From 0dce495435aef282f668c57b8bfccbca02b98217 Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 11 Mar 2025 06:47:46 +0100 Subject: [PATCH] refactor: mainComponent/hooks/webServices/ --- .env.local | 8 ++++---- components/DataSheet.js | 2 +- components/mainComponent/MapComponent.js | 12 ++++++------ .../useAutoRefreshLocationDevices.js | 2 +- .../useInitGisStationsMeasurements.js | 2 +- .../{ => webServices}/useInitGisStationsStatic.js | 2 +- .../useInitGisStationsStaticDistrict.js | 2 +- .../useInitGisStationsStatusDistrict.js | 2 +- .../{ => webServices}/useInitGisSystemStatic.js | 2 +- .../{ => webServices}/useInitLocationDevices.js | 2 +- config/appVersion.js | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) rename components/mainComponent/hooks/{ => webServices}/useAutoRefreshLocationDevices.js (91%) rename components/mainComponent/hooks/{ => webServices}/useInitGisStationsMeasurements.js (86%) rename components/mainComponent/hooks/{ => webServices}/useInitGisStationsStatic.js (92%) rename components/mainComponent/hooks/{ => webServices}/useInitGisStationsStaticDistrict.js (85%) rename components/mainComponent/hooks/{ => webServices}/useInitGisStationsStatusDistrict.js (85%) rename components/mainComponent/hooks/{ => webServices}/useInitGisSystemStatic.js (74%) rename components/mainComponent/hooks/{ => webServices}/useInitLocationDevices.js (75%) diff --git a/.env.local b/.env.local index b05b3eea6..ffea95242 100644 --- a/.env.local +++ b/.env.local @@ -7,12 +7,12 @@ DB_NAME=talas_v5 DB_PORT=3306 # Public Settings (Client braucht IP/Domain) -NEXT_PUBLIC_SERVER_URL="http://192.168.10.33" # oder evtl. später https://nodemap.firma.de +NEXT_PUBLIC_SERVER_URL="http://10.10.0.70" # oder evtl. später https://nodemap.firma.de NEXT_PUBLIC_ENABLE_GEOCODER=true NEXT_PUBLIC_USE_MOCK_API=false NEXT_PUBLIC_DEBUG_LOG=true # für Polylines/kabelstecken -> in Konextmenü "Station öffnen" " -NEXT_PUBLIC_BASE_URL=http://192.168.10.33/talas5/devices/ -NEXT_PUBLIC_API_BASE_URL=http://192.168.10.33/talas5/ClientData/WebServiceMap.asmx -NEXT_PUBLIC_API_PORT_3000=http://192.168.10.33:3000 +NEXT_PUBLIC_BASE_URL=http://10.10.0.70/talas5/devices/ +NEXT_PUBLIC_API_BASE_URL=http://10.10.0.70/talas5/ClientData/WebServiceMap.asmx +NEXT_PUBLIC_API_PORT_3000=http://10.10.0.70:3000 diff --git a/components/DataSheet.js b/components/DataSheet.js index 403f61813..b00a21eb0 100644 --- a/components/DataSheet.js +++ b/components/DataSheet.js @@ -12,7 +12,7 @@ import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleS import { useSelector, useDispatch } from "react-redux"; import { selectPolylineVisible, setPolylineVisible } from "../redux/slices/polylineLayerVisibleSlice"; import { selectGisSystemStatic } from "../redux/slices/webService/gisSystemStaticSlice"; -import { useInitGisStationsStatic } from "../components/mainComponent/hooks/useInitGisStationsStatic"; +import { useInitGisStationsStatic } from "../components/mainComponent/hooks/webServices/useInitGisStationsStatic"; import { fetchGisStationsStatic, selectGisStationsStatic } from "../redux/slices/webService/gisStationsStaticSlice"; import { selectGisStationsStaticDistrict } from "../redux/slices/webService/gisStationsStaticDistrictSlice"; diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index bd579ff95..faf6f7bda 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -67,15 +67,15 @@ import { fetchGisStationsMeasurements } from "../../services/api/fetchGisStation import { fetchGisSystemStatic } from "../../services/api/fetchGisSystemStatic.js"; import { usePolylineTooltipLayer } from "../../hooks/usePolylineTooltipLayer.js"; import { selectPolylineVisible, setPolylineVisible } from "../../redux/slices/polylineLayerVisibleSlice.js"; -import { useInitLocationDevices } from "./hooks/useInitLocationDevices"; -import { useInitGisStationsStaticDistrict } from "./hooks/useInitGisStationsStaticDistrict"; +import { useInitLocationDevices } from "./hooks/webServices/useInitLocationDevices"; +import { useInitGisStationsStaticDistrict } from "./hooks/webServices/useInitGisStationsStaticDistrict"; import { selectGisStationsStaticDistrict } from "../../redux/slices/webService/gisStationsStaticDistrictSlice"; -import { useInitGisStationsStatusDistrict } from "./hooks/useInitGisStationsStatusDistrict"; -import { useInitGisStationsMeasurements } from "./hooks/useInitGisStationsMeasurements"; -import { useInitGisSystemStatic } from "./hooks/useInitGisSystemStatic"; +import { useInitGisStationsStatusDistrict } from "./hooks/webServices/useInitGisStationsStatusDistrict"; +import { useInitGisStationsMeasurements } from "./hooks/webServices/useInitGisStationsMeasurements"; +import { useInitGisSystemStatic } from "./hooks/webServices/useInitGisSystemStatic"; import { selectGisSystemStatic, setGisSystemStatic } from "../../redux/slices/webService/gisSystemStaticSlice"; import ShowAddStationPopup from "../AddPOIModal.js"; -import { useInitGisStationsStatic } from "../mainComponent/hooks/useInitGisStationsStatic"; +import { useInitGisStationsStatic } from "../mainComponent/hooks/webServices/useInitGisStationsStatic"; import { closeAddPoiModal } from "../../redux/slices/addPoiOnPolylineSlice.js"; import AddPOIOnPolyline from "../AddPOIOnPolyline"; diff --git a/components/mainComponent/hooks/useAutoRefreshLocationDevices.js b/components/mainComponent/hooks/webServices/useAutoRefreshLocationDevices.js similarity index 91% rename from components/mainComponent/hooks/useAutoRefreshLocationDevices.js rename to components/mainComponent/hooks/webServices/useAutoRefreshLocationDevices.js index df25ec554..5d0e146a0 100644 --- a/components/mainComponent/hooks/useAutoRefreshLocationDevices.js +++ b/components/mainComponent/hooks/webServices/useAutoRefreshLocationDevices.js @@ -8,7 +8,7 @@ Daten werden dann in der Redux State gespeichert import { useEffect } from "react"; import { useDispatch } from "react-redux"; -import { fetchLocationDevicesFromDB } from "../../../redux/slices/db/locationDevicesFromDBSlice"; +import { fetchLocationDevicesFromDB } from "../../../../redux/slices/db/locationDevicesFromDBSlice"; export const useAutoRefreshLocationDevices = (interval = 20000) => { // alle 20 Sekunden diff --git a/components/mainComponent/hooks/useInitGisStationsMeasurements.js b/components/mainComponent/hooks/webServices/useInitGisStationsMeasurements.js similarity index 86% rename from components/mainComponent/hooks/useInitGisStationsMeasurements.js rename to components/mainComponent/hooks/webServices/useInitGisStationsMeasurements.js index 77cedf59e..2db27df07 100644 --- a/components/mainComponent/hooks/useInitGisStationsMeasurements.js +++ b/components/mainComponent/hooks/webServices/useInitGisStationsMeasurements.js @@ -1,7 +1,7 @@ // /components/mainComponent/hooks/useInitGisStationsMeasurements.js import { useEffect } from "react"; import { useDispatch } from "react-redux"; -import { fetchGisStationsMeasurementsFromWebService } from "../../../redux/slices/webService/gisStationsMeasurementsSlice"; +import { fetchGisStationsMeasurementsFromWebService } from "../../../../redux/slices/webService/gisStationsMeasurementsSlice"; export const useInitGisStationsMeasurements = () => { const dispatch = useDispatch(); diff --git a/components/mainComponent/hooks/useInitGisStationsStatic.js b/components/mainComponent/hooks/webServices/useInitGisStationsStatic.js similarity index 92% rename from components/mainComponent/hooks/useInitGisStationsStatic.js rename to components/mainComponent/hooks/webServices/useInitGisStationsStatic.js index 533ebd5ed..7c4596e45 100644 --- a/components/mainComponent/hooks/useInitGisStationsStatic.js +++ b/components/mainComponent/hooks/webServices/useInitGisStationsStatic.js @@ -2,7 +2,7 @@ //Bereiche/Area-Name Dropdownmenu für Datasheet wird hier initialisiert und in der Komponente verwendet import { useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { fetchGisStationsStatic, selectGisStationsStatic } from "../../../redux/slices/webService/gisStationsStaticSlice"; +import { fetchGisStationsStatic, selectGisStationsStatic } from "../../../../redux/slices/webService/gisStationsStaticSlice"; export const useInitGisStationsStatic = () => { const dispatch = useDispatch(); diff --git a/components/mainComponent/hooks/useInitGisStationsStaticDistrict.js b/components/mainComponent/hooks/webServices/useInitGisStationsStaticDistrict.js similarity index 85% rename from components/mainComponent/hooks/useInitGisStationsStaticDistrict.js rename to components/mainComponent/hooks/webServices/useInitGisStationsStaticDistrict.js index b53d554ad..74d70c736 100644 --- a/components/mainComponent/hooks/useInitGisStationsStaticDistrict.js +++ b/components/mainComponent/hooks/webServices/useInitGisStationsStaticDistrict.js @@ -1,7 +1,7 @@ // /components/mainComponent/hooks/useInitGisStationsStaticDistrict.js import { useEffect } from "react"; import { useDispatch } from "react-redux"; -import { fetchGisStationsStaticDistrictFromWebService } from "../../../redux/slices/webService/gisStationsStaticDistrictSlice"; +import { fetchGisStationsStaticDistrictFromWebService } from "../../../../redux/slices/webService/gisStationsStaticDistrictSlice"; export const useInitGisStationsStaticDistrict = () => { const dispatch = useDispatch(); diff --git a/components/mainComponent/hooks/useInitGisStationsStatusDistrict.js b/components/mainComponent/hooks/webServices/useInitGisStationsStatusDistrict.js similarity index 85% rename from components/mainComponent/hooks/useInitGisStationsStatusDistrict.js rename to components/mainComponent/hooks/webServices/useInitGisStationsStatusDistrict.js index 6d75ab118..147b1fa31 100644 --- a/components/mainComponent/hooks/useInitGisStationsStatusDistrict.js +++ b/components/mainComponent/hooks/webServices/useInitGisStationsStatusDistrict.js @@ -1,7 +1,7 @@ // /componets/mainComponent/hooks/useInitGisStationsStatusDistrict.js import { useEffect } from "react"; import { useDispatch } from "react-redux"; -import { fetchGisStationsStatusDistrictFromWebService } from "../../../redux/slices/webService/gisStationsStatusDistrictSlice"; +import { fetchGisStationsStatusDistrictFromWebService } from "../../../../redux/slices/webService/gisStationsStatusDistrictSlice"; export const useInitGisStationsStatusDistrict = () => { const dispatch = useDispatch(); diff --git a/components/mainComponent/hooks/useInitGisSystemStatic.js b/components/mainComponent/hooks/webServices/useInitGisSystemStatic.js similarity index 74% rename from components/mainComponent/hooks/useInitGisSystemStatic.js rename to components/mainComponent/hooks/webServices/useInitGisSystemStatic.js index 621eb7dea..b7a58a3e4 100644 --- a/components/mainComponent/hooks/useInitGisSystemStatic.js +++ b/components/mainComponent/hooks/webServices/useInitGisSystemStatic.js @@ -1,7 +1,7 @@ // /components/mainComponent/hooks/useInitGisStationsMeasurements.js import { useEffect } from "react"; import { useDispatch } from "react-redux"; -import { fetchGisSystemStaticFromWebService } from "../../../redux/slices/webService/gisSystemStaticSlice"; +import { fetchGisSystemStaticFromWebService } from "../../../../redux/slices/webService/gisSystemStaticSlice"; export const useInitGisSystemStatic = () => { const dispatch = useDispatch(); diff --git a/components/mainComponent/hooks/useInitLocationDevices.js b/components/mainComponent/hooks/webServices/useInitLocationDevices.js similarity index 75% rename from components/mainComponent/hooks/useInitLocationDevices.js rename to components/mainComponent/hooks/webServices/useInitLocationDevices.js index 9e01183b4..49708264f 100644 --- a/components/mainComponent/hooks/useInitLocationDevices.js +++ b/components/mainComponent/hooks/webServices/useInitLocationDevices.js @@ -1,7 +1,7 @@ // /components/mainComponent/hooks/useInitLocationDevices.js import { useEffect } from "react"; import { useDispatch } from "react-redux"; -import { fetchLocationDevicesFromDB } from "../../../redux/slices/db/locationDevicesFromDBSlice"; +import { fetchLocationDevicesFromDB } from "../../../../redux/slices/db/locationDevicesFromDBSlice"; export const useInitLocationDevices = () => { const dispatch = useDispatch(); diff --git a/config/appVersion.js b/config/appVersion.js index c2cb28618..c0d3f977c 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.45"; +export const APP_VERSION = "1.1.46";