From 075c6cc7e4e4ff596cb5be72384c07048fd7171b Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 14 Jul 2025 10:27:27 +0200
Subject: [PATCH 01/21] change: improve pwa loading on new version

---
 vite.config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vite.config.ts b/vite.config.ts
index 2944004..ea7a6fb 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -41,6 +41,8 @@ export default defineConfig({
       injectRegister: "auto",
       manifest: false,
       workbox: {
+        cleanupOutdatedCaches: true,
+        skipWaiting: true,
         navigateFallbackDenylist: [/^\/api*/],
         runtimeCaching: [
           {

From a2101db747502d8747c6a6e5a8e5a7d38748a254 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 17 Jul 2025 12:56:33 +0200
Subject: [PATCH 02/21] add QuillEditor Component

---
 package-lock.json              | 105 ++++++++++++++++++++++---------
 package.json                   |   1 +
 src/components/QuillEditor.vue | 110 +++++++++++++++++++++++++++++++++
 3 files changed, 187 insertions(+), 29 deletions(-)
 create mode 100644 src/components/QuillEditor.vue

diff --git a/package-lock.json b/package-lock.json
index 54f23a8..3c53095 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
         "pwacompat": "^2.0.17",
         "qrcode": "^1.5.4",
         "qs": "^6.14.0",
+        "quill": "^2.0.3",
         "socket.io-client": "^4.8.1",
         "unplugin-vue-markdown": "^29.1.0",
         "uuid": "^11.1.0",
@@ -4652,6 +4653,52 @@
         "vue": "^3.2.41"
       }
     },
+    "node_modules/@vueup/vue-quill/node_modules/eventemitter3": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==",
+      "license": "MIT"
+    },
+    "node_modules/@vueup/vue-quill/node_modules/fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/@vueup/vue-quill/node_modules/parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@vueup/vue-quill/node_modules/quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      }
+    },
+    "node_modules/@vueup/vue-quill/node_modules/quill/node_modules/quill-delta": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+      "license": "MIT",
+      "dependencies": {
+        "deep-equal": "^1.0.1",
+        "extend": "^3.0.2",
+        "fast-diff": "1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -6219,9 +6266,9 @@
       "license": "MIT"
     },
     "node_modules/eventemitter3": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
-      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
       "license": "MIT"
     },
     "node_modules/execa": {
@@ -6280,7 +6327,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
       "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/fast-glob": {
@@ -8129,6 +8175,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+      "license": "MIT"
+    },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
@@ -8710,9 +8762,9 @@
       }
     },
     "node_modules/parchment": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
-      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/parchment/-/parchment-3.0.0.tgz",
+      "integrity": "sha512-HUrJFQ/StvgmXRcQ1ftY6VEZUq3jA2t9ncFN4F84J/vN0/FPpQF+8FKXb3l6fLces6q0uOHj6NJn+2xvZnxO6A==",
       "license": "BSD-3-Clause"
     },
     "node_modules/parent-module": {
@@ -9111,17 +9163,18 @@
       "license": "MIT"
     },
     "node_modules/quill": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
-      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/quill/-/quill-2.0.3.tgz",
+      "integrity": "sha512-xEYQBqfYx/sfb33VJiKnSJp8ehloavImQ2A6564GAbqG55PGw1dAWUn1MUbQB62t0azawUS2CZZhWCjO8gRvTw==",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "clone": "^2.1.1",
-        "deep-equal": "^1.0.1",
-        "eventemitter3": "^2.0.3",
-        "extend": "^3.0.2",
-        "parchment": "^1.1.4",
-        "quill-delta": "^3.6.2"
+        "eventemitter3": "^5.0.1",
+        "lodash-es": "^4.17.21",
+        "parchment": "^3.0.0",
+        "quill-delta": "^5.1.0"
+      },
+      "engines": {
+        "npm": ">=8.2.3"
       }
     },
     "node_modules/quill-delta": {
@@ -9141,24 +9194,18 @@
       "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
       "license": "Apache-2.0"
     },
-    "node_modules/quill/node_modules/fast-diff": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
-      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==",
-      "license": "Apache-2.0"
-    },
     "node_modules/quill/node_modules/quill-delta": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
-      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-5.1.0.tgz",
+      "integrity": "sha512-X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA==",
       "license": "MIT",
       "dependencies": {
-        "deep-equal": "^1.0.1",
-        "extend": "^3.0.2",
-        "fast-diff": "1.1.2"
+        "fast-diff": "^1.3.0",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isequal": "^4.5.0"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">= 12.0.0"
       }
     },
     "node_modules/randombytes": {
diff --git a/package.json b/package.json
index 7d23ae8..4aea9cc 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "pwacompat": "^2.0.17",
     "qrcode": "^1.5.4",
     "qs": "^6.14.0",
+    "quill": "^2.0.3",
     "socket.io-client": "^4.8.1",
     "unplugin-vue-markdown": "^29.1.0",
     "uuid": "^11.1.0",
diff --git a/src/components/QuillEditor.vue b/src/components/QuillEditor.vue
new file mode 100644
index 0000000..55c39b2
--- /dev/null
+++ b/src/components/QuillEditor.vue
@@ -0,0 +1,110 @@
+<template>
+  <div ref="quill"></div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, type PropType } from "vue";
+import Quill, { Delta } from "quill";
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+
+type RangeStatic = { index: number; length: number };
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    toolbar: {
+      type: [String, Array, Object],
+      default: "",
+    },
+    modules: {
+      type: Object as PropType<Record<string, unknown>>,
+      default: {},
+    },
+    content: {
+      type: [String, Object] as PropType<string | Delta>,
+      default: "",
+    },
+    contentType: {
+      type: String as PropType<"delta" | "html" | "text">,
+      default: "text",
+    },
+    readonly: { type: Boolean, default: false },
+    placeholder: String,
+  },
+  emits: {
+    "update:content": (content: Delta | string) => true,
+    textChange: (tc: { delta: Delta; oldDelta: Delta; source: string }) => true,
+    selectionChange: (sc: { range: RangeStatic; oldRange: RangeStatic; source: string }) => true,
+    focus: () => true,
+    blur: () => true,
+    ready: (quill: Quill) => true,
+  },
+  watch: {
+    conent(val, oldVal) {
+      this.setContent(val);
+    },
+  },
+  data() {
+    return {
+      instance: undefined as undefined | Quill,
+    };
+  },
+  mounted() {
+    this.instance = new Quill(this.$refs.quill as HTMLElement, {
+      theme: "snow",
+      modules: {
+        toolbar: this.toolbar,
+      },
+      placeholder: this.placeholder,
+      readOnly: this.readonly,
+    });
+
+    this.instance.on("selection-change", (range, oldRange, source) => {
+      if (!range) {
+        this.$emit("blur");
+      } else {
+        this.$emit("focus");
+      }
+      this.$emit("selectionChange", { range, oldRange, source });
+    });
+    this.instance.on("text-change", (delta, oldDelta, source) => {
+      this.$emit("update:content", this.getContent());
+      this.$emit("textChange", { delta, oldDelta, source });
+    });
+
+    this.$emit("ready", this.instance as Quill);
+    this.setContent(this.content);
+  },
+  beforeUnmount() {
+    this.instance = undefined;
+  },
+  methods: {
+    getContent(): string | Delta {
+      if (this.contentType === "delta") {
+        return (this.instance?.getContents() ?? {}) as Delta;
+      } else if (this.contentType === "html") {
+        return this.instance?.getSemanticHTML() ?? "";
+      } else {
+        return this.instance?.getText() ?? "";
+      }
+    },
+    setContent(content: Delta | string) {
+      if (this.contentType === "delta") {
+        if (typeof content !== "string") {
+          this.instance?.setContents(content);
+        }
+      } else if (this.contentType === "html") {
+        if (typeof content === "string" && this.instance) {
+          this.instance.root.innerHTML = content;
+        }
+      } else {
+        if (typeof content === "string") {
+          this.instance?.setText(content);
+        }
+      }
+    },
+  },
+});
+</script>

From 08c3698dd8490508586302f878fb5ad0405dc18d Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 17 Jul 2025 13:57:50 +0200
Subject: [PATCH 03/21] update Editor usage

---
 src/components/QuillEditor.vue                | 34 ++++++++++++++-----
 .../admin/club/newsletter/NewsletterData.vue  |  3 +-
 .../admin/club/newsletter/NewsletterDates.vue |  3 +-
 .../club/newsletter/NewsletterOverview.vue    |  6 ++--
 .../admin/club/protocol/ProtocolAgenda.vue    |  3 +-
 .../admin/club/protocol/ProtocolDecisions.vue |  3 +-
 .../admin/club/protocol/ProtocolOverview.vue  |  3 +-
 .../admin/club/protocol/ProtocolVoting.vue    |  3 +-
 8 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/components/QuillEditor.vue b/src/components/QuillEditor.vue
index 55c39b2..8264879 100644
--- a/src/components/QuillEditor.vue
+++ b/src/components/QuillEditor.vue
@@ -4,7 +4,7 @@
 
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
-import Quill, { Delta } from "quill";
+import Quill, { Delta, type QuillOptions } from "quill";
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
 
