src/components/UserMenu.vue

@@ -21,7 +21,7 @@
         </div>
         <div class="px-1 py-1 w-full flex flex-col gap-2">
           <MenuItem v-slot="{ close }">
-            <RouterLink to="/account">
+            <RouterLink to="/account/me">
               <button button primary @click="close">Mein Account</button>
             </RouterLink>
           </MenuItem>

src/stores/admin/navigation.ts

@@ -46,7 +46,7 @@ export const useNavigationStore = defineStore("navigation", {
     resetNavigation() {
       this.$reset();
     },
-    updateTopLevel(first: boolean = false) {
+    updateTopLevel() {
       const abilityStore = useAbilityStore();
       this.topLevel = [
         ...(abilityStore.canSection("read", "club")
@@ -82,7 +82,7 @@ export const useNavigationStore = defineStore("navigation", {
         router.push({ name: `admin-${this.topLevel[0]?.key ?? "club"}-default` });
       }
     },
-    updateNavigation(first: boolean = false) {
+    updateNavigation() {
       const abilityStore = useAbilityStore();
       this.navigation = {
         club: {
@@ -129,8 +129,12 @@ export const useNavigationStore = defineStore("navigation", {
           ],
         },
       } as navigationModel;
-      if (this.activeNavigationObject.main.findIndex((e) => e.key == this.activeLink) == -1) {
+      if (
-        router.push({ name: `admin-${this.activeNavigation}-default` });
+        this.activeNavigationObject.main.findIndex((e) => e.key == this.activeLink) == -1 ||
+        this.activeLink == "default"
+      ) {
+        let link = this.activeNavigationObject.main[0].key;
+        router.push({ name: `admin-${this.activeNavigation}-${link}` });
       }
     },
   },

src/views/admin/View.vue

@@ -58,8 +58,8 @@ export default defineComponent({
       this.updateTopLevel();
       this.updateNavigation();
     });
-    this.updateTopLevel(true);
+    this.updateTopLevel();
-    this.updateNavigation(true);
+    this.updateNavigation();
   },
   beforeUnmount() {
     this.resetNavigation();