From b56d5ba2fc612eeea50299adb5a72c175893e042 Mon Sep 17 00:00:00 2001
From: oliviareichl <Olivia.Reichl@oeaw.ac.at>
Date: Tue, 30 Jan 2024 16:33:41 +0100
Subject: [PATCH] fix: display url path correctly

---
 components/ContentNavigation/CNCustom.vue | 20 +++++++++++++-------
 content/de/team.md                        |  6 ------
 pages/[...slug].vue                       |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 content/de/team.md

diff --git a/components/ContentNavigation/CNCustom.vue b/components/ContentNavigation/CNCustom.vue
index 764096ba..b97b2c91 100644
--- a/components/ContentNavigation/CNCustom.vue
+++ b/components/ContentNavigation/CNCustom.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import type { QueryBuilderParams } from "@nuxt/content/dist/runtime/types";
 
-const Locale = useI18n().locale;
+const locale = useLocale().current.value;
 
-const updateNaviagation = ref(false);
+const updateNavigation = ref(false);
 
 const navLocaleQuery = computed((): QueryBuilderParams => {
 	return {
 		where: [
 			{
 				// Create a regex pattern to match the locale in the path
-				_path: { $contains: `/${Locale.value}/` },
+				_path: { $contains: `/${locale}/` },
 			},
 		],
 	};
@@ -23,18 +23,24 @@ const { data: fetchedNavigation } = await useAsyncData(
 		return contentNav;
 	},
 	{
-		watch: [navLocaleQuery, updateNaviagation],
+		watch: [navLocaleQuery, updateNavigation],
 	},
 );
 
 onBeforeMount(() => {
-	if (!fetchedNavigation.value || !fetchedNavigation.value[0]?._path.includes(Locale.value)) {
-		updateNaviagation.value = true;
+	if (!fetchedNavigation.value || !fetchedNavigation.value[0]?._path.includes(locale)) {
+		updateNavigation.value = true;
 	}
 });
 
 const navigation = computed(() => {
-	return fetchedNavigation.value?.[0]?.children ?? null;
+	return (
+		fetchedNavigation.value?.[0]?.children?.map((entry) => {
+			const newEntry = { ...entry };
+			newEntry._path = entry._path.replace(`/${locale}`, "");
+			return newEntry;
+		}) ?? null
+	);
 });
 </script>
 
diff --git a/content/de/team.md b/content/de/team.md
deleted file mode 100644
index f25945c8..00000000
--- a/content/de/team.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Team
-navigation:
-  title: Team
----
-Das ist unser Team.
\ No newline at end of file
diff --git a/pages/[...slug].vue b/pages/[...slug].vue
index 35588e81..cfb03a81 100644
--- a/pages/[...slug].vue
+++ b/pages/[...slug].vue
@@ -7,7 +7,7 @@ const locale = useLocale().current.value;
 <template>
 	<VSheet height="calc(100vh - 65px)" class="d-flex justify-center pt-5">
 		<VContainer class="text-center" data-test="main-content-renderer">
-			<ContentDoc :path="`/${locale}/${route.params.slug ? route.params.slug[1] : ''}`">
+			<ContentDoc :path="`/${locale}/${route.params.slug ? route.params.slug[0] : ''}`">
 				<template #not-found>
 					<h1>Document not found</h1>
 					<NuxtLink :to="localePath('/')">{{ $t("global.basics.backHome") }}.</NuxtLink>