From 28dbf804627f611ce25e4d717551133660106fa2 Mon Sep 17 00:00:00 2001 From: Ismail Ali Date: Sat, 8 Mar 2025 08:06:07 +0100 Subject: [PATCH] feat: API-URLs dynamisch aus .env.local statt config.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Alle API-URLs nutzen jetzt `process.env.NEXT_PUBLIC_API_BASE_URL` - `fetchGisStationsMeasurements`, `fetchGisStationsStaticDistrict`, `fetchGisStationsStatusDistrict`, `fetchGisSystemStatic` angepasst - `idMap` und `idUser` werden dynamisch aus URL oder `.env.local` bezogen - Entfernte `config.js`-Abhängigkeit für API-URLs - `.env.local` erlaubt jetzt flexible Server-IPs ohne Code-Anpassung --- .env.local | 2 +- components/mainComponent/MapComponent.js | 3 --- config/appVersion.js | 2 +- .../api/fromWebService/fetchGisStationsMeasurements.js | 4 ++-- .../fromWebService/fetchGisStationsStaticDistrict.js | 4 ++-- .../fromWebService/fetchGisStationsStatusDistrict.js | 4 ++-- redux/api/fromWebService/fetchGisSystemStatic.js | 10 ++++------ 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.env.local b/.env.local index 8d9543dec..0eeebf47c 100644 --- a/.env.local +++ b/.env.local @@ -9,7 +9,7 @@ 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_ENABLE_GEOCODER=true -NEXT_PUBLIC_USE_MOCK_API=true +NEXT_PUBLIC_USE_MOCK_API=false NEXT_PUBLIC_DEBUG_LOG=true # für Polylines/kabelstecken -> in Konextmenü "Station öffnen" " diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index d924bc3f8..a77348c05 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -1010,9 +1010,6 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { useInitGisSystemStatic(); //-------------------------------------- - useEffect(() => { - console.log("GisStationsStaticDistrict aus Redux:", GisStationsStaticDistrict); - }, [GisStationsStaticDistrict]); //--------------------------------------- return ( diff --git a/config/appVersion.js b/config/appVersion.js index bbefc1393..741675367 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.26"; +export const APP_VERSION = "1.1.27"; diff --git a/redux/api/fromWebService/fetchGisStationsMeasurements.js b/redux/api/fromWebService/fetchGisStationsMeasurements.js index 04271a4c5..afe5a7ca4 100644 --- a/redux/api/fromWebService/fetchGisStationsMeasurements.js +++ b/redux/api/fromWebService/fetchGisStationsMeasurements.js @@ -1,8 +1,8 @@ // /redux/api/fromWebService/fetchGisStationsMeasurements.js -import { mapGisStationsMeasurementsUrl } from "../../../config/config"; +const apiBaseUrl = process.env.NEXT_PUBLIC_API_BASE_URL; export const fetchGisStationsMeasurements = async () => { - const response = await fetch(mapGisStationsMeasurementsUrl); + const response = await fetch(`${apiBaseUrl}/GisStationsMeasurements`); if (!response.ok) { throw new Error("GisStationsMeasurements konnte nicht geladen werden"); } diff --git a/redux/api/fromWebService/fetchGisStationsStaticDistrict.js b/redux/api/fromWebService/fetchGisStationsStaticDistrict.js index d45e0b592..cfef670d7 100644 --- a/redux/api/fromWebService/fetchGisStationsStaticDistrict.js +++ b/redux/api/fromWebService/fetchGisStationsStaticDistrict.js @@ -1,8 +1,8 @@ // /redux/api/fromWebService/fetchGisStationsStaticDistrict.js -import { mapGisStationsStaticDistrictUrl } from "../../../config/config"; +const apiBaseUrl = process.env.NEXT_PUBLIC_API_BASE_URL; export const fetchGisStationsStaticDistrict = async () => { - const response = await fetch(mapGisStationsStaticDistrictUrl); + const response = await fetch(`${apiBaseUrl}/GisStationsStaticDistrict`); if (!response.ok) { throw new Error("GisStationsStaticDistrict konnte nicht geladen werden"); } diff --git a/redux/api/fromWebService/fetchGisStationsStatusDistrict.js b/redux/api/fromWebService/fetchGisStationsStatusDistrict.js index 19390fbb3..5f9a04bd3 100644 --- a/redux/api/fromWebService/fetchGisStationsStatusDistrict.js +++ b/redux/api/fromWebService/fetchGisStationsStatusDistrict.js @@ -1,8 +1,8 @@ // /redux/api/fromWebService/fetchGisStationsStatusDistrict.js -import { mapGisStationsStatusDistrictUrl } from "../../../config/config"; +const apiBaseUrl = process.env.NEXT_PUBLIC_API_BASE_URL; export const fetchGisStationsStatusDistrict = async () => { - const response = await fetch(mapGisStationsStatusDistrictUrl); + const response = await fetch(`${apiBaseUrl}/GisStationsStatusDistrict`); if (!response.ok) { throw new Error("GisStationsStatusDistrict konnte nicht geladen werden"); } diff --git a/redux/api/fromWebService/fetchGisSystemStatic.js b/redux/api/fromWebService/fetchGisSystemStatic.js index 311dc782a..ee3e75de5 100644 --- a/redux/api/fromWebService/fetchGisSystemStatic.js +++ b/redux/api/fromWebService/fetchGisSystemStatic.js @@ -1,16 +1,14 @@ // /redux/api/fromWebService/fetchGisSystemStatic.js -import { useSearchParams } from "next/navigation"; // Falls du Next.js 13+ nutzt +const apiBaseUrl = process.env.NEXT_PUBLIC_API_BASE_URL; export async function fetchGisSystemStatic() { const params = new URLSearchParams(window.location.search); - const idMap = params.get("idMap") || "12"; // Fallback-Wert 12 - const idUser = params.get("idUser") || "484"; // Fallback-Wert 484 - - const apiBaseUrl = process.env.NEXT_PUBLIC_API_BASE_URL; // Dynamische Server-IP + const idMap = params.get("idMap") || process.env.NEXT_PUBLIC_DEFAULT_ID_MAP || "12"; + const idUser = params.get("idUser") || process.env.NEXT_PUBLIC_DEFAULT_ID_USER || "484"; const response = await fetch(`${apiBaseUrl}/GisSystemStatic?idMap=${idMap}&idUser=${idUser}`); const data = await response.json(); - console.log("fetchGisSystemStatic API Response:", data); // ✅ Prüfen, ob API Daten liefert + console.log("fetchGisSystemStatic API Response:", data); return data; }