chore: move profile out of cockpit (shared)

This commit is contained in:
Livio Bieri 2024-03-08 10:40:56 +01:00
parent ee8e6e23c4
commit d9cb334404
7 changed files with 27 additions and 41 deletions

View File

@ -28,7 +28,7 @@ const { summary } = useMentorCockpit(courseSession.value.id);
</div>
</div>
<router-link
:to="{ name: 'cockpitUserProfile', params: { userId: participant.id } }"
:to="{ name: 'userProfile', params: { userId: participant.id } }"
class="underline"
>
{{ $t("cockpit.profileLink") }}

View File

@ -1,11 +0,0 @@
<script setup lang="ts"></script>
<template>
<div class="bg-gray-200">
<main>
<div>
<router-view></router-view>
</div>
</main>
</div>
</template>

View File

@ -1,5 +1,5 @@
<script setup lang="ts">
import CockpitProfileContent from "@/components/cockpit/profile/CockpitProfileContent.vue";
import CockpitProfileContent from "@/components/userProfile/UserProfileContent.vue";
import { ref } from "vue";
import SelfEvaluationAndFeedbackList from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackList.vue";
import SelfEvaluationAndFeedbackOverview from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue";

View File

@ -1,7 +1,7 @@
<script setup lang="ts">
import { calculateCircleSectorData } from "@/pages/learningPath/learningPathPage/utils";
import { useCourseDataWithCompletion } from "@/composables";
import CockpitProfileContent from "@/components/cockpit/profile/CockpitProfileContent.vue";
import UserProfileContent from "@/components/userProfile/UserProfileContent.vue";
import LearningPathCircle from "@/pages/learningPath/learningPathPage/LearningPathCircle.vue";
import LearningSequence from "@/pages/learningPath/circlePage/LearningSequence.vue";
import { ref, watch } from "vue";
@ -28,7 +28,7 @@ watch(lpQueryResult.learningPath, () => {
</script>
<template>
<CockpitProfileContent>
<UserProfileContent>
<template #side>
<div
v-for="topic in lpQueryResult.learningPath?.value?.topics ?? []"
@ -69,5 +69,5 @@ watch(lpQueryResult.learningPath, () => {
</li>
</ol>
</template>
</CockpitProfileContent>
</UserProfileContent>
</template>

View File

@ -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();

View File

@ -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"),