Merge remote-tracking branch 'origin' into 3-semi-offline-room-finder

docker-compose.yml

@@ -14,8 +14,6 @@
 #You should have received a copy of the GNU Affero General Public License
 #along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-version: "3.9"
-
 services:
   htwkalender-backend:
     build:

frontend/package.json

@@ -13,42 +13,46 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@fullcalendar/core": "^6.1.11",
-    "@fullcalendar/daygrid": "^6.1.11",
-    "@fullcalendar/interaction": "^6.1.11",
-    "@fullcalendar/timegrid": "^6.1.11",
-    "@fullcalendar/vue3": "^6.1.11",
-    "@tanstack/vue-query": "^5.28.9",
-    "@tanstack/vue-query-devtools": "^5.28.10",
+    "@fullcalendar/core": "^6.1.13",
+    "@fullcalendar/daygrid": "^6.1.13",
+    "@fullcalendar/icalendar": "^6.1.13",
+    "@fullcalendar/interaction": "^6.1.13",
+    "@fullcalendar/timegrid": "^6.1.13",
+    "@fullcalendar/vue3": "^6.1.13",
+    "@tanstack/vue-query": "^5.37.1",
+    "@tanstack/vue-query-devtools": "^5.37.1",
+    "@types/ical": "^0.8.3",
     "@vueuse/core": "^10.9.0",
     "bson": "^5.5.1",
     "country-flag-emoji-polyfill": "^0.1.8",
     "date-fns": "^3.6.0",
     "date-fns-tz": "^3.1.3",
+    "ical.js": "^1.5.0",
     "pinia": "^2.1.7",
+    "pinia-plugin-persistedstate": "^3.2.1",
     "primeflex": "^3.3.1",
     "primeicons": "^6.0.1",
-    "primevue": "^3.50.0",
+    "primevue": "^3.52.0",
     "source-sans": "^3.46.0",
     "vue": "^3.4.11",
-    "vue-i18n": "^9.10.2",
-    "vue-router": "^4.3.0"
+    "vue-i18n": "^9.13.1",
+    "vue-router": "^4.3.2"
   },
   "devDependencies": {
-    "@types/node": "^20.12.2",
+    "@types/node": "^20.12.12",
+    "@vitejs/plugin-basic-ssl": "^1.1.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vue/eslint-config-typescript": "^12.0.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-vue": "^9.24.0",
+    "eslint-plugin-vue": "^9.26.0",
     "prettier": "3.2.1",
-    "sass": "^1.72.0",
+    "sass": "^1.77.2",
     "sass-loader": "^13.3.3",
-    "typescript": "^5.4.3",
-    "vite": "^5.2.7",
-    "vite-plugin-mkcert": "^1.17.5",
-    "vite-plugin-pwa": "^0.19.8",
-    "vitest": "^1.4.0",
+    "typescript": "^5.4.5",
+    "vite": "^5.2.11",
+    "vite-plugin-pwa": "^0.20.0",
+    "vitest": "^1.6.0",
     "vue-tsc": "^1.8.27"
   }
 }

frontend/public/primevue-sass-theme/README.md

@@ -7,5 +7,5 @@ npx sass public/primevue-sass-theme/themes/lara/lara-dark/yellow/theme.scss publ
 ```
 
 ```bash
