From c49b16dd83d3e401bd83c17e7146e3dc7b5c80c1 Mon Sep 17 00:00:00 2001 From: ISA Date: Thu, 7 Nov 2024 10:10:59 +0100 Subject: [PATCH] MAC Adresse 2 entfernen, weil ist nicht relavant zu sehen --- components/modales/SettingsModal.jsx | 18 +++--------------- public/CPL/SERVICE/System.js | 1 - public/CPLmockData/SERVICE/System.js | 1 - store/variablesSlice.js | 1 - utils/loadWindowVariables.js | 1 - 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/components/modales/SettingsModal.jsx b/components/modales/SettingsModal.jsx index be26968..2734437 100644 --- a/components/modales/SettingsModal.jsx +++ b/components/modales/SettingsModal.jsx @@ -12,7 +12,7 @@ function SettingModal({ showModal, onClose }) { // Redux-Werte abrufen const deviceName_Redux = useSelector((state) => state.variables.deviceName); const mac1_Redux = useSelector((state) => state.variables.mac1); - const mac2_Redux = useSelector((state) => state.variables.mac2); + const ip_Redux = useSelector((state) => state.variables.ip); const subnet_Redux = useSelector((state) => state.variables.subnet); const gateway_Redux = useSelector((state) => state.variables.gateway); @@ -28,7 +28,7 @@ function SettingModal({ showModal, onClose }) { // Lokale State-Variablen zum Bearbeiten const [name, setName] = useState(deviceName_Redux || ""); const [mac1, setMac1] = useState(mac1_Redux || ""); - const [mac2, setMac2] = useState(mac2_Redux || ""); + const [ip, setIp] = useState(ip_Redux || ""); const [subnet, setSubnet] = useState(subnet_Redux || ""); const [gateway, setGateway] = useState(gateway_Redux || ""); @@ -186,7 +186,7 @@ function SettingModal({ showModal, onClose }) { if (showModal) { setName(deviceName_Redux || ""); setMac1(mac1_Redux || ""); - setMac2(mac2_Redux || ""); + setIp(ip_Redux || ""); setSubnet(subnet_Redux || ""); setGateway(gateway_Redux || ""); @@ -292,18 +292,6 @@ function SettingModal({ showModal, onClose }) { disabled /> -
- - setMac2(e.target.value)} - disabled - /> -
diff --git a/public/CPL/SERVICE/System.js b/public/CPL/SERVICE/System.js index 7c3ffd1..559e034 100644 --- a/public/CPL/SERVICE/System.js +++ b/public/CPL/SERVICE/System.js @@ -1,7 +1,6 @@ var win_appVersion = "<%=SAV00%>"; var win_deviceName = "<%=SAN01%>"; var win_mac1 = "<%=SEM01%>"; -var win_mac2 = "<%=SEM02%>"; var win_ip = "<%=SEI01%>"; var win_subnet = "<%=SES01%>"; var win_gateway = "<%=SEG01%>"; diff --git a/public/CPLmockData/SERVICE/System.js b/public/CPLmockData/SERVICE/System.js index 483ffed..a52f715 100644 --- a/public/CPLmockData/SERVICE/System.js +++ b/public/CPLmockData/SERVICE/System.js @@ -1,7 +1,6 @@ var win_appVersion = "0.02"; var win_deviceName = "CPLV4_Maschen"; var win_mac1 = "0 48 86 81 46 143"; -var win_mac2 = "0 48 86 81 46 144"; var win_ip = "10.10.0.243"; var win_subnet = "255.255.255.0"; var win_gateway = "10.10.0.1"; diff --git a/store/variablesSlice.js b/store/variablesSlice.js index 19cf48c..35d00e6 100644 --- a/store/variablesSlice.js +++ b/store/variablesSlice.js @@ -5,7 +5,6 @@ const initialState = { last20Messages: null, deviceName: null, mac1: null, - mac2: null, ip: null, subnet: null, gateway: null, diff --git a/utils/loadWindowVariables.js b/utils/loadWindowVariables.js index 54c717e..813599a 100644 --- a/utils/loadWindowVariables.js +++ b/utils/loadWindowVariables.js @@ -5,7 +5,6 @@ export async function loadWindowVariables() { "win_last20Messages", "win_deviceName", "win_mac1", - "win_mac2", "win_ip", "win_subnet", "win_gateway",