From 1768564d4beab5897d570316ba2a32e45294a123 Mon Sep 17 00:00:00 2001 From: Ismail Ali Date: Thu, 13 Feb 2025 19:32:01 +0100 Subject: [PATCH] Struktur in components verbessert --- __tests__/components/modules/Kue705FO.test.tsx | 2 +- .../AnalogeEingaengeComponent.tsx | 0 components/main/{modules => analogeEingaenge}/XioPM.tsx | 0 .../kue705FO/Charts}/ChartSwitcher.tsx | 0 .../kue705FO/Charts}/DateRangePicker.tsx | 0 .../Charts}/LoopMeasurementChart/LoopChartActionBar.tsx | 0 .../Charts}/LoopMeasurementChart/LoopMeasurementChart.tsx | 0 .../kue705FO/Charts}/TDRChart/TDRChart.tsx | 0 .../kue705FO/Charts}/TDRChart/TDRChartActionBar.tsx | 2 +- .../{modules => kabelueberwachung}/kue705FO/Kue705FO.tsx | 6 +++--- .../{modules => kabelueberwachung}/kue705FO/KueModal.tsx | 0 .../kue705FO/handlers/firmwareUpdate.ts | 0 .../kue705FO/handlers/handleChange.ts | 0 .../kue705FO/handlers/handleDisplayEinschalten.ts | 0 .../kue705FO/handlers/handleSave.ts | 0 config/webVersion.ts | 2 +- pages/analogeEingaenge.tsx | 4 ++-- pages/kabelueberwachung.tsx | 2 +- 18 files changed, 9 insertions(+), 9 deletions(-) rename components/main/{modules => analogeEingaenge}/AnalogeEingaengeComponent.tsx (100%) rename components/main/{modules => analogeEingaenge}/XioPM.tsx (100%) rename components/main/{modules/kue705FO/charts => kabelueberwachung/kue705FO/Charts}/ChartSwitcher.tsx (100%) rename components/main/{modules/kue705FO/charts => kabelueberwachung/kue705FO/Charts}/DateRangePicker.tsx (100%) rename components/main/{modules/kue705FO/charts => kabelueberwachung/kue705FO/Charts}/LoopMeasurementChart/LoopChartActionBar.tsx (100%) rename components/main/{modules/kue705FO/charts => kabelueberwachung/kue705FO/Charts}/LoopMeasurementChart/LoopMeasurementChart.tsx (100%) rename components/main/{modules/kue705FO/charts => kabelueberwachung/kue705FO/Charts}/TDRChart/TDRChart.tsx (100%) rename components/main/{modules/kue705FO/charts => kabelueberwachung/kue705FO/Charts}/TDRChart/TDRChartActionBar.tsx (93%) rename components/main/{modules => kabelueberwachung}/kue705FO/Kue705FO.tsx (99%) rename components/main/{modules => kabelueberwachung}/kue705FO/KueModal.tsx (100%) rename components/main/{modules => kabelueberwachung}/kue705FO/handlers/firmwareUpdate.ts (100%) rename components/main/{modules => kabelueberwachung}/kue705FO/handlers/handleChange.ts (100%) rename components/main/{modules => kabelueberwachung}/kue705FO/handlers/handleDisplayEinschalten.ts (100%) rename components/main/{modules => kabelueberwachung}/kue705FO/handlers/handleSave.ts (100%) diff --git a/__tests__/components/modules/Kue705FO.test.tsx b/__tests__/components/modules/Kue705FO.test.tsx index bb8e98b..7be6db3 100644 --- a/__tests__/components/modules/Kue705FO.test.tsx +++ b/__tests__/components/modules/Kue705FO.test.tsx @@ -3,7 +3,7 @@ import { render, fireEvent, screen } from "@testing-library/react"; import configureStore from "redux-mock-store"; import { Provider } from "react-redux"; import "@testing-library/jest-dom"; -import Kue705FO from "../../../components/main/modules/kue705FO/Kue705FO"; +import Kue705FO from "../../../components/main/kabelueberwachung/kue705FO/Kue705FO"; // Mocks für externe Abhängigkeiten jest.mock("chart.js/auto", () => ({ diff --git a/components/main/modules/AnalogeEingaengeComponent.tsx b/components/main/analogeEingaenge/AnalogeEingaengeComponent.tsx similarity index 100% rename from components/main/modules/AnalogeEingaengeComponent.tsx rename to components/main/analogeEingaenge/AnalogeEingaengeComponent.tsx diff --git a/components/main/modules/XioPM.tsx b/components/main/analogeEingaenge/XioPM.tsx similarity index 100% rename from components/main/modules/XioPM.tsx rename to components/main/analogeEingaenge/XioPM.tsx diff --git a/components/main/modules/kue705FO/charts/ChartSwitcher.tsx b/components/main/kabelueberwachung/kue705FO/Charts/ChartSwitcher.tsx similarity index 100% rename from components/main/modules/kue705FO/charts/ChartSwitcher.tsx rename to components/main/kabelueberwachung/kue705FO/Charts/ChartSwitcher.tsx diff --git a/components/main/modules/kue705FO/charts/DateRangePicker.tsx b/components/main/kabelueberwachung/kue705FO/Charts/DateRangePicker.tsx similarity index 100% rename from components/main/modules/kue705FO/charts/DateRangePicker.tsx rename to components/main/kabelueberwachung/kue705FO/Charts/DateRangePicker.tsx diff --git a/components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx similarity index 100% rename from components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx rename to components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx diff --git a/components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopMeasurementChart.tsx b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx similarity index 100% rename from components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopMeasurementChart.tsx rename to components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx diff --git a/components/main/modules/kue705FO/charts/TDRChart/TDRChart.tsx b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx similarity index 100% rename from components/main/modules/kue705FO/charts/TDRChart/TDRChart.tsx rename to components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx diff --git a/components/main/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChartActionBar.tsx similarity index 93% rename from components/main/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx rename to components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChartActionBar.tsx index b29037b..40cb3e8 100644 --- a/components/main/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChartActionBar.tsx @@ -1,7 +1,7 @@ // /components/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx import React, { useState } from "react"; import DateRangePicker from "../DateRangePicker"; -import TDRChart from "./TDRChart"; +import TDRChart from "../../../../kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart"; import { useDispatch } from "react-redux"; import { setChartData } from "../../../../../../redux/slices/chartDataSlice"; diff --git a/components/main/modules/kue705FO/Kue705FO.tsx b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx similarity index 99% rename from components/main/modules/kue705FO/Kue705FO.tsx rename to components/main/kabelueberwachung/kue705FO/Kue705FO.tsx index 89bfd9a..b75504d 100644 --- a/components/main/modules/kue705FO/Kue705FO.tsx +++ b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx @@ -19,10 +19,10 @@ import { goTDR } from "../../../../utils/goTDR"; import { loadTDRChartData } from "../../../../utils/loadTDRChartData"; import { loadLoopChartData } from "../../../../utils/loadLoopChartData"; import { Kue705FOProps } from "../../../../types/components/Kue705FOProps"; -import ChartSwitcher from "./charts/ChartSwitcher"; +import ChartSwitcher from "./Charts/ChartSwitcher"; import { setActiveMode } from "../../../../redux/slices/chartDataSlice"; -import LoopMeasurementChart from "./charts/LoopMeasurementChart/LoopMeasurementChart"; -import TDRChart from "./charts/TDRChart/TDRChart"; +import LoopMeasurementChart from "./Charts/LoopMeasurementChart/LoopMeasurementChart"; +import TDRChart from "./Charts/TDRChart/TDRChart"; const Kue705FO: React.FC = ({ isolationswert, diff --git a/components/main/modules/kue705FO/KueModal.tsx b/components/main/kabelueberwachung/kue705FO/KueModal.tsx similarity index 100% rename from components/main/modules/kue705FO/KueModal.tsx rename to components/main/kabelueberwachung/kue705FO/KueModal.tsx diff --git a/components/main/modules/kue705FO/handlers/firmwareUpdate.ts b/components/main/kabelueberwachung/kue705FO/handlers/firmwareUpdate.ts similarity index 100% rename from components/main/modules/kue705FO/handlers/firmwareUpdate.ts rename to components/main/kabelueberwachung/kue705FO/handlers/firmwareUpdate.ts diff --git a/components/main/modules/kue705FO/handlers/handleChange.ts b/components/main/kabelueberwachung/kue705FO/handlers/handleChange.ts similarity index 100% rename from components/main/modules/kue705FO/handlers/handleChange.ts rename to components/main/kabelueberwachung/kue705FO/handlers/handleChange.ts diff --git a/components/main/modules/kue705FO/handlers/handleDisplayEinschalten.ts b/components/main/kabelueberwachung/kue705FO/handlers/handleDisplayEinschalten.ts similarity index 100% rename from components/main/modules/kue705FO/handlers/handleDisplayEinschalten.ts rename to components/main/kabelueberwachung/kue705FO/handlers/handleDisplayEinschalten.ts diff --git a/components/main/modules/kue705FO/handlers/handleSave.ts b/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts similarity index 100% rename from components/main/modules/kue705FO/handlers/handleSave.ts rename to components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts diff --git a/config/webVersion.ts b/config/webVersion.ts index 4e4490c..6445a71 100644 --- a/config/webVersion.ts +++ b/config/webVersion.ts @@ -5,5 +5,5 @@ 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). */ -const webVersion = "1.6.16"; +const webVersion = "1.6.17"; export default webVersion; diff --git a/pages/analogeEingaenge.tsx b/pages/analogeEingaenge.tsx index 46bd929..04cf2fd 100644 --- a/pages/analogeEingaenge.tsx +++ b/pages/analogeEingaenge.tsx @@ -1,7 +1,7 @@ "use client"; ///pages/analogeEingaenge.tsx import React, { useState } from "react"; -import AnalogeEingaengeComponent from "../components/main/modules/AnalogeEingaengeComponent"; -import XioPM from "../components/main/modules/XioPM"; +import AnalogeEingaengeComponent from "../components/main/analogeEingaenge/AnalogeEingaengeComponent"; +import XioPM from "../components/main/analogeEingaenge/XioPM"; import { analogInputs } from "../data/mockdata/analogInputs"; import { xioPm1Inputs } from "../data/mockdata/xioPm1Inputs"; import { xioPm2Inputs } from "../data/mockdata/xioPm2Inputs"; diff --git a/pages/kabelueberwachung.tsx b/pages/kabelueberwachung.tsx index 495ece0..d53378b 100644 --- a/pages/kabelueberwachung.tsx +++ b/pages/kabelueberwachung.tsx @@ -1,7 +1,7 @@ "use client"; import React, { useState, useEffect } from "react"; import { useRouter, useSearchParams } from "next/navigation"; -import Kue705FO from "../components/main/modules/kue705FO/Kue705FO"; +import Kue705FO from "../components/main/kabelueberwachung/kue705FO/Kue705FO"; import { useDispatch, useSelector } from "react-redux"; function Kabelueberwachung() {