From 65878b8920b259608a44a31f7abaf970c45e66b7 Mon Sep 17 00:00:00 2001
From: Alex Reinhardt <alexander.reinhardt@tu-dortmund.de>
Date: Wed, 20 Dec 2023 12:32:31 +0100
Subject: [PATCH] Move 'Gremien'-Definition to Config
---
public/config/default.json | 26 +++++++++++++++++++++++++-
src/panels/Gremium/GremiumPanel.tsx | 29 +++--------------------------
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/public/config/default.json b/public/config/default.json
index 30ebfad..6eea711 100644
--- a/public/config/default.json
+++ b/public/config/default.json
@@ -41,7 +41,31 @@
"w": 16,
"h": 4
},
- "config": {}
+ "config": {
+ "gremien": [
+ {
+ "name": "FSR",
+ "description": "Fachschaftsrat",
+ "link": "https://oh14.de/fsr",
+ "time": "Mittwoch, 12:15 Uhr",
+ "location": "Chaos-Zentrum-Informatik (OH14 - E39)"
+ },
+ {
+ "name": "FOSS-AG",
+ "description": "Free and Open Source Software - AG",
+ "link": "https://foss-ag.de/",
+ "time": "Montag, 18:00 Uhr",
+ "location": "Chaos-Zentrum-Informatik (OH14 - E39)"
+ },
+ {
+ "name": "CyberSec-AG",
+ "description": "Cybersecurity - AG",
+ "link": "https://oh14.de/cybersec",
+ "time": "Donnerstag, 18:00 Uhr",
+ "location": "Chaos-Zentrum-Informatik (OH14 - E39)"
+ }
+ ]
+ }
},
{
"type": "callout",
diff --git a/src/panels/Gremium/GremiumPanel.tsx b/src/panels/Gremium/GremiumPanel.tsx
index 025fb66..265fe08 100644
--- a/src/panels/Gremium/GremiumPanel.tsx
+++ b/src/panels/Gremium/GremiumPanel.tsx
@@ -6,6 +6,7 @@ import QRCode from "react-qr-code";
import { Clock, MapPin } from '@phosphor-icons/react'
export type GremiumPanelDefinition = {
+ gremien: [Gremium]
}
type Gremium = {
@@ -16,37 +17,13 @@ type Gremium = {
location: string
}
-const gremien: Gremium[] = [
- {
- name: "FSR",
- description: "Fachschaftsrat",
- link: "https://oh14.de/fsr",
- time: "Mittwoch, 12:15 Uhr",
- location: "Chaos-Zentrum-Informatik (OH14 - E39)"
- },
- {
- name: "FOSS-AG",
- description: "Free and Open Source Software - AG",
- link: "https://foss-ag.de/",
- time: "Montag, 18:00 Uhr",
- location: "Chaos-Zentrum-Informatik (OH14 - E39)"
- },
- {
- name: "CyberSec-AG",
- description: "Cybersecurity - AG",
- link: "https://oh14.de/cybersec",
- time: "Donnerstag, 18:00 Uhr",
- location: "Chaos-Zentrum-Informatik (OH14 - E39)"
- }
-]
-
const GremiumPanel = (props: {definition: GremiumPanelDefinition}) => {
- const [gremium, setGremium] = useState<Gremium>(gremien[0]);
+ const [gremium, setGremium] = useState<Gremium>(props.definition.gremien[0]);
const cycle = useRef<number>(0);
useEffect(() => {
const update = async () => {
- setGremium(gremien[cycle.current++ % gremien.length]);
+ setGremium(props.definition.gremien[cycle.current++ % props.definition.gremien.length]);
console.log(gremium);
console.log(cycle.current);
}
--
GitLab