Merge branch 'main' into tanstack-query

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json

frontend/src/components/AdditionalModuleTable.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
 import { defineAsyncComponent, inject, onMounted, ref, Ref } from "vue";
 import { Module } from "../model/module.ts";

frontend/src/components/CalendarLink.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
 import tokenStore from "../store/tokenStore.ts";
 import { useToast } from "primevue/usetoast";

frontend/src/components/CalendarPreview.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
 import { Ref, computed, inject, ref } from "vue";
 import moduleStore from "../store/moduleStore";

frontend/src/components/DarkModeSwitcher.vue

@@ -1,9 +1,29 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
 import { usePrimeVue } from "primevue/config";
 
 const PrimeVue = usePrimeVue();
 
+const emit = defineEmits(["dark-mode-toggled"]);
+
 const isDark = ref(true);
 const darkTheme = ref("lara-dark-blue"),
   lightTheme = ref("lara-light-blue");
@@ -18,19 +38,22 @@ function setTheme(shouldBeDark: boolean) {
   const newTheme = isDark.value ? darkTheme.value : lightTheme.value,
     oldTheme = isDark.value ? lightTheme.value : darkTheme.value;
   PrimeVue.changeTheme(oldTheme, newTheme, "theme-link", () => {});
+  emit("dark-mode-toggled", isDark.value);
 }
 
-// set theme matching browser preference
-setTheme(
-  window.matchMedia &&
+onMounted(() => {
+  // set theme matching browser preference
+  setTheme(
+    window.matchMedia &&
     window.matchMedia("(prefers-color-scheme: dark)").matches,
-);
+  );
 
-window
-  .matchMedia("(prefers-color-scheme: dark)")
-  .addEventListener("change", (e) => {
-    setTheme(e.matches);
-  });
+  window
+    .matchMedia("(prefers-color-scheme: dark)")
+    .addEventListener("change", (e) => {
+      setTheme(e.matches);
+    });
+});
 </script>
 
 <template>
@@ -39,8 +62,8 @@ window
     size="small"
     class="p-button-rounded w-full md:w-auto"
     style="margin-right: 1rem"
-    :severity="isDark ? 'warning' : 'info'"
-    @click="toggleTheme"
+    :severity="isDark ? 'warning' : 'success'"
+    @click="toggleTheme();"
   >
     <i v-if="isDark" class="pi pi-sun"></i>
     <i v-else class="pi pi-moon"></i>

frontend/src/components/FaqPage.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup></script>
 
 <template>

frontend/src/components/LocaleSwitcher.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
 import { computed } from "vue";
 import localeStore from "../store/localeStore.ts";

frontend/src/components/MenuBar.vue

@@ -1,10 +1,30 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import LocaleSwitcher from "./LocaleSwitcher.vue";
 import DarkModeSwitcher from "./DarkModeSwitcher.vue";
 const { t } = useI18n({ useScope: "global" });
 
+const isDark = ref(true);
+
 const items = computed(() => [
   {
     label: t("createCalendar"),
@@ -49,6 +69,13 @@ const items = computed(() => [
     url: "https://www.htwk-leipzig.de/hochschule/kontakt/datenschutzerklaerung/",
   },
 ]);
+
+function handleDarkModeToggled(isDarkVar: boolean) {
+  // Do something with isDark value
+  // For example, update the root isDark value
+  // Assuming the root component has an isDark ref
+  isDark.value = isDarkVar;
+}
 </script>
 
 <template>
@@ -56,7 +83,7 @@ const items = computed(() => [
     <template #start>
       <router-link v-slot="{ navigate }" :to="`/`" custom>
         <Button severity="secondary" text class="p-0 mx-2" @click="navigate">
-          <img width="50" height="50" src="../../public/htwk.svg" alt="Logo" />
+          <div alt="Logo" class="logo" />
         </Button>
       </router-link>
     </template>
@@ -96,7 +123,7 @@ const items = computed(() => [
     </template>
     <template #end>
       <div class="flex align-items-stretch justify-content-center">
-        <DarkModeSwitcher></DarkModeSwitcher>
+        <DarkModeSwitcher @dark-mode-toggled="handleDarkModeToggled"></DarkModeSwitcher>
         <LocaleSwitcher></LocaleSwitcher>
       </div>
     </template>
@@ -109,6 +136,15 @@ const items = computed(() => [
   border: none;
 }
 
+.logo {
+  background-color: var(--primary-color);
+  -webkit-mask: url(../../htwk-mask.svg) no-repeat center/contain;
+  mask: url(../../htwk-mask.svg) no-repeat center/contain;
+  width: 50px;
+  height: 50px;
+  border-radius: 6px;
+}
+
 :deep(.p-submenu-list) {
   border-radius: 6px;
 }

frontend/src/components/ModuleInformation.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
 import { Ref, inject } from "vue";
 import { Module } from "../model/module.ts";

frontend/src/components/ModuleSelection.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
 import { computed, ComputedRef, PropType } from "vue";
 import { Module } from "../model/module.ts";

frontend/src/components/ModuleTemplateDialog.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script setup lang="ts">
 import { computed, Ref, ref } from "vue";
 import { useI18n } from "vue-i18n";

frontend/src/components/RenameModules.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script setup lang="ts">
 import moduleStore from "../store/moduleStore.ts";
 import { createIndividualFeed } from "../api/createFeed.ts";
@@ -35,8 +53,10 @@ const columns = computed(() => [
 ]);
 
 const toast = useToast();
+const requestIsPending = ref(false);
 
 async function finalStep() {
+  requestIsPending.value = true;
   const createFeed: Promise<string> = createIndividualFeed(
     store.getAllModules(),
   );
@@ -44,6 +64,7 @@ async function finalStep() {
   // Check if createFeed Promise is resolved
   createFeed.then(async (token: string) => {
     tokenStore().setToken(token);
+    requestIsPending.value = false;
     await router.push("/calendar-link");
   });
 
@@ -157,9 +178,9 @@ async function finalStep() {
       </div>
 
       <Button
-        :disabled="store.isEmpty()"
+        :disabled="store.isEmpty() || requestIsPending"
         class="col-12 md:col-4 mb-3 align-self-end"
-        icon="pi pi-save"
+        :icon="requestIsPending ? 'pi pi-spin pi-spinner' : 'pi pi-save'"
         :label="$t('renameModules.nextStep')"
         @click="finalStep()"
       />

frontend/src/components/RoomOccupation.vue

@@ -1,3 +1,21 @@
+<!--
+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/>.
+-->
+
 <script lang="ts" setup>
 import FullCalendar from "@fullcalendar/vue3";
 import dayGridPlugin from "@fullcalendar/daygrid";
@@ -154,7 +172,7 @@ const calendarOptions: ComputedRef<CalendarOptions> = computed(() => ({
           id: event.id.toString(),
           start: event.start,
           end: event.end,
-          color: event.showFree ? "var(--green-800)" : "var(--primary-color)",
+          color: event.showFree ? "var(--htwk-gruen-500)" : "var(--primary-color)",
           textColor: event.showFree
             ? "var(--green-50)"
             : "var(--primary-color-text)",