Merge branch 'milestone/ff-admin-unit' into unit/#70-build-ui-demo

# Conflicts:
#	package-lock.json
#	package.json
#	src/router/club/newsletterGuard.ts
#	src/router/club/protocolGuard.ts
#	src/router/index.ts
#	src/types/permissionTypes.ts
#	src/views/admin/club/newsletter/NewsletterRecipients.vue

src/router/authGuard.ts

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

src/router/club/newsletterGuard.ts

@@ -1,7 +1,7 @@
 import { useNewsletterStore } from "@/stores/admin/club/newsletter/newsletter";
 import { useNewsletterDatesStore } from "@/stores/admin/club/newsletter/newsletterDates";
 import { useNewsletterRecipientsStore } from "@/stores/admin/club/newsletter/newsletterRecipients";
-import { useNewsletterPrintoutStore } from "../../stores/admin/club/newsletter/newsletterPrintout";
+import { useNewsletterPrintoutStore } from "@/stores/admin/club/newsletter/newsletterPrintout";
 
 export async function setNewsletterId(to: any, from: any, next: any) {
   const newsletter = useNewsletterStore();

src/router/club/protocolGuard.ts

@@ -3,7 +3,7 @@ import { useProtocolAgendaStore } from "@/stores/admin/club/protocol/protocolAge
 import { useProtocolDecisionStore } from "@/stores/admin/club/protocol/protocolDecision";
 import { useProtocolPresenceStore } from "@/stores/admin/club/protocol/protocolPresence";
 import { useProtocolVotingStore } from "@/stores/admin/club/protocol/protocolVoting";
-import { useProtocolPrintoutStore } from "../../stores/admin/club/protocol/protocolPrintout";
+import { useProtocolPrintoutStore } from "@/stores/admin/club/protocol/protocolPrintout";
 
 export async function setProtocolId(to: any, from: any, next: any) {
   const protocol = useProtocolStore();

src/router/index.ts

@@ -2,14 +2,12 @@ import { createRouter, createWebHistory } from "vue-router";
 import Login from "@/views/Login.vue";
 
 import { isAuthenticated } from "./authGuard";
-import { loadAccountData } from "./accountGuard";
 import { isSetup } from "./setupGuard";
 import { abilityAndNavUpdate } from "./adminGuard";
 import type { PermissionType, PermissionSection, PermissionModule } from "@/types/permissionTypes";
 import { resetMemberStores, setMemberId } from "./club/memberGuard";
 import { resetProtocolStores, setProtocolId } from "./club/protocolGuard";
 import { resetNewsletterStores, setNewsletterId } from "./club/newsletterGuard";
-import { config } from "../config";
 import { setBackupPage } from "./management/backupGuard";
 import { resetEquipmentTypeStores, setEquipmentTypeId } from "./unit/equipmentType";
 import { resetEquipmentStores, setEquipmentId } from "./unit/equipment";
@@ -1191,6 +1189,13 @@ const router = createRouter({
                 },
               ],
             },
+            {
+              path: "settings",
+              name: "admin-management-setting",
+              component: () => import("@/views/admin/management/setting/Setting.vue"),
+              meta: { type: "read", section: "management", module: "setting" },
+              beforeEnter: [abilityAndNavUpdate],
+            },
             {
               path: "backup",
               name: "admin-management-backup-route",
@@ -1326,10 +1331,6 @@ const router = createRouter({
   ],
 });
 
-router.afterEach((to, from) => {
-  document.title = config.app_name_overwrite || "FF Admin";
-});
-
 export default router;
 
 declare module "vue-router" {