feat: updated link handling

bbtgnn · Feb 25, 2024 · de6063c · de6063c
1 parent fbbb6e5
commit de6063c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -0,0 +1,5 @@
+import { base } from '$app/paths';
+
+export const href = (route: string) => {
+	return base ? `/${base}${route}` : route;
+};
diff --git a/src/routes/(collections)/+layout.svelte b/src/routes/(collections)/+layout.svelte
@@ -1,5 +1,9 @@
-<div class="p-4 bg-surface-700">
-	<a class="anchor" href="/">← Home</a>
+<script>
+	import { href } from '$lib/utils';
+</script>
+
+<div class="bg-surface-700 p-4">
+	<a class="anchor" href={href('/')}>← Home</a>
 </div>
 
 <div class="p-4">

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -1,12 +1,14 @@
 <script lang="ts">
+	import { base } from '$app/paths';
 	import { db } from '$lib/index';
 	import { pipe, flow, ReadonlyArray as A, ReadonlyRecord as R, String as S } from 'effect';
+	import { href } from '$lib/utils';
 
 	const links = pipe(
 		db.get_entries_loaders(),
 		R.toEntries,
 		A.map(([entry_path]) => entry_path),
-		A.map(flow(S.replace('/+page.svelte', ''), S.replace('./', '/')))
+		A.map(flow(S.replace('/+page.svelte', ''), S.replace('./', '/'), href))
 	);
 </script>