From e4c2f47eb0dbfa520638adaf3a25f3c6ee0bc65e Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 10 Apr 2025 12:48:38 +0200
Subject: [PATCH 01/45] 1.3.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51951fb..0007915 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ff-admin",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin",
-      "version": "1.3.5",
+      "version": "1.3.6",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fullcalendar/core": "^6.1.15",
diff --git a/package.json b/package.json
index 11d9293..fdd7e82 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ff-admin",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {

From 12963317963f6aa00d9339ee5516e5f42c3f4c79 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 14 Apr 2025 09:12:00 +0200
Subject: [PATCH 02/45] extend calendar by list

---
 package-lock.json                          |  10 ++
 package.json                               |   1 +
 src/components/CustomCalendar.vue          | 170 +++++++++++++++++++++
 src/main.css                               |  28 +---
 src/views/admin/club/calendar/Calendar.vue | 103 ++-----------
 src/views/public/calendar/Calendar.vue     |  38 +----
 6 files changed, 198 insertions(+), 152 deletions(-)
 create mode 100644 src/components/CustomCalendar.vue

diff --git a/package-lock.json b/package-lock.json
index f1e26a7..a08af4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
         "@fullcalendar/core": "^6.1.15",
         "@fullcalendar/daygrid": "^6.1.15",
         "@fullcalendar/interaction": "^6.1.15",
+        "@fullcalendar/list": "^6.1.17",
         "@fullcalendar/timegrid": "^6.1.15",
         "@fullcalendar/vue3": "^6.1.15",
         "@headlessui/vue": "^1.7.23",
@@ -2379,6 +2380,15 @@
         "@fullcalendar/core": "~6.1.17"
       }
     },
+    "node_modules/@fullcalendar/list": {
+      "version": "6.1.17",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-6.1.17.tgz",
+      "integrity": "sha512-fkyK49F9IxwlGUBVhJGsFpd/LTi/vRVERLIAe1HmBaGkjwpxnynm8TMLb9mZip97wvDk3CmZWduMe6PxscAlow==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@fullcalendar/core": "~6.1.17"
+      }
+    },
     "node_modules/@fullcalendar/timegrid": {
       "version": "6.1.17",
       "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.17.tgz",
diff --git a/package.json b/package.json
index 4ffd7d2..aa87b2c 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "@fullcalendar/core": "^6.1.15",
     "@fullcalendar/daygrid": "^6.1.15",
     "@fullcalendar/interaction": "^6.1.15",
+    "@fullcalendar/list": "^6.1.17",
     "@fullcalendar/timegrid": "^6.1.15",
     "@fullcalendar/vue3": "^6.1.15",
     "@headlessui/vue": "^1.7.23",
diff --git a/src/components/CustomCalendar.vue b/src/components/CustomCalendar.vue
new file mode 100644
index 0000000..e31d2d6
--- /dev/null
+++ b/src/components/CustomCalendar.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="flex flex-col w-full h-full gap-2 justify-between overflow-hidden">
+    <div class="flex flex-row gap-2 max-xl:flex-wrap justify-between max-sm:justify-center">
+      <div class="flex flex-row max-xl:order-2">
+        <button
+          :primary="view == 'dayGridMonth'"
+          :primary-outline="view != 'dayGridMonth'"
+          class="rounded-r-none!"
+          @click="setView('dayGridMonth')"
+        >
+          Monat
+        </button>
+        <button
+          :primary="view == 'timeGridWeek'"
+          :primary-outline="view != 'timeGridWeek'"
+          class="rounded-none! border-x-0!"
+          @click="setView('timeGridWeek')"
+        >
+          Woche
+        </button>
+        <button
+          :primary="view == 'listMonth'"
+          :primary-outline="view != 'listMonth'"
+          class="rounded-l-none!"
+          @click="setView('listMonth')"
+        >
+          Liste
+        </button>
+      </div>
+      <p class="text-3xl w-full max-xl:order-1 text-center">{{ currentTitle }}</p>
+      <div class="flex flex-row max-xl:order-3">
+        <button primary-outline class="rounded-r-none!" @click="navigateView('prev')">
+          <ChevronLeftIcon />
+        </button>
+        <button
+          :primary="containsToday"
+          :primary-outline="!containsToday"
+          class="rounded-none! border-x-0!"
+          @click="
+            calendarApi?.today();
+            containsToday = true;
+          "
+        >
+          heute
+        </button>
+        <button primary-outline class="rounded-l-none!" @click="navigateView('next')">
+          <ChevronRightIcon />
+        </button>
+      </div>
+    </div>
+    <FullCalendar ref="fullCalendar" :options="calendarOptions" class="max-h-full h-full" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, type PropType } from "vue";
+import FullCalendar from "@fullcalendar/vue3";
+import deLocale from "@fullcalendar/core/locales/de";
+import dayGridPlugin from "@fullcalendar/daygrid";
+import timeGridPlugin from "@fullcalendar/timegrid";
+import listPlugin from "@fullcalendar/list";
+import interactionPlugin from "@fullcalendar/interaction";
+import { ChevronLeftIcon, ChevronRightIcon } from "@heroicons/vue/24/outline";
+import type { CalendarOptions } from "@fullcalendar/core/index.js";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    items: {
+      type: Array as PropType<
+        {
+          id: string;
+          title: string;
+          start: string;
+          end: string;
+          backgroundColor: string;
+        }[]
+      >,
+      default: [],
+    },
+    allowInteraction: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  emits: {
+    dateSelect: ({ start, end, allDay }: { start: string; end: string; allDay: boolean }) => {
+      return typeof start == "string" && typeof end == "string" && typeof allDay === "boolean";
+    },
+    eventSelect: (id: string) => {
+      return typeof id == "string";
+    },
+  },
+  data() {
+    return {
+      view: "dayGridMonth" as "dayGridMonth" | "timeGridWeek" | "listMonth",
+      calendarApi: null as null | typeof FullCalendar,
+      currentTitle: "" as string,
+      containsToday: false as boolean,
+    };
+  },
+  computed: {
+    calendarOptions() {
+      return {
+        timeZone: "local",
+        locale: deLocale,
+        plugins: [dayGridPlugin, timeGridPlugin, listPlugin, interactionPlugin],
+        initialView: "dayGridMonth",
+        eventDisplay: "block",
+        headerToolbar: false,
+        weekends: true,
+        editable: this.allowInteraction,
+        selectable: this.allowInteraction,
+        selectMirror: false,
+        dayMaxEvents: true,
+        weekNumbers: true,
+        displayEventTime: true,
+        nowIndicator: true,
+        weekText: "KW",
+        allDaySlot: false,
+        events: this.items,
+        select: this.select,
+        eventClick: this.eventClick,
+      } as CalendarOptions;
+    },
+  },
+  mounted() {
+    this.calendarApi = (this.$refs.fullCalendar as typeof FullCalendar).getApi();
+    this.setTitle();
+    this.setContainsToday();
+  },
+  methods: {
+    setTitle() {
+      this.currentTitle = this.calendarApi?.view.title ?? "";
+    },
+    setView(view: "dayGridMonth" | "timeGridWeek" | "listMonth") {
+      this.calendarApi?.changeView(view);
+      this.view = view;
+      this.setTitle();
+      this.setContainsToday();
+    },
+    navigateView(change: "prev" | "next") {
+      if (change == "prev") {
+        this.calendarApi?.prev();
+      } else {
+        this.calendarApi?.next();
+      }
+      this.setTitle();
+      this.setContainsToday();
+    },
+    setContainsToday() {
+      const start = this.calendarApi?.view.currentStart;
+      const end = this.calendarApi?.view.currentEnd;
+      const today = new Date();
+      this.containsToday = today >= start && today < end;
+    },
+    select(e: any) {
+      this.$emit("dateSelect", {
+        start: e?.startStr ?? new Date().toISOString(),
+        end: e?.endStr ?? new Date().toISOString(),
+        allDay: e?.allDay ?? false,
+      });
+    },
+    eventClick(e: any) {
+      this.$emit("eventSelect", e.event.id);
+    },
+  },
+});
+</script>
diff --git a/src/main.css b/src/main.css
index 9816a0e..e618f2f 100644
--- a/src/main.css
+++ b/src/main.css
@@ -72,7 +72,7 @@ a[button] {
 
 button[primary]:not([primary="false"]),
 a[button][primary]:not([primary="false"]) {
-  @apply border border-transparent text-white bg-primary hover:bg-primary;
+  @apply border-2 border-transparent text-white bg-primary hover:bg-primary;
 }
 
 button[primary-outline]:not([primary-outline="false"]),
@@ -131,29 +131,3 @@ summary > svg {
 summary::-webkit-details-marker {
   display: none;
 }
-
-.fc-button-primary {
-  @apply bg-primary! border-primary! outline-hidden! ring-0! hover:bg-red-700! hover:border-red-700! h-10 text-center;
-}
-.fc-button-active {
-  @apply bg-red-500! border-red-500!;
-}
-.fc-toolbar {
-  @apply flex-wrap;
-}
-
-/* For screens between 850px and 768px */
-@media (max-width: 850px) and (min-width: 768px) {
-  .fc-header-toolbar.fc-toolbar.fc-toolbar-ltr > .fc-toolbar-chunk:nth-child(2) {
-    @apply order-1!;
-  }
-  /* Your styles for this range */
-}
-
-/* For screens between 525px and 0px */
-@media (max-width: 525px) and (min-width: 0px) {
-  /* Your styles for this range */
-  .fc-header-toolbar.fc-toolbar.fc-toolbar-ltr > .fc-toolbar-chunk:nth-child(2) {
-    @apply order-1!;
-  }
-}
diff --git a/src/views/admin/club/calendar/Calendar.vue b/src/views/admin/club/calendar/Calendar.vue
index d45bd41..4535be8 100644
--- a/src/views/admin/club/calendar/Calendar.vue
+++ b/src/views/admin/club/calendar/Calendar.vue
@@ -4,14 +4,17 @@
       <div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
         <h1 class="font-bold text-xl h-8">Kalender</h1>
         <div class="flex flex-row gap-2">
-          <PlusIcon class="text-gray-500 h-5 w-5 cursor-pointer" @click="select" />
+          <PlusIcon
+            class="text-gray-500 h-5 w-5 cursor-pointer"
+            @click="select({ start: '', end: '', allDay: false })"
+          />
           <LinkIcon class="text-gray-500 h-5 w-5 cursor-pointer" @click="openLinkModal" />
         </div>
       </div>
     </template>
     <template #diffMain>
       <div class="flex flex-col w-full h-full gap-2 justify-between px-7 overflow-hidden">
-        <FullCalendar :options="calendarOptions" class="max-h-full h-full" />
+        <CustomCalendar :items="formattedItems" @date-select="select" @event-select="eventClick" />
       </div>
     </template>
   </MainTemplate>
@@ -22,14 +25,10 @@ import { defineComponent, markRaw, defineAsyncComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import { useModalStore } from "@/stores/modal";
 import MainTemplate from "@/templates/Main.vue";
-import FullCalendar from "@fullcalendar/vue3";
-import deLocale from "@fullcalendar/core/locales/de";
-import dayGridPlugin from "@fullcalendar/daygrid";
-import timeGridPlugin from "@fullcalendar/timegrid";
-import interactionPlugin from "@fullcalendar/interaction";
 import { useCalendarStore } from "@/stores/admin/club/calendar";
 import { useAbilityStore } from "@/stores/ability";
 import { LinkIcon, PlusIcon } from "@heroicons/vue/24/outline";
+import CustomCalendar from "@/components/CustomCalendar.vue";
 </script>
 
 <script lang="ts">
@@ -40,33 +39,6 @@ export default defineComponent({
   computed: {
     ...mapState(useCalendarStore, ["formattedItems"]),
     ...mapState(useAbilityStore, ["can"]),
-    calendarOptions() {
-      return {
-        timeZone: "local",
-        locale: deLocale,
-        plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
-        initialView: "dayGridMonth",
-        headerToolbar: {
-          left: "dayGridMonth,timeGridWeek",
-          center: "title",
-          right: "prev,today,next",
-        },
-        eventDisplay: "block",
-        weekends: true,
-        editable: true,
-        selectable: true,
-        selectMirror: false,
-        dayMaxEvents: true,
-        weekNumbers: true,
-        displayEventTime: true,
-        nowIndicator: true,
-        weekText: "KW",
-        allDaySlot: false,
-        events: this.formattedItems,
-        select: this.select,
-        eventClick: this.eventClick,
-      };
-    },
   },
   mounted() {
     this.fetchCalendars();
@@ -74,22 +46,22 @@ export default defineComponent({
   methods: {
     ...mapActions(useModalStore, ["openModal"]),
     ...mapActions(useCalendarStore, ["fetchCalendars"]),
-    select(e: any) {
+    select({ start, end, allDay }: { start: string; end: string; allDay: boolean }) {
       if (!this.can("create", "club", "calendar")) return;
       this.openModal(
         markRaw(defineAsyncComponent(() => import("@/components/admin/club/calendar/CreateCalendarModal.vue"))),
         {
-          start: e?.startStr ?? new Date().toISOString(),
-          end: e?.endStr ?? new Date().toISOString(),
-          allDay: e?.allDay ?? false,
+          start,
+          end,
+          allDay,
         }
       );
     },
-    eventClick(e: any) {
+    eventClick(id: string) {
       if (!this.can("update", "club", "calendar")) return;
       this.openModal(
         markRaw(defineAsyncComponent(() => import("@/components/admin/club/calendar/UpdateCalendarModal.vue"))),
-        e.event.id
+        id
       );
     },
     openLinkModal(e: any) {
@@ -99,55 +71,4 @@ export default defineComponent({
     },
   },
 });
-
-/**
-locale: deLocale,
-      events: this.absencesList.map((x) => ({
-        id: x.absenceId,
-        start: x.startDate,
-        end: x.endDate,
-        allday: true,
-        backgroundColor: this.getColorForAbsenceType(x.absenceType),
-        borderColor: '#ffffff',
-        title: this.getAbsenceType(x.absenceType) + ' ' + x.fullName,
-      })),
-      plugins: [
-        interactionPlugin,
-        dayGridPlugin,
-        timeGridPlugin,
-        listPlugin,
-        multiMonthPlugin,
-      ],
-      initialView: 'dayGridMonth',
-      eventDisplay: 'block',
-      weekends: false,
-      editable: true,
-      selectable: true,
-      selectMirror: true,
-      dayMaxEvents: true,
-      weekNumbers: true,
-      displayEventTime: false,
-      weekText: 'KW',
-      validRange: { start: '2023-01-01', end: '' },
-      headerToolbar: {
-        left: 'today prev,next',
-        center: 'title',
-        right: 'listMonth,dayGridMonth,multiMonthYear,customview',
-      },
-      views: {
-        customview: {
-          type: 'multiMonth',
-          multiMonthMaxColumns: 1,
-          duration: { month: 12 },
-          buttonText: 'grid',
-        },
-      },
-      dateClick: this.handleDateSelect.bind(this),
-      datesSet: this.handleMonthChange.bind(this),
-      select: this.handleDateSelect.bind(this),
-      eventClick: this.handleEventClick.bind(this),
-      eventsSet: this.handleEvents.bind(this),
-    }; 
-
- */
 </script>
diff --git a/src/views/public/calendar/Calendar.vue b/src/views/public/calendar/Calendar.vue
index 956a34d..f4de6da 100644
--- a/src/views/public/calendar/Calendar.vue
+++ b/src/views/public/calendar/Calendar.vue
@@ -12,7 +12,7 @@
     </template>
     <template #diffMain>
       <div class="flex flex-col w-full h-full gap-2 justify-between px-7 overflow-hidden">
-        <FullCalendar :options="calendarOptions" class="max-h-full h-full" />
+        <CustomCalendar :items="formattedItems" :allow-interaction="false" @event-select="eventClick" />
       </div>
     </template>
   </MainTemplate>
@@ -23,14 +23,10 @@ import { defineComponent, markRaw, defineAsyncComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import { useModalStore } from "@/stores/modal";
 import MainTemplate from "@/templates/Main.vue";
-import FullCalendar from "@fullcalendar/vue3";
-import deLocale from "@fullcalendar/core/locales/de";
-import dayGridPlugin from "@fullcalendar/daygrid";
-import timeGridPlugin from "@fullcalendar/timegrid";
-import interactionPlugin from "@fullcalendar/interaction";
 import { InformationCircleIcon, LinkIcon } from "@heroicons/vue/24/outline";
 import type { CalendarViewModel } from "@/viewmodels/admin/club/calendar.models";
 import { RouterLink } from "vue-router";
+import CustomCalendar from "@/components/CustomCalendar.vue";
 </script>
 
 <script lang="ts">
@@ -50,32 +46,6 @@ export default defineComponent({
         backgroundColor: c.type.color,
       }));
     },
-    calendarOptions() {
-      return {
-        timeZone: "local",
-        locale: deLocale,
-        plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
-        initialView: "dayGridMonth",
-        headerToolbar: {
-          left: "dayGridMonth,timeGridWeek",
-          center: "title",
-          right: "prev,today,next",
-        },
-        eventDisplay: "block",
-        weekends: true,
-        editable: false,
-        selectable: false,
-        selectMirror: false,
-        dayMaxEvents: true,
-        weekNumbers: true,
-        displayEventTime: true,
-        nowIndicator: true,
-        weekText: "KW",
-        allDaySlot: false,
-        events: this.formattedItems,
-        eventClick: this.eventClick,
-      };
-    },
   },
   mounted() {
     this.fetchCalendars();
@@ -93,10 +63,10 @@ export default defineComponent({
     openLinkModal(e: any) {
       this.openModal(markRaw(defineAsyncComponent(() => import("@/components/public/calendar/CalendarLinkModal.vue"))));
     },
-    eventClick(e: any) {
+    eventClick(id: string) {
       this.openModal(
         markRaw(defineAsyncComponent(() => import("@/components/public/calendar/ShowCalendarEntryModal.vue"))),
-        this.calendars.find((c) => c.id == e.event.id)
+        this.calendars.find((c) => c.id == id)
       );
     },
   },

From 6d453255433ba532868dbb2739fa24e34decd18b Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 14 Apr 2025 09:17:32 +0200
Subject: [PATCH 03/45] add styling option for wide calendar view

---
 src/components/CustomCalendar.vue      | 17 +++++++++++++----
 src/views/public/calendar/Calendar.vue |  7 ++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/CustomCalendar.vue b/src/components/CustomCalendar.vue
index e31d2d6..edafd21 100644
--- a/src/components/CustomCalendar.vue
+++ b/src/components/CustomCalendar.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="flex flex-col w-full h-full gap-2 justify-between overflow-hidden">
-    <div class="flex flex-row gap-2 max-xl:flex-wrap justify-between max-sm:justify-center">
-      <div class="flex flex-row max-xl:order-2">
+    <div
+      class="flex flex-row gap-2 justify-between max-sm:justify-center"
+      :class="smallStyling ? 'max-lg:flex-wrap' : 'max-xl:flex-wrap'"
+    >
+      <div class="flex flex-row" :class="smallStyling ? 'max-lg:order-2' : 'max-xl:order-2'">
         <button
           :primary="view == 'dayGridMonth'"
           :primary-outline="view != 'dayGridMonth'"
@@ -27,8 +30,10 @@
           Liste
         </button>
       </div>
-      <p class="text-3xl w-full max-xl:order-1 text-center">{{ currentTitle }}</p>
-      <div class="flex flex-row max-xl:order-3">
+      <p class="text-3xl w-full text-center" :class="smallStyling ? 'max-lg:order-1' : 'max-xl:order-1'">
+        {{ currentTitle }}
+      </p>
+      <div class="flex flex-row" :class="smallStyling ? 'max-lg:order-3' : 'max-xl:order-3'">
         <button primary-outline class="rounded-r-none!" @click="navigateView('prev')">
           <ChevronLeftIcon />
         </button>
@@ -83,6 +88,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    smallStyling: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: {
     dateSelect: ({ start, end, allDay }: { start: string; end: string; allDay: boolean }) => {
diff --git a/src/views/public/calendar/Calendar.vue b/src/views/public/calendar/Calendar.vue
index f4de6da..8c68586 100644
--- a/src/views/public/calendar/Calendar.vue
+++ b/src/views/public/calendar/Calendar.vue
@@ -12,7 +12,12 @@
     </template>
     <template #diffMain>
       <div class="flex flex-col w-full h-full gap-2 justify-between px-7 overflow-hidden">
-        <CustomCalendar :items="formattedItems" :allow-interaction="false" @event-select="eventClick" />
+        <CustomCalendar
+          :items="formattedItems"
+          :allow-interaction="false"
+          :small-styling="true"
+          @event-select="eventClick"
+        />
       </div>
     </template>
   </MainTemplate>

From 5ce7aa8a17a2ea7aab6f0b74ddb28d3030eb8ba3 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 15 Apr 2025 09:26:25 +0200
Subject: [PATCH 04/45] add global sort

---
 src/components/queryBuilder/BuilderHost.vue   | 10 ++-
 src/components/queryBuilder/Join.vue          | 15 ++--
 src/components/queryBuilder/JoinTable.vue     | 35 +++++---
 src/components/queryBuilder/Order.vue         | 19 +++-
 .../queryBuilder/OrderStructure.vue           | 90 +++++++++++++++----
 src/components/queryBuilder/Table.vue         | 39 +++++---
 src/types/dynamicQueries.ts                   |  6 +-
 7 files changed, 157 insertions(+), 57 deletions(-)

diff --git a/src/components/queryBuilder/BuilderHost.vue b/src/components/queryBuilder/BuilderHost.vue
index bbb5b07..377a1bf 100644
--- a/src/components/queryBuilder/BuilderHost.vue
+++ b/src/components/queryBuilder/BuilderHost.vue
@@ -68,9 +68,9 @@
         </div>
       </div>
     </div>
-    <div class="p-2 h-44 md:h-60 w-full overflow-y-auto">
+    <div class="p-2 h-60 md:h-60 w-full overflow-y-auto">
       <textarea v-if="typeof value == 'string'" v-model="value" placeholder="SQL Query" class="h-full w-full" />
-      <Table v-else v-model="value" />
+      <Table v-else v-model="value" enableOrder />
     </div>
   </div>
 </template>
@@ -78,7 +78,7 @@
 <script setup lang="ts">
 import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
-import type { DynamicQueryStructure } from "@/types/dynamicQueries";
+import { type DynamicQueryStructure } from "@/types/dynamicQueries";
 import {
   ArchiveBoxArrowDownIcon,
   CommandLineIcon,
@@ -94,6 +94,7 @@ import { useModalStore } from "@/stores/modal";
 import Table from "./Table.vue";
 import { useAbilityStore } from "@/stores/ability";
 import { useQueryStoreStore } from "@/stores/admin/configuration/queryStore";
+import { v4 as uuid } from "uuid";
 </script>
 
 <script lang="ts">
@@ -102,6 +103,7 @@ export default defineComponent({
     modelValue: {
       type: [Object, String] as PropType<DynamicQueryStructure | string>,
       default: {
+        id: uuid(),
         select: "*",
         table: "",
         where: [],
@@ -163,6 +165,7 @@ export default defineComponent({
       this.activeQueryId = undefined;
       if (typeof this.value != "string") {
         this.value = {
+          id: uuid(),
           select: "*",
           table: "",
           where: [],
@@ -182,6 +185,7 @@ export default defineComponent({
       this.activeQueryId = undefined;
       if (this.queryMode == "builder") {
         this.value = {
+          id: uuid(),
           select: "*",
           table: "",
           where: [],
diff --git a/src/components/queryBuilder/Join.vue b/src/components/queryBuilder/Join.vue
index f652f96..85eb23a 100644
--- a/src/components/queryBuilder/Join.vue
+++ b/src/components/queryBuilder/Join.vue
@@ -7,6 +7,7 @@
           v-for="(join, index) in value"
           :model-value="join"
           :table="table"
+          :alreadyJoined="alreadyJoined"
           @update:model-value="($event) => (value[index] = $event)"
           @remove="removeAtIndex(index)"
         />
@@ -21,10 +22,11 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
-import type { DynamicQueryStructure } from "@/types/dynamicQueries";
+import { type DynamicQueryStructure } from "@/types/dynamicQueries";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import { PlusIcon } from "@heroicons/vue/24/outline";
 import JoinTable from "./JoinTable.vue";
+import { v4 as uuid } from "uuid";
 </script>
 
 <script lang="ts">
@@ -38,16 +40,14 @@ export default defineComponent({
       type: Array as PropType<Array<DynamicQueryStructure & { foreignColumn: string }>>,
       default: [],
     },
+    alreadyJoined: {
+      type: Array as PropType<Array<string>>,
+      default: [],
+    },
   },
   emits: ["update:model-value"],
-  data() {
-    return {};
-  },
   computed: {
     ...mapState(useQueryBuilderStore, ["tableMetas"]),
-    activeTable() {
-      return this.tableMetas.find((tm) => tm.tableName == this.table);
-    },
     value: {
       get() {
         return this.modelValue;
@@ -60,6 +60,7 @@ export default defineComponent({
   methods: {
     addToValue() {
       this.value.push({
+        id: uuid(),
         select: "*",
         table: "",
         where: [],
diff --git a/src/components/queryBuilder/JoinTable.vue b/src/components/queryBuilder/JoinTable.vue
index cedf9c3..773ef7b 100644
--- a/src/components/queryBuilder/JoinTable.vue
+++ b/src/components/queryBuilder/JoinTable.vue
@@ -4,8 +4,23 @@
       <div class="flex flex-col gap-2 w-full">
         <select v-model="foreignColumn" class="w-full">
           <option value="" disabled>Relation auswählen</option>
-          <option v-for="relation in activeTable?.relations" :value="relation.column">
+          <option
+            v-for="relation in activeTable?.relations"
+            :value="relation.column"
+            :disabled="
+              alreadyJoined.includes(joinTableName(relation.referencedTableName)) &&
+              joinTableName(relation.referencedTableName) != value.table
+            "
+          >
             {{ relation.column }} -> {{ joinTableName(relation.referencedTableName) }}
+            <span
+              v-if="
+                alreadyJoined.includes(joinTableName(relation.referencedTableName)) &&
+                joinTableName(relation.referencedTableName) != value.table
+              "
+            >
+              (Join auf dieser Ebene besteht schon)
+            </span>
           </option>
         </select>
         <Table v-model="value" disable-table-select />
@@ -20,7 +35,7 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
-import type { DynamicQueryStructure } from "@/types/dynamicQueries";
+import { type DynamicQueryStructure } from "@/types/dynamicQueries";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import Table from "./Table.vue";
 import { TrashIcon } from "@heroicons/vue/24/outline";
@@ -40,20 +55,14 @@ export default defineComponent({
           foreignColumn: string;
         }
       >,
-      default: {
-        select: "*",
-        table: "",
-        where: [],
-        join: [],
-        orderBy: [],
-        foreignColumn: "",
-      },
+      required: true,
+    },
+    alreadyJoined: {
+      type: Array as PropType<Array<string>>,
+      default: [],
     },
   },
   emits: ["update:model-value", "remove"],
-  data() {
-    return {};
-  },
   computed: {
     ...mapState(useQueryBuilderStore, ["tableMetas"]),
     activeTable() {
diff --git a/src/components/queryBuilder/Order.vue b/src/components/queryBuilder/Order.vue
index b8a6988..f633b42 100644
--- a/src/components/queryBuilder/Order.vue
+++ b/src/components/queryBuilder/Order.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="flex flex-row gap-2">
-    <p class="w-14 min-w-14 pt-2">ORDER</p>
+    <p class="w-14 min-w-14 pt-2">SORT</p>
     <div class="flex flex-row flex-wrap gap-2 items-center w-full">
       <OrderStructure
         v-for="(order, index) in value"
         :model-value="order"
         :table="table"
         :columns="columns"
+        :alreadySorted="alreadySorted"
         @update:model-value="($event) => (value[index] = $event)"
         @remove="removeAtIndex(index)"
       />
@@ -35,9 +36,15 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    // columns: {
+    //   type: [Array, String] as PropType<"*" | Array<string>>,
+    //   default: "*",
+    // },
     columns: {
-      type: [Array, String] as PropType<"*" | Array<string>>,
-      default: "*",
+      type: Array as PropType<
+        Array<{ table: string; id: string; depth: number; path: string[]; columns: "*" | string[] }>
+      >,
+      default: [],
     },
     modelValue: {
       type: Array as PropType<Array<OrderByStructure>>,
@@ -50,6 +57,9 @@ export default defineComponent({
   },
   computed: {
     ...mapState(useQueryBuilderStore, ["tableMetas"]),
+    alreadySorted() {
+      return this.modelValue.map((m) => ({ id: m.id, col: m.column }));
+    },
     value: {
       get() {
         return this.modelValue;
@@ -62,6 +72,9 @@ export default defineComponent({
   methods: {
     addToValue() {
       this.value.push({
+        id: "",
+        depth: 0,
+        table: "",
         column: "",
         order: "ASC",
       });
diff --git a/src/components/queryBuilder/OrderStructure.vue b/src/components/queryBuilder/OrderStructure.vue
index 4667fcb..cd15f86 100644
--- a/src/components/queryBuilder/OrderStructure.vue
+++ b/src/components/queryBuilder/OrderStructure.vue
@@ -2,14 +2,21 @@
   <div class="flex flex-row gap-2 items-center w-full">
     <select v-model="column" class="w-full">
       <option value="" disabled>Spalte auswählen</option>
-      <option v-for="column in selectableColumns" :value="column">
-        {{ column }}
+      <option
+        v-for="selectable in selectableColumns"
+        :value="`${selectable.id}_${selectable.column}`"
+        :disabled="
+          alreadySorted.some((as) => as.id == selectable.id && as.col == selectable.column) &&
+          `${selectable.id}_${selectable.column}` != column
+        "
+      >
+        {{ [...selectable.path, selectable.table].join("-") }} -> {{ selectable.column }}
       </option>
     </select>
     <select v-model="order">
       <option value="" disabled>Sortierung auswählen</option>
-      <option v-for="order in ['ASC', 'DESC']" :value="order">
-        {{ order }}
+      <option v-for="order in orderable" :value="order.key">
+        {{ order.val }}
       </option>
     </select>
     <div class="p-1 border border-gray-400 hover:bg-gray-200 rounded-md" @click="$emit('remove')">
@@ -33,37 +40,84 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    // columns: {
+    //   type: [Array, String] as PropType<"*" | Array<string>>,
+    //   default: "*",
+    // },
     columns: {
-      type: [Array, String] as PropType<"*" | Array<string>>,
-      default: "*",
+      type: Array as PropType<
+        Array<{ table: string; id: string; depth: number; path: string[]; columns: "*" | string[] }>
+      >,
+      default: [],
     },
     modelValue: {
       type: Object as PropType<OrderByStructure>,
       default: {},
     },
+    alreadySorted: {
+      type: Array as PropType<Array<{ id: string; col: string }>>,
+      default: [],
+    },
   },
   emits: ["update:model-value", "remove"],
+  watch: {
+    columns() {
+      if (!this.columns.some((c) => c.id == this.modelValue.id)) {
+        this.$emit("remove");
+      }
+    },
+  },
   data() {
-    return {};
+    return {
+      orderable: [
+        { key: "ASC", val: "Aufsteigend (ABC)" },
+        { key: "DESC", val: "Absteigend (CBA)" },
+      ],
+    };
   },
   computed: {
     ...mapState(useQueryBuilderStore, ["tableMetas"]),
+    // selectableColumns() {
+    //   if (this.columns == "*") {
+    //     let meta = this.tableMetas.find((tm) => tm.tableName == this.table);
+    //     if (!meta) return [];
+    //     let relCols = meta.relations.map((r) => r.column);
+    //     return meta.columns.map((c) => c.column).filter((c) => !relCols.includes(c));
+    //   } else {
+    //     return this.columns;
+    //   }
+    // },
     selectableColumns() {
-      if (this.columns == "*") {
-        let meta = this.tableMetas.find((tm) => tm.tableName == this.table);
-        if (!meta) return [];
-        let relCols = meta.relations.map((r) => r.column);
-        return meta.columns.map((c) => c.column).filter((c) => !relCols.includes(c));
-      } else {
-        return this.columns;
-      }
+      return this.columns.reduce(
+        (acc, curr) => {
+          if (curr.columns == "*") {
+            let meta = this.tableMetas.find((tm) => tm.tableName == this.table);
+            if (meta) {
+              let relCols = meta.relations.map((r) => r.column);
+              meta.columns
+                .map((c) => c.column)
+                .filter((c) => !relCols.includes(c))
+                .forEach((c) =>
+                  acc.push({ id: curr.id, depth: curr.depth, table: curr.table, column: c, path: curr.path })
+                );
+            }
+          } else {
+            curr.columns.forEach((c) =>
+              acc.push({ id: curr.id, depth: curr.depth, table: curr.table, column: c, path: curr.path })
+            );
+          }
+          return acc;
+        },
+        [] as Array<{ id: string; depth: number; table: string; column: string; path: string[] }>
+      );
     },
     column: {
       get() {
-        return this.modelValue.column;
+        return `${this.modelValue.id}_${this.modelValue.column}`;
       },
-      set(val: string) {
-        this.$emit("update:model-value", { ...this.modelValue, column: val });
+      set(val: `${string}_${string}`) {
+        let col = this.selectableColumns.find((sc) => sc.id == val.split("_")[0] && sc.column == val.split("_")[1]);
+        this.$emit("update:model-value", { ...this.modelValue, ...col });
       },
     },
     order: {
diff --git a/src/components/queryBuilder/Table.vue b/src/components/queryBuilder/Table.vue
index 3ad97ce..981e86a 100644
--- a/src/components/queryBuilder/Table.vue
+++ b/src/components/queryBuilder/Table.vue
@@ -3,16 +3,14 @@
     <TableSelect v-model="table" :disableTableSelect="disableTableSelect" />
     <ColumnSelect v-if="table != ''" v-model="columnSelect" :table="table" />
     <Where v-if="table != ''" v-model="where" :table="table" />
-    <Order v-if="table != ''" v-model="order" :table="table" :columns="columnSelect" />
-    <Join v-if="table != ''" v-model="modelValue.join" :table="table" />
+    <Join v-if="table != ''" v-model="modelValue.join" :table="table" :alreadyJoined="alreadyJoined" />
+    <Order v-if="table != '' && enableOrder" v-model="order" :table="table" :columns="nestedTablesByDepth" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
-import { mapActions, mapState } from "pinia";
-import type { ConditionStructure, DynamicQueryStructure, OrderByStructure } from "@/types/dynamicQueries";
-import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
+import { type ConditionStructure, type DynamicQueryStructure, type OrderByStructure } from "@/types/dynamicQueries";
 import ColumnSelect from "./ColumnSelect.vue";
 import Where from "./Where.vue";
 import Order from "./Order.vue";
@@ -25,21 +23,38 @@ export default defineComponent({
   props: {
     modelValue: {
       type: Object as PropType<DynamicQueryStructure>,
-      default: {
-        select: "*",
-        table: "",
-        where: [],
-        join: [],
-        orderBy: [],
-      },
+      required: true,
     },
     disableTableSelect: {
       type: Boolean,
       default: false,
     },
+    enableOrder: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ["update:model-value"],
   computed: {
+    alreadyJoined() {
+      return this.modelValue.join?.map((j) => j.table);
+    },
+    nestedTablesByDepth() {
+      const tables: Array<{ table: string; id: string; depth: number; path: string[]; columns: "*" | string[] }> = [];
+
+      function recurse(item: DynamicQueryStructure, path: string[]) {
+        tables.push({ table: item.table, id: item.id, depth: path.length, path, columns: item.select });
+        if (item.join) {
+          item.join.forEach((child) => {
+            recurse(child, [...path, item.table]);
+          });
+        }
+      }
+
+      recurse(this.modelValue, []);
+
+      return tables;
+    },
     table: {
       get() {
         return this.modelValue.table || "";
diff --git a/src/types/dynamicQueries.ts b/src/types/dynamicQueries.ts
index dfe3e09..adf4190 100644
--- a/src/types/dynamicQueries.ts
+++ b/src/types/dynamicQueries.ts
@@ -1,9 +1,10 @@
 export interface DynamicQueryStructure {
+  id: string;
   select: string[] | "*";
   table: string;
   where?: Array<ConditionStructure>;
   join?: Array<DynamicQueryStructure & { foreignColumn: string }>;
-  orderBy?: Array<OrderByStructure>;
+  orderBy?: Array<OrderByStructure>; // only at top level
 }
 
 export type ConditionStructure = (
@@ -48,6 +49,9 @@ export type WhereOperation =
 // TODO: age between | age equals | age greater | age smaller
 
 export type OrderByStructure = {
+  id: string;
+  depth: number;
+  table: string;
   column: string;
   order: OrderByType;
 };

From 8087108b908ec9c7c6e7f743d9c1ca251024b83b Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 15 Apr 2025 09:35:08 +0200
Subject: [PATCH 05/45] change order of sorts

---
 src/components/queryBuilder/Order.vue          | 10 ++++++++++
 src/components/queryBuilder/OrderStructure.vue | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/components/queryBuilder/Order.vue b/src/components/queryBuilder/Order.vue
index f633b42..a1d5332 100644
--- a/src/components/queryBuilder/Order.vue
+++ b/src/components/queryBuilder/Order.vue
@@ -8,6 +8,10 @@
         :table="table"
         :columns="columns"
         :alreadySorted="alreadySorted"
+        :notFirst="index != 0"
+        :notLast="index != value.length - 1"
+        @up="changeSort('up', index)"
+        @down="changeSort('down', index)"
         @update:model-value="($event) => (value[index] = $event)"
         @remove="removeAtIndex(index)"
       />
@@ -82,6 +86,12 @@ export default defineComponent({
     removeAtIndex(index: number) {
       this.value.splice(index, 1);
     },
+    changeSort(dir: "up" | "down", index: number) {
+      const swapIndex = dir === "up" ? index - 1 : index + 1;
+      if (swapIndex >= 0 && swapIndex < this.value.length) {
+        [this.value[index], this.value[swapIndex]] = [this.value[swapIndex], this.value[index]];
+      }
+    },
   },
 });
 </script>
diff --git a/src/components/queryBuilder/OrderStructure.vue b/src/components/queryBuilder/OrderStructure.vue
index cd15f86..9b57fd4 100644
--- a/src/components/queryBuilder/OrderStructure.vue
+++ b/src/components/queryBuilder/OrderStructure.vue
@@ -1,5 +1,9 @@
 <template>
   <div class="flex flex-row gap-2 items-center w-full">
+    <div class="flex flex-col min-w-fit">
+      <ChevronUpIcon v-if="notFirst" class="w-4 h-4 stroke-2 cursor-pointer" @click.prevent="$emit('up')" />
+      <ChevronDownIcon v-if="notLast" class="w-4 h-4 stroke-2 cursor-pointer" @click.prevent="$emit('down')" />
+    </div>
     <select v-model="column" class="w-full">
       <option value="" disabled>Spalte auswählen</option>
       <option
@@ -30,12 +34,20 @@ import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
 import type { OrderByStructure, OrderByType } from "@/types/dynamicQueries";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
-import { TrashIcon } from "@heroicons/vue/24/outline";
+import { TrashIcon, ChevronDownIcon, ChevronUpIcon } from "@heroicons/vue/24/outline";
 </script>
 
 <script lang="ts">
 export default defineComponent({
   props: {
+    notFirst: {
+      type: Boolean,
+      defailt: false,
+    },
+    notLast: {
+      type: Boolean,
+      defailt: false,
+    },
     table: {
       type: String,
       default: "",
@@ -59,7 +71,7 @@ export default defineComponent({
       default: [],
     },
   },
-  emits: ["update:model-value", "remove"],
+  emits: ["update:model-value", "remove", "up", "down"],
   watch: {
     columns() {
       if (!this.columns.some((c) => c.id == this.modelValue.id)) {

From 68b0aeffa8c2bbfcd75c880c4a6098af543f4cbc Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 15 Apr 2025 10:02:30 +0200
Subject: [PATCH 06/45] show correct columns to table

---
 src/components/queryBuilder/OrderStructure.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/queryBuilder/OrderStructure.vue b/src/components/queryBuilder/OrderStructure.vue
index 9b57fd4..21c63e2 100644
--- a/src/components/queryBuilder/OrderStructure.vue
+++ b/src/components/queryBuilder/OrderStructure.vue
@@ -103,7 +103,7 @@ export default defineComponent({
       return this.columns.reduce(
         (acc, curr) => {
           if (curr.columns == "*") {
-            let meta = this.tableMetas.find((tm) => tm.tableName == this.table);
+            let meta = this.tableMetas.find((tm) => tm.tableName == curr.table);
             if (meta) {
               let relCols = meta.relations.map((r) => r.column);
               meta.columns

From fc1185d1c80474adddc9d6a6385f11ae15bec7ae Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 15 Apr 2025 10:29:25 +0200
Subject: [PATCH 07/45] upgrade query to ids by default

---
 src/components/queryBuilder/BuilderHost.vue     |  5 +++++
 src/components/queryBuilder/Condition.vue       | 14 ++++++++++----
 src/components/queryBuilder/JoinTable.vue       |  6 ++++++
 src/components/queryBuilder/NestedCondition.vue | 14 ++++++++++----
 src/components/queryBuilder/Table.vue           | 14 ++++++++++++++
 src/components/queryBuilder/Where.vue           |  6 ++++--
 6 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/components/queryBuilder/BuilderHost.vue b/src/components/queryBuilder/BuilderHost.vue
index 377a1bf..174e2a1 100644
--- a/src/components/queryBuilder/BuilderHost.vue
+++ b/src/components/queryBuilder/BuilderHost.vue
@@ -131,6 +131,11 @@ export default defineComponent({
         this.value = query;
       }
     },
+    value() {
+      if (typeof this.value != "string" && !this.value.id) {
+        this.value.id = uuid();
+      }
+    },
   },
   data() {
     return {
diff --git a/src/components/queryBuilder/Condition.vue b/src/components/queryBuilder/Condition.vue
index 6a262d5..a78418b 100644
--- a/src/components/queryBuilder/Condition.vue
+++ b/src/components/queryBuilder/Condition.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-row gap-2 items-center w-full">
-    <select v-if="concat != '_'" v-model="concat" class="w-20! h-fit!">
+    <select v-if="!isFirst" v-model="concat" class="w-20! h-fit!">
       <option value="" disabled>Verknüpfung auswählen</option>
       <option v-for="operation in ['AND', 'OR']" :value="operation">
         {{ operation }}
@@ -68,6 +68,10 @@ import { TrashIcon } from "@heroicons/vue/24/outline";
 <script lang="ts">
 export default defineComponent({
   props: {
+    isFirst: {
+      type: Boolean,
+      default: false,
+    },
     table: {
       type: String,
       default: "",
@@ -78,9 +82,6 @@ export default defineComponent({
     },
   },
   emits: ["update:model-value", "remove"],
-  data() {
-    return {};
-  },
   computed: {
     ...mapState(useQueryBuilderStore, ["tableMetas"]),
     activeTable() {
@@ -144,5 +145,10 @@ export default defineComponent({
       },
     },
   },
+  mounted() {
+    if (this.concat == "_") {
+      this.concat = "AND";
+    }
+  },
 });
 </script>
diff --git a/src/components/queryBuilder/JoinTable.vue b/src/components/queryBuilder/JoinTable.vue
index 773ef7b..f8fac05 100644
--- a/src/components/queryBuilder/JoinTable.vue
+++ b/src/components/queryBuilder/JoinTable.vue
@@ -40,6 +40,7 @@ import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import Table from "./Table.vue";
 import { TrashIcon } from "@heroicons/vue/24/outline";
 import { joinTableName } from "@/helpers/queryFormatter";
+import { v4 as uuid } from "uuid";
 </script>
 
 <script lang="ts">
@@ -94,5 +95,10 @@ export default defineComponent({
       },
     },
   },
+  mounted() {
+    if (!this.value.id) {
+      this.value.id = uuid();
+    }
+  },
 });
 </script>
diff --git a/src/components/queryBuilder/NestedCondition.vue b/src/components/queryBuilder/NestedCondition.vue
index 2a7e073..e6f080b 100644
--- a/src/components/queryBuilder/NestedCondition.vue
+++ b/src/components/queryBuilder/NestedCondition.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-row gap-2 w-full border border-gray-300 rounded-md p-1">
-    <select v-if="concat != '_'" v-model="concat" class="w-20! h-fit!">
+    <select v-if="isFirst" v-model="concat" class="w-20! h-fit!">
       <option value="" disabled>Verknüpfung auswählen</option>
       <option v-for="operation in ['AND', 'OR']" :value="operation">
         {{ operation }}
@@ -28,6 +28,10 @@ import NestedWhere from "./NestedWhere.vue";
 <script lang="ts">
 export default defineComponent({
   props: {
+    isFirst: {
+      type: Boolean,
+      default: false,
+    },
     table: {
       type: String,
       default: "",
@@ -38,9 +42,6 @@ export default defineComponent({
     },
   },
   emits: ["update:model-value", "remove"],
-  data() {
-    return {};
-  },
   computed: {
     ...mapState(useQueryBuilderStore, ["tableMetas"]),
     concat: {
@@ -60,5 +61,10 @@ export default defineComponent({
       },
     },
   },
+  mounted() {
+    if (this.concat == "_") {
+      this.concat = "AND";
+    }
+  },
 });
 </script>
diff --git a/src/components/queryBuilder/Table.vue b/src/components/queryBuilder/Table.vue
index 981e86a..7f7b6ea 100644
--- a/src/components/queryBuilder/Table.vue
+++ b/src/components/queryBuilder/Table.vue
@@ -16,6 +16,7 @@ import Where from "./Where.vue";
 import Order from "./Order.vue";
 import Join from "./Join.vue";
 import TableSelect from "./TableSelect.vue";
+import { v4 as uuid } from "uuid";
 </script>
 
 <script lang="ts">
@@ -55,6 +56,14 @@ export default defineComponent({
 
       return tables;
     },
+    value: {
+      get() {
+        return this.modelValue;
+      },
+      set(val: DynamicQueryStructure) {
+        this.$emit("update:model-value", val);
+      },
+    },
     table: {
       get() {
         return this.modelValue.table || "";
@@ -96,5 +105,10 @@ export default defineComponent({
       },
     },
   },
+  mounted() {
+    if (!this.value.id) {
+      this.value.id = uuid();
+    }
+  },
 });
 </script>
diff --git a/src/components/queryBuilder/Where.vue b/src/components/queryBuilder/Where.vue
index 51c3ed8..e7db60e 100644
--- a/src/components/queryBuilder/Where.vue
+++ b/src/components/queryBuilder/Where.vue
@@ -5,6 +5,7 @@
       <div v-for="(condition, index) in value" class="contents">
         <NestedCondition
           v-if="condition.structureType == 'nested'"
+          :isFirst="index == 0"
           :model-value="condition"
           :table="table"
           @update:model-value="($event) => (value[index] = $event)"
@@ -12,6 +13,7 @@
         />
         <Condition
           v-else
+          :isFirst="index == 0"
           :model-value="condition"
           :table="table"
           @update:model-value="($event) => (value[index] = $event)"
@@ -74,14 +76,14 @@ export default defineComponent({
     addNestedToValue() {
       this.value.push({
         structureType: "nested",
-        concat: this.value.length == 0 ? "_" : "AND",
+        concat: "AND",
         conditions: [],
       });
     },
     addConditionToValue() {
       this.value.push({
         structureType: "condition",
-        concat: this.value.length == 0 ? "_" : "AND",
+        concat: "AND",
         operation: "eq",
         column: "",
         value: "",

From 9a7785917c81d43e0827f8772a5794ec362e92f2 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 15 Apr 2025 10:45:15 +0200
Subject: [PATCH 08/45] show changes detected

---
 src/components/queryBuilder/BuilderHost.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/queryBuilder/BuilderHost.vue b/src/components/queryBuilder/BuilderHost.vue
index 174e2a1..035ca81 100644
--- a/src/components/queryBuilder/BuilderHost.vue
+++ b/src/components/queryBuilder/BuilderHost.vue
@@ -30,6 +30,9 @@
         v-if="allowPredefinedSelect && can('read', 'configuration', 'query_store')"
         class="flex flex-row gap-2 max-lg:w-full max-lg:order-10"
       >
+        <div v-if="!isAsStored" class="p-1 border border-gray-400 bg-gray-100 rounded-md" title="Änderung erkannt">
+          <DocumentCurrencyRupeeIcon class="text-gray-500 h-6 w-6 cursor-pointer" />
+        </div>
         <select v-model="activeQueryId" class="max-h-[34px] py-0!">
           <option :value="undefined" disabled>gepeicherte Anfrage auswählen</option>
           <option v-for="query in queries" :key="query.id" :value="query.id">
@@ -88,6 +91,7 @@ import {
   RectangleGroupIcon,
   TrashIcon,
   SparklesIcon,
+  DocumentCurrencyRupeeIcon,
 } from "@heroicons/vue/24/outline";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import { useModalStore } from "@/stores/modal";
@@ -95,6 +99,7 @@ import Table from "./Table.vue";
 import { useAbilityStore } from "@/stores/ability";
 import { useQueryStoreStore } from "@/stores/admin/configuration/queryStore";
 import { v4 as uuid } from "uuid";
+import cloneDeep from "lodash.clonedeep";
 </script>
 
 <script lang="ts">
@@ -128,7 +133,7 @@ export default defineComponent({
         } else {
           this.queryMode = "builder";
         }
-        this.value = query;
+        this.value = cloneDeep(query);
       }
     },
     value() {
@@ -156,6 +161,11 @@ export default defineComponent({
         this.$emit("update:model-value", val);
       },
     },
+    isAsStored() {
+      let stored = this.queries.find((q) => q.id == this.activeQueryId);
+      if (!stored) return true;
+      return JSON.stringify(this.value) == JSON.stringify(stored.query);
+    },
   },
   mounted() {
     this.fetchTableMetas();

From 238a35da9f5dd2e52abf3aa8d8302f161e37d3c7 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 16 Apr 2025 16:11:10 +0200
Subject: [PATCH 09/45] extend query builder by custom join

---
 src/components/queryBuilder/BuilderHost.vue |   2 +-
 src/components/queryBuilder/Join.vue        |   9 +-
 src/components/queryBuilder/JoinTable.vue   | 115 ++++++++++++++------
 src/components/queryBuilder/Table.vue       |   6 +-
 src/types/dynamicQueries.ts                 |   4 +-
 src/views/admin/club/query/Builder.vue      |   7 +-
 6 files changed, 97 insertions(+), 46 deletions(-)

diff --git a/src/components/queryBuilder/BuilderHost.vue b/src/components/queryBuilder/BuilderHost.vue
index 035ca81..b1d0c67 100644
--- a/src/components/queryBuilder/BuilderHost.vue
+++ b/src/components/queryBuilder/BuilderHost.vue
@@ -71,7 +71,7 @@
         </div>
       </div>
     </div>
-    <div class="p-2 h-60 md:h-60 w-full overflow-y-auto">
+    <div class="p-2 h-44 md:h-60 w-full overflow-y-auto">
       <textarea v-if="typeof value == 'string'" v-model="value" placeholder="SQL Query" class="h-full w-full" />
       <Table v-else v-model="value" enableOrder />
     </div>
diff --git a/src/components/queryBuilder/Join.vue b/src/components/queryBuilder/Join.vue
index 85eb23a..e92c37a 100644
--- a/src/components/queryBuilder/Join.vue
+++ b/src/components/queryBuilder/Join.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-row gap-2">
-    <p class="w-14 min-w-14 pt-2">JOIN</p>
+    <p class="w-14 min-w-14 pt-2">I_JOIN</p>
     <div class="flex flex-row flex-wrap gap-2 items-center w-full">
       <div class="flex flex-row flex-wrap gap-2 items-center justify-end w-full">
         <JoinTable
@@ -22,7 +22,7 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
-import { type DynamicQueryStructure } from "@/types/dynamicQueries";
+import { type DynamicQueryStructure, type JoinStructure } from "@/types/dynamicQueries";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import { PlusIcon } from "@heroicons/vue/24/outline";
 import JoinTable from "./JoinTable.vue";
@@ -37,7 +37,7 @@ export default defineComponent({
       default: "",
     },
     modelValue: {
-      type: Array as PropType<Array<DynamicQueryStructure & { foreignColumn: string }>>,
+      type: Array as PropType<Array<DynamicQueryStructure & JoinStructure>>,
       default: [],
     },
     alreadyJoined: {
@@ -52,7 +52,7 @@ export default defineComponent({
       get() {
         return this.modelValue;
       },
-      set(val: Array<DynamicQueryStructure & { foreignColumn: string }>) {
+      set(val: Array<DynamicQueryStructure & JoinStructure>) {
         this.$emit("update:model-value", val);
       },
     },
@@ -66,6 +66,7 @@ export default defineComponent({
         where: [],
         join: [],
         orderBy: [],
+        type: "defined",
         foreignColumn: "",
       });
     },
diff --git a/src/components/queryBuilder/JoinTable.vue b/src/components/queryBuilder/JoinTable.vue
index f8fac05..453ae0a 100644
--- a/src/components/queryBuilder/JoinTable.vue
+++ b/src/components/queryBuilder/JoinTable.vue
@@ -2,28 +2,51 @@
   <div class="flex flex-row gap-2 w-full">
     <div class="flex flex-row gap-2 w-full">
       <div class="flex flex-col gap-2 w-full">
-        <select v-model="foreignColumn" class="w-full">
-          <option value="" disabled>Relation auswählen</option>
-          <option
-            v-for="relation in activeTable?.relations"
-            :value="relation.column"
-            :disabled="
-              alreadyJoined.includes(joinTableName(relation.referencedTableName)) &&
-              joinTableName(relation.referencedTableName) != value.table
-            "
+        <div class="flex flex-row gap-2 w-full">
+          <div
+            class="h-fit p-1 border border-gray-400 hover:bg-gray-200 rounded-md"
+            title="Join Modus wechseln"
+            @click="swapJoinType(value.type)"
           >
-            {{ relation.column }} -> {{ joinTableName(relation.referencedTableName) }}
-            <span
-              v-if="
+            <ArrowsUpDownIcon class="text-gray-500 h-6 w-6 cursor-pointer" />
+          </div>
+
+          <select v-if="value.type == 'defined'" v-model="context" class="w-full">
+            <option value="" disabled>Relation auswählen</option>
+            <option
+              v-for="relation in activeTable?.relations"
+              :value="relation.column"
+              :disabled="
                 alreadyJoined.includes(joinTableName(relation.referencedTableName)) &&
                 joinTableName(relation.referencedTableName) != value.table
               "
             >
-              (Join auf dieser Ebene besteht schon)
-            </span>
-          </option>
-        </select>
-        <Table v-model="value" disable-table-select />
+              {{ relation.column }} -> {{ joinTableName(relation.referencedTableName) }}
+              <span
+                v-if="
+                  alreadyJoined.includes(joinTableName(relation.referencedTableName)) &&
+                  joinTableName(relation.referencedTableName) != value.table
+                "
+              >
+                (Join auf dieser Ebene besteht schon)
+              </span>
+            </option>
+          </select>
+          <div v-else class="flex flex-col w-full">
+            <select v-model="joinTable">
+              <option value="" disabled>Tabelle auswählen</option>
+              <option
+                v-for="table in tableMetas"
+                :value="table.tableName"
+                :disabled="alreadyJoined.includes(table.tableName) && table.tableName != value.table"
+              >
+                {{ table.tableName }}
+              </option>
+            </select>
+            <input v-model="context" type="text" placeholder="Join Condition tabA.col = tabB.col" />
+          </div>
+        </div>
+        <Table v-model="value" disable-table-select :show-table-select="false" />
       </div>
       <div class="h-fit p-1 border border-gray-400 hover:bg-gray-200 rounded-md" @click="$emit('remove')">
         <TrashIcon class="text-gray-500 h-6 w-6 cursor-pointer" />
@@ -35,10 +58,10 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { mapActions, mapState } from "pinia";
-import { type DynamicQueryStructure } from "@/types/dynamicQueries";
+import { type DynamicQueryStructure, type JoinStructure } from "@/types/dynamicQueries";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import Table from "./Table.vue";
-import { TrashIcon } from "@heroicons/vue/24/outline";
+import { ArrowsUpDownIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { joinTableName } from "@/helpers/queryFormatter";
 import { v4 as uuid } from "uuid";
 </script>
@@ -51,11 +74,7 @@ export default defineComponent({
       default: "",
     },
     modelValue: {
-      type: Object as PropType<
-        DynamicQueryStructure & {
-          foreignColumn: string;
-        }
-      >,
+      type: Object as PropType<DynamicQueryStructure & JoinStructure>,
       required: true,
     },
     alreadyJoined: {
@@ -73,24 +92,43 @@ export default defineComponent({
       get() {
         return this.modelValue;
       },
-      set(
-        val: DynamicQueryStructure & {
-          foreignColumn: string;
-        }
-      ) {
+      set(val: DynamicQueryStructure & JoinStructure) {
         this.$emit("update:model-value", val);
       },
     },
-    foreignColumn: {
+    context: {
       get() {
-        return this.modelValue.foreignColumn;
+        if (this.modelValue.type == "defined") {
+          return this.modelValue.foreignColumn ?? "";
+        } else {
+          return this.modelValue.condition ?? "";
+        }
+      },
+      set(val: string) {
+        console.log(val, this.modelValue.type);
+        if (this.modelValue.type == "defined") {
+          let relTable = this.activeTable?.relations.find((r) => r.column == val);
+          this.$emit("update:model-value", {
+            ...this.modelValue,
+            foreignColumn: val,
+            table: joinTableName(relTable?.referencedTableName ?? ""),
+          });
+        } else {
+          this.$emit("update:model-value", {
+            ...this.modelValue,
+            condition: val,
+          });
+        }
+      },
+    },
+    joinTable: {
+      get(): string {
+        return this.modelValue.table;
       },
       set(val: string) {
-        let relTable = this.activeTable?.relations.find((r) => r.column == val);
         this.$emit("update:model-value", {
           ...this.modelValue,
-          foreignColumn: val,
-          table: joinTableName(relTable?.referencedTableName ?? ""),
+          table: val,
         });
       },
     },
@@ -100,5 +138,14 @@ export default defineComponent({
       this.value.id = uuid();
     }
   },
+  methods: {
+    swapJoinType(type: string) {
+      if (type == "defined") {
+        this.value.type = "custom";
+      } else {
+        this.value.type = "defined";
+      }
+    },
+  },
 });
 </script>
diff --git a/src/components/queryBuilder/Table.vue b/src/components/queryBuilder/Table.vue
index 7f7b6ea..a1697dc 100644
--- a/src/components/queryBuilder/Table.vue
+++ b/src/components/queryBuilder/Table.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col gap-2 w-full">
-    <TableSelect v-model="table" :disableTableSelect="disableTableSelect" />
+    <TableSelect v-if="showTableSelect" v-model="table" :disableTableSelect="disableTableSelect" />
     <ColumnSelect v-if="table != ''" v-model="columnSelect" :table="table" />
     <Where v-if="table != ''" v-model="where" :table="table" />
     <Join v-if="table != ''" v-model="modelValue.join" :table="table" :alreadyJoined="alreadyJoined" />
@@ -34,6 +34,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    showTableSelect: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: ["update:model-value"],
   computed: {
diff --git a/src/types/dynamicQueries.ts b/src/types/dynamicQueries.ts
index adf4190..161f590 100644
--- a/src/types/dynamicQueries.ts
+++ b/src/types/dynamicQueries.ts
@@ -3,7 +3,7 @@ export interface DynamicQueryStructure {
   select: string[] | "*";
   table: string;
   where?: Array<ConditionStructure>;
-  join?: Array<DynamicQueryStructure & { foreignColumn: string }>;
+  join?: Array<DynamicQueryStructure & JoinStructure>;
   orderBy?: Array<OrderByStructure>; // only at top level
 }
 
@@ -48,6 +48,8 @@ export type WhereOperation =
   | "timespanEq"; // Date before x years (YYYY-01-01 <bis> YYYY-12-31)
 // TODO: age between | age equals | age greater | age smaller
 
+export type JoinStructure = { foreignColumn: string; type: "defined" } | { condition: string; type: "custom" };
+
 export type OrderByStructure = {
   id: string;
   depth: number;
diff --git a/src/views/admin/club/query/Builder.vue b/src/views/admin/club/query/Builder.vue
index 29025fc..08b0b0d 100644
--- a/src/views/admin/club/query/Builder.vue
+++ b/src/views/admin/club/query/Builder.vue
@@ -70,14 +70,11 @@ import { useQueryStoreStore } from "@/stores/admin/configuration/queryStore";
 <script lang="ts">
 export default defineComponent({
   computed: {
-    ...mapState(useQueryBuilderStore, ["loading", "loadingData", "tableMetas", "data", "totalLength", "queryError"]),
+    ...mapState(useQueryBuilderStore, ["loading", "loadingData", "data", "totalLength", "queryError"]),
     ...mapWritableState(useQueryBuilderStore, ["query"]),
   },
-  mounted() {
-    this.fetchTableMetas();
-  },
   methods: {
-    ...mapActions(useQueryBuilderStore, ["fetchTableMetas", "sendQuery", "clearResults", "exportData"]),
+    ...mapActions(useQueryBuilderStore, ["sendQuery", "clearResults", "exportData"]),
     ...mapActions(useQueryStoreStore, ["triggerSave"]),
   },
 });

From f94cc8b365ebdb306e73d681ae90c35f1997c82e Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 16 Apr 2025 16:37:24 +0200
Subject: [PATCH 10/45] deactivate custom join switch

deactivated custom join switch as data is not passed down
---
 src/components/queryBuilder/JoinTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/queryBuilder/JoinTable.vue b/src/components/queryBuilder/JoinTable.vue
index 453ae0a..130185c 100644
--- a/src/components/queryBuilder/JoinTable.vue
+++ b/src/components/queryBuilder/JoinTable.vue
@@ -4,6 +4,7 @@
       <div class="flex flex-col gap-2 w-full">
         <div class="flex flex-row gap-2 w-full">
           <div
+            v-if="false"
             class="h-fit p-1 border border-gray-400 hover:bg-gray-200 rounded-md"
             title="Join Modus wechseln"
             @click="swapJoinType(value.type)"
@@ -105,7 +106,6 @@ export default defineComponent({
         }
       },
       set(val: string) {
-        console.log(val, this.modelValue.type);
         if (this.modelValue.type == "defined") {
           let relTable = this.activeTable?.relations.find((r) => r.column == val);
           this.$emit("update:model-value", {

From ea38b1835c1110de96671004fc70d3ed95320c53 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 16 Apr 2025 17:02:28 +0200
Subject: [PATCH 11/45] 1.4.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ffb14ad..7c33dbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ff-admin",
-  "version": "1.3.6",
+  "version": "1.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin",
-      "version": "1.3.6",
+      "version": "1.4.0",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fullcalendar/core": "^6.1.15",
diff --git a/package.json b/package.json
index bf134da..cf05645 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ff-admin",
-  "version": "1.3.6",
+  "version": "1.4.0",
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {

From 9a9742597a8d67e2b591bc5a5deb8b7693782296 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 17 Apr 2025 15:34:27 +0200
Subject: [PATCH 12/45] fix: calendar height after custom calendar header

---
 src/components/CustomCalendar.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/CustomCalendar.vue b/src/components/CustomCalendar.vue
index edafd21..549a7ff 100644
--- a/src/components/CustomCalendar.vue
+++ b/src/components/CustomCalendar.vue
@@ -53,7 +53,9 @@
         </button>
       </div>
     </div>
-    <FullCalendar ref="fullCalendar" :options="calendarOptions" class="max-h-full h-full" />
+    <div class="flex flex-col w-full grow overflow-hidden">
+      <FullCalendar ref="fullCalendar" :options="calendarOptions" class="max-h-full h-full" />
+    </div>
   </div>
 </template>
 

From caf1919930cdfdf57e204230e9972c138dcb3400 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 18 Apr 2025 11:10:49 +0200
Subject: [PATCH 13/45] 1.4.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c33dbf..e8eaacd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ff-admin",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin",
-      "version": "1.4.0",
+      "version": "1.4.1",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fullcalendar/core": "^6.1.15",
diff --git a/package.json b/package.json
index cf05645..9121444 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ff-admin",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {

From fb783609465d3387bf9a160bdd2bb1c566bdf4bb Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 19 Apr 2025 09:24:55 +0200
Subject: [PATCH 14/45] show who does not have newsletter configured

---
 src/components/admin/MemberSearchSelect.vue   |  9 +-
 .../club/newsletter/NewsletterRecipients.vue  | 82 +++++++++++--------
 2 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/src/components/admin/MemberSearchSelect.vue b/src/components/admin/MemberSearchSelect.vue
index 50efd6f..c56b0ef 100644
--- a/src/components/admin/MemberSearchSelect.vue
+++ b/src/components/admin/MemberSearchSelect.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="w-full">
     <Combobox v-model="selected" :disabled="disabled" multiple>
-      <ComboboxLabel>{{ title }}</ComboboxLabel>
-      <div class="relative mt-1">
+      <ComboboxLabel v-if="!showTitleAsPlaceholder">{{ title }}</ComboboxLabel>
+      <div class="relative" :class="{ 'mt-1': !showTitleAsPlaceholder }">
         <ComboboxInput
           class="rounded-md shadow-xs relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-hidden focus:ring-0 focus:z-10 sm:text-sm resize-none"
+          :placeholder="showTitleAsPlaceholder ? title : ''"
           @input="query = $event.target.value"
         />
         <ComboboxButton class="absolute inset-y-0 right-0 flex items-center pr-2">
@@ -101,6 +102,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    showTitleAsPlaceholder: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ["update:model-value", "add:difference", "remove:difference", "add:member", "add:memberByArray"],
   watch: {
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index 568dd0f..c71df25 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -4,52 +4,54 @@
     <p v-else-if="loading == 'failed'" @click="fetchNewsletterRecipients" class="cursor-pointer">
       &#8634; laden fehlgeschlagen
     </p>
-    <div class="flex flex-col gap-2 h-1/2">
+    <div v-if="!showMemberSelect" class="flex flex-row gap-2 items-center">
       <select v-model="recipientsByQueryId">
         <option value="def">Optional</option>
         <option v-for="query in queries" :key="query.id" :value="query.id">{{ query.title }}</option>
       </select>
-      <p>Empfänger durch gespeicherte Abfrage</p>
-      <div class="flex flex-col gap-2 grow overflow-y-auto">
-        <div
-          v-for="member in queried"
-          :key="member.id"
-          class="flex flex-row h-fit w-full border border-primary rounded-md bg-primary p-2 text-white justify-between items-center"
-        >
-          <div>
-            <p>{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}</p>
-            <p>Newsletter senden an Typ: {{ member.sendNewsletter?.type.type }}</p>
-          </div>
-        </div>
+      <div title="Empfänger manuell hinzufügen" @click="showMemberSelect = true">
+        <UserPlusIcon class="w-7 h-7 cursor-pointer" />
       </div>
     </div>
-    <div class="flex flex-col gap-2 h-1/2">
+    <div v-else class="flex flex-row gap-2 items-center">
       <MemberSearchSelect
         title="weitere Empfänger suchen"
+        showTitleAsPlaceholder
         v-model="recipients"
         :disabled="!can('create', 'club', 'newsletter')"
       />
-
-      <p>Ausgewählte Empfänger</p>
-      <div class="flex flex-col gap-2 grow overflow-y-auto">
-        <div
-          v-for="member in selected"
-          :key="member.id"
-          class="flex flex-row h-fit w-full border border-primary rounded-md bg-primary p-2 text-white justify-between items-center"
-        >
-          <div>
-            <p>{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}</p>
-            <p>Newsletter senden an Typ: {{ member.sendNewsletter?.type.type }}</p>
-          </div>
-
-          <TrashIcon
-            v-if="can('create', 'club', 'newsletter')"
-            class="w-5 h-5 p-1 box-content cursor-pointer"
-            @click="removeSelected(member.id)"
-          />
-        </div>
+      <div title="Empfänger über Query hinzufügen" @click="showMemberSelect = false">
+        <ArchiveBoxIcon class="w-7 h-7 cursor-pointer" />
       </div>
     </div>
+    <p v-if="!showMemberSelect">Empfänger durch gespeicherte Abfrage</p>
+    <p v-else>Ausgewählte Empfänger</p>
+
+    <div class="flex flex-col gap-2 grow overflow-y-auto">
+      <div
+        v-for="member in showRecipientsByMode"
+        :key="member.id"
+        class="flex flex-row gap-2 h-fit w-full border border-primary rounded-md bg-primary p-2 text-white items-center"
+      >
+        <ExclamationTriangleIcon v-if="member.sendNewsletter?.type.type == null" class="w-7 h-7" />
+
+        <div class="grow">
+          <p>{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}</p>
+          <p>Newsletter senden an Typ: {{ member.sendNewsletter?.type.type ?? "---" }}</p>
+        </div>
+
+        <TrashIcon
+          v-if="can('create', 'club', 'newsletter') && showMemberSelect"
+          class="w-5 h-5 p-1 box-content cursor-pointer"
+          @click="removeSelected(member.id)"
+        />
+      </div>
+    </div>
+
+    <div v-if="countOfNoConfig != 0" class="flex flex-row items-center gap-2 pt-3">
+      <ExclamationTriangleIcon class="text-red-500 w-5 h-5" />
+      <p>{{ countOfNoConfig }} Mitglieder der Auswahl haben keinen Newsletter-Versand konfiguriert!</p>
+    </div>
   </div>
 </template>
 
@@ -67,7 +69,7 @@ import {
   TransitionRoot,
 } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { TrashIcon } from "@heroicons/vue/24/outline";
+import { ArchiveBoxIcon, ExclamationTriangleIcon, TrashIcon, UserPlusIcon } from "@heroicons/vue/24/outline";
 import { useMemberStore } from "@/stores/admin/club/member/member";
 import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
@@ -93,6 +95,7 @@ export default defineComponent({
     return {
       query: "" as String,
       members: [] as Array<MemberViewModel>,
+      showMemberSelect: false as boolean,
     };
   },
   computed: {
@@ -125,6 +128,17 @@ export default defineComponent({
           .some((d) => (d.memberId ?? d.id) == m.id)
       );
     },
+    showRecipientsByMode() {
+      return (this.showMemberSelect ? this.selected : this.queried).sort((a, b) => {
+        const aHasConfig = a.sendNewsletter?.type.type != null;
+        const bHasConfig = b.sendNewsletter?.type.type != null;
+        if (aHasConfig === bHasConfig) return 0;
+        return aHasConfig ? -1 : 1;
+      });
+    },
+    countOfNoConfig() {
+      return this.showRecipientsByMode.filter((member) => member.sendNewsletter?.type.type == null).length;
+    },
     recipientsByQueryId: {
       get() {
         return this.activeNewsletterObj?.recipientsByQueryId ?? "def";

From b19e8df5616f9dc3bc6776a8ca14b725303bc34c Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 19 Apr 2025 09:42:25 +0200
Subject: [PATCH 15/45] add send none to newsletter config

---
 .../newsletterConfig/NewsletterConfigListItem.vue      |  8 ++++----
 src/enums/newsletterConfigEnum.ts                      |  5 +++++
 src/enums/newsletterConfigType.ts                      |  4 ----
 src/stores/admin/configuration/newsletterConfig.ts     |  2 +-
 .../admin/configuration/newsletterConfig.models.ts     |  6 +++---
 .../admin/club/newsletter/NewsletterRecipients.vue     | 10 ++++++----
 6 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 src/enums/newsletterConfigEnum.ts
 delete mode 100644 src/enums/newsletterConfigType.ts

diff --git a/src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue b/src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue
index da19c83..a4e7842 100644
--- a/src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue
+++ b/src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue
@@ -3,13 +3,13 @@
     <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
       <p>Newsletter bei Type "{{ comType.type }}" versenden/exportieren als</p>
       <div v-if="can('create', 'configuration', 'newsletter_config')" class="flex flex-row justify-end w-16">
-        <button v-if="status == null" type="submit" class="p-0! h-fit! w-fit!" title="speichern">
+        <button v-if="status == null" type="submit" class="p-0! h-fit! w-fit!" title="Änderung speichern">
           <ArchiveBoxArrowDownIcon class="w-5 h-5 p-1 box-content pointer-events-none" />
         </button>
         <Spinner v-else-if="status == 'loading'" class="my-auto" />
         <SuccessCheckmark v-else-if="status?.status == 'success'" />
         <FailureXMark v-else-if="status?.status == 'failed'" />
-        <button type="button" class="p-0! h-fit! w-fit!" title="zurücksetzen" @click="resetForm">
+        <button type="button" class="p-0! h-fit! w-fit!" title="Änderung zurücksetzen" @click="resetForm">
           <ArchiveBoxXMarkIcon class="w-5 h-5 p-1 box-content pointer-events-none" />
         </button>
       </div>
@@ -36,7 +36,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useModalStore } from "@/stores/modal";
-import { NewsletterConfigType } from "@/enums/newsletterConfigType";
+import { NewsletterConfigEnum } from "@/enums/newsletterConfigEnum";
 import type { AxiosResponse } from "axios";
 import type { CommunicationTypeViewModel } from "@/viewmodels/admin/configuration/communicationType.models";
 import { useAbilityStore } from "@/stores/ability";
@@ -62,7 +62,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    this.configs = Object.values(NewsletterConfigType);
+    this.configs = Object.values(NewsletterConfigEnum);
   },
   beforeUnmount() {
     try {
diff --git a/src/enums/newsletterConfigEnum.ts b/src/enums/newsletterConfigEnum.ts
new file mode 100644
index 0000000..1e7313f
--- /dev/null
+++ b/src/enums/newsletterConfigEnum.ts
@@ -0,0 +1,5 @@
+export enum NewsletterConfigEnum {
+  pdf = "pdf",
+  mail = "mail",
+  none = "none",
+}
diff --git a/src/enums/newsletterConfigType.ts b/src/enums/newsletterConfigType.ts
deleted file mode 100644
index 4703494..0000000
--- a/src/enums/newsletterConfigType.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum NewsletterConfigType {
-  pdf = "pdf",
-  mail = "mail",
-}
diff --git a/src/stores/admin/configuration/newsletterConfig.ts b/src/stores/admin/configuration/newsletterConfig.ts
index 3bb12be..eef3687 100644
--- a/src/stores/admin/configuration/newsletterConfig.ts
+++ b/src/stores/admin/configuration/newsletterConfig.ts
@@ -6,7 +6,7 @@ import type {
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
-export const useNewsletterConfigStore = defineStore("newsletterConfi", {
+export const useNewsletterConfigStore = defineStore("newsletterConfig", {
   state: () => {
     return {
       config: [] as Array<NewsletterConfigViewModel>,
diff --git a/src/viewmodels/admin/configuration/newsletterConfig.models.ts b/src/viewmodels/admin/configuration/newsletterConfig.models.ts
index 6d8be6f..a5a0684 100644
--- a/src/viewmodels/admin/configuration/newsletterConfig.models.ts
+++ b/src/viewmodels/admin/configuration/newsletterConfig.models.ts
@@ -1,13 +1,13 @@
-import type { NewsletterConfigType } from "@/enums/newsletterConfigType";
+import type { NewsletterConfigEnum } from "@/enums/newsletterConfigEnum";
 import type { CommunicationTypeViewModel } from "./communicationType.models";
 
 export interface NewsletterConfigViewModel {
   comTypeId: number;
-  config: NewsletterConfigType;
+  config: NewsletterConfigEnum;
   comType: CommunicationTypeViewModel;
 }
 
 export interface SetNewsletterConfigViewModel {
   comTypeId: number;
-  config: NewsletterConfigType;
+  config: NewsletterConfigEnum;
 }
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index c71df25..dac8ed7 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -4,6 +4,7 @@
     <p v-else-if="loading == 'failed'" @click="fetchNewsletterRecipients" class="cursor-pointer">
       &#8634; laden fehlgeschlagen
     </p>
+
     <div v-if="!showMemberSelect" class="flex flex-row gap-2 items-center">
       <select v-model="recipientsByQueryId">
         <option value="def">Optional</option>
@@ -24,6 +25,7 @@
         <ArchiveBoxIcon class="w-7 h-7 cursor-pointer" />
       </div>
     </div>
+
     <p v-if="!showMemberSelect">Empfänger durch gespeicherte Abfrage</p>
     <p v-else>Ausgewählte Empfänger</p>
 
@@ -33,7 +35,7 @@
         :key="member.id"
         class="flex flex-row gap-2 h-fit w-full border border-primary rounded-md bg-primary p-2 text-white items-center"
       >
-        <ExclamationTriangleIcon v-if="member.sendNewsletter?.type.type == null" class="w-7 h-7" />
+        <ExclamationTriangleIcon v-if="member.sendNewsletter == null" class="w-7 h-7" />
 
         <div class="grow">
           <p>{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}</p>
@@ -130,14 +132,14 @@ export default defineComponent({
     },
     showRecipientsByMode() {
       return (this.showMemberSelect ? this.selected : this.queried).sort((a, b) => {
-        const aHasConfig = a.sendNewsletter?.type.type != null;
-        const bHasConfig = b.sendNewsletter?.type.type != null;
+        const aHasConfig = a.sendNewsletter != null;
+        const bHasConfig = b.sendNewsletter != null;
         if (aHasConfig === bHasConfig) return 0;
         return aHasConfig ? -1 : 1;
       });
     },
     countOfNoConfig() {
-      return this.showRecipientsByMode.filter((member) => member.sendNewsletter?.type.type == null).length;
+      return this.showRecipientsByMode.filter((member) => member.sendNewsletter == null).length;
     },
     recipientsByQueryId: {
       get() {

From a20c0d3ed3876fba83c6aa1c374418e036533aee Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 19 Apr 2025 10:05:01 +0200
Subject: [PATCH 16/45] enhance: use QueryStoreId to fetch query

---
 src/stores/admin/club/queryBuilder.ts         | 11 +++++++
 .../club/newsletter/newsletter.models.ts      |  3 --
 .../club/newsletter/NewsletterRecipients.vue  | 30 ++++++++-----------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/stores/admin/club/queryBuilder.ts b/src/stores/admin/club/queryBuilder.ts
index 2aad8af..1633c3c 100644
--- a/src/stores/admin/club/queryBuilder.ts
+++ b/src/stores/admin/club/queryBuilder.ts
@@ -2,6 +2,7 @@ import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import type { TableMeta } from "@/viewmodels/admin/configuration/query.models";
 import type { DynamicQueryStructure, FieldType } from "@/types/dynamicQueries";
+import type { AxiosResponse } from "axios";
 
 export const useQueryBuilderStore = defineStore("queryBuilder", {
   state: () => {
@@ -58,6 +59,16 @@ export const useQueryBuilderStore = defineStore("queryBuilder", {
           this.loadingData = "failed";
         });
     },
+    async sendQueryByStoreId(
+      id: string,
+      offset = 0,
+      count = 25,
+      noLimit: boolean = false
+    ): Promise<AxiosResponse<any, any>> {
+      return await http.post(
+        `/admin/querybuilder/query/${id}?` + (noLimit ? `noLimit=true` : `offset=${offset}&count=${count}`)
+      );
+    },
     clearResults() {
       this.data = [];
       this.totalLength = 0;
diff --git a/src/viewmodels/admin/club/newsletter/newsletter.models.ts b/src/viewmodels/admin/club/newsletter/newsletter.models.ts
index 31926bc..84d2988 100644
--- a/src/viewmodels/admin/club/newsletter/newsletter.models.ts
+++ b/src/viewmodels/admin/club/newsletter/newsletter.models.ts
@@ -1,5 +1,3 @@
-import type { QueryViewModel } from "../../configuration/query.models";
-
 export interface NewsletterViewModel {
   id: number;
   title: string;
@@ -9,7 +7,6 @@ export interface NewsletterViewModel {
   newsletterSignatur: string;
   isSent: boolean;
   recipientsByQueryId?: string | null;
-  recipientsByQuery?: QueryViewModel | null;
 }
 
 export interface CreateNewsletterViewModel {
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index dac8ed7..5335e82 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -81,6 +81,7 @@ import { useQueryStoreStore } from "@/stores/admin/configuration/queryStore";
 import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
 import cloneDeep from "lodash.clonedeep";
 import MemberSearchSelect from "@/components/admin/MemberSearchSelect.vue";
+import type { FieldType } from "@/types/dynamicQueries";
 </script>
 
 <script lang="ts">
@@ -88,14 +89,9 @@ export default defineComponent({
   props: {
     newsletterId: String,
   },
-  watch: {
-    recipientsByQuery() {
-      this.loadQuery();
-    },
-  },
   data() {
     return {
-      query: "" as String,
+      queryResult: [] as Array<{ id: FieldType; [key: string]: FieldType }>,
       members: [] as Array<MemberViewModel>,
       showMemberSelect: false as boolean,
     };
@@ -104,7 +100,6 @@ export default defineComponent({
     ...mapWritableState(useNewsletterRecipientsStore, ["recipients", "loading"]),
     ...mapWritableState(useNewsletterStore, ["activeNewsletterObj"]),
     ...mapState(useQueryStoreStore, ["queries"]),
-    ...mapState(useQueryBuilderStore, ["data"]),
     ...mapState(useAbilityStore, ["can"]),
     selected(): Array<MemberViewModel> {
       return this.members
@@ -119,10 +114,10 @@ export default defineComponent({
     },
     queried(): Array<MemberViewModel> {
       if (this.recipientsByQueryId == "def") return [];
-      let keys = Object.keys(this.data?.[0] ?? {});
+      let keys = Object.keys(this.queryResult?.[0] ?? {});
       let memberKey = keys.find((k) => k.includes("member_id"));
       return this.members.filter((m) =>
-        this.data
+        this.queryResult
           .map((t) => ({
             id: t.id,
             ...(memberKey ? { memberId: t[memberKey] } : {}),
@@ -149,17 +144,12 @@ export default defineComponent({
         if (this.activeNewsletterObj == undefined) return;
         if (val == "def") {
           this.activeNewsletterObj.recipientsByQueryId = null;
-          this.activeNewsletterObj.recipientsByQuery = null;
         } else if (this.queries.find((q) => q.id == val)) {
           this.activeNewsletterObj.recipientsByQueryId = val;
-          this.activeNewsletterObj.recipientsByQuery = cloneDeep(this.queries.find((q) => q.id == val));
-          this.sendQuery(0, 0, this.recipientsByQuery?.query, true);
+          this.loadQuery();
         }
       },
     },
-    recipientsByQuery() {
-      return this.activeNewsletterObj?.recipientsByQuery;
-    },
   },
   mounted() {
     // this.fetchNewsletterRecipients();
@@ -171,7 +161,7 @@ export default defineComponent({
     ...mapActions(useMemberStore, ["getAllMembers"]),
     ...mapActions(useNewsletterRecipientsStore, ["fetchNewsletterRecipients"]),
     ...mapActions(useQueryStoreStore, ["fetchQueries"]),
-    ...mapActions(useQueryBuilderStore, ["sendQuery"]),
+    ...mapActions(useQueryBuilderStore, ["sendQueryByStoreId"]),
     removeSelected(id: string) {
       let index = this.recipients.findIndex((s) => s == id);
       if (index != -1) {
@@ -186,8 +176,12 @@ export default defineComponent({
         .catch(() => {});
     },
     loadQuery() {
-      if (this.recipientsByQuery) {
-        this.sendQuery(0, 0, this.recipientsByQuery.query, true);
+      if (this.recipientsByQueryId != "def") {
+        this.sendQueryByStoreId(this.recipientsByQueryId, 0, 0, true)
+          .then((result) => {
+            this.queryResult = result.data.rows;
+          })
+          .catch(() => {});
       }
     },
   },

From 20a2a3ccd06083da3cef8af1cfd667916c823b2a Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 24 Apr 2025 16:49:14 +0200
Subject: [PATCH 17/45] move pwa manifest to backend

---
 .env.example                |   6 +-----
 .env.production             |   6 +-----
 entrypoint.sh               |   9 ++-------
 index.html                  |   7 +++++--
 package-lock.json           |   7 +++++++
 package.json                |   1 +
 public/Logo.png             | Bin 35299 -> 0 bytes
 public/favicon.ico          | Bin 9662 -> 0 bytes
 public/favicon.png          | Bin 29706 -> 0 bytes
 src/App.vue                 |  22 +++++++++++++++++++++-
 src/components/AppLogo.vue  |   7 +++++++
 src/components/Header.vue   |   3 ++-
 src/main.ts                 |   3 +++
 src/router/index.ts         |   6 ------
 src/serverCom.ts            |   2 +-
 src/stores/configuration.ts |  30 ++++++++++++++++++++++++++++++
 src/views/Login.vue         |   3 ++-
 src/views/invite/Verify.vue |   3 ++-
 src/views/reset/Reset.vue   |   3 ++-
 src/views/reset/Start.vue   |   3 ++-
 src/views/setup/Setup.vue   |   3 ++-
 src/views/setup/Verify.vue  |   3 ++-
 vite.config.ts              |  22 ++--------------------
 23 files changed, 95 insertions(+), 54 deletions(-)
 delete mode 100644 public/Logo.png
 delete mode 100644 public/favicon.ico
 delete mode 100644 public/favicon.png
 create mode 100644 src/components/AppLogo.vue
 create mode 100644 src/stores/configuration.ts

diff --git a/.env.example b/.env.example
index 4de72c4..f7e858f 100644
--- a/.env.example
+++ b/.env.example
@@ -1,5 +1 @@
-VITE_SERVER_ADDRESS = backend_url #ohne pfad
-VITE_APP_NAME_OVERWRITE = Mitgliederverwaltung # overwrites FF Admin
-VITE_IMPRINT_LINK = https://mywebsite-imprint-url
-VITE_PRIVACY_LINK = https://mywebsite-privacy-url
-VITE_CUSTOM_LOGIN_MESSAGE = betrieben von xy
+VITE_SERVER_ADDRESS = backend_url #ohne pfad
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 6696bbd..27c9fc3 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1 @@
-VITE_SERVER_ADDRESS = __SERVERADDRESS__
-VITE_APP_NAME_OVERWRITE = __APPNAMEOVERWRITE__
-VITE_IMPRINT_LINK = __IMPRINTLINK__
-VITE_PRIVACY_LINK = __PRIVACYLINK__
-VITE_CUSTOM_LOGIN_MESSAGE = __CUSTOMLOGINMESSAGE__
\ No newline at end of file
+VITE_SERVER_ADDRESS = __SERVERADDRESS__
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index 87660c6..75edc0b 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-keys="SERVERADDRESS APPNAMEOVERWRITE IMPRINTLINK PRIVACYLINK CUSTOMLOGINMESSAGE"
-files="/usr/share/nginx/html/assets/config-*.js /usr/share/nginx/html/manifest.webmanifest"
+keys="SERVERADDRESS"
+files="/usr/share/nginx/html/assets/config-*.js"
 
 # Replace env vars in files served by NGINX
 for file in $files
@@ -12,11 +12,6 @@ do
     # Get environment variable
     value=$(eval echo "\$$key")
 
-    # Set default value for APPNAMEOVERWRITE if empty
-    if [ "$key" = "APPNAMEOVERWRITE" ] && [ -z "$value" ]; then
-      value="FF Admin"
-    fi
-
     echo "replace $key by $value"
 
     # replace __[variable_name]__ value with environment variable
diff --git a/index.html b/index.html
index 35046b4..1d1d2bb 100644
--- a/index.html
+++ b/index.html
@@ -2,11 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="/favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover" />
+    <!-- icon and manifest are provided by App.vue -->
   </head>
   <body>
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
+    <script>
+      // screen.orientation.lock("portrait-primary").catch(() => {});
+    </script>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
index 7c33dbf..0c6c56a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,6 +35,7 @@
         "nprogress": "^0.2.0",
         "pdf-dist": "^1.0.0",
         "pinia": "^3.0.2",
+        "pwacompat": "^2.0.17",
         "qrcode": "^1.5.3",
         "qs": "^6.11.2",
         "socket.io-client": "^4.5.0",
@@ -8752,6 +8753,12 @@
         "node": ">=6"
       }
     },
+    "node_modules/pwacompat": {
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/pwacompat/-/pwacompat-2.0.17.tgz",
+      "integrity": "sha512-6Du7IZdIy7cHiv7AhtDy4X2QRM8IAD5DII69mt5qWibC2d15ZU8DmBG1WdZKekG11cChSu4zkSUGPF9sweOl6w==",
+      "license": "Apache-2.0"
+    },
     "node_modules/qrcode": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
diff --git a/package.json b/package.json
index cf05645..73f97b9 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "nprogress": "^0.2.0",
     "pdf-dist": "^1.0.0",
     "pinia": "^3.0.2",
+    "pwacompat": "^2.0.17",
     "qrcode": "^1.5.3",
     "qs": "^6.11.2",
     "socket.io-client": "^4.5.0",
diff --git a/public/Logo.png b/public/Logo.png
deleted file mode 100644
index a2760bc868de85b44416af5d33796f9672566b06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35299
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

diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 2f7aa89557ca102b2f3b45701077b5133db60aa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9662
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

diff --git a/public/favicon.png b/public/favicon.png
deleted file mode 100644
index 39a8174e006b997c1611424429a4054898f06329..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29706
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

diff --git a/src/App.vue b/src/App.vue
index 385415e..e818e36 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,6 +8,11 @@
   </div>
   <Footer @contextmenu.prevent />
   <Notification />
+
+  <Teleport to="head">
+    <link rel="icon" type="image/ico" :href="config.server_address + '/api/public/favicon.ico'" />
+    <link rel="manifest" :href="config.server_address + '/api/public/manifest.webmanifest'" />
+  </Teleport>
 </template>
 
 <script setup lang="ts">
@@ -15,20 +20,32 @@ import { defineComponent } from "vue";
 import { RouterView } from "vue-router";
 import Header from "./components/Header.vue";
 import Footer from "./components/Footer.vue";
-import { mapState } from "pinia";
+import { mapActions, mapState } from "pinia";
 import { useAuthStore } from "./stores/auth";
 import { isAuthenticatedPromise } from "./router/authGuard";
 import ContextMenu from "./components/ContextMenu.vue";
 import Modal from "./components/Modal.vue";
 import Notification from "./components/Notification.vue";
+import { config } from "./config";
+import { useConfigurationStore } from "@/stores/configuration";
 </script>
 
 <script lang="ts">
 export default defineComponent({
+  watch: {
+    clubName() {
+      document.title = this.clubName;
+    },
+  },
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
+    ...mapState(useConfigurationStore, ["clubName"]),
   },
   mounted() {
+    this.configure();
+
+    document.title = this.clubName;
+
     if (!this.authCheck && localStorage.getItem("access_token")) {
       isAuthenticatedPromise().catch(() => {
         localStorage.removeItem("access_token");
@@ -36,5 +53,8 @@ export default defineComponent({
       });
     }
   },
+  methods: {
+    ...mapActions(useConfigurationStore, ["configure"]),
+  },
 });
 </script>
diff --git a/src/components/AppLogo.vue b/src/components/AppLogo.vue
new file mode 100644
index 0000000..f29cffc
--- /dev/null
+++ b/src/components/AppLogo.vue
@@ -0,0 +1,7 @@
+<template>
+  <img :src="url + '/api/public/applogo.png'" alt="LOGO" class="h-full w-auto" />
+</template>
+
+<script setup lang="ts">
+import { url } from "@/serverCom";
+</script>
diff --git a/src/components/Header.vue b/src/components/Header.vue
index d2235fa..ab29aa3 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -1,7 +1,7 @@
 <template>
   <header class="flex flex-row h-16 min-h-16 justify-between p-3 md:px-5 bg-white shadow-xs">
     <RouterLink to="/" class="flex flex-row gap-2 align-bottom w-fit h-full">
-      <img src="/Logo.png" alt="LOGO" class="h-full w-auto" />
+      <AppLogo />
       <h1 v-if="false" class="font-bold text-3xl w-fit whitespace-nowrap">
         {{ config.app_name_overwrite || "FF Admin" }}
       </h1>
@@ -42,6 +42,7 @@ import { config } from "@/config";
 
 <script lang="ts">
 import { defineComponent } from "vue";
+import AppLogo from "./AppLogo.vue";
 export default defineComponent({
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
diff --git a/src/main.ts b/src/main.ts
index fdb7f03..8939925 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,6 +9,9 @@ import "../node_modules/nprogress/nprogress.css";
 import { http } from "./serverCom";
 import "./main.css";
 
+// auto generates splash screen for iOS
+import "pwacompat";
+
 NProgress.configure({ showSpinner: false });
 
 const app = createApp(App);
diff --git a/src/router/index.ts b/src/router/index.ts
index e2e484c..7b713d5 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,14 +2,12 @@ import { createRouter, createWebHistory } from "vue-router";
 import Login from "@/views/Login.vue";
 
 import { isAuthenticated } from "./authGuard";
-import { loadAccountData } from "./accountGuard";
 import { isSetup } from "./setupGuard";
 import { abilityAndNavUpdate } from "./adminGuard";
 import type { PermissionType, PermissionSection, PermissionModule } from "@/types/permissionTypes";
 import { resetMemberStores, setMemberId } from "./memberGuard";
 import { resetProtocolStores, setProtocolId } from "./protocolGuard";
 import { resetNewsletterStores, setNewsletterId } from "./newsletterGuard";
-import { config } from "../config";
 import { setBackupPage } from "./backupGuard";
 
 const router = createRouter({
@@ -777,10 +775,6 @@ const router = createRouter({
   ],
 });
 
-router.afterEach((to, from) => {
-  document.title = config.app_name_overwrite || "FF Admin";
-});
-
 export default router;
 
 declare module "vue-router" {
diff --git a/src/serverCom.ts b/src/serverCom.ts
index 5249bf1..ad4d39f 100644
--- a/src/serverCom.ts
+++ b/src/serverCom.ts
@@ -135,4 +135,4 @@ async function* streamingFetch(path: string, abort?: AbortController) {
   }
 }
 
-export { http, newEventSource, streamingFetch, host };
+export { http, newEventSource, streamingFetch, host, url };
diff --git a/src/stores/configuration.ts b/src/stores/configuration.ts
new file mode 100644
index 0000000..1c920f2
--- /dev/null
+++ b/src/stores/configuration.ts
@@ -0,0 +1,30 @@
+import { defineStore } from "pinia";
+import { http } from "../serverCom";
+
+export const useConfigurationStore = defineStore("configuration", {
+  state: () => {
+    return {
+      clubName: "",
+      clubImprint: "",
+      clubPrivacy: "",
+      clubWebsite: "",
+      appCustom_login_message: "",
+      appShow_link_to_calendar: "",
+    };
+  },
+  actions: {
+    configure() {
+      http
+        .get("/public/configuration")
+        .then((res) => {
+          this.clubName = res.data["club.name"];
+          this.clubImprint = res.data["club.imprint"];
+          this.clubPrivacy = res.data["club.privacy"];
+          this.clubWebsite = res.data["club.website"];
+          this.appCustom_login_message = res.data["app.custom_login_message"];
+          this.appShow_link_to_calendar = res.data["app.show_link_to_calendar"];
+        })
+        .catch(() => {});
+    },
+  },
+});
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 5a8b9f4..268fdc4 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -2,7 +2,7 @@
   <div class="grow flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
     <div class="max-w-md w-full space-y-8 pb-20">
       <div class="flex flex-col items-center gap-4">
-        <img src="/Logo.png" alt="LOGO" class="h-auto w-full" />
+        <AppLogo />
         <h2 class="text-center text-4xl font-extrabold text-gray-900">
           {{ config.app_name_overwrite || "FF Admin" }}
         </h2>
@@ -51,6 +51,7 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import { resetAllPiniaStores } from "@/helpers/piniaReset";
 import FormBottomBar from "@/components/FormBottomBar.vue";
 import { config } from "@/config";
+import AppLogo from "@/components/AppLogo.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/invite/Verify.vue b/src/views/invite/Verify.vue
index 8fa1b2c..f2cbed2 100644
--- a/src/views/invite/Verify.vue
+++ b/src/views/invite/Verify.vue
@@ -2,7 +2,7 @@
   <div class="grow flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
     <div class="max-w-md w-full space-y-8 pb-20">
       <div class="flex flex-col items-center gap-4">
-        <img src="/Logo.png" alt="LOGO" class="h-auto w-full" />
+        <AppLogo />
         <h2 class="text-center text-4xl font-extrabold text-gray-900">Einrichtung</h2>
       </div>
 
@@ -49,6 +49,7 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import FormBottomBar from "@/components/FormBottomBar.vue";
 import TextCopy from "@/components/TextCopy.vue";
+import AppLogo from "@/components/AppLogo.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/reset/Reset.vue b/src/views/reset/Reset.vue
index 5910c22..bf0fabf 100644
--- a/src/views/reset/Reset.vue
+++ b/src/views/reset/Reset.vue
@@ -2,7 +2,7 @@
   <div class="grow flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
     <div class="max-w-md w-full space-y-8 pb-20">
       <div class="flex flex-col items-center gap-4">
-        <img src="/Logo.png" alt="LOGO" class="h-auto w-full" />
+        <AppLogo />
         <h2 class="text-center text-4xl font-extrabold text-gray-900">TOTP zurücksetzen</h2>
       </div>
 
@@ -49,6 +49,7 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
 import FormBottomBar from "@/components/FormBottomBar.vue";
 import TextCopy from "@/components/TextCopy.vue";
+import AppLogo from "@/components/AppLogo.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/reset/Start.vue b/src/views/reset/Start.vue
index 5a76d1d..5d9abd7 100644
--- a/src/views/reset/Start.vue
+++ b/src/views/reset/Start.vue
@@ -2,7 +2,7 @@
   <div class="grow flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
     <div class="max-w-md w-full space-y-8 pb-20">
       <div class="flex flex-col items-center gap-4">
-        <img src="/Logo.png" alt="LOGO" class="h-auto w-full" />
+        <AppLogo />
         <h2 class="text-center text-4xl font-extrabold text-gray-900">TOTP zurücksetzen</h2>
       </div>
 
@@ -36,6 +36,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import FormBottomBar from "@/components/FormBottomBar.vue";
+import AppLogo from "@/components/AppLogo.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/setup/Setup.vue b/src/views/setup/Setup.vue
index f8c30bd..dda3e04 100644
--- a/src/views/setup/Setup.vue
+++ b/src/views/setup/Setup.vue
@@ -2,7 +2,7 @@
   <div class="grow flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
     <div class="max-w-md w-full space-y-8 pb-20">
       <div class="flex flex-col items-center gap-4">
-        <img src="/Logo.png" alt="LOGO" class="h-auto w-full" />
+        <AppLogo />
         <h2 class="text-center text-4xl font-extrabold text-gray-900">Einrichtung</h2>
       </div>
 
@@ -44,6 +44,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import FormBottomBar from "@/components/FormBottomBar.vue";
+import AppLogo from "@/components/AppLogo.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/setup/Verify.vue b/src/views/setup/Verify.vue
index 6e6c666..91c55bc 100644
--- a/src/views/setup/Verify.vue
+++ b/src/views/setup/Verify.vue
@@ -2,7 +2,7 @@
   <div class="grow flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
     <div class="max-w-md w-full space-y-8 pb-20">
       <div class="flex flex-col items-center gap-4">
-        <img src="/Logo.png" alt="LOGO" class="h-auto w-full" />
+        <AppLogo />
         <h2 class="text-center text-4xl font-extrabold text-gray-900">Einrichtung</h2>
       </div>
 
@@ -50,6 +50,7 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import { RouterLink } from "vue-router";
 import FormBottomBar from "@/components/FormBottomBar.vue";
 import TextCopy from "@/components/TextCopy.vue";
+import AppLogo from "@/components/AppLogo.vue";
 </script>
 
 <script lang="ts">
diff --git a/vite.config.ts b/vite.config.ts
index 48e4a8d..2944004 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -39,27 +39,9 @@ export default defineConfig({
     VitePWA({
       registerType: "autoUpdate",
       injectRegister: "auto",
-      includeAssets: ["favicon.png", "favicon.ico"],
-      manifest: {
-        name: "__APPNAMEOVERWRITE__",
-        short_name: "__APPNAMEOVERWRITE__",
-        theme_color: "#990b00",
-        display: "standalone",
-        start_url: "/",
-        icons: [
-          {
-            src: "favicon.ico",
-            sizes: "48x48",
-            type: "image/ico",
-          },
-          {
-            src: "favicon.png",
-            sizes: "512x512",
-            type: "image/png",
-          },
-        ],
-      },
+      manifest: false,
       workbox: {
+        navigateFallbackDenylist: [/^\/api*/],
         runtimeCaching: [
           {
             urlPattern: /^\/api\//,

From 5d9007f5175a92edde57c885cbf357aa6de003d1 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 25 Apr 2025 08:18:27 +0200
Subject: [PATCH 18/45] display app configuration values

---
 src/App.vue                      |  8 +-------
 src/components/FormBottomBar.vue | 24 ++++++++++++++++++++----
 src/components/Header.vue        |  5 +++--
 src/components/UserMenu.vue      |  2 +-
 src/config.ts                    |  8 --------
 src/stores/configuration.ts      |  2 +-
 src/views/Login.vue              |  8 ++++++--
 src/views/account/View.vue       |  9 +++------
 src/views/setup/Setup.vue        |  2 +-
 src/views/setup/Verify.vue       |  2 +-
 10 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e818e36..b4895f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,6 +10,7 @@
   <Notification />
 
   <Teleport to="head">
+    <title>{{ clubName }}</title>
     <link rel="icon" type="image/ico" :href="config.server_address + '/api/public/favicon.ico'" />
     <link rel="manifest" :href="config.server_address + '/api/public/manifest.webmanifest'" />
   </Teleport>
@@ -32,11 +33,6 @@ import { useConfigurationStore } from "@/stores/configuration";
 
 <script lang="ts">
 export default defineComponent({
-  watch: {
-    clubName() {
-      document.title = this.clubName;
-    },
-  },
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
     ...mapState(useConfigurationStore, ["clubName"]),
@@ -44,8 +40,6 @@ export default defineComponent({
   mounted() {
     this.configure();
 
-    document.title = this.clubName;
-
     if (!this.authCheck && localStorage.getItem("access_token")) {
       isAuthenticatedPromise().catch(() => {
         localStorage.removeItem("access_token");
diff --git a/src/components/FormBottomBar.vue b/src/components/FormBottomBar.vue
index 8e0de42..808842d 100644
--- a/src/components/FormBottomBar.vue
+++ b/src/components/FormBottomBar.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="flex flex-col text-gray-400 text-sm mt-4 items-center">
     <div class="flex flex-row gap-2 justify-center">
-      <a v-if="config.imprint_link" :href="config.imprint_link" target="_blank">Datenschutz</a>
-      <a v-if="config.privacy_link" :href="config.privacy_link" target="_blank">Impressum</a>
+      <a v-if="clubImprint" :href="clubImprint" target="_blank">Datenschutz</a>
+      <a v-if="clubPrivacy" :href="clubPrivacy" target="_blank">Impressum</a>
     </div>
-    <p v-if="config.custom_login_message">{{ config.custom_login_message }}</p>
+    <p v-if="appCustom_login_message">{{ appCustom_login_message }}</p>
     <p>
       <a href="https://ff-admin.de/admin" target="_blank">FF Admin</a>
       entwickelt von
@@ -14,5 +14,21 @@
 </template>
 
 <script setup lang="ts">
-import { config } from "@/config";
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import { useConfigurationStore } from "@/stores/configuration";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  computed: {
+    ...mapState(useConfigurationStore, [
+      "appCustom_login_message",
+      "appShow_link_to_calendar",
+      "clubImprint",
+      "clubPrivacy",
+      "clubWebsite",
+    ]),
+  },
+});
 </script>
diff --git a/src/components/Header.vue b/src/components/Header.vue
index ab29aa3..9872753 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -3,7 +3,7 @@
     <RouterLink to="/" class="flex flex-row gap-2 align-bottom w-fit h-full">
       <AppLogo />
       <h1 v-if="false" class="font-bold text-3xl w-fit whitespace-nowrap">
-        {{ config.app_name_overwrite || "FF Admin" }}
+        {{ clubName }}
       </h1>
     </RouterLink>
     <div class="flex flex-row gap-2 items-center">
@@ -37,16 +37,17 @@ import { useAuthStore } from "@/stores/auth";
 import { useNavigationStore } from "@/stores/admin/navigation";
 import TopLevelLink from "./admin/TopLevelLink.vue";
 import UserMenu from "./UserMenu.vue";
-import { config } from "@/config";
 </script>
 
 <script lang="ts">
 import { defineComponent } from "vue";
 import AppLogo from "./AppLogo.vue";
+import { useConfigurationStore } from "../stores/configuration";
 export default defineComponent({
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
     ...mapState(useNavigationStore, ["topLevel"]),
+    ...mapState(useConfigurationStore, ["clubName"]),
     routeName() {
       return typeof this.$route.name == "string" ? this.$route.name : "";
     },
diff --git a/src/components/UserMenu.vue b/src/components/UserMenu.vue
index 586e56b..7879731 100644
--- a/src/components/UserMenu.vue
+++ b/src/components/UserMenu.vue
@@ -25,7 +25,7 @@
               <button button primary @click="close">Mein Account</button>
             </RouterLink>
           </MenuItem>
-          <MenuItem v-slot="{ close }">
+          <MenuItem v-if="false" v-slot="{ close }">
             <RouterLink to="/docs" target="_blank">
               <button button primary @click="close">Dokumentation</button>
             </RouterLink>
diff --git a/src/config.ts b/src/config.ts
index 1351e98..ccba337 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,15 +1,7 @@
 export interface Config {
   server_address: string;
-  app_name_overwrite: string;
-  imprint_link: string;
-  privacy_link: string;
-  custom_login_message: string;
 }
 
 export const config: Config = {
   server_address: import.meta.env.VITE_SERVER_ADDRESS,
-  app_name_overwrite: import.meta.env.VITE_APP_NAME_OVERWRITE,
-  imprint_link: import.meta.env.VITE_IMPRINT_LINK,
-  privacy_link: import.meta.env.VITE_PRIVACY_LINK,
-  custom_login_message: import.meta.env.VITE_CUSTOM_LOGIN_MESSAGE,
 };
diff --git a/src/stores/configuration.ts b/src/stores/configuration.ts
index 1c920f2..c33803a 100644
--- a/src/stores/configuration.ts
+++ b/src/stores/configuration.ts
@@ -9,7 +9,7 @@ export const useConfigurationStore = defineStore("configuration", {
       clubPrivacy: "",
       clubWebsite: "",
       appCustom_login_message: "",
-      appShow_link_to_calendar: "",
+      appShow_link_to_calendar: false as boolean,
     };
   },
   actions: {
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 268fdc4..2ad96f7 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -4,7 +4,7 @@
       <div class="flex flex-col items-center gap-4">
         <AppLogo />
         <h2 class="text-center text-4xl font-extrabold text-gray-900">
-          {{ config.app_name_overwrite || "FF Admin" }}
+          {{ clubName }}
         </h2>
       </div>
 
@@ -50,8 +50,9 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { resetAllPiniaStores } from "@/helpers/piniaReset";
 import FormBottomBar from "@/components/FormBottomBar.vue";
-import { config } from "@/config";
 import AppLogo from "@/components/AppLogo.vue";
+import { mapState } from "pinia";
+import { useConfigurationStore } from "@/stores/configuration";
 </script>
 
 <script lang="ts">
@@ -62,6 +63,9 @@ export default defineComponent({
       loginError: "" as string,
     };
   },
+  computed: {
+    ...mapState(useConfigurationStore, ["clubName"]),
+  },
   mounted() {
     resetAllPiniaStores();
   },
diff --git a/src/views/account/View.vue b/src/views/account/View.vue
index 8662849..ff1d0cd 100644
--- a/src/views/account/View.vue
+++ b/src/views/account/View.vue
@@ -1,11 +1,7 @@
 <template>
   <SidebarLayout>
     <template #sidebar>
-      <SidebarTemplate
-        mainTitle="Mein Account"
-        :topTitle="config.app_name_overwrite || 'FF Admin'"
-        :showTopList="isOwner"
-      >
+      <SidebarTemplate mainTitle="Mein Account" :topTitle="clubName" :showTopList="isOwner">
         <template v-if="isOwner" #topList>
           <RoutingLink
             title="Administration"
@@ -42,13 +38,14 @@ import SidebarTemplate from "@/templates/Sidebar.vue";
 import RoutingLink from "@/components/admin/RoutingLink.vue";
 import { RouterView } from "vue-router";
 import { useAbilityStore } from "@/stores/ability";
-import { config } from "@/config";
+import { useConfigurationStore } from "@/stores/configuration";
 </script>
 
 <script lang="ts">
 export default defineComponent({
   computed: {
     ...mapState(useAbilityStore, ["isOwner"]),
+    ...mapState(useConfigurationStore, ["clubName"]),
     activeRouteName() {
       return this.$route.name;
     },
diff --git a/src/views/setup/Setup.vue b/src/views/setup/Setup.vue
index dda3e04..f707e96 100644
--- a/src/views/setup/Setup.vue
+++ b/src/views/setup/Setup.vue
@@ -61,7 +61,7 @@ export default defineComponent({
       this.setupStatus = "loading";
       this.setupMessage = "";
       this.$http
-        .post(`/setup`, {
+        .post(`/setup/me`, {
           username: formData.username.value,
           mail: formData.mail.value,
           firstname: formData.firstname.value,
diff --git a/src/views/setup/Verify.vue b/src/views/setup/Verify.vue
index 91c55bc..06a6bf0 100644
--- a/src/views/setup/Verify.vue
+++ b/src/views/setup/Verify.vue
@@ -93,7 +93,7 @@ export default defineComponent({
       this.setupStatus = "loading";
       this.setupError = "";
       this.$http
-        .put(`/setup`, {
+        .post(`/setup/finish`, {
           token: this.token,
           mail: this.mail,
           totp: formData.totp.value,

From 8880af28808fe96096cd9bc90fba35370000b4e9 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 25 Apr 2025 12:13:02 +0200
Subject: [PATCH 19/45] Setup wizard for Settings

---
 src/components/CheckProgressBar.vue |  48 ++++++++++
 src/components/FormBottomBar.vue    |   5 +-
 src/components/setup/Account.vue    |  70 +++++++++++++++
 src/components/setup/App.vue        |  66 ++++++++++++++
 src/components/setup/Club.vue       |  99 +++++++++++++++++++++
 src/components/setup/Finished.vue   |   3 +
 src/components/setup/Images.vue     |  87 +++++++++++++++++++
 src/components/setup/Mail.vue       |  95 ++++++++++++++++++++
 src/main.css                        |   4 +-
 src/stores/setup.ts                 | 130 ++++++++++++++++++++++++++++
 src/views/setup/Setup.vue           |  75 ++++------------
 11 files changed, 622 insertions(+), 60 deletions(-)
 create mode 100644 src/components/CheckProgressBar.vue
 create mode 100644 src/components/setup/Account.vue
 create mode 100644 src/components/setup/App.vue
 create mode 100644 src/components/setup/Club.vue
 create mode 100644 src/components/setup/Finished.vue
 create mode 100644 src/components/setup/Images.vue
 create mode 100644 src/components/setup/Mail.vue
 create mode 100644 src/stores/setup.ts

diff --git a/src/components/CheckProgressBar.vue b/src/components/CheckProgressBar.vue
new file mode 100644
index 0000000..1bd3b96
--- /dev/null
+++ b/src/components/CheckProgressBar.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="w-full flex flex-row items-center">
+    <div class="contents" v-for="(i, index) in total" :key="index">
+      <SuccessCheckmark v-if="index <= successfull && index != step" class="h-8!" />
+      <div
+        v-else-if="index <= step"
+        class="flex items-center justify-center h-8 w-8 border-4 border-success rounded-full"
+      >
+        <div class="h-2 w-2 border-4 border-success bg-success rounded-full"></div>
+      </div>
+      <div v-else class="h-8 w-8 border-4 border-gray-400 rounded-full"></div>
+      <div v-if="i != total" class="grow border-2" :class="index < step ? ' border-success' : 'border-gray-400'"></div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import SuccessCheckmark from "./SuccessCheckmark.vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    step: {
+      type: Number,
+      default: 0,
+      validator(value: number) {
+        return value >= 0;
+      },
+    },
+    successfull: {
+      type: Number,
+      default: 0,
+      validator(value: number) {
+        return value >= 0;
+      },
+    },
+    total: {
+      type: Number,
+      default: 1,
+      validator(value: number) {
+        return value >= 1;
+      },
+    },
+  },
+});
+</script>
diff --git a/src/components/FormBottomBar.vue b/src/components/FormBottomBar.vue
index 808842d..65e7ece 100644
--- a/src/components/FormBottomBar.vue
+++ b/src/components/FormBottomBar.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="flex flex-col text-gray-400 text-sm mt-4 items-center">
-    <div class="flex flex-row gap-2 justify-center">
+    <p v-if="appCustom_login_message">{{ appCustom_login_message }}</p>
+    <div class="flex flex-row gap-2 justify-center mb-3">
+      <a v-if="clubWebsite" :href="clubWebsite" target="_blank">Webseite</a>
       <a v-if="clubImprint" :href="clubImprint" target="_blank">Datenschutz</a>
       <a v-if="clubPrivacy" :href="clubPrivacy" target="_blank">Impressum</a>
     </div>
-    <p v-if="appCustom_login_message">{{ appCustom_login_message }}</p>
     <p>
       <a href="https://ff-admin.de/admin" target="_blank">FF Admin</a>
       entwickelt von
diff --git a/src/components/setup/Account.vue b/src/components/setup/Account.vue
new file mode 100644
index 0000000..95b88bd
--- /dev/null
+++ b/src/components/setup/Account.vue
@@ -0,0 +1,70 @@
+<template>
+  <form class="flex flex-col gap-2" @submit.prevent="setup">
+    <p class="text-center">Admin Account</p>
+    <div class="-space-y-px">
+      <div>
+        <input id="username" name="username" type="text" required placeholder="Benutzer" class="rounded-b-none!" />
+      </div>
+      <div>
+        <input id="mail" name="mail" type="email" required placeholder="Mailadresse" class="rounded-none!" />
+      </div>
+      <div>
+        <input id="firstname" name="firstname" type="text" required placeholder="Vorname" class="rounded-none!" />
+      </div>
+      <div>
+        <input id="lastname" name="lastname" type="text" required placeholder="Nachname" class="rounded-t-none!" />
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="setupStatus == 'loading' || setupStatus == 'success'">
+        Admin-Account anlegen
+      </button>
+      <Spinner v-if="setupStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="setupStatus == 'success'" />
+      <FailureXMark v-else-if="setupStatus == 'failed'" />
+    </div>
+    <p v-if="setupMessage" class="text-center">{{ setupMessage }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { mapActions } from "pinia";
+import { useSetupStore } from "../../stores/setup";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      setupStatus: undefined as undefined | "loading" | "success" | "failed",
+      setupMessage: "" as string,
+    };
+  },
+  methods: {
+    ...mapActions(useSetupStore, ["createAdmin"]),
+    setup(e: any) {
+      let formData = e.target.elements;
+      this.setupStatus = "loading";
+      this.setupMessage = "";
+      this.createAdmin({
+        username: formData.username.value,
+        mail: formData.mail.value,
+        firstname: formData.firstname.value,
+        lastname: formData.lastname.value,
+      })
+        .then((result) => {
+          // this.setupStatus = "success";
+        })
+        .catch((err) => {
+          this.setupStatus = "failed";
+          this.setupMessage = err.response.data;
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/setup/App.vue b/src/components/setup/App.vue
new file mode 100644
index 0000000..fbc2079
--- /dev/null
+++ b/src/components/setup/App.vue
@@ -0,0 +1,66 @@
+<template>
+  <form class="flex flex-col gap-2" @submit.prevent="setup">
+    <p class="text-center">App Konfiguration</p>
+    <div class="-space-y-px">
+      <div>
+        <input id="login_message" name="login_message" type="text" placeholder="Nachricht unter Login (optional)" />
+      </div>
+
+      <div class="flex flex-row items-center gap-2 pt-1">
+        <input type="checkbox" id="show_cal_link" checked />
+        <label for="show_cal_link">Link zum Kalender anzeigen (optional)</label>
+      </div>
+    </div>
+
+    <p class="text-primary cursor-pointer ml-auto" @click="skip('app')">überspringen</p>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="setupStatus == 'loading' || setupStatus == 'success'">
+        Anwendungsdaten speichern
+      </button>
+      <Spinner v-if="setupStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="setupStatus == 'success'" />
+      <FailureXMark v-else-if="setupStatus == 'failed'" />
+    </div>
+    <p v-if="setupMessage" class="text-center">{{ setupMessage }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { mapActions } from "pinia";
+import { useSetupStore } from "../../stores/setup";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      setupStatus: undefined as undefined | "loading" | "success" | "failed",
+      setupMessage: "" as string,
+    };
+  },
+  methods: {
+    ...mapActions(useSetupStore, ["setApp", "skip"]),
+    setup(e: any) {
+      let formData = e.target.elements;
+      this.setupStatus = "loading";
+      this.setupMessage = "";
+      this.setApp({
+        login_message: formData.login_message.value,
+        show_cal_link: formData.show_cal_link.checked,
+      })
+        .then((result) => {
+          // this.setupStatus = "success";
+        })
+        .catch((err) => {
+          this.setupStatus = "failed";
+          this.setupMessage = err.response.data;
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/setup/Club.vue b/src/components/setup/Club.vue
new file mode 100644
index 0000000..96fa4f9
--- /dev/null
+++ b/src/components/setup/Club.vue
@@ -0,0 +1,99 @@
+<template>
+  <form class="flex flex-col gap-2" @submit.prevent="setup">
+    <p class="text-center">Feuerwehr-/Vereinsdaten</p>
+    <div class="-space-y-px">
+      <div>
+        <input
+          id="name"
+          name="name"
+          type="text"
+          placeholder="Feuerwehr-/Vereinsname (optional)"
+          class="rounded-b-none!"
+        />
+      </div>
+
+      <div>
+        <input
+          id="imprint"
+          name="imprint"
+          type="url"
+          placeholder="Link zum Impressum (optional)"
+          class="rounded-none!"
+        />
+      </div>
+
+      <div>
+        <input
+          id="privacy"
+          name="privacy"
+          type="url"
+          placeholder="Link zur Datenschutzerklärung (optional)"
+          class="rounded-none!"
+        />
+      </div>
+
+      <div>
+        <input
+          id="website"
+          name="website"
+          type="url"
+          placeholder="Link zur Webseite (optional)"
+          class="rounded-t-none!"
+        />
+      </div>
+    </div>
+
+    <p class="text-primary cursor-pointer ml-auto" @click="skip('club')">überspringen</p>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="setupStatus == 'loading' || setupStatus == 'success'">
+        Vereinsdaten speichern
+      </button>
+      <Spinner v-if="setupStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="setupStatus == 'success'" />
+      <FailureXMark v-else-if="setupStatus == 'failed'" />
+    </div>
+    <p v-if="setupMessage" class="text-center">{{ setupMessage }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { mapActions } from "pinia";
+import { useSetupStore } from "../../stores/setup";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      setupStatus: undefined as undefined | "loading" | "success" | "failed",
+      setupMessage: "" as string,
+    };
+  },
+  methods: {
+    ...mapActions(useSetupStore, ["setClub", "skip"]),
+    setup(e: any) {
+      let formData = e.target.elements;
+      this.setupStatus = "loading";
+      this.setupMessage = "";
+      this.setClub({
+        name: formData.name.value,
+        imprint: formData.imprint.value,
+        privacy: formData.privacy.value,
+        website: formData.website.value,
+      })
+        .then((result) => {
+          // this.setupStatus = "success";
+        })
+        .catch((err) => {
+          this.setupStatus = "failed";
+          this.setupMessage = err.response.data;
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/setup/Finished.vue b/src/components/setup/Finished.vue
new file mode 100644
index 0000000..c711b4e
--- /dev/null
+++ b/src/components/setup/Finished.vue
@@ -0,0 +1,3 @@
+<template>
+  <p class="text-center">Sie haben einen Verifizierungslink per Mail erhalten.</p>
+</template>
diff --git a/src/components/setup/Images.vue b/src/components/setup/Images.vue
new file mode 100644
index 0000000..33f5c23
--- /dev/null
+++ b/src/components/setup/Images.vue
@@ -0,0 +1,87 @@
+<template>
+  <form class="flex flex-col gap-2" @submit.prevent="setup">
+    <p class="text-center">Feuerwehr-/Vereins-Auftritt</p>
+    <div class="flex flex-col gap-2">
+      <div class="flex flex-col gap-2">
+        <p>quadratisches Icon für App (optional)</p>
+        <img ref="icon_img" class="hidden w-full h-20 object-contain" />
+        <input class="hidden!" type="file" ref="icon" accept="image/*" @change="previewImage('icon')" />
+        <button type="button" primary-outline @click="($refs.icon as HTMLInputElement).click()">Icon auswählen</button>
+      </div>
+      <div class="flex flex-col gap-2">
+        <p>Logo (optional)</p>
+        <img ref="logo_img" class="hidden w-full h-20 object-contain" />
+        <input class="hidden!" type="file" ref="logo" accept="image/*" @change="previewImage('logo')" />
+        <button type="button" primary-outline @click="($refs.logo as HTMLInputElement).click()">Logo auswählen</button>
+      </div>
+    </div>
+    <br />
+
+    <p class="text-primary cursor-pointer ml-auto" @click="skip('appImages')">überspringen</p>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="setupStatus == 'loading' || setupStatus == 'success'">
+        Bilder speichern
+      </button>
+      <Spinner v-if="setupStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="setupStatus == 'success'" />
+      <FailureXMark v-else-if="setupStatus == 'failed'" />
+    </div>
+    <p v-if="setupMessage" class="text-center">{{ setupMessage }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { mapActions } from "pinia";
+import { useSetupStore } from "../../stores/setup";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      setupStatus: undefined as undefined | "loading" | "success" | "failed",
+      setupMessage: "" as string,
+    };
+  },
+  methods: {
+    ...mapActions(useSetupStore, ["setClubImages", "skip"]),
+    previewImage(inputname: "icon" | "logo") {
+      let input = this.$refs[inputname] as HTMLInputElement;
+      let previewElement = this.$refs[inputname + "_img"] as HTMLImageElement;
+      if (input.files && input.files[0]) {
+        const reader = new FileReader();
+
+        reader.onload = function (e) {
+          previewElement.src = e.target?.result as string;
+          previewElement.style.display = "block";
+        };
+
+        reader.readAsDataURL(input.files[0]);
+      } else {
+        previewElement.src = "";
+        previewElement.style.display = "none";
+      }
+    },
+    setup(e: any) {
+      this.setupStatus = "loading";
+      this.setupMessage = "";
+      this.setClubImages({
+        icon: (this.$refs.icon as HTMLInputElement).files?.[0],
+        logo: (this.$refs.logo as HTMLInputElement).files?.[0],
+      })
+        .then((result) => {
+          // this.setupStatus = "success";
+        })
+        .catch((err) => {
+          this.setupStatus = "failed";
+          this.setupMessage = err.response.data;
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/setup/Mail.vue b/src/components/setup/Mail.vue
new file mode 100644
index 0000000..170c541
--- /dev/null
+++ b/src/components/setup/Mail.vue
@@ -0,0 +1,95 @@
+<template>
+  <form class="flex flex-col gap-2" @submit.prevent="setup">
+    <p class="text-center">Mailversand</p>
+    <div class="-space-y-px">
+      <div class="mb-2">
+        <input id="mail" name="mail" type="email" placeholder="Mailadresse" required autocomplete="email" />
+      </div>
+      <div>
+        <input
+          id="user"
+          name="user"
+          type="text"
+          placeholder="Benutzername (kann auch Mail sein)"
+          required
+          autocomplete="username"
+          class="rounded-b-none!"
+        />
+      </div>
+      <div>
+        <input
+          id="password"
+          name="password"
+          type="password"
+          placeholder="Passwort"
+          required
+          autocomplete="new-password"
+          class="rounded-none!"
+        />
+      </div>
+      <div>
+        <input id="host" name="host" type="text" placeholder="Server-Host" required class="rounded-none!" />
+      </div>
+      <div>
+        <input id="port" name="port" type="number" placeholder="Port (25, 465, 587)" required class="rounded-t-none!" />
+      </div>
+      <div class="flex flex-row items-center gap-2 pt-1">
+        <input type="checkbox" id="secure" />
+        <label for="secure">SSL-Verbindung (setzen bei Port 465)</label>
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="setupStatus == 'loading' || setupStatus == 'success'">
+        Mailversand speichern
+      </button>
+      <Spinner v-if="setupStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="setupStatus == 'success'" />
+      <FailureXMark v-else-if="setupStatus == 'failed'" />
+    </div>
+    <p v-if="setupMessage" class="text-center">{{ setupMessage }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { mapActions } from "pinia";
+import { useSetupStore } from "../../stores/setup";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      setupStatus: undefined as undefined | "loading" | "success" | "failed",
+      setupMessage: "" as string,
+    };
+  },
+  methods: {
+    ...mapActions(useSetupStore, ["setMailConfig", "skip"]),
+    setup(e: any) {
+      let formData = e.target.elements;
+      this.setupStatus = "loading";
+      this.setupMessage = "";
+      this.setMailConfig({
+        host: formData.host.value,
+        port: formData.port.value,
+        secure: formData.secure.checked,
+        mail: formData.mail.value,
+        username: formData.user.value,
+        password: formData.password.value,
+      })
+        .then((result) => {
+          // this.setupStatus = "success";
+        })
+        .catch((err) => {
+          this.setupStatus = "failed";
+          this.setupMessage = err.response.data;
+        });
+    },
+  },
+});
+</script>
diff --git a/src/main.css b/src/main.css
index e618f2f..9f95aa5 100644
--- a/src/main.css
+++ b/src/main.css
@@ -18,7 +18,7 @@
     --error: #9a0d55;
     --warning: #bb6210;
     --info: #388994;
-    --success: #73ad0f;
+    --success: #7ac142;
   }
   .dark {
     --primary: #ff0d00;
@@ -27,7 +27,7 @@
     --error: #9a0d55;
     --warning: #bb6210;
     --info: #4ccbda;
-    --success: #73ad0f;
+    --success: #7ac142;
   }
 }
 
diff --git a/src/stores/setup.ts b/src/stores/setup.ts
new file mode 100644
index 0000000..3958eee
--- /dev/null
+++ b/src/stores/setup.ts
@@ -0,0 +1,130 @@
+import { defineStore } from "pinia";
+import { http } from "../serverCom";
+import type { AxiosResponse } from "axios";
+import { useConfigurationStore } from "./configuration";
+
+export const useSetupStore = defineStore("setup", {
+  state: () => {
+    return {
+      dictionary: ["club", "clubImages", "app", "mail", "account", "finished"],
+      step: 0 as number,
+      successfull: 0 as number,
+    };
+  },
+  getters: {
+    stepIndex: (state) => (dict: string) => state.dictionary.findIndex((d) => d == dict),
+  },
+  actions: {
+    skip(dict: string) {
+      let myIndex = this.stepIndex(dict);
+      this.step += 1;
+      if (this.successfull <= myIndex) {
+        this.successfull = myIndex + 1;
+      }
+    },
+    async setClub(data: {
+      name?: string;
+      imprint?: string;
+      privacy?: string;
+      website?: string;
+    }): Promise<AxiosResponse<any, any>> {
+      let configStore = useConfigurationStore();
+
+      let myIndex = this.stepIndex("club");
+      const res = await http.post(`/setup/club`, {
+        name: data.name,
+        imprint: data.imprint,
+        privacy: data.privacy,
+        website: data.website,
+      });
+      configStore.configure();
+
+      this.step += 1;
+      if (this.successfull <= myIndex) {
+        this.successfull = myIndex;
+      }
+      return res;
+    },
+    async setClubImages(data: { icon?: File; logo?: File }): Promise<AxiosResponse<any, any>> {
+      let configStore = useConfigurationStore();
+
+      let myIndex = this.stepIndex("clubImages");
+      const formData = new FormData();
+
+      if (data.icon) {
+        formData.append("icon", data.icon);
+      }
+
+      if (data.logo) {
+        formData.append("logo", data.logo);
+      }
+
+      const res = await http.post(`/setup/club/images`, formData, {
+        headers: {
+          "Content-Type": "multipart/form-data",
+        },
+      });
+      configStore.configure();
+
+      this.step += 1;
+      if (this.successfull <= myIndex) {
+        this.successfull = myIndex;
+      }
+      return res;
+    },
+    async setApp(data: { login_message: string; show_cal_link: boolean }): Promise<AxiosResponse<any, any>> {
+      let myIndex = this.stepIndex("app");
+      const res = await http.post(`/setup/app`, {
+        custom_login_message: data.login_message,
+        show_link_to_calendar: data.show_cal_link,
+      });
+      this.step += 1;
+      if (this.successfull <= myIndex) {
+        this.successfull = myIndex;
+      }
+      return res;
+    },
+    async setMailConfig(data: {
+      host: string;
+      port: number;
+      secure: boolean;
+      mail: string;
+      username: string;
+      password: string;
+    }): Promise<AxiosResponse<any, any>> {
+      let myIndex = this.stepIndex("mail");
+      const res = await http.post(`/setup/mail`, {
+        host: data.host,
+        port: data.port,
+        secure: data.secure,
+        mail: data.mail,
+        username: data.username,
+        password: data.password,
+      });
+      this.step += 1;
+      if (this.successfull <= myIndex) {
+        this.successfull = myIndex;
+      }
+      return res;
+    },
+    async createAdmin(credentials: {
+      username: string;
+      mail: string;
+      firstname: string;
+      lastname: string;
+    }): Promise<AxiosResponse<any, any>> {
+      let myIndex = this.stepIndex("account");
+      const res = await http.post(`/setup/me`, {
+        username: credentials.username,
+        mail: credentials.mail,
+        firstname: credentials.firstname,
+        lastname: credentials.lastname,
+      });
+      this.step += 1;
+      if (this.successfull < myIndex) {
+        this.successfull = myIndex;
+      }
+      return res;
+    },
+  },
+});
diff --git a/src/views/setup/Setup.vue b/src/views/setup/Setup.vue
index f707e96..dd51a4f 100644
--- a/src/views/setup/Setup.vue
+++ b/src/views/setup/Setup.vue
@@ -5,33 +5,15 @@
         <AppLogo />
         <h2 class="text-center text-4xl font-extrabold text-gray-900">Einrichtung</h2>
       </div>
+      <CheckProgressBar :total="dictionary.length" :step="step" :successfull="successfull" />
 
-      <form class="flex flex-col gap-2" @submit.prevent="setup">
-        <div class="-space-y-px">
-          <div>
-            <input id="username" name="username" type="text" required placeholder="Benutzer" class="rounded-b-none!" />
-          </div>
-          <div>
-            <input id="mail" name="mail" type="email" required placeholder="Mailadresse" class="rounded-none!" />
-          </div>
-          <div>
-            <input id="firstname" name="firstname" type="text" required placeholder="Vorname" class="rounded-none!" />
-          </div>
-          <div>
-            <input id="lastname" name="lastname" type="text" required placeholder="Nachname" class="rounded-t-none!" />
-          </div>
-        </div>
-
-        <div class="flex flex-row gap-2">
-          <button type="submit" primary :disabled="setupStatus == 'loading' || setupStatus == 'success'">
-            Admin-Account anlegen
-          </button>
-          <Spinner v-if="setupStatus == 'loading'" class="my-auto" />
-          <SuccessCheckmark v-else-if="setupStatus == 'success'" />
-          <FailureXMark v-else-if="setupStatus == 'failed'" />
-        </div>
-        <p v-if="setupMessage" class="text-center">{{ setupMessage }}</p>
-      </form>
+      <Club v-if="step == stepIndex('club')" />
+      <Images v-else-if="step == stepIndex('clubImages')" />
+      <App v-else-if="step == stepIndex('app')" />
+      <Mail v-else-if="step == stepIndex('mail')" />
+      <Account v-else-if="step == stepIndex('account')" />
+      <Finished v-else-if="step == stepIndex('finished')" />
+      <p v-else class="text-center">UI-Fehler - versuchen Sie einen Reload der Seite</p>
 
       <FormBottomBar />
     </div>
@@ -40,42 +22,23 @@
 
 <script setup lang="ts">
 import { defineComponent } from "vue";
-import Spinner from "@/components/Spinner.vue";
-import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
-import FailureXMark from "@/components/FailureXMark.vue";
 import FormBottomBar from "@/components/FormBottomBar.vue";
 import AppLogo from "@/components/AppLogo.vue";
+import App from "@/components/setup/App.vue";
+import Account from "@/components/setup/Account.vue";
+import CheckProgressBar from "@/components/CheckProgressBar.vue";
+import { mapState } from "pinia";
+import { useSetupStore } from "@/stores/setup";
+import Club from "@/components/setup/Club.vue";
+import Images from "@/components/setup/Images.vue";
+import Finished from "@/components/setup/Finished.vue";
+import Mail from "../../components/setup/Mail.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
-  data() {
-    return {
-      setupStatus: undefined as undefined | "loading" | "success" | "failed",
-      setupMessage: "" as string,
-    };
-  },
-  methods: {
-    setup(e: any) {
-      let formData = e.target.elements;
-      this.setupStatus = "loading";
-      this.setupMessage = "";
-      this.$http
-        .post(`/setup/me`, {
-          username: formData.username.value,
-          mail: formData.mail.value,
-          firstname: formData.firstname.value,
-          lastname: formData.lastname.value,
-        })
-        .then((result) => {
-          this.setupStatus = "success";
-          this.setupMessage = "Sie haben einen Verifizierungslink per Mail erhalten.";
-        })
-        .catch((err) => {
-          this.setupStatus = "failed";
-          this.setupMessage = err.response.data;
-        });
-    },
+  computed: {
+    ...mapState(useSetupStore, ["step", "stepIndex", "successfull", "dictionary"]),
   },
 });
 </script>

From e607f8c5992d18b99ce651337b96d1d847100e08 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 25 Apr 2025 12:22:04 +0200
Subject: [PATCH 20/45] fix: false positive auth true by existing expired jwt

---
 src/router/authGuard.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/router/authGuard.ts b/src/router/authGuard.ts
index d7e5be2..c19bc72 100644
--- a/src/router/authGuard.ts
+++ b/src/router/authGuard.ts
@@ -55,6 +55,7 @@ export async function isAuthenticatedPromise(forceRefresh: boolean = false): Pro
       // check jwt expiry
       const exp = decoded.exp ?? 0;
       const correctedLocalTime = new Date().getTime();
+      let failedRefresh = false;
       if (exp < Math.floor(correctedLocalTime / 1000) || forceRefresh) {
         await refreshToken()
           .then(() => {
@@ -63,10 +64,13 @@ export async function isAuthenticatedPromise(forceRefresh: boolean = false): Pro
           .catch((err: string) => {
             console.log("expired");
             auth.setFailed();
+            failedRefresh = true;
             reject(err);
           });
       }
 
+      if (failedRefresh) return;
+
       var { userId, firstname, lastname, mail, username, permissions, isOwner } = decoded;
 
       if (Object.keys(permissions ?? {}).length === 0 && !isOwner) {

From beaf6a5926e8ffd4ef731a97c6ab1a1cf0883e2d Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 25 Apr 2025 12:31:49 +0200
Subject: [PATCH 21/45] base structure settings inside Admin UI

---
 src/components/CheckProgressBar.vue           |  7 ++++-
 src/router/index.ts                           |  7 +++++
 src/stores/admin/navigation.ts                |  1 +
 src/types/permissionTypes.ts                  |  6 ++--
 .../admin/management/setting/Setting.vue      | 31 +++++++++++++++++++
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 src/views/admin/management/setting/Setting.vue

diff --git a/src/components/CheckProgressBar.vue b/src/components/CheckProgressBar.vue
index 1bd3b96..962a3f8 100644
--- a/src/components/CheckProgressBar.vue
+++ b/src/components/CheckProgressBar.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="w-full flex flex-row items-center">
     <div class="contents" v-for="(i, index) in total" :key="index">
-      <SuccessCheckmark v-if="index <= successfull && index != step" class="h-8!" />
+      <div
+        v-if="index <= successfull && index != step"
+        class="relative flex items-center justify-center h-8 w-8 border-4 border-success rounded-full"
+      >
+        <SuccessCheckmark class="h-8! asolute top-0 m-0!" />
+      </div>
       <div
         v-else-if="index <= step"
         class="flex items-center justify-center h-8 w-8 border-4 border-success rounded-full"
diff --git a/src/router/index.ts b/src/router/index.ts
index 7b713d5..0be84bf 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -640,6 +640,13 @@ const router = createRouter({
                 },
               ],
             },
+            {
+              path: "settings",
+              name: "admin-management-setting",
+              component: () => import("@/views/admin/management/setting/Setting.vue"),
+              meta: { type: "read", section: "management", module: "setting" },
+              beforeEnter: [abilityAndNavUpdate],
+            },
             {
               path: "backup",
               name: "admin-management-backup-route",
diff --git a/src/stores/admin/navigation.ts b/src/stores/admin/navigation.ts
index cc9024a..116bbd6 100644
--- a/src/stores/admin/navigation.ts
+++ b/src/stores/admin/navigation.ts
@@ -137,6 +137,7 @@ export const useNavigationStore = defineStore("navigation", {
             ...(abilityStore.can("read", "management", "user") ? [{ key: "user", title: "Benutzer" }] : []),
             ...(abilityStore.can("read", "management", "role") ? [{ key: "role", title: "Rollen" }] : []),
             ...(abilityStore.can("read", "management", "webapi") ? [{ key: "webapi", title: "Webapi-Token" }] : []),
+            ...(abilityStore.can("read", "management", "setting") ? [{ key: "setting", title: "Einstellungen" }] : []),
             ...(abilityStore.can("read", "management", "backup") ? [{ key: "backup", title: "Backups" }] : []),
             ...(abilityStore.isAdmin() ? [{ key: "version", title: "Version" }] : []),
           ],
diff --git a/src/types/permissionTypes.ts b/src/types/permissionTypes.ts
index e9ed138..72f15c7 100644
--- a/src/types/permissionTypes.ts
+++ b/src/types/permissionTypes.ts
@@ -21,7 +21,8 @@ export type PermissionModule =
   | "query_store"
   | "template"
   | "template_usage"
-  | "backup";
+  | "backup"
+  | "setting";
 
 export type PermissionType = "read" | "create" | "update" | "delete";
 
@@ -67,6 +68,7 @@ export const permissionModules: Array<PermissionModule> = [
   "template",
   "template_usage",
   "backup",
+  "setting",
 ];
 export const permissionTypes: Array<PermissionType> = ["read", "create", "update", "delete"];
 export const sectionsAndModules: SectionsAndModulesObject = {
@@ -84,5 +86,5 @@ export const sectionsAndModules: SectionsAndModulesObject = {
     "template_usage",
     "newsletter_config",
   ],
-  management: ["user", "role", "webapi", "backup"],
+  management: ["user", "role", "webapi", "backup", "setting"],
 };
diff --git a/src/views/admin/management/setting/Setting.vue b/src/views/admin/management/setting/Setting.vue
new file mode 100644
index 0000000..0577ce7
--- /dev/null
+++ b/src/views/admin/management/setting/Setting.vue
@@ -0,0 +1,31 @@
+<template>
+  <MainTemplate>
+    <template #topBar>
+      <div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
+        <h1 class="font-bold text-xl h-8">Einstellungen</h1>
+      </div>
+    </template>
+    <template #diffMain>
+      <div class="flex flex-col gap-4 h-full pl-7">
+        <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">Einstellungen</div>
+      </div>
+    </template>
+  </MainTemplate>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { useAbilityStore } from "@/stores/ability";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {},
+  methods: {},
+});
+</script>

From 9bd663f266d514b533d7a5558277c922c1f4ebd2 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 26 Apr 2025 09:21:27 +0200
Subject: [PATCH 22/45] base settings operations

---
 src/stores/admin/management/setting.ts        | 53 ++++++++++++
 src/types/settingTypes.ts                     | 80 +++++++++++++++++++
 .../admin/management/setting/Setting.vue      |  9 ++-
 3 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 src/stores/admin/management/setting.ts
 create mode 100644 src/types/settingTypes.ts

diff --git a/src/stores/admin/management/setting.ts b/src/stores/admin/management/setting.ts
new file mode 100644
index 0000000..c57cf69
--- /dev/null
+++ b/src/stores/admin/management/setting.ts
@@ -0,0 +1,53 @@
+import { defineStore } from "pinia";
+import { http } from "@/serverCom";
+import { type SettingString, type SettingValueMapping } from "@/types/settingTypes";
+import type { AxiosResponse } from "axios";
+
+export const useSettingStore = defineStore("setting", {
+  state: () => {
+    return {
+      settings: {} as { [key in SettingString]: SettingValueMapping[key] },
+      loading: "loading" as "loading" | "fetched" | "failed",
+    };
+  },
+  getters: {
+    readSetting:
+      (state) =>
+      <K extends SettingString>(key: K): SettingValueMapping[K] => {
+        return state.settings[key];
+      },
+  },
+  actions: {
+    fetchSettings() {
+      this.loading = "loading";
+      http
+        .get("/admin/setting")
+        .then((result) => {
+          this.settings = result.data;
+          this.loading = "fetched";
+        })
+        .catch((err) => {
+          this.loading = "failed";
+        });
+    },
+    async getSetting(key: SettingString): Promise<AxiosResponse<any, any>> {
+      return await http.get(`/admin/setting/${key}`).then((res) => {
+        //@ts-expect-error
+        this.settings[key] = res.data;
+        return res;
+      });
+    },
+    async updateSetting<K extends SettingString>(
+      key: K,
+      val: SettingValueMapping[K]
+    ): Promise<AxiosResponse<any, any>> {
+      return await http.put("/admin/setting", {
+        setting: key,
+        value: val,
+      });
+    },
+    async resetSetting(key: SettingString): Promise<AxiosResponse<any, any>> {
+      return await http.delete(`/admin/setting/${key}`);
+    },
+  },
+});
diff --git a/src/types/settingTypes.ts b/src/types/settingTypes.ts
new file mode 100644
index 0000000..43d77a3
--- /dev/null
+++ b/src/types/settingTypes.ts
@@ -0,0 +1,80 @@
+export type SettingTopic = "club" | "app" | "session" | "mail" | "backup" | "security";
+export type SettingString =
+  | "club.icon"
+  | "club.logo"
+  | "club.name"
+  | "club.imprint"
+  | "club.privacy"
+  | "club.website"
+  | "app.custom_login_message"
+  | "app.show_link_to_calendar"
+  | "session.jwt_expiration"
+  | "session.refresh_expiration"
+  | "session.pwa_refresh_expiration"
+  | "mail.email"
+  | "mail.username"
+  | "mail.password"
+  | "mail.host"
+  | "mail.port"
+  | "mail.secure"
+  | "backup.interval"
+  | "backup.copies";
+
+export type SettingTypeAtom = "longstring" | "string" | "ms" | "number" | "boolean" | "url" | "email";
+export type SettingType = SettingTypeAtom | `${SettingTypeAtom}/crypt` | `${SettingTypeAtom}/rand`;
+
+export type SettingValueMapping = {
+  "club.icon": string;
+  "club.logo": string;
+  "club.name": string;
+  "club.imprint": string;
+  "club.privacy": string;
+  "club.website": string;
+  "app.custom_login_message": string;
+  "app.show_link_to_calendar": boolean;
+  "session.jwt_expiration": string;
+  "session.refresh_expiration": string;
+  "session.pwa_refresh_expiration": string;
+  "mail.email": string;
+  "mail.username": string;
+  "mail.password": string;
+  "mail.host": string;
+  "mail.port": number;
+  "mail.secure": boolean;
+  "backup.interval": number;
+  "backup.copies": number;
+};
+
+// Typsicherer Zugriff auf Settings
+export type SettingDefinition<T extends SettingType | SettingTypeAtom[]> = {
+  type: T;
+  default?: string | number | boolean;
+  optional?: boolean;
+  min?: T extends "number" | `number/crypt` | `number/rand` ? number : never;
+};
+
+export type SettingsSchema = {
+  [key in SettingString]: SettingDefinition<SettingType | SettingTypeAtom[]>;
+};
+
+export const settingsType: SettingsSchema = {
+  "club.icon": { type: "string", optional: true },
+  "club.logo": { type: "string", optional: true },
+  "club.name": { type: "string", default: "FF Admin" },
+  "club.imprint": { type: "url", optional: true },
+  "club.privacy": { type: "url", optional: true },
+  "club.website": { type: "url", optional: true },
+  "app.custom_login_message": { type: "string", optional: true },
+  "app.show_link_to_calendar": { type: "boolean", default: true },
+  "session.jwt_expiration": { type: "ms", default: "15m" },
+  "session.refresh_expiration": { type: "ms", default: "1d" },
+  "session.pwa_refresh_expiration": { type: "ms", default: "5d" },
+  "mail.email": { type: "email", optional: false },
+  "mail.username": { type: "string", optional: false },
+  "mail.password": { type: "string/crypt", optional: false },
+  "mail.host": { type: "url", optional: false },
+  "mail.port": { type: "number", default: 587 },
+  "mail.secure": { type: "boolean", default: false },
+  "backup.interval": { type: "number", default: 1, min: 1 },
+  "backup.copies": { type: "number", default: 7, min: 1 },
+};
diff --git a/src/views/admin/management/setting/Setting.vue b/src/views/admin/management/setting/Setting.vue
index 0577ce7..1911343 100644
--- a/src/views/admin/management/setting/Setting.vue
+++ b/src/views/admin/management/setting/Setting.vue
@@ -18,6 +18,7 @@ import { defineComponent } from "vue";
 import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useAbilityStore } from "@/stores/ability";
+import { useSettingStore } from "@/stores/admin/management/setting";
 </script>
 
 <script lang="ts">
@@ -25,7 +26,11 @@ export default defineComponent({
   computed: {
     ...mapState(useAbilityStore, ["can"]),
   },
-  mounted() {},
-  methods: {},
+  mounted() {
+    this.fetchSettings();
+  },
+  methods: {
+    ...mapActions(useSettingStore, ["fetchSettings"]),
+  },
 });
 </script>

From b7dd5a95cdb119a98c33436d27d2d0e7c1327840 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 28 Apr 2025 12:39:32 +0200
Subject: [PATCH 23/45] settings Sceleton

---
 .../admin/management/setting/AppSetting.vue    | 18 ++++++++++++++++++
 .../admin/management/setting/BackupSetting.vue | 18 ++++++++++++++++++
 .../admin/management/setting/ClubSetting.vue   | 18 ++++++++++++++++++
 .../admin/management/setting/MailSetting.vue   | 18 ++++++++++++++++++
 .../management/setting/SessionSetting.vue      | 18 ++++++++++++++++++
 src/views/admin/management/setting/Setting.vue | 15 +++++++++++----
 6 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 src/components/admin/management/setting/AppSetting.vue
 create mode 100644 src/components/admin/management/setting/BackupSetting.vue
 create mode 100644 src/components/admin/management/setting/ClubSetting.vue
 create mode 100644 src/components/admin/management/setting/MailSetting.vue
 create mode 100644 src/components/admin/management/setting/SessionSetting.vue

diff --git a/src/components/admin/management/setting/AppSetting.vue b/src/components/admin/management/setting/AppSetting.vue
new file mode 100644
index 0000000..572448c
--- /dev/null
+++ b/src/components/admin/management/setting/AppSetting.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="flex flex-col w-full">
+    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
+      <p class="text-lg font-semibold">Anwendungs Einstellungen</p>
+    </div>
+    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
+      <input type="text" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({});
+</script>
diff --git a/src/components/admin/management/setting/BackupSetting.vue b/src/components/admin/management/setting/BackupSetting.vue
new file mode 100644
index 0000000..957e8c4
--- /dev/null
+++ b/src/components/admin/management/setting/BackupSetting.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="flex flex-col w-full">
+    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
+      <p class="text-lg font-semibold">Backup Einstellungen</p>
+    </div>
+    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
+      <input type="text" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({});
+</script>
diff --git a/src/components/admin/management/setting/ClubSetting.vue b/src/components/admin/management/setting/ClubSetting.vue
new file mode 100644
index 0000000..8d606e0
--- /dev/null
+++ b/src/components/admin/management/setting/ClubSetting.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="flex flex-col w-full">
+    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
+      <p class="text-lg font-semibold">Vereins Einstellungen</p>
+    </div>
+    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
+      <input type="text" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({});
+</script>
diff --git a/src/components/admin/management/setting/MailSetting.vue b/src/components/admin/management/setting/MailSetting.vue
new file mode 100644
index 0000000..57eeadf
--- /dev/null
+++ b/src/components/admin/management/setting/MailSetting.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="flex flex-col w-full">
+    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
+      <p class="text-lg font-semibold">E-Mail Einstellungen</p>
+    </div>
+    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
+      <input type="text" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({});
+</script>
diff --git a/src/components/admin/management/setting/SessionSetting.vue b/src/components/admin/management/setting/SessionSetting.vue
new file mode 100644
index 0000000..4f487ab
--- /dev/null
+++ b/src/components/admin/management/setting/SessionSetting.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="flex flex-col w-full">
+    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
+      <p class="text-lg font-semibold">Login-Session Einstellungen</p>
+    </div>
+    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
+      <input type="text" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({});
+</script>
diff --git a/src/views/admin/management/setting/Setting.vue b/src/views/admin/management/setting/Setting.vue
index 1911343..2220105 100644
--- a/src/views/admin/management/setting/Setting.vue
+++ b/src/views/admin/management/setting/Setting.vue
@@ -5,10 +5,12 @@
         <h1 class="font-bold text-xl h-8">Einstellungen</h1>
       </div>
     </template>
-    <template #diffMain>
-      <div class="flex flex-col gap-4 h-full pl-7">
-        <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">Einstellungen</div>
-      </div>
+    <template #main>
+      <ClubSetting />
+      <AppSetting />
+      <MailSetting />
+      <SessionSetting />
+      <BackupSetting />
     </template>
   </MainTemplate>
 </template>
@@ -19,6 +21,11 @@ import { mapState, mapActions } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useAbilityStore } from "@/stores/ability";
 import { useSettingStore } from "@/stores/admin/management/setting";
+import ClubSetting from "@/components/admin/management/setting/ClubSetting.vue";
+import AppSetting from "@/components/admin/management/setting/AppSetting.vue";
+import MailSetting from "@/components/admin/management/setting/MailSetting.vue";
+import SessionSetting from "@/components/admin/management/setting/SessionSetting.vue";
+import BackupSetting from "@/components/admin/management/setting/BackupSetting.vue";
 </script>
 
 <script lang="ts">

From 6f155ada66574eb54bcb7ca9c592b913fad61165 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 28 Apr 2025 14:36:47 +0200
Subject: [PATCH 24/45] Display Settings

---
 src/components/AppIcon.vue                    |  7 +++
 .../admin/management/setting/AppSetting.vue   | 28 +++++++++++-
 .../management/setting/BackupSetting.vue      | 20 ++++++++-
 .../admin/management/setting/ClubSetting.vue  | 44 ++++++++++++++++++-
 .../admin/management/setting/MailSetting.vue  | 43 +++++++++++++++++-
 .../management/setting/SessionSetting.vue     | 24 +++++++++-
 src/stores/admin/management/setting.ts        | 15 ++++++-
 7 files changed, 170 insertions(+), 11 deletions(-)
 create mode 100644 src/components/AppIcon.vue

diff --git a/src/components/AppIcon.vue b/src/components/AppIcon.vue
new file mode 100644
index 0000000..ed4b4db
--- /dev/null
+++ b/src/components/AppIcon.vue
@@ -0,0 +1,7 @@
+<template>
+  <img :src="url + '/api/public/icon.png'" alt="LOGO" class="h-full w-auto" />
+</template>
+
+<script setup lang="ts">
+import { url } from "@/serverCom";
+</script>
diff --git a/src/components/admin/management/setting/AppSetting.vue b/src/components/admin/management/setting/AppSetting.vue
index 572448c..234a4ab 100644
--- a/src/components/admin/management/setting/AppSetting.vue
+++ b/src/components/admin/management/setting/AppSetting.vue
@@ -4,15 +4,39 @@
       <p class="text-lg font-semibold">Anwendungs Einstellungen</p>
     </div>
     <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <input type="text" />
+      <div class="w-full">
+        <label for="name">Vereins-Name</label>
+        <input id="name" type="text" readonly :value="appSettings['app.custom_login_message']" />
+      </div>
+      <div class="w-full flex flex-row items-center gap-2">
+        <div
+          v-if="true"
+          class="border-2 border-gray-500 rounded-sm"
+          :class="appSettings['app.show_link_to_calendar'] ? 'bg-gray-500' : 'h-3 w-3'"
+        >
+          <CheckIcon v-if="appSettings['app.show_link_to_calendar']" class="h-2.5 w-2.5 stroke-4 text-white" />
+        </div>
+        <input v-else id="name" type="checkbox" :checked="appSettings['app.show_link_to_calendar']" />
+        <label for="name">Kalender-Link anzeigen</label>
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { useSettingStore } from "@/stores/admin/management/setting";
+import { CheckIcon } from "@heroicons/vue/24/outline";
+import { mapState } from "pinia";
 import { defineComponent } from "vue";
 </script>
 
 <script lang="ts">
-export default defineComponent({});
+export default defineComponent({
+  computed: {
+    ...mapState(useSettingStore, ["readByTopic"]),
+    appSettings() {
+      return this.readByTopic("app");
+    },
+  },
+});
 </script>
diff --git a/src/components/admin/management/setting/BackupSetting.vue b/src/components/admin/management/setting/BackupSetting.vue
index 957e8c4..f18298a 100644
--- a/src/components/admin/management/setting/BackupSetting.vue
+++ b/src/components/admin/management/setting/BackupSetting.vue
@@ -4,15 +4,31 @@
       <p class="text-lg font-semibold">Backup Einstellungen</p>
     </div>
     <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <input type="text" />
+      <div class="w-full">
+        <label for="name">Anzahl paralleler Backups</label>
+        <input id="name" type="text" readonly :value="backupSettings['backup.copies']" />
+      </div>
+      <div class="w-full">
+        <label for="name">Intervall zur Backup-Erstellung</label>
+        <input id="name" type="text" readonly :value="backupSettings['backup.interval']" />
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { useSettingStore } from "@/stores/admin/management/setting";
+import { mapState } from "pinia";
 import { defineComponent } from "vue";
 </script>
 
 <script lang="ts">
-export default defineComponent({});
+export default defineComponent({
+  computed: {
+    ...mapState(useSettingStore, ["readByTopic"]),
+    backupSettings() {
+      return this.readByTopic("backup");
+    },
+  },
+});
 </script>
diff --git a/src/components/admin/management/setting/ClubSetting.vue b/src/components/admin/management/setting/ClubSetting.vue
index 8d606e0..51dfb40 100644
--- a/src/components/admin/management/setting/ClubSetting.vue
+++ b/src/components/admin/management/setting/ClubSetting.vue
@@ -4,15 +4,55 @@
       <p class="text-lg font-semibold">Vereins Einstellungen</p>
     </div>
     <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <input type="text" />
+      <div class="w-full">
+        <p>Vereins-Icon</p>
+        <AppIcon v-if="clubSettings['club.icon'] != ''" class="h-10! max-w-full mx-auto" />
+        <div v-else class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm">
+          Kein Icon hochgeladen
+        </div>
+      </div>
+      <div class="w-full">
+        <p>Vereins-Logo</p>
+        <AppLogo v-if="clubSettings['club.logo'] != ''" class="h-10! max-w-full mx-auto" />
+        <div v-else class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm">
+          Kein Logo hochgeladen
+        </div>
+      </div>
+      <div class="w-full">
+        <label for="name">Vereins-Name</label>
+        <input id="name" type="text" readonly :value="clubSettings['club.name']" />
+      </div>
+      <div class="w-full">
+        <label for="imprint">Vereins-Impressum Link</label>
+        <input id="imprint" type="url" readonly :value="clubSettings['club.imprint']" />
+      </div>
+      <div class="w-full">
+        <label for="icon">Vereins-Datenschutz Link</label>
+        <input id="privacy" type="url" readonly :value="clubSettings['club.privacy']" />
+      </div>
+      <div class="w-full">
+        <label for="website">Vereins-Webseite Link</label>
+        <input id="website" type="url" readonly :value="clubSettings['club.website']" />
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import AppIcon from "@/components/AppIcon.vue";
+import AppLogo from "@/components/AppLogo.vue";
+import { useSettingStore } from "@/stores/admin/management/setting";
+import { mapState } from "pinia";
 import { defineComponent } from "vue";
 </script>
 
 <script lang="ts">
-export default defineComponent({});
+export default defineComponent({
+  computed: {
+    ...mapState(useSettingStore, ["readByTopic"]),
+    clubSettings() {
+      return this.readByTopic("club");
+    },
+  },
+});
 </script>
diff --git a/src/components/admin/management/setting/MailSetting.vue b/src/components/admin/management/setting/MailSetting.vue
index 57eeadf..b945b2a 100644
--- a/src/components/admin/management/setting/MailSetting.vue
+++ b/src/components/admin/management/setting/MailSetting.vue
@@ -4,15 +4,54 @@
       <p class="text-lg font-semibold">E-Mail Einstellungen</p>
     </div>
     <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <input type="text" />
+      <div class="w-full">
+        <label for="name">Mailadresse</label>
+        <input id="name" type="text" readonly :value="mailSettings['mail.email']" />
+      </div>
+      <div class="w-full">
+        <label for="name">Benutzername</label>
+        <input id="name" type="text" readonly :value="mailSettings['mail.username']" />
+      </div>
+      <div class="w-full">
+        <label for="name">Server-Host</label>
+        <input id="name" type="text" readonly :value="mailSettings['mail.host']" />
+      </div>
+      <div class="w-full">
+        <label for="name">Server-Port</label>
+        <input id="name" type="text" readonly :value="mailSettings['mail.port']" />
+      </div>
+      <div class="w-full flex flex-row items-center gap-2">
+        <div
+          v-if="true"
+          class="border-2 border-gray-500 rounded-sm"
+          :class="mailSettings['mail.secure'] ? 'bg-gray-500' : 'h-3 w-3'"
+        >
+          <CheckIcon v-if="mailSettings['mail.secure']" class="h-2.5 w-2.5 stroke-4 text-white" />
+        </div>
+        <input v-else id="name" type="checkbox" :checked="mailSettings['mail.secure']" />
+        <label for="name">Secure-Verbindung</label>
+      </div>
+      <div class="w-full">
+        <label for="name">Passwort</label>
+        <input id="name" type="password" readonly />
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { useSettingStore } from "@/stores/admin/management/setting";
+import { mapState } from "pinia";
 import { defineComponent } from "vue";
 </script>
 
 <script lang="ts">
-export default defineComponent({});
+export default defineComponent({
+  computed: {
+    ...mapState(useSettingStore, ["readByTopic"]),
+    mailSettings() {
+      return this.readByTopic("mail");
+    },
+  },
+});
 </script>
diff --git a/src/components/admin/management/setting/SessionSetting.vue b/src/components/admin/management/setting/SessionSetting.vue
index 4f487ab..e93aee8 100644
--- a/src/components/admin/management/setting/SessionSetting.vue
+++ b/src/components/admin/management/setting/SessionSetting.vue
@@ -4,15 +4,35 @@
       <p class="text-lg font-semibold">Login-Session Einstellungen</p>
     </div>
     <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <input type="text" />
+      <div class="w-full">
+        <label for="name">JWT-Gültigkeitsdauer</label>
+        <input id="name" type="text" readonly :value="sessionSettings['session.jwt_expiration']" />
+      </div>
+      <div class="w-full">
+        <label for="name">Session-Gültigkeitsdauer</label>
+        <input id="name" type="text" readonly :value="sessionSettings['session.refresh_expiration']" />
+      </div>
+      <div class="w-full">
+        <label for="name">Sesion-Gültigkeitsdauer PWA</label>
+        <input id="name" type="text" readonly :value="sessionSettings['session.pwa_refresh_expiration']" />
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { useSettingStore } from "@/stores/admin/management/setting";
+import { mapState } from "pinia";
 import { defineComponent } from "vue";
 </script>
 
 <script lang="ts">
-export default defineComponent({});
+export default defineComponent({
+  computed: {
+    ...mapState(useSettingStore, ["readByTopic"]),
+    sessionSettings() {
+      return this.readByTopic("session");
+    },
+  },
+});
 </script>
diff --git a/src/stores/admin/management/setting.ts b/src/stores/admin/management/setting.ts
index c57cf69..174141a 100644
--- a/src/stores/admin/management/setting.ts
+++ b/src/stores/admin/management/setting.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
-import { type SettingString, type SettingValueMapping } from "@/types/settingTypes";
+import type { SettingString, SettingTopic, SettingValueMapping } from "@/types/settingTypes";
 import type { AxiosResponse } from "axios";
 
 export const useSettingStore = defineStore("setting", {
@@ -16,6 +16,19 @@ export const useSettingStore = defineStore("setting", {
       <K extends SettingString>(key: K): SettingValueMapping[K] => {
         return state.settings[key];
       },
+    readByTopic:
+      (state) =>
+      <T extends SettingTopic>(
+        topic: T
+      ): { [K in SettingString as K extends `${T}.${string}` ? K : never]: SettingValueMapping[K] } => {
+        return Object.entries(state.settings).reduce((acc, [key, value]) => {
+          const typedKey = key as SettingString;
+          if (key.startsWith(topic)) {
+            acc[typedKey] = value;
+          }
+          return acc;
+        }, {} as any);
+      },
   },
   actions: {
     fetchSettings() {

From 06380e48c5e05082c514c9c7efc8daa97d719371 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 29 Apr 2025 13:10:30 +0200
Subject: [PATCH 25/45] Settings form and handling

---
 .../admin/management/setting/AppSetting.vue   |  65 +++++++---
 .../management/setting/BackupSetting.vue      |  49 +++++---
 .../admin/management/setting/BaseSetting.vue  |  79 ++++++++++++
 .../management/setting/ClubImageSetting.vue   |  90 +++++++++++++
 .../admin/management/setting/ClubSetting.vue  | 107 ++++++++++------
 .../admin/management/setting/MailSetting.vue  | 119 ++++++++++++------
 .../management/setting/SessionSetting.vue     |  74 ++++++++---
 src/stores/admin/management/setting.ts        |  28 ++++-
 src/stores/configuration.ts                   |   6 +-
 .../admin/management/setting/Setting.vue      |   3 +
 10 files changed, 485 insertions(+), 135 deletions(-)
 create mode 100644 src/components/admin/management/setting/BaseSetting.vue
 create mode 100644 src/components/admin/management/setting/ClubImageSetting.vue

diff --git a/src/components/admin/management/setting/AppSetting.vue b/src/components/admin/management/setting/AppSetting.vue
index 234a4ab..787dbe1 100644
--- a/src/components/admin/management/setting/AppSetting.vue
+++ b/src/components/admin/management/setting/AppSetting.vue
@@ -1,42 +1,67 @@
 <template>
-  <div class="flex flex-col w-full">
-    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
-      <p class="text-lg font-semibold">Anwendungs Einstellungen</p>
+  <BaseSetting title="Anwendungs Einstellungen" :submit-function="submit" v-slot="{ enableEdit }">
+    <div class="w-full">
+      <label for="custom_login_message">Nachricht unter Login (optional)</label>
+      <input
+        id="custom_login_message"
+        type="text"
+        :readonly="!enableEdit"
+        :value="appSettings['app.custom_login_message']"
+      />
     </div>
-    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <div class="w-full">
-        <label for="name">Vereins-Name</label>
-        <input id="name" type="text" readonly :value="appSettings['app.custom_login_message']" />
-      </div>
-      <div class="w-full flex flex-row items-center gap-2">
-        <div
-          v-if="true"
-          class="border-2 border-gray-500 rounded-sm"
-          :class="appSettings['app.show_link_to_calendar'] ? 'bg-gray-500' : 'h-3 w-3'"
-        >
-          <CheckIcon v-if="appSettings['app.show_link_to_calendar']" class="h-2.5 w-2.5 stroke-4 text-white" />
-        </div>
-        <input v-else id="name" type="checkbox" :checked="appSettings['app.show_link_to_calendar']" />
-        <label for="name">Kalender-Link anzeigen</label>
+    <div class="w-full flex flex-row items-center gap-2">
+      <div
+        v-if="!enableEdit"
+        class="border-2 border-gray-500 rounded-sm"
+        :class="appSettings['app.show_link_to_calendar'] ? 'bg-gray-500' : 'h-3.5 w-3.5'"
+      >
+        <CheckIcon v-if="appSettings['app.show_link_to_calendar']" class="h-2.5 w-2.5 stroke-4 text-white" />
       </div>
+      <input v-else id="show_link_to_calendar" type="checkbox" :checked="appSettings['app.show_link_to_calendar']" />
+      <label for="show_link_to_calendar">Kalender-Link anzeigen</label>
     </div>
-  </div>
+  </BaseSetting>
 </template>
 
 <script setup lang="ts">
+import { useAbilityStore } from "@/stores/ability";
 import { useSettingStore } from "@/stores/admin/management/setting";
 import { CheckIcon } from "@heroicons/vue/24/outline";
-import { mapState } from "pinia";
+import { mapActions, mapState } from "pinia";
 import { defineComponent } from "vue";
+import BaseSetting from "./BaseSetting.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
+  data() {
+    return {
+      enableEdit: false as boolean,
+      status: undefined as undefined | "loading" | "success" | "failed",
+    };
+  },
   computed: {
     ...mapState(useSettingStore, ["readByTopic"]),
+    ...mapState(useAbilityStore, ["can"]),
     appSettings() {
       return this.readByTopic("app");
     },
   },
+  methods: {
+    ...mapActions(useSettingStore, ["updateSettings"]),
+    submit(e: any) {
+      const formData = e.target.elements;
+      return this.updateSettings([
+        {
+          key: "app.custom_login_message",
+          value: formData.custom_login_message.value || null,
+        },
+        {
+          key: "app.show_link_to_calendar",
+          value: formData.show_link_to_calendar.checked || null,
+        },
+      ]);
+    },
+  },
 });
 </script>
diff --git a/src/components/admin/management/setting/BackupSetting.vue b/src/components/admin/management/setting/BackupSetting.vue
index f18298a..f71a36a 100644
--- a/src/components/admin/management/setting/BackupSetting.vue
+++ b/src/components/admin/management/setting/BackupSetting.vue
@@ -1,34 +1,53 @@
 <template>
-  <div class="flex flex-col w-full">
-    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
-      <p class="text-lg font-semibold">Backup Einstellungen</p>
+  <BaseSetting title="Backup Einstellungen" :submit-function="submit" v-slot="{ enableEdit }">
+    <div class="w-full">
+      <label for="copies">Anzahl paralleler Backups (optional)</label>
+      <input id="copies" type="text" :readonly="!enableEdit" :value="backupSettings['backup.copies']" />
     </div>
-    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <div class="w-full">
-        <label for="name">Anzahl paralleler Backups</label>
-        <input id="name" type="text" readonly :value="backupSettings['backup.copies']" />
-      </div>
-      <div class="w-full">
-        <label for="name">Intervall zur Backup-Erstellung</label>
-        <input id="name" type="text" readonly :value="backupSettings['backup.interval']" />
-      </div>
-    </div>
-  </div>
+    <div class="w-full">
+      <label for="interval">Intervall zur Backup-Erstellung (optional)</label>
+      <input id="interval" type="text" :readonly="!enableEdit" :value="backupSettings['backup.interval']" /></div
+  ></BaseSetting>
 </template>
 
 <script setup lang="ts">
+import { useAbilityStore } from "@/stores/ability";
 import { useSettingStore } from "@/stores/admin/management/setting";
-import { mapState } from "pinia";
+import { mapActions, mapState } from "pinia";
 import { defineComponent } from "vue";
+import BaseSetting from "./BaseSetting.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
+  data() {
+    return {
+      enableEdit: false as boolean,
+      status: undefined as undefined | "loading" | "success" | "failed",
+    };
+  },
   computed: {
     ...mapState(useSettingStore, ["readByTopic"]),
+    ...mapState(useAbilityStore, ["can"]),
     backupSettings() {
       return this.readByTopic("backup");
     },
   },
+  methods: {
+    ...mapActions(useSettingStore, ["updateSettings"]),
+    submit(e: any) {
+      const formData = e.target.elements;
+      return this.updateSettings([
+        {
+          key: "backup.copies",
+          value: formData.copies.value || null,
+        },
+        {
+          key: "backup.interval",
+          value: formData.interval.value || null,
+        },
+      ]);
+    },
+  },
 });
 </script>
diff --git a/src/components/admin/management/setting/BaseSetting.vue b/src/components/admin/management/setting/BaseSetting.vue
new file mode 100644
index 0000000..96c1308
--- /dev/null
+++ b/src/components/admin/management/setting/BaseSetting.vue
@@ -0,0 +1,79 @@
+<template>
+  <form class="flex flex-col w-full" @submit.prevent="submit">
+    <div class="flex flex-row gap-2 items-center border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
+      <p class="text-lg font-semibold grow">{{ title }}</p>
+      <Spinner v-if="status == 'loading'" />
+      <SuccessCheckmark v-else-if="status == 'success'" />
+      <FailureXMark v-else-if="status == 'failed'" />
+      <div v-else-if="enableEdit" class="flex flex-row gap-2">
+        <button type="submit" class="!w-fit !h-fit !p-0">
+          <CheckIcon class="h-5 w-5 cursor-pointer" />
+        </button>
+        <button type="reset" class="!w-fit !h-fit !p-0" @click="enableEdit = false">
+          <XMarkIcon class="h-5 w-5 cursor-pointer" />
+        </button>
+      </div>
+      <PencilSquareIcon
+        v-else-if="can('create', 'management', 'setting')"
+        class="h-5 w-5 cursor-pointer"
+        @click="enableEdit = true"
+      />
+    </div>
+    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
+      <slot :enableEdit="enableEdit"></slot>
+    </div>
+  </form>
+</template>
+
+<script setup lang="ts">
+import FailureXMark from "@/components/FailureXMark.vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import { useAbilityStore } from "@/stores/ability";
+import { CheckIcon, PencilSquareIcon, XMarkIcon } from "@heroicons/vue/24/outline";
+import { mapActions, mapState } from "pinia";
+import { defineComponent } from "vue";
+import type { PropType } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    title: {
+      type: String,
+      required: true,
+    },
+    submitFunction: {
+      type: Function as PropType<(e: any) => Promise<any>>,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      enableEdit: false as boolean,
+      status: undefined as undefined | "loading" | "success" | "failed",
+    };
+  },
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  methods: {
+    submit(e: any) {
+      this.status = "loading";
+      this.submitFunction(e)
+        .then(() => {
+          this.status = "success";
+        })
+        .catch(() => {
+          this.status = "failed";
+        })
+        .finally(() => {
+          setTimeout(() => {
+            this.enableEdit = false;
+            this.status = undefined;
+          }, 2000);
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/management/setting/ClubImageSetting.vue b/src/components/admin/management/setting/ClubImageSetting.vue
new file mode 100644
index 0000000..e2ab129
--- /dev/null
+++ b/src/components/admin/management/setting/ClubImageSetting.vue
@@ -0,0 +1,90 @@
+<template>
+  <BaseSetting title="Vereins-Auftritt Einstellungen" :submit-function="submit" v-slot="{ enableEdit }">
+    <div class="w-full">
+      <p>Vereins-Icon</p>
+      <AppIcon v-if="clubSettings['club.icon'] != '' && !overwriteIcon" class="h-10! max-w-full mx-auto" />
+      <img v-else-if="overwriteIcon" ref="icon_img" class="hidden w-full h-20 object-contain" />
+      <div
+        v-else
+        class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm cursor-pointer"
+        @click="($refs.icon as HTMLInputElement).click()"
+      >
+        Kein eigenes Icon ausgewählt
+      </div>
+      <input class="hidden!" type="file" ref="icon" accept="image/*" @change="previewImage('icon')" />
+    </div>
+    <div class="w-full">
+      <p>Vereins-Logo</p>
+      <AppLogo v-if="clubSettings['club.logo'] != '' && !overwriteLogo" class="h-10! max-w-full mx-auto" />
+      <img v-else-if="overwriteLogo" ref="logo_img" class="hidden w-full h-20 object-contain" />
+      <div
+        v-else
+        class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm cursor-pointer"
+        @click="($refs.logo as HTMLInputElement).click()"
+      >
+        Kein eigenes Logo ausgewählt
+      </div>
+      <input class="hidden!" type="file" ref="logo" accept="image/*" @change="previewImage('logo')" /></div
+  ></BaseSetting>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import { useSettingStore } from "@/stores/admin/management/setting";
+import AppIcon from "@/components/AppIcon.vue";
+import AppLogo from "@/components/AppLogo.vue";
+import { useAbilityStore } from "@/stores/ability";
+import type { SettingString } from "@/types/settingTypes";
+import BaseSetting from "./BaseSetting.vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      overwriteIcon: false as boolean,
+      overwriteLogo: false as boolean,
+    };
+  },
+  computed: {
+    ...mapState(useSettingStore, ["readByTopic"]),
+    ...mapState(useAbilityStore, ["can"]),
+    clubSettings() {
+      return this.readByTopic("club");
+    },
+  },
+  methods: {
+    ...mapActions(useSettingStore, ["updateSettings", "uploadImage"]),
+    previewImage(inputname: "icon" | "logo") {
+      let input = this.$refs[inputname] as HTMLInputElement;
+      let previewElement = this.$refs[inputname + "_img"] as HTMLImageElement;
+      if (input.files && input.files[0]) {
+        const reader = new FileReader();
+
+        reader.onload = function (e) {
+          previewElement.src = e.target?.result as string;
+          previewElement.style.display = "block";
+        };
+
+        reader.readAsDataURL(input.files[0]);
+      } else {
+        previewElement.src = "";
+        previewElement.style.display = "none";
+      }
+    },
+    submit(e: any) {
+      return this.uploadImage([
+        {
+          key: "club.icon" as SettingString,
+          value: (this.$refs.icon as HTMLInputElement).files?.[0],
+        },
+        {
+          key: "club.logo" as SettingString,
+          value: (this.$refs.logo as HTMLInputElement).files?.[0],
+        },
+      ]);
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/management/setting/ClubSetting.vue b/src/components/admin/management/setting/ClubSetting.vue
index 51dfb40..8b6cbcc 100644
--- a/src/components/admin/management/setting/ClubSetting.vue
+++ b/src/components/admin/management/setting/ClubSetting.vue
@@ -1,58 +1,89 @@
 <template>
-  <div class="flex flex-col w-full">
-    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
-      <p class="text-lg font-semibold">Vereins Einstellungen</p>
+  <BaseSetting title="Vereins Einstellungen" :submit-function="submit" v-slot="{ enableEdit }">
+    <div class="w-full">
+      <label for="clubname">Vereins-Name (optional)</label>
+      <input id="clubname" type="text" :readonly="!enableEdit" :value="clubSettings['club.name']" />
     </div>
-    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <div class="w-full">
-        <p>Vereins-Icon</p>
-        <AppIcon v-if="clubSettings['club.icon'] != ''" class="h-10! max-w-full mx-auto" />
-        <div v-else class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm">
-          Kein Icon hochgeladen
-        </div>
-      </div>
-      <div class="w-full">
-        <p>Vereins-Logo</p>
-        <AppLogo v-if="clubSettings['club.logo'] != ''" class="h-10! max-w-full mx-auto" />
-        <div v-else class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm">
-          Kein Logo hochgeladen
-        </div>
-      </div>
-      <div class="w-full">
-        <label for="name">Vereins-Name</label>
-        <input id="name" type="text" readonly :value="clubSettings['club.name']" />
-      </div>
-      <div class="w-full">
-        <label for="imprint">Vereins-Impressum Link</label>
-        <input id="imprint" type="url" readonly :value="clubSettings['club.imprint']" />
-      </div>
-      <div class="w-full">
-        <label for="icon">Vereins-Datenschutz Link</label>
-        <input id="privacy" type="url" readonly :value="clubSettings['club.privacy']" />
-      </div>
-      <div class="w-full">
-        <label for="website">Vereins-Webseite Link</label>
-        <input id="website" type="url" readonly :value="clubSettings['club.website']" />
-      </div>
+    <div class="w-full">
+      <label for="imprint">Vereins-Impressum Link (optional)</label>
+      <input id="imprint" type="url" :readonly="!enableEdit" :value="clubSettings['club.imprint']" />
     </div>
-  </div>
+    <div class="w-full">
+      <label for="privacy">Vereins-Datenschutz Link (optional)</label>
+      <input id="privacy" type="url" :readonly="!enableEdit" :value="clubSettings['club.privacy']" />
+    </div>
+    <div class="w-full">
+      <label for="website">Vereins-Webseite Link (optional)</label>
+      <input id="website" type="url" :readonly="!enableEdit" :value="clubSettings['club.website']" /></div
+  ></BaseSetting>
 </template>
 
 <script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import { useSettingStore } from "@/stores/admin/management/setting";
 import AppIcon from "@/components/AppIcon.vue";
 import AppLogo from "@/components/AppLogo.vue";
-import { useSettingStore } from "@/stores/admin/management/setting";
-import { mapState } from "pinia";
-import { defineComponent } from "vue";
+import { useAbilityStore } from "@/stores/ability";
+import type { SettingString } from "@/types/settingTypes";
+import BaseSetting from "./BaseSetting.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
+  data() {
+    return {
+      overwriteIcon: false as boolean,
+      overwriteLogo: false as boolean,
+    };
+  },
   computed: {
     ...mapState(useSettingStore, ["readByTopic"]),
+    ...mapState(useAbilityStore, ["can"]),
     clubSettings() {
       return this.readByTopic("club");
     },
   },
+  methods: {
+    ...mapActions(useSettingStore, ["updateSettings", "uploadImage"]),
+    previewImage(inputname: "icon" | "logo") {
+      let input = this.$refs[inputname] as HTMLInputElement;
+      let previewElement = this.$refs[inputname + "_img"] as HTMLImageElement;
+      if (input.files && input.files[0]) {
+        const reader = new FileReader();
+
+        reader.onload = function (e) {
+          previewElement.src = e.target?.result as string;
+          previewElement.style.display = "block";
+        };
+
+        reader.readAsDataURL(input.files[0]);
+      } else {
+        previewElement.src = "";
+        previewElement.style.display = "none";
+      }
+    },
+    submit(e: any) {
+      const formData = e.target.elements;
+      return this.updateSettings([
+        {
+          key: "club.name",
+          value: formData.clubname.value || null,
+        },
+        {
+          key: "club.imprint",
+          value: formData.imprint.value || null,
+        },
+        {
+          key: "club.privacy",
+          value: formData.privacy.value || null,
+        },
+        {
+          key: "club.website",
+          value: formData.website.value || null,
+        },
+      ]);
+    },
+  },
 });
 </script>
diff --git a/src/components/admin/management/setting/MailSetting.vue b/src/components/admin/management/setting/MailSetting.vue
index b945b2a..64ca03d 100644
--- a/src/components/admin/management/setting/MailSetting.vue
+++ b/src/components/admin/management/setting/MailSetting.vue
@@ -1,57 +1,100 @@
 <template>
-  <div class="flex flex-col w-full">
-    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
-      <p class="text-lg font-semibold">E-Mail Einstellungen</p>
+  <BaseSetting title="E-Mail Einstellungen" :submit-function="submit" v-slot="{ enableEdit }">
+    <div class="w-full">
+      <label for="email">Mailadresse</label>
+      <input id="email" type="email" autocomplete="email" :readonly="!enableEdit" :value="mailSettings['mail.email']" />
     </div>
-    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <div class="w-full">
-        <label for="name">Mailadresse</label>
-        <input id="name" type="text" readonly :value="mailSettings['mail.email']" />
-      </div>
-      <div class="w-full">
-        <label for="name">Benutzername</label>
-        <input id="name" type="text" readonly :value="mailSettings['mail.username']" />
-      </div>
-      <div class="w-full">
-        <label for="name">Server-Host</label>
-        <input id="name" type="text" readonly :value="mailSettings['mail.host']" />
-      </div>
-      <div class="w-full">
-        <label for="name">Server-Port</label>
-        <input id="name" type="text" readonly :value="mailSettings['mail.port']" />
-      </div>
-      <div class="w-full flex flex-row items-center gap-2">
-        <div
-          v-if="true"
-          class="border-2 border-gray-500 rounded-sm"
-          :class="mailSettings['mail.secure'] ? 'bg-gray-500' : 'h-3 w-3'"
-        >
-          <CheckIcon v-if="mailSettings['mail.secure']" class="h-2.5 w-2.5 stroke-4 text-white" />
-        </div>
-        <input v-else id="name" type="checkbox" :checked="mailSettings['mail.secure']" />
-        <label for="name">Secure-Verbindung</label>
-      </div>
-      <div class="w-full">
-        <label for="name">Passwort</label>
-        <input id="name" type="password" readonly />
-      </div>
+    <div class="w-full">
+      <label for="username">Benutzername</label>
+      <input
+        id="username"
+        type="text"
+        :readonly="!enableEdit"
+        autocomplete="username"
+        :value="mailSettings['mail.username']"
+      />
     </div>
-  </div>
+    <div class="w-full">
+      <label for="host">Server-Host</label>
+      <input id="host" type="text" :readonly="!enableEdit" :value="mailSettings['mail.host']" />
+    </div>
+    <div class="w-full">
+      <label for="port">Server-Port (25, 465, 587)</label>
+      <input id="port" type="number" :readonly="!enableEdit" :value="mailSettings['mail.port']" />
+    </div>
+    <div class="w-full flex flex-row items-center gap-2">
+      <div
+        v-if="!enableEdit"
+        class="border-2 border-gray-500 rounded-sm"
+        :class="mailSettings['mail.secure'] ? 'bg-gray-500' : 'h-3.5 w-3.5'"
+      >
+        <CheckIcon v-if="mailSettings['mail.secure']" class="h-2.5 w-2.5 stroke-4 text-white" />
+      </div>
+      <input v-else id="secure" type="checkbox" :checked="mailSettings['mail.secure']" />
+      <label for="secure">Secure-Verbindung (setzen bei Port 465)</label>
+    </div>
+    <div class="w-full">
+      <label for="password">Passwort (optional)</label>
+      <input id="password" type="password" :readonly="!enableEdit" autocomplete="new-password" />
+    </div>
+  </BaseSetting>
 </template>
 
 <script setup lang="ts">
-import { useSettingStore } from "@/stores/admin/management/setting";
-import { mapState } from "pinia";
 import { defineComponent } from "vue";
+import { CheckIcon } from "@heroicons/vue/24/outline";
+import { mapActions, mapState } from "pinia";
+import { useSettingStore } from "@/stores/admin/management/setting";
+import { useAbilityStore } from "@/stores/ability";
+import BaseSetting from "./BaseSetting.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
+  data() {
+    return {
+      enableEdit: false as boolean,
+      status: undefined as undefined | "loading" | "success" | "failed",
+    };
+  },
   computed: {
     ...mapState(useSettingStore, ["readByTopic"]),
+    ...mapState(useAbilityStore, ["can"]),
     mailSettings() {
       return this.readByTopic("mail");
     },
   },
+  methods: {
+    ...mapActions(useSettingStore, ["updateSettings"]),
+    submit(e: any) {
+      const formData = e.target.elements;
+      return this.updateSettings([
+        {
+          key: "mail.email",
+          value: formData.email.value,
+        },
+        {
+          key: "mail.username",
+          value: formData.username.value,
+        },
+        {
+          key: "mail.host",
+          value: formData.host.value,
+        },
+        {
+          key: "mail.port",
+          value: formData.port.value,
+        },
+        {
+          key: "mail.secure",
+          value: formData.secure.checked,
+        },
+        {
+          key: "mail.password",
+          value: formData.password.value || null,
+        },
+      ]);
+    },
+  },
 });
 </script>
diff --git a/src/components/admin/management/setting/SessionSetting.vue b/src/components/admin/management/setting/SessionSetting.vue
index e93aee8..712ea75 100644
--- a/src/components/admin/management/setting/SessionSetting.vue
+++ b/src/components/admin/management/setting/SessionSetting.vue
@@ -1,38 +1,76 @@
 <template>
-  <div class="flex flex-col w-full">
-    <div class="border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
-      <p class="text-lg font-semibold">Login-Session Einstellungen</p>
+  <BaseSetting title="Login-Session Einstellungen" :submit-function="submit" v-slot="{ enableEdit }">
+    <div class="w-full">
+      <label for="jwt_expiration">JWT-Gültigkeitsdauer (optional)</label>
+      <input
+        id="jwt_expiration"
+        type="text"
+        :readonly="!enableEdit"
+        :value="sessionSettings['session.jwt_expiration']"
+      />
     </div>
-    <div class="border-l-3 border-l-primary p-2 rounded-b-lg">
-      <div class="w-full">
-        <label for="name">JWT-Gültigkeitsdauer</label>
-        <input id="name" type="text" readonly :value="sessionSettings['session.jwt_expiration']" />
-      </div>
-      <div class="w-full">
-        <label for="name">Session-Gültigkeitsdauer</label>
-        <input id="name" type="text" readonly :value="sessionSettings['session.refresh_expiration']" />
-      </div>
-      <div class="w-full">
-        <label for="name">Sesion-Gültigkeitsdauer PWA</label>
-        <input id="name" type="text" readonly :value="sessionSettings['session.pwa_refresh_expiration']" />
-      </div>
+    <div class="w-full">
+      <label for="refresh_expiration">Session-Gültigkeitsdauer (optional)</label>
+      <input
+        id="refresh_expiration"
+        type="text"
+        :readonly="!enableEdit"
+        :value="sessionSettings['session.refresh_expiration']"
+      />
     </div>
-  </div>
+    <div class="w-full">
+      <label for="pwa_refresh_expiration">Sesion-Gültigkeitsdauer PWA (optional)</label>
+      <input
+        id="pwa_refresh_expiration"
+        type="text"
+        :readonly="!enableEdit"
+        :value="sessionSettings['session.pwa_refresh_expiration']"
+      /></div
+  ></BaseSetting>
 </template>
 
 <script setup lang="ts">
+import { useAbilityStore } from "@/stores/ability";
 import { useSettingStore } from "@/stores/admin/management/setting";
-import { mapState } from "pinia";
+import { mapActions, mapState } from "pinia";
 import { defineComponent } from "vue";
+import BaseSetting from "./BaseSetting.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
+  data() {
+    return {
+      enableEdit: false as boolean,
+      status: undefined as undefined | "loading" | "success" | "failed",
+    };
+  },
   computed: {
     ...mapState(useSettingStore, ["readByTopic"]),
+    ...mapState(useAbilityStore, ["can"]),
     sessionSettings() {
       return this.readByTopic("session");
     },
   },
+  methods: {
+    ...mapActions(useSettingStore, ["updateSettings"]),
+    submit(e: any) {
+      const formData = e.target.elements;
+      return this.updateSettings([
+        {
+          key: "session.jwt_expiration",
+          value: formData.jwt_expiration.value || null,
+        },
+        {
+          key: "session.refresh_expiration",
+          value: formData.refresh_expiration.value || null,
+        },
+        {
+          key: "session.pwa_refresh_expiration",
+          value: formData.pwa_refresh_expiration.value || null,
+        },
+      ]);
+    },
+  },
 });
 </script>
diff --git a/src/stores/admin/management/setting.ts b/src/stores/admin/management/setting.ts
index 174141a..defb78b 100644
--- a/src/stores/admin/management/setting.ts
+++ b/src/stores/admin/management/setting.ts
@@ -50,14 +50,32 @@ export const useSettingStore = defineStore("setting", {
         return res;
       });
     },
+    async uploadImage(data: { key: SettingString; value?: File }[]): Promise<AxiosResponse<any, any>> {
+      const formData = new FormData();
+      for (let entry of data) {
+        if (entry.value) formData.append(entry.key, entry.value);
+      }
+      return await http.put("/admin/setting/img", formData, {
+        headers: {
+          "Content-Type": "multipart/form-data",
+        },
+      });
+    },
+    async updateSettings<K extends SettingString>(
+      data: { key: K; value: SettingValueMapping[K] }[]
+    ): Promise<AxiosResponse<any, any>> {
+      return await http.put("/admin/setting", data);
+    },
     async updateSetting<K extends SettingString>(
       key: K,
-      val: SettingValueMapping[K]
+      value: SettingValueMapping[K]
     ): Promise<AxiosResponse<any, any>> {
-      return await http.put("/admin/setting", {
-        setting: key,
-        value: val,
-      });
+      return await http.put("/admin/setting", [
+        {
+          setting: key,
+          value: value,
+        },
+      ]);
     },
     async resetSetting(key: SettingString): Promise<AxiosResponse<any, any>> {
       return await http.delete(`/admin/setting/${key}`);
diff --git a/src/stores/configuration.ts b/src/stores/configuration.ts
index c33803a..1e8bfd8 100644
--- a/src/stores/configuration.ts
+++ b/src/stores/configuration.ts
@@ -10,6 +10,8 @@ export const useConfigurationStore = defineStore("configuration", {
       clubWebsite: "",
       appCustom_login_message: "",
       appShow_link_to_calendar: false as boolean,
+
+      serverOffline: false as boolean,
     };
   },
   actions: {
@@ -24,7 +26,9 @@ export const useConfigurationStore = defineStore("configuration", {
           this.appCustom_login_message = res.data["app.custom_login_message"];
           this.appShow_link_to_calendar = res.data["app.show_link_to_calendar"];
         })
-        .catch(() => {});
+        .catch(() => {
+          this.serverOffline = true;
+        });
     },
   },
 });
diff --git a/src/views/admin/management/setting/Setting.vue b/src/views/admin/management/setting/Setting.vue
index 2220105..25e602a 100644
--- a/src/views/admin/management/setting/Setting.vue
+++ b/src/views/admin/management/setting/Setting.vue
@@ -6,6 +6,8 @@
       </div>
     </template>
     <template #main>
+      <p>Hinweis: Optionale Felder können leer gelassen werden und nutzen dann einen Fallback-Werte.</p>
+      <ClubImageSetting />
       <ClubSetting />
       <AppSetting />
       <MailSetting />
@@ -26,6 +28,7 @@ import AppSetting from "@/components/admin/management/setting/AppSetting.vue";
 import MailSetting from "@/components/admin/management/setting/MailSetting.vue";
 import SessionSetting from "@/components/admin/management/setting/SessionSetting.vue";
 import BackupSetting from "@/components/admin/management/setting/BackupSetting.vue";
+import ClubImageSetting from "@/components/admin/management/setting/ClubImageSetting.vue";
 </script>
 
 <script lang="ts">

From 0771b43f56e3d58b8573a96b66e1e7686cbec305 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 29 Apr 2025 13:19:50 +0200
Subject: [PATCH 26/45] change url

---
 src/stores/admin/management/setting.ts | 36 ++++++++++++--------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/stores/admin/management/setting.ts b/src/stores/admin/management/setting.ts
index defb78b..20c39bc 100644
--- a/src/stores/admin/management/setting.ts
+++ b/src/stores/admin/management/setting.ts
@@ -50,32 +50,30 @@ export const useSettingStore = defineStore("setting", {
         return res;
       });
     },
-    async uploadImage(data: { key: SettingString; value?: File }[]): Promise<AxiosResponse<any, any>> {
-      const formData = new FormData();
-      for (let entry of data) {
-        if (entry.value) formData.append(entry.key, entry.value);
-      }
-      return await http.put("/admin/setting/img", formData, {
-        headers: {
-          "Content-Type": "multipart/form-data",
-        },
+    async updateSetting<K extends SettingString>(
+      key: K,
+      value: SettingValueMapping[K]
+    ): Promise<AxiosResponse<any, any>> {
+      return await http.put("/admin/setting", {
+        setting: key,
+        value: value,
       });
     },
     async updateSettings<K extends SettingString>(
       data: { key: K; value: SettingValueMapping[K] }[]
     ): Promise<AxiosResponse<any, any>> {
-      return await http.put("/admin/setting", data);
+      return await http.put("/admin/setting/multi", data);
     },
-    async updateSetting<K extends SettingString>(
-      key: K,
-      value: SettingValueMapping[K]
-    ): Promise<AxiosResponse<any, any>> {
-      return await http.put("/admin/setting", [
-        {
-          setting: key,
-          value: value,
+    async uploadImage(data: { key: SettingString; value?: File }[]): Promise<AxiosResponse<any, any>> {
+      const formData = new FormData();
+      for (let entry of data) {
+        if (entry.value) formData.append(entry.key, entry.value);
+      }
+      return await http.put("/admin/setting/images", formData, {
+        headers: {
+          "Content-Type": "multipart/form-data",
         },
-      ]);
+      });
     },
     async resetSetting(key: SettingString): Promise<AxiosResponse<any, any>> {
       return await http.delete(`/admin/setting/${key}`);

From 91ede955300a9c30886e997ed5b6b1c5be6eda0b Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 29 Apr 2025 18:32:08 +0200
Subject: [PATCH 27/45] Image Upload

---
 .../admin/management/setting/BaseSetting.vue  |  10 +-
 .../management/setting/ClubImageSetting.vue   | 100 ++++++++++++++----
 .../admin/management/setting/MailSetting.vue  |   2 +-
 src/stores/admin/management/setting.ts        |  39 +++++--
 4 files changed, 117 insertions(+), 34 deletions(-)

diff --git a/src/components/admin/management/setting/BaseSetting.vue b/src/components/admin/management/setting/BaseSetting.vue
index 96c1308..a879de1 100644
--- a/src/components/admin/management/setting/BaseSetting.vue
+++ b/src/components/admin/management/setting/BaseSetting.vue
@@ -9,7 +9,14 @@
         <button type="submit" class="!w-fit !h-fit !p-0">
           <CheckIcon class="h-5 w-5 cursor-pointer" />
         </button>
-        <button type="reset" class="!w-fit !h-fit !p-0" @click="enableEdit = false">
+        <button
+          type="reset"
+          class="!w-fit !h-fit !p-0"
+          @click="
+            enableEdit = false;
+            $emit('reset');
+          "
+        >
           <XMarkIcon class="h-5 w-5 cursor-pointer" />
         </button>
       </div>
@@ -48,6 +55,7 @@ export default defineComponent({
       required: true,
     },
   },
+  emits: ["reset"],
   data() {
     return {
       enableEdit: false as boolean,
diff --git a/src/components/admin/management/setting/ClubImageSetting.vue b/src/components/admin/management/setting/ClubImageSetting.vue
index e2ab129..1a1d675 100644
--- a/src/components/admin/management/setting/ClubImageSetting.vue
+++ b/src/components/admin/management/setting/ClubImageSetting.vue
@@ -1,31 +1,48 @@
 <template>
-  <BaseSetting title="Vereins-Auftritt Einstellungen" :submit-function="submit" v-slot="{ enableEdit }">
+  <BaseSetting title="Vereins-Auftritt Einstellungen" :submit-function="submit" v-slot="{ enableEdit }" @reset="reset">
     <div class="w-full">
       <p>Vereins-Icon</p>
-      <AppIcon v-if="clubSettings['club.icon'] != '' && !overwriteIcon" class="h-10! max-w-full mx-auto" />
-      <img v-else-if="overwriteIcon" ref="icon_img" class="hidden w-full h-20 object-contain" />
-      <div
-        v-else
-        class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm cursor-pointer"
-        @click="($refs.icon as HTMLInputElement).click()"
-      >
-        Kein eigenes Icon ausgewählt
+      <div class="flex flex-row gap-2">
+        <AppIcon v-if="icon != '' && !overwriteIcon" class="h-10! max-w-full mx-auto" />
+        <div
+          v-else-if="!overwriteIcon"
+          class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm"
+          :class="{ 'cursor-pointer': enableEdit }"
+          @click="enableEdit ? ($refs.icon as HTMLInputElement).click() : null"
+        >
+          Kein eigenes Icon ausgewählt
+        </div>
+        <img ref="icon_img" class="hidden w-full h-20 object-contain" />
+        <XMarkIcon
+          v-if="enableEdit && (icon != '' || overwriteIcon)"
+          class="h-5 w-5 cursor-pointer"
+          @click="resetImage('icon')"
+        />
       </div>
       <input class="hidden!" type="file" ref="icon" accept="image/*" @change="previewImage('icon')" />
     </div>
     <div class="w-full">
       <p>Vereins-Logo</p>
-      <AppLogo v-if="clubSettings['club.logo'] != '' && !overwriteLogo" class="h-10! max-w-full mx-auto" />
-      <img v-else-if="overwriteLogo" ref="logo_img" class="hidden w-full h-20 object-contain" />
-      <div
-        v-else
-        class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm cursor-pointer"
-        @click="($refs.logo as HTMLInputElement).click()"
-      >
-        Kein eigenes Logo ausgewählt
+      <div class="flex flex-row gap-2">
+        <AppLogo v-if="logo != '' && !overwriteLogo" class="h-10! max-w-full mx-auto" />
+        <div
+          v-else-if="!overwriteLogo"
+          class="flex h-10 w-full border-2 border-gray-300 rounded-md items-center justify-center text-sm"
+          :class="{ 'cursor-pointer': enableEdit }"
+          @click="enableEdit ? ($refs.logo as HTMLInputElement).click() : null"
+        >
+          Kein eigenes Logo ausgewählt
+        </div>
+        <img ref="logo_img" class="hidden w-full h-20 object-contain" />
+        <XMarkIcon
+          v-if="enableEdit && (logo != '' || overwriteLogo)"
+          class="h-5 w-5 cursor-pointer"
+          @click="resetImage('logo')"
+        />
       </div>
-      <input class="hidden!" type="file" ref="logo" accept="image/*" @change="previewImage('logo')" /></div
-  ></BaseSetting>
+      <input class="hidden!" type="file" ref="logo" accept="image/*" @change="previewImage('logo')" />
+    </div>
+  </BaseSetting>
 </template>
 
 <script setup lang="ts">
@@ -37,12 +54,20 @@ import AppLogo from "@/components/AppLogo.vue";
 import { useAbilityStore } from "@/stores/ability";
 import type { SettingString } from "@/types/settingTypes";
 import BaseSetting from "./BaseSetting.vue";
+import { XMarkIcon } from "@heroicons/vue/24/outline";
 </script>
 
 <script lang="ts">
 export default defineComponent({
+  watch: {
+    clubSettings() {
+      this.reset();
+    },
+  },
   data() {
     return {
+      logo: "",
+      icon: "",
       overwriteIcon: false as boolean,
       overwriteLogo: false as boolean,
     };
@@ -54,8 +79,35 @@ export default defineComponent({
       return this.readByTopic("club");
     },
   },
+  mounted() {
+    this.reset();
+  },
   methods: {
     ...mapActions(useSettingStore, ["updateSettings", "uploadImage"]),
+    reset() {
+      this.icon = this.clubSettings["club.icon"];
+      this.overwriteIcon = false;
+      (this.$refs.icon_img as HTMLImageElement).style.display = "none";
+      (this.$refs.icon as HTMLInputElement).value = "";
+
+      this.logo = this.clubSettings["club.logo"];
+      this.overwriteLogo = false;
+      (this.$refs.logo_img as HTMLImageElement).style.display = "none";
+      (this.$refs.logo as HTMLInputElement).value = "";
+    },
+    resetImage(inputname: "icon" | "logo") {
+      if (inputname == "icon") {
+        this.icon = "";
+        this.overwriteIcon = false;
+        (this.$refs.icon_img as HTMLImageElement).style.display = "none";
+        (this.$refs.icon as HTMLInputElement).value = "";
+      } else {
+        this.logo = "";
+        this.overwriteLogo = false;
+        (this.$refs.logo_img as HTMLImageElement).style.display = "none";
+        (this.$refs.logo as HTMLInputElement).value = "";
+      }
+    },
     previewImage(inputname: "icon" | "logo") {
       let input = this.$refs[inputname] as HTMLInputElement;
       let previewElement = this.$refs[inputname + "_img"] as HTMLImageElement;
@@ -68,6 +120,12 @@ export default defineComponent({
         };
 
         reader.readAsDataURL(input.files[0]);
+
+        if (inputname == "icon") {
+          this.overwriteIcon = true;
+        } else {
+          this.overwriteLogo = true;
+        }
       } else {
         previewElement.src = "";
         previewElement.style.display = "none";
@@ -76,11 +134,11 @@ export default defineComponent({
     submit(e: any) {
       return this.uploadImage([
         {
-          key: "club.icon" as SettingString,
+          key: "club.icon",
           value: (this.$refs.icon as HTMLInputElement).files?.[0],
         },
         {
-          key: "club.logo" as SettingString,
+          key: "club.logo",
           value: (this.$refs.logo as HTMLInputElement).files?.[0],
         },
       ]);
diff --git a/src/components/admin/management/setting/MailSetting.vue b/src/components/admin/management/setting/MailSetting.vue
index 64ca03d..4b09057 100644
--- a/src/components/admin/management/setting/MailSetting.vue
+++ b/src/components/admin/management/setting/MailSetting.vue
@@ -34,7 +34,7 @@
       <label for="secure">Secure-Verbindung (setzen bei Port 465)</label>
     </div>
     <div class="w-full">
-      <label for="password">Passwort (optional)</label>
+      <label for="password">Passwort (optional - leeres Feld setzt Passwort nicht zurück)</label>
       <input id="password" type="password" :readonly="!enableEdit" autocomplete="new-password" />
     </div>
   </BaseSetting>
diff --git a/src/stores/admin/management/setting.ts b/src/stores/admin/management/setting.ts
index 20c39bc..98bd8a8 100644
--- a/src/stores/admin/management/setting.ts
+++ b/src/stores/admin/management/setting.ts
@@ -54,26 +54,43 @@ export const useSettingStore = defineStore("setting", {
       key: K,
       value: SettingValueMapping[K]
     ): Promise<AxiosResponse<any, any>> {
-      return await http.put("/admin/setting", {
-        setting: key,
-        value: value,
-      });
+      return await http
+        .put("/admin/setting", {
+          setting: key,
+          value: value,
+        })
+        .then((res) => {
+          this.settings[key] = value;
+          return res;
+        });
     },
     async updateSettings<K extends SettingString>(
       data: { key: K; value: SettingValueMapping[K] }[]
     ): Promise<AxiosResponse<any, any>> {
-      return await http.put("/admin/setting/multi", data);
+      return await http.put("/admin/setting/multi", data).then((res) => {
+        for (const element of data) {
+          this.settings[element.key] = element.value;
+        }
+        return res;
+      });
     },
-    async uploadImage(data: { key: SettingString; value?: File }[]): Promise<AxiosResponse<any, any>> {
+    async uploadImage(data: { key: "club.logo" | "club.icon"; value?: File }[]): Promise<AxiosResponse<any, any>> {
       const formData = new FormData();
       for (let entry of data) {
         if (entry.value) formData.append(entry.key, entry.value);
       }
-      return await http.put("/admin/setting/images", formData, {
-        headers: {
-          "Content-Type": "multipart/form-data",
-        },
-      });
+      return await http
+        .put("/admin/setting/images", formData, {
+          headers: {
+            "Content-Type": "multipart/form-data",
+          },
+        })
+        .then((res) => {
+          for (const element of data) {
+            this.settings[element.key] = element.value ? "configured" : "";
+          }
+          return res;
+        });
     },
     async resetSetting(key: SettingString): Promise<AxiosResponse<any, any>> {
       return await http.delete(`/admin/setting/${key}`);

From 939c982c40f605a4cacd34c2894bf9effb181fcc Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 30 Apr 2025 10:43:11 +0200
Subject: [PATCH 28/45] image upload and keep if not changed

---
 .../management/setting/ClubImageSetting.vue      | 16 ++++++++++------
 src/stores/admin/management/setting.ts           |  8 ++++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/admin/management/setting/ClubImageSetting.vue b/src/components/admin/management/setting/ClubImageSetting.vue
index 1a1d675..adc4630 100644
--- a/src/components/admin/management/setting/ClubImageSetting.vue
+++ b/src/components/admin/management/setting/ClubImageSetting.vue
@@ -12,14 +12,14 @@
         >
           Kein eigenes Icon ausgewählt
         </div>
-        <img ref="icon_img" class="hidden w-full h-20 object-contain" />
+        <img ref="icon_img" class="hidden w-full h-10 object-contain" />
         <XMarkIcon
           v-if="enableEdit && (icon != '' || overwriteIcon)"
           class="h-5 w-5 cursor-pointer"
           @click="resetImage('icon')"
         />
       </div>
-      <input class="hidden!" type="file" ref="icon" accept="image/*" @change="previewImage('icon')" />
+      <input class="hidden!" type="file" ref="icon" accept="image/png" @change="previewImage('icon')" />
     </div>
     <div class="w-full">
       <p>Vereins-Logo</p>
@@ -33,14 +33,14 @@
         >
           Kein eigenes Logo ausgewählt
         </div>
-        <img ref="logo_img" class="hidden w-full h-20 object-contain" />
+        <img ref="logo_img" class="hidden w-full h-10 object-contain" />
         <XMarkIcon
           v-if="enableEdit && (logo != '' || overwriteLogo)"
           class="h-5 w-5 cursor-pointer"
           @click="resetImage('logo')"
         />
       </div>
-      <input class="hidden!" type="file" ref="logo" accept="image/*" @change="previewImage('logo')" />
+      <input class="hidden!" type="file" ref="logo" accept="image/png" @change="previewImage('logo')" />
     </div>
   </BaseSetting>
 </template>
@@ -135,11 +135,15 @@ export default defineComponent({
       return this.uploadImage([
         {
           key: "club.icon",
-          value: (this.$refs.icon as HTMLInputElement).files?.[0],
+          value:
+            (this.$refs.icon as HTMLInputElement).files?.[0] ??
+            (this.icon != "" && !this.overwriteIcon ? "keep" : undefined),
         },
         {
           key: "club.logo",
-          value: (this.$refs.logo as HTMLInputElement).files?.[0],
+          value:
+            (this.$refs.logo as HTMLInputElement).files?.[0] ??
+            (this.logo != "" && !this.overwriteLogo ? "keep" : undefined),
         },
       ]);
     },
diff --git a/src/stores/admin/management/setting.ts b/src/stores/admin/management/setting.ts
index 98bd8a8..da8b455 100644
--- a/src/stores/admin/management/setting.ts
+++ b/src/stores/admin/management/setting.ts
@@ -74,10 +74,14 @@ export const useSettingStore = defineStore("setting", {
         return res;
       });
     },
-    async uploadImage(data: { key: "club.logo" | "club.icon"; value?: File }[]): Promise<AxiosResponse<any, any>> {
+    async uploadImage(
+      data: { key: "club.logo" | "club.icon"; value?: File | "keep" }[]
+    ): Promise<AxiosResponse<any, any>> {
       const formData = new FormData();
       for (let entry of data) {
-        if (entry.value) formData.append(entry.key, entry.value);
+        if (entry.value) {
+          formData.append(typeof entry.value == "string" ? entry.key : entry.key.split(".")[1], entry.value);
+        }
       }
       return await http
         .put("/admin/setting/images", formData, {

From 751370fed4632e2ee27ee3613eed2a6d3f3704e4 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 30 Apr 2025 10:51:07 +0200
Subject: [PATCH 29/45] reload images if updated

---
 src/components/AppIcon.vue | 21 ++++++++++++++++++++-
 src/components/AppLogo.vue | 21 ++++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/components/AppIcon.vue b/src/components/AppIcon.vue
index ed4b4db..ac5dcce 100644
--- a/src/components/AppIcon.vue
+++ b/src/components/AppIcon.vue
@@ -1,7 +1,26 @@
 <template>
-  <img :src="url + '/api/public/icon.png'" alt="LOGO" class="h-full w-auto" />
+  <img ref="icon" :src="url + '/api/public/icon.png'" alt="LOGO" class="h-full w-auto" />
 </template>
 
 <script setup lang="ts">
 import { url } from "@/serverCom";
+import { useSettingStore } from "@/stores/admin/management/setting";
+import { mapState } from "pinia";
+import { defineComponent } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  watch: {
+    icon() {
+      (this.$refs.icon as HTMLImageElement).src = url + "/api/public/icon.png?" + new Date().getTime();
+    },
+  },
+  computed: {
+    ...mapState(useSettingStore, ["readSetting"]),
+    icon() {
+      return this.readSetting("club.icon");
+    },
+  },
+});
 </script>
diff --git a/src/components/AppLogo.vue b/src/components/AppLogo.vue
index f29cffc..1e4ffb8 100644
--- a/src/components/AppLogo.vue
+++ b/src/components/AppLogo.vue
@@ -1,7 +1,26 @@
 <template>
-  <img :src="url + '/api/public/applogo.png'" alt="LOGO" class="h-full w-auto" />
+  <img ref="logo" :src="url + '/api/public/applogo.png'" alt="LOGO" class="h-full w-auto" />
 </template>
 
 <script setup lang="ts">
 import { url } from "@/serverCom";
+import { useSettingStore } from "@/stores/admin/management/setting";
+import { mapState } from "pinia";
+import { defineComponent } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  watch: {
+    logo() {
+      (this.$refs.logo as HTMLImageElement).src = url + "/api/public/applogo.png?t=" + new Date().getTime();
+    },
+  },
+  computed: {
+    ...mapState(useSettingStore, ["readSetting"]),
+    logo() {
+      return this.readSetting("club.logo");
+    },
+  },
+});
 </script>

From eb622658d94491c82ed8c6b067fe28a02ec7c652 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 30 Apr 2025 11:36:48 +0200
Subject: [PATCH 30/45] no form reset on failure

---
 src/components/admin/management/setting/BaseSetting.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/management/setting/BaseSetting.vue b/src/components/admin/management/setting/BaseSetting.vue
index a879de1..5091d89 100644
--- a/src/components/admin/management/setting/BaseSetting.vue
+++ b/src/components/admin/management/setting/BaseSetting.vue
@@ -1,5 +1,5 @@
 <template>
-  <form class="flex flex-col w-full" @submit.prevent="submit">
+  <form ref="form" class="flex flex-col w-full" @submit.prevent="submit">
     <div class="flex flex-row gap-2 items-center border-l-3 border-l-primary p-2 rounded-t-lg bg-red-200">
       <p class="text-lg font-semibold grow">{{ title }}</p>
       <Spinner v-if="status == 'loading'" />
@@ -77,7 +77,7 @@ export default defineComponent({
         })
         .finally(() => {
           setTimeout(() => {
-            this.enableEdit = false;
+            if (this.status == "success") this.enableEdit = false;
             this.status = undefined;
           }, 2000);
         });

From bbf5b65aab7cce9c3140ea26982890cdc5b94f61 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 30 Apr 2025 12:22:41 +0200
Subject: [PATCH 31/45] enhance: provide latest inserted internal Id

---
 .../admin/club/member/CreateMemberModal.vue   | 19 +++++++++++++++++--
 src/stores/admin/club/member/member.ts        |  3 +++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/club/member/CreateMemberModal.vue b/src/components/admin/club/member/CreateMemberModal.vue
index bf5c537..d91ed76 100644
--- a/src/components/admin/club/member/CreateMemberModal.vue
+++ b/src/components/admin/club/member/CreateMemberModal.vue
@@ -69,7 +69,15 @@
         <input type="date" id="birthdate" required />
       </div>
       <div>
-        <label for="internalId">Interne ID (optional)</label>
+        <div class="flex flex-row">
+          <label for="internalId" class="grow">
+            Interne ID (optional{{ lastId ? ` - zuletzte verwendet: ${lastId}` : "" }})
+          </label>
+          <div title="Es empfiehlt sich, die Interne Id mit Platzhaltern wie '0' vorne aufzufüllen.">
+            <InformationCircleIcon class="h-5 w-5" />
+          </div>
+        </div>
+
         <input type="text" id="internalId" />
       </div>
       <div class="flex flex-row gap-2">
@@ -103,6 +111,7 @@ import { useMemberStore } from "@/stores/admin/club/member/member";
 import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import { useSalutationStore } from "../../../../stores/admin/configuration/salutation";
 import type { SalutationViewModel } from "../../../../viewmodels/admin/configuration/salutation.models";
+import { InformationCircleIcon } from "@heroicons/vue/24/outline";
 </script>
 
 <script lang="ts">
@@ -112,6 +121,7 @@ export default defineComponent({
       status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
       timeout: undefined as any,
       selectedSalutation: null as null | SalutationViewModel,
+      lastId: "" as string,
     };
   },
   computed: {
@@ -119,6 +129,11 @@ export default defineComponent({
   },
   mounted() {
     this.fetchSalutations();
+    this.fetchLastInternalId()
+      .then((res) => {
+        this.lastId = res.data;
+      })
+      .catch(() => {});
   },
   beforeUnmount() {
     try {
@@ -127,7 +142,7 @@ export default defineComponent({
   },
   methods: {
     ...mapActions(useModalStore, ["closeModal"]),
-    ...mapActions(useMemberStore, ["createMember"]),
+    ...mapActions(useMemberStore, ["createMember", "fetchLastInternalId"]),
     ...mapActions(useSalutationStore, ["fetchSalutations"]),
     triggerCreate(e: any) {
       if (!this.selectedSalutation) return;
diff --git a/src/stores/admin/club/member/member.ts b/src/stores/admin/club/member/member.ts
index 30d778b..26c8bd4 100644
--- a/src/stores/admin/club/member/member.ts
+++ b/src/stores/admin/club/member/member.ts
@@ -87,6 +87,9 @@ export const useMemberStore = defineStore("member", {
         })
         .catch((err) => {});
     },
+    fetchLastInternalId() {
+      return http.get(`/admin/member/last/internalId`);
+    },
     async printMemberByActiveId() {
       return http.get(`/admin/member/${this.activeMember}/print`, {
         responseType: "blob",

From 9cf2cf2d8000b5a852e9a2fa3361fe7d4c8fcce2 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 2 May 2025 09:16:29 +0200
Subject: [PATCH 32/45] fix: compatability layer for query builder joins

---
 src/components/queryBuilder/JoinTable.vue | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/queryBuilder/JoinTable.vue b/src/components/queryBuilder/JoinTable.vue
index 130185c..8ea2153 100644
--- a/src/components/queryBuilder/JoinTable.vue
+++ b/src/components/queryBuilder/JoinTable.vue
@@ -12,7 +12,7 @@
             <ArrowsUpDownIcon class="text-gray-500 h-6 w-6 cursor-pointer" />
           </div>
 
-          <select v-if="value.type == 'defined'" v-model="context" class="w-full">
+          <select v-if="type == 'defined'" v-model="context" class="w-full">
             <option value="" disabled>Relation auswählen</option>
             <option
               v-for="relation in activeTable?.relations"
@@ -121,6 +121,17 @@ export default defineComponent({
         }
       },
     },
+    type: {
+      get(): string {
+        return this.modelValue.type ?? "defined";
+      },
+      set(val: "custom" | "defined") {
+        this.$emit("update:model-value", {
+          ...this.modelValue,
+          type: val,
+        });
+      },
+    },
     joinTable: {
       get(): string {
         return this.modelValue.table;
@@ -137,13 +148,17 @@ export default defineComponent({
     if (!this.value.id) {
       this.value.id = uuid();
     }
+    if (!this.value.type) {
+      console.log("setting type");
+      this.type = "defined";
+    }
   },
   methods: {
     swapJoinType(type: string) {
       if (type == "defined") {
-        this.value.type = "custom";
+        this.type = "custom";
       } else {
-        this.value.type = "defined";
+        this.type = "defined";
       }
     },
   },

From 63d97d0b83215db6deed46feb57cee2c2a687c9e Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 5 May 2025 14:21:22 +0200
Subject: [PATCH 33/45] login by password or totp

---
 src/helpers/crypto.ts |  7 ++++
 src/views/Login.vue   | 97 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 src/helpers/crypto.ts

diff --git a/src/helpers/crypto.ts b/src/helpers/crypto.ts
new file mode 100644
index 0000000..06b32cf
--- /dev/null
+++ b/src/helpers/crypto.ts
@@ -0,0 +1,7 @@
+export async function hashString(message = ""): Promise<string> {
+  const msgUint8 = new TextEncoder().encode(message);
+  const hashBuffer = await window.crypto.subtle.digest("SHA-256", msgUint8);
+  const hashArray = Array.from(new Uint8Array(hashBuffer));
+  const hashHex = hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
+  return hashHex;
+}
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 2ad96f7..8b5ce8c 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -8,13 +8,28 @@
         </h2>
       </div>
 
-      <form class="flex flex-col gap-2" @submit.prevent="login">
+      <form class="flex flex-col gap-2" @submit.prevent="submit">
         <div class="-space-y-px">
-          <div>
-            <input id="username" name="username" type="text" required placeholder="Benutzer" class="rounded-b-none!" />
-          </div>
-          <div>
+          <div class="relative">
             <input
+              id="username"
+              name="username"
+              type="text"
+              required
+              placeholder="Benutzer"
+              :class="routine == '' ? '' : 'rounded-b-none!'"
+              :value="username"
+              :disabled="username != ''"
+            />
+            <div v-if="usernameStatus" class="h-full flex items-center justify-center w-5 absolute top-0 right-2">
+              <Spinner v-if="usernameStatus == 'loading'" class="my-auto" />
+              <SuccessCheckmark v-else-if="usernameStatus == 'success'" />
+              <FailureXMark v-else-if="usernameStatus == 'failed'" />
+            </div>
+          </div>
+          <div v-if="routine != ''">
+            <input
+              v-if="routine == 'totp'"
               id="totp"
               name="totp"
               type="text"
@@ -23,13 +38,26 @@
               class="rounded-t-none!"
               autocomplete="off"
             />
+            <input
+              v-else
+              id="password"
+              name="password"
+              type="password"
+              required
+              placeholder="Passwort"
+              class="rounded-t-none!"
+              autocomplete="off"
+            />
           </div>
         </div>
-        <RouterLink :to="{ name: 'reset-start' }" class="w-fit self-end text-primary">TOTP verloren</RouterLink>
+        <p v-if="username != ''" class="w-fit self-end text-primary cursor-pointer" @click="resetRoutine">
+          Benutzer wechseln
+        </p>
+        <RouterLink :to="{ name: 'reset-start' }" class="w-fit self-end text-primary">Zugang verloren</RouterLink>
 
         <div class="flex flex-row gap-2">
           <button type="submit" primary :disabled="loginStatus == 'loading' || loginStatus == 'success'">
-            anmelden
+            {{ routine == "" ? "Benutzer prüfen" : "anmelden" }}
           </button>
           <Spinner v-if="loginStatus == 'loading'" class="my-auto" />
           <SuccessCheckmark v-else-if="loginStatus == 'success'" />
@@ -53,6 +81,7 @@ import FormBottomBar from "@/components/FormBottomBar.vue";
 import AppLogo from "@/components/AppLogo.vue";
 import { mapState } from "pinia";
 import { useConfigurationStore } from "@/stores/configuration";
+import { hashString } from "../helpers/crypto";
 </script>
 
 <script lang="ts">
@@ -60,7 +89,10 @@ export default defineComponent({
   data() {
     return {
       loginStatus: undefined as undefined | "loading" | "success" | "failed",
+      usernameStatus: undefined as undefined | "loading" | "success" | "failed",
       loginError: "" as string,
+      username: "" as string,
+      routine: "" as string,
     };
   },
   computed: {
@@ -68,16 +100,63 @@ export default defineComponent({
   },
   mounted() {
     resetAllPiniaStores();
+    this.username = localStorage.getItem("username") ?? "";
+    this.routine = localStorage.getItem("routine") ?? "";
   },
   methods: {
-    login(e: any) {
+    resetRoutine() {
+      this.routine = "";
+      this.username = "";
+      localStorage.removeItem("routine");
+      localStorage.removeItem("username");
+    },
+    submit(e: any) {
+      if (this.routine == "") this.kickof(e);
+      else this.login(e);
+    },
+    kickof(e: any) {
+      let formData = e.target.elements;
+      let username = formData.username.value;
+      this.usernameStatus = "loading";
+      this.loginError = "";
+      this.$http
+        .post(`/auth/kickof`, {
+          username: username,
+        })
+        .then((result) => {
+          this.usernameStatus = "success";
+          this.routine = result.data.routine;
+          this.username = username;
+          localStorage.setItem("routine", result.data.routine);
+          localStorage.setItem("username", username);
+        })
+        .catch((err) => {
+          this.usernameStatus = "failed";
+          this.loginError = err.response?.data;
+        })
+        .finally(() => {
+          setTimeout(() => {
+            this.usernameStatus = undefined;
+            this.loginError = "";
+          }, 2000);
+        });
+    },
+    async login(e: any) {
       let formData = e.target.elements;
       this.loginStatus = "loading";
       this.loginError = "";
+
+      let secret = "";
+      if (this.routine == "totp") {
+        secret = formData.totp.value;
+      } else {
+        secret = await hashString(formData.password.value);
+      }
+
       this.$http
         .post(`/auth/login`, {
           username: formData.username.value,
-          totp: formData.totp.value,
+          secret: secret,
         })
         .then((result) => {
           this.loginStatus = "success";

From ee52363bded8510b6ca4ed6ac45bb60458805486 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 5 May 2025 17:44:03 +0200
Subject: [PATCH 34/45] enable switch to pw totp in account settings

---
 src/components/account/ChangeToPassword.vue |  93 +++++++++++++++++
 src/components/account/ChangeToTOTP.vue     |  92 +++++++++++++++++
 src/components/account/PasswordChange.vue   |  96 ++++++++++++++++++
 src/components/account/TotpCheckAndScan.vue |  83 ++++++++++++++++
 src/views/Login.vue                         |  16 +++
 src/views/account/LoginData.vue             | 105 +++++++++-----------
 6 files changed, 429 insertions(+), 56 deletions(-)
 create mode 100644 src/components/account/ChangeToPassword.vue
 create mode 100644 src/components/account/ChangeToTOTP.vue
 create mode 100644 src/components/account/PasswordChange.vue
 create mode 100644 src/components/account/TotpCheckAndScan.vue

diff --git a/src/components/account/ChangeToPassword.vue b/src/components/account/ChangeToPassword.vue
new file mode 100644
index 0000000..7a2f6a2
--- /dev/null
+++ b/src/components/account/ChangeToPassword.vue
@@ -0,0 +1,93 @@
+<template>
+  <form class="flex flex-col gap-2" @submit.prevent="change">
+    <div class="-space-y-px">
+      <div>
+        <input
+          id="new"
+          name="new"
+          type="password"
+          required
+          placeholder="neues Passwort"
+          autocomplete="new-password"
+          class="rounded-b-none!"
+        />
+      </div>
+      <div>
+        <input
+          id="new_rep"
+          name="new_rep"
+          type="password"
+          required
+          placeholder="neues Passwort wiederholen"
+          autocomplete="new-password"
+          class="rounded-t-none!"
+        />
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="changeStatus == 'loading' || changeStatus == 'success'">
+        zu Passwort wechseln
+      </button>
+      <Spinner v-if="changeStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="changeStatus == 'success'" />
+      <FailureXMark v-else-if="changeStatus == 'failed'" />
+    </div>
+    <p v-if="changeError" class="text-center">{{ changeError }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import TextCopy from "@/components/TextCopy.vue";
+import { hashString } from "../../helpers/crypto";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    currentRoutine: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: ["updateCurrent"],
+  data() {
+    return {
+      verification: "loading" as "success" | "loading" | "failed",
+      changeStatus: undefined as undefined | "loading" | "success" | "failed",
+      changeError: "" as string,
+    };
+  },
+  mounted() {},
+  methods: {
+    async change(e: any) {
+      let formData = e.target.elements;
+      this.changeStatus = "loading";
+      this.changeError = "";
+      this.$http
+        .post(`/user/changeToPW`, {
+          newpassword: await hashString(formData.new.value),
+        })
+        .then((result) => {
+          this.changeStatus = "success";
+        })
+        .catch((err) => {
+          this.changeStatus = "failed";
+          this.changeError = err.response.data;
+        })
+        .finally(() => {
+          setTimeout(() => {
+            this.changeStatus = undefined;
+            this.$emit("updateCurrent");
+          }, 2000);
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/account/ChangeToTOTP.vue b/src/components/account/ChangeToTOTP.vue
new file mode 100644
index 0000000..c04197c
--- /dev/null
+++ b/src/components/account/ChangeToTOTP.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="flex flex-col gap-2 grow">
+    <img :src="image" alt="totp" class="w-56 h-56 self-center" />
+
+    <TextCopy :copyText="otp" />
+  </div>
+  <form class="flex flex-col gap-2" @submit.prevent="verify">
+    <div class="-space-y-px">
+      <div>
+        <input id="totp" name="totp" type="text" required placeholder="TOTP" />
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="verifyStatus == 'loading' || verifyStatus == 'success'">
+        zu TOTP wechseln
+      </button>
+      <Spinner v-if="verifyStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="verifyStatus == 'success'" />
+      <FailureXMark v-else-if="verifyStatus == 'failed'" />
+    </div>
+    <p v-if="verifyError" class="text-center">{{ verifyError }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import TextCopy from "@/components/TextCopy.vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    currentRoutine: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: ["updateCurrent"],
+  data() {
+    return {
+      verification: "loading" as "success" | "loading" | "failed",
+      image: undefined as undefined | string,
+      otp: undefined as undefined | string,
+      verifyStatus: undefined as undefined | "loading" | "success" | "failed",
+      verifyError: "" as string,
+    };
+  },
+  mounted() {
+    this.$http
+      .get(`/user/changeToTOTP`)
+      .then((result) => {
+        this.verification = "success";
+        this.image = result.data.dataUrl;
+        this.otp = result.data.otp;
+      })
+      .catch((err) => {
+        this.verification = "failed";
+      });
+  },
+  methods: {
+    verify(e: any) {
+      let formData = e.target.elements;
+      this.verifyStatus = "loading";
+      this.verifyError = "";
+      this.$http
+        .post(`/user/changeToTOTP`, {
+          otp: this.otp,
+          totp: formData.totp.value,
+        })
+        .then((result) => {
+          this.verifyStatus = "success";
+        })
+        .catch((err) => {
+          this.verifyStatus = "failed";
+          this.verifyError = err.response.data;
+        })
+        .finally(() => {
+          setTimeout(() => {
+            this.verifyStatus = undefined;
+            this.$emit("updateCurrent");
+          }, 2000);
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/account/PasswordChange.vue b/src/components/account/PasswordChange.vue
new file mode 100644
index 0000000..f93614b
--- /dev/null
+++ b/src/components/account/PasswordChange.vue
@@ -0,0 +1,96 @@
+<template>
+  <form class="flex flex-col gap-2" @submit.prevent="change">
+    <div class="-space-y-px">
+      <div>
+        <input
+          id="current"
+          name="current"
+          type="password"
+          required
+          placeholder="aktuelles Passwort"
+          autocomplete="current-password"
+          class="rounded-b-none!"
+        />
+      </div>
+      <div>
+        <input
+          id="new"
+          name="new"
+          type="password"
+          required
+          placeholder="neues Passwort"
+          autocomplete="new-password"
+          class="rounded-none!"
+        />
+      </div>
+      <div>
+        <input
+          id="new_rep"
+          name="new_rep"
+          type="password"
+          required
+          placeholder="neues Passwort wiederholen"
+          autocomplete="new-password"
+          class="rounded-t-none!"
+        />
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="changeStatus == 'loading' || changeStatus == 'success'">
+        Passwort ändern
+      </button>
+      <Spinner v-if="changeStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="changeStatus == 'success'" />
+      <FailureXMark v-else-if="changeStatus == 'failed'" />
+    </div>
+    <p v-if="changeError" class="text-center">{{ changeError }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { hashString } from "../../helpers/crypto";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      verification: "loading" as "success" | "loading" | "failed",
+      changeStatus: undefined as undefined | "loading" | "success" | "failed",
+      changeError: "" as string,
+    };
+  },
+  mounted() {},
+  methods: {
+    async change(e: any) {
+      let formData = e.target.elements;
+      this.changeStatus = "loading";
+      this.changeError = "";
+      this.$http
+        .post(`/user/changepw`, {
+          current: await hashString(formData.current.value),
+          newpassword: await hashString(formData.new.value),
+        })
+        .then((result) => {
+          this.changeStatus = "success";
+        })
+        .catch((err) => {
+          this.changeStatus = "failed";
+          this.changeError = err.response.data;
+        })
+        .finally(() => {
+          setTimeout(() => {
+            this.changeStatus = undefined;
+          }, 2000);
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/account/TotpCheckAndScan.vue b/src/components/account/TotpCheckAndScan.vue
new file mode 100644
index 0000000..a9ba5ef
--- /dev/null
+++ b/src/components/account/TotpCheckAndScan.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class="flex flex-col gap-2 grow">
+    <img :src="image" alt="totp" class="w-56 h-56 self-center" />
+
+    <TextCopy :copyText="otp" />
+  </div>
+  <form class="flex flex-col gap-2" @submit.prevent="verify">
+    <div class="-space-y-px">
+      <div>
+        <input id="totp" name="totp" type="text" required placeholder="TOTP prüfen" />
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-2">
+      <button type="submit" primary :disabled="verifyStatus == 'loading' || verifyStatus == 'success'">
+        TOTP prüfen
+      </button>
+      <Spinner v-if="verifyStatus == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="verifyStatus == 'success'" />
+      <FailureXMark v-else-if="verifyStatus == 'failed'" />
+    </div>
+    <p v-if="verifyError" class="text-center">{{ verifyError }}</p>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import TextCopy from "@/components/TextCopy.vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      verification: "loading" as "success" | "loading" | "failed",
+      image: undefined as undefined | string,
+      otp: undefined as undefined | string,
+      verifyStatus: undefined as undefined | "loading" | "success" | "failed",
+      verifyError: "" as string,
+    };
+  },
+  mounted() {
+    this.$http
+      .get(`/user/totp`)
+      .then((result) => {
+        this.verification = "success";
+        this.image = result.data.dataUrl;
+        this.otp = result.data.otp;
+      })
+      .catch((err) => {
+        this.verification = "failed";
+      });
+  },
+  methods: {
+    verify(e: any) {
+      let formData = e.target.elements;
+      this.verifyStatus = "loading";
+      this.verifyError = "";
+      this.$http
+        .post(`/user/verify`, {
+          totp: formData.totp.value,
+        })
+        .then((result) => {
+          this.verifyStatus = "success";
+        })
+        .catch((err) => {
+          this.verifyStatus = "failed";
+          this.verifyError = err.response.data;
+        })
+        .finally(() => {
+          setTimeout(() => {
+            this.verifyStatus = undefined;
+          }, 2000);
+        });
+    },
+  },
+});
+</script>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 8b5ce8c..908a2c7 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -102,6 +102,22 @@ export default defineComponent({
     resetAllPiniaStores();
     this.username = localStorage.getItem("username") ?? "";
     this.routine = localStorage.getItem("routine") ?? "";
+
+    if (this.username != "") {
+      this.$http
+        .post(`/auth/kickof`, {
+          username: this.username,
+        })
+        .then((result) => {
+          this.usernameStatus = "success";
+          this.routine = result.data.routine;
+          localStorage.setItem("routine", result.data.routine);
+        })
+        .catch((err) => {
+          this.usernameStatus = "failed";
+          this.loginError = err.response?.data;
+        });
+    }
   },
   methods: {
     resetRoutine() {
diff --git a/src/views/account/LoginData.vue b/src/views/account/LoginData.vue
index 7ba75bb..f91ad25 100644
--- a/src/views/account/LoginData.vue
+++ b/src/views/account/LoginData.vue
@@ -6,29 +6,41 @@
       </div>
     </template>
     <template #diffMain>
-      <div class="flex flex-col w-full h-full gap-2 justify-between px-7 overflow-hidden">
-        <div class="flex flex-col gap-2">
-          <img :src="image" alt="totp" class="w-56 h-56 self-center" />
-
-          <TextCopy :copyText="otp" />
+      <Spinner v-if="loading" class="mx-auto" />
+      <div v-else class="flex flex-col w-full h-full gap-2 px-7 overflow-hidden">
+        <div class="w-full flex flex-row gap-2 justify-center">
+          <p
+            class="w-1/2 p-0.5 pl-0 rounded-lg py-2.5 text-sm text-center font-medium leading-5 outline-hidden cursor-pointer"
+            :class="
+              tab == 'totp' ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : ' hover:bg-red-200'
+            "
+            @click="tab = 'totp'"
+          >
+            TOTP
+          </p>
+          <p
+            class="w-1/2 p-0.5 rounded-lg py-2.5 text-sm text-center font-medium leading-5 outline-hidden cursor-pointer"
+            :class="
+              tab == 'password' ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : 'hover:bg-red-200'
+            "
+            @click="tab = 'password'"
+          >
+            Passwort
+          </p>
         </div>
-        <form class="flex flex-col gap-2" @submit.prevent="verify">
-          <div class="-space-y-px">
-            <div>
-              <input id="totp" name="totp" type="text" required placeholder="TOTP prüfen" />
-            </div>
-          </div>
-
-          <div class="flex flex-row gap-2">
-            <button type="submit" primary :disabled="verifyStatus == 'loading' || verifyStatus == 'success'">
-              TOTP prüfen
-            </button>
-            <Spinner v-if="verifyStatus == 'loading'" class="my-auto" />
-            <SuccessCheckmark v-else-if="verifyStatus == 'success'" />
-            <FailureXMark v-else-if="verifyStatus == 'failed'" />
-          </div>
-          <p v-if="verifyError" class="text-center">{{ verifyError }}</p>
-        </form>
+        <ChangeToTOTP
+          v-if="currentRoutine == 'password' && tab == 'totp'"
+          :currentRoutine="currentRoutine"
+          @updateCurrent="currentRoutine = 'totp'"
+        />
+        <ChangeToPassword
+          v-else-if="currentRoutine == 'totp' && tab == 'password'"
+          :currentRoutine="currentRoutine"
+          @updateCurrent="currentRoutine = 'password'"
+        />
+        <TotpCheckAndScan v-else-if="tab == 'totp'" />
+        <PasswordChange v-else-if="tab == 'password'" />
+        <p v-else>etwas ist schief gelaufen</p>
       </div>
     </template>
   </MainTemplate>
@@ -42,53 +54,34 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import TextCopy from "@/components/TextCopy.vue";
+import TotpCheckAndScan from "../../components/account/TotpCheckAndScan.vue";
+import PasswordChange from "../../components/account/PasswordChange.vue";
+import ChangeToPassword from "../../components/account/ChangeToPassword.vue";
+import ChangeToTOTP from "../../components/account/ChangeToTOTP.vue";
 </script>
 
 <script lang="ts">
 export default defineComponent({
   data() {
     return {
-      verification: "loading" as "success" | "loading" | "failed",
-      image: undefined as undefined | string,
-      otp: undefined as undefined | string,
-      verifyStatus: undefined as undefined | "loading" | "success" | "failed",
-      verifyError: "" as string,
+      loading: false,
+      tab: "",
+      currentRoutine: "",
     };
   },
   mounted() {
+    this.loading = true;
     this.$http
-      .get(`/user/totp`)
+      .get(`/user/routine`)
       .then((result) => {
-        this.verification = "success";
-        this.image = result.data.dataUrl;
-        this.otp = result.data.otp;
+        this.tab = result.data.routine;
+        this.currentRoutine = result.data.routine;
       })
-      .catch((err) => {
-        this.verification = "failed";
+      .catch((err) => {})
+      .finally(() => {
+        this.loading = false;
       });
   },
-  methods: {
-    verify(e: any) {
-      let formData = e.target.elements;
-      this.verifyStatus = "loading";
-      this.verifyError = "";
-      this.$http
-        .post(`/user/verify`, {
-          totp: formData.totp.value,
-        })
-        .then((result) => {
-          this.verifyStatus = "success";
-        })
-        .catch((err) => {
-          this.verifyStatus = "failed";
-          this.verifyError = err.response.data;
-        })
-        .finally(() => {
-          setTimeout(() => {
-            this.verifyStatus = undefined;
-          }, 2000);
-        });
-    },
-  },
+  methods: {},
 });
 </script>

From b39198c935f027039d8b0c3cc983d987ebb43ec6 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 6 May 2025 08:38:28 +0200
Subject: [PATCH 35/45] enable password on invite or reset

---
 src/views/Login.vue         |  2 +-
 src/views/invite/Verify.vue | 72 ++++++++++++++++++++++++++++++++----
 src/views/reset/Reset.vue   | 73 +++++++++++++++++++++++++++++++++----
 src/views/reset/Start.vue   |  6 ++-
 4 files changed, 135 insertions(+), 18 deletions(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index 908a2c7..6ef5c6b 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -46,7 +46,7 @@
               required
               placeholder="Passwort"
               class="rounded-t-none!"
-              autocomplete="off"
+              autocomplete="current-password"
             />
           </div>
         </div>
diff --git a/src/views/invite/Verify.vue b/src/views/invite/Verify.vue
index f2cbed2..ff1977f 100644
--- a/src/views/invite/Verify.vue
+++ b/src/views/invite/Verify.vue
@@ -14,17 +14,59 @@
         <p class="w-fit">Einladungslink nicht gültig - Melde dich bei einem Admin.</p>
       </div>
       <form v-else class="flex flex-col gap-2" @submit.prevent="invite">
+        <div class="w-full flex flex-row gap-2 justify-center">
+          <p
+            class="w-1/2 p-0.5 pl-0 rounded-lg py-2.5 text-sm text-center font-medium leading-5 outline-hidden cursor-pointer"
+            :class="
+              tab == 'totp' ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : ' hover:bg-red-200'
+            "
+            @click="tab = 'totp'"
+          >
+            TOTP
+          </p>
+          <p
+            class="w-1/2 p-0.5 rounded-lg py-2.5 text-sm text-center font-medium leading-5 outline-hidden cursor-pointer"
+            :class="
+              tab == 'password' ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : 'hover:bg-red-200'
+            "
+            @click="tab = 'password'"
+          >
+            Passwort
+          </p>
+        </div>
         <p class="text-center">Dein Nutzername: {{ username }}</p>
 
-        <img :src="image" alt="totp" class="w-56 h-56 self-center" />
+        <div v-if="tab == 'totp'" class="flex flex-col gap-2">
+          <img :src="image" alt="totp" class="w-56 h-56 self-center" />
 
-        <TextCopy :copyText="otp" />
+          <TextCopy :copyText="otp" />
 
-        <div class="-space-y-px">
-          <div>
-            <input id="totp" name="totp" type="text" required placeholder="TOTP" />
+          <div class="-space-y-px">
+            <div>
+              <input id="totp" name="totp" type="text" required placeholder="TOTP" />
+            </div>
           </div>
         </div>
+        <div v-else>
+          <input
+            id="password"
+            name="password"
+            type="password"
+            required
+            placeholder="Passwort"
+            class="rounded-b-none!"
+            autocomplete="new-password"
+          />
+          <input
+            id="passwordrep"
+            name="passwordrep"
+            type="password"
+            required
+            placeholder="Passwort wiederholen"
+            class="rounded-t-none!"
+            autocomplete="new-password"
+          />
+        </div>
 
         <div class="flex flex-row gap-2">
           <button type="submit" primary :disabled="inviteStatus == 'loading' || inviteStatus == 'success'">
@@ -50,6 +92,7 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import FormBottomBar from "@/components/FormBottomBar.vue";
 import TextCopy from "@/components/TextCopy.vue";
 import AppLogo from "@/components/AppLogo.vue";
+import { hashString } from "@/helpers/crypto";
 </script>
 
 <script lang="ts">
@@ -60,6 +103,7 @@ export default defineComponent({
   },
   data() {
     return {
+      tab: "totp",
       verification: "loading" as "success" | "loading" | "failed",
       image: undefined as undefined | string,
       otp: undefined as undefined | string,
@@ -89,15 +133,19 @@ export default defineComponent({
       });
   },
   methods: {
-    invite(e: any) {
-      let formData = e.target.elements;
+    async invite(e: any) {
+      let secret = "";
+      if (this.tab == "totp") secret = this.totp(e);
+      else secret = await this.password(e);
+
       this.inviteStatus = "loading";
       this.inviteError = "";
       this.$http
         .put(`/invite`, {
           token: this.token,
           mail: this.mail,
-          totp: formData.totp.value,
+          secret: secret,
+          routine: this.tab,
         })
         .then((result) => {
           this.inviteStatus = "success";
@@ -112,6 +160,14 @@ export default defineComponent({
           this.inviteError = err.response.data;
         });
     },
+    totp(e: any) {
+      let formData = e.target.elements;
+      return formData.totp.value;
+    },
+    async password(e: any) {
+      let formData = e.target.elements;
+      return await hashString(formData.password.value);
+    },
   },
 });
 </script>
diff --git a/src/views/reset/Reset.vue b/src/views/reset/Reset.vue
index bf0fabf..fb05868 100644
--- a/src/views/reset/Reset.vue
+++ b/src/views/reset/Reset.vue
@@ -15,15 +15,58 @@
         <RouterLink to="/reset" class="text-primary">Zum zurücksetzen Start</RouterLink>
       </div>
       <form v-else class="flex flex-col gap-2" @submit.prevent="reset">
-        <img :src="image" alt="totp" class="w-56 h-56 self-center" />
+        <div class="w-full flex flex-row gap-2 justify-center">
+          <p
+            class="w-1/2 p-0.5 pl-0 rounded-lg py-2.5 text-sm text-center font-medium leading-5 outline-hidden cursor-pointer"
+            :class="
+              tab == 'totp' ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : ' hover:bg-red-200'
+            "
+            @click="tab = 'totp'"
+          >
+            TOTP
+          </p>
+          <p
+            class="w-1/2 p-0.5 rounded-lg py-2.5 text-sm text-center font-medium leading-5 outline-hidden cursor-pointer"
+            :class="
+              tab == 'password' ? 'bg-red-200 shadow-sm border-b-2 border-primary rounded-b-none' : 'hover:bg-red-200'
+            "
+            @click="tab = 'password'"
+          >
+            Passwort
+          </p>
+        </div>
 
-        <TextCopy :copyText="otp" />
+        <div v-if="tab == 'totp'" class="flex flex-col gap-2">
+          <img :src="image" alt="totp" class="w-56 h-56 self-center" />
 
-        <div class="-space-y-px">
-          <div>
-            <input id="totp" name="totp" type="text" required placeholder="TOTP" />
+          <TextCopy :copyText="otp" />
+
+          <div class="-space-y-px">
+            <div>
+              <input id="totp" name="totp" type="text" required placeholder="TOTP" />
+            </div>
           </div>
         </div>
+        <div v-else>
+          <input
+            id="password"
+            name="password"
+            type="password"
+            required
+            placeholder="Passwort"
+            class="rounded-b-none!"
+            autocomplete="new-password"
+          />
+          <input
+            id="passwordrep"
+            name="passwordrep"
+            type="password"
+            required
+            placeholder="Passwort wiederholen"
+            class="rounded-t-none!"
+            autocomplete="new-password"
+          />
+        </div>
 
         <div class="flex flex-row gap-2">
           <button type="submit" primary :disabled="resetStatus == 'loading' || resetStatus == 'success'">
@@ -50,6 +93,7 @@ import { RouterLink } from "vue-router";
 import FormBottomBar from "@/components/FormBottomBar.vue";
 import TextCopy from "@/components/TextCopy.vue";
 import AppLogo from "@/components/AppLogo.vue";
+import { hashString } from "@/helpers/crypto";
 </script>
 
 <script lang="ts">
@@ -60,6 +104,7 @@ export default defineComponent({
   },
   data() {
     return {
+      tab: "totp",
       verification: "loading" as "success" | "loading" | "failed",
       image: undefined as undefined | string,
       otp: undefined as undefined | string,
@@ -87,15 +132,19 @@ export default defineComponent({
       });
   },
   methods: {
-    reset(e: any) {
-      let formData = e.target.elements;
+    async reset(e: any) {
+      let secret = "";
+      if (this.tab == "totp") secret = this.totp(e);
+      else secret = await this.password(e);
+
       this.resetStatus = "loading";
       this.resetError = "";
       this.$http
         .put(`/reset`, {
           token: this.token,
           mail: this.mail,
-          totp: formData.totp.value,
+          secret: secret,
+          routine: this.tab,
         })
         .then((result) => {
           this.resetStatus = "success";
@@ -110,6 +159,14 @@ export default defineComponent({
           this.resetError = err.response.data;
         });
     },
+    totp(e: any) {
+      let formData = e.target.elements;
+      return formData.totp.value;
+    },
+    async password(e: any) {
+      let formData = e.target.elements;
+      return await hashString(formData.password.value);
+    },
   },
 });
 </script>
diff --git a/src/views/reset/Start.vue b/src/views/reset/Start.vue
index 5d9abd7..95dbad5 100644
--- a/src/views/reset/Start.vue
+++ b/src/views/reset/Start.vue
@@ -9,7 +9,7 @@
       <form class="flex flex-col gap-2" @submit.prevent="reset">
         <div class="-space-y-px">
           <div>
-            <input id="username" name="username" type="text" required placeholder="Benutzer" />
+            <input id="username" name="username" type="text" required placeholder="Benutzer" :value="username" />
           </div>
         </div>
         <RouterLink to="/" class="w-fit self-end text-primary">zum Login</RouterLink>
@@ -45,8 +45,12 @@ export default defineComponent({
     return {
       resetStatus: undefined as undefined | "loading" | "success" | "failed",
       resetMessage: "" as string,
+      username: "" as string,
     };
   },
+  mounted() {
+    this.username = localStorage.getItem("username") ?? "";
+  },
   methods: {
     reset(e: any) {
       let formData = e.target.elements;

From 196a92325a341cf7f83907564ad9986282443af2 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 6 May 2025 08:38:49 +0200
Subject: [PATCH 36/45] fix: redirect to nopermission screen

---
 src/router/authGuard.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/authGuard.ts b/src/router/authGuard.ts
index c19bc72..433a1ea 100644
--- a/src/router/authGuard.ts
+++ b/src/router/authGuard.ts
@@ -73,7 +73,7 @@ export async function isAuthenticatedPromise(forceRefresh: boolean = false): Pro
 
       var { userId, firstname, lastname, mail, username, permissions, isOwner } = decoded;
 
-      if (Object.keys(permissions ?? {}).length === 0 && !isOwner) {
+      if (Object.keys(permissions ?? {}).filter((p) => p != "adminByOwner").length === 0 && !isOwner) {
         auth.setFailed();
         reject("nopermissions");
       }

From f65b3108eefe9355c1fbe313d4fc0454e043b0fe Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 6 May 2025 09:02:55 +0200
Subject: [PATCH 37/45] check if password and repeat match

---
 src/components/account/ChangeToPassword.vue | 13 +++++++++++++
 src/components/account/PasswordChange.vue   | 13 +++++++++++++
 src/views/invite/Verify.vue                 | 19 +++++++++++++++++--
 src/views/reset/Reset.vue                   | 21 ++++++++++++++++++---
 src/views/reset/Start.vue                   |  2 +-
 5 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/components/account/ChangeToPassword.vue b/src/components/account/ChangeToPassword.vue
index 7a2f6a2..86b7c8e 100644
--- a/src/components/account/ChangeToPassword.vue
+++ b/src/components/account/ChangeToPassword.vue
@@ -10,6 +10,7 @@
           placeholder="neues Passwort"
           autocomplete="new-password"
           class="rounded-b-none!"
+          :class="notMatching ? 'border-red-600!' : ''"
         />
       </div>
       <div>
@@ -21,8 +22,10 @@
           placeholder="neues Passwort wiederholen"
           autocomplete="new-password"
           class="rounded-t-none!"
+          :class="notMatching ? 'border-red-600!' : ''"
         />
       </div>
+      <p v-if="notMatching">Passwörter stimmen nicht überein</p>
     </div>
 
     <div class="flex flex-row gap-2">
@@ -62,12 +65,22 @@ export default defineComponent({
       verification: "loading" as "success" | "loading" | "failed",
       changeStatus: undefined as undefined | "loading" | "success" | "failed",
       changeError: "" as string,
+      notMatching: false as boolean,
     };
   },
   mounted() {},
   methods: {
     async change(e: any) {
       let formData = e.target.elements;
+
+      let new_pw = await hashString(formData.new.value);
+      let new_rep = await hashString(formData.new_rep.value);
+      if (new_pw != new_rep) {
+        this.notMatching = true;
+        return;
+      }
+      this.notMatching = false;
+
       this.changeStatus = "loading";
       this.changeError = "";
       this.$http
diff --git a/src/components/account/PasswordChange.vue b/src/components/account/PasswordChange.vue
index f93614b..268e5bc 100644
--- a/src/components/account/PasswordChange.vue
+++ b/src/components/account/PasswordChange.vue
@@ -21,6 +21,7 @@
           placeholder="neues Passwort"
           autocomplete="new-password"
           class="rounded-none!"
+          :class="notMatching ? 'border-red-600!' : ''"
         />
       </div>
       <div>
@@ -32,8 +33,10 @@
           placeholder="neues Passwort wiederholen"
           autocomplete="new-password"
           class="rounded-t-none!"
+          :class="notMatching ? 'border-red-600!' : ''"
         />
       </div>
+      <p v-if="notMatching">Passwörter stimmen nicht überein</p>
     </div>
 
     <div class="flex flex-row gap-2">
@@ -65,12 +68,22 @@ export default defineComponent({
       verification: "loading" as "success" | "loading" | "failed",
       changeStatus: undefined as undefined | "loading" | "success" | "failed",
       changeError: "" as string,
+      notMatching: false as boolean,
     };
   },
   mounted() {},
   methods: {
     async change(e: any) {
       let formData = e.target.elements;
+
+      let new_pw = await hashString(formData.new.value);
+      let new_rep = await hashString(formData.new_rep.value);
+      if (new_pw != new_rep) {
+        this.notMatching = true;
+        return;
+      }
+      this.notMatching = false;
+
       this.changeStatus = "loading";
       this.changeError = "";
       this.$http
diff --git a/src/views/invite/Verify.vue b/src/views/invite/Verify.vue
index ff1977f..0547f3f 100644
--- a/src/views/invite/Verify.vue
+++ b/src/views/invite/Verify.vue
@@ -56,16 +56,19 @@
             placeholder="Passwort"
             class="rounded-b-none!"
             autocomplete="new-password"
+            :class="notMatching ? 'border-red-600!' : ''"
           />
           <input
-            id="passwordrep"
-            name="passwordrep"
+            id="password_rep"
+            name="password_rep"
             type="password"
             required
             placeholder="Passwort wiederholen"
             class="rounded-t-none!"
             autocomplete="new-password"
+            :class="notMatching ? 'border-red-600!' : ''"
           />
+          <p v-if="notMatching">Passwörter stimmen nicht überein</p>
         </div>
 
         <div class="flex flex-row gap-2">
@@ -110,6 +113,7 @@ export default defineComponent({
       username: "" as string,
       inviteStatus: undefined as undefined | "loading" | "success" | "failed",
       inviteError: "" as string,
+      notMatching: false as boolean,
     };
   },
   mounted() {
@@ -138,6 +142,8 @@ export default defineComponent({
       if (this.tab == "totp") secret = this.totp(e);
       else secret = await this.password(e);
 
+      if (secret == "") return;
+
       this.inviteStatus = "loading";
       this.inviteError = "";
       this.$http
@@ -166,6 +172,15 @@ export default defineComponent({
     },
     async password(e: any) {
       let formData = e.target.elements;
+
+      let new_pw = await hashString(formData.password.value);
+      let new_rep = await hashString(formData.password_rep.value);
+      if (new_pw != new_rep) {
+        this.notMatching = true;
+        return "";
+      }
+      this.notMatching = false;
+
       return await hashString(formData.password.value);
     },
   },
diff --git a/src/views/reset/Reset.vue b/src/views/reset/Reset.vue
index fb05868..9a6bc4c 100644
--- a/src/views/reset/Reset.vue
+++ b/src/views/reset/Reset.vue
@@ -3,7 +3,7 @@
     <div class="max-w-md w-full space-y-8 pb-20">
       <div class="flex flex-col items-center gap-4">
         <AppLogo />
-        <h2 class="text-center text-4xl font-extrabold text-gray-900">TOTP zurücksetzen</h2>
+        <h2 class="text-center text-4xl font-extrabold text-gray-900">Zugang zurücksetzen</h2>
       </div>
 
       <div v-if="verification == 'loading'" class="flex flex-col gap-2 items-center">
@@ -56,16 +56,19 @@
             placeholder="Passwort"
             class="rounded-b-none!"
             autocomplete="new-password"
+            :class="notMatching ? 'border-red-600!' : ''"
           />
           <input
-            id="passwordrep"
-            name="passwordrep"
+            id="password_rep"
+            name="password_rep"
             type="password"
             required
             placeholder="Passwort wiederholen"
             class="rounded-t-none!"
             autocomplete="new-password"
+            :class="notMatching ? 'border-red-600!' : ''"
           />
+          <p v-if="notMatching">Passwörter stimmen nicht überein</p>
         </div>
 
         <div class="flex flex-row gap-2">
@@ -110,6 +113,7 @@ export default defineComponent({
       otp: undefined as undefined | string,
       resetStatus: undefined as undefined | "loading" | "success" | "failed",
       resetError: "" as string,
+      notMatching: false as boolean,
     };
   },
   mounted() {
@@ -137,6 +141,8 @@ export default defineComponent({
       if (this.tab == "totp") secret = this.totp(e);
       else secret = await this.password(e);
 
+      if (secret == "") return;
+
       this.resetStatus = "loading";
       this.resetError = "";
       this.$http
@@ -165,6 +171,15 @@ export default defineComponent({
     },
     async password(e: any) {
       let formData = e.target.elements;
+
+      let new_pw = await hashString(formData.password.value);
+      let new_rep = await hashString(formData.password_rep.value);
+      if (new_pw != new_rep) {
+        this.notMatching = true;
+        return "";
+      }
+      this.notMatching = false;
+
       return await hashString(formData.password.value);
     },
   },
diff --git a/src/views/reset/Start.vue b/src/views/reset/Start.vue
index 95dbad5..a1de3c4 100644
--- a/src/views/reset/Start.vue
+++ b/src/views/reset/Start.vue
@@ -3,7 +3,7 @@
     <div class="max-w-md w-full space-y-8 pb-20">
       <div class="flex flex-col items-center gap-4">
         <AppLogo />
-        <h2 class="text-center text-4xl font-extrabold text-gray-900">TOTP zurücksetzen</h2>
+        <h2 class="text-center text-4xl font-extrabold text-gray-900">Zugang zurücksetzen</h2>
       </div>
 
       <form class="flex flex-col gap-2" @submit.prevent="reset">

From 625a2df308de5c90c68fcf4981a75d5702169bcd Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 6 May 2025 09:17:26 +0200
Subject: [PATCH 38/45] fix: temporary fix on tailwind hover

---
 src/components/admin/management/setting/BaseSetting.vue | 4 ++--
 src/main.css                                            | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/management/setting/BaseSetting.vue b/src/components/admin/management/setting/BaseSetting.vue
index 5091d89..533c593 100644
--- a/src/components/admin/management/setting/BaseSetting.vue
+++ b/src/components/admin/management/setting/BaseSetting.vue
@@ -6,12 +6,12 @@
       <SuccessCheckmark v-else-if="status == 'success'" />
       <FailureXMark v-else-if="status == 'failed'" />
       <div v-else-if="enableEdit" class="flex flex-row gap-2">
-        <button type="submit" class="!w-fit !h-fit !p-0">
+        <button type="submit" class="w-fit! h-fit! p-0!">
           <CheckIcon class="h-5 w-5 cursor-pointer" />
         </button>
         <button
           type="reset"
-          class="!w-fit !h-fit !p-0"
+          class="w-fit! h-fit! p-0!"
           @click="
             enableEdit = false;
             $emit('reset');
diff --git a/src/main.css b/src/main.css
index 9f95aa5..a334a51 100644
--- a/src/main.css
+++ b/src/main.css
@@ -31,6 +31,8 @@
   }
 }
 
+@custom-variant hover (&:hover);
+
 /* ===== Scrollbar CSS ===== */
 /* Firefox */
 * {

From f01c895d30c6745b46f0862a658b5525f0dcfdda Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 6 May 2025 09:30:50 +0200
Subject: [PATCH 39/45] update all packages

---
 package-lock.json | 2903 ++++++++++++++++++++++++++++-----------------
 package.json      |   60 +-
 2 files changed, 1846 insertions(+), 1117 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c6c56a..44fcb7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,19 +9,19 @@
       "version": "1.4.0",
       "license": "AGPL-3.0-only",
       "dependencies": {
-        "@fullcalendar/core": "^6.1.15",
-        "@fullcalendar/daygrid": "^6.1.15",
-        "@fullcalendar/interaction": "^6.1.15",
+        "@fullcalendar/core": "^6.1.17",
+        "@fullcalendar/daygrid": "^6.1.17",
+        "@fullcalendar/interaction": "^6.1.17",
         "@fullcalendar/list": "^6.1.17",
-        "@fullcalendar/timegrid": "^6.1.15",
-        "@fullcalendar/vue3": "^6.1.15",
+        "@fullcalendar/timegrid": "^6.1.17",
+        "@fullcalendar/vue3": "^6.1.17",
         "@headlessui/vue": "^1.7.23",
-        "@heroicons/vue": "^2.1.5",
-        "@tailwindcss/vite": "^4.1.3",
+        "@heroicons/vue": "^2.2.0",
+        "@tailwindcss/vite": "^4.1.5",
         "@vueup/vue-quill": "^1.2.0",
-        "axios": "^1.7.9",
+        "axios": "^1.9.0",
         "event-source-polyfill": "^1.0.31",
-        "grapesjs": "^0.22.4",
+        "grapesjs": "^0.22.7",
         "grapesjs-preset-newsletter": "^1.0.2",
         "highlight.js": "^11.11.1",
         "jwt-decode": "^4.0.0",
@@ -36,45 +36,45 @@
         "pdf-dist": "^1.0.0",
         "pinia": "^3.0.2",
         "pwacompat": "^2.0.17",
-        "qrcode": "^1.5.3",
-        "qs": "^6.11.2",
-        "socket.io-client": "^4.5.0",
+        "qrcode": "^1.5.4",
+        "qs": "^6.14.0",
+        "socket.io-client": "^4.8.1",
         "unplugin-vue-markdown": "^28.3.1",
         "uuid": "^11.1.0",
-        "vue": "^3.4.29",
-        "vue-router": "^4.3.3"
+        "vue": "^3.5.13",
+        "vue-router": "^4.5.1"
       },
       "devDependencies": {
-        "@rushstack/eslint-patch": "^1.8.0",
-        "@tailwindcss/postcss": "^4.1.3",
-        "@tsconfig/node20": "^20.1.4",
-        "@types/eslint": "~9.6.0",
+        "@rushstack/eslint-patch": "^1.11.0",
+        "@tailwindcss/postcss": "^4.1.5",
+        "@tsconfig/node20": "^20.1.5",
+        "@types/eslint": "~9.6.1",
         "@types/event-source-polyfill": "^1.0.5",
         "@types/lodash.clonedeep": "^4.5.9",
         "@types/lodash.difference": "^4.5.9",
         "@types/lodash.differencewith": "^4.5.9",
         "@types/lodash.isequal": "^4.5.8",
         "@types/markdown-it": "^14.1.2",
-        "@types/node": "^22.14.0",
-        "@types/nprogress": "^0.2.0",
+        "@types/node": "^22.15.12",
+        "@types/nprogress": "^0.2.3",
         "@types/qrcode": "^1.5.5",
-        "@types/qs": "^6.9.11",
+        "@types/qs": "^6.9.18",
         "@types/uuid": "^10.0.0",
         "@vite-pwa/assets-generator": "^1.0.0",
-        "@vitejs/plugin-vue": "^5.0.5",
+        "@vitejs/plugin-vue": "^5.2.3",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.5.0",
         "@vue/tsconfig": "^0.7.0",
-        "eslint": "^9.24.0",
-        "eslint-plugin-vue": "^10.0.0",
-        "npm-run-all2": "^7.0.2",
-        "prettier": "^3.2.5",
-        "tailwindcss": "^4.1.3",
+        "eslint": "^9.26.0",
+        "eslint-plugin-vue": "^10.1.0",
+        "npm-run-all2": "^8.0.1",
+        "prettier": "^3.5.3",
+        "tailwindcss": "^4.1.5",
         "typescript": "^5.8.3",
-        "vite": "^6.2.6",
+        "vite": "^6.3.5",
         "vite-plugin-pwa": "^1.0.0",
-        "vite-plugin-vue-devtools": "^7.6.8",
-        "vue-tsc": "^2.0.21"
+        "vite-plugin-vue-devtools": "^7.7.6",
+        "vue-tsc": "^2.2.10"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -115,24 +115,24 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.27.1",
         "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
-      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.1.tgz",
+      "integrity": "sha512-Q+E+rd/yBzNQhXkG+zQnF58e4zoZfBedaxwzPmicKsiK3nt8iJYrSrDbjwFFDGC4f+rPafqRaPH6TsDoSvMf7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -140,22 +140,22 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.26.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
-      "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.1.tgz",
+      "integrity": "sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.10",
-        "@babel/helper-compilation-targets": "^7.26.5",
-        "@babel/helper-module-transforms": "^7.26.0",
-        "@babel/helpers": "^7.26.10",
-        "@babel/parser": "^7.26.10",
-        "@babel/template": "^7.26.9",
-        "@babel/traverse": "^7.26.10",
-        "@babel/types": "^7.26.10",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.27.1",
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helpers": "^7.27.1",
+        "@babel/parser": "^7.27.1",
+        "@babel/template": "^7.27.1",
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -181,14 +181,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
-      "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.1.tgz",
+      "integrity": "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.0",
-        "@babel/types": "^7.27.0",
+        "@babel/parser": "^7.27.1",
+        "@babel/types": "^7.27.1",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -198,27 +198,27 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
-      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz",
+      "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.9"
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz",
-      "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.1.tgz",
+      "integrity": "sha512-2YaDd/Rd9E598B5+WIc8wJPmWETiiJXFYVE60oX8FDohv7rAUU3CQj+A1MgeEmcsk2+dQuEjIe/GDvig0SqL4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.26.8",
-        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/compat-data": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -238,18 +238,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.0.tgz",
-      "integrity": "sha512-vSGCvMecvFCd/BdpGlhpXYNhhC4ccxyvQWpbGL4CWbvfEoLFWUZuSuf7s9Aw70flgQF+6vptvgK2IfOnKlRmBg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz",
+      "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-member-expression-to-functions": "^7.25.9",
-        "@babel/helper-optimise-call-expression": "^7.25.9",
-        "@babel/helper-replace-supers": "^7.26.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
-        "@babel/traverse": "^7.27.0",
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/traverse": "^7.27.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -270,13 +270,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.0.tgz",
-      "integrity": "sha512-fO8l08T76v48BhpNRW/nQ0MxfnSdoSKUJBMjubOAYffsVuGG5qOfMq7N6Es7UJvi7Y8goXXo07EfcHZXDPuELQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz",
+      "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-annotate-as-pure": "^7.27.1",
         "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
@@ -315,43 +315,43 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
-      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
+      "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
-      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.1.tgz",
+      "integrity": "sha512-9yHn519/8KvTU5BjTVEEeIM3w9/2yXNKoD82JifINImhpKkARMJKPP59kLo+BafpdN5zgNeIcS4jsGDmd3l58g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -361,22 +361,22 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
-      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
+      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.9"
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
-      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -384,15 +384,15 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
-      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-wrap-function": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-wrap-function": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -402,15 +402,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
-      "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
+      "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.25.9",
-        "@babel/helper-optimise-call-expression": "^7.25.9",
-        "@babel/traverse": "^7.26.5"
+        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -420,41 +420,41 @@
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
-      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
+      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -462,41 +462,41 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
-      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.27.1.tgz",
+      "integrity": "sha512-NFJK2sHUvrjo8wAU/nQTWU890/zB2jj0qBcCbZbbf+005cAsv6tMjXz31fBign6M5ov1o0Bllu+9nbqkfsjjJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.9",
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/template": "^7.27.1",
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
-      "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz",
+      "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.0",
-        "@babel/types": "^7.27.0"
+        "@babel/template": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
-      "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.1.tgz",
+      "integrity": "sha512-I0dZ3ZpCrJ1c04OqlNsQcKiZlsrXf/kkE4FXzID9rIOYICsAbA8mMDzhW/luRNAHdCNt7os/u8wenklZDlUVUQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.0"
+        "@babel/types": "^7.27.1"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -506,14 +506,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
-      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
+      "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -523,13 +523,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
-      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
+      "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -539,13 +539,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
-      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
+      "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -555,15 +555,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
-      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
-        "@babel/plugin-transform-optional-chaining": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -573,14 +573,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
-      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz",
+      "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -590,15 +590,15 @@
       }
     },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.9.tgz",
-      "integrity": "sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.27.1.tgz",
+      "integrity": "sha512-DTxe4LBPrtFdsWzgpmbBKevg3e9PBy+dXRt19kSbucbZvL2uqtdqwwpluL1jfxYE0wIDTFp1nTy/q6gNLsxXrg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/plugin-syntax-decorators": "^7.25.9"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-decorators": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -621,13 +621,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz",
-      "integrity": "sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.27.1.tgz",
+      "integrity": "sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -637,13 +637,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
-      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
+      "integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -653,13 +653,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
-      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -682,13 +682,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
-      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -698,13 +698,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
-      "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -731,13 +731,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
-      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
+      "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -747,15 +747,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
-      "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.27.1.tgz",
+      "integrity": "sha512-eST9RrwlpaoJBDHShc+DS2SG4ATTi2MYNb4OxYkf3n+7eb49LWpnS+HSpVfW4x927qQwgk8A2hGNVaajAEw0EA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "@babel/helper-remap-async-to-generator": "^7.25.9",
-        "@babel/traverse": "^7.26.8"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-remap-async-to-generator": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -765,15 +765,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
-      "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-remap-async-to-generator": "^7.25.9"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-remap-async-to-generator": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -783,13 +783,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
-      "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
+      "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -799,13 +799,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.0.tgz",
-      "integrity": "sha512-u1jGphZ8uDI2Pj/HJj6YQ6XQLZCNjOlprjxB5SVz6rq2T6SwAR+CdrWK0CP7F+9rDVMXdB0+r6Am5G5aobOjAQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.1.tgz",
+      "integrity": "sha512-QEcFlMl9nGTgh1rn2nIeU5bkfb9BAjaQcWbiP4LvKxUot52ABcTkpcyJ7f2Q2U2RuQ84BNLgts3jRme2dTx6Fw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -815,14 +815,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
-      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz",
+      "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -832,14 +832,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
-      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz",
+      "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -849,17 +849,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
-      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.27.1.tgz",
+      "integrity": "sha512-7iLhfFAubmpeJe/Wo2TVuDrykh/zlWXLzPNdL0Jqn/Xu8R3QQ8h9ff8FQoISZOsw74/HFqFI7NX63HN7QFIHKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-compilation-targets": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-replace-supers": "^7.25.9",
-        "@babel/traverse": "^7.25.9",
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1",
+        "@babel/traverse": "^7.27.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -880,14 +880,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
-      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz",
+      "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/template": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/template": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -897,13 +897,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
-      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.27.1.tgz",
+      "integrity": "sha512-ttDCqhfvpE9emVkXbPD8vyxxh4TWYACVybGkDj+oReOGwnp066ITEivDlLwe0b1R0+evJ13IXQuLNB5w1fhC5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -913,14 +913,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
-      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz",
+      "integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -930,13 +930,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
-      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
+      "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -946,14 +946,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
-      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz",
+      "integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -963,13 +963,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
-      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
+      "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -979,13 +979,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.26.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
-      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
+      "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -995,13 +995,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
-      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
+      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1011,14 +1011,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz",
-      "integrity": "sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
+      "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1028,15 +1028,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
-      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
+      "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1046,13 +1046,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
-      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz",
+      "integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1062,13 +1062,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
-      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
+      "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1078,13 +1078,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
-      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
+      "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1094,13 +1094,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
-      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
+      "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1110,14 +1110,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
-      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
+      "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1127,14 +1127,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.26.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
-      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
+      "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.26.0",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1144,16 +1144,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
-      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
+      "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1163,14 +1163,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
-      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
+      "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1180,14 +1180,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
-      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz",
+      "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1197,13 +1197,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
-      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
+      "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1213,13 +1213,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.26.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
-      "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz",
+      "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1229,13 +1229,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
-      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
+      "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1245,15 +1245,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
-      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.27.1.tgz",
+      "integrity": "sha512-/sSliVc9gHE20/7D5qsdGlq7RG5NCDTWsAhyqzGuq174EtWJoGzIu1BQ7G56eDsTcy1jseBZwv50olSdXOlGuA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/plugin-transform-parameters": "^7.25.9"
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-transform-parameters": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1263,14 +1263,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
-      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
+      "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-replace-supers": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1280,13 +1280,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
-      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz",
+      "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1296,14 +1296,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
-      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1313,13 +1313,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
-      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.1.tgz",
+      "integrity": "sha512-018KRk76HWKeZ5l4oTj2zPpSh+NbGdt0st5S6x0pga6HgrjBOJb24mMDHorFopOOd6YHkLgOZ+zaCjZGPO4aKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1329,14 +1329,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
-      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
+      "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1346,15 +1346,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
-      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
+      "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1364,13 +1364,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
-      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
+      "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1380,14 +1380,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.0.tgz",
-      "integrity": "sha512-LX/vCajUJQDqE7Aum/ELUMZAY19+cDpghxrnyt5I1tV6X5PyC86AOoWXWFYFeIvauyeSA6/ktn4tQVn/3ZifsA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.1.tgz",
+      "integrity": "sha512-B19lbbL7PMrKr52BNPjCqg1IyNUIjTcxKj8uX9zHO+PmWN93s19NDr/f69mIkEp2x9nmDJ08a7lgHaTTzvW7mw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "regenerator-transform": "^0.15.2"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1397,14 +1396,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-regexp-modifiers": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
-      "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz",
+      "integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1414,13 +1413,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
-      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
+      "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1430,13 +1429,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
-      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
+      "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1446,14 +1445,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
-      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz",
+      "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1463,13 +1462,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
-      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
+      "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1479,13 +1478,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
-      "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
+      "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1495,13 +1494,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.0.tgz",
-      "integrity": "sha512-+LLkxA9rKJpNoGsbLnAgOCdESl73vwYn+V6b+5wHbrE7OGKVDPHIQvbFSzqE6rwqaCw2RE+zdJrlLkcf8YOA0w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
+      "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1511,17 +1510,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.27.0.tgz",
-      "integrity": "sha512-fRGGjO2UEGPjvEcyAZXRXAS8AfdaQoq7HnxAbJoAoW10B9xOKesmmndJv+Sym2a+9FHWZ9KbyyLCe9s0Sn5jtg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.27.1.tgz",
+      "integrity": "sha512-Q5sT5+O4QUebHdbwKedFBEwRLb02zJ7r4A5Gg2hUoLuU3FjdMcyqcywqUrLCaDsFCxzokf7u9kuy7qz51YUuAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-create-class-features-plugin": "^7.27.0",
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
-        "@babel/plugin-syntax-typescript": "^7.25.9"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1531,13 +1530,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
-      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
+      "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1547,14 +1546,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
-      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz",
+      "integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1564,14 +1563,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
-      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
+      "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1581,14 +1580,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
-      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz",
+      "integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1598,75 +1597,75 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.9.tgz",
-      "integrity": "sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.27.1.tgz",
+      "integrity": "sha512-TZ5USxFpLgKDpdEt8YWBR7p6g+bZo6sHaXLqP2BY/U0acaoI8FTVflcYCr/v94twM1C5IWFdZ/hscq9WjUeLXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.26.8",
-        "@babel/helper-compilation-targets": "^7.26.5",
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "@babel/helper-validator-option": "^7.25.9",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
-        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
+        "@babel/compat-data": "^7.27.1",
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.27.1",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.27.1",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-import-assertions": "^7.26.0",
-        "@babel/plugin-syntax-import-attributes": "^7.26.0",
+        "@babel/plugin-syntax-import-assertions": "^7.27.1",
+        "@babel/plugin-syntax-import-attributes": "^7.27.1",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.25.9",
-        "@babel/plugin-transform-async-generator-functions": "^7.26.8",
-        "@babel/plugin-transform-async-to-generator": "^7.25.9",
-        "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
-        "@babel/plugin-transform-block-scoping": "^7.25.9",
-        "@babel/plugin-transform-class-properties": "^7.25.9",
-        "@babel/plugin-transform-class-static-block": "^7.26.0",
-        "@babel/plugin-transform-classes": "^7.25.9",
-        "@babel/plugin-transform-computed-properties": "^7.25.9",
-        "@babel/plugin-transform-destructuring": "^7.25.9",
-        "@babel/plugin-transform-dotall-regex": "^7.25.9",
-        "@babel/plugin-transform-duplicate-keys": "^7.25.9",
-        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
-        "@babel/plugin-transform-dynamic-import": "^7.25.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.26.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.25.9",
-        "@babel/plugin-transform-for-of": "^7.26.9",
-        "@babel/plugin-transform-function-name": "^7.25.9",
-        "@babel/plugin-transform-json-strings": "^7.25.9",
-        "@babel/plugin-transform-literals": "^7.25.9",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.25.9",
-        "@babel/plugin-transform-modules-amd": "^7.25.9",
-        "@babel/plugin-transform-modules-commonjs": "^7.26.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.25.9",
-        "@babel/plugin-transform-modules-umd": "^7.25.9",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
-        "@babel/plugin-transform-new-target": "^7.25.9",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6",
-        "@babel/plugin-transform-numeric-separator": "^7.25.9",
-        "@babel/plugin-transform-object-rest-spread": "^7.25.9",
-        "@babel/plugin-transform-object-super": "^7.25.9",
-        "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
-        "@babel/plugin-transform-optional-chaining": "^7.25.9",
-        "@babel/plugin-transform-parameters": "^7.25.9",
-        "@babel/plugin-transform-private-methods": "^7.25.9",
-        "@babel/plugin-transform-private-property-in-object": "^7.25.9",
-        "@babel/plugin-transform-property-literals": "^7.25.9",
-        "@babel/plugin-transform-regenerator": "^7.25.9",
-        "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
-        "@babel/plugin-transform-reserved-words": "^7.25.9",
-        "@babel/plugin-transform-shorthand-properties": "^7.25.9",
-        "@babel/plugin-transform-spread": "^7.25.9",
-        "@babel/plugin-transform-sticky-regex": "^7.25.9",
-        "@babel/plugin-transform-template-literals": "^7.26.8",
-        "@babel/plugin-transform-typeof-symbol": "^7.26.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.25.9",
-        "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
-        "@babel/plugin-transform-unicode-regex": "^7.25.9",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
+        "@babel/plugin-transform-arrow-functions": "^7.27.1",
+        "@babel/plugin-transform-async-generator-functions": "^7.27.1",
+        "@babel/plugin-transform-async-to-generator": "^7.27.1",
+        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
+        "@babel/plugin-transform-block-scoping": "^7.27.1",
+        "@babel/plugin-transform-class-properties": "^7.27.1",
+        "@babel/plugin-transform-class-static-block": "^7.27.1",
+        "@babel/plugin-transform-classes": "^7.27.1",
+        "@babel/plugin-transform-computed-properties": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.27.1",
+        "@babel/plugin-transform-dotall-regex": "^7.27.1",
+        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.27.1",
+        "@babel/plugin-transform-dynamic-import": "^7.27.1",
+        "@babel/plugin-transform-exponentiation-operator": "^7.27.1",
+        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+        "@babel/plugin-transform-for-of": "^7.27.1",
+        "@babel/plugin-transform-function-name": "^7.27.1",
+        "@babel/plugin-transform-json-strings": "^7.27.1",
+        "@babel/plugin-transform-literals": "^7.27.1",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.27.1",
+        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
+        "@babel/plugin-transform-modules-amd": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-modules-systemjs": "^7.27.1",
+        "@babel/plugin-transform-modules-umd": "^7.27.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1",
+        "@babel/plugin-transform-new-target": "^7.27.1",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
+        "@babel/plugin-transform-numeric-separator": "^7.27.1",
+        "@babel/plugin-transform-object-rest-spread": "^7.27.1",
+        "@babel/plugin-transform-object-super": "^7.27.1",
+        "@babel/plugin-transform-optional-catch-binding": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1",
+        "@babel/plugin-transform-parameters": "^7.27.1",
+        "@babel/plugin-transform-private-methods": "^7.27.1",
+        "@babel/plugin-transform-private-property-in-object": "^7.27.1",
+        "@babel/plugin-transform-property-literals": "^7.27.1",
+        "@babel/plugin-transform-regenerator": "^7.27.1",
+        "@babel/plugin-transform-regexp-modifiers": "^7.27.1",
+        "@babel/plugin-transform-reserved-words": "^7.27.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
+        "@babel/plugin-transform-spread": "^7.27.1",
+        "@babel/plugin-transform-sticky-regex": "^7.27.1",
+        "@babel/plugin-transform-template-literals": "^7.27.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
+        "@babel/plugin-transform-unicode-property-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.27.1",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
         "babel-plugin-polyfill-corejs2": "^0.4.10",
         "babel-plugin-polyfill-corejs3": "^0.11.0",
@@ -1707,45 +1706,42 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
-      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
+      "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
-      "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.1.tgz",
+      "integrity": "sha512-Fyo3ghWMqkHHpHQCoBs2VnYjR4iWFFjguTDEqA5WgZDOrFesVjMhMM2FSqTKSoUSDO1VQtavj8NFpdRBEvJTtg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/parser": "^7.27.0",
-        "@babel/types": "^7.27.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
-      "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.1.tgz",
+      "integrity": "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.27.0",
-        "@babel/parser": "^7.27.0",
-        "@babel/template": "^7.27.0",
-        "@babel/types": "^7.27.0",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.27.1",
+        "@babel/parser": "^7.27.1",
+        "@babel/template": "^7.27.1",
+        "@babel/types": "^7.27.1",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1764,13 +1760,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
-      "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
+      "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1784,22 +1780,23 @@
       "license": "MIT"
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.1.tgz",
-      "integrity": "sha512-LMshMVP0ZhACNjQNYXiU1iZJ6QCcv0lUdPDPugqGvCGXt5xtRVBPdtA0qU12pEXZzpWAhWlZYptfdAFq10DOVQ==",
-      "dev": true,
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
+      "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "tslib": "^2.4.0"
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
-      "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
+      "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
       "cpu": [
         "ppc64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "aix"
@@ -1809,12 +1806,13 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz",
-      "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
+      "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
       "cpu": [
         "arm"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -1824,12 +1822,13 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz",
-      "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
+      "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -1839,12 +1838,13 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz",
-      "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
+      "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -1854,12 +1854,13 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz",
-      "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
+      "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1869,12 +1870,13 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz",
-      "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
+      "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1884,12 +1886,13 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz",
-      "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -1899,12 +1902,13 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz",
-      "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
+      "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -1914,12 +1918,13 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz",
-      "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
+      "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
       "cpu": [
         "arm"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1929,12 +1934,13 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
-      "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
+      "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1944,12 +1950,13 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz",
-      "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
+      "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
       "cpu": [
         "ia32"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1959,12 +1966,13 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz",
-      "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
+      "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
       "cpu": [
         "loong64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1974,12 +1982,13 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz",
-      "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
+      "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
       "cpu": [
         "mips64el"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1989,12 +1998,13 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz",
-      "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
+      "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
       "cpu": [
         "ppc64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2004,12 +2014,13 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz",
-      "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
+      "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
       "cpu": [
         "riscv64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2019,12 +2030,13 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz",
-      "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
+      "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
       "cpu": [
         "s390x"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2034,12 +2046,13 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz",
-      "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
+      "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2049,12 +2062,13 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz",
-      "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -2064,12 +2078,13 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz",
-      "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
+      "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -2079,12 +2094,13 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz",
-      "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -2094,12 +2110,13 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz",
-      "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
+      "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -2109,12 +2126,13 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz",
-      "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
+      "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -2124,12 +2142,13 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz",
-      "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
+      "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -2139,12 +2158,13 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz",
-      "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
+      "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
       "cpu": [
         "ia32"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -2154,12 +2174,13 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz",
-      "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
+      "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -2169,9 +2190,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
-      "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2237,9 +2258,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
-      "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
+      "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -2247,9 +2268,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
-      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
+      "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2308,9 +2329,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.24.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.24.0.tgz",
-      "integrity": "sha512-uIY/y3z0uvOGX8cp1C2fiC4+ZmBhp6yZWkojtHL1YEMnRt1Y63HB9TM17proGEmeG7HeUY+UP36F0aknKYTpYA==",
+      "version": "9.26.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz",
+      "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2341,19 +2362,6 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
-      "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@types/json-schema": "^7.0.15"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
     "node_modules/@fullcalendar/core": {
       "version": "6.1.17",
       "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.17.tgz",
@@ -2510,6 +2518,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "darwin"
@@ -2532,6 +2541,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "darwin"
@@ -2554,6 +2564,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "darwin"
@@ -2570,6 +2581,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "darwin"
@@ -2586,6 +2598,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
@@ -2602,6 +2615,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
@@ -2618,6 +2632,7 @@
         "s390x"
       ],
       "dev": true,
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
@@ -2634,6 +2649,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
@@ -2650,6 +2666,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
@@ -2666,6 +2683,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
@@ -2682,6 +2700,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -2704,6 +2723,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -2726,6 +2746,7 @@
         "s390x"
       ],
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -2748,6 +2769,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -2770,6 +2792,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -2792,6 +2815,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -2814,6 +2838,7 @@
         "wasm32"
       ],
       "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
       "optional": true,
       "dependencies": {
         "@emnapi/runtime": "^1.2.0"
@@ -2833,6 +2858,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "win32"
@@ -2852,6 +2878,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "win32"
@@ -2954,6 +2981,28 @@
       "integrity": "sha512-QiGNZslz+zXUs2X8D11UQhB4KAMZ0DZghvYxa7+1B+VMLcDtz//XHpWbcuexjzE3kBXSxIUTPH3eSQCa0puZHA==",
       "license": "MIT"
     },
+    "node_modules/@modelcontextprotocol/sdk": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.0.tgz",
+      "integrity": "sha512-k/1pb70eD638anoi0e8wUGAlbMJXyvdV4p62Ko+EZ7eBe1xMx8Uhak1R5DgfoofsK5IBBnRwsYGTaLZl+6/+RQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "content-type": "^1.0.5",
+        "cors": "^2.8.5",
+        "cross-spawn": "^7.0.3",
+        "eventsource": "^3.0.2",
+        "express": "^5.0.1",
+        "express-rate-limit": "^7.5.0",
+        "pkce-challenge": "^5.0.0",
+        "raw-body": "^3.0.0",
+        "zod": "^3.23.8",
+        "zod-to-json-schema": "^3.24.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2993,16 +3042,16 @@
       }
     },
     "node_modules/@pkgr/core": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.2.tgz",
-      "integrity": "sha512-25L86MyPvnlQoX2MTIV2OiUcb6vJ6aRbFa9pbwByn95INKD5mFH2smgjDhq+fwJoqAgvgbdJLj6Tz7V9X5CFAQ==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.4.tgz",
+      "integrity": "sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/unts"
+        "url": "https://opencollective.com/pkgr"
       }
     },
     "node_modules/@polka/url": {
@@ -3017,6 +3066,7 @@
       "resolved": "https://registry.npmjs.org/@quansync/fs/-/fs-0.1.2.tgz",
       "integrity": "sha512-ezIadUb1aFhwJLd++WVqVpi9rnlX8vnd4ju7saPhwLHJN1mJgOv0puePTGV+FbtSnWtwoHDT8lAm4kagDZmpCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "quansync": "^0.2.10"
       },
@@ -3112,9 +3162,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz",
-      "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.1.tgz",
+      "integrity": "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==",
       "cpu": [
         "arm"
       ],
@@ -3125,9 +3175,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz",
-      "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.1.tgz",
+      "integrity": "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==",
       "cpu": [
         "arm64"
       ],
@@ -3138,9 +3188,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz",
-      "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.1.tgz",
+      "integrity": "sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==",
       "cpu": [
         "arm64"
       ],
@@ -3151,9 +3201,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz",
-      "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.1.tgz",
+      "integrity": "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==",
       "cpu": [
         "x64"
       ],
@@ -3164,9 +3214,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz",
-      "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.1.tgz",
+      "integrity": "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==",
       "cpu": [
         "arm64"
       ],
@@ -3177,9 +3227,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz",
-      "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.1.tgz",
+      "integrity": "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==",
       "cpu": [
         "x64"
       ],
@@ -3190,9 +3240,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz",
-      "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.1.tgz",
+      "integrity": "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==",
       "cpu": [
         "arm"
       ],
@@ -3203,9 +3253,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz",
-      "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.1.tgz",
+      "integrity": "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==",
       "cpu": [
         "arm"
       ],
@@ -3216,9 +3266,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz",
-      "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.1.tgz",
+      "integrity": "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==",
       "cpu": [
         "arm64"
       ],
@@ -3229,9 +3279,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz",
-      "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.1.tgz",
+      "integrity": "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==",
       "cpu": [
         "arm64"
       ],
@@ -3242,9 +3292,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz",
-      "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.1.tgz",
+      "integrity": "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==",
       "cpu": [
         "loong64"
       ],
@@ -3255,9 +3305,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz",
-      "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.1.tgz",
+      "integrity": "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==",
       "cpu": [
         "ppc64"
       ],
@@ -3268,9 +3318,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz",
-      "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.1.tgz",
+      "integrity": "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==",
       "cpu": [
         "riscv64"
       ],
@@ -3281,9 +3331,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz",
-      "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.1.tgz",
+      "integrity": "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==",
       "cpu": [
         "riscv64"
       ],
@@ -3294,9 +3344,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz",
-      "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.1.tgz",
+      "integrity": "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==",
       "cpu": [
         "s390x"
       ],
@@ -3307,9 +3357,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz",
-      "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.1.tgz",
+      "integrity": "sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==",
       "cpu": [
         "x64"
       ],
@@ -3320,9 +3370,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz",
-      "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.1.tgz",
+      "integrity": "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==",
       "cpu": [
         "x64"
       ],
@@ -3333,9 +3383,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz",
-      "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.1.tgz",
+      "integrity": "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==",
       "cpu": [
         "arm64"
       ],
@@ -3346,9 +3396,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz",
-      "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.1.tgz",
+      "integrity": "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==",
       "cpu": [
         "ia32"
       ],
@@ -3359,9 +3409,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz",
-      "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.1.tgz",
+      "integrity": "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==",
       "cpu": [
         "x64"
       ],
@@ -3428,52 +3478,48 @@
       }
     },
     "node_modules/@tailwindcss/node": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.3.tgz",
-      "integrity": "sha512-H/6r6IPFJkCfBJZ2dKZiPJ7Ueb2wbL592+9bQEl2r73qbX6yGnmQVIfiUvDRB2YI0a3PWDrzUwkvQx1XW1bNkA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.5.tgz",
+      "integrity": "sha512-CBhSWo0vLnWhXIvpD0qsPephiaUYfHUX3U9anwDaHZAeuGpTiB3XmsxPAN6qX7bFhipyGBqOa1QYQVVhkOUGxg==",
+      "license": "MIT",
       "dependencies": {
         "enhanced-resolve": "^5.18.1",
         "jiti": "^2.4.2",
         "lightningcss": "1.29.2",
-        "tailwindcss": "4.1.3"
-      }
-    },
-    "node_modules/@tailwindcss/node/node_modules/jiti": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
-      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
-      "bin": {
-        "jiti": "lib/jiti-cli.mjs"
+        "tailwindcss": "4.1.5"
       }
     },
     "node_modules/@tailwindcss/oxide": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.3.tgz",
-      "integrity": "sha512-t16lpHCU7LBxDe/8dCj9ntyNpXaSTAgxWm1u2XQP5NiIu4KGSyrDJJRlK9hJ4U9yJxx0UKCVI67MJWFNll5mOQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.5.tgz",
+      "integrity": "sha512-1n4br1znquEvyW/QuqMKQZlBen+jxAbvyduU87RS8R3tUSvByAkcaMTkJepNIrTlYhD+U25K4iiCIxE6BGdRYA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       },
       "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.1.3",
-        "@tailwindcss/oxide-darwin-arm64": "4.1.3",
-        "@tailwindcss/oxide-darwin-x64": "4.1.3",
-        "@tailwindcss/oxide-freebsd-x64": "4.1.3",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.3",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.3",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.1.3",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.1.3",
-        "@tailwindcss/oxide-linux-x64-musl": "4.1.3",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.3",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.1.3"
+        "@tailwindcss/oxide-android-arm64": "4.1.5",
+        "@tailwindcss/oxide-darwin-arm64": "4.1.5",
+        "@tailwindcss/oxide-darwin-x64": "4.1.5",
+        "@tailwindcss/oxide-freebsd-x64": "4.1.5",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.5",
+        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.5",
+        "@tailwindcss/oxide-linux-arm64-musl": "4.1.5",
+        "@tailwindcss/oxide-linux-x64-gnu": "4.1.5",
+        "@tailwindcss/oxide-linux-x64-musl": "4.1.5",
+        "@tailwindcss/oxide-wasm32-wasi": "4.1.5",
+        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.5",
+        "@tailwindcss/oxide-win32-x64-msvc": "4.1.5"
       }
     },
     "node_modules/@tailwindcss/oxide-android-arm64": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.3.tgz",
-      "integrity": "sha512-cxklKjtNLwFl3mDYw4XpEfBY+G8ssSg9ADL4Wm6//5woi3XGqlxFsnV5Zb6v07dxw1NvEX2uoqsxO/zWQsgR+g==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.5.tgz",
+      "integrity": "sha512-LVvM0GirXHED02j7hSECm8l9GGJ1RfgpWCW+DRn5TvSaxVsv28gRtoL4aWKGnXqwvI3zu1GABeDNDVZeDPOQrw==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -3483,12 +3529,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-arm64": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.3.tgz",
-      "integrity": "sha512-mqkf2tLR5VCrjBvuRDwzKNShRu99gCAVMkVsaEOFvv6cCjlEKXRecPu9DEnxp6STk5z+Vlbh1M5zY3nQCXMXhw==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.5.tgz",
+      "integrity": "sha512-//TfCA3pNrgnw4rRJOqavW7XUk8gsg9ddi8cwcsWXp99tzdBAZW0WXrD8wDyNbqjW316Pk2hiN/NJx/KWHl8oA==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3498,12 +3545,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-x64": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.3.tgz",
-      "integrity": "sha512-7sGraGaWzXvCLyxrc7d+CCpUN3fYnkkcso3rCzwUmo/LteAl2ZGCDlGvDD8Y/1D3ngxT8KgDj1DSwOnNewKhmg==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.5.tgz",
+      "integrity": "sha512-XQorp3Q6/WzRd9OalgHgaqgEbjP3qjHrlSUb5k1EuS1Z9NE9+BbzSORraO+ecW432cbCN7RVGGL/lSnHxcd+7Q==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3513,12 +3561,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-freebsd-x64": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.3.tgz",
-      "integrity": "sha512-E2+PbcbzIReaAYZe997wb9rId246yDkCwAakllAWSGqe6VTg9hHle67hfH6ExjpV2LSK/siRzBUs5wVff3RW9w==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.5.tgz",
+      "integrity": "sha512-bPrLWbxo8gAo97ZmrCbOdtlz/Dkuy8NK97aFbVpkJ2nJ2Jo/rsCbu0TlGx8joCuA3q6vMWTSn01JY46iwG+clg==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -3528,12 +3577,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.3.tgz",
-      "integrity": "sha512-GvfbJ8wjSSjbLFFE3UYz4Eh8i4L6GiEYqCtA8j2Zd2oXriPuom/Ah/64pg/szWycQpzRnbDiJozoxFU2oJZyfg==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.5.tgz",
+      "integrity": "sha512-1gtQJY9JzMAhgAfvd/ZaVOjh/Ju/nCoAsvOVJenWZfs05wb8zq+GOTnZALWGqKIYEtyNpCzvMk+ocGpxwdvaVg==",
       "cpu": [
         "arm"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3543,12 +3593,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.3.tgz",
-      "integrity": "sha512-35UkuCWQTeG9BHcBQXndDOrpsnt3Pj9NVIB4CgNiKmpG8GnCNXeMczkUpOoqcOhO6Cc/mM2W7kaQ/MTEENDDXg==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.5.tgz",
+      "integrity": "sha512-dtlaHU2v7MtdxBXoqhxwsWjav7oim7Whc6S9wq/i/uUMTWAzq/gijq1InSgn2yTnh43kR+SFvcSyEF0GCNu1PQ==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3558,12 +3609,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.3.tgz",
-      "integrity": "sha512-dm18aQiML5QCj9DQo7wMbt1Z2tl3Giht54uVR87a84X8qRtuXxUqnKQkRDK5B4bCOmcZ580lF9YcoMkbDYTXHQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.5.tgz",
+      "integrity": "sha512-fg0F6nAeYcJ3CriqDT1iVrqALMwD37+sLzXs8Rjy8Z1ZHshJoYceodfyUwGJEsQoTyWbliFNRs2wMQNXtT7MVA==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3573,12 +3625,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.3.tgz",
-      "integrity": "sha512-LMdTmGe/NPtGOaOfV2HuO7w07jI3cflPrVq5CXl+2O93DCewADK0uW1ORNAcfu2YxDUS035eY2W38TxrsqngxA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.5.tgz",
+      "integrity": "sha512-SO+F2YEIAHa1AITwc8oPwMOWhgorPzzcbhWEb+4oLi953h45FklDmM8dPSZ7hNHpIk9p/SCZKUYn35t5fjGtHA==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3588,12 +3641,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-musl": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.3.tgz",
-      "integrity": "sha512-aalNWwIi54bbFEizwl1/XpmdDrOaCjRFQRgtbv9slWjmNPuJJTIKPHf5/XXDARc9CneW9FkSTqTbyvNecYAEGw==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.5.tgz",
+      "integrity": "sha512-6UbBBplywkk/R+PqqioskUeXfKcBht3KU7juTi1UszJLx0KPXUo10v2Ok04iBJIaDPkIFkUOVboXms5Yxvaz+g==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3602,13 +3656,43 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.5.tgz",
+      "integrity": "sha512-hwALf2K9FHuiXTPqmo1KeOb83fTRNbe9r/Ixv9ZNQ/R24yw8Ge1HOWDDgTdtzntIaIUJG5dfXCf4g9AD4RiyhQ==",
+      "bundleDependencies": [
+        "@napi-rs/wasm-runtime",
+        "@emnapi/core",
+        "@emnapi/runtime",
+        "@tybys/wasm-util",
+        "@emnapi/wasi-threads",
+        "tslib"
+      ],
+      "cpu": [
+        "wasm32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.4.3",
+        "@emnapi/runtime": "^1.4.3",
+        "@emnapi/wasi-threads": "^1.0.2",
+        "@napi-rs/wasm-runtime": "^0.2.9",
+        "@tybys/wasm-util": "^0.9.0",
+        "tslib": "^2.8.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.3.tgz",
-      "integrity": "sha512-PEj7XR4OGTGoboTIAdXicKuWl4EQIjKHKuR+bFy9oYN7CFZo0eu74+70O4XuERX4yjqVZGAkCdglBODlgqcCXg==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.5.tgz",
+      "integrity": "sha512-oDKncffWzaovJbkuR7/OTNFRJQVdiw/n8HnzaCItrNQUeQgjy7oUiYpsm9HUBgpmvmDpSSbGaCa2Evzvk3eFmA==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3618,12 +3702,13 @@
       }
     },
     "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.3.tgz",
-      "integrity": "sha512-T8gfxECWDBENotpw3HR9SmNiHC9AOJdxs+woasRZ8Q/J4VHN0OMs7F+4yVNZ9EVN26Wv6mZbK0jv7eHYuLJLwA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.5.tgz",
+      "integrity": "sha512-WiR4dtyrFdbb+ov0LK+7XsFOsG+0xs0PKZKkt41KDn9jYpO7baE3bXiudPVkTqUEwNfiglCygQHl2jklvSBi7Q==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3633,36 +3718,37 @@
       }
     },
     "node_modules/@tailwindcss/postcss": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.3.tgz",
-      "integrity": "sha512-6s5nJODm98F++QT49qn8xJKHQRamhYHfMi3X7/ltxiSQ9dyRsaFSfFkfaMsanWzf+TMYQtbk8mt5f6cCVXJwfg==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.5.tgz",
+      "integrity": "sha512-5lAC2/pzuyfhsFgk6I58HcNy6vPK3dV/PoPxSDuOTVbDvCddYHzHiJZZInGIY0venvzzfrTEUAXJFULAfFmObg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
-        "@tailwindcss/node": "4.1.3",
-        "@tailwindcss/oxide": "4.1.3",
+        "@tailwindcss/node": "4.1.5",
+        "@tailwindcss/oxide": "4.1.5",
         "postcss": "^8.4.41",
-        "tailwindcss": "4.1.3"
+        "tailwindcss": "4.1.5"
       }
     },
     "node_modules/@tailwindcss/vite": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.3.tgz",
-      "integrity": "sha512-lUI/QaDxLtlV52Lho6pu07CG9pSnRYLOPmKGIQjyHdTBagemc6HmgZxyjGAQ/5HMPrNeWBfTVIpQl0/jLXvWHQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.5.tgz",
+      "integrity": "sha512-FE1stRoqdHSb7RxesMfCXE8icwI1W6zGE/512ae3ZDrpkQYTTYeSyUJPRCjZd8CwVAhpDUbi1YR8pcZioFJQ/w==",
       "license": "MIT",
       "dependencies": {
-        "@tailwindcss/node": "4.1.3",
-        "@tailwindcss/oxide": "4.1.3",
-        "tailwindcss": "4.1.3"
+        "@tailwindcss/node": "4.1.5",
+        "@tailwindcss/oxide": "4.1.5",
+        "tailwindcss": "4.1.5"
       },
       "peerDependencies": {
         "vite": "^5.2.0 || ^6"
       }
     },
     "node_modules/@tanstack/virtual-core": {
-      "version": "3.13.6",
-      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.6.tgz",
-      "integrity": "sha512-cnQUeWnhNP8tJ4WsGcYiX24Gjkc9ALstLbHcBj1t3E7EimN6n6kHH+DPV4PpDnuw00NApQp+ViojMj1GRdwYQg==",
+      "version": "3.13.8",
+      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.8.tgz",
+      "integrity": "sha512-BT6w89Hqy7YKaWewYzmecXQzcJh6HTBbKYJIIkMaNU49DZ06LoTV3z32DWWEdUsgW6n1xTmwTLs4GtWrZC261w==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -3670,12 +3756,12 @@
       }
     },
     "node_modules/@tanstack/vue-virtual": {
-      "version": "3.13.6",
-      "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.6.tgz",
-      "integrity": "sha512-GYdZ3SJBQPzgxhuCE2fvpiH46qzHiVx5XzBSdtESgiqh4poj8UgckjGWYEhxaBbcVt1oLzh1m3Ql4TyH32TOzQ==",
+      "version": "3.13.8",
+      "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.8.tgz",
+      "integrity": "sha512-CqyjKVc88YlE8JPth8a5Gi4CUoYrwJ2PZxtFbhoekx8Z2qqymxX2jzkbUMKFsX4EVNET90D5bLsG3epyozbzcg==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/virtual-core": "3.13.6"
+        "@tanstack/virtual-core": "3.13.8"
       },
       "funding": {
         "type": "github",
@@ -3812,10 +3898,11 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.14.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
-      "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
+      "version": "22.15.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.12.tgz",
+      "integrity": "sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -3874,24 +3961,25 @@
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
       "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.1.tgz",
-      "integrity": "sha512-ba0rr4Wfvg23vERs3eB+P3lfj2E+2g3lhWcCVukUuhtcdUx5lSIFZlGFEBHKr+3zizDa/TvZTptdNHVZWAkSBg==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.0.tgz",
+      "integrity": "sha512-/jU9ettcntkBFmWUzzGgsClEi2ZFiikMX5eEQsmxIAWMOn4H3D4rvHssstmAHGVvrYnaMqdWWWg0b5M6IN/MTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.29.1",
-        "@typescript-eslint/type-utils": "8.29.1",
-        "@typescript-eslint/utils": "8.29.1",
-        "@typescript-eslint/visitor-keys": "8.29.1",
+        "@typescript-eslint/scope-manager": "8.32.0",
+        "@typescript-eslint/type-utils": "8.32.0",
+        "@typescript-eslint/utils": "8.32.0",
+        "@typescript-eslint/visitor-keys": "8.32.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3907,16 +3995,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.1.tgz",
-      "integrity": "sha512-zczrHVEqEaTwh12gWBIJWj8nx+ayDcCJs06yoNMY0kwjMWDM6+kppljY+BxWI06d2Ja+h4+WdufDcwMnnMEWmg==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.0.tgz",
+      "integrity": "sha512-B2MdzyWxCE2+SqiZHAjPphft+/2x2FlO9YBx7eKE1BCb+rqBlQdhtAEhzIEdozHd55DXPmxBdpMygFJjfjjA9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.29.1",
-        "@typescript-eslint/types": "8.29.1",
-        "@typescript-eslint/typescript-estree": "8.29.1",
-        "@typescript-eslint/visitor-keys": "8.29.1",
+        "@typescript-eslint/scope-manager": "8.32.0",
+        "@typescript-eslint/types": "8.32.0",
+        "@typescript-eslint/typescript-estree": "8.32.0",
+        "@typescript-eslint/visitor-keys": "8.32.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3932,14 +4020,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.1.tgz",
-      "integrity": "sha512-2nggXGX5F3YrsGN08pw4XpMLO1Rgtnn4AzTegC2MDesv6q3QaTU5yU7IbS1tf1IwCR0Hv/1EFygLn9ms6LIpDA==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.0.tgz",
+      "integrity": "sha512-jc/4IxGNedXkmG4mx4nJTILb6TMjL66D41vyeaPWvDUmeYQzF3lKtN15WsAeTr65ce4mPxwopPSo1yUUAWw0hQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.29.1",
-        "@typescript-eslint/visitor-keys": "8.29.1"
+        "@typescript-eslint/types": "8.32.0",
+        "@typescript-eslint/visitor-keys": "8.32.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3950,16 +4038,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.1.tgz",
-      "integrity": "sha512-DkDUSDwZVCYN71xA4wzySqqcZsHKic53A4BLqmrWFFpOpNSoxX233lwGu/2135ymTCR04PoKiEEEvN1gFYg4Tw==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.0.tgz",
+      "integrity": "sha512-t2vouuYQKEKSLtJaa5bB4jHeha2HJczQ6E5IXPDPgIty9EqcJxpr1QHQ86YyIPwDwxvUmLfP2YADQ5ZY4qddZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.29.1",
-        "@typescript-eslint/utils": "8.29.1",
+        "@typescript-eslint/typescript-estree": "8.32.0",
+        "@typescript-eslint/utils": "8.32.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3974,9 +4062,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.1.tgz",
-      "integrity": "sha512-VT7T1PuJF1hpYC3AGm2rCgJBjHL3nc+A/bhOp9sGMKfi5v0WufsX/sHCFBfNTx2F+zA6qBc/PD0/kLRLjdt8mQ==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.0.tgz",
+      "integrity": "sha512-O5Id6tGadAZEMThM6L9HmVf5hQUXNSxLVKeGJYWNhhVseps/0LddMkp7//VDkzwJ69lPL0UmZdcZwggj9akJaA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3988,20 +4076,20 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.1.tgz",
-      "integrity": "sha512-l1enRoSaUkQxOQnbi0KPUtqeZkSiFlqrx9/3ns2rEDhGKfTa+88RmXqedC1zmVTOWrLc2e6DEJrTA51C9iLH5g==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.0.tgz",
+      "integrity": "sha512-pU9VD7anSCOIoBFnhTGfOzlVFQIA1XXiQpH/CezqOBaDppRwTglJzCC6fUQGpfwey4T183NKhF1/mfatYmjRqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.29.1",
-        "@typescript-eslint/visitor-keys": "8.29.1",
+        "@typescript-eslint/types": "8.32.0",
+        "@typescript-eslint/visitor-keys": "8.32.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4015,16 +4103,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.1.tgz",
-      "integrity": "sha512-QAkFEbytSaB8wnmB+DflhUPz6CLbFWE2SnSCrRMEa+KnXIzDYbpsn++1HGvnfAsUY44doDXmvRkO5shlM/3UfA==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.0.tgz",
+      "integrity": "sha512-8S9hXau6nQ/sYVtC3D6ISIDoJzS1NsCK+gluVhLN2YkBPX+/1wkwyUiDKnxRh15579WoOIyVWnoyIf3yGI9REw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.29.1",
-        "@typescript-eslint/types": "8.29.1",
-        "@typescript-eslint/typescript-estree": "8.29.1"
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.32.0",
+        "@typescript-eslint/types": "8.32.0",
+        "@typescript-eslint/typescript-estree": "8.32.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4039,13 +4127,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.1.tgz",
-      "integrity": "sha512-RGLh5CRaUEf02viP5c1Vh1cMGffQscyHe7HPAzGpfmfflFg1wUz2rYxd+OZqwpeypYvZ8UxSxuIpF++fmOzEcg==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.0.tgz",
+      "integrity": "sha512-1rYQTCLFFzOI5Nl0c8LUpJT8HxpwVRn9E4CkMsYfuN6ctmQqExjSTzzSk0Tz2apmXy7WU6/6fyaZVVA/thPN+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.29.1",
+        "@typescript-eslint/types": "8.32.0",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -4074,6 +4162,7 @@
       "resolved": "https://registry.npmjs.org/@vite-pwa/assets-generator/-/assets-generator-1.0.0.tgz",
       "integrity": "sha512-tWRF/tsqGkND5+dDVnJz7DzQkIRjtTRRYvA3y6l4FwTwK47OK72p1X7ResSz6T7PimIZMuFd+arsB8NRIG+Sww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
         "colorette": "^2.0.20",
@@ -4107,30 +4196,30 @@
       }
     },
     "node_modules/@volar/language-core": {
-      "version": "2.4.12",
-      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.12.tgz",
-      "integrity": "sha512-RLrFdXEaQBWfSnYGVxvR2WrO6Bub0unkdHYIdC31HzIEqATIuuhRRzYu76iGPZ6OtA4Au1SnW0ZwIqPP217YhA==",
+      "version": "2.4.13",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.13.tgz",
+      "integrity": "sha512-MnQJ7eKchJx5Oz+YdbqyFUk8BN6jasdJv31n/7r6/WwlOOv7qzvot6B66887l2ST3bUW4Mewml54euzpJWA6bg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/source-map": "2.4.12"
+        "@volar/source-map": "2.4.13"
       }
     },
     "node_modules/@volar/source-map": {
-      "version": "2.4.12",
-      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.12.tgz",
-      "integrity": "sha512-bUFIKvn2U0AWojOaqf63ER0N/iHIBYZPpNGogfLPQ68F5Eet6FnLlyho7BS0y2HJ1jFhSif7AcuTx1TqsCzRzw==",
+      "version": "2.4.13",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.13.tgz",
+      "integrity": "sha512-l/EBcc2FkvHgz2ZxV+OZK3kMSroMr7nN3sZLF2/f6kWW66q8+tEL4giiYyFjt0BcubqJhBt6soYIrAPhg/Yr+Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@volar/typescript": {
-      "version": "2.4.12",
-      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.12.tgz",
-      "integrity": "sha512-HJB73OTJDgPc80K30wxi3if4fSsZZAOScbj2fcicMuOPoOkcf9NNAINb33o+DzhBdF9xTKC1gnPmIRDous5S0g==",
+      "version": "2.4.13",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.13.tgz",
+      "integrity": "sha512-Ukz4xv84swJPupZeoFsQoeJEOm7U9pqsEnaGGgt5ni3SCTa22m8oJP5Nng3Wed7Uw5RBELdLxxORX8YhJPyOgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.12",
+        "@volar/language-core": "2.4.13",
         "path-browserify": "^1.0.1",
         "vscode-uri": "^3.0.8"
       }
@@ -4250,24 +4339,27 @@
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "6.6.4",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
-      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
-      "license": "MIT"
+      "version": "7.7.6",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.6.tgz",
+      "integrity": "sha512-b2Xx0KvXZObePpXPYHvBRRJLDQn5nhKjXh7vUhMEtWxz1AYNFOVIsh5+HLP8xDGL7sy+Q7hXeUxPHB/KgbtsPw==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-kit": "^7.7.6"
+      }
     },
     "node_modules/@vue/devtools-core": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.7.2.tgz",
-      "integrity": "sha512-lexREWj1lKi91Tblr38ntSsy6CvI8ba7u+jmwh2yruib/ltLUcsIzEjCnrkh1yYGGIKXbAuYV2tOG10fGDB9OQ==",
+      "version": "7.7.6",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.7.6.tgz",
+      "integrity": "sha512-ghVX3zjKPtSHu94Xs03giRIeIWlb9M+gvDRVpIZ/cRIxKHdW6HE/sm1PT3rUYS3aV92CazirT93ne+7IOvGUWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-kit": "^7.7.2",
-        "@vue/devtools-shared": "^7.7.2",
+        "@vue/devtools-kit": "^7.7.6",
+        "@vue/devtools-shared": "^7.7.6",
         "mitt": "^3.0.1",
-        "nanoid": "^5.0.9",
-        "pathe": "^2.0.2",
-        "vite-hot-client": "^0.2.4"
+        "nanoid": "^5.1.0",
+        "pathe": "^2.0.3",
+        "vite-hot-client": "^2.0.4"
       },
       "peerDependencies": {
         "vue": "^3.0.0"
@@ -4293,24 +4385,24 @@
       }
     },
     "node_modules/@vue/devtools-kit": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.2.tgz",
-      "integrity": "sha512-CY0I1JH3Z8PECbn6k3TqM1Bk9ASWxeMtTCvZr7vb+CHi+X/QwQm5F1/fPagraamKMAHVfuuCbdcnNg1A4CYVWQ==",
+      "version": "7.7.6",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.6.tgz",
+      "integrity": "sha512-geu7ds7tem2Y7Wz+WgbnbZ6T5eadOvozHZ23Atk/8tksHMFOFylKi1xgGlQlVn0wlkEf4hu+vd5ctj1G4kFtwA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-shared": "^7.7.2",
-        "birpc": "^0.2.19",
+        "@vue/devtools-shared": "^7.7.6",
+        "birpc": "^2.3.0",
         "hookable": "^5.5.3",
         "mitt": "^3.0.1",
         "perfect-debounce": "^1.0.0",
         "speakingurl": "^14.0.1",
-        "superjson": "^2.2.1"
+        "superjson": "^2.2.2"
       }
     },
     "node_modules/@vue/devtools-shared": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.2.tgz",
-      "integrity": "sha512-uBFxnp8gwW2vD6FrJB8JZLUzVb6PNRG0B0jBnHsOH8uKyva2qINY8PTF5Te4QlTbMDqU5K6qtJDr6cNsKWhbOA==",
+      "version": "7.7.6",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.6.tgz",
+      "integrity": "sha512-yFEgJZ/WblEsojQQceuyK6FzpFDx4kqrz2ohInxNj5/DnhoX023upTv4OD6lNPLAA5LLkbwPVb10o/7b+Y4FVA==",
       "license": "MIT",
       "dependencies": {
         "rfdc": "^1.4.1"
@@ -4358,9 +4450,9 @@
       }
     },
     "node_modules/@vue/language-core": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.8.tgz",
-      "integrity": "sha512-rrzB0wPGBvcwaSNRriVWdNAbHQWSf0NlGqgKHK5mEkXpefjUlVRP62u03KvwZpvKVjRnBIQ/Lwre+Mx9N6juUQ==",
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.10.tgz",
+      "integrity": "sha512-+yNoYx6XIKuAO8Mqh1vGytu8jkFEOH5C8iOv3i8Z/65A7x9iAOXA97Q+PqZ3nlm2lxf5rOJuIGI/wDtx/riNYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4437,6 +4529,7 @@
       "resolved": "https://registry.npmjs.org/@vue/tsconfig/-/tsconfig-0.7.0.tgz",
       "integrity": "sha512-ku2uNz5MaZ9IerPPUyOHzyjhXoX2kVJaVf7hL315DC17vS6IiZRmmCPfggNbU16QTvM80+uYYy3eYJB59WCtvg==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "typescript": "5.x",
         "vue": "^3.4.0"
@@ -4463,6 +4556,20 @@
         "vue": "^3.2.41"
       }
     },
+    "node_modules/accepts": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
+      "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "^3.0.0",
+        "negotiator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.14.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
@@ -4628,9 +4735,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
-      "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
+      "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -4718,14 +4825,35 @@
       "license": "MIT"
     },
     "node_modules/birpc": {
-      "version": "0.2.19",
-      "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.19.tgz",
-      "integrity": "sha512-5WeXXAvTmitV1RqJFppT5QtUiz2p1mRSYU000Jkft5ZUCLJIk4uQriYNO50HknxKwM6jd8utNc66K1qGIwwWBQ==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.3.0.tgz",
+      "integrity": "sha512-ijbtkn/F3Pvzb6jHypHRyve2QApOCZDR25D/VnkY2G/lBNcXCTsnsCxgY4k4PkVB7zfwzYbY3O9Lcqe3xufS5g==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/body-parser": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
+      "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "^3.1.2",
+        "content-type": "^1.0.5",
+        "debug": "^4.4.0",
+        "http-errors": "^2.0.0",
+        "iconv-lite": "^0.6.3",
+        "on-finished": "^2.4.1",
+        "qs": "^6.14.0",
+        "raw-body": "^3.0.0",
+        "type-is": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@@ -4757,9 +4885,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.24.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
+      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
       "dev": true,
       "funding": [
         {
@@ -4777,10 +4905,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
+        "caniuse-lite": "^1.0.30001716",
+        "electron-to-chromium": "^1.5.149",
         "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4812,6 +4940,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/cac": {
       "version": "6.7.14",
       "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
@@ -4889,9 +5027,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001713",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
-      "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
+      "version": "1.0.30001717",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz",
+      "integrity": "sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==",
       "dev": true,
       "funding": [
         {
@@ -5020,6 +5158,13 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "devOptional": true,
+      "license": "MIT"
+    },
     "node_modules/common-tags": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
@@ -5047,6 +5192,29 @@
         "node": "^14.18.0 || >=16.10.0"
       }
     },
+    "node_modules/content-disposition": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
+      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -5054,6 +5222,26 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
+      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.6.0"
+      }
+    },
     "node_modules/copy-anything": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
@@ -5070,9 +5258,9 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.41.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
-      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
+      "version": "3.42.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.42.0.tgz",
+      "integrity": "sha512-bQasjMfyDGyaeWKBIu33lHh9qlSR0MFE/Nmc6nMjf/iU9b3rSMdAYz1Baxrv4lPdGUsTqZudHA4jIGSJy0SWZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5083,6 +5271,20 @@
         "url": "https://opencollective.com/core-js"
       }
     },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -5362,7 +5564,8 @@
       "version": "6.1.4",
       "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
       "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
@@ -5373,10 +5576,20 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
+      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=8"
@@ -5402,6 +5615,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/ejs": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
@@ -5419,9 +5639,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.136",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.136.tgz",
-      "integrity": "sha512-kL4+wUTD7RSA5FHx5YwWtjDnEEkIIikFgWHR4P6fqjw1PPLlqYkxeOb++wAauAssat0YClCy8Y3C5SxgSkjibQ==",
+      "version": "1.5.150",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.150.tgz",
+      "integrity": "sha512-rOOkP2ZUMx1yL4fCxXQKDHQ8ZXwisb2OycOQVKHgvB3ZI4CvehOd4y2tfnnLDieJ3Zs1RL1Dlp3cMkyIn7nnXA==",
       "dev": true,
       "license": "ISC"
     },
@@ -5431,6 +5651,16 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "license": "MIT"
     },
+    "node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/engine.io-client": {
       "version": "6.6.3",
       "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
@@ -5474,6 +5704,7 @@
       "version": "5.18.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
       "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -5634,10 +5865,11 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
-      "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
+      "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -5645,31 +5877,31 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.2",
-        "@esbuild/android-arm": "0.25.2",
-        "@esbuild/android-arm64": "0.25.2",
-        "@esbuild/android-x64": "0.25.2",
-        "@esbuild/darwin-arm64": "0.25.2",
-        "@esbuild/darwin-x64": "0.25.2",
-        "@esbuild/freebsd-arm64": "0.25.2",
-        "@esbuild/freebsd-x64": "0.25.2",
-        "@esbuild/linux-arm": "0.25.2",
-        "@esbuild/linux-arm64": "0.25.2",
-        "@esbuild/linux-ia32": "0.25.2",
-        "@esbuild/linux-loong64": "0.25.2",
-        "@esbuild/linux-mips64el": "0.25.2",
-        "@esbuild/linux-ppc64": "0.25.2",
-        "@esbuild/linux-riscv64": "0.25.2",
-        "@esbuild/linux-s390x": "0.25.2",
-        "@esbuild/linux-x64": "0.25.2",
-        "@esbuild/netbsd-arm64": "0.25.2",
-        "@esbuild/netbsd-x64": "0.25.2",
-        "@esbuild/openbsd-arm64": "0.25.2",
-        "@esbuild/openbsd-x64": "0.25.2",
-        "@esbuild/sunos-x64": "0.25.2",
-        "@esbuild/win32-arm64": "0.25.2",
-        "@esbuild/win32-ia32": "0.25.2",
-        "@esbuild/win32-x64": "0.25.2"
+        "@esbuild/aix-ppc64": "0.25.4",
+        "@esbuild/android-arm": "0.25.4",
+        "@esbuild/android-arm64": "0.25.4",
+        "@esbuild/android-x64": "0.25.4",
+        "@esbuild/darwin-arm64": "0.25.4",
+        "@esbuild/darwin-x64": "0.25.4",
+        "@esbuild/freebsd-arm64": "0.25.4",
+        "@esbuild/freebsd-x64": "0.25.4",
+        "@esbuild/linux-arm": "0.25.4",
+        "@esbuild/linux-arm64": "0.25.4",
+        "@esbuild/linux-ia32": "0.25.4",
+        "@esbuild/linux-loong64": "0.25.4",
+        "@esbuild/linux-mips64el": "0.25.4",
+        "@esbuild/linux-ppc64": "0.25.4",
+        "@esbuild/linux-riscv64": "0.25.4",
+        "@esbuild/linux-s390x": "0.25.4",
+        "@esbuild/linux-x64": "0.25.4",
+        "@esbuild/netbsd-arm64": "0.25.4",
+        "@esbuild/netbsd-x64": "0.25.4",
+        "@esbuild/openbsd-arm64": "0.25.4",
+        "@esbuild/openbsd-x64": "0.25.4",
+        "@esbuild/sunos-x64": "0.25.4",
+        "@esbuild/win32-arm64": "0.25.4",
+        "@esbuild/win32-ia32": "0.25.4",
+        "@esbuild/win32-x64": "0.25.4"
       }
     },
     "node_modules/escalade": {
@@ -5682,6 +5914,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -5696,23 +5935,24 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.24.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.24.0.tgz",
-      "integrity": "sha512-eh/jxIEJyZrvbWRe4XuVclLPDYSYYYgLy5zXGGxD6j8zjSAxFEzI2fL/8xNq6O2yKqVt+eF2YhV+hxjV6UKXwQ==",
+      "version": "9.26.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.26.0.tgz",
+      "integrity": "sha512-Hx0MOjPh6uK9oq9nVsATZKE/Wlbai7KFjfCuw9UHaguDW3x+HF0O5nIi3ud39TWgrTjTO5nHxmL3R1eANinWHQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.20.0",
-        "@eslint/config-helpers": "^0.2.0",
-        "@eslint/core": "^0.12.0",
+        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/core": "^0.13.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.24.0",
-        "@eslint/plugin-kit": "^0.2.7",
+        "@eslint/js": "9.26.0",
+        "@eslint/plugin-kit": "^0.2.8",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
+        "@modelcontextprotocol/sdk": "^1.8.0",
         "@types/estree": "^1.0.6",
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
@@ -5736,7 +5976,8 @@
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3"
+        "optionator": "^0.9.3",
+        "zod": "^3.24.2"
       },
       "bin": {
         "eslint": "bin/eslint.js"
@@ -5770,9 +6011,9 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.2.6",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.6.tgz",
-      "integrity": "sha512-mUcf7QG2Tjk7H055Jk0lGBjbgDnfrvqjhXh9t2xLMSCjZVcw9Rb1V6sVNXO0th3jgeO7zllWPTNRil3JW94TnQ==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
+      "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5801,9 +6042,9 @@
       }
     },
     "node_modules/eslint-plugin-vue": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.0.0.tgz",
-      "integrity": "sha512-XKckedtajqwmaX6u1VnECmZ6xJt+YvlmMzBPZd+/sI3ub2lpYZyFnsyWo7c3nMOQKJQudeyk1lw/JxdgeKT64w==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.1.0.tgz",
+      "integrity": "sha512-/VTiJ1eSfNLw6lvG9ENySbGmcVvz6wZ9nA7ZqXlLBY2RkaF15iViYKxglWiIch12KiLAj0j1iXPYU6W4wTROFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5985,6 +6226,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/event-source-polyfill": {
       "version": "1.0.31",
       "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.31.tgz",
@@ -5997,6 +6248,29 @@
       "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==",
       "license": "MIT"
     },
+    "node_modules/eventsource": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.6.tgz",
+      "integrity": "sha512-l19WpE2m9hSuyP06+FbuUUf1G+R0SFLrtQfbRb9PRr+oimOfxQhgGCbVaXg5IvZyyTThJsxh6L/srkMiCeBPDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventsource-parser": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/eventsource-parser": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.1.tgz",
+      "integrity": "sha512-VARTJ9CYeuQYb0pZEPbzi740OWFgpHe7AYJ2WFZVnUDUQp5Dk2yJUgF36YsZ81cOyxT0QxmXD2EQpapAouzWVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/execa": {
       "version": "9.5.2",
       "resolved": "https://registry.npmjs.org/execa/-/execa-9.5.2.tgz",
@@ -6024,6 +6298,65 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
+    "node_modules/express": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
+      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "^2.0.0",
+        "body-parser": "^2.2.0",
+        "content-disposition": "^1.0.0",
+        "content-type": "^1.0.5",
+        "cookie": "^0.7.1",
+        "cookie-signature": "^1.2.1",
+        "debug": "^4.4.0",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "etag": "^1.8.1",
+        "finalhandler": "^2.1.0",
+        "fresh": "^2.0.0",
+        "http-errors": "^2.0.0",
+        "merge-descriptors": "^2.0.0",
+        "mime-types": "^3.0.0",
+        "on-finished": "^2.4.1",
+        "once": "^1.4.0",
+        "parseurl": "^1.3.3",
+        "proxy-addr": "^2.0.7",
+        "qs": "^6.14.0",
+        "range-parser": "^1.2.1",
+        "router": "^2.2.0",
+        "send": "^1.1.0",
+        "serve-static": "^2.2.0",
+        "statuses": "^2.0.1",
+        "type-is": "^2.0.1",
+        "vary": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/express-rate-limit": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz",
+      "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/express-rate-limit"
+      },
+      "peerDependencies": {
+        "express": "^4.11 || 5 || ^5.0.0-beta.1"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -6192,6 +6525,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/finalhandler": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
+      "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "on-finished": "^2.4.1",
+        "parseurl": "^1.3.3",
+        "statuses": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -6281,6 +6632,47 @@
         "node": ">= 6"
       }
     },
+    "node_modules/form-data/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/form-data/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
+      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/fs-extra": {
       "version": "11.3.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
@@ -6562,9 +6954,9 @@
       "license": "ISC"
     },
     "node_modules/grapesjs": {
-      "version": "0.22.6",
-      "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.22.6.tgz",
-      "integrity": "sha512-V4sD0jDhE95bz3bwC3gD+DmZzelwgozlarcFrEQFGv7HwYmKOIVXni7i8NVj/DLRGCD5jVHmr4k/sV5oSXPajw==",
+      "version": "0.22.7",
+      "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.22.7.tgz",
+      "integrity": "sha512-uKaLsT/wJmM9QnBK46efLlQ2K2rbzDyF1mEDMx4oaej1xwohM+C1/0fcUehdewwtzy6TRrCIXd5Q93aEmgYXTQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@types/backbone": "1.4.15",
@@ -6748,6 +7140,23 @@
       "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "license": "MIT"
     },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/human-signals": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.1.tgz",
@@ -6765,6 +7174,19 @@
       "dev": true,
       "license": "MPL-2.0"
     },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/idb": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
@@ -6843,6 +7265,16 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/is-arguments": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
@@ -7181,6 +7613,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-promise": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
+      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/is-regex": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
@@ -7447,14 +7886,12 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.7",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
+      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "bin": {
-        "jiti": "bin/jiti.js"
+        "jiti": "lib/jiti-cli.mjs"
       }
     },
     "node_modules/js-tokens": {
@@ -7502,6 +7939,7 @@
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
       "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.17.0 || >=20.5.0"
       }
@@ -7626,6 +8064,7 @@
       "version": "1.29.2",
       "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.2.tgz",
       "integrity": "sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==",
+      "license": "MPL-2.0",
       "dependencies": {
         "detect-libc": "^2.0.3"
       },
@@ -7656,6 +8095,7 @@
       "cpu": [
         "arm64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "darwin"
@@ -7675,6 +8115,7 @@
       "cpu": [
         "x64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "darwin"
@@ -7694,6 +8135,7 @@
       "cpu": [
         "x64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "freebsd"
@@ -7713,6 +8155,7 @@
       "cpu": [
         "arm"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -7732,6 +8175,7 @@
       "cpu": [
         "arm64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -7751,6 +8195,7 @@
       "cpu": [
         "arm64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -7770,6 +8215,7 @@
       "cpu": [
         "x64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -7789,6 +8235,7 @@
       "cpu": [
         "x64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
@@ -7808,6 +8255,7 @@
       "cpu": [
         "arm64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "win32"
@@ -7827,6 +8275,7 @@
       "cpu": [
         "x64"
       ],
+      "license": "MPL-2.0",
       "optional": true,
       "os": [
         "win32"
@@ -8003,6 +8452,16 @@
       "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
       "license": "MIT"
     },
+    "node_modules/media-typer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
+      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -8012,6 +8471,19 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/merge-descriptors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
+      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -8037,21 +8509,23 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mime-db": "1.52.0"
+        "mime-db": "^1.54.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -8127,6 +8601,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/node-releases": {
       "version": "2.0.19",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
@@ -8139,20 +8623,22 @@
       "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
       "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-run-all2": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-7.0.2.tgz",
-      "integrity": "sha512-7tXR+r9hzRNOPNTvXegM+QzCuMjzUIIq66VDunL6j60O4RrExx32XUhlrS7UK4VcdGw5/Wxzb3kfNcFix9JKDA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-8.0.1.tgz",
+      "integrity": "sha512-jkhE0AsELQeCtScrcJ/7mSIdk+ZsnWjvKk3KwE96HZ6+OFVB74XhxQtHT1W6kdUfn92fRnBb29Mz82j9bV2XEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.2.1",
         "cross-spawn": "^7.0.6",
         "memorystream": "^0.3.1",
-        "minimatch": "^9.0.0",
+        "minimatch": "^10.0.1",
         "pidtree": "^0.6.0",
         "read-package-json-fast": "^4.0.0",
         "shell-quote": "^1.7.3",
@@ -8165,8 +8651,8 @@
         "run-s": "bin/run-s/index.js"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0",
-        "npm": ">= 9"
+        "node": "^20.5.0 || >=22.0.0",
+        "npm": ">= 10"
       }
     },
     "node_modules/npm-run-all2/node_modules/ansi-styles": {
@@ -8187,15 +8673,33 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
       "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/npm-run-all2/node_modules/minimatch": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
+      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/npm-run-all2/node_modules/which": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
       "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^3.1.1"
       },
@@ -8255,6 +8759,16 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -8313,6 +8827,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -8324,9 +8851,9 @@
       }
     },
     "node_modules/open": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
-      "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
+      "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8451,6 +8978,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/path-browserify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
@@ -8494,6 +9031,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/path-to-regexp": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/pathe": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -8565,13 +9112,14 @@
         }
       }
     },
-    "node_modules/pinia/node_modules/@vue/devtools-api": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.2.tgz",
-      "integrity": "sha512-1syn558KhyN+chO5SjlZIwJ8bV/bQ1nOVTG66t2RbG66ZGekyiYNmRO7X9BJCXQqPsFHlnksqvPhce2qpzxFnA==",
+    "node_modules/pkce-challenge": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
+      "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@vue/devtools-kit": "^7.7.2"
+      "engines": {
+        "node": ">=16.20.0"
       }
     },
     "node_modules/pngjs": {
@@ -8728,6 +9276,20 @@
       "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==",
       "license": "MIT"
     },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -8805,7 +9367,8 @@
           "type": "individual",
           "url": "https://github.com/sponsors/sxzz"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
@@ -8889,11 +9452,38 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
+      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.6.3",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/read-package-json-fast": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz",
       "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "json-parse-even-better-errors": "^4.0.0",
         "npm-normalize-package-bin": "^4.0.0"
@@ -8945,23 +9535,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
@@ -9107,9 +9680,9 @@
       "license": "MIT"
     },
     "node_modules/rollup": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz",
-      "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz",
+      "integrity": "sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==",
       "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.7"
@@ -9122,29 +9695,46 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.40.0",
-        "@rollup/rollup-android-arm64": "4.40.0",
-        "@rollup/rollup-darwin-arm64": "4.40.0",
-        "@rollup/rollup-darwin-x64": "4.40.0",
-        "@rollup/rollup-freebsd-arm64": "4.40.0",
-        "@rollup/rollup-freebsd-x64": "4.40.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.40.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.40.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.40.0",
-        "@rollup/rollup-linux-arm64-musl": "4.40.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.40.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.40.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.40.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.40.0",
-        "@rollup/rollup-linux-x64-gnu": "4.40.0",
-        "@rollup/rollup-linux-x64-musl": "4.40.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.40.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.40.0",
-        "@rollup/rollup-win32-x64-msvc": "4.40.0",
+        "@rollup/rollup-android-arm-eabi": "4.40.1",
+        "@rollup/rollup-android-arm64": "4.40.1",
+        "@rollup/rollup-darwin-arm64": "4.40.1",
+        "@rollup/rollup-darwin-x64": "4.40.1",
+        "@rollup/rollup-freebsd-arm64": "4.40.1",
+        "@rollup/rollup-freebsd-x64": "4.40.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.40.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.40.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.40.1",
+        "@rollup/rollup-linux-arm64-musl": "4.40.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.40.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.40.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.40.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.40.1",
+        "@rollup/rollup-linux-x64-gnu": "4.40.1",
+        "@rollup/rollup-linux-x64-musl": "4.40.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.40.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.40.1",
+        "@rollup/rollup-win32-x64-msvc": "4.40.1",
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/router": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
+      "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "depd": "^2.0.0",
+        "is-promise": "^4.0.0",
+        "parseurl": "^1.3.3",
+        "path-to-regexp": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/run-applescript": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
@@ -9258,6 +9848,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/section-matter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
@@ -9284,6 +9881,29 @@
         "node": ">=10"
       }
     },
+    "node_modules/send": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
+      "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.5",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "etag": "^1.8.1",
+        "fresh": "^2.0.0",
+        "http-errors": "^2.0.0",
+        "mime-types": "^3.0.1",
+        "ms": "^2.1.3",
+        "on-finished": "^2.4.1",
+        "range-parser": "^1.2.1",
+        "statuses": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -9294,6 +9914,22 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/serve-static": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz",
+      "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "parseurl": "^1.3.3",
+        "send": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -9347,12 +9983,20 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/sharp": {
       "version": "0.33.5",
       "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz",
       "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "color": "^4.2.3",
         "detect-libc": "^2.0.3",
@@ -9679,6 +10323,16 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "license": "BSD-3-Clause"
     },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -9891,13 +10545,13 @@
       }
     },
     "node_modules/synckit": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.3.tgz",
-      "integrity": "sha512-szhWDqNNI9etJUvbZ1/cx1StnZx8yMmFxme48SwR4dty4ioSY50KEZlpv0qAfgc1fpRzuh9hBXEzoCpJ779dLg==",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.4.tgz",
+      "integrity": "sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@pkgr/core": "^0.2.1",
+        "@pkgr/core": "^0.2.3",
         "tslib": "^2.8.1"
       },
       "engines": {
@@ -9908,15 +10562,16 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.3.tgz",
-      "integrity": "sha512-2Q+rw9vy1WFXu5cIxlvsabCwhU2qUwodGq03ODhLJ0jW4ek5BUtoCsnLB0qG+m8AHgEsSJcJGDSDe06FXlP74g==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.5.tgz",
+      "integrity": "sha512-nYtSPfWGDiWgCkwQG/m+aX83XCwf62sBgg3bIlNiiOcggnS1x3uVRDAuyelBFL+vJdOPPCGElxv9DjHJjRHiVA==",
       "license": "MIT"
     },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -9963,19 +10618,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/tempy/node_modules/type-fest": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/terser": {
       "version": "5.39.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
@@ -9995,20 +10637,13 @@
         "node": ">=10"
       }
     },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "devOptional": true,
-      "license": "MIT"
-    },
     "node_modules/tinyglobby": {
-      "version": "0.2.12",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
-      "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
-      "dev": true,
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
+      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+      "license": "MIT",
       "dependencies": {
-        "fdir": "^6.4.3",
+        "fdir": "^6.4.4",
         "picomatch": "^4.0.2"
       },
       "engines": {
@@ -10019,10 +10654,10 @@
       }
     },
     "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.4.3",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
-      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
-      "dev": true,
+      "version": "6.4.4",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
+      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "license": "MIT",
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -10036,7 +10671,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -10064,6 +10699,16 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/totalist": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
@@ -10101,7 +10746,7 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
+      "devOptional": true,
       "license": "0BSD"
     },
     "node_modules/type-check": {
@@ -10117,6 +10762,34 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/type-fest": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
+      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
+      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "content-type": "^1.0.5",
+        "media-typer": "^1.1.0",
+        "mime-types": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/typed-array-buffer": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
@@ -10210,15 +10883,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.29.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.1.tgz",
-      "integrity": "sha512-f8cDkvndhbQMPcysk6CUSGBWV+g1utqdn71P5YKwMumVMOG/5k7cHq0KyG4O52nB0oKS4aN2Tp5+wB4APJGC+w==",
+      "version": "8.32.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.0.tgz",
+      "integrity": "sha512-UMq2kxdXCzinFFPsXc9o2ozIpYCCOiEC46MG3yEh5Vipq6BO27otTtEBZA1fQ66DulEUgE97ucQ/3YY66CPg0A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.29.1",
-        "@typescript-eslint/parser": "8.29.1",
-        "@typescript-eslint/utils": "8.29.1"
+        "@typescript-eslint/eslint-plugin": "8.32.0",
+        "@typescript-eslint/parser": "8.32.0",
+        "@typescript-eslint/utils": "8.32.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -10258,10 +10931,11 @@
       }
     },
     "node_modules/unconfig": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/unconfig/-/unconfig-7.3.1.tgz",
-      "integrity": "sha512-LH5WL+un92tGAzWS87k7LkAfwpMdm7V0IXG2FxEjZz/QxiIW5J5LkcrKQThj0aRz6+h/lFmKI9EUXmK/T0bcrw==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/unconfig/-/unconfig-7.3.2.tgz",
+      "integrity": "sha512-nqG5NNL2wFVGZ0NA/aCFw0oJ2pxSf1lwg4Z5ill8wd7K4KX/rQbHlwbh+bjctXL5Ly1xtzHenHGOK0b+lG6JVg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@quansync/fs": "^0.1.1",
         "defu": "^6.1.4",
@@ -10272,15 +10946,6 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/unconfig/node_modules/jiti": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
-      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
-      "dev": true,
-      "bin": {
-        "jiti": "lib/jiti-cli.mjs"
-      }
-    },
     "node_modules/underscore": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
@@ -10291,7 +10956,8 @@
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",
@@ -10373,6 +11039,16 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/unplugin": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.2.tgz",
@@ -10521,14 +11197,28 @@
         "uuid": "dist/esm/bin/uuid"
       }
     },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/vite": {
-      "version": "6.2.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz",
-      "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==",
+      "version": "6.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
         "postcss": "^8.5.3",
-        "rollup": "^4.30.1"
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -10592,9 +11282,9 @@
       }
     },
     "node_modules/vite-hot-client": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/vite-hot-client/-/vite-hot-client-0.2.4.tgz",
-      "integrity": "sha512-a1nzURqO7DDmnXqabFOliz908FRmIppkBKsJthS8rbe8hBEXwEwe4C3Pp33Z1JoFCYfVL4kTOMLKk0ZZxREIeA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vite-hot-client/-/vite-hot-client-2.0.4.tgz",
+      "integrity": "sha512-W9LOGAyGMrbGArYJN4LBCdOC5+Zwh7dHvOHC0KmGKkJhsOzaKbpo/jEjpPKVHIW0/jBWj8RZG0NUxfgA8BxgAg==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -10641,6 +11331,7 @@
       "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-1.0.0.tgz",
       "integrity": "sha512-X77jo0AOd5OcxmWj3WnVti8n7Kw2tBgV1c8MCXFclrSlDV23ePzv2eTDIALXI2Qo6nJ5pZJeZAuX0AawvRfoeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.3.6",
         "pretty-bytes": "^6.1.1",
@@ -10667,17 +11358,17 @@
       }
     },
     "node_modules/vite-plugin-vue-devtools": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.7.2.tgz",
-      "integrity": "sha512-5V0UijQWiSBj32blkyPEqIbzc6HO9c1bwnBhx+ay2dzU0FakH+qMdNUT8nF9BvDE+i6I1U8CqCuJiO20vKEdQw==",
+      "version": "7.7.6",
+      "resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.7.6.tgz",
+      "integrity": "sha512-L7nPVM5a7lgit/Z+36iwoqHOaP3wxqVi1UvaDJwGCfblS9Y6vNqf32ILlzJVH9c47aHu90BhDXeZc+rgzHRHcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-core": "^7.7.2",
-        "@vue/devtools-kit": "^7.7.2",
-        "@vue/devtools-shared": "^7.7.2",
-        "execa": "^9.5.1",
-        "sirv": "^3.0.0",
+        "@vue/devtools-core": "^7.7.6",
+        "@vue/devtools-kit": "^7.7.6",
+        "@vue/devtools-shared": "^7.7.6",
+        "execa": "^9.5.2",
+        "sirv": "^3.0.1",
         "vite-plugin-inspect": "0.8.9",
         "vite-plugin-vue-inspector": "^5.3.1"
       },
@@ -10709,6 +11400,32 @@
         "vite": "^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.0-0"
       }
     },
+    "node_modules/vite/node_modules/fdir": {
+      "version": "6.4.4",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
+      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/vscode-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
@@ -10776,9 +11493,9 @@
       }
     },
     "node_modules/vue-router": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.5.0.tgz",
-      "integrity": "sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.5.1.tgz",
+      "integrity": "sha512-ogAF3P97NPm8fJsE4by9dwSYtDwXIY1nFY9T6DyQnGHd1E2Da94w9JIolpe42LJGIl0DwOHBi8TcRPlPGwbTtw==",
       "license": "MIT",
       "dependencies": {
         "@vue/devtools-api": "^6.6.4"
@@ -10790,15 +11507,21 @@
         "vue": "^3.2.0"
       }
     },
+    "node_modules/vue-router/node_modules/@vue/devtools-api": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
+      "license": "MIT"
+    },
     "node_modules/vue-tsc": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.2.8.tgz",
-      "integrity": "sha512-jBYKBNFADTN+L+MdesNX/TB3XuDSyaWynKMDgR+yCSln0GQ9Tfb7JS2lr46s2LiFUT1WsmfWsSvIElyxzOPqcQ==",
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.2.10.tgz",
+      "integrity": "sha512-jWZ1xSaNbabEV3whpIDMbjVSVawjAyW+x1n3JeGQo7S0uv2n9F/JMgWW90tGWNFRKya4YwKMZgCtr0vRAM7DeQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@volar/typescript": "~2.4.11",
-        "@vue/language-core": "2.2.8"
+        "@vue/language-core": "2.2.10"
       },
       "bin": {
         "vue-tsc": "bin/vue-tsc.js"
@@ -11400,20 +12123,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
-      "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/yargs": {
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@@ -11526,6 +12235,26 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.24.4",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz",
+      "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zod-to-json-schema": {
+      "version": "3.24.5",
+      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.5.tgz",
+      "integrity": "sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==",
+      "dev": true,
+      "license": "ISC",
+      "peerDependencies": {
+        "zod": "^3.24.1"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 73f97b9..14dd5f8 100644
--- a/package.json
+++ b/package.json
@@ -24,19 +24,19 @@
   "author": "JK Effects",
   "license": "AGPL-3.0-only",
   "dependencies": {
-    "@fullcalendar/core": "^6.1.15",
-    "@fullcalendar/daygrid": "^6.1.15",
-    "@fullcalendar/interaction": "^6.1.15",
+    "@fullcalendar/core": "^6.1.17",
+    "@fullcalendar/daygrid": "^6.1.17",
+    "@fullcalendar/interaction": "^6.1.17",
     "@fullcalendar/list": "^6.1.17",
-    "@fullcalendar/timegrid": "^6.1.15",
-    "@fullcalendar/vue3": "^6.1.15",
+    "@fullcalendar/timegrid": "^6.1.17",
+    "@fullcalendar/vue3": "^6.1.17",
     "@headlessui/vue": "^1.7.23",
-    "@heroicons/vue": "^2.1.5",
-    "@tailwindcss/vite": "^4.1.3",
+    "@heroicons/vue": "^2.2.0",
+    "@tailwindcss/vite": "^4.1.5",
     "@vueup/vue-quill": "^1.2.0",
-    "axios": "^1.7.9",
+    "axios": "^1.9.0",
     "event-source-polyfill": "^1.0.31",
-    "grapesjs": "^0.22.4",
+    "grapesjs": "^0.22.7",
     "grapesjs-preset-newsletter": "^1.0.2",
     "highlight.js": "^11.11.1",
     "jwt-decode": "^4.0.0",
@@ -51,44 +51,44 @@
     "pdf-dist": "^1.0.0",
     "pinia": "^3.0.2",
     "pwacompat": "^2.0.17",
-    "qrcode": "^1.5.3",
-    "qs": "^6.11.2",
-    "socket.io-client": "^4.5.0",
+    "qrcode": "^1.5.4",
+    "qs": "^6.14.0",
+    "socket.io-client": "^4.8.1",
     "unplugin-vue-markdown": "^28.3.1",
     "uuid": "^11.1.0",
-    "vue": "^3.4.29",
-    "vue-router": "^4.3.3"
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.1"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.8.0",
-    "@tailwindcss/postcss": "^4.1.3",
-    "@tsconfig/node20": "^20.1.4",
-    "@types/eslint": "~9.6.0",
+    "@rushstack/eslint-patch": "^1.11.0",
+    "@tailwindcss/postcss": "^4.1.5",
+    "@tsconfig/node20": "^20.1.5",
+    "@types/eslint": "~9.6.1",
     "@types/event-source-polyfill": "^1.0.5",
     "@types/lodash.clonedeep": "^4.5.9",
     "@types/lodash.difference": "^4.5.9",
     "@types/lodash.differencewith": "^4.5.9",
     "@types/lodash.isequal": "^4.5.8",
     "@types/markdown-it": "^14.1.2",
-    "@types/node": "^22.14.0",
-    "@types/nprogress": "^0.2.0",
+    "@types/node": "^22.15.12",
+    "@types/nprogress": "^0.2.3",
     "@types/qrcode": "^1.5.5",
-    "@types/qs": "^6.9.11",
+    "@types/qs": "^6.9.18",
     "@types/uuid": "^10.0.0",
     "@vite-pwa/assets-generator": "^1.0.0",
-    "@vitejs/plugin-vue": "^5.0.5",
+    "@vitejs/plugin-vue": "^5.2.3",
     "@vue/eslint-config-prettier": "^10.2.0",
     "@vue/eslint-config-typescript": "^14.5.0",
     "@vue/tsconfig": "^0.7.0",
-    "eslint": "^9.24.0",
-    "eslint-plugin-vue": "^10.0.0",
-    "npm-run-all2": "^7.0.2",
-    "prettier": "^3.2.5",
-    "tailwindcss": "^4.1.3",
+    "eslint": "^9.26.0",
+    "eslint-plugin-vue": "^10.1.0",
+    "npm-run-all2": "^8.0.1",
+    "prettier": "^3.5.3",
+    "tailwindcss": "^4.1.5",
     "typescript": "^5.8.3",
-    "vite": "^6.2.6",
+    "vite": "^6.3.5",
     "vite-plugin-pwa": "^1.0.0",
-    "vite-plugin-vue-devtools": "^7.6.8",
-    "vue-tsc": "^2.0.21"
+    "vite-plugin-vue-devtools": "^7.7.6",
+    "vue-tsc": "^2.2.10"
   }
 }

From ccc6d47d9edfb7c344df1a7395c19e9bfcffa589 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 6 May 2025 09:53:15 +0200
Subject: [PATCH 40/45] 1.5.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index caefee1..b601e11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ff-admin",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin",
-      "version": "1.4.1",
+      "version": "1.5.0",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fullcalendar/core": "^6.1.17",
diff --git a/package.json b/package.json
index 6f30ca5..08f7778 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ff-admin",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {

From fa5fb54876f47b748839d5aecce585e5d493c999 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 7 May 2025 08:27:03 +0200
Subject: [PATCH 41/45] update: ReadMe

---
 README.md            |  17 +++--------------
 demo-totp-qrcode.png | Bin 1946 -> 0 bytes
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 demo-totp-qrcode.png

diff --git a/README.md b/README.md
index 1ac5ff6..6f1136c 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,9 @@ Dieses Repository dient hauptsächlich zur Verwaltung der Mitgliederdaten, aber
 
 Eine Demo dieser Seite finden Sie unter [https://admin-demo.ff-admin.de](https://admin-demo.ff-admin.de).
 
-Für die Verwendung muss ein TOTP-Code eingegeben werden.
+Die Zugangsdaten (Lesebeschränkt) sind unterhalb dem Login angegeben.
 
-Die Zugangsdaten (Lesebeschränkt) sind:\
-EMAIL: demo-besucher\
-TOTP: ![alt text](demo-totp-qrcode.png)\
-TOTP-Code: FBMDAJKFOYQXM2DNH47GWWBGJ5KWOUCW
+Das Handbuch zur Anwendung finden sie unter [https://ff-admin.de/ff-admin-handbook](https://ff-admin.de/ff-admin-handbook).
 
 ## Installation
 
@@ -29,17 +26,9 @@ services:
     image: docker.registry.jk-effects.cloud/ehrenamt/ff-admin/app:latest
     container_name: ff_admin
     restart: unless-stopped
-
+    
     #environment:
     #  - SERVERADDRESS=<backend_url (https://... | http://...)> # wichtig: ohne Pfad
-    #  - APPNAMEOVERWRITE=<appname> # ersetzt den Namen FF-Admin auf der Login-Seite und sonstigen Positionen in der Oberfläche
-    #  - IMPRINTLINK=<imprint link>
-    #  - PRIVACYLINK=<privacy link>
-    #  - CUSTOMLOGINMESSAGE=betrieben von xy
-    #volumes:
-    #  - <volume|local path>/favicon.ico:/usr/share/nginx/html/favicon.ico # 48x48 px Auflösung
-    #  - <volume|local path>/favicon.png:/usr/share/nginx/html/favicon.png # 512x512 px Auflösung - wird als pwa Icon genutzt
-    #  - <volume|local path>/Logo.png:/usr/share/nginx/html/Logo.png
 ```
 
 Wenn keine Server-Adresse angegeben wird, wird versucht das Backend unter der URL des Frontends zu erreichen. Dazu muss das Backend auf der gleichen URL wie das Frontend laufen. Zur Unterscheidung von Frontend und Backend bei gleicher URL müssen alle Anfragen mit dem PathPrefix `/api` an das Backend weitergeleitet werden.
diff --git a/demo-totp-qrcode.png b/demo-totp-qrcode.png
deleted file mode 100644
index ae03670cbfe00b52ba89f1524e6fa8d9e55781af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1946
zcmb7FZ)g)|7|$l?6uL4?5Y(~hT!Z()(tNp1yJp&0dm}X_y^0%*&O$!z!%fkdLP^;s
zb%`jG60BqxnjT%w{Xt~|m69qN7!^S#7RJEn;eld>CZ7^^Hv2u#UCiA+Z69*)UG90_
z_j!JQo=fiAyQgK%`ZXSpr$y=uMzQ`%zt>jc`oW!*ek`v_!JTsamBsamKRljQ1N8L#
z#?I4Q_N=}Bq5p2Z?mu=q@zL9n`|oUBxU<;0aP8K?pHFUFxc2-1TFj+Q={ZeL&QGL#
z!a#9@5Ek0gVL60*)j!x3sbz%jLkFI1KJnYO!&m~N9~VV!Hc}p+m&-xpR7x_WVq02@
zU6_>5=R@AGP>_tw>z{x6_~OEDT22hjRC=-PKv6-+Oo}7h)0!?7eM0vX-YMIEI(p{j
zC+ptF^47K=DyrU+)`p|!g!6J&1lPP7*x`(rrn1hVO4>uk25ktx5YPFwkhdPQ>%>yI
z+3{nw!;0kX^3;@7NmZoN8iy7_Mpo`bI`z&++nf6bZ5%>^k~cGNz6AH%7dOTx83A!{
zcFHOl7|P|LFP&KR5iA8%Hz_~J$8(6ws+A;wF3Dv#Nc-t{g#jcO>23m)NU`Whv{M^p
zGVEGL?==ZFm!=5O>hXC3fnyuVV2=`rRs}%Tj-$Gy-7%I+f$HY8&l?6MO0*WV$R3%d
zCU9O(7g104JqJkLYQ^H5Kv#!32fau}3$}S#uOYfX>Hv-Hcwgdb2;LF{O}){7W`C2f
z;jyKY^72edL`ft?bfjnG?ntNBr9oUQ2DcRZSbMa4B^V<G41z)+Jt;icSL^pG^1q>?
zZ3)zd65~Ba8)*Vrkm5K%6otZ5Te(;g)$afYa0G%HK<0bi0(mSJo%4k`N77<zp%2EO
zv$*SQo~jRVya+i{H}HY&9iP)Ht>mm;N*m3A&1wBqDlE?efe<OCx9A3U2ytDJ24~1z
z-4Jj6a?0VVH~#*nHE$BAREh<zTFJ13$oB-eyMe?RdmQiy<U#DNkbX(yt3jws8q1ec
zXpCnDd(rke1do!z9x-E1xEr-NWl8gVP;7)~6hV-rR)<4wEk9gAMB(Qn@N5RbKRtqf
zRiA529Omt|3<(fnnl(d67>&;R*$^X9ryXjK&O-1cOExEz-l@$_k)S5{795yoo5L0U
zUxocdh>c}|-1?SuMmA@f4y!%t@n-2Y5C+!t1Bu{>=9`{9;u;hNrXvC*qXcWAv~io4
zFyvBo40dxV#&SpJs^2mO4-KR?FlqDF-)*`IQ*Zzh$#AuV01p|Gd(g;0moAHZah0Hr
z_h2ik7&+FL!4hl9iSU*08C-HE6@XCs5)f*UGMO<-S9j&Ng#^9=kTp$XD}DpuB~s`9
zbk4MxFvi1=Et2HX2FJ1p*&HFEt~PPL6gco~ZL?weO8vK|N+5Tz@YR#>;lJ>)^+>z-
L27lT0+1LL718%Zi


From c17355fcd16dfa8e811b68f7b01a2cc71d429857 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 7 May 2025 08:27:31 +0200
Subject: [PATCH 42/45] change: request method for account credential change

---
 src/components/account/ChangeToPassword.vue | 2 +-
 src/components/account/ChangeToTOTP.vue     | 2 +-
 src/components/account/PasswordChange.vue   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/account/ChangeToPassword.vue b/src/components/account/ChangeToPassword.vue
index 86b7c8e..cbd14c7 100644
--- a/src/components/account/ChangeToPassword.vue
+++ b/src/components/account/ChangeToPassword.vue
@@ -84,7 +84,7 @@ export default defineComponent({
       this.changeStatus = "loading";
       this.changeError = "";
       this.$http
-        .post(`/user/changeToPW`, {
+        .patch(`/user/changeToPW`, {
           newpassword: await hashString(formData.new.value),
         })
         .then((result) => {
diff --git a/src/components/account/ChangeToTOTP.vue b/src/components/account/ChangeToTOTP.vue
index c04197c..3d5dab3 100644
--- a/src/components/account/ChangeToTOTP.vue
+++ b/src/components/account/ChangeToTOTP.vue
@@ -69,7 +69,7 @@ export default defineComponent({
       this.verifyStatus = "loading";
       this.verifyError = "";
       this.$http
-        .post(`/user/changeToTOTP`, {
+        .patch(`/user/changeToTOTP`, {
           otp: this.otp,
           totp: formData.totp.value,
         })
diff --git a/src/components/account/PasswordChange.vue b/src/components/account/PasswordChange.vue
index 268e5bc..eebd339 100644
--- a/src/components/account/PasswordChange.vue
+++ b/src/components/account/PasswordChange.vue
@@ -87,7 +87,7 @@ export default defineComponent({
       this.changeStatus = "loading";
       this.changeError = "";
       this.$http
-        .post(`/user/changepw`, {
+        .patch(`/user/changepw`, {
           current: await hashString(formData.current.value),
           newpassword: await hashString(formData.new.value),
         })

From b4fdd5fc6091f3292c9ed634068e1c5c169a1d87 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 7 May 2025 09:05:25 +0200
Subject: [PATCH 43/45] enhance: permission handling

---
 src/components/admin/Permission.vue | 10 +++----
 src/stores/ability.ts               | 46 +++++++++++++++++------------
 src/types/permissionTypes.ts        | 14 +++++++++
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/components/admin/Permission.vue b/src/components/admin/Permission.vue
index 9be7f19..7da9b9d 100644
--- a/src/components/admin/Permission.vue
+++ b/src/components/admin/Permission.vue
@@ -18,22 +18,22 @@
         <div class="flex flex-row border border-white rounded-md overflow-hidden">
           <EyeIcon
             class="w-5 h-5 p-1 box-content cursor-pointer"
-            :class="_can(permissionUpdate, 'read', section) ? 'bg-success' : ''"
+            :class="_canSection(permissionUpdate, 'read', section) ? 'bg-success' : ''"
             @click="togglePermission('read', section)"
           />
           <PlusIcon
             class="w-5 h-5 p-1 box-content cursor-pointer"
-            :class="_can(permissionUpdate, 'create', section) ? 'bg-success' : ''"
+            :class="_canSection(permissionUpdate, 'create', section) ? 'bg-success' : ''"
             @click="togglePermission('create', section)"
           />
           <PencilIcon
             class="w-5 h-5 p-1 box-content cursor-pointer"
-            :class="_can(permissionUpdate, 'update', section) ? 'bg-success' : ''"
+            :class="_canSection(permissionUpdate, 'update', section) ? 'bg-success' : ''"
             @click="togglePermission('update', section)"
           />
           <TrashIcon
             class="w-5 h-5 p-1 box-content cursor-pointer"
-            :class="_can(permissionUpdate, 'delete', section) ? 'bg-success' : ''"
+            :class="_canSection(permissionUpdate, 'delete', section) ? 'bg-success' : ''"
             @click="togglePermission('delete', section)"
           />
         </div>
@@ -132,7 +132,7 @@ export default defineComponent({
     };
   },
   computed: {
-    ...mapState(useAbilityStore, ["_can"]),
+    ...mapState(useAbilityStore, ["_can", "_canSection"]),
     canSaveOrReset(): boolean {
       return isEqual(this.permissions, this.permissionUpdate);
     },
diff --git a/src/stores/ability.ts b/src/stores/ability.ts
index d5190af..f65f6fe 100644
--- a/src/stores/ability.ts
+++ b/src/stores/ability.ts
@@ -11,21 +11,18 @@ export const useAbilityStore = defineStore("ability", {
   getters: {
     can:
       (state) =>
-      (type: PermissionType | "admin", section: PermissionSection, module?: PermissionModule): boolean => {
+      (type: PermissionType | "admin", section: PermissionSection, module: PermissionModule): boolean => {
         const permissions = state.permissions;
         if (state.isOwner) return true;
-        if (type == "admin") return permissions?.admin ?? false;
-        if (permissions?.admin) return true;
+        if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
+        if (permissions?.admin || permissions?.adminByOwner) return true;
         if (
-          (!module &&
-            permissions[section] != undefined &&
-            (permissions[section]?.all == "*" || permissions[section]?.all?.includes(type))) ||
           permissions[section]?.all == "*" ||
-          permissions[section]?.all?.includes(type)
+          permissions[section]?.all?.includes(type) ||
+          permissions[section]?.[module] == "*" ||
+          permissions[section]?.[module]?.includes(type)
         )
           return true;
-        if (module && (permissions[section]?.[module] == "*" || permissions[section]?.[module]?.includes(type)))
-          return true;
         return false;
       },
     canSection:
@@ -33,8 +30,8 @@ export const useAbilityStore = defineStore("ability", {
       (type: PermissionType | "admin", section: PermissionSection): boolean => {
         const permissions = state.permissions;
         if (state.isOwner) return true;
-        if (type == "admin") return permissions?.admin ?? false;
-        if (permissions?.admin) return true;
+        if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
+        if (permissions?.admin || permissions?.adminByOwner) return true;
         if (
           permissions[section]?.all == "*" ||
           permissions[section]?.all?.includes(type) ||
@@ -54,20 +51,31 @@ export const useAbilityStore = defineStore("ability", {
         permissions: PermissionObject,
         type: PermissionType | "admin",
         section: PermissionSection,
-        module?: PermissionModule
+        module: PermissionModule
       ): boolean => {
         // ignores ownership
-        if (type == "admin") return permissions?.admin ?? false;
-        if (permissions?.admin) return true;
+        if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
+        if (permissions?.admin || permissions?.adminByOwner) return true;
         if (
-          (!module &&
-            permissions[section] != undefined &&
-            (permissions[section]?.all == "*" || permissions[section]?.all?.includes(type))) ||
           permissions[section]?.all == "*" ||
-          permissions[section]?.all?.includes(type)
+          permissions[section]?.all?.includes(type) ||
+          permissions[section]?.[module] == "*" ||
+          permissions[section]?.[module]?.includes(type)
         )
           return true;
-        if (module && (permissions[section]?.[module] == "*" || permissions[section]?.[module]?.includes(type)))
+        return false;
+      },
+    _canSection:
+      () =>
+      (permissions: PermissionObject, type: PermissionType | "admin", section: PermissionSection): boolean => {
+        // ignores ownership
+        if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
+        if (permissions?.admin || permissions?.adminByOwner) return true;
+        if (
+          permissions[section]?.all == "*" ||
+          permissions[section]?.all?.includes(type) ||
+          permissions[section] != undefined
+        )
           return true;
         return false;
       },
diff --git a/src/types/permissionTypes.ts b/src/types/permissionTypes.ts
index 72f15c7..eff7fd1 100644
--- a/src/types/permissionTypes.ts
+++ b/src/types/permissionTypes.ts
@@ -31,6 +31,7 @@ export type PermissionString =
   | `${PermissionSection}.${PermissionModule}.*` // für alle Berechtigungen in einem Modul
   | `${PermissionSection}.${PermissionType}` // für spezifische Berechtigungen in einem Abschnitt
   | `${PermissionSection}.*` // für alle Berechtigungen in einem Abschnitt
+  | `additional.${string}.${string}` // additional
   | "*"; // für Admin
 
 export type PermissionObject = {
@@ -39,10 +40,20 @@ export type PermissionObject = {
   } & { all?: Array<PermissionType> | "*" };
 } & {
   admin?: boolean;
+  adminByOwner?: boolean;
+} & {
+  additional?: { [key: string]: string };
 };
 
 export type SectionsAndModulesObject = {
   [section in PermissionSection]: Array<PermissionModule>;
+} & {
+  additional?: Array<{
+    key: string;
+    name: string;
+    type: "number" | "string";
+    emptyIfAdmin: boolean;
+  }>;
 };
 
 export const permissionSections: Array<PermissionSection> = ["club", "configuration", "management"];
@@ -87,4 +98,7 @@ export const sectionsAndModules: SectionsAndModulesObject = {
     "newsletter_config",
   ],
   management: ["user", "role", "webapi", "backup", "setting"],
+  additional: [
+    //{ key: "val", name: "name", type: "number", emptyIfAdmin: true },
+  ],
 };

From 18d52e4babda133fc7142796bf6a9f7ef140a67a Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 7 May 2025 09:20:32 +0200
Subject: [PATCH 44/45] change: refactor imports

---
 src/components/Header.vue                                 | 2 +-
 src/components/account/ChangeToPassword.vue               | 2 +-
 src/components/account/PasswordChange.vue                 | 2 +-
 src/components/admin/MemberSearchSelect.vue               | 2 +-
 src/components/admin/club/member/CreateMemberModal.vue    | 4 ++--
 .../admin/club/newsletter/CreateNewsletterModal.vue       | 4 ++--
 src/components/admin/management/backup/BackupListItem.vue | 2 +-
 .../admin/management/backup/RestoreBackupModal.vue        | 4 ++--
 .../admin/management/webapi/CreateWebapiModal.vue         | 2 +-
 .../admin/management/webapi/WebapiTokenModal.vue          | 2 +-
 src/components/setup/Account.vue                          | 2 +-
 src/components/setup/App.vue                              | 2 +-
 src/components/setup/Club.vue                             | 2 +-
 src/components/setup/Images.vue                           | 2 +-
 src/components/setup/Mail.vue                             | 2 +-
 src/helpers/queryFormatter.ts                             | 2 +-
 src/router/backupGuard.ts                                 | 2 +-
 src/router/newsletterGuard.ts                             | 2 +-
 src/router/protocolGuard.ts                               | 2 +-
 src/stores/admin/club/newsletter/newsletterPrintout.ts    | 5 ++---
 src/stores/admin/configuration/queryStore.ts              | 6 +++---
 src/stores/admin/management/backup.ts                     | 2 +-
 src/stores/admin/navigation.ts                            | 2 +-
 src/stores/configuration.ts                               | 2 +-
 src/stores/setup.ts                                       | 2 +-
 src/viewmodels/admin/club/calendar.models.ts              | 2 +-
 src/viewmodels/admin/club/member/communication.models.ts  | 2 +-
 src/viewmodels/admin/club/member/member.models.ts         | 2 +-
 .../admin/club/newsletter/newsletterDates.models.ts       | 2 +-
 .../admin/club/newsletter/newsletterRecipients.models.ts  | 2 +-
 src/viewmodels/admin/management/backup.models.ts          | 2 +-
 src/views/Login.vue                                       | 2 +-
 src/views/account/LoginData.vue                           | 8 ++++----
 src/views/admin/club/members/MemberEdit.vue               | 2 +-
 src/views/admin/club/newsletter/Newsletter.vue            | 2 +-
 src/views/admin/club/newsletter/NewsletterPrintout.vue    | 2 +-
 src/views/admin/club/newsletter/NewsletterRouting.vue     | 4 ++--
 src/views/setup/Setup.vue                                 | 2 +-
 38 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 9872753..109c38a 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -42,7 +42,7 @@ import UserMenu from "./UserMenu.vue";
 <script lang="ts">
 import { defineComponent } from "vue";
 import AppLogo from "./AppLogo.vue";
-import { useConfigurationStore } from "../stores/configuration";
+import { useConfigurationStore } from "@/stores/configuration";
 export default defineComponent({
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
diff --git a/src/components/account/ChangeToPassword.vue b/src/components/account/ChangeToPassword.vue
index cbd14c7..0d061fc 100644
--- a/src/components/account/ChangeToPassword.vue
+++ b/src/components/account/ChangeToPassword.vue
@@ -48,7 +48,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import TextCopy from "@/components/TextCopy.vue";
-import { hashString } from "../../helpers/crypto";
+import { hashString } from "@/helpers/crypto";
 </script>
 
 <script lang="ts">
diff --git a/src/components/account/PasswordChange.vue b/src/components/account/PasswordChange.vue
index eebd339..d7560e7 100644
--- a/src/components/account/PasswordChange.vue
+++ b/src/components/account/PasswordChange.vue
@@ -58,7 +58,7 @@ import MainTemplate from "@/templates/Main.vue";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { hashString } from "../../helpers/crypto";
+import { hashString } from "@/helpers/crypto";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/MemberSearchSelect.vue b/src/components/admin/MemberSearchSelect.vue
index c56b0ef..b5e0bd0 100644
--- a/src/components/admin/MemberSearchSelect.vue
+++ b/src/components/admin/MemberSearchSelect.vue
@@ -87,7 +87,7 @@ import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { useMemberStore } from "@/stores/admin/club/member/member";
 import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 import difference from "lodash.difference";
-import Spinner from "../Spinner.vue";
+import Spinner from "@/components/Spinner.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/club/member/CreateMemberModal.vue b/src/components/admin/club/member/CreateMemberModal.vue
index d91ed76..b25aa1e 100644
--- a/src/components/admin/club/member/CreateMemberModal.vue
+++ b/src/components/admin/club/member/CreateMemberModal.vue
@@ -109,8 +109,8 @@ import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } f
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { useMemberStore } from "@/stores/admin/club/member/member";
 import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
-import { useSalutationStore } from "../../../../stores/admin/configuration/salutation";
-import type { SalutationViewModel } from "../../../../viewmodels/admin/configuration/salutation.models";
+import { useSalutationStore } from "@/stores/admin/configuration/salutation";
+import type { SalutationViewModel } from "@/viewmodels/admin/configuration/salutation.models";
 import { InformationCircleIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/components/admin/club/newsletter/CreateNewsletterModal.vue b/src/components/admin/club/newsletter/CreateNewsletterModal.vue
index f589b89..40da0c4 100644
--- a/src/components/admin/club/newsletter/CreateNewsletterModal.vue
+++ b/src/components/admin/club/newsletter/CreateNewsletterModal.vue
@@ -36,8 +36,8 @@ import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
 import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models";
-import { useNewsletterStore } from "../../../../stores/admin/club/newsletter/newsletter";
-import type { CreateNewsletterViewModel } from "../../../../viewmodels/admin/club/newsletter/newsletter.models";
+import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
+import type { CreateNewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/management/backup/BackupListItem.vue b/src/components/admin/management/backup/BackupListItem.vue
index 1962f15..7fe1a60 100644
--- a/src/components/admin/management/backup/BackupListItem.vue
+++ b/src/components/admin/management/backup/BackupListItem.vue
@@ -20,7 +20,7 @@ import { mapState, mapActions } from "pinia";
 import { ArchiveBoxArrowDownIcon, ArrowDownTrayIcon, BarsArrowUpIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
 import { useModalStore } from "@/stores/modal";
-import { useBackupStore } from "../../../../stores/admin/management/backup";
+import { useBackupStore } from "@/stores/admin/management/backup";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/management/backup/RestoreBackupModal.vue b/src/components/admin/management/backup/RestoreBackupModal.vue
index aa58db8..6e8a60c 100644
--- a/src/components/admin/management/backup/RestoreBackupModal.vue
+++ b/src/components/admin/management/backup/RestoreBackupModal.vue
@@ -57,9 +57,9 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useBackupStore } from "@/stores/admin/management/backup";
-import type { BackupRestoreViewModel } from "../../../../viewmodels/admin/management/backup.models";
+import type { BackupRestoreViewModel } from "@/viewmodels/admin/management/backup.models";
 import { InformationCircleIcon } from "@heroicons/vue/24/outline";
-import { backupSections, type BackupSection } from "../../../../types/backupTypes";
+import { backupSections, type BackupSection } from "@/types/backupTypes";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/management/webapi/CreateWebapiModal.vue b/src/components/admin/management/webapi/CreateWebapiModal.vue
index 9df8f94..4e9d372 100644
--- a/src/components/admin/management/webapi/CreateWebapiModal.vue
+++ b/src/components/admin/management/webapi/CreateWebapiModal.vue
@@ -39,7 +39,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useWebapiStore } from "@/stores/admin/management/webapi";
-import type { CreateWebapiViewModel } from "../../../../viewmodels/admin/management/webapi.models";
+import type { CreateWebapiViewModel } from "@/viewmodels/admin/management/webapi.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/management/webapi/WebapiTokenModal.vue b/src/components/admin/management/webapi/WebapiTokenModal.vue
index a7f10fa..c55b7fe 100644
--- a/src/components/admin/management/webapi/WebapiTokenModal.vue
+++ b/src/components/admin/management/webapi/WebapiTokenModal.vue
@@ -28,7 +28,7 @@ import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import TextCopy from "@/components/TextCopy.vue";
 import { CalendarDaysIcon, InformationCircleIcon } from "@heroicons/vue/24/outline";
 import { host } from "@/serverCom";
-import { useWebapiStore } from "../../../../stores/admin/management/webapi";
+import { useWebapiStore } from "@/stores/admin/management/webapi";
 </script>
 
 <script lang="ts">
diff --git a/src/components/setup/Account.vue b/src/components/setup/Account.vue
index 95b88bd..a5b8a38 100644
--- a/src/components/setup/Account.vue
+++ b/src/components/setup/Account.vue
@@ -34,7 +34,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { mapActions } from "pinia";
-import { useSetupStore } from "../../stores/setup";
+import { useSetupStore } from "@/stores/setup";
 </script>
 
 <script lang="ts">
diff --git a/src/components/setup/App.vue b/src/components/setup/App.vue
index fbc2079..2093ba7 100644
--- a/src/components/setup/App.vue
+++ b/src/components/setup/App.vue
@@ -32,7 +32,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { mapActions } from "pinia";
-import { useSetupStore } from "../../stores/setup";
+import { useSetupStore } from "@/stores/setup";
 </script>
 
 <script lang="ts">
diff --git a/src/components/setup/Club.vue b/src/components/setup/Club.vue
index 96fa4f9..0e16feb 100644
--- a/src/components/setup/Club.vue
+++ b/src/components/setup/Club.vue
@@ -63,7 +63,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { mapActions } from "pinia";
-import { useSetupStore } from "../../stores/setup";
+import { useSetupStore } from "@/stores/setup";
 </script>
 
 <script lang="ts">
diff --git a/src/components/setup/Images.vue b/src/components/setup/Images.vue
index 33f5c23..03519d8 100644
--- a/src/components/setup/Images.vue
+++ b/src/components/setup/Images.vue
@@ -37,7 +37,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { mapActions } from "pinia";
-import { useSetupStore } from "../../stores/setup";
+import { useSetupStore } from "@/stores/setup";
 </script>
 
 <script lang="ts">
diff --git a/src/components/setup/Mail.vue b/src/components/setup/Mail.vue
index 170c541..344f8cd 100644
--- a/src/components/setup/Mail.vue
+++ b/src/components/setup/Mail.vue
@@ -57,7 +57,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { mapActions } from "pinia";
-import { useSetupStore } from "../../stores/setup";
+import { useSetupStore } from "@/stores/setup";
 </script>
 
 <script lang="ts">
diff --git a/src/helpers/queryFormatter.ts b/src/helpers/queryFormatter.ts
index f934c6a..15eb87c 100644
--- a/src/helpers/queryFormatter.ts
+++ b/src/helpers/queryFormatter.ts
@@ -1,4 +1,4 @@
-import { joinTableFormatter, type FieldType, type QueryResult } from "../types/dynamicQueries";
+import { joinTableFormatter, type FieldType, type QueryResult } from "@/types/dynamicQueries";
 
 export function joinTableName(name: string): string {
   let normalized = joinTableFormatter[name];
diff --git a/src/router/backupGuard.ts b/src/router/backupGuard.ts
index 097b198..79a708c 100644
--- a/src/router/backupGuard.ts
+++ b/src/router/backupGuard.ts
@@ -1,4 +1,4 @@
-import { useBackupStore } from "../stores/admin/management/backup";
+import { useBackupStore } from "@/stores/admin/management/backup";
 
 export async function setBackupPage(to: any, from: any, next: any) {
   const backup = useBackupStore();
diff --git a/src/router/newsletterGuard.ts b/src/router/newsletterGuard.ts
index 5d96cf9..385c78e 100644
--- a/src/router/newsletterGuard.ts
+++ b/src/router/newsletterGuard.ts
@@ -1,7 +1,7 @@
 import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
 import { useNewsletterDatesStore } from "@/stores/admin/club/newsletter/newsletterDates";
 import { useNewsletterRecipientsStore } from "@/stores/admin/club/newsletter/newsletterRecipients";
-import { useNewsletterPrintoutStore } from "../stores/admin/club/newsletter/newsletterPrintout";
+import { useNewsletterPrintoutStore } from "@/stores/admin/club/newsletter/newsletterPrintout";
 
 export async function setNewsletterId(to: any, from: any, next: any) {
   const newsletter = useNewsletterStore();
diff --git a/src/router/protocolGuard.ts b/src/router/protocolGuard.ts
index 9b235ce..41cb370 100644
--- a/src/router/protocolGuard.ts
+++ b/src/router/protocolGuard.ts
@@ -3,7 +3,7 @@ import { useProtocolAgendaStore } from "@/stores/admin/club/protocol/protocolAge
 import { useProtocolDecisionStore } from "@/stores/admin/club/protocol/protocolDecision";
 import { useProtocolPresenceStore } from "@/stores/admin/club/protocol/protocolPresence";
 import { useProtocolVotingStore } from "@/stores/admin/club/protocol/protocolVoting";
-import { useProtocolPrintoutStore } from "../stores/admin/club/protocol/protocolPrintout";
+import { useProtocolPrintoutStore } from "@/stores/admin/club/protocol/protocolPrintout";
 
 export async function setProtocolId(to: any, from: any, next: any) {
   const protocol = useProtocolStore();
diff --git a/src/stores/admin/club/newsletter/newsletterPrintout.ts b/src/stores/admin/club/newsletter/newsletterPrintout.ts
index 97bc4f3..143c425 100644
--- a/src/stores/admin/club/newsletter/newsletterPrintout.ts
+++ b/src/stores/admin/club/newsletter/newsletterPrintout.ts
@@ -1,9 +1,8 @@
 import { defineStore } from "pinia";
-import { http, newEventSource, streamingFetch } from "@/serverCom";
+import { http, streamingFetch } from "@/serverCom";
 import { useNewsletterStore } from "./newsletter";
 import type { AxiosResponse } from "axios";
-import type { EventSourcePolyfill } from "event-source-polyfill";
-import { useNotificationStore, type NotificationType } from "../../../notification";
+import { useNotificationStore, type NotificationType } from "@/stores/notification";
 
 export const useNewsletterPrintoutStore = defineStore("newsletterPrintout", {
   state: () => {
diff --git a/src/stores/admin/configuration/queryStore.ts b/src/stores/admin/configuration/queryStore.ts
index 451cbca..b2d0a1c 100644
--- a/src/stores/admin/configuration/queryStore.ts
+++ b/src/stores/admin/configuration/queryStore.ts
@@ -6,10 +6,10 @@ import type {
 } from "@/viewmodels/admin/configuration/query.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import { useQueryBuilderStore } from "../club/queryBuilder";
-import { useModalStore } from "../../modal";
+import { useQueryBuilderStore } from "@/stores/admin/club/queryBuilder";
+import { useModalStore } from "@/stores/modal";
 import { defineAsyncComponent, markRaw } from "vue";
-import { useAbilityStore } from "../../ability";
+import { useAbilityStore } from "@/stores/ability";
 
 export const useQueryStoreStore = defineStore("queryStore", {
   state: () => {
diff --git a/src/stores/admin/management/backup.ts b/src/stores/admin/management/backup.ts
index ab0b0e7..f46d198 100644
--- a/src/stores/admin/management/backup.ts
+++ b/src/stores/admin/management/backup.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import type { AxiosResponse, AxiosProgressEvent } from "axios";
-import type { BackupRestoreViewModel } from "../../../viewmodels/admin/management/backup.models";
+import type { BackupRestoreViewModel } from "@/viewmodels/admin/management/backup.models";
 
 export const useBackupStore = defineStore("backup", {
   state: () => {
diff --git a/src/stores/admin/navigation.ts b/src/stores/admin/navigation.ts
index 116bbd6..8d43417 100644
--- a/src/stores/admin/navigation.ts
+++ b/src/stores/admin/navigation.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
 import router from "@/router";
-import type { PermissionSection } from "../../types/permissionTypes";
+import type { PermissionSection } from "@/types/permissionTypes";
 
 export type navigationModel = {
   [key in topLevelNavigationType]: navigationSplitModel;
diff --git a/src/stores/configuration.ts b/src/stores/configuration.ts
index 1e8bfd8..493b688 100644
--- a/src/stores/configuration.ts
+++ b/src/stores/configuration.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { http } from "../serverCom";
+import { http } from "@/serverCom";
 
 export const useConfigurationStore = defineStore("configuration", {
   state: () => {
diff --git a/src/stores/setup.ts b/src/stores/setup.ts
index 3958eee..7294dee 100644
--- a/src/stores/setup.ts
+++ b/src/stores/setup.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { http } from "../serverCom";
+import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 import { useConfigurationStore } from "./configuration";
 
diff --git a/src/viewmodels/admin/club/calendar.models.ts b/src/viewmodels/admin/club/calendar.models.ts
index c4c5351..cf11032 100644
--- a/src/viewmodels/admin/club/calendar.models.ts
+++ b/src/viewmodels/admin/club/calendar.models.ts
@@ -1,4 +1,4 @@
-import type { CalendarTypeViewModel } from "../configuration/calendarType.models";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/configuration/calendarType.models";
 
 export interface CalendarViewModel {
   id: string;
diff --git a/src/viewmodels/admin/club/member/communication.models.ts b/src/viewmodels/admin/club/member/communication.models.ts
index fd47dbf..75b79c2 100644
--- a/src/viewmodels/admin/club/member/communication.models.ts
+++ b/src/viewmodels/admin/club/member/communication.models.ts
@@ -1,4 +1,4 @@
-import type { CommunicationTypeViewModel } from "../../configuration/communicationType.models";
+import type { CommunicationTypeViewModel } from "@/viewmodels/admin/configuration/communicationType.models";
 
 export interface CommunicationViewModel {
   id: number;
diff --git a/src/viewmodels/admin/club/member/member.models.ts b/src/viewmodels/admin/club/member/member.models.ts
index eb5aae4..7701876 100644
--- a/src/viewmodels/admin/club/member/member.models.ts
+++ b/src/viewmodels/admin/club/member/member.models.ts
@@ -1,6 +1,6 @@
 import type { CommunicationViewModel } from "./communication.models";
 import type { MembershipViewModel } from "./membership.models";
-import type { SalutationViewModel } from "../../configuration/salutation.models";
+import type { SalutationViewModel } from "@/viewmodels/admin/configuration/salutation.models";
 
 export interface MemberViewModel {
   id: string;
diff --git a/src/viewmodels/admin/club/newsletter/newsletterDates.models.ts b/src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
index 3db4d5b..9f691dc 100644
--- a/src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
+++ b/src/viewmodels/admin/club/newsletter/newsletterDates.models.ts
@@ -1,4 +1,4 @@
-import type { CalendarViewModel } from "../calendar.models";
+import type { CalendarViewModel } from "@/viewmodels/admin/club/calendar.models";
 
 export interface NewsletterDatesViewModel {
   newsletterId: number;
diff --git a/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts b/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
index b78192c..f10670d 100644
--- a/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
+++ b/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
@@ -1,4 +1,4 @@
-import type { MemberViewModel } from "../member/member.models";
+import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models";
 
 export interface NewsletterRecipientsViewModel {
   newsletterId: number;
diff --git a/src/viewmodels/admin/management/backup.models.ts b/src/viewmodels/admin/management/backup.models.ts
index 522c0ff..e7fd5e4 100644
--- a/src/viewmodels/admin/management/backup.models.ts
+++ b/src/viewmodels/admin/management/backup.models.ts
@@ -1,4 +1,4 @@
-import type { BackupSection } from "../../../types/backupTypes";
+import type { BackupSection } from "@/types/backupTypes";
 
 export interface BackupRestoreViewModel {
   filename: string;
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 6ef5c6b..487b753 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -81,7 +81,7 @@ import FormBottomBar from "@/components/FormBottomBar.vue";
 import AppLogo from "@/components/AppLogo.vue";
 import { mapState } from "pinia";
 import { useConfigurationStore } from "@/stores/configuration";
-import { hashString } from "../helpers/crypto";
+import { hashString } from "@/helpers/crypto";
 </script>
 
 <script lang="ts">
diff --git a/src/views/account/LoginData.vue b/src/views/account/LoginData.vue
index f91ad25..7378799 100644
--- a/src/views/account/LoginData.vue
+++ b/src/views/account/LoginData.vue
@@ -54,10 +54,10 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import TextCopy from "@/components/TextCopy.vue";
-import TotpCheckAndScan from "../../components/account/TotpCheckAndScan.vue";
-import PasswordChange from "../../components/account/PasswordChange.vue";
-import ChangeToPassword from "../../components/account/ChangeToPassword.vue";
-import ChangeToTOTP from "../../components/account/ChangeToTOTP.vue";
+import TotpCheckAndScan from "@/components/account/TotpCheckAndScan.vue";
+import PasswordChange from "@/components/account/PasswordChange.vue";
+import ChangeToPassword from "@/components/account/ChangeToPassword.vue";
+import ChangeToTOTP from "@/components/account/ChangeToTOTP.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/members/MemberEdit.vue b/src/views/admin/club/members/MemberEdit.vue
index 42eb162..f7ce25f 100644
--- a/src/views/admin/club/members/MemberEdit.vue
+++ b/src/views/admin/club/members/MemberEdit.vue
@@ -103,7 +103,7 @@ import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } f
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
-import { useSalutationStore } from "../../../../stores/admin/configuration/salutation";
+import { useSalutationStore } from "@/stores/admin/configuration/salutation";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/newsletter/Newsletter.vue b/src/views/admin/club/newsletter/Newsletter.vue
index 37e24ab..01c158f 100644
--- a/src/views/admin/club/newsletter/Newsletter.vue
+++ b/src/views/admin/club/newsletter/Newsletter.vue
@@ -38,7 +38,7 @@ import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
 import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
 import type { NewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models";
-import NewsletterListItem from "../../../../components/admin/club/newsletter/NewsletterListItem.vue";
+import NewsletterListItem from "@/components/admin/club/newsletter/NewsletterListItem.vue";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/newsletter/NewsletterPrintout.vue b/src/views/admin/club/newsletter/NewsletterPrintout.vue
index db9dcd2..114de53 100644
--- a/src/views/admin/club/newsletter/NewsletterPrintout.vue
+++ b/src/views/admin/club/newsletter/NewsletterPrintout.vue
@@ -81,7 +81,7 @@ import FailureXMark from "@/components/FailureXMark.vue";
 import { ArrowDownTrayIcon, ViewfinderCircleIcon } from "@heroicons/vue/24/outline";
 import { useModalStore } from "@/stores/modal";
 import { useAbilityStore } from "@/stores/ability";
-import { useNewsletterPrintoutStore } from "../../../../stores/admin/club/newsletter/newsletterPrintout";
+import { useNewsletterPrintoutStore } from "@/stores/admin/club/newsletter/newsletterPrintout";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/club/newsletter/NewsletterRouting.vue b/src/views/admin/club/newsletter/NewsletterRouting.vue
index c8805e4..6089853 100644
--- a/src/views/admin/club/newsletter/NewsletterRouting.vue
+++ b/src/views/admin/club/newsletter/NewsletterRouting.vue
@@ -53,8 +53,8 @@ import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
 import { useModalStore } from "@/stores/modal";
 import NewsletterSyncing from "@/components/admin/club/newsletter/NewsletterSyncing.vue";
 import { PrinterIcon } from "@heroicons/vue/24/outline";
-import { useNewsletterDatesStore } from "../../../../stores/admin/club/newsletter/newsletterDates";
-import { useNewsletterRecipientsStore } from "../../../../stores/admin/club/newsletter/newsletterRecipients";
+import { useNewsletterDatesStore } from "@/stores/admin/club/newsletter/newsletterDates";
+import { useNewsletterRecipientsStore } from "@/stores/admin/club/newsletter/newsletterRecipients";
 </script>
 
 <script lang="ts">
diff --git a/src/views/setup/Setup.vue b/src/views/setup/Setup.vue
index dd51a4f..fbc67b8 100644
--- a/src/views/setup/Setup.vue
+++ b/src/views/setup/Setup.vue
@@ -32,7 +32,7 @@ import { useSetupStore } from "@/stores/setup";
 import Club from "@/components/setup/Club.vue";
 import Images from "@/components/setup/Images.vue";
 import Finished from "@/components/setup/Finished.vue";
-import Mail from "../../components/setup/Mail.vue";
+import Mail from "@/components/setup/Mail.vue";
 </script>
 
 <script lang="ts">

From a39044dffcc579af2087df2aa927ac61ca52e35e Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 8 May 2025 08:12:26 +0200
Subject: [PATCH 45/45] change: remove logging

---
 src/components/queryBuilder/JoinTable.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/queryBuilder/JoinTable.vue b/src/components/queryBuilder/JoinTable.vue
index 8ea2153..bb637d8 100644
--- a/src/components/queryBuilder/JoinTable.vue
+++ b/src/components/queryBuilder/JoinTable.vue
@@ -149,7 +149,6 @@ export default defineComponent({
       this.value.id = uuid();
     }
     if (!this.value.type) {
-      console.log("setting type");
       this.type = "defined";
     }
   },