fix(frontend): Fouten door de merge van dev opgelost.
This commit is contained in:
parent
858f4c3694
commit
18616450cf
4 changed files with 97 additions and 105 deletions
|
@ -1,15 +1,11 @@
|
|||
<script setup lang="ts">
|
||||
import auth from "@/services/auth/auth-service.ts";
|
||||
import MenuBar from "@/components/MenuBar.vue";
|
||||
auth.loadUser();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<v-app>
|
||||
<menu-bar></menu-bar>
|
||||
<v-main>
|
||||
<router-view />
|
||||
</v-main>
|
||||
</v-app>
|
||||
</template>
|
||||
|
||||
|
|
|
@ -296,7 +296,6 @@
|
|||
</li>
|
||||
</div>
|
||||
</nav>
|
||||
<router-view />
|
||||
</main>
|
||||
</template>
|
||||
|
||||
|
@ -352,16 +351,4 @@
|
|||
nav a.router-link-active {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
@media (max-width: 700px) {
|
||||
.menu {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 701px) {
|
||||
.menu_collapsed {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -110,25 +110,32 @@ const router = createRouter({
|
|||
meta: { requiresAuth: true },
|
||||
},
|
||||
{
|
||||
path: "/learningPath/search",
|
||||
path: "/learningPath",
|
||||
component: MenuBar,
|
||||
children: [
|
||||
{
|
||||
path: "/search",
|
||||
name: "LearningPathSearchPage",
|
||||
component: LearningPathSearchPage,
|
||||
meta: { requiresAuth: false }
|
||||
meta: { requiresAuth: true }
|
||||
},
|
||||
{
|
||||
path: "/learningPath/:hruid/:language",
|
||||
path: "/:hruid/:language",
|
||||
name: "LearningPath",
|
||||
component: LearningPathPage,
|
||||
props: true,
|
||||
meta: { requiresAuth: false },
|
||||
meta: { requiresAuth: true },
|
||||
children: [
|
||||
{
|
||||
path: ":learningObjectHruid",
|
||||
component: LearningPathPage,
|
||||
props: true,
|
||||
meta: { requiresAuth: true }
|
||||
}
|
||||
]
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
path: "/:catchAll(.*)",
|
||||
name: "NotFound",
|
||||
|
|
|
@ -123,6 +123,7 @@
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<v-main>
|
||||
<using-remote-resource
|
||||
:resource="learningPathResource"
|
||||
v-slot="learningPath: {data: LearningPath}"
|
||||
|
@ -201,6 +202,7 @@
|
|||
</v-btn>
|
||||
</div>
|
||||
</using-remote-resource>
|
||||
</v-main>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue