From 3c78e387faa3c2b479394331d39df52c7c4bbc1d Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 10 Sep 2024 07:33:02 +0200 Subject: [PATCH] =?UTF-8?q?.env.local=20f=C3=BCr=2010.10.0.30=20vorbereite?= =?UTF-8?q?t=20ohne=20Mock=20Dateien=20von=20useLineData.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.local | 40 ++++++++++++++++++++-------------------- hooks/useLineData.js | 12 ++++++------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.env.local b/.env.local index 426f51759..14b8e8c52 100644 --- a/.env.local +++ b/.env.local @@ -1,24 +1,7 @@ #.env.local #je nach dem Mysql Server, ob localhost freigegeben ist oder die IP Adresse des Servers, manchmal die beide und manchmal nur eine -#DB_HOST=10.10.0.30 -#DB_USER=root -#DB_PASSWORD="root#$" -#DB_NAME=talas_v5 -#DB_PORT=3306 - - -######################### - -#NEXT_PUBLIC_BASE_URL="http://10.10.0.30/talas5/devices/" -#NEXT_PUBLIC_SERVER_URL="http://10.10.0.70" -#NEXT_PUBLIC_PROXY_TARGET="http://10.10.0.30" -#NEXT_PUBLIC_ONLINE_TILE_LAYER="http://10.10.0.30:3000/mapTiles/{z}/{x}/{y}.png" -#NEXT_PUBLIC_ONLINE_TILE_LAYER="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" -######################### - - -DB_HOST=10.10.0.70 +DB_HOST=10.10.0.30 DB_USER=root DB_PASSWORD="root#$" DB_NAME=talas_v5 @@ -29,8 +12,25 @@ DB_PORT=3306 NEXT_PUBLIC_BASE_URL="http://10.10.0.30/talas5/devices/" NEXT_PUBLIC_SERVER_URL="http://10.10.0.70" -NEXT_PUBLIC_PROXY_TARGET="http://10.10.0.70" -NEXT_PUBLIC_ONLINE_TILE_LAYER="http://10.10.0.13:3000/mapTiles/{z}/{x}/{y}.png" +NEXT_PUBLIC_PROXY_TARGET="http://10.10.0.30" +NEXT_PUBLIC_ONLINE_TILE_LAYER="http://10.10.0.30:3000/mapTiles/{z}/{x}/{y}.png" +#NEXT_PUBLIC_ONLINE_TILE_LAYER="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" +######################### + + +#DB_HOST=10.10.0.70 +#DB_USER=root +#DB_PASSWORD="root#$" +#DB_NAME=talas_v5 +#DB_PORT=3306 + + +######################### + +#NEXT_PUBLIC_BASE_URL="http://10.10.0.30/talas5/devices/" +#NEXT_PUBLIC_SERVER_URL="http://10.10.0.70" +#NEXT_PUBLIC_PROXY_TARGET="http://10.10.0.70" +#NEXT_PUBLIC_ONLINE_TILE_LAYER="http://10.10.0.13:3000/mapTiles/{z}/{x}/{y}.png" #NEXT_PUBLIC_ONLINE_TILE_LAYER="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" ######################### diff --git a/hooks/useLineData.js b/hooks/useLineData.js index e89ca06a7..60abd1d17 100644 --- a/hooks/useLineData.js +++ b/hooks/useLineData.js @@ -14,16 +14,16 @@ const useLineData = (webserviceGisLinesStatusUrl, setLineStatusData) => { const fetchData = async () => { try { console.log("Daten werden abgerufen..."); - //const response1 = await fetch(webserviceGisLinesStatusUrl); // original - const response1 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/gisLines/webserviceGisLinesStatusUrlMock`); //von original kopiert + const response1 = await fetch(webserviceGisLinesStatusUrl); // original + //const response1 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/gisLines/webserviceGisLinesStatusUrlMock`); //von original kopiert const data1 = await response1.json(); console.log("Daten empfangen data1:", data1); - //const response2 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/gisLines/readGisLines`); - const response2 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/gisLines/readGisLinesMock`); + const response2 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/gisLines/readGisLines`); + //const response2 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/gisLines/readGisLinesMock`); const data2 = await response2.json(); console.log("Daten empfangen data2:", data2); - //const response3 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/station/getAllStationsNames`); - const response3 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/station/getAllStationsNamesMock`); + const response3 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/station/getAllStationsNames`); + //const response3 = await fetch(`${SERVER_URL}:3000/api/talas_v5_DB/station/getAllStationsNamesMock`); const namesData = await response3.json(); console.log("Daten empfangen namesData:", namesData);