diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 2dabe392..14e1178d 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,15 +1,11 @@ - - - - + diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue index ed80d7c2..b456429c 100644 --- a/frontend/src/components/MenuBar.vue +++ b/frontend/src/components/MenuBar.vue @@ -296,7 +296,6 @@ - @@ -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; - } - } diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 810764b5..a4a64f35 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -110,23 +110,30 @@ const router = createRouter({ meta: { requiresAuth: true }, }, { - path: "/learningPath/search", - name: "LearningPathSearchPage", - component: LearningPathSearchPage, - meta: { requiresAuth: false } - }, - { - path: "/learningPath/:hruid/:language", - name: "LearningPath", - component: LearningPathPage, - props: true, - meta: { requiresAuth: false }, + path: "/learningPath", + component: MenuBar, children: [ { - path: ":learningObjectHruid", + path: "/search", + name: "LearningPathSearchPage", + component: LearningPathSearchPage, + meta: { requiresAuth: true } + }, + { + path: "/:hruid/:language", + name: "LearningPath", component: LearningPathPage, props: true, - } + meta: { requiresAuth: true }, + children: [ + { + path: ":learningObjectHruid", + component: LearningPathPage, + props: true, + meta: { requiresAuth: true } + } + ] + }, ] }, { diff --git a/frontend/src/views/learning-paths/LearningPathPage.vue b/frontend/src/views/learning-paths/LearningPathPage.vue index 2a17b544..65c1ef4d 100644 --- a/frontend/src/views/learning-paths/LearningPathPage.vue +++ b/frontend/src/views/learning-paths/LearningPathPage.vue @@ -123,84 +123,86 @@ - - - - - - {{ t("legendNotCompletedYet") }} - {{ t("legendCompleted") }} - {{ t("legendTeacherExclusive") }} - - - + + + + + + + {{ t("legendNotCompletedYet") }} + {{ t("legendCompleted") }} + {{ t("legendTeacherExclusive") }} + + + - - - + - - - - - {{ node.estimatedTime }}' - - - + + + + + + {{ node.estimatedTime }}' + + + + + + + + + + - - - - - - - - - - - {{ t("previous") }} - - - {{ t("next") }} - - - + + + + {{ t("previous") }} + + + {{ t("next") }} + + + +
{{ t("legendNotCompletedYet") }}
{{ t("legendCompleted") }}
{{ t("legendTeacherExclusive") }}