From b682c5561f710927dc7efa8d8e48a7861253352d Mon Sep 17 00:00:00 2001 From: Elia Bieri Date: Wed, 25 Sep 2024 10:37:15 +0200 Subject: [PATCH 1/3] Only show cockpit and preview link when in CS --- client/src/components/header/MainNavigationBar.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue index 1f478161..8b2f7ca8 100644 --- a/client/src/components/header/MainNavigationBar.vue +++ b/client/src/components/header/MainNavigationBar.vue @@ -90,12 +90,17 @@ const hasMediaLibraryMenu = computed(() => ) ); -const hasCockpitMenu = computed(() => - Boolean(courseSessionsStore.currentCourseSession?.actions.includes("expert-cockpit")) +const hasCockpitMenu = computed( + () => + Boolean( + courseSessionsStore.currentCourseSession?.actions.includes("expert-cockpit") + ) && inCourse() ); -const hasPreviewMenu = computed(() => - Boolean(courseSessionsStore.currentCourseSession?.actions.includes("preview")) +const hasPreviewMenu = computed( + () => + Boolean(courseSessionsStore.currentCourseSession?.actions.includes("preview")) && + inCourse() ); const hasAppointmentsMenu = computed(() => From fd9f2162c52acad034b24299449b2a9a866a74c5 Mon Sep 17 00:00:00 2001 From: Elia Bieri Date: Wed, 25 Sep 2024 11:03:50 +0200 Subject: [PATCH 2/3] Remove CS switcher when not in course --- client/src/components/header/AccountMenuContent.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/components/header/AccountMenuContent.vue b/client/src/components/header/AccountMenuContent.vue index a8cda83f..c70f966b 100644 --- a/client/src/components/header/AccountMenuContent.vue +++ b/client/src/components/header/AccountMenuContent.vue @@ -2,6 +2,7 @@ import CourseSessionsMenu from "@/components/header/CourseSessionsMenu.vue"; import type { User } from "@/stores/user"; import type { CourseSession } from "@/types"; +import { useRouteLookups } from "@/utils/route"; import { useRouter } from "vue-router"; const props = defineProps<{ @@ -13,6 +14,7 @@ const props = defineProps<{ const emit = defineEmits(["selectCourseSession", "logout", "close"]); const router = useRouter(); +const { inCourse } = useRouteLookups(); async function navigate(routeName: string) { await router.push({ name: routeName }); @@ -41,7 +43,7 @@ async function navigate(routeName: string) { -
+
Date: Wed, 25 Sep 2024 13:27:32 +0200 Subject: [PATCH 3/3] Minor refactor --- client/src/components/header/AccountMenuContent.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/components/header/AccountMenuContent.vue b/client/src/components/header/AccountMenuContent.vue index c70f966b..7f38ea98 100644 --- a/client/src/components/header/AccountMenuContent.vue +++ b/client/src/components/header/AccountMenuContent.vue @@ -3,6 +3,7 @@ import CourseSessionsMenu from "@/components/header/CourseSessionsMenu.vue"; import type { User } from "@/stores/user"; import type { CourseSession } from "@/types"; import { useRouteLookups } from "@/utils/route"; +import { computed } from "vue"; import { useRouter } from "vue-router"; const props = defineProps<{ @@ -16,6 +17,8 @@ const emit = defineEmits(["selectCourseSession", "logout", "close"]); const router = useRouter(); const { inCourse } = useRouteLookups(); +const showCourseSessionMenu = computed(() => inCourse() && props.courseSessions.length); + async function navigate(routeName: string) { await router.push({ name: routeName }); emit("close"); @@ -43,7 +46,7 @@ async function navigate(routeName: string) {
-
+