From 9c14d541a336652477863a7b1930c47ccdb9d99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Schr=C3=B6tler?= <niklas@allround.digital> Date: Mon, 27 Nov 2023 01:27:05 +0100 Subject: [PATCH] Restructured panels folder --- src/App.tsx | 2 +- src/panels/{Bild.tsx => Bild/BildPanel.tsx} | 6 +++--- src/panels/{Error.tsx => Error/ErrorPanel.tsx} | 2 +- src/panels/{Mensaplan.tsx => Mensaplan/MensaplanPanel.tsx} | 4 ++-- src/panels/{Uhr.tsx => Uhr/UhrPanel.tsx} | 4 ++-- src/panels/_Panels.tsx | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename src/panels/{Bild.tsx => Bild/BildPanel.tsx} (91%) rename src/panels/{Error.tsx => Error/ErrorPanel.tsx} (85%) rename src/panels/{Mensaplan.tsx => Mensaplan/MensaplanPanel.tsx} (57%) rename src/panels/{Uhr.tsx => Uhr/UhrPanel.tsx} (61%) diff --git a/src/App.tsx b/src/App.tsx index d7fb4f4..d70a873 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -4,8 +4,8 @@ import ScreenWrapper from "./meta/ScreenWrapper"; import useLayout from "./hooks/useLayout"; import {PanelRenderers} from "./panels/_Panels"; import LayoutElement from "./layout/LayoutElement"; -import ErrorPanel from "./panels/Error"; import {ErrorBoundary} from "react-error-boundary"; +import ErrorPanel from "./panels/Error/ErrorPanel"; function App() { const layout = useLayout(); diff --git a/src/panels/Bild.tsx b/src/panels/Bild/BildPanel.tsx similarity index 91% rename from src/panels/Bild.tsx rename to src/panels/Bild/BildPanel.tsx index f8db8b2..607eba5 100644 --- a/src/panels/Bild.tsx +++ b/src/panels/Bild/BildPanel.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import PanelWrapper from "../meta/PanelWrapper"; -import classNames from "../util/classNames"; -import PanelContent from "../meta/PanelContent"; +import PanelWrapper from "../../meta/PanelWrapper"; +import classNames from "../../util/classNames"; +import PanelContent from "../../meta/PanelContent"; export type BildPanelDefinition = { url: string, diff --git a/src/panels/Error.tsx b/src/panels/Error/ErrorPanel.tsx similarity index 85% rename from src/panels/Error.tsx rename to src/panels/Error/ErrorPanel.tsx index f1a931e..bc0db9c 100644 --- a/src/panels/Error.tsx +++ b/src/panels/Error/ErrorPanel.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import PanelWrapper from "../meta/PanelWrapper"; +import PanelWrapper from "../../meta/PanelWrapper"; const ErrorPanel = (props: {message?: string}) => { const message = props.message ?? "Failed to render Panel"; diff --git a/src/panels/Mensaplan.tsx b/src/panels/Mensaplan/MensaplanPanel.tsx similarity index 57% rename from src/panels/Mensaplan.tsx rename to src/panels/Mensaplan/MensaplanPanel.tsx index 5be7012..af581a5 100644 --- a/src/panels/Mensaplan.tsx +++ b/src/panels/Mensaplan/MensaplanPanel.tsx @@ -1,6 +1,6 @@ import React from 'react'; -const Mensaplan = () => { +const MensaplanPanel = () => { return ( <div> Mensaplan @@ -8,4 +8,4 @@ const Mensaplan = () => { ); }; -export default Mensaplan; +export default MensaplanPanel; diff --git a/src/panels/Uhr.tsx b/src/panels/Uhr/UhrPanel.tsx similarity index 61% rename from src/panels/Uhr.tsx rename to src/panels/Uhr/UhrPanel.tsx index 64b30ba..6d30695 100644 --- a/src/panels/Uhr.tsx +++ b/src/panels/Uhr/UhrPanel.tsx @@ -1,6 +1,6 @@ import React from 'react'; -const Uhr = () => { +const UhrPanel = () => { return ( <div> Uhr @@ -8,4 +8,4 @@ const Uhr = () => { ); }; -export default Uhr; +export default UhrPanel; diff --git a/src/panels/_Panels.tsx b/src/panels/_Panels.tsx index e030ce0..ec12086 100644 --- a/src/panels/_Panels.tsx +++ b/src/panels/_Panels.tsx @@ -6,8 +6,8 @@ import React from "react"; import FahrplanPanel from "./Fahrplan/FahrplanPanel"; import {PanelDefinition} from "../types/LayoutConfig"; -import BildPanel from "./Bild"; import PanelWrapper from "../meta/PanelWrapper"; +import BildPanel from "./Bild/BildPanel"; /* * First, please claim a unique id for your panel here. Convention is that it is all lowercase, in snake-case to be -- GitLab