-npx sass public/primevue-sass-theme/themes/lara/lara-light/blue/theme.scss public/themes/lara-light-blue/theme.css
+npx sass public/primevue-sass-theme/themes/lara/lara-light/green/theme.scss public/themes/lara-light-blue/theme.css
 ```

frontend/public/primevue-sass-theme/themes/lara/lara-dark/yellow/theme.scss

@@ -53,6 +53,18 @@ $highlightFocusBg: rgba($primaryColor, 0.24) !default;
     color: map-get($colors, "htwk-schwarz"); /*#1c2127*/
   }
 
+  .fc-v-event {
+    background: map-get($colors, "primary");
+    border: 2px solid rgba(193, 180, 0, 0.94);
+    color: map-get($colors, "htwk-schwarz"); /*#1c2127*/
+    border-radius: 6px;
+    margin: 1%;
+  }
+
+  .fc-v-event .fc-event-main {
+    color: map-get($colors, "htwk-schwarz"); /*#1c2127*/
+  }
+
   .fc.fc-unthemed .fc-view-container .fc-divider {
     background: map-get($colors, "htwk-grau"); /*#071426*/
     border: 1px solid map-get($colors, "htwk-grau-140"); /*#0b213f*/

frontend/public/primevue-sass-theme/themes/lara/lara-light/green/theme.scss

@@ -56,6 +56,13 @@ $highlightFocusBg: rgba($primaryColor, .24) !default;
     color: $primaryTextColor; /*#1c2127*/
   }
 
+  .fc-v-event {
+    background: map-get($colors, "primary");
+    border: 2px solid rgba(0, 121, 62, 0.94);
+    border-radius: 6px;
+    margin: 1%;
+  }
+
   .fc.fc-unthemed .fc-view-container .fc-divider {
     background: $primaryTextColor; /*#071426*/
     border: 1px solid map-get($colors, "htwk-grau-140"); /*#0b213f*/

frontend/public/themes/lara-dark-blue/theme.css

@@ -10133,6 +10133,16 @@
   border: 1px solid rgba(255, 237, 0, 0.24);
   color: #000000; /*#1c2127*/
 }
+:root .fc-v-event {
+  background: #ffed00;
+  border: 2px solid rgba(193, 180, 0, 0.94);
+  color: #000000; /*#1c2127*/
+  border-radius: 6px;
+  margin: 1%;
+}
+:root .fc-v-event .fc-event-main {
+  color: #000000; /*#1c2127*/
+}
 :root .fc.fc-unthemed .fc-view-container .fc-divider {
   background: #2e3639; /*#071426*/
   border: 1px solid #1b2022; /*#0b213f*/

frontend/public/themes/lara-light-blue/theme.css

@@ -10132,6 +10132,12 @@
   border: 1px solid rgba(0, 148, 76, 0.24);
   color: #ffffff; /*#1c2127*/
 }
+:root .fc-v-event {
+  background: #00944c;
+  border: 2px solid rgba(0, 121, 62, 0.94);
+  border-radius: 6px;
+  margin: 1%;
+}
 :root .fc.fc-unthemed .fc-view-container .fc-divider {
   background: #ffffff; /*#071426*/
   border: 1px solid #1b2022; /*#0b213f*/

frontend/src/api/loadICal.ts

@@ -0,0 +1,23 @@
+//Calendar implementation for the HTWK Leipzig timetable. Evaluation and display of the individual dates in iCal format.
+//Copyright (C) 2024 HTWKalender support@htwkalender.de
+
+//This program is free software: you can redistribute it and/or modify
+//it under the terms of the GNU Affero General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU Affero General Public License for more details.
+
+//You should have received a copy of the GNU Affero General Public License
+//along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+export async function fetchICalendarEvents(token: string): Promise<string> {
+  const response = await fetch("/api/feed?token=" + token, { method: "GET" });
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.text();
+}

frontend/src/components/CalendarLink.vue

@@ -76,6 +76,14 @@ const forwardToMicrosoft = () => {
   );
 };
 
+const forwardToHTWKalendar = () => {
+  // route to path /calendar/view?token=token
+  router.push({
+    name: "calendar-view",
+    query: { token: tokenStore().token },
+  });
+};
+
 const actions = computed(() => [
   {
     label: t("calendarLink.copyToClipboard"),
@@ -92,6 +100,11 @@ const actions = computed(() => [
     icon: "pi pi-microsoft",
     command: forwardToMicrosoft,
   },
+  {
+    label: t("calendarLink.toHTWKalendar"),
+    icon: "pi pi-home",
+    command: forwardToHTWKalendar,
+  }
 ]);
 </script>
 

frontend/src/components/CalendarViewer.vue

@@ -0,0 +1,133 @@
+<script setup lang="ts">
+
+import FullCalendar from "@fullcalendar/vue3";
+import { computed, ComputedRef, inject, Ref, ref, watch } from "vue";
+import { CalendarOptions, DatesSetArg } from "@fullcalendar/core";
+import allLocales from "@fullcalendar/core/locales-all";
+import dayGridPlugin from "@fullcalendar/daygrid";
+import interactionPlugin from "@fullcalendar/interaction";
+import timeGridPlugin from "@fullcalendar/timegrid";
+import iCalenderPlugin from "@fullcalendar/icalendar";
+import router from "@/router";
+import { formatYearMonthDay } from "@/helpers/dates.ts";
+import { useI18n } from "vue-i18n";
+import { useQuery } from "@tanstack/vue-query";
+import tokenStore from "@/store/tokenStore.ts";
+import { parseICalData } from "@/helpers/ical.ts";
+import { fetchICalendarEvents } from "@/api/loadICal.ts";
+
+const { t } = useI18n({ useScope: "global" });
+
+const props = defineProps({
+  token: {
+    type: String,
+    required: true,
+  },
+});
+
+const selectedToken = computed(() => props.token);
+
+const mobilePage = inject("mobilePage") as Ref<boolean>;
+const date: Ref<Date> = ref(new Date());
+
+const { data: calendar } = useQuery({
+  queryKey: ["userCalendar", selectedToken],
+  queryFn: () =>
+    fetchICalendarEvents(selectedToken.value),
+  select: (data) => {
+    return data;
+  },
+  networkMode: "offlineFirst",
+  enabled: () => tokenStore().token !== "",
+  staleTime: 5000000, // 500 seconds
+});
+
+const fullCalendar = ref<InstanceType<typeof FullCalendar>>();
+
+const calendarOptions: ComputedRef<CalendarOptions> = computed(() => ({
+  locales: allLocales,
+  locale: t("languageCode"),
+  plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin, iCalenderPlugin],
+  // local debugging of mobilePage variable in object creation on ternary expression
+  initialView: mobilePage.value ? "Day" : "week",
+  initialDate: date.value,
+  dayHeaderFormat: { weekday: "short", omitCommas: true },
+  slotDuration: "00:15:00",
+  eventTimeFormat: {
+    hour: "2-digit",
+    minute: "2-digit",
+    hour12: false,
+  },
+  height: "auto",
+  views: {
+    week: {
+      type: "timeGrid",
+      slotLabelFormat: {
+        hour: "numeric",
+        minute: "2-digit",
+        omitZeroMinute: false,
+        meridiem: false,
+        hour12: false,
+      },
+      dateAlignment: "week",
+      titleFormat: { month: "short", day: "numeric" },
+      slotMinTime: "06:00:00",
+      slotMaxTime: "22:00:00",
+      duration: { days: 7 },
+      firstDay: 1,
+      allDaySlot: false,
+      hiddenDays: [0],
+    },
+    Day: {
+      type: "timeGrid",
+      slotLabelFormat: {
+        hour: "numeric",
+        minute: "2-digit",
+        omitZeroMinute: false,
+        meridiem: false,
+        hour12: false,
+      },
+      titleFormat: { month: "short", day: "numeric" },
+      slotMinTime: "06:00:00",
+      slotMaxTime: "22:00:00",
+      duration: { days: 1 },
+      allDaySlot: false,
+      hiddenDays: [0],
+    },
+  },
+  headerToolbar: {
+    end: "prev,next today",
+    center: "title",
+    start: "week,Day",
+  },
+
+  datesSet: function (dateInfo: DatesSetArg) {
+    const view = dateInfo.view;
+    const offset = new Date().getTimezoneOffset();
+    const endDate = new Date(view.activeEnd.getTime() - offset * 60 * 1000);
+    router.replace({
+      query: {
+        ...router.currentRoute.value.query,
+        date: formatYearMonthDay(endDate),
+      },
+    });
+  },
+  events: parseICalData(calendar.value),
+}));
+
+watch(mobilePage, () => {
+  fullCalendar.value?.getApi().changeView(mobilePage.value ? "Day" : "week");
+});
+</script>
+
+<template>
+  <FullCalendar ref="fullCalendar" :options="calendarOptions" />
+</template>
+
+<style scoped>
+:deep(.fc-toolbar.fc-header-toolbar) {
+  flex-wrap: wrap;
+  justify-content: space-between;
+  gap: 0.5rem;
+}
+</style>

frontend/src/components/MenuBar.vue

@@ -26,15 +26,27 @@ const { t } = useI18n({ useScope: "global" });
 const isDark = ref(true);
 
 const items = computed(() => [
+  {
+    label: t("calendar"),
+    icon: "pi pi-fw pi-angle-down",
+    info: "calendar",
+    items: [
       {
         label: t("createCalendar"),
         icon: "pi pi-fw pi-plus",
-    route: "/",
+        route: "/calendar/create",
       },
       {
         label: t("editCalendar"),
         icon: "pi pi-fw pi-pencil",
-    route: "/edit",
+        route: "/calendar/edit",
+      },
+      {
+        label: t("userCalendar"),
+        icon: "pi pi-fw pi-calendar",
+        route: "/calendar/view",
+      },
+    ],
   },
   {
     label: t("rooms"),

frontend/src/components/RoomOccupation.vue

@@ -175,9 +175,12 @@ const calendarOptions: ComputedRef<CalendarOptions> = computed(() => ({
           id: event.id.toString(),
           start: event.start,
           end: event.end,
-          color: event.showFree 
+          backgroundColor: event.showFree
             ? "var(--htwk-gruen-500)"
             : "var(--htwk-grau-60-500)",
+          borderColor: event.showFree
+            ? "var(--htwk-gruen-600)"
+            : "var(--htwk-grau-60-600)",
           textColor: event.showFree
             ? "var(--green-50)"
             : "white",

frontend/src/helpers/ical.ts

@@ -0,0 +1,24 @@
+import ICAL from 'ical.js';
+import { CalendarComponent } from 'ical';
+
+export function parseICalData(icalData: string | undefined) {
+  if (icalData === undefined || !icalData) {
+    return [];
+  }
+
+  const jCalData = ICAL.parse(icalData);
+  const comp = new ICAL.Component(jCalData);
+  const vEvents = comp.getAllSubcomponents('vevent');
+
+  return vEvents.map((vevent: CalendarComponent) => {
+    const event = new ICAL.Event(vevent);
+
+    return {
+      title: event.summary,
+      start: event.startDate.toJSDate(),
+      end: event.endDate.toJSDate(),
+      allDay: event.startDate.isDate,
+      // Include other properties as needed
+    };
+  });
+}

frontend/src/helpers/token.ts

@@ -0,0 +1,19 @@
+const tokenRegex = /^[a-z0-9]{15}$/;
+const tokenUriRegex = /[?&]token=([a-z0-9]{15})(?:&|$)/;
+
+export const isToken = (token: string): boolean => {
+  return tokenRegex.test(token) || tokenUriRegex.test(token);
+};
+
+export function extractToken(token: string): string {
+  if (tokenRegex.test(token)) {
+    return token;
+  }
+
+  const match = tokenUriRegex.exec(token);
+  if (match) {
+    return match[1];
+  }
+
+  throw new Error("Invalid token");
+}

frontend/src/i18n/translations/de.json

@@ -2,6 +2,8 @@
   "languageCode": "de",
   "createCalendar": "Kalender erstellen",
   "editCalendar": "Kalender bearbeiten",
+  "userCalendar": "Dein Kalender",
+  "calendar": "Kalender",
   "rooms": "Räume",
   "faq": "FAQ",
   "imprint": "Impressum",
@@ -139,7 +141,8 @@
     "copyToastErrorDetail": "Link konnte nicht in Zwischenablage kopiert werden",
     "copyToClipboard": "Link kopieren",
     "toGoogleCalendar": "Google Kalender",
-    "toMicrosoftCalendar": "Microsoft Kalender"
+    "toMicrosoftCalendar": "Microsoft Kalender",
+    "toHTWKalendar": "HTWKalender"
   },
   "calendarPreview": {
     "preview": "Vorschau",
@@ -240,5 +243,11 @@
     "ninthAnswer": "Wenn du dich für die Entwicklung und den Quelltext interessierst, kannst du jederzeit als HTWK-Student daran mitarbeiten. Quelltext und weitere Informationen findest du im ",
     "notFound": "Nicht gefunden, wonach du suchst?",
     "contact": "Kontakt aufnehmen"
+  },
+  "userCalender": {
+    "headline": "Dein Kalender",
+    "subTitle": "Hier findest du die Kalenderansicht von deinem persönlichen Feed.",
+    "searchPlaceholder": "Token",
+    "searchButton": "Kalender laden"
   }
 }

frontend/src/i18n/translations/en.json

@@ -2,6 +2,8 @@
   "languageCode": "en",
   "createCalendar": "create calendar",
   "editCalendar": "edit calendar",
+  "userCalendar": "user calendar",
+  "calendar": "calendar",
   "rooms": "rooms",
   "faq": "faq",
   "imprint": "imprint",
@@ -138,8 +140,9 @@
     "copyToastError": "error",
     "copyToastErrorDetail": "could not copy link to clipboard",
     "copyToClipboard": "copy to clipboard",
-    "toGoogleCalendar": "to Google Calendar",
-    "toMicrosoftCalendar": "to Microsoft Calendar"
+    "toGoogleCalendar": "Google Calendar",
+    "toMicrosoftCalendar": "Microsoft Calendar",
+    "toHTWKalendar": "HTWKalender"
   },
   "calendarPreview": {
     "preview": "preview",
@@ -240,5 +243,11 @@
     "ninthAnswer": "If you want to contribute, you can do so at any time if you are a HTWK student. The source code is available on ",
     "notFound": "Not finding what you're looking for?",
     "contact": "Get in touch"
+  },
+  "userCalender": {
+    "headline": "user calendar",
+    "subTitle": "Here you can find the calendar view of your personal feed.",
+    "searchPlaceholder": "calendar token",
+    "searchButton": "load calendar"
   }
 }

frontend/src/i18n/translations/ja.json

@@ -2,6 +2,8 @@
   "languageCode": "ja",
   "createCalendar": "カレンダーを作成",
   "editCalendar": "カレンダーを編集",
+  "userCalendar": "ユーザーカレンダー",
+  "calendar": "カレンダー",
   "rooms": "部屋",
   "faq": "よくある質問",
   "imprint": "インプリント",
@@ -138,8 +140,9 @@
     "copyToastError": "エラー",
     "copyToastErrorDetail": "リンクをクリップボードにコピーできませんでした",
     "copyToClipboard": "クリップボードにコピー",
-      "toGoogleCalendar": "Googleカレンダーへ",
-      "toMicrosoftCalendar": "Microsoftカレンダーへ"
+    "toGoogleCalendar": "Googleカレンダー",
+    "toMicrosoftCalendar": "Microsoftカレンダー",
+    "toHTWKalendar": "HTWカレンダー"
   },
   "calendarPreview": {
     "preview": "プレビュー",
@@ -240,6 +243,11 @@
     "ninthAnswer": "貢献したい場合は、HTWKの学生であればいつでもできます。ソースコードは以下にあります",
     "notFound": "探しているものが見つかりませんか？",
     "contact": "連絡する"
+  },
+  "userCalender": {
+    "headline": "ユーザーカレンダー",
+    "subTitle": "ここでは、個人のフィードのカレンダー表示を見つけることができます。",
+    "searchPlaceholder": "カレンダートークン",
+    "searchButton": "ロードカレンダー"
   }
-  }
-  
+}

frontend/src/main.ts

@@ -56,12 +56,15 @@ import Calendar from "primevue/calendar";
 import i18n from "./i18n";
 import { VueQueryPlugin } from "@tanstack/vue-query";
 import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 
 polyfillCountryFlagEmojis();
 
 const app = createApp(App);
 const pinia = createPinia();
 
+pinia.use(piniaPluginPersistedstate)
+
 app.use(VueQueryPlugin, {
   queryClientConfig: {
     defaultOptions: {

frontend/src/model/roomOccupancyList.test.ts

@@ -17,8 +17,8 @@
 import { beforeEach, describe, expect, test } from "vitest";
 import { RoomOccupancyList } from "./roomOccupancyList";
 import { Binary } from "bson";
-import { add, addHours, addMinutes, interval, subHours } from "date-fns";
-import { fromZonedTime, toZonedTime } from "date-fns-tz";
+import { addHours, addMinutes, interval, subHours } from "date-fns";
+import { toZonedTime } from "date-fns-tz";
 
 const testListStart = new Date("2022-01-01T00:00:00Z");
 var testList : RoomOccupancyList; //= RoomOccupancyList.fromJSON({});

frontend/src/router/index.ts

@@ -28,6 +28,7 @@ const EditAdditionalModules = () =>
 const EditModules = () => import("../view/editCalendar/EditModules.vue");
 const CourseSelection = () => import("../view/CourseSelection.vue");
 const FreeRooms = () => import("../view/FreeRooms.vue");
+const CalenderViewer = () => import("../view/UserCalendar.vue");
 
 import i18n from "../i18n";
 
@@ -36,7 +37,12 @@ const router = createRouter({
   routes: [
     {
       path: "/",
-      name: "course-selection",
+      name: "home",
+      component: CourseSelection,
+    },
+    {
+      path: "/calendar/create",
+      name: "calendar-create",
       component: CourseSelection,
     },
     {
@@ -54,6 +60,11 @@ const router = createRouter({
       name: "free-rooms",
       component: FreeRooms,
     },
+    {
+      path: "/calendar/view",
+      name: "calendar-view",
+      component: CalenderViewer,
+    },
     {
       path: "/faq",
       name: "faq",
@@ -80,7 +91,7 @@ const router = createRouter({
       component: CalendarLink,
     },
     {
-      path: "/edit",
+      path: "/calendar/edit",
       name: "edit",
       component: EditCalendarView,
     },

frontend/src/store/tokenStore.ts

@@ -20,6 +20,7 @@ const tokenStore = defineStore("tokenStore", {
   state: () => ({
     token: "",
   }),
+  persist: true,
   actions: {
     setToken(token: string) {
       this.token = token;

frontend/src/view/EditCalendarView.vue

@@ -26,6 +26,7 @@ import tokenStore from "../store/tokenStore";
 import { useToast } from "primevue/usetoast";
 import { useI18n } from "vue-i18n";
 import DynamicPage from "./DynamicPage.vue";
+import { extractToken, isToken } from "@/helpers/token.ts";
 const { t } = useI18n({ useScope: "global" });
 
 const toast = useToast();
@@ -33,26 +34,6 @@ const toast = useToast();
 const token: Ref<string> = ref("");
 const modules: Ref<Map<string, Module>> = ref(moduleStore().modules);
 
-const tokenRegex = /^[a-z0-9]{15}$/;
-const tokenUriRegex = /[?&]token=([a-z0-9]{15})(?:&|$)/;
-
-const isToken = (token: string): boolean => {
-  return tokenRegex.test(token) || tokenUriRegex.test(token);
-};
-
-function extractToken(token: string): string {
-  if (tokenRegex.test(token)) {
-    return token;
-  }
-
-  const match = tokenUriRegex.exec(token);
-  if (match) {
-    return match[1];
-  }
-
-  throw new Error("Invalid token");
-}
-
 function loadCalendar(): void {
   try {
     token.value = extractToken(token.value);

frontend/src/view/UserCalendar.vue

@@ -0,0 +1,81 @@
+<script setup lang="ts">
+
+import CalendarViewer from "@/components/CalendarViewer.vue";
+import DynamicPage from "@/view/DynamicPage.vue";
+import { useI18n } from "vue-i18n";
+import { onMounted, ref } from "vue";
+import { extractToken } from "@/helpers/token.ts";
+import { useToast } from "primevue/usetoast";
+import moduleStore from "@/store/moduleStore.ts";
+import tokenStore from "@/store/tokenStore.ts";
+
+const { t } = useI18n({ useScope: "global" });
+const toast = useToast();
+
+const token = ref(tokenStore().token || ""  as string );
+
+// parse token from query parameter
+const urlParams = new URLSearchParams(window.location.search);
+const tokenFromUrl = urlParams.get("token");
+if (tokenFromUrl) {
+  token.value = tokenFromUrl;
+  tokenStore().setToken(tokenFromUrl);
+  loadCalendar();
+}
+
+function loadCalendar() {
+  try {
+    token.value = extractToken(token.value);
+  } catch (e) {
+    console.error(e);
+    toast.add({
+      severity: "error",
+      summary: t("editCalendarView.error"),
+      detail: t("editCalendarView.invalidToken"),
+      life: 3000,
+    });
+    return;
+  }
+
+  moduleStore().removeAllModules();
+  tokenStore().setToken(token.value);
+}
+
+onMounted(() => {
+  if (token.value && token.value !== "") {
+    loadCalendar();
+  }
+});
+
+</script>
+
+<template>
+  <DynamicPage
+    :hide-content="false"
+    :headline="$t('userCalender.headline')"
+    :sub-title="$t('userCalender.subTitle')"
+  >
+      <template #selection="{ flexSpecs }">
+      <InputText
+        v-model="token"
+        :placeholder="$t('userCalender.searchPlaceholder')"
+        :class="flexSpecs"
+        @keyup.enter="loadCalendar()"
+      />
+      <Button
+        :label="$t('userCalender.searchButton')"
+        icon="pi pi-refresh"
+        @click="loadCalendar()"
+      />
+      </template>
+      <template #content>
+      <CalendarViewer
+        :token="tokenStore().token"
+      />
+      </template>
+</DynamicPage>
+</template>
+
+<style scoped>
+
+</style>

frontend/src/vite-env.d.ts

@@ -15,3 +15,5 @@
 //along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 /// <reference types="vite/client" />
+
+declare module 'ical.js';

frontend/vite.config.ts

@@ -18,12 +18,12 @@ import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
 import { fileURLToPath } from "node:url";
 import { VitePWA } from 'vite-plugin-pwa';
-import mkcert from 'vite-plugin-mkcert';
+import basicSsl from '@vitejs/plugin-basic-ssl'
 
 export default defineConfig({
   plugins: [
     vue(),
-    mkcert(),
+    basicSsl(),
     VitePWA({
       mode: 'development',
       base: '/',
@@ -67,7 +67,21 @@ export default defineConfig({
       registerType: 'autoUpdate',
       workbox: {
         globPatterns: ['**/*.{js,css,html,ico,png,svg,json,vue,txt,woff2}'],
-        cleanupOutdatedCaches: true
+        cleanupOutdatedCaches: true,
+        runtimeCaching: [
+          {
+            urlPattern: /^https?.*/,
+            handler: 'NetworkFirst',
+            options: {
+              cacheName: 'https-calls',
+              expiration: {
+                maxEntries: 150,
+                maxAgeSeconds: 30 * 12 * 60 * 60, // 1 month
+              },
+              networkTimeoutSeconds: 10, // fall back to cache if api does not response within 10 seconds
+            },
+          },
+        ],
       },
       devOptions: {
         enabled: true,

reverseproxy.conf

@@ -113,60 +113,30 @@ http {
     server {
         listen              80;
         listen              [::]:80;
-        server_name         cal.htwk-leipzig.de;
-
-        location /api/feed {
-            proxy_pass http://htwkalender-backend:8090;
-            client_max_body_size 2m;
-            proxy_connect_timeout 600s;
-            proxy_read_timeout 600s;
-            proxy_send_timeout 600s;
-            send_timeout 600s;
-            limit_req zone=feed burst=10 nodelay;
-        }
+        server_name         pwa.htwkalender.de;
 
         location / {
-            return 301 https://cal.htwk-leipzig.de$request_uri;
-        }
-    }
-
-    server {
-        listen              80;
-        listen              [::]:80;
-        server_name         htwkalender.de;
-
-        location /api/feed {
-            proxy_pass http://htwkalender-backend:8090;
-            client_max_body_size 2m;
-            proxy_connect_timeout 600s;
-            proxy_read_timeout 600s;
-            proxy_send_timeout 600s;
-            send_timeout 600s;
-            limit_req zone=feed burst=10 nodelay;
-        }
-
-        location / {
-            return 301 https://cal.htwk-leipzig.de$request_uri;
+            return 301 https://$host$request_uri;
         }
     }
 
     server {
         listen              443 ssl;
         listen              [::]:443 ssl;
-        server_name         htwkalender.de www.htwkalender.de;
+        server_name         pwa.htwkalender.de;
 
         ssl_certificate     htwkalender.de.pem;
         ssl_certificate_key htwkalender.de.key.pem;
-        return 301 https://cal.htwk-leipzig.de$request_uri;
+
+        location /_ {
+            proxy_pass http://htwkalender-backend:8090;
+            # if user is not 0 in admin list, return 404
+            if ($admin) {
+                return 404 "Not Found";
+            }
+            # Increase upload file size
+            client_max_body_size 100m;
         }
-
-    server {
-        listen              443 ssl;
-        listen              [::]:443 ssl;
-        server_name         cal.htwk-leipzig.de;
-
-        ssl_certificate     cal.htwk-leipzig.de.pem;
-        ssl_certificate_key cal.htwk-leipzig.de.key.pem;
 
         location /api {
             proxy_pass http://htwkalender-backend:8090;
@@ -272,16 +242,6 @@ http {
             send_timeout 600s;
         }
 
-        location /_ {
-            proxy_pass http://htwkalender-backend:8090;
-            # if user is not 0 in admin list, return 404
-            if ($admin) {
-                return 404 "Not Found";
-            }
-            # Increase upload file size
-            client_max_body_size 100m;
-        }
-
         location / {
             proxy_pass http://htwkalender-frontend:8000;
         }

reverseproxy.local.conf

@@ -51,25 +51,8 @@ http {
     server {
         listen              80;
         listen              [::]:80;
-
-        location /api {
-            proxy_pass http://htwkalender-backend:8090;
-            client_max_body_size 20m;
-            proxy_connect_timeout 600s;
-            proxy_read_timeout 600s;
-            proxy_send_timeout 600s;
-            send_timeout 600s;
-        }
-
-        location /_ {
-            proxy_pass http://htwkalender-backend:8090;
-            # Increase upload file size
-            client_max_body_size 100m;
-        }
-
-        location / {
-            proxy_pass http://htwkalender-frontend:8000;
-        }
+        server_name         dev.htwkalender.de;
+        return 301 https://$host$request_uri;
     }
 
     server {