ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix route matching with special chars

This commit is contained in:
Daniel Egger 2022-12-02 16:31:15 +01:00
parent 7bddd43b65
commit 299b30cb0f
6 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/pages/competence/CompetenceIndexPage.vue
View File

@ -51,7 +51,7 @@ const countStatus = computed(() => {
<template> <template>
<div class="container-large lg:mt-4"> <div class="container-large lg:mt-4">
<div <div
v-if="competenceStore.competenceProfilePage" v-if="competenceStore.competenceProfilePage()"
class="flex flex-col lg:flex-row lg:items-center justify-between mb-10" class="flex flex-col lg:flex-row lg:items-center justify-between mb-10"
> >
<h1>{{ $t("competences.title") }}</h1> <h1>{{ $t("competences.title") }}</h1>
@ -83,7 +83,7 @@ const countStatus = computed(() => {
</li> </li>
</ul> </ul>
<router-link <router-link
:to="`${competenceStore.competenceProfilePage?.frontend_url}/competences`" :to="`${competenceStore.competenceProfilePage()?.frontend_url}/competences`"
class="btn-text inline-flex items-center pl-0 py-2" class="btn-text inline-flex items-center pl-0 py-2"
> >
<span>{{ $t("competences.showAll") }}</span> <span>{{ $t("competences.showAll") }}</span>
@ -129,7 +129,7 @@ const countStatus = computed(() => {
</li> </li>
</ul> </ul>
<router-link <router-link
:to="`${competenceStore.competenceProfilePage?.frontend_url}/criteria`" :to="`${competenceStore.competenceProfilePage()?.frontend_url}/criteria`"
class="btn-text inline-flex items-center pl-0 py-2" class="btn-text inline-flex items-center pl-0 py-2"
> >
<span>{{ $t("competences.showAll") }}</span> <span>{{ $t("competences.showAll") }}</span>
@ -154,7 +154,7 @@ const countStatus = computed(() => {
</li> </li>
</ul> </ul>
<router-link <router-link
:to="`${competenceStore.competenceProfilePage?.frontend_url}/criteria`" :to="`${competenceStore.competenceProfilePage()?.frontend_url}/criteria`"
class="btn-text inline-flex items-center pl-0 py-2" class="btn-text inline-flex items-center pl-0 py-2"
> >
<span>{{ $t("competences.showAll") }}</span> <span>{{ $t("competences.showAll") }}</span>

6
client/src/pages/competence/CompetenceListPage.vue
View File

@ -13,9 +13,9 @@ const competenceStore = useCompetenceStore();
<div class="container-large"> <div class="container-large">
<nav class="py-4 lg:pb-8"> <nav class="py-4 lg:pb-8">
<router-link <router-link
v-if="competenceStore.competenceProfilePage" v-if="competenceStore.competenceProfilePage()"
class="btn-text inline-flex items-center pl-0" class="btn-text inline-flex items-center pl-0"
:to="competenceStore.competenceProfilePage?.frontend_url" :to="competenceStore.competenceProfilePage()?.frontend_url"
> >
<it-icon-arrow-left /> <it-icon-arrow-left />
<span>{{ $t("general.back") }}</span> <span>{{ $t("general.back") }}</span>
@ -29,7 +29,7 @@ const competenceStore = useCompetenceStore();
:items="competenceStore.availableCircles" :items="competenceStore.availableCircles"
></ItDropdownSelect> ></ItDropdownSelect>
</div> </div>
<ul v-if="competenceStore.competenceProfilePage"> <ul v-if="competenceStore.competenceProfilePage()">
<li <li
v-for="competence in competenceStore.competences()" v-for="competence in competenceStore.competences()"
:key="competence.id" :key="competence.id"

2
client/src/pages/competence/PerformanceCriteriaPage.vue
View File

@ -57,7 +57,7 @@ function updateActiveState(status: CourseCompletionStatus) {
<nav class="py-4 lg:pb-8"> <nav class="py-4 lg:pb-8">
<router-link <router-link
class="btn-text inline-flex items-center pl-0" class="btn-text inline-flex items-center pl-0"
:to="`${competenceStore.competenceProfilePage?.frontend_url}`" :to="`${competenceStore.competenceProfilePage()?.frontend_url}`"
> >
<it-icon-arrow-left /> <it-icon-arrow-left />
<span>zurück</span> <span>zurück</span>

3
client/src/pages/competence/SinglePerformanceCriteriaPage.vue
View File

@ -19,8 +19,7 @@ let currentQuestion: PerformanceCriteria | undefined;
let competencePage: CompetencePage | undefined; let competencePage: CompetencePage | undefined;
const findCriteria = () => { const findCriteria = () => {
for (const page of competenceStore.competenceProfilePage for (const page of competenceStore.competenceProfilePage()?.children as CompetencePage[]) {
?.children as CompetencePage[]) {
for (const criteria of page.children) { for (const criteria of page.children) {
if (criteria.slug === route.params["criteriaSlug"]) { if (criteria.slug === route.params["criteriaSlug"]) {
currentQuestion = criteria; currentQuestion = criteria;

8
client/src/stores/competence.ts
View File

@ -53,6 +53,14 @@ export const useCompetenceStore = defineStore({
return competence.children; return competence.children;
}); });
}, },
competenceProfilePage(userId: number | undefined = undefined) {
if (!userId) {
const userStore = useUserStore();
userId = userStore.id;
}
return this.competenceProfilePages.get(userId);
},
flatPerformanceCriteria(userId: number | undefined = undefined) { flatPerformanceCriteria(userId: number | undefined = undefined) {
if (!userId) { if (!userId) {
const userStore = useUserStore(); const userStore = useUserStore();

5
client/src/stores/courseSessions.ts
View File

@ -20,10 +20,11 @@ export const useCourseSessionsStore = defineStore({
getters: { getters: {
courseSessionForRoute: (state) => { courseSessionForRoute: (state) => {
const route = useRoute(); const route = useRoute();
const routePath = decodeURI(route.path);
return state.courseSessions?.find((cs) => { return state.courseSessions?.find((cs) => {
return ( return (
route.path.startsWith(cs.learning_path_url) || routePath.startsWith(cs.learning_path_url) ||
route.path.startsWith(cs.competence_url) routePath.startsWith(cs.competence_url)
); );
}); });
}, },