Merge branch 'main' into #3-calendar

# Conflicts:
#	package-lock.json
#	src/data-source.ts
#	src/routes/admin/index.ts
#	src/type/permissionTypes.ts
This commit is contained in:
Julian Krauser 2024-11-07 11:09:52 +01:00
commit 98eb870385
48 changed files with 2672 additions and 9 deletions

View file

@ -4,7 +4,7 @@ export type PermissionModule =
| "member"
| "calendar"
| "newsletter"
| "protocoll"
| "protocol"
| "qualification"
| "award"
| "executive_position"
@ -40,7 +40,7 @@ export const permissionModules: Array<PermissionModule> = [
"member",
"calendar",
"newsletter",
"protocoll",
"protocol",
"qualification",
"award",
"executive_position",
@ -52,7 +52,7 @@ export const permissionModules: Array<PermissionModule> = [
];
export const permissionTypes: Array<PermissionType> = ["read", "create", "update", "delete"];
export const sectionsAndModules: SectionsAndModulesObject = {
club: ["member", "calendar", "newsletter", "protocoll"],
club: ["member", "calendar", "newsletter", "protocol"],
settings: ["qualification", "award", "executive_position", "communication", "membership_status", "calendar_type"],
user: ["user", "role"],
};