From ff455efe84f688c584ab769a15c059ee859c8a7e Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Wed, 13 Mar 2024 16:27:34 +0100
Subject: [PATCH] fix: profile links in cockpit / learning mentor

---
 .../src/pages/cockpit/cockpitPage/CockpitExpertPage.vue   | 5 ++++-
 .../learningMentor/mentor/MentorParticipantsPage.vue      | 5 ++++-
 client/src/pages/learningPath/circlePage/CirclePage.vue   | 5 ++++-
 client/src/pages/userProfile/UserProfilePage.vue          | 8 --------
 client/src/router/index.ts                                | 1 -
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue b/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
index 744a94de..6cbd4203 100644
--- a/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
+++ b/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
@@ -148,7 +148,10 @@ const courseSessionDetailResult = useCourseSessionDetailQuery();
                 </template>
                 <template #link>
                   <router-link
-                    :to="`/course/${props.courseSlug}/profile/${csu.user_id}`"
+                    :to="{
+                      name: 'profileLearningPath',
+                      params: { userId: csu.user_id, courseSlug: props.courseSlug },
+                    }"
                     class="link w-full lg:text-right"
                   >
                     {{ $t("general.profileLink") }}
diff --git a/client/src/pages/learningMentor/mentor/MentorParticipantsPage.vue b/client/src/pages/learningMentor/mentor/MentorParticipantsPage.vue
index dac287c1..b86c8f8b 100644
--- a/client/src/pages/learningMentor/mentor/MentorParticipantsPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorParticipantsPage.vue
@@ -30,7 +30,10 @@ const { summary } = useLearningMentees(courseSession.value.id);
           </div>
         </div>
         <router-link
-          :to="{ name: 'userProfile', params: { userId: participant.id } }"
+          :to="{
+            name: 'profileLearningPath',
+            params: { userId: participant.id, courseSlug: courseSession.course.slug },
+          }"
           class="underline"
         >
           {{ $t("cockpit.profileLink") }}
diff --git a/client/src/pages/learningPath/circlePage/CirclePage.vue b/client/src/pages/learningPath/circlePage/CirclePage.vue
index 90e92244..91ec6eff 100644
--- a/client/src/pages/learningPath/circlePage/CirclePage.vue
+++ b/client/src/pages/learningPath/circlePage/CirclePage.vue
@@ -172,7 +172,10 @@ watch(
                 <div>
                   <router-link
                     class="link"
-                    :to="`/course/${courseSlug}/profile/${profileUser.user_id}`"
+                    :to="{
+                      name: 'profileLearningPath',
+                      params: { userId: profileUser.user_id, courseSlug },
+                    }"
                   >
                     {{ $t("general.profileLink") }}
                   </router-link>
diff --git a/client/src/pages/userProfile/UserProfilePage.vue b/client/src/pages/userProfile/UserProfilePage.vue
index a16c9230..639becc1 100644
--- a/client/src/pages/userProfile/UserProfilePage.vue
+++ b/client/src/pages/userProfile/UserProfilePage.vue
@@ -40,14 +40,6 @@ onMounted(() => {
   <div v-if="user" class="flex flex-col bg-gray-200">
     <div class="relative border-b bg-white shadow-md">
       <div class="container-large pb-0">
-        <router-link
-          class="btn-text inline-flex items-center pl-0"
-          :to="`/course/${props.courseSlug}/cockpit`"
-        >
-          <it-icon-arrow-left />
-          <span>{{ $t("general.back") }}</span>
-        </router-link>
-
         <div class="mb-12 mt-2 flex items-center">
           <img class="mr-8 h-48 w-48 rounded-full" :src="user.avatar_url" />
           <div class="flex flex-col">
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index c92e7bb2..abe6b431 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -160,7 +160,6 @@ const router = createRouter({
       path: "/course/:courseSlug/profile/:userId",
       component: () => import("@/pages/userProfile/UserProfilePage.vue"),
       props: true,
-      name: "userProfile",
       children: [
         {
           path: "learning-path",