@@ -14,21 +14,24 @@ type RangeStatic = { index: number; length: number };
 <script lang="ts">
 export default defineComponent({
   props: {
+    options: {
+      type: Object as PropType<QuillOptions>,
+      default: {},
+    },
     toolbar: {
       type: [String, Array, Object],
       default: "",
     },
-    modules: {
-      type: Object as PropType<Record<string, unknown>>,
-      default: {},
-    },
     content: {
-      type: [String, Object] as PropType<string | Delta>,
+      type: [String, Object] as PropType<string | Delta | null>,
       default: "",
     },
     contentType: {
       type: String as PropType<"delta" | "html" | "text">,
       default: "text",
+      validator: (value: string) => {
+        return ["delta", "html", "text"].includes(value);
+      },
     },
     readonly: { type: Boolean, default: false },
     placeholder: String,
@@ -51,6 +54,16 @@ export default defineComponent({
       instance: undefined as undefined | Quill,
     };
   },
+  computed: {
+    value: {
+      get(): string | Delta {
+        return this.content ?? "";
+      },
+      set(val: string | Delta) {
+        this.$emit("update:content", val);
+      },
+    },
+  },
   mounted() {
     this.instance = new Quill(this.$refs.quill as HTMLElement, {
       theme: "snow",
@@ -59,6 +72,7 @@ export default defineComponent({
       },
       placeholder: this.placeholder,
       readOnly: this.readonly,
+      ...this.options,
     });
 
     this.instance.on("selection-change", (range, oldRange, source) => {
@@ -70,12 +84,12 @@ export default defineComponent({
       this.$emit("selectionChange", { range, oldRange, source });
     });
     this.instance.on("text-change", (delta, oldDelta, source) => {
-      this.$emit("update:content", this.getContent());
+      this.value = this.getContent();
       this.$emit("textChange", { delta, oldDelta, source });
     });
 
     this.$emit("ready", this.instance as Quill);
-    this.setContent(this.content);
+    this.setContent(this.value);
   },
   beforeUnmount() {
     this.instance = undefined;
@@ -91,6 +105,7 @@ export default defineComponent({
       }
     },
     setContent(content: Delta | string) {
+      if (content == "") return;
       if (this.contentType === "delta") {
         if (typeof content !== "string") {
           this.instance?.setContents(content);
@@ -98,6 +113,9 @@ export default defineComponent({
       } else if (this.contentType === "html") {
         if (typeof content === "string" && this.instance) {
           this.instance.root.innerHTML = content;
+          // this.instance.clipboard.dangerouslyPasteHTML(content);
+          // let delta = this.instance.clipboard.convert({ html: content });
+          // this.instance?.setContents(delta);
         }
       } else {
         if (typeof content === "string") {
diff --git a/src/views/admin/club/newsletter/NewsletterData.vue b/src/views/admin/club/newsletter/NewsletterData.vue
index f9195b6..15a5eea 100644
--- a/src/views/admin/club/newsletter/NewsletterData.vue
+++ b/src/views/admin/club/newsletter/NewsletterData.vue
@@ -52,8 +52,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
 import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
-import { QuillEditor } from "@vueup/vue-quill";
-import "@vueup/vue-quill/dist/vue-quill.snow.css";
+import QuillEditor from "@/components/QuillEditor.vue";
 import { toolbarOptions } from "@/helpers/quillConfig";
 import { useAbilityStore } from "@/stores/ability";
 </script>
diff --git a/src/views/admin/club/newsletter/NewsletterDates.vue b/src/views/admin/club/newsletter/NewsletterDates.vue
index 66a9baf..b47c903 100644
--- a/src/views/admin/club/newsletter/NewsletterDates.vue
+++ b/src/views/admin/club/newsletter/NewsletterDates.vue
@@ -107,8 +107,7 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { QuillEditor } from "@vueup/vue-quill";
-import "@vueup/vue-quill/dist/vue-quill.snow.css";
+import QuillEditor from "@/components/QuillEditor.vue";
 import { toolbarOptions } from "@/helpers/quillConfig";
 import { useNewsletterDatesStore } from "@/stores/admin/club/newsletter/newsletterDates";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/newsletter/NewsletterOverview.vue b/src/views/admin/club/newsletter/NewsletterOverview.vue
index 5283ac0..1f4e1f9 100644
--- a/src/views/admin/club/newsletter/NewsletterOverview.vue
+++ b/src/views/admin/club/newsletter/NewsletterOverview.vue
@@ -18,13 +18,12 @@
         <label for="summary">Zusammenfassung</label>
         <QuillEditor
           id="summary"
-          theme="snow"
           placeholder="Zusammenfassung zum Newsletter..."
           style="height: 250px; max-height: 250px; min-height: 250px"
           contentType="html"
           :toolbar="toolbarOptions"
           v-model:content="activeNewsletterObj.description"
-          :enable="can('create', 'club', 'newsletter')"
+          :readonly="!can('create', 'club', 'newsletter')"
           :style="!can('create', 'club', 'newsletter') ? 'opacity: 75%; background: rgb(243 244 246)' : ''"
         />
       </div>
@@ -42,8 +41,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
 import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
-import { QuillEditor } from "@vueup/vue-quill";
-import "@vueup/vue-quill/dist/vue-quill.snow.css";
+import QuillEditor from "@/components/QuillEditor.vue";
 import { toolbarOptions } from "@/helpers/quillConfig";
 import { useAbilityStore } from "@/stores/ability";
 </script>
diff --git a/src/views/admin/club/protocol/ProtocolAgenda.vue b/src/views/admin/club/protocol/ProtocolAgenda.vue
index 8e17344..300facc 100644
--- a/src/views/admin/club/protocol/ProtocolAgenda.vue
+++ b/src/views/admin/club/protocol/ProtocolAgenda.vue
@@ -78,8 +78,7 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { QuillEditor } from "@vueup/vue-quill";
-import "@vueup/vue-quill/dist/vue-quill.snow.css";
+import QuillEditor from "@/components/QuillEditor.vue";
 import { toolbarOptions } from "@/helpers/quillConfig";
 import { useProtocolAgendaStore } from "@/stores/admin/club/protocol/protocolAgenda";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/protocol/ProtocolDecisions.vue b/src/views/admin/club/protocol/ProtocolDecisions.vue
index e63570e..2d3dd3a 100644
--- a/src/views/admin/club/protocol/ProtocolDecisions.vue
+++ b/src/views/admin/club/protocol/ProtocolDecisions.vue
@@ -78,8 +78,7 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { QuillEditor } from "@vueup/vue-quill";
-import "@vueup/vue-quill/dist/vue-quill.snow.css";
+import QuillEditor from "@/components/QuillEditor.vue";
 import { toolbarOptions } from "@/helpers/quillConfig";
 import { useProtocolDecisionStore } from "@/stores/admin/club/protocol/protocolDecision";
 import { useAbilityStore } from "@/stores/ability";
diff --git a/src/views/admin/club/protocol/ProtocolOverview.vue b/src/views/admin/club/protocol/ProtocolOverview.vue
index d5f984a..7c696f7 100644
--- a/src/views/admin/club/protocol/ProtocolOverview.vue
+++ b/src/views/admin/club/protocol/ProtocolOverview.vue
@@ -64,8 +64,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
 import { useProtocolStore } from "@/stores/admin/club/protocol/protocol";
-import { QuillEditor } from "@vueup/vue-quill";
-import "@vueup/vue-quill/dist/vue-quill.snow.css";
+import QuillEditor from "@/components/QuillEditor.vue";
 import { toolbarOptions } from "@/helpers/quillConfig";
 import { useAbilityStore } from "@/stores/ability";
 </script>
diff --git a/src/views/admin/club/protocol/ProtocolVoting.vue b/src/views/admin/club/protocol/ProtocolVoting.vue
index 6d26871..0692486 100644
--- a/src/views/admin/club/protocol/ProtocolVoting.vue
+++ b/src/views/admin/club/protocol/ProtocolVoting.vue
@@ -95,8 +95,7 @@
 import { defineComponent } from "vue";
 import { mapActions, mapState, mapWritableState } from "pinia";
 import Spinner from "@/components/Spinner.vue";
-import { QuillEditor } from "@vueup/vue-quill";
-import "@vueup/vue-quill/dist/vue-quill.snow.css";
+import QuillEditor from "@/components/QuillEditor.vue";
 import { toolbarOptions } from "@/helpers/quillConfig";
 import { useProtocolVotingStore } from "@/stores/admin/club/protocol/protocolVoting";
 import { useAbilityStore } from "@/stores/ability";

From e6dfde058d2e239ca05666ac93a68e27bd63ff41 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 18 Jul 2025 15:18:09 +0200
Subject: [PATCH 04/21] rewirte in composition api to prevent this ref errors

---
 src/components/QuillEditor.vue | 217 ++++++++++++++++-----------------
 1 file changed, 108 insertions(+), 109 deletions(-)

diff --git a/src/components/QuillEditor.vue b/src/components/QuillEditor.vue
index 8264879..6787edf 100644
--- a/src/components/QuillEditor.vue
+++ b/src/components/QuillEditor.vue
@@ -3,126 +3,125 @@
 </template>
 
 <script setup lang="ts">
-import { defineComponent, type PropType } from "vue";
+import { markRaw, onMounted, onUnmounted, ref, useTemplateRef, watch, type PropType } from "vue";
 import Quill, { Delta, type QuillOptions } from "quill";
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
+import isEqual from "lodash.isequal";
+import cloneDeep from "lodash.clonedeep";
 
 type RangeStatic = { index: number; length: number };
-</script>
 
-<script lang="ts">
-export default defineComponent({
-  props: {
-    options: {
-      type: Object as PropType<QuillOptions>,
-      default: {},
-    },
-    toolbar: {
-      type: [String, Array, Object],
-      default: "",
-    },
-    content: {
-      type: [String, Object] as PropType<string | Delta | null>,
-      default: "",
-    },
-    contentType: {
-      type: String as PropType<"delta" | "html" | "text">,
-      default: "text",
-      validator: (value: string) => {
-        return ["delta", "html", "text"].includes(value);
-      },
-    },
-    readonly: { type: Boolean, default: false },
-    placeholder: String,
-  },
-  emits: {
-    "update:content": (content: Delta | string) => true,
-    textChange: (tc: { delta: Delta; oldDelta: Delta; source: string }) => true,
-    selectionChange: (sc: { range: RangeStatic; oldRange: RangeStatic; source: string }) => true,
-    focus: () => true,
-    blur: () => true,
-    ready: (quill: Quill) => true,
-  },
-  watch: {
-    conent(val, oldVal) {
-      this.setContent(val);
-    },
-  },
-  data() {
-    return {
-      instance: undefined as undefined | Quill,
-    };
-  },
-  computed: {
-    value: {
-      get(): string | Delta {
-        return this.content ?? "";
-      },
-      set(val: string | Delta) {
-        this.$emit("update:content", val);
-      },
-    },
-  },
-  mounted() {
-    this.instance = new Quill(this.$refs.quill as HTMLElement, {
-      theme: "snow",
-      modules: {
-        toolbar: this.toolbar,
-      },
-      placeholder: this.placeholder,
-      readOnly: this.readonly,
-      ...this.options,
-    });
+const quillElement = useTemplateRef("quill");
 
-    this.instance.on("selection-change", (range, oldRange, source) => {
-      if (!range) {
-        this.$emit("blur");
-      } else {
-        this.$emit("focus");
-      }
-      this.$emit("selectionChange", { range, oldRange, source });
-    });
-    this.instance.on("text-change", (delta, oldDelta, source) => {
-      this.value = this.getContent();
-      this.$emit("textChange", { delta, oldDelta, source });
-    });
+const instance = ref<undefined | Quill>();
+const model = ref<string | Delta>("");
 
-    this.$emit("ready", this.instance as Quill);
-    this.setContent(this.value);
+const props = defineProps({
+  options: {
+    type: Object as PropType<QuillOptions>,
+    default: {},
   },
-  beforeUnmount() {
-    this.instance = undefined;
+  toolbar: {
+    type: [String, Array, Object],
+    default: "",
   },
-  methods: {
-    getContent(): string | Delta {
-      if (this.contentType === "delta") {
-        return (this.instance?.getContents() ?? {}) as Delta;
-      } else if (this.contentType === "html") {
-        return this.instance?.getSemanticHTML() ?? "";
-      } else {
-        return this.instance?.getText() ?? "";
-      }
-    },
-    setContent(content: Delta | string) {
-      if (content == "") return;
-      if (this.contentType === "delta") {
-        if (typeof content !== "string") {
-          this.instance?.setContents(content);
-        }
-      } else if (this.contentType === "html") {
-        if (typeof content === "string" && this.instance) {
-          this.instance.root.innerHTML = content;
-          // this.instance.clipboard.dangerouslyPasteHTML(content);
-          // let delta = this.instance.clipboard.convert({ html: content });
-          // this.instance?.setContents(delta);
-        }
-      } else {
-        if (typeof content === "string") {
-          this.instance?.setText(content);
-        }
-      }
+  content: {
+    type: [String, Object] as PropType<string | Delta | null>,
+    default: "",
+  },
+  contentType: {
+    type: String as PropType<"delta" | "html" | "text">,
+    default: "text",
+    validator: (value: string) => {
+      return ["delta", "html", "text"].includes(value);
     },
   },
+  readonly: { type: Boolean, default: false },
+  placeholder: String,
 });
+
+const emit = defineEmits({
+  "update:content": (content: Delta | string) => true,
+  textChange: (tc: { delta: Delta; oldDelta: Delta; source: string }) => true,
+  selectionChange: (sc: { range: RangeStatic; oldRange: RangeStatic; source: string }) => true,
+  focus: () => true,
+  blur: () => true,
+  ready: (quill: Quill) => true,
+});
+
+watch(
+  () => props.content,
+  (val, oldVal) => {
+    if (!instance.value || !val || isEqual(val, model.value)) return;
+    console.log("hi");
+    setContent(cloneDeep(val));
+  },
+  { deep: true }
+);
+watch(model, (val, oldVal) => {
+  emit("update:content", cloneDeep(val));
+});
+
+onMounted(() => {
+  if (!quillElement.value) return;
+  const quill = new Quill(quillElement.value, {
+    theme: "snow",
+    modules: {
+      toolbar: props.toolbar,
+    },
+    placeholder: props.placeholder,
+    readOnly: props.readonly,
+    ...props.options,
+  });
+
+  quill.on(Quill.events.SELECTION_CHANGE, (range, oldRange, source) => {
+    if (!range) {
+      emit("blur");
+    } else {
+      emit("focus");
+    }
+    console.log(range);
+    emit("selectionChange", { range, oldRange, source });
+  });
+  quill.on(Quill.events.TEXT_CHANGE, (delta, oldDelta, source) => {
+    model.value = getContent();
+    emit("textChange", { delta, oldDelta, source });
+  });
+
+  emit("ready", quill);
+  instance.value = markRaw(quill);
+  setContent(cloneDeep(props.content ?? ""));
+});
+onUnmounted(() => {
+  instance.value = undefined;
+});
+
+function getContent(): string | Delta {
+  if (props.contentType === "delta") {
+    return (instance.value?.getContents() ?? {}) as Delta;
+  } else if (props.contentType === "html") {
+    return instance.value?.getSemanticHTML() ?? "";
+  } else {
+    return instance.value?.getText() ?? "";
+  }
+}
+function setContent(content: Delta | string) {
+  if (content == "") return;
+  if (props.contentType === "delta") {
+    if (typeof content !== "string") {
+      instance.value?.setContents(content);
+    }
+  } else if (props.contentType === "html") {
+    if (typeof content === "string" && instance.value) {
+      instance.value.clipboard.dangerouslyPasteHTML(content);
+      let delta = instance.value.clipboard.convert({ html: content });
+      instance.value?.setContents(delta);
+    }
+  } else {
+    if (typeof content === "string") {
+      instance.value?.setText(content);
+    }
+  }
+}
 </script>

From 4265ed679197a64c3f89379549d35f5d2bc49e5d Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 18 Jul 2025 15:52:54 +0200
Subject: [PATCH 05/21] enhance unmount and format

---
 src/components/QuillEditor.vue | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/components/QuillEditor.vue b/src/components/QuillEditor.vue
index 6787edf..ae00810 100644
--- a/src/components/QuillEditor.vue
+++ b/src/components/QuillEditor.vue
@@ -1,5 +1,7 @@
 <template>
-  <div ref="quill"></div>
+  <div :id="id" :style="style" class="flex flex-col">
+    <div ref="quill"></div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -18,6 +20,8 @@ const instance = ref<undefined | Quill>();
 const model = ref<string | Delta>("");
 
 const props = defineProps({
+  id: String,
+  style: [String, Object],
   options: {
     type: Object as PropType<QuillOptions>,
     default: {},
@@ -54,11 +58,16 @@ watch(
   () => props.content,
   (val, oldVal) => {
     if (!instance.value || !val || isEqual(val, model.value)) return;
-    console.log("hi");
     setContent(cloneDeep(val));
   },
   { deep: true }
 );
+watch(
+  () => props.readonly,
+  (val, oldVal) => {
+    instance.value?.enable(val);
+  }
+);
 watch(model, (val, oldVal) => {
   emit("update:content", cloneDeep(val));
 });
@@ -81,7 +90,6 @@ onMounted(() => {
     } else {
       emit("focus");
     }
-    console.log(range);
     emit("selectionChange", { range, oldRange, source });
   });
   quill.on(Quill.events.TEXT_CHANGE, (delta, oldDelta, source) => {
@@ -94,7 +102,11 @@ onMounted(() => {
   setContent(cloneDeep(props.content ?? ""));
 });
 onUnmounted(() => {
-  instance.value = undefined;
+  if (instance.value) {
+    instance.value.off(Quill.events.SELECTION_CHANGE);
+    instance.value.off(Quill.events.TEXT_CHANGE);
+    instance.value = undefined;
+  }
 });
 
 function getContent(): string | Delta {
@@ -125,3 +137,15 @@ function setContent(content: Delta | string) {
   }
 }
 </script>
+
+<style>
+.ql-container {
+  border-bottom-left-radius: 0.5em;
+  border-bottom-right-radius: 0.5em;
+}
+.ql-toolbar {
+  background: var(--color-gray-100);
+  border-top-left-radius: 0.5em;
+  border-top-right-radius: 0.5em;
+}
+</style>

From 53fd89dd9ebca766f2467f76951b58a6ffc3ec8b Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 18 Jul 2025 16:16:07 +0200
Subject: [PATCH 06/21] fix: return text with normal whitespace

---
 src/components/QuillEditor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/QuillEditor.vue b/src/components/QuillEditor.vue
index ae00810..1cd192d 100644
--- a/src/components/QuillEditor.vue
+++ b/src/components/QuillEditor.vue
@@ -113,9 +113,9 @@ function getContent(): string | Delta {
   if (props.contentType === "delta") {
     return (instance.value?.getContents() ?? {}) as Delta;
   } else if (props.contentType === "html") {
-    return instance.value?.getSemanticHTML() ?? "";
+    return instance.value?.getSemanticHTML().replace(/&nbsp;/g, " ") ?? "";
   } else {
-    return instance.value?.getText() ?? "";
+    return instance.value?.getText().replace(/&nbsp;/g, " ") ?? "";
   }
 }
 function setContent(content: Delta | string) {

From ada4da7aa890f9d8f3f7e5fd7f16f83b6883f1cb Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Fri, 18 Jul 2025 16:17:00 +0200
Subject: [PATCH 07/21] 1.7.2

---
 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 0eb9855..c80c45f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ff-admin",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin",
-      "version": "1.7.1",
+      "version": "1.7.2",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fullcalendar/core": "^6.1.18",
diff --git a/package.json b/package.json
index 836ec96..d9cac98 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ff-admin",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {

From 7252ae74ba7e7d8a99399437ac63c2b58f2aff91 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 19 Jul 2025 11:06:10 +0200
Subject: [PATCH 08/21] package update and CVE close

---
 package-lock.json | 292 ++++++++++------------------------------------
 package.json      |   9 +-
 2 files changed, 64 insertions(+), 237 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0eb9855..b53f993 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,10 +18,9 @@
         "@headlessui/vue": "^1.7.23",
         "@heroicons/vue": "^2.2.0",
         "@tailwindcss/vite": "^4.1.11",
-        "@vueup/vue-quill": "^1.2.0",
         "axios": "^1.10.0",
         "event-source-polyfill": "^1.0.31",
-        "grapesjs": "^0.22.9",
+        "grapesjs": "^0.22.11",
         "grapesjs-preset-newsletter": "^1.0.2",
         "highlight.js": "^11.11.1",
         "jwt-decode": "^4.0.0",
@@ -56,7 +55,7 @@
         "@types/lodash.differencewith": "^4.5.9",
         "@types/lodash.isequal": "^4.5.8",
         "@types/markdown-it": "^14.1.2",
-        "@types/node": "^24.0.13",
+        "@types/node": "^24.0.15",
         "@types/nprogress": "^0.2.3",
         "@types/qrcode": "^1.5.5",
         "@types/qs": "^6.14.0",
@@ -72,10 +71,10 @@
         "prettier": "^3.6.2",
         "tailwindcss": "^4.1.11",
         "typescript": "^5.8.3",
-        "vite": "^7.0.4",
+        "vite": "^7.0.5",
         "vite-plugin-pwa": "^1.0.1",
         "vite-plugin-vue-devtools": "^7.7.7",
-        "vue-tsc": "^3.0.1"
+        "vue-tsc": "^3.0.3"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -2268,9 +2267,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
-      "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2352,13 +2351,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
-      "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz",
+      "integrity": "sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.14.0",
+        "@eslint/core": "^0.15.1",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -2893,29 +2892,6 @@
         "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@isaacs/balanced-match": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
-      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@isaacs/balanced-match": "^4.0.1"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
     "node_modules/@isaacs/fs-minipass": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
@@ -3925,9 +3901,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.0.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.13.tgz",
-      "integrity": "sha512-Qm9OYVOFHFYg3wJoTSrz80hoec5Lia/dPp84do3X7dZvLikQvM1YpmvTBEdIr/e+U8HTkFjLHLnl78K/qjf+jQ==",
+      "version": "24.0.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.15.tgz",
+      "integrity": "sha512-oaeTSbCef7U/z7rDeJA138xpG3NuKc64/rZ2qmUFkFJmnMsAPaluIifqyWd8hSSMxyP9oie3dLAqYPblag9KgA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -4277,30 +4253,30 @@
       }
     },
     "node_modules/@volar/language-core": {
-      "version": "2.4.17",
-      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.17.tgz",
-      "integrity": "sha512-chmRZMbKmcGpKMoO7Reb70uiLrzo0KWC2CkFttKUuKvrE+VYgi+fL9vWMJ07Fv5ulX0V1TAyyacN9q3nc5/ecA==",
+      "version": "2.4.20",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.20.tgz",
+      "integrity": "sha512-dRDF1G33xaAIDqR6+mXUIjXYdu9vzSxlMGfMEwBxQsfY/JMUEXSpLTR057oTKlUQ2nIvCmP9k94A8h8z2VrNSA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/source-map": "2.4.17"
+        "@volar/source-map": "2.4.20"
       }
     },
     "node_modules/@volar/source-map": {
-      "version": "2.4.17",
-      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.17.tgz",
-      "integrity": "sha512-QDybtQyO3Ms/NjFqNHTC5tbDN2oK5VH7ZaKrcubtfHBDj63n2pizHC3wlMQ+iT55kQXZUUAbmBX5L1C8CHFeBw==",
+      "version": "2.4.20",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.20.tgz",
+      "integrity": "sha512-mVjmFQH8mC+nUaVwmbxoYUy8cww+abaO8dWzqPUjilsavjxH0jCJ3Mp8HFuHsdewZs2c+SP+EO7hCd8Z92whJg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@volar/typescript": {
-      "version": "2.4.17",
-      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.17.tgz",
-      "integrity": "sha512-3paEFNh4P5DkgNUB2YkTRrfUekN4brAXxd3Ow1syMqdIPtCZHbUy4AW99S5RO/7mzyTWPMdDSo3mqTpB/LPObQ==",
+      "version": "2.4.20",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.20.tgz",
+      "integrity": "sha512-Oc4DczPwQyXcVbd+5RsNEqX6ia0+w3p+klwdZQ6ZKhFjWoBP9PCPQYlKYRi/tDemWphW93P/Vv13vcE9I9D2GQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.17",
+        "@volar/language-core": "2.4.20",
         "path-browserify": "^1.0.1",
         "vscode-uri": "^3.0.8"
       }
@@ -4531,20 +4507,20 @@
       }
     },
     "node_modules/@vue/language-core": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.0.1.tgz",
-      "integrity": "sha512-sq+/Mc1IqIexWEQ+Q2XPiDb5SxSvY5JPqHnMOl/PlF5BekslzduX8dglSkpC17VeiAQB6dpS+4aiwNLJRduCNw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.0.3.tgz",
+      "integrity": "sha512-I9wY0ULMN9tMSua+2C7g+ez1cIziVMUzIHlDYGSl2rtru3Eh4sXj95vZ+4GBuXwwPnEmYfzSApVbXiVbI8V5Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.17",
+        "@volar/language-core": "2.4.20",
         "@vue/compiler-dom": "^3.5.0",
         "@vue/compiler-vue2": "^2.7.16",
         "@vue/shared": "^3.5.0",
         "alien-signals": "^2.0.5",
-        "minimatch": "^10.0.1",
         "muggle-string": "^0.4.1",
-        "path-browserify": "^1.0.1"
+        "path-browserify": "^1.0.1",
+        "picomatch": "^4.0.2"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -4555,20 +4531,17 @@
         }
       }
     },
-    "node_modules/@vue/language-core/node_modules/minimatch": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
-      "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
+    "node_modules/@vue/language-core/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@isaacs/brace-expansion": "^5.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "20 || >=22"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/@vue/reactivity": {
@@ -4640,65 +4613,6 @@
         }
       }
     },
-    "node_modules/@vueup/vue-quill": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vueup/vue-quill/-/vue-quill-1.2.0.tgz",
-      "integrity": "sha512-kd5QPSHMDpycklojPXno2Kw2JSiKMYduKYQckTm1RJoVDA557MnyUXgcuuDpry4HY/Rny9nGNcK+m3AHk94wag==",
-      "license": "MIT",
-      "dependencies": {
-        "quill": "^1.3.7",
-        "quill-delta": "^4.2.2"
-      },
-      "peerDependencies": {
-        "vue": "^3.2.41"
-      }
-    },
-    "node_modules/@vueup/vue-quill/node_modules/eventemitter3": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
-      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==",
-      "license": "MIT"
-    },
-    "node_modules/@vueup/vue-quill/node_modules/fast-diff": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
-      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/@vueup/vue-quill/node_modules/parchment": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
-      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@vueup/vue-quill/node_modules/quill": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
-      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "clone": "^2.1.1",
-        "deep-equal": "^1.0.1",
-        "eventemitter3": "^2.0.3",
-        "extend": "^3.0.2",
-        "parchment": "^1.1.4",
-        "quill-delta": "^3.6.2"
-      }
-    },
-    "node_modules/@vueup/vue-quill/node_modules/quill/node_modules/quill-delta": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
-      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
-      "license": "MIT",
-      "dependencies": {
-        "deep-equal": "^1.0.1",
-        "extend": "^3.0.2",
-        "fast-diff": "1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -5062,6 +4976,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
       "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.0",
@@ -5182,15 +5097,6 @@
         "wrap-ansi": "^6.2.0"
       }
     },
-    "node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/codemirror": {
       "version": "5.63.0",
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.0.tgz",
@@ -5496,26 +5402,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/deep-equal": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
-      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
-      "license": "MIT",
-      "dependencies": {
-        "is-arguments": "^1.1.1",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.5.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -5567,6 +5453,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
@@ -5597,6 +5484,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
       "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
@@ -6113,19 +6001,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
-      "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/eslint/node_modules/brace-expansion": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
@@ -6298,12 +6173,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "license": "MIT"
-    },
     "node_modules/extend-shallow": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -6645,6 +6514,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6856,9 +6726,9 @@
       "license": "ISC"
     },
     "node_modules/grapesjs": {
-      "version": "0.22.9",
-      "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.22.9.tgz",
-      "integrity": "sha512-ni9b/M1ydkq3ifkOVRWf1iL8JcGmwpQqX3zdrTvOg1KCxYX0dLX5bg5EpQmS/bewHW2r+8c47SdoNCbUiVOZKg==",
+      "version": "0.22.11",
+      "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.22.11.tgz",
+      "integrity": "sha512-zGG13MEPDwbnijjJ56GZ9mCWIPbcZ53OXyC6fIDiipJC3/ZnsRSDMIivzltoVOn61cv64tcHuyrcltCuVeMi+A==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@types/backbone": "1.4.15",
@@ -6948,6 +6818,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
@@ -7137,22 +7008,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
-      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-array-buffer": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
@@ -7282,6 +7137,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
       "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -7479,6 +7335,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
       "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -8609,26 +8466,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-is": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
-      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -9177,23 +9019,6 @@
         "npm": ">=8.2.3"
       }
     },
-    "node_modules/quill-delta": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-4.2.2.tgz",
-      "integrity": "sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-diff": "1.2.0",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.isequal": "^4.5.0"
-      }
-    },
-    "node_modules/quill-delta/node_modules/fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "license": "Apache-2.0"
-    },
     "node_modules/quill/node_modules/quill-delta": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-5.1.0.tgz",
@@ -9279,6 +9104,7 @@
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
       "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -9617,6 +9443,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
@@ -9634,6 +9461,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
       "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
@@ -10852,9 +10680,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.4.tgz",
-      "integrity": "sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.5.tgz",
+      "integrity": "sha512-1mncVwJxy2C9ThLwz0+2GKZyEXuC3MyWtAAlNftlZZXZDP3AJt5FmwcMit/IGGaNZ8ZOB2BNO/HFUB+CpN0NQw==",
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
@@ -11157,14 +10985,14 @@
       "license": "MIT"
     },
     "node_modules/vue-tsc": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.0.1.tgz",
-      "integrity": "sha512-UvMLQD0hAGL1g/NfEQelnSVB4H5gtf/gz2lJKjMMwWNOUmSNyWkejwJagAxEbSjtV5CPPJYslOtoSuqJ63mhdg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.0.3.tgz",
+      "integrity": "sha512-uU1OMSzWE8/y0+kDTc0iEIu9v82bmFkGyJpAO/x3wQqBkkHkButKgtygREyOkxL4E/xtcf/ExvgNhhjdzonldw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/typescript": "2.4.17",
-        "@vue/language-core": "3.0.1"
+        "@volar/typescript": "2.4.20",
+        "@vue/language-core": "3.0.3"
       },
       "bin": {
         "vue-tsc": "bin/vue-tsc.js"
diff --git a/package.json b/package.json
index 836ec96..e58b5ba 100644
--- a/package.json
+++ b/package.json
@@ -33,10 +33,9 @@
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.2.0",
     "@tailwindcss/vite": "^4.1.11",
-    "@vueup/vue-quill": "^1.2.0",
     "axios": "^1.10.0",
     "event-source-polyfill": "^1.0.31",
-    "grapesjs": "^0.22.9",
+    "grapesjs": "^0.22.11",
     "grapesjs-preset-newsletter": "^1.0.2",
     "highlight.js": "^11.11.1",
     "jwt-decode": "^4.0.0",
@@ -71,7 +70,7 @@
     "@types/lodash.differencewith": "^4.5.9",
     "@types/lodash.isequal": "^4.5.8",
     "@types/markdown-it": "^14.1.2",
-    "@types/node": "^24.0.13",
+    "@types/node": "^24.0.15",
     "@types/nprogress": "^0.2.3",
     "@types/qrcode": "^1.5.5",
     "@types/qs": "^6.14.0",
@@ -87,9 +86,9 @@
     "prettier": "^3.6.2",
     "tailwindcss": "^4.1.11",
     "typescript": "^5.8.3",
-    "vite": "^7.0.4",
+    "vite": "^7.0.5",
     "vite-plugin-pwa": "^1.0.1",
     "vite-plugin-vue-devtools": "^7.7.7",
-    "vue-tsc": "^3.0.1"
+    "vue-tsc": "^3.0.3"
   }
 }

From f94a1e5d2f6835b0c39b11c7b6af471bd7bb4690 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sat, 19 Jul 2025 11:09:17 +0200
Subject: [PATCH 09/21] 1.7.3

---
 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 1aedae5..296066f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ff-admin",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin",
-      "version": "1.7.2",
+      "version": "1.7.3",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fullcalendar/core": "^6.1.18",
diff --git a/package.json b/package.json
index 4a81073..528cb41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ff-admin",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {

From e755a4ec37391cbd358a3194e1438aa22adb78b8 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 22 Jul 2025 07:50:26 +0200
Subject: [PATCH 10/21] enhance: allow longpress and contextmenu copy paste

---
 package-lock.json                       | 45 ++++++++++++++++++
 package.json                            |  3 +-
 src/App.vue                             | 34 +++++++++++---
 src/components/ContextMenu.vue          |  3 +-
 src/components/CopyPasteContextMenu.vue | 61 +++++++++++++++++++++++++
 src/components/Modal.vue                | 11 ++---
 src/stores/context-menu.ts              |  5 +-
 7 files changed, 144 insertions(+), 18 deletions(-)
 create mode 100644 src/components/CopyPasteContextMenu.vue

diff --git a/package-lock.json b/package-lock.json
index 1aedae5..3671099 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,7 @@
         "@headlessui/vue": "^1.7.23",
         "@heroicons/vue": "^2.2.0",
         "@tailwindcss/vite": "^4.1.11",
+        "@vueuse/core": "^13.5.0",
         "axios": "^1.10.0",
         "event-source-polyfill": "^1.0.31",
         "grapesjs": "^0.22.11",
@@ -3967,6 +3968,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+      "license": "MIT"
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.36.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
@@ -4613,6 +4620,44 @@
         }
       }
     },
