Fix path issues

ScratchAddons · Aug 17, 2023 · 64cc1f9 · 64cc1f9
1 parent f2a93a3
commit 64cc1f9
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 17 deletions.
diff --git a/src/components/LanguagePicker.astro b/src/components/LanguagePicker.astro
@@ -4,6 +4,6 @@ const { locales } = Astro.props
 
 <ul class="flex list-none flex-wrap mb-4 gap-2">
 	{ Object.keys(locales).map(code => <li class="flex list-none">
-		<a class="p-2 border rounded hover:bg-slate-100" href={ code } >{ code }</a>
+		<a class="p-2 border rounded hover:bg-slate-100" href={ '../' + code + '/' } >{ code }</a>
 	</li>) }
-</ul>
+</ul>
diff --git a/src/components/LanguagePickerIndex.astro b/src/components/LanguagePickerIndex.astro
@@ -0,0 +1,9 @@
+---
+const { locales } = Astro.props
+---
+
+<ul class="flex list-none flex-wrap mb-4 gap-2">
+	{ Object.keys(locales).map(code => <li class="flex list-none">
+		<a class="p-2 border rounded hover:bg-slate-100" href={ code + '/' } >{ code }</a>
+	</li>) }
+</ul>
diff --git a/src/components/VersionPicker.astro b/src/components/VersionPicker.astro
@@ -10,6 +10,6 @@ const versions = Object.keys(
 
 <ul class="flex list-none flex-wrap mb-2 gap-2">
 	{ versions.map(version => <li class="flex list-none">
-		<a class="p-2 border rounded hover:bg-slate-100" href={ '../' + version + '/' + lang } >{ version }</a>
+		<a class="p-2 border rounded hover:bg-slate-100" href={ '../../' + version + '/' + lang + '/' } >{ version }</a>
 	</li>) }
 </ul>
diff --git a/src/components/VersionPickerIndex.astro b/src/components/VersionPickerIndex.astro
@@ -0,0 +1,13 @@
+---
+const versions = Object.keys(
+	import.meta.glob("../pages/*/index.astro", { as: "raw" })
+).map(k => {
+	return k.split('/')[2]
+}).filter(a => a);
+---
+
+<ul class="flex list-none flex-wrap mb-2">
+	{ versions.map(version => <li class="flex list-none">
+		<a class="p-2 border rounded me-2 hover:bg-slate-100" href={ '../' + version + '/' } >{ version }</a>
+	</li>) }
+</ul>
diff --git a/src/layouts/Display.astro b/src/layouts/Display.astro
@@ -18,10 +18,10 @@ let { version, locales, lang } = Astro.props
 		<header class="container mx-auto">
 			<ul class="flex list-none flex-wrap mb-2 gap-2">
 				<li class="flex list-none">
-					<a class="p-2 border rounded hover:bg-slate-100" href="../">← Back to Home</a>
+					<a class="p-2 border rounded hover:bg-slate-100" href="../../">← Back to Home</a>
 				</li>
 				<li class="flex list-none">
-					<a class="p-2 border rounded hover:bg-slate-100" href="./">Version: { version }</a>
+					<a class="p-2 border rounded hover:bg-slate-100" href="../">Version: { version }</a>
 				</li>
 				<li class="flex list-none">
 					<a class="p-2 border rounded hover:bg-slate-100" href="#">Language: { lang }</a>

diff --git a/src/layouts/DisplayIndex.astro b/src/layouts/DisplayIndex.astro
@@ -1,10 +1,7 @@
 ---
-import LanguagePicker from "../components/LanguagePicker.astro";
-const versions = Object.keys(
-	import.meta.glob("../pages/*/index.astro", { as: "raw" })
-).map(k => {
-	return k.split('/')[2]
-});
+import LanguagePickerIndex from "../components/LanguagePickerIndex.astro";
+import VersionPickerIndex from "../components/VersionPickerIndex.astro";
+
 
 let { version, locales } = Astro.props
 ---
@@ -28,12 +25,8 @@ let { version, locales } = Astro.props
 					<a class="p-2 border rounded hover:bg-slate-100" href="./">Version: { version }</a>
 				</li>
 			</ul>
-			<ul class="flex list-none flex-wrap mb-2">
-				{ versions.map(version => <li class="flex list-none">
-					<a class="p-2 border rounded me-2 hover:bg-slate-100" href={ '../' + version + '/' } >{ version }</a>
-				</li>) }
-			</ul>
-			<LanguagePicker locales={ locales } />
+			<VersionPickerIndex />
+			<LanguagePickerIndex locales={ locales } />
 		</header>
 		<main class="container mx-auto">
 		</main>