Compare revisions

7a8184cf · 91185887 · 150a193d · 2e2c327a · 6533cd44 · d961bd3d
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 image: alpine:latest
+stages:
+  - qa
+  - build
+sonarqube-check:
+  stage: qa
+  image:
+    name: sonarsource/sonar-scanner-cli:latest
+    entrypoint: [""]
+  variables:
+    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
+    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+      - .sonar/cache
+  script:
+    - sonar-scanner
+  allow_failure: true
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
 pages:
-  stage: deploy
+  image: node:20-alpine
+  stage: build
  script:
-  - mkdir public
+    - npm install
-  - mv js public/js
+    - npm run build
-  - mv css public/css
+    - rm -rf public
-  - mv panels public/panels
+    - mkdir public
-  - mv config public/config
+    - mv build/* public
-  - mv index.html public/index.html
-  - mv favicon.png public/favicon.png 
  artifacts:
    paths:
-    - public/
+      - public/
  only:
-  - master
+    - master
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ProjectRootManager">
    <output url="file://$PROJECT_DIR$/out" />

--- a/README.md
+++ b/README.md
@@ -2,9 +2,16 @@
 This is a rewrite of the Infoscreen. It aims to make it less bad.
+## Quality
+To ensure code quality, this repo is automatically evaluated by a SonarQube instance.
+[![Quality gate](https://sonarqube.upi.li/api/project_badges/quality_gate?project=Fachschaft-Informatik-Infoscreen&token=sqb_1e0e28d3a4ad3e243d0ee76c6dc33d6694d261a2)](https://sonarqube.upi.li/dashboard?id=Fachschaft-Informatik-Infoscreen)
 ## Test
+Before running the appliction for the first time you have to install all dependencies using `npm install`
-This Website can be run locally for testing purposes with `python3 -m http.server` or any other HTTP Server
+This Website can be run locally for testing purposes with `npm run start`.
 ## Adding Ads

--- a/favicon.png
+++ b/favicon.png
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
+    "@phosphor-icons/react": "^2.0.15",
    "@testing-library/jest-dom": "^5.16.5",
    "@testing-library/react": "^13.4.0",
    "@testing-library/user-event": "^13.5.0",
@@ -10,11 +11,15 @@
    "@types/node": "^16.18.36",
    "@types/react": "^18.2.13",
    "@types/react-dom": "^18.2.6",
-    "framer-motion": "^10.12.22",
+    "framer-motion": "^10.16.16",
+    "ical.js": "^2.1.0",
    "javascript-time-ago": "^2.5.9",
+    "openmeteo": "^1.1.3",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
-    "react-scripts": "5.0.1",
+    "react-error-boundary": "^4.0.11",
+    "react-qr-code": "^2.0.12",
+    "react-scripts": "^5.0.1",
    "typescript": "^4.9.5",
    "web-vitals": "^2.1.4"
  },

--- a/public/activeConfigs.json
+++ b/public/activeConfigs.json
 [
-  "config/default.json",
+  "config/foobar.json",
-  "config/foobar.json"
+  "config/ophase.json",
+  "config/fvv.json",
+  "config/default.json"
 ]
--- a/public/config/default.json
+++ b/public/config/default.json
 {
-  "priority": 0,
+  "id": "default",
  "schedule": {
    "always": true
  },
-  "layout": {
+  "panels": [
-    "type": "xsplit",
+    {
-    "cut": 35,
+      "type": "fahrplan",
-    "left": {
+      "position": {
-      "type": "panel",
+        "x": 0,
-      "name": "departure",
+        "y": 0,
-      "config": "oh14"
+        "w": 9,
+        "h": 9
+      },
+      "config": {
+        "stops": [
+          "Dortmund Universität S",
+          "Dortmund Meitnerweg",
+          "Dortmund/Joseph Fraunhofer"
+        ],
+        "filter": {
+          "types": ["H-Bahn"],
+          "destination": ["Dortmund Otto-Hahn-Straße"]
+        }
+      }
+    },
+    {
+      "type": "nextbike",
+      "position": {
+        "x": 0,
+        "y": 9,
+        "w": 9,
+        "h": 4
+      },
+      "config": {
+        "city": 129,
+        "station_ids": [7361, 7369, 7333, 7386],
+        "station_names": [
+          "Otto-Hahn-Str. (OH14)",
+          "SRG",
+          "Technologiepark (H-Bahn)",
+          "Meitnerweg"
+        ]
+      }
+    },
+    {
+      "type": "termine",
+      "position": {
+        "x": 9,
+        "y": 0,
+        "w": 16,
+        "h": 3
+      },
+      "config": {
+        "calendars": [
+          {
+            "calendar_name": "FOSS-AG",
+            "url": "http://foss-ag.de",
+            "webcal_url": "/remote.php/dav/public-calendars/NQLSNyyW3D4YW5iC/?export"
+          },
+          {
+            "calendar_name": "Fachschaft",
+            "url": "https://cloud.fachschaften.org/apps/calendar/p/XFBG6b9Xwp9s2EzK",
+            "webcal_url": "/remote.php/dav/public-calendars/XFBG6b9Xwp9s2EzK/?export"
+          },
+          {
+            "calendar_name": "Kolloquium",
+            "url": "https://kolloquium.cs.tu-dortmund.de",
+            "webcal_url": "/kolloquium?tx_ftbuniversitycolloquium_colloquium%5Baction%5D=vCalendar&tx_ftbuniversitycolloquium_colloquium%5Bcontroller%5D=Series&tx_ftbuniversitycolloquium_colloquium%5Bseries%5D=1&type=119&cHash=1febbc21e3cf82eb5f597ad0dc8b5a4a"
+          }
+        ],
+        "days": 7
+      }
+    },
+    {
+      "type": "wetter",
+      "position": {
+        "x": 9,
+        "y": 3,
+        "w": 8,
+        "h": 2
+      },
+      "config": {
+        "latitude": 51.4897872,
+        "longitude": 7.4033162
+      }
+    },
+    {
+      "type": "mensa-jetzt",
+      "position": {
+        "x": 17,
+        "y": 3,
+        "w": 8,
+        "h": 2
+      }
    },
-    "right": {
+    {
-      "type": "ysplit",
+      "type": "mensaplan",
-      "cut": 30,
+      "position": {
-      "up": {
+        "x": 9,
-        "type": "panel",
+        "y": 5,
-        "name": "clock"
+        "w": 16,
+        "h": 8
      },
-      "down":	{
+      "config": {
-        "type": "panel",
+        "canteenId": 341,
-        "name": "mensaPlan"
+        "closingTime": {
+          "hours": 14,
+          "minutes": 15
+        }
      }
    }
-  }
+  ]
 }
--- a/public/config/foobar.json
+++ b/public/config/foobar.json
 {
-  "priority": 1,
+  "id": "foobar",
+  "background": "/content/preisliste.png",
  "schedule": {
-    "time": [
+    "times": [
      {
-        "from": "26.06.2023"
+        "from": "2024-12-10T18:00",
+        "to": "2024-12-10T22:00"
+      },
+      {
+        "from": "2025-01-07T18:00",
+        "to": "2025-01-07T22:00"
+      },
+      {
+        "from": "2025-01-21T18:00",
+        "to": "2025-01-21T22:00"
      }
    ]
  },
-  "layout": {
+  "panels": []
-    "type": "xsplit",
-    "cut": 35,
-    "left": {
-      "type": "panel",
-      "name": "departure",
-      "config": "oh14"
-    },
-    "right": {
-      "type": "ysplit",
-      "cut": 30,
-      "up": {
-        "type": "panel",
-        "name": "clock"
-      },
-      "down":	{
-        "type": "panel",
-        "name": "mensaPlan"
-      }
-    }
-  }
 }
--- a/public/config/fvv.json
+++ b/public/config/fvv.json
+{
+  "id": "fvv",
+  "schedule": {
+    "times": [
+      {
+        "from": "2024-01-29T08:00",
+        "to": "2024-01-31T18:00"
+      }
+    ]
+  },
+  "panels": [
+    {
+      "type": "fahrplan",
+      "position": {
+        "x": 0,
+        "y": 0,
+        "w": 9,
+        "h": 13
+      },
+      "config": {
+        "stops": [
+          "Dortmund Universität S",
+          "Dortmund Meitnerweg",
+          "Dortmund/Joseph Fraunhofer"
+        ],
+        "filter": {
+          "types": [
+            "H-Bahn"
+          ],
+          "destination": [
+            "Dortmund Otto-Hahn-Straße"
+          ]
+        }
+      }
+    },
+    {
+      "type": "bild",
+      "position": {
+        "x": 9,
+        "y": 0,
+        "w": 16,
+        "h": 5
+      },
+      "config": {
+        "url": "/content/2024-1-fvv.png"
+      }
+    },
+    {
+      "type": "callout",
+      "position": {
+        "x": 9,
+        "y": 5,
+        "w": 16,
+        "h": 2
+      },
+      "config": {
+        "type": "warning",
+        "title": "Achtung, Testbetrieb",
+        "description": "Der neue Infoscreen ist da! Bitte melde Fehler an die Admins unter root@oh14.de."
+      }
+    },
+    {
+      "type": "mensaplan",
+      "position": {
+        "x": 9,
+        "y": 7,
+        "w": 16,
+        "h": 6
+      },
+      "config": {
+        "canteenId": 341,
+        "closingTime": {
+          "hours": 14,
+          "minutes": 15
+        }
+      }
+    }
+  ]
+}
--- a/public/config/karaoke-testbetrieb.json
+++ b/public/config/karaoke-testbetrieb.json
+{
+  "id": "karaoke-testbetrieb",
+  "schedule": {
+    "times": [
+      {
+        "from": "2023-12-12T22:00",
+        "to": "2023-12-19T22:00"
+      }
+    ]
+  },
+  "panels": [
+    {
+      "type": "fahrplan",
+      "position": {
+        "x": 0,
+        "y": 0,
+        "w": 9,
+        "h": 13
+      },
+      "config": {
+        "stops": [
+          "Dortmund Universität S",
+          "Dortmund Meitnerweg",
+          "Dortmund/Joseph Fraunhofer"
+        ],
+        "filter": {
+          "types": [
+            "H-Bahn"
+          ],
+          "destination": [
+            "Dortmund Otto-Hahn-Straße"
+          ]
+        }
+      }
+    },
+    {
+      "type": "bild",
+      "position": {
+        "x": 9,
+        "y": 0,
+        "w": 16,
+        "h": 5
+      },
+      "config": {
+        "url": "/content/karaoke.png",
+        "title": "Weihnachts-Karaoke am 19.12.",
+        "description": "Wir laden euch herzlich zur unvergesslichen Weihnachtskaraoke am 19.12. um 18 Uhr in der Otto-Hahn-Straße 14 ein! Lasst uns gemeinsam festliche Lieder singen und die Vorfreude auf das Fest genießen! Bringt eure Freunde mit!"
+      }
+    },
+    {
+      "type": "callout",
+      "position": {
+        "x": 9,
+        "y": 5,
+        "w": 16,
+        "h": 2
+      },
+      "config": {
+        "type": "warning",
+        "title": "Achtung, Testbetrieb",
+        "description": "Der neue Infoscreen ist da! Bitte melde Fehler an die Admins unter root@oh14.de."
+      }
+    },
+    {
+      "type": "mensaplan",
+      "position": {
+        "x": 9,
+        "y": 7,
+        "w": 16,
+        "h": 6
+      },
+      "config": {
+        "canteenId": 341,
+        "closingTime": {
+          "hours": 14,
+          "minutes": 15
+        }
+      }
+    }
+  ]
+}
--- a/public/config/ophase-teamer-testbetrieb.json
+++ b/public/config/ophase-teamer-testbetrieb.json
+{
+  "id": "ophase-teamer-testbetrieb",
+  "schedule": {
+    "times": [
+      {
+        "from": "2024-01-24T15:00",
+        "to": "2024-02-02T18:00"
+      }
+    ]
+  },
+  "panels": [
+    {
+      "type": "fahrplan",
+      "position": {
+        "x": 0,
+        "y": 0,
+        "w": 9,
+        "h": 13
+      },
+      "config": {
+        "stops": [
+          "Dortmund Universität S",
+          "Dortmund Meitnerweg",
+          "Dortmund/Joseph Fraunhofer"
+        ],
+        "filter": {
+          "types": [
+            "H-Bahn"
+          ],
+          "destination": [
+            "Dortmund Otto-Hahn-Straße"
+          ]
+        }
+      }
+    },
+    {
+      "type": "bild",
+      "position": {
+        "x": 9,
+        "y": 0,
+        "w": 16,
+        "h": 5
+      },
+      "config": {
+        "url": "/content/ophase-teamer-temp.png",
+        "title": "Teamende Gesucht!",
+        "description": "In der Woche vom 1.4. bis zum 5.4. findet die Sommer-O-Phase statt. Wenn auch du neuen Studierenden die Uni zeigen und den Studienstart erleichtern willst, melde dich jetzt als Teamer:in an. Weitere Infos findest du auf tix.oh14.de/sose24team.",
+        "gradient": false
+      }
+    },
+    {
+      "type": "callout",
+      "position": {
+        "x": 9,
+        "y": 5,
+        "w": 16,
+        "h": 2
+      },
+      "config": {
+        "type": "warning",
+        "title": "Achtung, Testbetrieb",
+        "description": "Der neue Infoscreen ist da! Bitte melde Fehler an die Admins unter root@oh14.de."
+      }
+    },
+    {
+      "type": "mensaplan",
+      "position": {
+        "x": 9,
+        "y": 7,
+        "w": 16,
+        "h": 6
+      },
+      "config": {
+        "canteenId": 341,
+        "closingTime": {
+          "hours": 14,
+          "minutes": 15
+        }
+      }
+    }
+  ]
+}
--- a/public/config/ophase.json
+++ b/public/config/ophase.json
+{
+  "id": "ophase",
+  "schedule": {
+    "times": [
+      {
+        "from": "2024-03-23T10:00",
+        "to": "2024-03-24T22:00"
+      }
+    ]
+  },
+  "panels": [
+    {
+      "type": "fahrplan",
+      "position": {
+        "x": 0,
+        "y": 0,
+        "w": 9,
+        "h": 13
+      },
+      "config": {
+        "stops": [
+          "Dortmund Universität S",
+          "Dortmund Meitnerweg",
+          "Dortmund/Joseph Fraunhofer"
+        ],
+        "filter": {
+          "types": [
+            "H-Bahn"
+          ],
+          "destination": [
+            "Dortmund Otto-Hahn-Straße"
+          ]
+        }
+      }
+    },
+    {
+      "type": "bild",
+      "position": {
+        "x": 9,
+        "y": 0,
+        "w": 16,
+        "h": 5
+      },
+      "config": {
+        "url": "/content/SpiderMan-Infoscreen.png",
+        "gradient": false
+      }
+    },
+    {
+      "type": "mensaplan",
+      "position": {
+        "x": 9,
+        "y": 5,
+        "w": 16,
+        "h": 8
+      },
+      "config": {
+        "canteenId": 341,
+        "closingTime": {
+          "hours": 14,
+          "minutes": 15
+        }
+      }
+    }
+  ]
+}
--- a/public/content/2024-1-fvv.png
+++ b/public/content/2024-1-fvv.png
--- a/public/content/SpiderMan-Infoscreen.png
+++ b/public/content/SpiderMan-Infoscreen.png
--- a/public/content/karaoke.png
+++ b/public/content/karaoke.png
--- a/public/content/neujahr.jpg
+++ b/public/content/neujahr.jpg
--- a/public/content/ophase-teamer-temp.png
+++ b/public/content/ophase-teamer-temp.png
--- a/public/content/preisliste.png
+++ b/public/content/preisliste.png
--- a/public/content/warning.png
+++ b/public/content/warning.png
No results found