-
+
();
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
>,
+ type: Array as PropType>,
default: [],
},
title: String,
@@ -133,7 +133,7 @@ export default defineComponent({
get() {
return this.modelValue;
},
- set(val: Array) {
+ set(val: Array) {
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/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 @@
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
diff --git a/src/components/admin/user/backup/RestoreBackupModal.vue b/src/components/admin/user/backup/RestoreBackupModal.vue
new file mode 100644
index 0000000..c80e026
--- /dev/null
+++ b/src/components/admin/user/backup/RestoreBackupModal.vue
@@ -0,0 +1,107 @@
+
+
+
+
Backup {{ data }} laden
+
+
+
+
+
+
+
+
+
+
oder
+
+
+
+
+
+
+
+
+
+
+
+
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 4d46b2b..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),
@@ -634,6 +635,32 @@ const router = createRouter({
},
],
},
+ {
+ path: "backup",
+ 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/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,
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): Promise> {
+ async getMembersByIds(ids: Array): Promise> {
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> {
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,
- origin: [] as Array,
+ recipients: [] as Array,
+ origin: [] as Array,
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/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..1f87652
--- /dev/null
+++ b/src/stores/admin/user/backup.ts
@@ -0,0 +1,57 @@
+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,
+ loading: null as null | "loading" | "success" | "failed",
+ page: "generated" as "generated" | "uploaded",
+ };
+ },
+ actions: {
+ fetchBackups() {
+ this.loading = "loading";
+ http
+ .get(`/admin/backup/${this.page}`)
+ .then((result) => {
+ this.backups = result.data;
+ this.loading = "success";
+ })
+ .catch((err) => {
+ this.loading = "failed";
+ });
+ },
+ fetchBackupById(filename: string): Promise> {
+ return http.get(`/admin/backup/${this.page}/${filename}`);
+ },
+ async restoreBackup(backup: BackupRestoreViewModel): Promise> {
+ return await http.post(`/admin/backup/${this.page}/restore`, backup);
+ },
+ async triggerBackupCreate(): Promise> {
+ const result = await http.post("/admin/backup");
+ this.fetchBackups();
+ return result;
+ },
+ async uploadBackup(file: File): Promise> {
+ 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/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> {
+ fetchUserById(id: string): Promise> {
return http.get(`/admin/user/${id}`);
},
- updateActiveUser(user: UpdateUserViewModel): Promise> {
- 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> {
- return http
- .patch(`/admin/user/${user}/permissions`, {
- permissions: permission,
- })
- .then((result) => {
- this.fetchUsers();
- return result;
- });
- },
- updateActiveUserRoles(user: number, roles: Array): Promise> {
- return http
- .patch(`/admin/user/${user}/roles`, {
- roleIds: roles,
- })
- .then((result) => {
- this.fetchUsers();
- return result;
- });
- },
- deleteUser(user: number): Promise> {
- return http.delete(`/admin/user/${user}`).then((result) => {
- this.fetchUsers();
- return result;
+ async updateActiveUser(user: UpdateUserViewModel): Promise> {
+ 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> {
+ const result = await http.patch(`/admin/user/${userId}/permissions`, {
+ permissions: permission,
+ });
+ this.fetchUsers();
+ return result;
+ },
+ async updateActiveUserRoles(userId: string, roles: Array): Promise> {
+ const result = await http.patch(`/admin/user/${userId}/roles`, {
+ roleIds: roles,
+ });
+ this.fetchUsers();
+ return result;
+ },
+ async deleteUser(userId: string): Promise> {
+ const result = await http.delete(`/admin/user/${userId}`);
+ this.fetchUsers();
+ 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 = [
+ "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 = [
"query_store",
"template",
"template_usage",
+ "backup",
];
export const permissionTypes: Array = ["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/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/member/membership.models.ts b/src/viewmodels/admin/club/member/membership.models.ts
index 6051ec9..ccf8105 100644
--- a/src/viewmodels/admin/club/member/membership.models.ts
+++ b/src/viewmodels/admin/club/member/membership.models.ts
@@ -9,10 +9,11 @@ export interface MembershipViewModel {
export interface MembershipStatisticsViewModel {
durationInDays: number;
- durationInYears: string;
+ durationInYears: number;
+ exactDuration: string;
status: string;
statusId: number;
- memberId: number;
+ memberId: string;
memberSalutation: string;
memberFirstname: string;
memberLastname: 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;
+ memberIds: Array;
}
diff --git a/src/viewmodels/admin/user/backup.models.ts b/src/viewmodels/admin/user/backup.models.ts
new file mode 100644
index 0000000..522c0ff
--- /dev/null
+++ b/src/viewmodels/admin/user/backup.models.ts
@@ -0,0 +1,8 @@
+import type { BackupSection } from "../../../types/backupTypes";
+
+export interface BackupRestoreViewModel {
+ filename: string;
+ partial: boolean;
+ include: Array;
+ overwrite: boolean;
+}
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/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,
diff --git a/src/views/admin/club/members/MemberOverview.vue b/src/views/admin/club/members/MemberOverview.vue
index c92deab..9a3d079 100644
--- a/src/views/admin/club/members/MemberOverview.vue
+++ b/src/views/admin/club/members/MemberOverview.vue
@@ -34,7 +34,7 @@
>
{{ stat.status }} für gesamt {{ stat.durationInDays }} Tage
- ~> {{ stat.durationInYears.replace("_", "") }} Jahre
+ ~> {{ stat.exactDuration }}
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/backup/BackupRouting.vue b/src/views/admin/user/backup/BackupRouting.vue
new file mode 100644
index 0000000..477398e
--- /dev/null
+++ b/src/views/admin/user/backup/BackupRouting.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
Backups
+
+
+
+
+
+
+
+
+ {{ tab.title }}
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
Diese Seite existiert nicht.
-
+