+    "node_modules/@vueuse/core": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-13.5.0.tgz",
+      "integrity": "sha512-wV7z0eUpifKmvmN78UBZX8T7lMW53Nrk6JP5+6hbzrB9+cJ3jr//hUlhl9TZO/03bUkMK6gGkQpqOPWoabr72g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.21",
+        "@vueuse/metadata": "13.5.0",
+        "@vueuse/shared": "13.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "vue": "^3.5.0"
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-13.5.0.tgz",
+      "integrity": "sha512-euhItU3b0SqXxSy8u1XHxUCdQ8M++bsRs+TYhOLDU/OykS7KvJnyIFfep0XM5WjIFry9uAPlVSjmVHiqeshmkw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-13.5.0.tgz",
+      "integrity": "sha512-K7GrQIxJ/ANtucxIXbQlUHdB0TPA8c+q5i+zbrjxuhJCnJ9GtBg75sBSnvmLSxHKPg2Yo8w62PWksl9kwH0Q8g==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "vue": "^3.5.0"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
diff --git a/package.json b/package.json
index 4a81073..6d47398 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --host",
     "build": "run-p type-check \"build-only {@}\" --",
     "preview": "vite preview",
     "build-only": "vite build",
@@ -33,6 +33,7 @@
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.2.0",
     "@tailwindcss/vite": "^4.1.11",
