From 3480efa754982d6c413c5dde14a1cc3ee8550fd9 Mon Sep 17 00:00:00 2001 From: ISA Date: Thu, 13 Feb 2025 15:28:35 +0100 Subject: [PATCH] =?UTF-8?q?Struktur=20f=C3=BCr=20components/main=20verbess?= =?UTF-8?q?ert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/Kue705FO.test.tsx | 2 +- .../modules/AnalogeEingaengeComponent.tsx | 2 +- components/{ => main}/modules/XioPM.tsx | 0 .../{ => main}/modules/kue705FO/Kue705FO.tsx | 24 +++++++++---------- .../{ => main}/modules/kue705FO/KueModal.tsx | 12 +++++----- .../modules/kue705FO/charts/ChartSwitcher.tsx | 0 .../kue705FO/charts/DateRangePicker.tsx | 0 .../LoopChartActionBar.tsx | 2 +- .../LoopMeasurementChart.tsx | 0 .../kue705FO/charts/TDRChart/TDRChart.tsx | 0 .../charts/TDRChart/TDRChartActionBar.tsx | 2 +- .../kue705FO/handlers/firmwareUpdate.ts | 0 .../modules/kue705FO/handlers/handleChange.ts | 0 .../handlers/handleDisplayEinschalten.ts | 0 .../modules/kue705FO/handlers/handleSave.ts | 0 config/webVersion.ts | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) rename components/{ => main}/modules/AnalogeEingaengeComponent.tsx (97%) rename components/{ => main}/modules/XioPM.tsx (100%) rename components/{ => main}/modules/kue705FO/Kue705FO.tsx (95%) rename components/{ => main}/modules/kue705FO/KueModal.tsx (95%) rename components/{ => main}/modules/kue705FO/charts/ChartSwitcher.tsx (100%) rename components/{ => main}/modules/kue705FO/charts/DateRangePicker.tsx (100%) rename components/{ => main}/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx (94%) rename components/{ => main}/modules/kue705FO/charts/LoopMeasurementChart/LoopMeasurementChart.tsx (100%) rename components/{ => main}/modules/kue705FO/charts/TDRChart/TDRChart.tsx (100%) rename components/{ => main}/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx (93%) rename components/{ => main}/modules/kue705FO/handlers/firmwareUpdate.ts (100%) rename components/{ => main}/modules/kue705FO/handlers/handleChange.ts (100%) rename components/{ => main}/modules/kue705FO/handlers/handleDisplayEinschalten.ts (100%) rename components/{ => main}/modules/kue705FO/handlers/handleSave.ts (100%) diff --git a/__tests__/components/modules/Kue705FO.test.tsx b/__tests__/components/modules/Kue705FO.test.tsx index 00f9f89..bb8e98b 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/modules/kue705FO/Kue705FO"; +import Kue705FO from "../../../components/main/modules/kue705FO/Kue705FO"; // Mocks für externe Abhängigkeiten jest.mock("chart.js/auto", () => ({ diff --git a/components/modules/AnalogeEingaengeComponent.tsx b/components/main/modules/AnalogeEingaengeComponent.tsx similarity index 97% rename from components/modules/AnalogeEingaengeComponent.tsx rename to components/main/modules/AnalogeEingaengeComponent.tsx index 9a1e591..1e555ba 100644 --- a/components/modules/AnalogeEingaengeComponent.tsx +++ b/components/main/modules/AnalogeEingaengeComponent.tsx @@ -1,7 +1,7 @@ "use client"; // components/modules/AnalogeEingaengeComponent.tsx import React, { useState } from "react"; import { Icon } from "@iconify/react"; -import { analogInputs } from "../../data/mockdata/analogInputs"; +import { analogInputs } from "../../../data/mockdata/analogInputs"; const AnalogeEingaengeComponent = () => { const [activeConfig, setActiveConfig] = useState(null); diff --git a/components/modules/XioPM.tsx b/components/main/modules/XioPM.tsx similarity index 100% rename from components/modules/XioPM.tsx rename to components/main/modules/XioPM.tsx diff --git a/components/modules/kue705FO/Kue705FO.tsx b/components/main/modules/kue705FO/Kue705FO.tsx similarity index 95% rename from components/modules/kue705FO/Kue705FO.tsx rename to components/main/modules/kue705FO/Kue705FO.tsx index 86789b0..2ff3e7e 100644 --- a/components/modules/kue705FO/Kue705FO.tsx +++ b/components/main/modules/kue705FO/Kue705FO.tsx @@ -5,22 +5,22 @@ import Chart from "chart.js/auto"; import { useSelector } from "react-redux"; import KueModal from "./KueModal"; import "bootstrap-icons/font/bootstrap-icons.css"; // Import Bootstrap Icons -import { RootState } from "../../../redux/store"; -import { DataTDR } from "../../../redux/types/chartDataTypesTDR"; +import { RootState } from "../../../../redux/store"; +import { DataTDR } from "../../../../redux/types/chartDataTypesTDR"; import { useDispatch } from "react-redux"; import { setSelectedChartData, setSelectedFileName, -} from "../../../redux/slices/variablesSlice"; -import { createLoopChart, createTDRChart } from "../../../utils/chartUtils"; -import { getAlarmDisplayText } from "../../../utils/alarmUtils"; -import { goLoop } from "../../../utils/goLoop"; -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 { setActiveMode } from "../../../redux/slices/chartDataSlice"; +} from "../../../../redux/slices/variablesSlice"; +import { createLoopChart, createTDRChart } from "../../../../utils/chartUtils"; +import { getAlarmDisplayText } from "../../../../utils/alarmUtils"; +import { goLoop } from "../../../../utils/goLoop"; +import { goTDR } from "../../../../utils/goTDR"; +import { loadTDRChartData } from "../../../../utils/loadTDRChartData"; +import { loadLoopChartData } from "../../../../utils/loadLoopChartData"; +import { Kue705FOProps } from "../../../../types/components/Kue705FOProps"; +import ChartSwitcher from "../../../modules/kue705FO/charts/ChartSwitcher"; +import { setActiveMode } from "../../../../redux/slices/chartDataSlice"; import LoopMeasurementChart from "./charts/LoopMeasurementChart/LoopMeasurementChart"; import TDRChart from "./charts/TDRChart/TDRChart"; diff --git a/components/modules/kue705FO/KueModal.tsx b/components/main/modules/kue705FO/KueModal.tsx similarity index 95% rename from components/modules/kue705FO/KueModal.tsx rename to components/main/modules/kue705FO/KueModal.tsx index f468e00..0816287 100644 --- a/components/modules/kue705FO/KueModal.tsx +++ b/components/main/modules/kue705FO/KueModal.tsx @@ -2,15 +2,15 @@ import ReactModal from "react-modal"; import { useState, useEffect } from "react"; import { useSelector, useDispatch } from "react-redux"; -import { setVariables } from "../../../redux/slices/variablesSlice"; +import { setVariables } from "../../../../redux/slices/variablesSlice"; import "bootstrap-icons/font/bootstrap-icons.css"; // Import Bootstrap Icons import handleSave, { OriginalValues, -} from "../../modules/kue705FO/handlers/handleSave"; -import handleDisplayEinschalten from "../../modules/kue705FO/handlers/handleDisplayEinschalten"; -import handleChange from "../../modules/kue705FO/handlers/handleChange"; -import firmwareUpdate from "../../modules/kue705FO/handlers/firmwareUpdate"; -import decodeToken from "../../../utils/decodeToken"; +} from "../../../modules/kue705FO/handlers/handleSave"; +import handleDisplayEinschalten from "./handlers/handleDisplayEinschalten"; +import handleChange from "./handlers/handleChange"; +import firmwareUpdate from "./handlers/firmwareUpdate"; +import decodeToken from "../../../../utils/decodeToken"; // Props-Typen definieren interface KueModalProps { showModal: boolean; diff --git a/components/modules/kue705FO/charts/ChartSwitcher.tsx b/components/main/modules/kue705FO/charts/ChartSwitcher.tsx similarity index 100% rename from components/modules/kue705FO/charts/ChartSwitcher.tsx rename to components/main/modules/kue705FO/charts/ChartSwitcher.tsx diff --git a/components/modules/kue705FO/charts/DateRangePicker.tsx b/components/main/modules/kue705FO/charts/DateRangePicker.tsx similarity index 100% rename from components/modules/kue705FO/charts/DateRangePicker.tsx rename to components/main/modules/kue705FO/charts/DateRangePicker.tsx diff --git a/components/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx b/components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx similarity index 94% rename from components/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx rename to components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx index 177ec5c..894679c 100644 --- a/components/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx +++ b/components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopChartActionBar.tsx @@ -3,7 +3,7 @@ import React, { useState } from "react"; import DateRangePicker from "../DateRangePicker"; import LoopMeasurementChart from "./LoopMeasurementChart"; import { useDispatch } from "react-redux"; -import { setChartData } from "../../../../../redux/slices/chartDataSlice"; +import { setChartData } from "../../../../../../redux/slices/chartDataSlice"; const LoopChartActionBar: React.FC = () => { const dispatch = useDispatch(); diff --git a/components/modules/kue705FO/charts/LoopMeasurementChart/LoopMeasurementChart.tsx b/components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopMeasurementChart.tsx similarity index 100% rename from components/modules/kue705FO/charts/LoopMeasurementChart/LoopMeasurementChart.tsx rename to components/main/modules/kue705FO/charts/LoopMeasurementChart/LoopMeasurementChart.tsx diff --git a/components/modules/kue705FO/charts/TDRChart/TDRChart.tsx b/components/main/modules/kue705FO/charts/TDRChart/TDRChart.tsx similarity index 100% rename from components/modules/kue705FO/charts/TDRChart/TDRChart.tsx rename to components/main/modules/kue705FO/charts/TDRChart/TDRChart.tsx diff --git a/components/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx b/components/main/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx similarity index 93% rename from components/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx rename to components/main/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx index a42241e..b29037b 100644 --- a/components/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx +++ b/components/main/modules/kue705FO/charts/TDRChart/TDRChartActionBar.tsx @@ -3,7 +3,7 @@ import React, { useState } from "react"; import DateRangePicker from "../DateRangePicker"; import TDRChart from "./TDRChart"; import { useDispatch } from "react-redux"; -import { setChartData } from "../../../../../redux/slices/chartDataSlice"; +import { setChartData } from "../../../../../../redux/slices/chartDataSlice"; const TDRChartActionBar: React.FC = () => { const dispatch = useDispatch(); diff --git a/components/modules/kue705FO/handlers/firmwareUpdate.ts b/components/main/modules/kue705FO/handlers/firmwareUpdate.ts similarity index 100% rename from components/modules/kue705FO/handlers/firmwareUpdate.ts rename to components/main/modules/kue705FO/handlers/firmwareUpdate.ts diff --git a/components/modules/kue705FO/handlers/handleChange.ts b/components/main/modules/kue705FO/handlers/handleChange.ts similarity index 100% rename from components/modules/kue705FO/handlers/handleChange.ts rename to components/main/modules/kue705FO/handlers/handleChange.ts diff --git a/components/modules/kue705FO/handlers/handleDisplayEinschalten.ts b/components/main/modules/kue705FO/handlers/handleDisplayEinschalten.ts similarity index 100% rename from components/modules/kue705FO/handlers/handleDisplayEinschalten.ts rename to components/main/modules/kue705FO/handlers/handleDisplayEinschalten.ts diff --git a/components/modules/kue705FO/handlers/handleSave.ts b/components/main/modules/kue705FO/handlers/handleSave.ts similarity index 100% rename from components/modules/kue705FO/handlers/handleSave.ts rename to components/main/modules/kue705FO/handlers/handleSave.ts diff --git a/config/webVersion.ts b/config/webVersion.ts index 28de84b..a111ffe 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.14"; +const webVersion = "1.6.15"; export default webVersion;