diff --git a/client/src/components/cockpit/profile/CockpitProfileContent.vue b/client/src/components/userProfile/UserProfileContent.vue similarity index 100% rename from client/src/components/cockpit/profile/CockpitProfileContent.vue rename to client/src/components/userProfile/UserProfileContent.vue diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipantsPage.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipantsPage.vue index 5356d283..f1393761 100644 --- a/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipantsPage.vue +++ b/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipantsPage.vue @@ -28,7 +28,7 @@ const { summary } = useMentorCockpit(courseSession.value.id); {{ $t("cockpit.profileLink") }} diff --git a/client/src/pages/cockpit/vv/VVCockpitParentPage.vue b/client/src/pages/cockpit/vv/VVCockpitParentPage.vue deleted file mode 100644 index ed872e95..00000000 --- a/client/src/pages/cockpit/vv/VVCockpitParentPage.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/client/src/pages/cockpit/profilePage/CompetenceProfilePage.vue b/client/src/pages/userProfile/CompetenceProfilePage.vue similarity index 95% rename from client/src/pages/cockpit/profilePage/CompetenceProfilePage.vue rename to client/src/pages/userProfile/CompetenceProfilePage.vue index b306ba5b..b193eef4 100644 --- a/client/src/pages/cockpit/profilePage/CompetenceProfilePage.vue +++ b/client/src/pages/userProfile/CompetenceProfilePage.vue @@ -1,5 +1,5 @@ diff --git a/client/src/pages/cockpit/profilePage/CockpitUserProfilePage.vue b/client/src/pages/userProfile/UserProfilePage.vue similarity index 93% rename from client/src/pages/cockpit/profilePage/CockpitUserProfilePage.vue rename to client/src/pages/userProfile/UserProfilePage.vue index fe9c24a6..a16c9230 100644 --- a/client/src/pages/cockpit/profilePage/CockpitUserProfilePage.vue +++ b/client/src/pages/userProfile/UserProfilePage.vue @@ -13,8 +13,8 @@ const props = defineProps<{ const { t } = useTranslation(); const pages = ref([ - { label: t("general.learningPath"), route: "cockpitProfileLearningPath" }, - { label: t("a.KompetenzNavi"), route: "cockpitProfileCompetence" }, + { label: t("general.learningPath"), route: "profileLearningPath" }, + { label: t("a.KompetenzNavi"), route: "profileCompetence" }, ]); const courseSession = useCurrentCourseSession(); diff --git a/client/src/router/index.ts b/client/src/router/index.ts index 0e6c6b2d..60c8ede2 100644 --- a/client/src/router/index.ts +++ b/client/src/router/index.ts @@ -157,6 +157,26 @@ const router = createRouter({ public: true, }, }, + { + path: "/course/:courseSlug/profile/:userId", + component: () => import("@/pages/userProfile/UserProfilePage.vue"), + props: true, + name: "userProfile", + children: [ + { + path: "learning-path", + component: () => import("@/pages/userProfile/LearningPathProfilePage.vue"), + props: true, + name: "profileLearningPath", + }, + { + path: "competence", + component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"), + props: true, + name: "profileCompetence", + }, + ], + }, { path: "/course/:courseSlug/cockpit", name: "cockpit", @@ -244,29 +264,6 @@ const router = createRouter({ }, ], }, - { - path: "profile/:userId", - component: () => - import("@/pages/cockpit/profilePage/CockpitUserProfilePage.vue"), - props: true, - name: "cockpitUserProfile", - children: [ - { - path: "learning-path", - component: () => - import("@/pages/cockpit/profilePage/LearningPathProfilePage.vue"), - props: true, - name: "cockpitProfileLearningPath", - }, - { - path: "competence", - component: () => - import("@/pages/cockpit/profilePage/CompetenceProfilePage.vue"), - props: true, - name: "cockpitProfileCompetence", - }, - ], - }, { path: "profile/:userId/:circleSlug", component: () => import("@/pages/cockpit/CockpitUserCirclePage.vue"),