+    "@vueuse/core": "^13.5.0",
     "axios": "^1.10.0",
     "event-source-polyfill": "^1.0.31",
     "grapesjs": "^0.22.11",
diff --git a/src/App.vue b/src/App.vue
index 8ee85e5..07f15ca 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,11 +2,11 @@
   <Modal />
   <ContextMenu />
 
-  <Header @contextmenu.prevent />
-  <div class="grow overflow-x-hidden overflow-y-auto p-2 md:p-4" @contextmenu.prevent>
+  <AppHeader />
+  <div class="grow overflow-x-hidden overflow-y-auto p-2 md:p-4">
     <RouterView />
   </div>
-  <Footer @contextmenu.prevent />
+  <AppFooter />
   <Notification />
 
   <Teleport to="head">
@@ -18,10 +18,11 @@
 </template>
 
 <script setup lang="ts">
-import { defineComponent } from "vue";
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { onLongPress } from "@vueuse/core";
 import { RouterView } from "vue-router";
-import Header from "./components/Header.vue";
-import Footer from "./components/Footer.vue";
+import AppHeader from "./components/Header.vue";
+import AppFooter from "./components/Footer.vue";
 import { mapActions, mapState } from "pinia";
 import { useAuthStore } from "./stores/auth";
 import { isAuthenticatedPromise } from "./router/authGuard";
