fix(frontend): Fouten door de merge van dev opgelost.

This commit is contained in:
Gerald Schmittinger 2025-03-25 10:05:31 +01:00
parent 858f4c3694
commit 18616450cf
4 changed files with 97 additions and 105 deletions

View file

@ -1,15 +1,11 @@
<script setup lang="ts"> <script setup lang="ts">
import auth from "@/services/auth/auth-service.ts"; import auth from "@/services/auth/auth-service.ts";
import MenuBar from "@/components/MenuBar.vue";
auth.loadUser(); auth.loadUser();
</script> </script>
<template> <template>
<v-app> <v-app>
<menu-bar></menu-bar>
<v-main>
<router-view /> <router-view />
</v-main>
</v-app> </v-app>
</template> </template>

View file

@ -296,7 +296,6 @@
</li> </li>
</div> </div>
</nav> </nav>
<router-view />
</main> </main>
</template> </template>
@ -352,16 +351,4 @@
nav a.router-link-active { nav a.router-link-active {
font-weight: bold; font-weight: bold;
} }
@media (max-width: 700px) {
.menu {
display: none;
}
}
@media (min-width: 701px) {
.menu_collapsed {
display: none;
}
}
</style> </style>

View file

@ -110,25 +110,32 @@ const router = createRouter({
meta: { requiresAuth: true }, meta: { requiresAuth: true },
}, },
{ {
path: "/learningPath/search", path: "/learningPath",
component: MenuBar,
children: [
{
path: "/search",
name: "LearningPathSearchPage", name: "LearningPathSearchPage",
component: LearningPathSearchPage, component: LearningPathSearchPage,
meta: { requiresAuth: false } meta: { requiresAuth: true }
}, },
{ {
path: "/learningPath/:hruid/:language", path: "/:hruid/:language",
name: "LearningPath", name: "LearningPath",
component: LearningPathPage, component: LearningPathPage,
props: true, props: true,
meta: { requiresAuth: false }, meta: { requiresAuth: true },
children: [ children: [
{ {
path: ":learningObjectHruid", path: ":learningObjectHruid",
component: LearningPathPage, component: LearningPathPage,
props: true, props: true,
meta: { requiresAuth: true }
} }
] ]
}, },
]
},
{ {
path: "/:catchAll(.*)", path: "/:catchAll(.*)",
name: "NotFound", name: "NotFound",

View file

@ -123,6 +123,7 @@
</script> </script>
<template> <template>
<v-main>
<using-remote-resource <using-remote-resource
:resource="learningPathResource" :resource="learningPathResource"
v-slot="learningPath: {data: LearningPath}" v-slot="learningPath: {data: LearningPath}"
@ -201,6 +202,7 @@
</v-btn> </v-btn>
</div> </div>
</using-remote-resource> </using-remote-resource>
</v-main>
</template> </template>
<style scoped> <style scoped>