From 4c5d132de809926b4d629bdfd0c12651d8af072b Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 29 Jan 2025 08:53:42 +0100
Subject: [PATCH 1/5] change user to uuid

---
 src/components/Pagination.vue                 | 21 +++---
 src/components/admin/MemberSearchSelect.vue   |  6 +-
 src/components/admin/Permission.vue           |  4 +-
 src/stores/admin/club/member/member.ts        |  8 +--
 .../club/newsletter/newsletterRecipients.ts   |  4 +-
 .../admin/club/protocol/protocolPresence.ts   |  4 +-
 src/stores/admin/user/user.ts                 | 66 ++++++++-----------
 .../admin/club/member/member.models.ts        |  6 +-
 .../newsletter/newsletterRecipients.models.ts |  4 +-
 .../club/protocol/protocolPresence.models.ts  |  4 +-
 src/viewmodels/admin/user/user.models.ts      |  4 +-
 .../club/newsletter/NewsletterRecipients.vue  |  2 +-
 .../admin/club/protocol/ProtocolPresence.vue  |  6 +-
 src/views/admin/user/user/UserEdit.vue        |  2 +-
 .../admin/user/user/UserEditPermission.vue    |  2 +-
 src/views/admin/user/user/UserEditRoles.vue   |  2 +-
 src/views/docs/DocPage.vue                    | 34 +++++-----
 17 files changed, 86 insertions(+), 93 deletions(-)

diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue
index 28084c6..83210a7 100644
--- a/src/components/Pagination.vue
+++ b/src/components/Pagination.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="grow flex flex-col gap-2 overflow-hidden">
     <div v-if="useSearch" class="relative self-end flex flex-row items-center gap-2">
-      <Spinner v-if="deferingSearch"  />
+      <Spinner v-if="deferingSearch" />
       <input
         type="text"
         class="!max-w-64 !w-64 rounded-md shadow-sm relative block px-3 py-2 pr-5 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
@@ -82,27 +82,30 @@ const props = defineProps({
 });
 
 const slots = defineSlots<{
-  pageRow(props: { row: T }): void;
+  pageRow(props: { row: T; key: number }): void;
 }>();
 
 const timer = ref(undefined) as undefined | any;
 const currentPage = ref(0);
 const searchString = ref("");
-const deferingSearch = ref(false)
+const deferingSearch = ref(false);
 
 watch(searchString, async () => {
-  deferingSearch.value = true
+  deferingSearch.value = true;
   clearTimeout(timer.value);
   timer.value = setTimeout(() => {
     currentPage.value = 0;
-    deferingSearch.value = false
+    deferingSearch.value = false;
     emit("search", searchString.value);
   }, 600);
 });
 