@@ -31,6 +32,7 @@ import Notification from "./components/Notification.vue";
 import { config } from "./config";
 import { useConfigurationStore } from "@/stores/configuration";
 import { resetAllPiniaStores } from "@/helpers/piniaReset";
+import { useContextMenuStore } from "./stores/context-menu";
 </script>
 
 <script lang="ts">
@@ -40,6 +42,11 @@ export default defineComponent({
     ...mapState(useConfigurationStore, ["clubName"]),
   },
   mounted() {
+    document.body.addEventListener("contextmenu", (event) => {
+      this.handleContextMenu(event);
+    });
+    onLongPress(document.body, this.handleContextMenu);
+
     resetAllPiniaStores();
     this.configure();
 
@@ -52,6 +59,21 @@ export default defineComponent({
   },
   methods: {
     ...mapActions(useConfigurationStore, ["configure"]),
+    ...mapActions(useContextMenuStore, ["openContextMenu"]),
+    handleContextMenu(e: MouseEvent) {
+      e.preventDefault();
+
+      // TODO allow contextmenu on elements with special attribute with reduced selection
+      const target = e.target as HTMLElement | null;
+      if (!target) return;
+
+      if (["INPUT", "TEXTAREA", "P", "H1", "H2", "H3", "H4"].includes((target as HTMLElement).nodeName)) {
+        this.openContextMenu(e, {
+          component_ref: markRaw(defineAsyncComponent(() => import("@/components/CopyPasteContextMenu.vue"))),
+          data: ["INPUT", "TEXTAREA"].includes((e.target as HTMLElement).nodeName) ? "" : "nopaste",
+        });
+      }
+    },
   },
 });
 </script>
diff --git a/src/components/ContextMenu.vue b/src/components/ContextMenu.vue
index aa44235..c4d0dc3 100644
--- a/src/components/ContextMenu.vue
+++ b/src/components/ContextMenu.vue
@@ -1,10 +1,9 @@
 <template>
   <div
     ref="contextMenu"
-    class="absolute flex flex-col gap-1 border border-gray-400 bg-white rounded-md select-none text-left shadow-md z-50 p-1"
+    class="absolute flex flex-col gap-1 border border-gray-400 bg-white rounded-md select-none text-left shadow-md z-[100] p-1"
     v-show="show"
     :style="contextMenuStyle"
-    @contextmenu.prevent
     @click="closeContextMenu"
   >
     <component :is="component_ref" :data="data" />
diff --git a/src/components/CopyPasteContextMenu.vue b/src/components/CopyPasteContextMenu.vue
new file mode 100644
index 0000000..80dd642
--- /dev/null
+++ b/src/components/CopyPasteContextMenu.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="flex flex-row gap-2 cursor-pointer hover:bg-gray-300 p-1 rounded-md" @click="copy">
+    <DocumentDuplicateIcon class="w-5 h-5" />
+    <p>kopieren</p>
+  </div>
+  <div
+    v-if="data != 'nopaste'"
+    class="flex flex-row gap-2 cursor-pointer hover:bg-gray-300 p-1 rounded-md"
+    @click="paste"
+  >
+    <ClipboardDocumentIcon class="w-5 h-5" />
+    <p>einfügen</p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { ClipboardDocumentIcon, DocumentDuplicateIcon } from "@heroicons/vue/24/outline";
+import { mapState } from "pinia";
+import { useContextMenuStore } from "@/stores/context-menu";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: ["data"],
+  data() {
+    return {
+      selectedText: "",
+    };
+  },
+  computed: {
+    ...mapState(useContextMenuStore, ["clickedOnEl"]),
+  },
+  mounted() {
+    this.selectedText =
+      document.getSelection()?.toString() || this.clickedOnEl.value || this.clickedOnEl.innerText || "";
+
+    let selection = document.getSelection()?.toString();
+    console.log(selection);
+    if (selection == "") {
+      console.log("jo");
+      const range = document.createRange();
+      range.selectNode(this.clickedOnEl);
+      console.log(range);
+      window.getSelection()?.removeAllRanges();
+      window.getSelection()?.addRange(range);
+    }
+  },
+  methods: {
+    copy() {
+      navigator.clipboard.writeText(this.selectedText);
+    },
+    paste() {
+      const el = this.clickedOnEl;
+      navigator.clipboard.readText().then((e) => {
+        el.value = e;
+      });
+    },
+  },
+});
+</script>
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index fac5fcf..1a9039e 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -3,21 +3,15 @@
     ref="contextMenu"
     class="absolute inset-0 w-full h-full flex justify-center items-center bg-black/50 select-none z-50 p-2"
     v-show="show"
-    @contextmenu.prevent
   >
-    <!-- @click="closeModal" -->
-    <component
-      :is="component_ref"
-      :data="data"
-      @click.stop
-      class="p-4 bg-white rounded-lg max-h-[95%] overflow-y-auto"
-    />
+    <component :is="component_ref" :data="data" class="p-4 bg-white rounded-lg max-h-[95%] overflow-y-auto" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { mapState, mapActions } from "pinia";
 import { useModalStore } from "@/stores/modal";
+import { useContextMenuStore } from "@/stores/context-menu";
 </script>
 
 <script lang="ts">
@@ -27,6 +21,7 @@ export default {
   },
   methods: {
     ...mapActions(useModalStore, ["closeModal"]),
+    ...mapActions(useContextMenuStore, ["closeContextMenu"]),
   },
 };
 </script>
