Compare revisions

Niklas Schrötler · Niklas Schrötler · Niklas Schrötler · Niklas Schrötler · Niklas Schrötler · Niklas Schrötler
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ image: alpine:latest
 stages:
  - qa
  - build
-  - deploy

 sonarqube-check:
  stage: qa
@@ -23,24 +22,17 @@ sonarqube-check:
  rules:
    - if: $CI_COMMIT_BRANCH == 'master'

-build:
-  image: node:14.15.3-buster-slim
+pages:
+  image: node:20-alpine
  stage: build
  script:
    - npm install
    - npm run build
-  artifacts:
-    paths:
-      - build/
-
-pages:
-  stage: deploy
-  script:
    - rm -rf public
    - mkdir public
-    - mv build public
+    - mv build/* public
  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
@@ -9,8 +9,9 @@ To ensure code quality, this repo is automatically evaluated by a SonarQube inst
 [![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
@@ -11,12 +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-error-boundary": "^4.0.11",
-    "react-scripts": "5.0.1",
+    "react-qr-code": "^2.0.12",
+    "react-scripts": "^5.0.1",
    "typescript": "^4.9.5",
    "web-vitals": "^2.1.4"
  },
@@ -46,6 +49,5 @@
  },
  "devDependencies": {
    "tailwindcss": "^3.3.2"
-  },
-  "homepage": "https://niklasschroetler.fspages.org/infoscreen"
+  }
 }
--- a/public/activeConfigs.json
+++ b/public/activeConfigs.json
 [
  "config/foobar.json",
+  "config/ophase.json",
+  "config/fvv.json",
  "config/default.json"
 ]
--- a/public/config/default.json
+++ b/public/config/default.json
@@ -10,52 +10,86 @@
        "x": 0,
        "y": 0,
        "w": 9,
-        "h": 13
+        "h": 9
      },
      "config": {
        "stops": [
          "Dortmund Universität S",
-          "Dortmund Joseph von Fraunhofer",
-          "Dortmund Meitnerweg"
+          "Dortmund Meitnerweg",
+          "Dortmund/Joseph Fraunhofer"
        ],
        "filter": {
-          "type": [
-            "H-Bahn"
-          ],
-          "destination": [
-            "Dortmund Otto-Hahn-Straße"
-          ]
+          "types": ["H-Bahn"],
+          "destination": ["Dortmund Otto-Hahn-Straße"]
        }
      }
    },
    {
-      "type": "bild",
+      "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": 5
+        "h": 3
      },
      "config": {
-        "url": "/infoscreen/content/warning.png",
-        "title": "Achtung, Testbetrieb",
-        "description": "Wie du vielleicht siehst, sieht dieser Bildschirm heute anders aus. Darf ich vorstellen: Der neue Infoscreen. Bitte beachte allerdings, dass wir gerade einen Testbetrieb machen. Bitte melde daher Fehler und auch sonstige Wünsche an Niklas unter @niklasschroetler:chat.upi.li oder niklas.schroetler@tu-dortmund.de"
+        "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": "placeholder",
+      "type": "wetter",
      "position": {
        "x": 9,
-        "y": 5,
+        "y": 3,
        "w": 8,
        "h": 2
+      },
+      "config": {
+        "latitude": 51.4897872,
+        "longitude": 7.4033162
      }
    },
    {
-      "type": "placeholder",
+      "type": "mensa-jetzt",
      "position": {
        "x": 17,
-        "y": 5,
+        "y": 3,
        "w": 8,
        "h": 2
      }
@@ -64,9 +98,9 @@
      "type": "mensaplan",
      "position": {
        "x": 9,
-        "y": 7,
+        "y": 5,
        "w": 16,
-        "h": 6
+        "h": 8
      },
      "config": {
        "canteenId": 341,

--- a/public/config/foobar.json
+++ b/public/config/foobar.json
 {
  "id": "foobar",
-  "background": "/infoscreen/content/preisliste.png",
+  "background": "/content/preisliste.png",
  "schedule": {
    "times": [
      {
-        "from": "2023-11-25T17:30",
-        "to": "2023-11-25T17:31"
+        "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"
      }
    ]
  },

--- 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/fonts/inter/inter-v13-latin-200.woff2
+++ b/public/fonts/inter/inter-v13-latin-200.woff2
--- a/public/fonts/inter/inter-v13-latin-300.woff2
+++ b/public/fonts/inter/inter-v13-latin-300.woff2
No results found