-watch(() => props.totalCount, async () => {
-  currentPage.value = 0;
-});
+watch(
+  () => props.totalCount,
+  async () => {
+    currentPage.value = 0;
+  }
+);
 
 const emit = defineEmits({
   submit(id: number) {
@@ -159,7 +162,7 @@ const loadPage = (newPage: number | ".") => {
   if (pageEnd > entryCount.value) pageEnd = entryCount.value;
 
   let loadedElementCount = filterData(props.items, searchString.value, pageStart, pageEnd).length;
-  
+
   if (loadedElementCount < props.maxEntriesPerPage && (pageEnd != props.totalCount || loadedElementCount == 0))
     emit("loadData", pageStart, props.maxEntriesPerPage, searchString.value);
 
diff --git a/src/components/admin/MemberSearchSelect.vue b/src/components/admin/MemberSearchSelect.vue
index cf67fa9..1522d31 100644
--- a/src/components/admin/MemberSearchSelect.vue
+++ b/src/components/admin/MemberSearchSelect.vue
@@ -93,7 +93,7 @@ import Spinner from "../Spinner.vue";
 export default defineComponent({
   props: {
     modelValue: {
-      type: Array as PropType<Array<number>>,
+      type: Array as PropType<Array<string>>,
       default: [],
     },
     title: String,
@@ -133,7 +133,7 @@ export default defineComponent({
       get() {
         return this.modelValue;
       },
-      set(val: Array<number>) {
+      set(val: Array<string>) {
         this.$emit("update:model-value", val);
         if (this.modelValue.length < val.length) {
           let diff = difference(val, this.modelValue);
@@ -166,7 +166,7 @@ export default defineComponent({
           this.loading = false;
         });
     },
-    getMemberFromSearch(id: number) {
+    getMemberFromSearch(id: string) {
       return this.filtered.find((f) => f.id == id);
     },
     loadMembersInitial() {
diff --git a/src/components/admin/Permission.vue b/src/components/admin/Permission.vue
index 93dcd2a..31b1060 100644
--- a/src/components/admin/Permission.vue
+++ b/src/components/admin/Permission.vue
@@ -178,12 +178,12 @@ export default defineComponent({
         if (!this.permissionUpdate[section]) {
           this.permissionUpdate[section] = {};
         }
-        this.permissionUpdate[section].all = permissions;
+        this.permissionUpdate[section]!.all = permissions;
       } else {
         if (!this.permissionUpdate[section]) {
           this.permissionUpdate[section] = {};
         }
-        this.permissionUpdate[section][modul] = permissions;
+        this.permissionUpdate[section]![modul] = permissions;
       }
     },
     reset() {
diff --git a/src/stores/admin/club/member/member.ts b/src/stores/admin/club/member/member.ts
index d92670e..29fc075 100644
--- a/src/stores/admin/club/member/member.ts
+++ b/src/stores/admin/club/member/member.ts
@@ -14,7 +14,7 @@ export const useMemberStore = defineStore("member", {
       members: [] as Array<MemberViewModel & { tab_pos: number }>,
       totalCount: 0 as number,
       loading: "loading" as "loading" | "fetched" | "failed",
-      activeMember: null as number | null,
+      activeMember: null as string | null,
       activeMemberObj: null as MemberViewModel | null,
       activeMemberStatistics: null as MemberStatisticsViewModel | null,
       loadingActive: "loading" as "loading" | "fetched" | "failed",
@@ -50,7 +50,7 @@ export const useMemberStore = defineStore("member", {
         return { ...res, data: res.data.members };
       });
     },
-    async getMembersByIds(ids: Array<number>): Promise<AxiosResponse<any, any>> {
+    async getMembersByIds(ids: Array<string>): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/member?ids=${ids.join(",")}&noLimit=true`).then((res) => {
         return { ...res, data: res.data.members };
       });
@@ -72,7 +72,7 @@ export const useMemberStore = defineStore("member", {
           this.loadingActive = "failed";
         });
     },
-    fetchMemberById(id: number) {
+    fetchMemberById(id: string) {
       return http.get(`/admin/member/${id}`);
     },
     fetchMemberStatisticsByActiveId() {
@@ -83,7 +83,7 @@ export const useMemberStore = defineStore("member", {
         })
         .catch((err) => {});
     },
-    fetchMemberStatisticsById(id: number) {
+    fetchMemberStatisticsById(id: string) {
       return http.get(`/admin/member/${id}/statistics`);
     },
     async createMember(member: CreateMemberViewModel): Promise<AxiosResponse<any, any>> {
diff --git a/src/stores/admin/club/newsletter/newsletterRecipients.ts b/src/stores/admin/club/newsletter/newsletterRecipients.ts
index 594ac7f..2a7efb3 100644
--- a/src/stores/admin/club/newsletter/newsletterRecipients.ts
+++ b/src/stores/admin/club/newsletter/newsletterRecipients.ts
@@ -12,8 +12,8 @@ export const useNewsletterRecipientsStore = defineStore("newsletterRecipients",
   state: () => {
     return {
       initialized: false as boolean,
-      recipients: [] as Array<number>,
-      origin: [] as Array<number>,
+      recipients: [] as Array<string>,
+      origin: [] as Array<string>,
       loading: "loading" as "loading" | "fetched" | "failed",
       syncingNewsletterRecipients: "synced" as "synced" | "syncing" | "detectedChanges" | "failed",
     };
diff --git a/src/stores/admin/club/protocol/protocolPresence.ts b/src/stores/admin/club/protocol/protocolPresence.ts
index de641d2..b2f6c9c 100644
--- a/src/stores/admin/club/protocol/protocolPresence.ts
+++ b/src/stores/admin/club/protocol/protocolPresence.ts
@@ -22,8 +22,8 @@ export const useProtocolPresenceStore = defineStore("protocolPresence", {
   getters: {
     detectedChangeProtocolPresence: (state) =>
       !isEqual(
-        state.origin.sort((a: ProtocolPresenceViewModel, b: ProtocolPresenceViewModel) => a.memberId - b.memberId),
-        state.presence.sort((a: ProtocolPresenceViewModel, b: ProtocolPresenceViewModel) => a.memberId - b.memberId)
+        state.origin, //.sort((a: ProtocolPresenceViewModel, b: ProtocolPresenceViewModel) => a.memberId - b.memberId),
+        state.presence //.sort((a: ProtocolPresenceViewModel, b: ProtocolPresenceViewModel) => a.memberId - b.memberId)
       ) && state.syncingProtocolPresence != "syncing",
   },
   actions: {
diff --git a/src/stores/admin/user/user.ts b/src/stores/admin/user/user.ts
index 5696063..dc8ee25 100644
--- a/src/stores/admin/user/user.ts
+++ b/src/stores/admin/user/user.ts
@@ -24,47 +24,37 @@ export const useUserStore = defineStore("user", {
           this.loading = "failed";
         });
     },
-    fetchUserById(id: number): Promise<AxiosResponse<any, any>> {
+    fetchUserById(id: string): Promise<AxiosResponse<any, any>> {
       return http.get(`/admin/user/${id}`);
     },
-    updateActiveUser(user: UpdateUserViewModel): Promise<AxiosResponse<any, any>> {
-      return http
-        .patch(`/admin/user/${user.id}`, {
-          username: user.username,
-          firstname: user.firstname,
-          lastname: user.lastname,
-          mail: user.mail,
-        })
-        .then((result) => {
-          this.fetchUsers();
-          return result;
-        });
-    },
-    updateActiveUserPermissions(user: number, permission: PermissionObject): Promise<AxiosResponse<any, any>> {
-      return http
-        .patch(`/admin/user/${user}/permissions`, {
-          permissions: permission,
-        })
-        .then((result) => {
-          this.fetchUsers();
-          return result;
-        });
-    },
-    updateActiveUserRoles(user: number, roles: Array<number>): Promise<AxiosResponse<any, any>> {
-      return http
-        .patch(`/admin/user/${user}/roles`, {
-          roleIds: roles,
-        })
-        .then((result) => {
-          this.fetchUsers();
-          return result;
-        });
-    },
-    deleteUser(user: number): Promise<AxiosResponse<any, any>> {
-      return http.delete(`/admin/user/${user}`).then((result) => {
-        this.fetchUsers();
-        return result;
+    async updateActiveUser(user: UpdateUserViewModel): Promise<AxiosResponse<any, any>> {
+      const result = await http.patch(`/admin/user/${user.id}`, {
+        username: user.username,
+        firstname: user.firstname,
+        lastname: user.lastname,
+        mail: user.mail,
       });
+      this.fetchUsers();
+      return result;
+    },
+    async updateActiveUserPermissions(userId: string, permission: PermissionObject): Promise<AxiosResponse<any, any>> {
+      const result = await http.patch(`/admin/user/${userId}/permissions`, {
+        permissions: permission,
+      });
+      this.fetchUsers();
+      return result;
+    },
+    async updateActiveUserRoles(userId: string, roles: Array<number>): Promise<AxiosResponse<any, any>> {
+      const result = await http.patch(`/admin/user/${userId}/roles`, {
+        roleIds: roles,
+      });
+      this.fetchUsers();
+      return result;
+    },
+    async deleteUser(userId: string): Promise<AxiosResponse<any, any>> {
+      const result = await http.delete(`/admin/user/${userId}`);
+      this.fetchUsers();
+      return result;
     },
   },
 });
diff --git a/src/viewmodels/admin/club/member/member.models.ts b/src/viewmodels/admin/club/member/member.models.ts
index a6b49ff..e367e4a 100644
--- a/src/viewmodels/admin/club/member/member.models.ts
+++ b/src/viewmodels/admin/club/member/member.models.ts
@@ -3,7 +3,7 @@ import type { MembershipViewModel } from "./membership.models";
 import type { SalutationViewModel } from "../../settings/salutation.models";
 
 export interface MemberViewModel {
-  id: number;
+  id: string;
   salutation: SalutationViewModel;
   firstname: string;
   lastname: string;
@@ -18,7 +18,7 @@ export interface MemberViewModel {
 }
 
 export interface MemberStatisticsViewModel {
-  id: number;
+  id: string;
   salutation: string;
   firstname: string;
   lastname: string;
@@ -39,7 +39,7 @@ export interface CreateMemberViewModel {
 }
 
 export interface UpdateMemberViewModel {
-  id: number;
+  id: string;
   salutationId: number;
   firstname: string;
   lastname: string;
diff --git a/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts b/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
index 7e5ab15..b78192c 100644
--- a/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
+++ b/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
@@ -2,10 +2,10 @@ import type { MemberViewModel } from "../member/member.models";
 
 export interface NewsletterRecipientsViewModel {
   newsletterId: number;
-  memberId: number;
+  memberId: string;
   member: MemberViewModel;
 }
 
 export interface SyncNewsletterRecipientsViewModel {
-  memberId: number;
+  memberId: string;
 }
diff --git a/src/viewmodels/admin/club/protocol/protocolPresence.models.ts b/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
index 35bdd44..755261b 100644
--- a/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
+++ b/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
@@ -1,10 +1,10 @@
 export interface ProtocolPresenceViewModel {
-  memberId: number;
+  memberId: string;
   absent: boolean;
   excused: boolean;
   protocolId: number;
 }
 
 export interface SyncProtocolPresenceViewModel {
-  memberIds: Array<number>;
+  memberIds: Array<string>;
 }
diff --git a/src/viewmodels/admin/user/user.models.ts b/src/viewmodels/admin/user/user.models.ts
index 94cc940..d13b38a 100644
--- a/src/viewmodels/admin/user/user.models.ts
+++ b/src/viewmodels/admin/user/user.models.ts
@@ -2,7 +2,7 @@ import type { PermissionObject } from "@/types/permissionTypes";
 import type { RoleViewModel } from "./role.models";
 
 export interface UserViewModel {
-  id: number;
+  id: string;
   username: string;
   mail: string;
   firstname: string;
@@ -21,7 +21,7 @@ export interface CreateUserViewModel {
 }
 
 export interface UpdateUserViewModel {
-  id: number;
+  id: string;
   username: string;
   mail: string;
   firstname: string;
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index 0a18c1a..e1b2d96 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -154,7 +154,7 @@ export default defineComponent({
     ...mapActions(useNewsletterRecipientsStore, ["fetchNewsletterRecipients"]),
     ...mapActions(useQueryStoreStore, ["fetchQueries"]),
     ...mapActions(useQueryBuilderStore, ["sendQuery"]),
-    removeSelected(id: number) {
+    removeSelected(id: string) {
       let index = this.recipients.findIndex((s) => s == id);
       if (index != -1) {
         this.recipients.splice(index, 1);
diff --git a/src/views/admin/club/protocol/ProtocolPresence.vue b/src/views/admin/club/protocol/ProtocolPresence.vue
index e5f2c19..c392338 100644
--- a/src/views/admin/club/protocol/ProtocolPresence.vue
+++ b/src/views/admin/club/protocol/ProtocolPresence.vue
@@ -10,7 +10,7 @@
       :model-value="presence.map((p) => p.memberId)"
       :disabled="!can('create', 'club', 'protocol')"
       @add:difference="
-        (id: number) =>
+        (id: string) =>
           presence.push({ memberId: id, absent: false, excused: true, protocolId: parseInt(protocolId ?? '') })
       "
       @add:member="(s) => members.push(s)"
@@ -78,7 +78,7 @@ export default defineComponent({
     ...mapWritableState(useProtocolPresenceStore, ["presence", "loading"]),
     ...mapState(useAbilityStore, ["can"]),
     getMember() {
-      return (memberId: number) => {
+      return (memberId: string) => {
         return this.members.find((m) => memberId == m.id);
       };
     },
@@ -86,7 +86,7 @@ export default defineComponent({
   mounted() {},
   methods: {
     ...mapActions(useProtocolPresenceStore, ["fetchProtocolPresence"]),
-    removeSelected(id: number) {
+    removeSelected(id: string) {
       let index = this.presence.findIndex((s) => s.memberId == id);
       if (index != -1) {
         this.presence.splice(index, 1);
diff --git a/src/views/admin/user/user/UserEdit.vue b/src/views/admin/user/user/UserEdit.vue
index 154b3f3..05e4898 100644
--- a/src/views/admin/user/user/UserEdit.vue
+++ b/src/views/admin/user/user/UserEdit.vue
@@ -95,7 +95,7 @@ export default defineComponent({
       this.user = cloneDeep(this.origin);
     },
     fetchItem() {
-      this.fetchUserById(parseInt(this.id ?? ""))
+      this.fetchUserById(this.id ?? "")
         .then((result) => {
           this.user = result.data;
           this.origin = cloneDeep(result.data);
diff --git a/src/views/admin/user/user/UserEditPermission.vue b/src/views/admin/user/user/UserEditPermission.vue
index 748cc18..b34dd62 100644
--- a/src/views/admin/user/user/UserEditPermission.vue
+++ b/src/views/admin/user/user/UserEditPermission.vue
@@ -57,7 +57,7 @@ export default defineComponent({
   methods: {
     ...mapActions(useUserStore, ["fetchUserById", "updateActiveUserPermissions"]),
     fetchItem() {
-      this.fetchUserById(parseInt(this.id ?? ""))
+      this.fetchUserById(this.id ?? "")
         .then((result) => {
           this.user = result.data;
           this.loading = "fetched";
diff --git a/src/views/admin/user/user/UserEditRoles.vue b/src/views/admin/user/user/UserEditRoles.vue
index e162ab1..45ff118 100644
--- a/src/views/admin/user/user/UserEditRoles.vue
+++ b/src/views/admin/user/user/UserEditRoles.vue
@@ -111,7 +111,7 @@ export default defineComponent({
       this.assigned = this.origin?.roles.map((r) => r.id) ?? [];
     },
     fetchItem() {
-      this.fetchUserById(parseInt(this.id ?? ""))
+      this.fetchUserById(this.id ?? "")
         .then((result) => {
           this.origin = cloneDeep(result.data);
           this.assigned = this.origin?.roles.map((r) => r.id) ?? [];
diff --git a/src/views/docs/DocPage.vue b/src/views/docs/DocPage.vue
index 6d58af9..483a7fe 100644
--- a/src/views/docs/DocPage.vue
+++ b/src/views/docs/DocPage.vue
@@ -11,53 +11,53 @@
           <component v-if="markdownComponent" :is="markdownComponent" />
           <p v-else>Diese Seite existiert nicht.</p>
         </div>
-      </div>      
+      </div>
     </template>
   </MainTemplate>
 </template>
 
 <script setup lang="ts">
-import { defineAsyncComponent, defineComponent, markRaw} from "vue";
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import MainTemplate from "@/templates/Main.vue";
-import 'highlight.js/styles/atom-one-dark.css';
+import "highlight.js/styles/atom-one-dark.css";
 </script>
 
 <script lang="ts">
 export default defineComponent({
   props: {
-    page: String
+    page: String,
   },
-  watch:{
+  watch: {
     page() {
-      this.loadPage()
-    }
+      this.loadPage();
+    },
   },
   data() {
     return {
-      markdownComponent: null,
+      markdownComponent: null as any,
     };
   },
   async mounted() {
-    this.loadPage()
+    this.loadPage();
   },
-  methods:{
-    loadPage(){
-      this.markdownComponent = null
+  methods: {
+    loadPage() {
+      this.markdownComponent = null;
       this.markdownComponent = markRaw(defineAsyncComponent(() => import(`$/${this.page?.toLowerCase()}.md`)));
-    }
-  }
+    },
+  },
 });
 </script>
 
 <style>
 .markdown-container {
-  font-family: 'Open Sans', sans-serif;
+  font-family: "Open Sans", sans-serif;
   color: #555;
   background-color: #f8f8f8;
   border: 2px solid gray;
   padding: 20px;
   border-radius: 5px;
-  height: 100%
+  height: 100%;
 }
 
 .markdown-container h1 {
@@ -84,4 +84,4 @@ export default defineComponent({
   list-style-type: disc;
   margin-left: 20px;
 }
-</style>
\ No newline at end of file
+</style>

From 5a8d858918d9e49c3d7664e543fde4e7c78462c3 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 29 Jan 2025 10:06:09 +0100
Subject: [PATCH 2/5] fix: member update salutation read

---
 src/views/admin/club/members/MemberEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/admin/club/members/MemberEdit.vue b/src/views/admin/club/members/MemberEdit.vue
index 6053966..9e71a03 100644
--- a/src/views/admin/club/members/MemberEdit.vue
+++ b/src/views/admin/club/members/MemberEdit.vue
@@ -157,7 +157,7 @@ export default defineComponent({
       let formData = e.target.elements;
       let updateMember: UpdateMemberViewModel = {
         id: this.member.id,
-        salutationId: formData.salutation.value,
+        salutationId: formData["salutation[id]"].value,
         firstname: formData.firstname.value,
         lastname: formData.lastname.value,
         nameaffix: formData.nameaffix.value,

From e5cb8fecc60bd08d5b1652986b97033697c829ca Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sun, 2 Feb 2025 11:10:11 +0100
Subject: [PATCH 3/5] change permission

---
 src/components/admin/user/user/UserListItem.vue       | 2 +-
 src/viewmodels/admin/club/member/membership.models.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/user/user/UserListItem.vue b/src/components/admin/user/user/UserListItem.vue
index 241a60e..f705262 100644
--- a/src/components/admin/user/user/UserListItem.vue
+++ b/src/components/admin/user/user/UserListItem.vue
@@ -7,7 +7,7 @@
       </p>
       <div class="flex flex-row">
         <RouterLink
-          v-if="can('update', 'user', 'user')"
+          v-if="can('admin', 'user', 'user')"
           :to="{ name: 'admin-user-user-roles', params: { id: user.id } }"
         >
           <UserGroupIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
diff --git a/src/viewmodels/admin/club/member/membership.models.ts b/src/viewmodels/admin/club/member/membership.models.ts
index 6051ec9..0bbdb92 100644
--- a/src/viewmodels/admin/club/member/membership.models.ts
+++ b/src/viewmodels/admin/club/member/membership.models.ts
@@ -12,7 +12,7 @@ export interface MembershipStatisticsViewModel {
   durationInYears: string;
   status: string;
   statusId: number;
-  memberId: number;
+  memberId: string;
   memberSalutation: string;
   memberFirstname: string;
   memberLastname: string;

From f8fb222ebbdf6bcb3ac041762f3c6acef421bb04 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sun, 2 Feb 2025 16:37:46 +0100
Subject: [PATCH 4/5] backup read, upload and restore

---
 package-lock.json                             |  81 +++++++++++++-
 package.json                                  |   2 +-
 .../admin/user/backup/BackupListItem.vue      |  58 ++++++++++
 .../admin/user/backup/CreateBackupModal.vue   |  67 ++++++++++++
 .../admin/user/backup/RestoreBackupModal.vue  | 101 ++++++++++++++++++
 .../admin/user/backup/UploadBackupModal.vue   |  93 ++++++++++++++++
 src/router/index.ts                           |   7 ++
 src/stores/admin/navigation.ts                |   1 +
 src/stores/admin/user/backup.ts               |  56 ++++++++++
 src/types/backupTypes.ts                      |  24 +++++
 src/types/permissionTypes.ts                  |   6 +-
 src/viewmodels/admin/user/backup.models.ts    |   7 ++
 src/views/admin/user/backup/Backup.vue        |  60 +++++++++++
 13 files changed, 555 insertions(+), 8 deletions(-)
 create mode 100644 src/components/admin/user/backup/BackupListItem.vue
 create mode 100644 src/components/admin/user/backup/CreateBackupModal.vue
 create mode 100644 src/components/admin/user/backup/RestoreBackupModal.vue
 create mode 100644 src/components/admin/user/backup/UploadBackupModal.vue
 create mode 100644 src/stores/admin/user/backup.ts
 create mode 100644 src/types/backupTypes.ts
 create mode 100644 src/viewmodels/admin/user/backup.models.ts
 create mode 100644 src/views/admin/user/backup/Backup.vue

diff --git a/package-lock.json b/package-lock.json
index 10f4839..9748c4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@headlessui/vue": "^1.7.13",
         "@heroicons/vue": "^2.1.5",
         "@vueup/vue-quill": "^1.2.0",
-        "axios": "^0.26.1",
+        "axios": "^1.7.9",
         "event-source-polyfill": "^1.0.31",
         "grapesjs": "^0.22.4",
         "grapesjs-preset-newsletter": "^1.0.2",
@@ -3951,6 +3951,12 @@
       "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
       "dev": true
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -4013,11 +4019,14 @@
       }
     },
     "node_modules/axios": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.14.8"
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
     "node_modules/b4a": {
@@ -4515,6 +4524,18 @@
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "dev": true
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -4875,6 +4896,15 @@
       "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
       "dev": true
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/detect-libc": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
@@ -5714,6 +5744,20 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/form-data": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/fraction.js": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
@@ -7172,6 +7216,27 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mimic-response": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -8115,6 +8180,12 @@
       "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==",
       "license": "MIT"
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "license": "MIT"
+    },
     "node_modules/pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
diff --git a/package.json b/package.json
index 922267f..c76f49a 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "@headlessui/vue": "^1.7.13",
     "@heroicons/vue": "^2.1.5",
     "@vueup/vue-quill": "^1.2.0",
-    "axios": "^0.26.1",
+    "axios": "^1.7.9",
     "event-source-polyfill": "^1.0.31",
     "grapesjs": "^0.22.4",
     "grapesjs-preset-newsletter": "^1.0.2",
diff --git a/src/components/admin/user/backup/BackupListItem.vue b/src/components/admin/user/backup/BackupListItem.vue
new file mode 100644
index 0000000..18e2b06
--- /dev/null
+++ b/src/components/admin/user/backup/BackupListItem.vue
@@ -0,0 +1,58 @@
+<template>
+  <div class="flex flex-col h-fit w-full border border-primary rounded-md">
+    <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
+      <p>{{ backup }}</p>
+      <div class="flex flex-row">
+        <div @click="downloadBackup">
+          <ArrowDownTrayIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
+        </div>
+        <div v-if="can('admin', 'user', 'backup')" @click="openRestoreModal">
+          <BarsArrowUpIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
+import { mapState, mapActions } from "pinia";
+import { ArchiveBoxArrowDownIcon, ArrowDownTrayIcon, BarsArrowUpIcon } from "@heroicons/vue/24/outline";
+import { useAbilityStore } from "@/stores/ability";
+import { useModalStore } from "@/stores/modal";
+import { useBackupStore } from "../../../../stores/admin/user/backup";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    backup: { type: String, default: "" },
+  },
+  computed: {
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  methods: {
+    ...mapActions(useModalStore, ["openModal"]),
+    ...mapActions(useBackupStore, ["fetchBackupById"]),
+    openRestoreModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/RestoreBackupModal.vue"))),
+        this.backup
+      );
+    },
+    downloadBackup() {
+      this.fetchBackupById(this.backup)
+        .then((response) => {
+          const fileURL = window.URL.createObjectURL(new Blob([JSON.stringify(response.data, null, 2)]));
+          const fileLink = document.createElement("a");
+          fileLink.href = fileURL;
+          fileLink.setAttribute("download", this.backup);
+          document.body.appendChild(fileLink);
+          fileLink.click();
+          fileLink.remove();
+        })
+        .catch(() => {});
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/user/backup/CreateBackupModal.vue b/src/components/admin/user/backup/CreateBackupModal.vue
new file mode 100644
index 0000000..0c205ef
--- /dev/null
+++ b/src/components/admin/user/backup/CreateBackupModal.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="w-full md:max-w-md">
+    <div class="flex flex-col items-center">
+      <p class="text-xl font-medium">Backup erstellen</p>
+    </div>
+    <br />
+    <form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreateBackup">
+      <div class="flex flex-row gap-2">
+        <button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">erstellen</button>
+        <Spinner v-if="status == 'loading'" class="my-auto" />
+        <SuccessCheckmark v-else-if="status?.status == 'success'" />
+        <FailureXMark v-else-if="status?.status == 'failed'" />
+      </div>
+    </form>
+
+    <div class="flex flex-row justify-end">
+      <div class="flex flex-row gap-4 py-2">
+        <button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
+          abbrechen
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { useBackupStore } from "@/stores/admin/user/backup";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+      timeout: undefined as any,
+    };
+  },
+  beforeUnmount() {
+    try {
+      clearTimeout(this.timeout);
+    } catch (error) {}
+  },
+  methods: {
+    ...mapActions(useModalStore, ["closeModal"]),
+    ...mapActions(useBackupStore, ["triggerBackupCreate"]),
+    triggerCreateBackup(e: any) {
+      this.status = "loading";
+      this.triggerBackupCreate()
+        .then(() => {
+          this.status = { status: "success" };
+          this.timeout = setTimeout(() => {
+            this.closeModal();
+          }, 1500);
+        })
+        .catch(() => {
+          this.status = { status: "failed" };
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/user/backup/RestoreBackupModal.vue b/src/components/admin/user/backup/RestoreBackupModal.vue
new file mode 100644
index 0000000..e50a398
--- /dev/null
+++ b/src/components/admin/user/backup/RestoreBackupModal.vue
@@ -0,0 +1,101 @@
+<template>
+  <div class="w-full md:max-w-md">
+    <div class="flex flex-col items-center">
+      <p class="text-xl font-medium">Backup {{ data }} laden</p>
+    </div>
+    <br />
+    <form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreateBackup">
+      <div class="flex flex-row items-center gap-2">
+        <input type="checkbox" id="partial" v-model="partial" />
+        <label for="partial">Backup vollständig laden</label>
+      </div>
+      <div v-if="!partial">
+        <label for="sections">Module zur Wiederherstellung auswählen:</label>
+        <select id="sections" multiple>
+          <option v-for="section in backupSections" :value="section">{{ section }}</option>
+        </select>
+      </div>
+
+      <br />
+      <p class="flex">
+        <InformationCircleIcon class="min-h-5 h-5 min-w-5 w-5" />Je nach Auswahl, werden die entsprechenden
+        Bestandsdaten ersetzt. Dadurch können Daten, die seit diesem Backup erstellt wurden, verloren gehen.
+      </p>
+
+      <div class="flex flex-row gap-2">
+        <button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">
+          Backup laden
+        </button>
+        <Spinner v-if="status == 'loading'" class="my-auto" />
+        <SuccessCheckmark v-else-if="status?.status == 'success'" />
+        <FailureXMark v-else-if="status?.status == 'failed'" />
+      </div>
+    </form>
+
+    <div class="flex flex-row justify-end">
+      <div class="flex flex-row gap-4 py-2">
+        <button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
+          abbrechen
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { useBackupStore } from "@/stores/admin/user/backup";
+import type { BackupRestoreViewModel } from "../../../../viewmodels/admin/user/backup.models";
+import { InformationCircleIcon } from "@heroicons/vue/24/outline";
+import { backupSections, type BackupSection } from "../../../../types/backupTypes";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    data: { type: String, default: "" },
+  },
+  data() {
+    return {
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+      timeout: undefined as any,
+      partial: true,
+    };
+  },
+  beforeUnmount() {
+    try {
+      clearTimeout(this.timeout);
+    } catch (error) {}
+  },
+  methods: {
+    ...mapActions(useModalStore, ["closeModal"]),
+    ...mapActions(useBackupStore, ["restoreBackup"]),
+    triggerCreateBackup(e: any) {
+      let formData = e.target.elements;
+      let restoreBackup: BackupRestoreViewModel = {
+        filename: this.data,
+        partial: !formData.partial.checked,
+        include: Array.from(formData?.sections?.selectedOptions ?? []).map(
+          (t) => (t as HTMLOptionElement).value
+        ) as Array<BackupSection>,
+      };
+      this.status = "loading";
+      this.restoreBackup(restoreBackup)
+        .then(() => {
+          this.status = { status: "success" };
+          this.timeout = setTimeout(() => {
+            this.closeModal();
+          }, 1500);
+        })
+        .catch(() => {
+          this.status = { status: "failed" };
+        });
+    },
+  },
+});
+</script>
diff --git a/src/components/admin/user/backup/UploadBackupModal.vue b/src/components/admin/user/backup/UploadBackupModal.vue
new file mode 100644
index 0000000..d65db5f
--- /dev/null
+++ b/src/components/admin/user/backup/UploadBackupModal.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="w-full md:max-w-md">
+    <div class="flex flex-col items-center">
+      <p class="text-xl font-medium">Backup hochladen</p>
+    </div>
+    <br />
+    <div
+      class="hidden md:flex flex-col gap-2 py-7 bg-gray-200 justify-center items-center w-full grow rounded-lg"
+      @drop.prevent="fileDrop"
+      @dragover.prevent
+    >
+      <p class="text-lg text-dark-gray">Datei hierher ziehen</p>
+    </div>
+    <p class="hidden md:block text-center">oder</p>
+    <div class="flex flex-row gap-2 items-center">
+      <input
+        class="!hidden"
+        type="file"
+        ref="fileSelect"
+        accept="application/JSON"
+        @change="(e) => uploadFile((e.target as HTMLInputElement)?.files?.[0])"
+        multiple
+      />
+      <button primary @click="openFileSelect">Datei auswählen</button>
+    </div>
+    <div class="flex flex-row gap-2 pt-4 items-center justify-center">
+      <Spinner v-if="status == 'loading'" class="my-auto" />
+      <SuccessCheckmark v-else-if="status?.status == 'success'" />
+      <FailureXMark v-else-if="status?.status == 'failed'" />
+    </div>
+
+    <div class="flex flex-row justify-end">
+      <div class="flex flex-row gap-4 py-2">
+        <button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
+          abbrechen
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineComponent } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { useBackupStore } from "@/stores/admin/user/backup";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+      timeout: undefined as any,
+    };
+  },
+  beforeUnmount() {
+    try {
+      clearTimeout(this.timeout);
+    } catch (error) {}
+  },
+  methods: {
+    ...mapActions(useModalStore, ["closeModal"]),
+    ...mapActions(useBackupStore, ["uploadBackup"]),
+    openFileSelect(event: Event) {
+      (this.$refs.fileSelect as HTMLInputElement).click();
+    },
+    fileDrop(event: DragEvent) {
+      const file = event.dataTransfer?.files[0];
+      console.log("hi", file);
+      if (file?.type.toLocaleLowerCase() != "application/json") return;
+      this.uploadFile(file);
+    },
+    uploadFile(file?: File) {
+      if (!file) return;
+      this.status = "loading";
+      this.uploadBackup(file)
+        .then(() => {
+          this.status = { status: "success" };
+          this.timeout = setTimeout(() => {
+            this.closeModal();
+          }, 1500);
+        })
+        .catch(() => {
+          this.status = { status: "failed" };
+        });
+    },
+  },
+});
+</script>
diff --git a/src/router/index.ts b/src/router/index.ts
index 4d46b2b..8011d2a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -634,6 +634,13 @@ const router = createRouter({
                 },
               ],
             },
+            {
+              path: "backup",
+              name: "admin-user-backup",
+              component: () => import("@/views/admin/user/backup/Backup.vue"),
+              meta: { type: "read", section: "user", module: "backup" },
+              beforeEnter: [abilityAndNavUpdate],
+            },
           ],
         },
         {
diff --git a/src/stores/admin/navigation.ts b/src/stores/admin/navigation.ts
index 003f868..07a7532 100644
--- a/src/stores/admin/navigation.ts
+++ b/src/stores/admin/navigation.ts
@@ -133,6 +133,7 @@ export const useNavigationStore = defineStore("navigation", {
             ...(abilityStore.can("read", "user", "user") ? [{ key: "user", title: "Benutzer" }] : []),
             ...(abilityStore.can("read", "user", "role") ? [{ key: "role", title: "Rollen" }] : []),
             ...(abilityStore.can("read", "user", "webapi") ? [{ key: "webapi", title: "Webapi-Token" }] : []),
+            ...(abilityStore.can("read", "user", "backup") ? [{ key: "backup", title: "Backups" }] : []),
           ],
         },
       } as navigationModel;
diff --git a/src/stores/admin/user/backup.ts b/src/stores/admin/user/backup.ts
new file mode 100644
index 0000000..1f29cf8
--- /dev/null
+++ b/src/stores/admin/user/backup.ts
@@ -0,0 +1,56 @@
+import { defineStore } from "pinia";
+import { http } from "@/serverCom";
+import type { AxiosResponse, AxiosProgressEvent } from "axios";
+import type { BackupRestoreViewModel } from "../../../viewmodels/admin/user/backup.models";
+
+export const useBackupStore = defineStore("backup", {
+  state: () => {
+    return {
+      backups: [] as Array<string>,
+      loading: null as null | "loading" | "success" | "failed",
+    };
+  },
+  actions: {
+    fetchBackups() {
+      this.loading = "loading";
+      http
+        .get("/admin/backup")
+        .then((result) => {
+          this.backups = result.data;
+          this.loading = "success";
+        })
+        .catch((err) => {
+          this.loading = "failed";
+        });
+    },
+    fetchBackupById(filename: string): Promise<AxiosResponse<any, any>> {
+      return http.get(`/admin/backup/${filename}`);
+    },
+    async triggerBackupCreate(): Promise<AxiosResponse<any, any>> {
+      const result = await http.post("/admin/backup");
+      this.fetchBackups();
+      return result;
+    },
+    async restoreBackup(backup: BackupRestoreViewModel): Promise<AxiosResponse<any, any>> {
+      return await http.post("/admin/backup/restore", backup);
+    },
+    async uploadBackup(file: File): Promise<AxiosResponse<any, any>> {
+      const formData = new FormData();
+      formData.append("file", file);
+
+      const options = {
+        headers: {
+          "Content-Type": "multipart/form-data",
+        },
+        onUploadProgress: (progressEvent: AxiosProgressEvent) => {
+          const { loaded, total = 1 } = progressEvent;
+          console.log("progress", Math.floor((loaded * 100) / total));
+        },
+      };
+
+      const result = await http.post("/admin/backup/upload", formData, options);
+      this.fetchBackups();
+      return result;
+    },
+  },
+});
diff --git a/src/types/backupTypes.ts b/src/types/backupTypes.ts
new file mode 100644
index 0000000..744ddc4
--- /dev/null
+++ b/src/types/backupTypes.ts
@@ -0,0 +1,24 @@
+export type BackupSection =
+  | "member"
+  | "memberBase"
+  | "protocol"
+  | "newsletter"
+  | "newsletter_config"
+  | "calendar"
+  | "query"
+  | "template"
+  | "user"
+  | "webapi";
+
+export const backupSections: Array<BackupSection> = [
+  "member",
+  "memberBase",
+  "protocol",
+  "newsletter",
+  "newsletter_config",
+  "calendar",
+  "query",
+  "template",
+  "user",
+  "webapi",
+];
diff --git a/src/types/permissionTypes.ts b/src/types/permissionTypes.ts
index cd37e49..e3d3105 100644
--- a/src/types/permissionTypes.ts
+++ b/src/types/permissionTypes.ts
@@ -19,7 +19,8 @@ export type PermissionModule =
   | "query"
   | "query_store"
   | "template"
-  | "template_usage";
+  | "template_usage"
+  | "backup";
 
 export type PermissionType = "read" | "create" | "update" | "delete";
 
@@ -63,6 +64,7 @@ export const permissionModules: Array<PermissionModule> = [
   "query_store",
   "template",
   "template_usage",
+  "backup",
 ];
 export const permissionTypes: Array<PermissionType> = ["read", "create", "update", "delete"];
 export const sectionsAndModules: SectionsAndModulesObject = {
@@ -80,5 +82,5 @@ export const sectionsAndModules: SectionsAndModulesObject = {
     "template_usage",
     "newsletter_config",
   ],
-  user: ["user", "role", "webapi"],
+  user: ["user", "role", "webapi", "backup"],
 };
diff --git a/src/viewmodels/admin/user/backup.models.ts b/src/viewmodels/admin/user/backup.models.ts
new file mode 100644
index 0000000..1d552dc
--- /dev/null
+++ b/src/viewmodels/admin/user/backup.models.ts
@@ -0,0 +1,7 @@
+import type { BackupSection } from "../../../types/backupTypes";
+
+export interface BackupRestoreViewModel {
+  filename: string;
+  partial: boolean;
+  include: Array<BackupSection>;
+}
diff --git a/src/views/admin/user/backup/Backup.vue b/src/views/admin/user/backup/Backup.vue
new file mode 100644
index 0000000..b238994
--- /dev/null
+++ b/src/views/admin/user/backup/Backup.vue
@@ -0,0 +1,60 @@
+<template>
+  <MainTemplate>
+    <template #topBar>
+      <div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
+        <h1 class="font-bold text-xl h-8">Backups</h1>
+      </div>
+    </template>
+    <template #diffMain>
+      <div class="flex flex-col gap-4 h-full pl-7">
+        <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
+          <BackupListItem v-for="backup in backups" :key="backup" :backup="backup" />
+        </div>
+        <div class="flex flex-row gap-4">
+          <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openCreateModal">
+            Backup erstellen
+          </button>
+          <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openUploadModal">
+            Backup hochladen
+          </button>
+        </div>
+      </div>
+    </template>
+  </MainTemplate>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { mapState, mapActions } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { useBackupStore } from "@/stores/admin/user/backup";
+import BackupListItem from "@/components/admin/user/backup/BackupListItem.vue";
+import { useModalStore } from "@/stores/modal";
+import { useAbilityStore } from "@/stores/ability";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  computed: {
+    ...mapState(useBackupStore, ["backups"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchBackups();
+  },
+  methods: {
+    ...mapActions(useBackupStore, ["fetchBackups"]),
+    ...mapActions(useModalStore, ["openModal"]),
+    openCreateModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/CreateBackupModal.vue")))
+      );
+    },
+    openUploadModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/UploadBackupModal.vue")))
+      );
+    },
+  },
+});
+</script>

From 5cb68d92ce3f66a6bc3caaccba020e1e24d84c9f Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Mon, 3 Feb 2025 11:03:38 +0100
Subject: [PATCH 5/5] split uploaded and generated backups

---
 .../admin/user/backup/RestoreBackupModal.vue  |  6 +++
 .../admin/user/backup/UploadBackupModal.vue   |  7 ++-
 src/router/backupGuard.ts                     | 19 ++++++++
 src/router/index.ts                           | 24 +++++++++-
 src/stores/admin/user/backup.ts               | 11 +++--
 .../admin/club/member/membership.models.ts    |  3 +-
 src/viewmodels/admin/user/backup.models.ts    |  1 +
 .../admin/club/members/MemberOverview.vue     |  2 +-
 .../backup/{Backup.vue => BackupRouting.vue}  | 40 +++++++++++-----
 .../admin/user/backup/GeneratedBackup.vue     | 48 +++++++++++++++++++
 .../admin/user/backup/UploadedBackup.vue      | 48 +++++++++++++++++++
 11 files changed, 188 insertions(+), 21 deletions(-)
 create mode 100644 src/router/backupGuard.ts
 rename src/views/admin/user/backup/{Backup.vue => BackupRouting.vue} (57%)
 create mode 100644 src/views/admin/user/backup/GeneratedBackup.vue
 create mode 100644 src/views/admin/user/backup/UploadedBackup.vue

diff --git a/src/components/admin/user/backup/RestoreBackupModal.vue b/src/components/admin/user/backup/RestoreBackupModal.vue
index e50a398..c80e026 100644
--- a/src/components/admin/user/backup/RestoreBackupModal.vue
+++ b/src/components/admin/user/backup/RestoreBackupModal.vue
@@ -15,12 +15,17 @@
           <option v-for="section in backupSections" :value="section">{{ section }}</option>
         </select>
       </div>
+      <div v-if="!partial" class="flex flex-row items-center gap-2">
+        <input type="checkbox" id="overwrite" checked />
+        <label for="overwrite">Daten entfernen und importieren</label>
+      </div>
 
       <br />
       <p class="flex">
         <InformationCircleIcon class="min-h-5 h-5 min-w-5 w-5" />Je nach Auswahl, werden die entsprechenden
         Bestandsdaten ersetzt. Dadurch können Daten, die seit diesem Backup erstellt wurden, verloren gehen.
       </p>
+      <p class="flex">Das Laden eines vollständigen Backups wird zur Vermeidung von Inkonsistenzen empfohlen.</p>
 
       <div class="flex flex-row gap-2">
         <button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">
@@ -83,6 +88,7 @@ export default defineComponent({
         include: Array.from(formData?.sections?.selectedOptions ?? []).map(
           (t) => (t as HTMLOptionElement).value
         ) as Array<BackupSection>,
+        overwrite: !formData?.overwrite.checked,
       };
       this.status = "loading";
       this.restoreBackup(restoreBackup)
diff --git a/src/components/admin/user/backup/UploadBackupModal.vue b/src/components/admin/user/backup/UploadBackupModal.vue
index d65db5f..c14fdbb 100644
--- a/src/components/admin/user/backup/UploadBackupModal.vue
+++ b/src/components/admin/user/backup/UploadBackupModal.vue
@@ -18,7 +18,12 @@
         type="file"
         ref="fileSelect"
         accept="application/JSON"
-        @change="(e) => uploadFile((e.target as HTMLInputElement)?.files?.[0])"
+        @change="
+          (e) => {
+            uploadFile((e.target as HTMLInputElement)?.files?.[0]);
+            e.target.value = null;
+          }
+        "
         multiple
       />
       <button primary @click="openFileSelect">Datei auswählen</button>
diff --git a/src/router/backupGuard.ts b/src/router/backupGuard.ts
new file mode 100644
index 0000000..a9e6302
--- /dev/null
+++ b/src/router/backupGuard.ts
@@ -0,0 +1,19 @@
+import { useBackupStore } from "../stores/admin/user/backup";
+
+export async function setBackupPage(to: any, from: any, next: any) {
+  const backup = useBackupStore();
+
+  let uploadPage = to.name.includes("uploaded");
+
+  if (uploadPage) {
+    backup.page = "uploaded";
+    backup.backups = [];
+  } else {
+    backup.page = "generated";
+    backup.backups = [];
+  }
+
+  backup.fetchBackups();
+
+  next();
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 8011d2a..2d39254 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@ import { resetMemberStores, setMemberId } from "./memberGuard";
 import { resetProtocolStores, setProtocolId } from "./protocolGuard";
 import { resetNewsletterStores, setNewsletterId } from "./newsletterGuard";
 import { config } from "../config";
+import { setBackupPage } from "./backupGuard";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -636,10 +637,29 @@ const router = createRouter({
             },
             {
               path: "backup",
-              name: "admin-user-backup",
-              component: () => import("@/views/admin/user/backup/Backup.vue"),
+              name: "admin-user-backup-route",
+              component: () => import("@/views/admin/user/backup/BackupRouting.vue"),
               meta: { type: "read", section: "user", module: "backup" },
               beforeEnter: [abilityAndNavUpdate],
+              children: [
+                {
+                  path: "",
+                  name: "admin-user-backup",
+                  redirect: { name: "admin-user-backup-generated" },
+                },
+                {
+                  path: "generated",
+                  name: "admin-user-backup-generated",
+                  component: () => import("@/views/admin/user/backup/GeneratedBackup.vue"),
+                  beforeEnter: [setBackupPage],
+                },
+                {
+                  path: "uploads",
+                  name: "admin-user-backup-uploaded",
+                  component: () => import("@/views/admin/user/backup/UploadedBackup.vue"),
+                  beforeEnter: [setBackupPage],
+                },
+              ],
             },
           ],
         },
diff --git a/src/stores/admin/user/backup.ts b/src/stores/admin/user/backup.ts
index 1f29cf8..1f87652 100644
--- a/src/stores/admin/user/backup.ts
+++ b/src/stores/admin/user/backup.ts
@@ -8,13 +8,14 @@ export const useBackupStore = defineStore("backup", {
     return {
       backups: [] as Array<string>,
       loading: null as null | "loading" | "success" | "failed",
+      page: "generated" as "generated" | "uploaded",
     };
   },
   actions: {
     fetchBackups() {
       this.loading = "loading";
       http
-        .get("/admin/backup")
+        .get(`/admin/backup/${this.page}`)
         .then((result) => {
           this.backups = result.data;
           this.loading = "success";
@@ -24,16 +25,16 @@ export const useBackupStore = defineStore("backup", {
         });
     },
     fetchBackupById(filename: string): Promise<AxiosResponse<any, any>> {
-      return http.get(`/admin/backup/${filename}`);
+      return http.get(`/admin/backup/${this.page}/${filename}`);
+    },
+    async restoreBackup(backup: BackupRestoreViewModel): Promise<AxiosResponse<any, any>> {
+      return await http.post(`/admin/backup/${this.page}/restore`, backup);
     },
     async triggerBackupCreate(): Promise<AxiosResponse<any, any>> {
       const result = await http.post("/admin/backup");
       this.fetchBackups();
       return result;
     },
-    async restoreBackup(backup: BackupRestoreViewModel): Promise<AxiosResponse<any, any>> {
-      return await http.post("/admin/backup/restore", backup);
-    },
     async uploadBackup(file: File): Promise<AxiosResponse<any, any>> {
       const formData = new FormData();
       formData.append("file", file);
diff --git a/src/viewmodels/admin/club/member/membership.models.ts b/src/viewmodels/admin/club/member/membership.models.ts
index 0bbdb92..ccf8105 100644
--- a/src/viewmodels/admin/club/member/membership.models.ts
+++ b/src/viewmodels/admin/club/member/membership.models.ts
@@ -9,7 +9,8 @@ export interface MembershipViewModel {
 
 export interface MembershipStatisticsViewModel {
   durationInDays: number;
-  durationInYears: string;
+  durationInYears: number;
+  exactDuration: string;
   status: string;
   statusId: number;
   memberId: string;
diff --git a/src/viewmodels/admin/user/backup.models.ts b/src/viewmodels/admin/user/backup.models.ts
index 1d552dc..522c0ff 100644
--- a/src/viewmodels/admin/user/backup.models.ts
+++ b/src/viewmodels/admin/user/backup.models.ts
@@ -4,4 +4,5 @@ export interface BackupRestoreViewModel {
   filename: string;
   partial: boolean;
   include: Array<BackupSection>;
+  overwrite: boolean;
 }
diff --git a/src/views/admin/club/members/MemberOverview.vue b/src/views/admin/club/members/MemberOverview.vue
index db2726c..5bb4ad1 100644
--- a/src/views/admin/club/members/MemberOverview.vue
+++ b/src/views/admin/club/members/MemberOverview.vue
@@ -34,7 +34,7 @@
           >
             <p>
               {{ stat.status }} für gesamt {{ stat.durationInDays }} Tage
-              <span class="whitespace-nowrap"> ~> {{ stat.durationInYears.replace("_", "") }} Jahre</span>
+              <span class="whitespace-nowrap"> ~> {{ stat.exactDuration }}</span>
             </p>
           </div>
         </div>
diff --git a/src/views/admin/user/backup/Backup.vue b/src/views/admin/user/backup/BackupRouting.vue
similarity index 57%
rename from src/views/admin/user/backup/Backup.vue
rename to src/views/admin/user/backup/BackupRouting.vue
index b238994..477398e 100644
--- a/src/views/admin/user/backup/Backup.vue
+++ b/src/views/admin/user/backup/BackupRouting.vue
@@ -6,17 +6,27 @@
       </div>
     </template>
     <template #diffMain>
-      <div class="flex flex-col gap-4 h-full pl-7">
-        <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
-          <BackupListItem v-for="backup in backups" :key="backup" :backup="backup" />
-        </div>
-        <div class="flex flex-row gap-4">
-          <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openCreateModal">
-            Backup erstellen
-          </button>
-          <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openUploadModal">
-            Backup hochladen
-          </button>
+      <div class="flex flex-col gap-2 grow px-7 overflow-hidden">
+        <div class="flex flex-col grow gap-2 overflow-hidden">
+          <div class="w-full flex flex-row max-lg:flex-wrap justify-center">
+            <RouterLink
+              v-for="tab in tabs"
+              :key="tab.route"
+              v-slot="{ isActive }"
+              :to="{ name: tab.route }"
+              class="w-1/2 p-0.5 first:pl-0 last:pr-0"
+            >
+              <p
+                :class="[
+                  'w-full rounded-lg py-2.5 text-sm text-center font-medium leading-5 focus:ring-0 outline-none',
+                  isActive ? 'bg-red-200 shadow border-b-2 border-primary rounded-b-none' : ' hover:bg-red-200',
+                ]"
+              >
+                {{ tab.title }}
+              </p>
+            </RouterLink>
+          </div>
+          <RouterView />
         </div>
       </div>
     </template>
@@ -35,6 +45,14 @@ import { useAbilityStore } from "@/stores/ability";
 
 <script lang="ts">
 export default defineComponent({
+  data() {
+    return {
+      tabs: [
+        { route: "admin-user-backup-generated", title: "Erstellt" },
+        { route: "admin-user-backup-uploaded", title: "Uploads" },
+      ],
+    };
+  },
   computed: {
     ...mapState(useBackupStore, ["backups"]),
     ...mapState(useAbilityStore, ["can"]),
diff --git a/src/views/admin/user/backup/GeneratedBackup.vue b/src/views/admin/user/backup/GeneratedBackup.vue
new file mode 100644
index 0000000..b42d93b
--- /dev/null
+++ b/src/views/admin/user/backup/GeneratedBackup.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="flex flex-col gap-4 h-full pl-7">
+    <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
+      <BackupListItem v-for="backup in backups" :key="backup" :backup="backup" />
+    </div>
+    <div class="flex flex-row gap-4">
+      <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openCreateModal">
+        Backup erstellen
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { mapState, mapActions } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { useBackupStore } from "@/stores/admin/user/backup";
+import BackupListItem from "@/components/admin/user/backup/BackupListItem.vue";
+import { useModalStore } from "@/stores/modal";
+import { useAbilityStore } from "@/stores/ability";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  computed: {
+    ...mapState(useBackupStore, ["backups"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchBackups();
+  },
+  methods: {
+    ...mapActions(useBackupStore, ["fetchBackups"]),
+    ...mapActions(useModalStore, ["openModal"]),
+    openCreateModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/CreateBackupModal.vue")))
+      );
+    },
+    openUploadModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/UploadBackupModal.vue")))
+      );
+    },
+  },
+});
+</script>
diff --git a/src/views/admin/user/backup/UploadedBackup.vue b/src/views/admin/user/backup/UploadedBackup.vue
new file mode 100644
index 0000000..b5f975c
--- /dev/null
+++ b/src/views/admin/user/backup/UploadedBackup.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="flex flex-col gap-4 h-full pl-7">
+    <div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
+      <BackupListItem v-for="backup in backups" :key="backup" :backup="backup" />
+    </div>
+    <div class="flex flex-row gap-4">
+      <button v-if="can('create', 'user', 'backup')" primary class="!w-fit" @click="openUploadModal">
+        Backup hochladen
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { mapState, mapActions } from "pinia";
+import MainTemplate from "@/templates/Main.vue";
+import { useBackupStore } from "@/stores/admin/user/backup";
+import BackupListItem from "@/components/admin/user/backup/BackupListItem.vue";
+import { useModalStore } from "@/stores/modal";
+import { useAbilityStore } from "@/stores/ability";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  computed: {
+    ...mapState(useBackupStore, ["backups"]),
+    ...mapState(useAbilityStore, ["can"]),
+  },
+  mounted() {
+    this.fetchBackups();
+  },
+  methods: {
+    ...mapActions(useBackupStore, ["fetchBackups"]),
+    ...mapActions(useModalStore, ["openModal"]),
+    openCreateModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/CreateBackupModal.vue")))
+      );
+    },
+    openUploadModal() {
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/user/backup/UploadBackupModal.vue")))
+      );
+    },
+  },
+});
+</script>