diff --git a/src/stores/context-menu.ts b/src/stores/context-menu.ts
index 43d529b..e012fa7 100644
--- a/src/stores/context-menu.ts
+++ b/src/stores/context-menu.ts
@@ -8,6 +8,7 @@ export const useContextMenuStore = defineStore("context-menu", {
       show: false,
       component_ref: null as any,
       data: null as any,
+      clickedOnEl: null as any,
     };
   },
   getters: {
@@ -16,16 +17,18 @@ export const useContextMenuStore = defineStore("context-menu", {
     },
   },
   actions: {
-    openContextMenu(e: MouseEvent, content: { component_ref: any; data: any }) {
+    openContextMenu(e: MouseEvent, content: { component_ref: any; data?: any }) {
       this.component_ref = content.component_ref;
       this.data = content.data;
       this.contextX = e.pageX;
       this.contextY = e.pageY;
+      this.clickedOnEl = e.target;
       this.show = true;
     },
     closeContextMenu() {
       this.component_ref = null;
       this.data = null;
+      this.clickedOnEl = null;
       this.show = false;
     },
   },

From 63c9045d986b066574f7338a71afec38d9cf4aaf Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 22 Jul 2025 07:50:38 +0200
Subject: [PATCH 11/21] change: UI text and interaction

---
 src/components/TextCopy.vue | 2 +-
 src/views/reset/Start.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/TextCopy.vue b/src/components/TextCopy.vue
index 7fd8ce7..6c13613 100644
--- a/src/components/TextCopy.vue
+++ b/src/components/TextCopy.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex relative">
-    <input type="text" :value="copyText" />
+    <input type="text" readonly :value="copyText" />
     <ClipboardIcon
       class="w-5 h-5 p-2 box-content absolute right-1 top-1/2 -translate-y-1/2 bg-white cursor-pointer"
       @click="copyToClipboard"
diff --git a/src/views/reset/Start.vue b/src/views/reset/Start.vue
index a1de3c4..6e8f9fa 100644
--- a/src/views/reset/Start.vue
+++ b/src/views/reset/Start.vue
@@ -16,7 +16,7 @@
 
         <div class="flex flex-row gap-2">
           <button type="submit" primary :disabled="resetStatus == 'loading' || resetStatus == 'success'">
-            TOTP zurücksetzen
+            Zugangsdaten zurücksetzen
           </button>
           <Spinner v-if="resetStatus == 'loading'" class="my-auto" />
           <SuccessCheckmark v-else-if="resetStatus == 'success'" />

From 4d1ec2616d805ea331ae3fcb73615ca217024c70 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 22 Jul 2025 08:22:41 +0200
Subject: [PATCH 12/21] change: view style of new versions

---
 .../admin/management/version/VersionItem.vue  | 52 +++++++++++++++++++
 .../management/version/VersionDisplay.vue     | 35 +++----------
 2 files changed, 58 insertions(+), 29 deletions(-)
 create mode 100644 src/components/admin/management/version/VersionItem.vue

diff --git a/src/components/admin/management/version/VersionItem.vue b/src/components/admin/management/version/VersionItem.vue
new file mode 100644
index 0000000..552e2f4
--- /dev/null
+++ b/src/components/admin/management/version/VersionItem.vue
@@ -0,0 +1,52 @@
+<template>
+  <div class="flex flex-col gap-1">
+    <p>
+      <span class="font-semibold text-lg">{{ version.title }}</span> vom
+      {{
+        new Date(version.isoDate).toLocaleDateString("de", {
+          month: "2-digit",
+          day: "2-digit",
+          year: "numeric",
+        })
+      }}
+    </p>
+    <div class="versionDisplay flex flex-col" v-html="version['content:encoded']"></div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { Release } from "@/viewmodels/version.models";
+import { defineComponent, type PropType } from "vue";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    version: {
+      type: Object as PropType<Release>,
+      required: true,
+    },
+  },
+});
+</script>
+
+<style lang="css" scoped>
+@reference "@/main.css";
+
+.versionDisplay :deep() ul {
+  list-style: none;
+  padding-left: 10px;
+  padding-bottom: 5px;
+}
+
+.versionDisplay :deep() ul li::before {
+  content: "-";
+  margin-right: 10px;
+  color: black;
+  font-weight: 600;
+}
+
+.versionDisplay :deep() a {
+  @apply text-primary;
+}
+</style>
diff --git a/src/views/admin/management/version/VersionDisplay.vue b/src/views/admin/management/version/VersionDisplay.vue
index 34a02dc..55736fe 100644
--- a/src/views/admin/management/version/VersionDisplay.vue
+++ b/src/views/admin/management/version/VersionDisplay.vue
@@ -11,7 +11,7 @@
               </small>
             </h1>
             <p>
