From 19e057031094ef09464e7b3307d11c8092a76655 Mon Sep 17 00:00:00 2001 From: ISA Date: Wed, 18 Dec 2024 07:29:47 +0100 Subject: [PATCH] Files copy and paste from store atoms and selector to redux slices folder --- components/DataSheet.js | 14 +++--- components/MapComponent.js | 24 +++++----- components/PoiUpdateModal.js | 14 ++---- components/ShowAddStationPopup.js | 48 ++++--------------- components/pois/AddPoiModalWindow.js | 4 +- components/pois/PoiUpdateModal.js | 6 +-- components/pois/PoiUpdateModalWrapper.js | 4 +- hooks/useCreateAndSetDevices.js | 2 +- hooks/useMapComponentState.js | 2 +- hooks/useMarkerLayers.js | 2 +- pages/index.js | 4 +- redux/{ => middleware}/websocketMiddleware.js | 0 .../atoms => redux/slices}/currentPoiState.js | 0 .../slices/gisStationsStaticDistrictSlice.js | 0 .../slices/gisSystemStaticSlice.js | 0 .../atoms => redux/slices}/mapLayersState.js | 0 .../atoms => redux/slices}/poiLayerVisible.js | 0 .../slices}/poiLayerVisibleState.js | 0 .../slices/poiReadFromDbTriggerSlice.js | 0 .../slices}/polylineEventsDisabledState.js | 0 .../slices}/polylineLayerVisibleState.js | 0 .../slices}/readPoiMarkersStore.js | 0 .../slices}/selectedAreaState.js | 0 .../slices/selectedPoiState.js | 0 .../slices}/urlParameterState.js | 0 .../slices}/zoomTriggerState.js | 0 redux/store.js | 2 +- store/atoms/mapAtom.js | 7 --- store/atoms/poiDeviceNameState.js | 7 --- store/atoms/poiTypState.js | 7 --- utils/createAndSetDevices.js | 2 +- utils/setupPolylines.js | 2 +- 32 files changed, 47 insertions(+), 104 deletions(-) rename redux/{ => middleware}/websocketMiddleware.js (100%) rename {store/atoms => redux/slices}/currentPoiState.js (100%) rename store/atoms/gisStationState.js => redux/slices/gisStationsStaticDistrictSlice.js (100%) rename store/atoms/gisSystemState.js => redux/slices/gisSystemStaticSlice.js (100%) rename {store/atoms => redux/slices}/mapLayersState.js (100%) rename {store/atoms => redux/slices}/poiLayerVisible.js (100%) rename {store/atoms => redux/slices}/poiLayerVisibleState.js (100%) rename store/atoms/poiReadFromDbTriggerAtom.js => redux/slices/poiReadFromDbTriggerSlice.js (100%) rename {store/atoms => redux/slices}/polylineEventsDisabledState.js (100%) rename {store/atoms => redux/slices}/polylineLayerVisibleState.js (100%) rename {store/selectors => redux/slices}/readPoiMarkersStore.js (100%) rename {store/atoms => redux/slices}/selectedAreaState.js (100%) rename store/atoms/poiState.js => redux/slices/selectedPoiState.js (100%) rename {store/atoms => redux/slices}/urlParameterState.js (100%) rename {store/atoms => redux/slices}/zoomTriggerState.js (100%) delete mode 100644 store/atoms/mapAtom.js delete mode 100644 store/atoms/poiDeviceNameState.js delete mode 100644 store/atoms/poiTypState.js diff --git a/components/DataSheet.js b/components/DataSheet.js index b357e5b47..4860c8a81 100644 --- a/components/DataSheet.js +++ b/components/DataSheet.js @@ -1,13 +1,13 @@ import React, { useEffect, useState } from "react"; import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil"; -import { gisStationsStaticDistrictState } from "../store/atoms/gisStationState"; -import { gisSystemStaticState } from "../store/atoms/gisSystemState"; -import { mapLayersState } from "../store/atoms/mapLayersState"; -import { selectedAreaState } from "../store/atoms/selectedAreaState"; -import { zoomTriggerState } from "../store/atoms/zoomTriggerState"; -import { poiLayerVisibleState } from "../store/atoms/poiLayerVisibleState"; +import { gisStationsStaticDistrictState } from "../redux/slices/gisStationsStaticDistrictSlice"; +import { gisSystemStaticState } from "../redux/slices/gisSystemStaticSlice"; +import { mapLayersState } from "../redux/slices/mapLayersState"; +import { selectedAreaState } from "../redux/slices/selectedAreaState"; +import { zoomTriggerState } from "../redux/slices/zoomTriggerState.js"; +import { poiLayerVisibleState } from "../redux/slices/poiLayerVisibleState"; import EditModeToggle from "./EditModeToggle"; -import { polylineLayerVisibleState } from "../store/atoms/polylineLayerVisibleState"; // Import für Polyline-Visibility +import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleState"; // Import für Polyline-Visibility function DataSheet() { const [editMode, setEditMode] = useState(false); // Zustand für editMode diff --git a/components/MapComponent.js b/components/MapComponent.js index f508291e3..ef5efff92 100644 --- a/components/MapComponent.js +++ b/components/MapComponent.js @@ -9,21 +9,21 @@ import "leaflet.smooth_marker_bouncing"; import OverlappingMarkerSpiderfier from "overlapping-marker-spiderfier-leaflet"; import DataSheet from "./DataSheet.js"; import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil"; -import { gisStationsStaticDistrictState } from "../store/atoms/gisStationState.js"; -import { gisSystemStaticState } from "../store/atoms/gisSystemState.js"; -import { mapLayersState } from "../store/atoms/mapLayersState.js"; -import { selectedAreaState } from "../store/atoms/selectedAreaState.js"; -import { zoomTriggerState } from "../store/atoms/zoomTriggerState.js"; +import { gisStationsStaticDistrictState } from "../redux/slices/gisStationsStaticDistrictSlice"; +import { gisSystemStaticState } from "../redux/slices/gisSystemStaticSlice"; +import { mapLayersState } from "../redux/slices/mapLayersState"; +import { selectedAreaState } from "../redux/slices/selectedAreaState"; +import { zoomTriggerState } from "../redux/slices/zoomTriggerState.js"; import AddPoiModalWindow from "./pois/AddPoiModalWindow.js"; -import { poiReadFromDbTriggerAtom } from "../store/atoms/poiReadFromDbTriggerAtom.js"; +import { poiReadFromDbTriggerAtom } from "../redux/slices/poiReadFromDbTriggerSlice"; import { InformationCircleIcon } from "@heroicons/react/20/solid"; // oder 'outline' import PoiUpdateModal from "./pois/PoiUpdateModal.js"; -import { selectedPoiState } from "../store/atoms/poiState.js"; -import { currentPoiState } from "../store/atoms/currentPoiState.js"; +import { selectedPoiState } from "../redux/slices/selectedPoiState.js"; +import { currentPoiState } from "../redux/slices/currentPoiState.js"; import { ToastContainer, toast } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; -import { mapIdState, userIdState } from "../store/atoms/urlParameterState.js"; -import { poiLayerVisibleState } from "../store/atoms/poiLayerVisibleState.js"; +import { mapIdState, userIdState } from "../redux/slices/urlParameterState.js"; +import { poiLayerVisibleState } from "../redux/slices/poiLayerVisibleState.js"; import plusRoundIcon from "./PlusRoundIcon.js"; import { createAndSetDevices } from "../utils/createAndSetDevices.js"; import { restoreMapSettings, checkOverlappingMarkers } from "../utils/mapUtils.js"; @@ -48,9 +48,9 @@ import useLineData from "../hooks/useLineData.js"; //import { useCreateAndSetDevices } from "../hooks/useCreateAndSetDevices"; import { useMapComponentState } from "../hooks/useMapComponentState"; -import { polylineEventsDisabledState } from "../store/atoms/polylineEventsDisabledState"; +import { polylineEventsDisabledState } from "../redux/slices/polylineEventsDisabledState"; import { disablePolylineEvents, enablePolylineEvents } from "../utils/setupPolylines"; -import { polylineLayerVisibleState } from "../store/atoms/polylineLayerVisibleState"; +import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleState"; const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const polylineVisible = useRecoilValue(polylineLayerVisibleState); diff --git a/components/PoiUpdateModal.js b/components/PoiUpdateModal.js index d24cab7ad..17fc068df 100644 --- a/components/PoiUpdateModal.js +++ b/components/PoiUpdateModal.js @@ -2,8 +2,8 @@ import React, { useState, useEffect } from "react"; import { useRecoilValue } from "recoil"; -import { selectedPoiState } from "../store/atoms/poiState"; -import { currentPoiState } from "../store/atoms/currentPoiState"; +import { selectedPoiState } from "../redux/slices/selectedPoiState"; +import { currentPoiState } from "../redux/slices/currentPoiState"; const PoiUpdateModal = ({ onClose, poiData }) => { const currentPoi = useRecoilValue(currentPoiState); @@ -90,9 +90,7 @@ const PoiUpdateModal = ({ onClose, poiData }) => { const fetchData = async () => { try { // const response = await fetch("/api/talas_v5/location_device"); //"/api/talas_v5_DB/locationDevice/location_device" - const response = await fetch( - "/api/talas_v5_DB/locationDevice/locationDevices" - ); + const response = await fetch("/api/talas_v5_DB/locationDevice/locationDevices"); const data = await response.json(); setLocationDeviceData(data); if (poiData && poiData.idLD) { @@ -207,11 +205,7 @@ const PoiUpdateModal = ({ onClose, poiData }) => { - diff --git a/components/ShowAddStationPopup.js b/components/ShowAddStationPopup.js index 4415d2041..6bafa5cbd 100644 --- a/components/ShowAddStationPopup.js +++ b/components/ShowAddStationPopup.js @@ -2,8 +2,8 @@ import React, { useState, useEffect, use } from "react"; import ReactDOM from "react-dom"; import { useRecoilValue, useRecoilState, useSetRecoilState } from "recoil"; -import { readPoiMarkersStore } from "../store/selectors/readPoiMarkersStore"; -import { poiReadFromDbTriggerAtom } from "../store/atoms/poiReadFromDbTriggerAtom"; +import { readPoiMarkersStore } from "../redux/slices/readPoiMarkersStore.js"; +import { poiReadFromDbTriggerAtom } from "../redux/slices/poiReadFromDbTriggerSlice"; const ShowAddStationPopup = ({ onClose, map, latlng }) => { const [poiTypData, setpoiTypData] = useState(); // Recoil State verwenden @@ -26,10 +26,7 @@ const ShowAddStationPopup = ({ onClose, map, latlng }) => { if (data && data.length > 0) { setPoiTypeId(data[0].idPoiTyp); // Set initial poiTypeId to the id of the first poiType setPoiTypeName(data[1].name); // Set initial poiTypeName to the name of the first poiType - console.log( - "Initial poiTypeId set in ShowAddStationPopup.js :", - data[0].idPoiTyp - ); + console.log("Initial poiTypeId set in ShowAddStationPopup.js :", data[0].idPoiTyp); } } catch (error) { console.error("Fehler beim Abrufen der poiTyp Daten:", error); @@ -72,10 +69,7 @@ const ShowAddStationPopup = ({ onClose, map, latlng }) => { } console.log("Abgerufene Standort- und Gerätedaten:", data); } catch (error) { - console.error( - "Fehler beim Abrufen der Standort- und Gerätedaten:", - error - ); + console.error("Fehler beim Abrufen der Standort- und Gerätedaten:", error); } }; @@ -91,8 +85,7 @@ const ShowAddStationPopup = ({ onClose, map, latlng }) => { poiTypeId, latitude, longitude, - idLD: locationDeviceData.find((device) => device.name === deviceName) - .idLD, + idLD: locationDeviceData.find((device) => device.name === deviceName).idLD, }; const response = await fetch("/api/talas_v5_DB/pois/addLocation", { @@ -129,15 +122,7 @@ const ShowAddStationPopup = ({ onClose, map, latlng }) => { - setName(e.target.value)} - placeholder="Name der Station" - className="block p-2 w-full border-2 border-gray-200 rounded-md text-sm" - /> + setName(e.target.value)} placeholder="Name der Station" className="block p-2 w-full border-2 border-gray-200 rounded-md text-sm" /> {/* {locationDeviceData.----------------------------------------------*/} @@ -145,13 +130,7 @@ const ShowAddStationPopup = ({ onClose, map, latlng }) => { - setDeviceName(e.target.value)} className="block p-2 w-full border-2 border-gray-200 rounded-md text-sm"> {locationDeviceData.map((device, index) => (