-              V{{ clientVersion }} ({{
+              {{ clientVersion }} ({{
                 new Date(clientVersionRelease).toLocaleDateString("de", {
                   month: "2-digit",
                   day: "2-digit",
@@ -23,19 +23,7 @@
             </p>
           </div>
           <div class="grow flex flex-col gap-4 overflow-y-scroll">
-            <div v-for="version in newerClientVersions">
-              <p>
-                <span class="font-semibold text-lg">V{{ version.title }}</span> vom
-                {{
-                  new Date(version.isoDate).toLocaleDateString("de", {
-                    month: "2-digit",
-                    day: "2-digit",
-                    year: "numeric",
-                  })
-                }}
-              </p>
-              <div class="flex flex-col" v-html="version['content:encoded']"></div>
-            </div>
+            <VersionItem v-for="version in newerClientVersions" :key="version.title" :version="version" />
             <div v-if="newerClientVersions.length == 0" class="flex items-center justify-center">
               <p>Der Client ist auf der neuesten Version.</p>
             </div>
@@ -50,7 +38,7 @@
               </small>
             </h1>
             <p>
-              V{{ serverVersion }} ({{
+              {{ serverVersion }} ({{
                 new Date(serverVersionRelease).toLocaleDateString("de", {
                   month: "2-digit",
                   day: "2-digit",
@@ -61,20 +49,8 @@
               }})
             </p>
           </div>
-          <div class="grow flex flex-col gap-2 overflow-y-scroll">
-            <div v-for="version in newerServerVersions">
-              <p>
-                <span class="font-semibold text-lg">V{{ version.title }}</span> vom
-                {{
-                  new Date(version.isoDate).toLocaleDateString("de", {
-                    month: "2-digit",
-                    day: "2-digit",
-                    year: "numeric",
-                  })
-                }}
-              </p>
-              <div class="flex flex-col" v-html="version['content:encoded']"></div>
-            </div>
+          <div class="grow flex flex-col gap-4 overflow-y-scroll">
+            <VersionItem v-for="version in newerServerVersions" :key="version.title" :version="version" />
             <div v-if="newerServerVersions.length == 0" class="flex items-center justify-center">
               <p>Der Server ist auf der neuesten Version.</p>
             </div>
@@ -90,6 +66,7 @@ import { defineComponent } from "vue";
 import MainTemplate from "@/templates/Main.vue";
 import clientPackage from "../../../../../package.json";
 import type { Releases } from "@/viewmodels/version.models";
+import VersionItem from "@/components/admin/management/version/VersionItem.vue";
 </script>
 
 <script lang="ts">

From e223e1fd9fa077c611014517059900eeb497c335 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 22 Jul 2025 08:23:10 +0200
Subject: [PATCH 13/21] package update and CVE close

---
 package-lock.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3671099..20252e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6454,14 +6454,15 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {

From ff9beda0690d5b9be94644eeb87037daaa47c967 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 22 Jul 2025 08:24:55 +0200
Subject: [PATCH 14/21] 1.7.4

---
 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 fbaff9d..633449d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ff-admin",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin",
-      "version": "1.7.3",
+      "version": "1.7.4",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fullcalendar/core": "^6.1.18",
diff --git a/package.json b/package.json
index e4c83fb..96a9a9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ff-admin",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {

From 167c26afe7d41ca774704c02cf0d6e3282a1dcbc Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Tue, 22 Jul 2025 08:59:53 +0200
Subject: [PATCH 15/21] adapt changed version tag format

---
 src/views/admin/management/version/VersionDisplay.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/admin/management/version/VersionDisplay.vue b/src/views/admin/management/version/VersionDisplay.vue
index 55736fe..c642096 100644
--- a/src/views/admin/management/version/VersionDisplay.vue
+++ b/src/views/admin/management/version/VersionDisplay.vue
@@ -11,7 +11,7 @@
               </small>
             </h1>
             <p>
-              {{ clientVersion }} ({{
+              v{{ clientVersion }} ({{
                 new Date(clientVersionRelease).toLocaleDateString("de", {
                   month: "2-digit",
                   day: "2-digit",
@@ -38,7 +38,7 @@
               </small>
             </h1>
             <p>
-              {{ serverVersion }} ({{
+              v{{ serverVersion }} ({{
                 new Date(serverVersionRelease).toLocaleDateString("de", {
                   month: "2-digit",
                   day: "2-digit",
@@ -90,11 +90,11 @@ export default defineComponent({
     },
     serverVersionRelease() {
       if (!this.serverRss) return "";
-      return this.serverRss.items.find((i) => i.title == this.serverVersion)?.isoDate ?? "";
+      return this.serverRss.items.find((i) => i.title == `v${this.serverVersion}`)?.isoDate ?? "";
     },
     clientVersionRelease() {
       if (!this.clientRss) return "";
-      return this.clientRss.items.find((i) => i.title == this.clientVersion)?.isoDate ?? "";
+      return this.clientRss.items.find((i) => i.title == `v${this.clientVersion}`)?.isoDate ?? "";
     },
   },
   mounted() {

From c4cc68fb7874addc60180a63dbbe58f74b25f927 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 24 Jul 2025 07:41:54 +0200
Subject: [PATCH 16/21] package update and CVE close

---
 package-lock.json | 160 +++++++++++++++++++++++-----------------------
 package.json      |   8 +--
 2 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fbaff9d..b805ae4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@heroicons/vue": "^2.2.0",
         "@tailwindcss/vite": "^4.1.11",
         "@vueuse/core": "^13.5.0",
-        "axios": "^1.10.0",
+        "axios": "^1.11.0",
         "event-source-polyfill": "^1.0.31",
         "grapesjs": "^0.22.11",
         "grapesjs-preset-newsletter": "^1.0.2",
@@ -42,7 +42,7 @@
         "socket.io-client": "^4.8.1",
         "unplugin-vue-markdown": "^29.1.0",
         "uuid": "^11.1.0",
-        "vue": "^3.5.17",
+        "vue": "^3.5.18",
         "vue-router": "^4.5.1"
       },
       "devDependencies": {
@@ -56,7 +56,7 @@
         "@types/lodash.differencewith": "^4.5.9",
         "@types/lodash.isequal": "^4.5.8",
         "@types/markdown-it": "^14.1.2",
-        "@types/node": "^24.0.15",
+        "@types/node": "^24.1.0",
         "@types/nprogress": "^0.2.3",
         "@types/qrcode": "^1.5.5",
         "@types/qs": "^6.14.0",
@@ -72,7 +72,7 @@
         "prettier": "^3.6.2",
         "tailwindcss": "^4.1.11",
         "typescript": "^5.8.3",
-        "vite": "^7.0.5",
+        "vite": "^7.0.6",
         "vite-plugin-pwa": "^1.0.1",
         "vite-plugin-vue-devtools": "^7.7.7",
         "vue-tsc": "^3.0.3"
@@ -491,12 +491,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.5.tgz",
-      "integrity": "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.3"
+        "@babel/types": "^7.28.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1760,9 +1760,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.6.tgz",
-      "integrity": "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==",
+      "version": "7.28.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.1.tgz",
+      "integrity": "sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -3902,9 +3902,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.0.15",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.15.tgz",
-      "integrity": "sha512-oaeTSbCef7U/z7rDeJA138xpG3NuKc64/rZ2qmUFkFJmnMsAPaluIifqyWd8hSSMxyP9oie3dLAqYPblag9KgA==",
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
+      "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -4342,39 +4342,39 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.17.tgz",
-      "integrity": "sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.18.tgz",
+      "integrity": "sha512-3slwjQrrV1TO8MoXgy3aynDQ7lslj5UqDxuHnrzHtpON5CBinhWjJETciPngpin/T3OuW3tXUf86tEurusnztw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.5",
-        "@vue/shared": "3.5.17",
+        "@babel/parser": "^7.28.0",
+        "@vue/shared": "3.5.18",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.17.tgz",
-      "integrity": "sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.18.tgz",
+      "integrity": "sha512-RMbU6NTU70++B1JyVJbNbeFkK+A+Q7y9XKE2EM4NLGm2WFR8x9MbAtWxPPLdm0wUkuZv9trpwfSlL6tjdIa1+A==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-core": "3.5.18",
+        "@vue/shared": "3.5.18"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.17.tgz",
-      "integrity": "sha512-rQQxbRJMgTqwRugtjw0cnyQv9cP4/4BxWfTdRBkqsTfLOHWykLzbOc3C4GGzAmdMDxhzU/1Ija5bTjMVrddqww==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.18.tgz",
+      "integrity": "sha512-5aBjvGqsWs+MoxswZPoTB9nSDb3dhd1x30xrrltKujlCxo48j8HGDNj3QPhF4VIS0VQDUrA1xUfp2hEa+FNyXA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.5",
-        "@vue/compiler-core": "3.5.17",
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/compiler-ssr": "3.5.17",
-        "@vue/shared": "3.5.17",
+        "@babel/parser": "^7.28.0",
+        "@vue/compiler-core": "3.5.18",
+        "@vue/compiler-dom": "3.5.18",
+        "@vue/compiler-ssr": "3.5.18",
+        "@vue/shared": "3.5.18",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.17",
         "postcss": "^8.5.6",
@@ -4382,13 +4382,13 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.17.tgz",
-      "integrity": "sha512-hkDbA0Q20ZzGgpj5uZjb9rBzQtIHLS78mMilwrlpWk2Ep37DYntUz0PonQ6kr113vfOEdM+zTBuJDaceNIW0tQ==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.18.tgz",
+      "integrity": "sha512-xM16Ak7rSWHkM3m22NlmcdIM+K4BMyFARAfV9hYFl+SFuRzrZ3uGMNW05kA5pmeMa0X9X963Kgou7ufdbpOP9g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-dom": "3.5.18",
+        "@vue/shared": "3.5.18"
       }
     },
     "node_modules/@vue/compiler-vue2": {
@@ -4552,53 +4552,53 @@
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.17.tgz",
-      "integrity": "sha512-l/rmw2STIscWi7SNJp708FK4Kofs97zc/5aEPQh4bOsReD/8ICuBcEmS7KGwDj5ODQLYWVN2lNibKJL1z5b+Lw==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.18.tgz",
+      "integrity": "sha512-x0vPO5Imw+3sChLM5Y+B6G1zPjwdOri9e8V21NnTnlEvkxatHEH5B5KEAJcjuzQ7BsjGrKtfzuQ5eQwXh8HXBg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.17"
+        "@vue/shared": "3.5.18"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.17.tgz",
-      "integrity": "sha512-QQLXa20dHg1R0ri4bjKeGFKEkJA7MMBxrKo2G+gJikmumRS7PTD4BOU9FKrDQWMKowz7frJJGqBffYMgQYS96Q==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.18.tgz",
+      "integrity": "sha512-DUpHa1HpeOQEt6+3nheUfqVXRog2kivkXHUhoqJiKR33SO4x+a5uNOMkV487WPerQkL0vUuRvq/7JhRgLW3S+w==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/reactivity": "3.5.18",
+        "@vue/shared": "3.5.18"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.17.tgz",
-      "integrity": "sha512-8El0M60TcwZ1QMz4/os2MdlQECgGoVHPuLnQBU3m9h3gdNRW9xRmI8iLS4t/22OQlOE6aJvNNlBiCzPHur4H9g==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.18.tgz",
+      "integrity": "sha512-YwDj71iV05j4RnzZnZtGaXwPoUWeRsqinblgVJwR8XTXYZ9D5PbahHQgsbmzUvCWNF6x7siQ89HgnX5eWkr3mw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.17",
-        "@vue/runtime-core": "3.5.17",
-        "@vue/shared": "3.5.17",
+        "@vue/reactivity": "3.5.18",
+        "@vue/runtime-core": "3.5.18",
+        "@vue/shared": "3.5.18",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.17.tgz",
-      "integrity": "sha512-BOHhm8HalujY6lmC3DbqF6uXN/K00uWiEeF22LfEsm9Q93XeJ/plHTepGwf6tqFcF7GA5oGSSAAUock3VvzaCA==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.18.tgz",
+      "integrity": "sha512-PvIHLUoWgSbDG7zLHqSqaCoZvHi6NNmfVFOqO+OnwvqMz/tqQr3FuGWS8ufluNddk7ZLBJYMrjcw1c6XzR12mA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-ssr": "3.5.18",
+        "@vue/shared": "3.5.18"
       },
       "peerDependencies": {
-        "vue": "3.5.17"
+        "vue": "3.5.18"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.18.tgz",
+      "integrity": "sha512-cZy8Dq+uuIXbxCZpuLd2GJdeSO/lIzIspC2WtkqIpje5QyFbvLaI5wZtdUjLHjGZrlVX6GilejatWwVYYRc8tA==",
       "license": "MIT"
     },
     "node_modules/@vue/tsconfig": {
@@ -4823,13 +4823,13 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.10.0.tgz",
-      "integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz",
+      "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
+        "form-data": "^4.0.4",
         "proxy-from-env": "^1.1.0"
       }
     },
@@ -10726,14 +10726,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.5.tgz",
-      "integrity": "sha512-1mncVwJxy2C9ThLwz0+2GKZyEXuC3MyWtAAlNftlZZXZDP3AJt5FmwcMit/IGGaNZ8ZOB2BNO/HFUB+CpN0NQw==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.6.tgz",
+      "integrity": "sha512-MHFiOENNBd+Bd9uvc8GEsIzdkn1JxMmEeYX35tI3fv0sJBUTfW5tQsoaOwuY4KhBI09A3dUJ/DXf2yxPVPUceg==",
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.4.6",
-        "picomatch": "^4.0.2",
+        "picomatch": "^4.0.3",
         "postcss": "^8.5.6",
         "rollup": "^4.40.0",
         "tinyglobby": "^0.2.14"
@@ -10933,9 +10933,9 @@
       }
     },
     "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==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -10952,16 +10952,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.17.tgz",
-      "integrity": "sha512-LbHV3xPN9BeljML+Xctq4lbz2lVHCR6DtbpTf5XIO6gugpXUN49j2QQPcMj086r9+AkJ0FfUT8xjulKKBkkr9g==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.18.tgz",
+      "integrity": "sha512-7W4Y4ZbMiQ3SEo+m9lnoNpV9xG7QVMLa+/0RFwwiAVkeYoyGXqWE85jabU4pllJNUzqfLShJ5YLptewhCWUgNA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/compiler-sfc": "3.5.17",
-        "@vue/runtime-dom": "3.5.17",
-        "@vue/server-renderer": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-dom": "3.5.18",
+        "@vue/compiler-sfc": "3.5.18",
+        "@vue/runtime-dom": "3.5.18",
+        "@vue/server-renderer": "3.5.18",
+        "@vue/shared": "3.5.18"
       },
       "peerDependencies": {
         "typescript": "*"
diff --git a/package.json b/package.json
index e4c83fb..ec76406 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@heroicons/vue": "^2.2.0",
     "@tailwindcss/vite": "^4.1.11",
     "@vueuse/core": "^13.5.0",
-    "axios": "^1.10.0",
+    "axios": "^1.11.0",
     "event-source-polyfill": "^1.0.31",
     "grapesjs": "^0.22.11",
     "grapesjs-preset-newsletter": "^1.0.2",
@@ -57,7 +57,7 @@
     "socket.io-client": "^4.8.1",
     "unplugin-vue-markdown": "^29.1.0",
     "uuid": "^11.1.0",
-    "vue": "^3.5.17",
+    "vue": "^3.5.18",
     "vue-router": "^4.5.1"
   },
   "devDependencies": {
@@ -71,7 +71,7 @@
     "@types/lodash.differencewith": "^4.5.9",
     "@types/lodash.isequal": "^4.5.8",
     "@types/markdown-it": "^14.1.2",
-    "@types/node": "^24.0.15",
+    "@types/node": "^24.1.0",
     "@types/nprogress": "^0.2.3",
     "@types/qrcode": "^1.5.5",
     "@types/qs": "^6.14.0",
@@ -87,7 +87,7 @@
     "prettier": "^3.6.2",
     "tailwindcss": "^4.1.11",
     "typescript": "^5.8.3",
-    "vite": "^7.0.5",
+    "vite": "^7.0.6",
     "vite-plugin-pwa": "^1.0.1",
     "vite-plugin-vue-devtools": "^7.7.7",
     "vue-tsc": "^3.0.3"

From d057512514b327f14184065068198521a9cdbb68 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 24 Jul 2025 07:53:31 +0200
Subject: [PATCH 17/21] fix: allow admin user creation on setup with pw or totp

---
 src/views/setup/Verify.vue | 91 ++++++++++++++++++++++++++++++++++----
 1 file changed, 83 insertions(+), 8 deletions(-)

diff --git a/src/views/setup/Verify.vue b/src/views/setup/Verify.vue
index 06a6bf0..3ff59ae 100644
--- a/src/views/setup/Verify.vue
+++ b/src/views/setup/Verify.vue
@@ -15,15 +15,61 @@
         <RouterLink to="/setup" class="text-primary">Zum Einrichtungsstart</RouterLink>
       </div>
       <form v-else class="flex flex-col gap-2" @submit.prevent="setup">
-        <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>
+        <p class="text-center">Dein Nutzername: {{ username }}</p>
+        <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"
+            :class="notMatching ? 'border-red-600!' : ''"
+          />
+          <input
+            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">
           <button type="submit" primary :disabled="setupStatus == 'loading' || setupStatus == 'success'">
@@ -51,6 +97,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">
@@ -61,11 +108,14 @@ export default defineComponent({
   },
   data() {
     return {
+      tab: "totp",
       verification: "loading" as "success" | "loading" | "failed",
       image: undefined as undefined | string,
       otp: undefined as undefined | string,
+      username: "" as string,
       setupStatus: undefined as undefined | "loading" | "success" | "failed",
       setupError: "" as string,
+      notMatching: false as boolean,
     };
   },
   mounted() {
@@ -79,6 +129,7 @@ export default defineComponent({
           this.verification = "success";
           this.image = result.data.dataUrl;
           this.otp = result.data.otp;
+          this.username = result.data.username;
         }, 1000);
       })
       .catch((err) => {
@@ -88,15 +139,21 @@ export default defineComponent({
       });
   },
   methods: {
-    setup(e: any) {
-      let formData = e.target.elements;
+    async setup(e: any) {
+      let secret = "";
+      if (this.tab == "totp") secret = this.totp(e);
+      else secret = await this.password(e);
+
+      if (secret == "") return;
+
       this.setupStatus = "loading";
       this.setupError = "";
       this.$http
         .post(`/setup/finish`, {
           token: this.token,
           mail: this.mail,
-          totp: formData.totp.value,
+          secret: secret,
+          routine: this.tab,
         })
         .then((result) => {
           this.setupStatus = "success";
@@ -111,6 +168,24 @@ export default defineComponent({
           this.setupError = err.response.data;
         });
     },
+
+    totp(e: any) {
+      let formData = e.target.elements;
+      return formData.totp.value;
+    },
+    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);
+    },
   },
 });
 </script>

From 89bc0f9373bad4bbdf0a7cf2b401b3ef91b68eb6 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 24 Jul 2025 08:11:02 +0200
Subject: [PATCH 18/21] change: UI

---
 src/stores/admin/club/member/membership.ts          | 3 ++-
 src/views/admin/club/protocol/ProtocolDecisions.vue | 4 ++--
 src/views/admin/club/protocol/ProtocolVoting.vue    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/stores/admin/club/member/membership.ts b/src/stores/admin/club/member/membership.ts
index 1d44b92..273eac5 100644
--- a/src/stores/admin/club/member/membership.ts
+++ b/src/stores/admin/club/member/membership.ts
@@ -49,7 +49,8 @@ export const useMembershipStore = defineStore("membership", {
       http
         .get(`/admin/member/${memberId}/memberships/totalstatistics`)
         .then((result) => {
-          this.totalMembershipStatistics = result.data;
+          if (result.status == 200) this.totalMembershipStatistics = result.data;
+          else this.totalMembershipStatistics = undefined;
         })
         .catch((err) => {});
     },
diff --git a/src/views/admin/club/protocol/ProtocolDecisions.vue b/src/views/admin/club/protocol/ProtocolDecisions.vue
index 2d3dd3a..c9469d6 100644
--- a/src/views/admin/club/protocol/ProtocolDecisions.vue
+++ b/src/views/admin/club/protocol/ProtocolDecisions.vue
@@ -24,7 +24,7 @@
             type="text"
             name="title"
             id="title"
-            placeholder="Entscheidung"
+            placeholder="Beschluss"
             autocomplete="off"
             v-model="item.topic"
             @keyup.prevent
@@ -57,7 +57,7 @@
         <QuillEditor
           id="top"
           theme="snow"
-          placeholder="Entscheidung Inhalt..."
+          placeholder="Beschluss Inhalt..."
           style="height: 250px; max-height: 250px; min-height: 250px"
           contentType="html"
           :toolbar="toolbarOptions"
diff --git a/src/views/admin/club/protocol/ProtocolVoting.vue b/src/views/admin/club/protocol/ProtocolVoting.vue
index 0692486..5e5b4bd 100644
--- a/src/views/admin/club/protocol/ProtocolVoting.vue
+++ b/src/views/admin/club/protocol/ProtocolVoting.vue
@@ -57,8 +57,8 @@
         <QuillEditor
           id="top"
           theme="snow"
-          placeholder="Entscheidung Inhalt..."
-          style="height: 100px; max-height: 100px; min-height: 100px"
+          placeholder="Abstimmung Inhalt..."
+          style="height: 150px; max-height: 150px; min-height: 150px"
           contentType="html"
           :toolbar="toolbarOptions"
           v-model:content="item.context"

From e10bfdd315d361379a2df36dc00fc0155508bccb Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 24 Jul 2025 08:49:18 +0200
Subject: [PATCH 19/21] fix: navigation with restricted permissions

---
 src/components/Footer.vue      | 4 ++--
 src/components/Header.vue      | 4 ++--
 src/router/adminGuard.ts       | 7 ++++++-
 src/stores/ability.ts          | 3 ++-
 src/stores/admin/navigation.ts | 5 +++++
 src/views/NoPermission.vue     | 2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index f1082c4..eda9403 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -6,7 +6,7 @@
     <div class="w-full flex flex-row gap-2 h-full align-middle">
       <TopLevelLink
         v-if="routeName == 'admin' || routeName.includes('admin-')"
-        v-for="item in topLevel"
+        v-for="item in topLevelObject"
         :key="item.key"
         :link="item"
         :disableSubLink="true"
@@ -34,7 +34,7 @@ import TopLevelLink from "./admin/TopLevelLink.vue";
 export default defineComponent({
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
-    ...mapState(useNavigationStore, ["topLevel"]),
+    ...mapState(useNavigationStore, ["topLevelObject"]),
     routeName() {
       return typeof this.$route.name == "string" ? this.$route.name : "";
     },
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 109c38a..72575c0 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -10,7 +10,7 @@
       <div v-if="authCheck" class="hidden md:flex flex-row gap-2 h-full align-middle">
         <TopLevelLink
           v-if="routeName == 'admin' || routeName.includes('admin-')"
-          v-for="item in topLevel"
+          v-for="item in topLevelObject"
           :key="item.key"
           :link="item"
         />
@@ -46,7 +46,7 @@ import { useConfigurationStore } from "@/stores/configuration";
 export default defineComponent({
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
-    ...mapState(useNavigationStore, ["topLevel"]),
+    ...mapState(useNavigationStore, ["topLevelObject"]),
     ...mapState(useConfigurationStore, ["clubName"]),
     routeName() {
       return typeof this.$route.name == "string" ? this.$route.name : "";
diff --git a/src/router/adminGuard.ts b/src/router/adminGuard.ts
index 8016b7d..26396d9 100644
--- a/src/router/adminGuard.ts
+++ b/src/router/adminGuard.ts
@@ -19,11 +19,16 @@ export async function abilityAndNavUpdate(to: any, from: any, next: any) {
     navigation.updateNavigation();
     NProgress.done();
     next();
-  } else if ((admin && ability.isAdmin()) || ability.can(type, section, module)) {
+  } else if (module && ((admin && ability.isAdmin()) || ability.can(type, section, module))) {
     NProgress.done();
     navigation.activeNavigation = to.name.split("-")[1];
     navigation.activeLink = to.name.split("-")[2];
     next();
+  } else if (!module && ((admin && ability.isAdmin()) || ability.canSection(type, section))) {
+    NProgress.done();
+    navigation.activeNavigation = to.name.split("-")[1];
+    navigation.activeLink = null;
+    next();
   } else {
     NProgress.done();
     next({ name: "admin-default" });
diff --git a/src/stores/ability.ts b/src/stores/ability.ts
index ed65b5f..26cfa52 100644
--- a/src/stores/ability.ts
+++ b/src/stores/ability.ts
@@ -33,7 +33,8 @@ export const useAbilityStore = defineStore("ability", {
         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]?.all == "*" ||
+          permissions[section]?.all?.includes(type) ||
           permissions[section] != undefined
         )
           return true;
diff --git a/src/stores/admin/navigation.ts b/src/stores/admin/navigation.ts
index 3b14619..566fccd 100644
--- a/src/stores/admin/navigation.ts
+++ b/src/stores/admin/navigation.ts
@@ -37,6 +37,11 @@ export const useNavigationStore = defineStore("navigation", {
     };
   },
   getters: {
+    topLevelObject: (state) =>
+      state.topLevel.map((tl) => ({
+        ...tl,
+        levelDefault: state.navigation[tl.key].main.filter((m) => !m.key.includes("divider"))[0]?.key ?? "",
+      })),
     activeNavigationObject: (state) => (state.navigation[state.activeNavigation] ?? {}) as navigationSplitModel,
     activeTopLevelObject: (state) =>
       (state.topLevel.find((elem) => elem.key == state.activeNavigation) ?? {}) as topLevelNavigationModel,
diff --git a/src/views/NoPermission.vue b/src/views/NoPermission.vue
index d953327..ddf2841 100644
--- a/src/views/NoPermission.vue
+++ b/src/views/NoPermission.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col items-center">
+  <div class="flex flex-col gap-2 items-center">
     <br />
     <h1 class="w-full p-4 text-center font-bold text-3xl">Kein Zugriff</h1>
     <br />

From 9d3348b6d5c23fed3c51220237969f7b69ffd9b0 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 24 Jul 2025 08:51:36 +0200
Subject: [PATCH 20/21] enhance: set username and routing on invite and setup

---
 src/views/invite/Verify.vue | 2 ++
 src/views/setup/Verify.vue  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/views/invite/Verify.vue b/src/views/invite/Verify.vue
index 0547f3f..84a0b3b 100644
--- a/src/views/invite/Verify.vue
+++ b/src/views/invite/Verify.vue
@@ -157,6 +157,8 @@ export default defineComponent({
           this.inviteStatus = "success";
           localStorage.setItem("accessToken", result.data.accessToken);
           localStorage.setItem("refreshToken", result.data.refreshToken);
+          localStorage.setItem("routine", this.tab);
+          localStorage.setItem("username", this.username);
           setTimeout(() => {
             this.$router.push(`/admin`);
           }, 1000);
diff --git a/src/views/setup/Verify.vue b/src/views/setup/Verify.vue
index 3ff59ae..57ab946 100644
--- a/src/views/setup/Verify.vue
+++ b/src/views/setup/Verify.vue
@@ -159,6 +159,8 @@ export default defineComponent({
           this.setupStatus = "success";
           localStorage.setItem("accessToken", result.data.accessToken);
           localStorage.setItem("refreshToken", result.data.refreshToken);
+          localStorage.setItem("routine", this.tab);
+          localStorage.setItem("username", this.username);
           setTimeout(() => {
             this.$router.push(`/admin`);
           }, 1000);

From a7149b271242f3a81d6db936b17ac4631929020d Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 24 Jul 2025 08:57:54 +0200
Subject: [PATCH 21/21] 1.7.5

---
 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 aa072a4..0e154ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ff-admin",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin",
-      "version": "1.7.4",
+      "version": "1.7.5",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fullcalendar/core": "^6.1.18",
diff --git a/package.json b/package.json
index 60cae48..4403864 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ff-admin",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "Feuerwehr/Verein Mitgliederverwaltung UI",
   "type": "module",
   "scripts": {