From bff919c757a7e3762e170a4ba48a18a5c03187a9 Mon Sep 17 00:00:00 2001
From: vcoppe <vianney.coppe@gmail.com>
Date: Mon, 8 Jul 2024 19:13:31 +0200
Subject: [PATCH] use base in URLs

---
 website/src/lib/components/Footer.svelte         |  2 +-
 website/src/lib/components/LanguageSelect.svelte |  3 ++-
 website/src/lib/components/Menu.svelte           |  3 ++-
 website/src/lib/components/Nav.svelte            |  2 +-
 website/src/lib/languages.ts                     | 16 +---------------
 website/src/lib/utils.ts                         | 15 +++++++++++++++
 website/src/routes/[...language]/+page.svelte    |  2 +-
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/website/src/lib/components/Footer.svelte b/website/src/lib/components/Footer.svelte
index 0930a00f..d41c806d 100644
--- a/website/src/lib/components/Footer.svelte
+++ b/website/src/lib/components/Footer.svelte
@@ -4,7 +4,7 @@
 	import Logo from '$lib/components/Logo.svelte';
 	import { AtSign, BookOpenText, Heart, Home, Map } from 'lucide-svelte';
 	import { _, locale } from 'svelte-i18n';
-	import { getURLForLanguage } from '$lib/languages';
+	import { getURLForLanguage } from '$lib/utils';
 </script>
 
 <footer class="w-full">
diff --git a/website/src/lib/components/LanguageSelect.svelte b/website/src/lib/components/LanguageSelect.svelte
index 2dc09542..a0d33b44 100644
--- a/website/src/lib/components/LanguageSelect.svelte
+++ b/website/src/lib/components/LanguageSelect.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
 	import { page } from '$app/stores';
 	import * as Select from '$lib/components/ui/select';
-	import { getURLForLanguage, languages } from '$lib/languages';
+	import { languages } from '$lib/languages';
+	import { getURLForLanguage } from '$lib/utils';
 	import { Languages } from 'lucide-svelte';
 	import { _, locale } from 'svelte-i18n';
 
diff --git a/website/src/lib/components/Menu.svelte b/website/src/lib/components/Menu.svelte
index 02155b7d..ab010043 100644
--- a/website/src/lib/components/Menu.svelte
+++ b/website/src/lib/components/Menu.svelte
@@ -72,8 +72,9 @@
 	import Export from '$lib/components/Export.svelte';
 	import { mode, setMode, systemPrefersMode } from 'mode-watcher';
 	import { _, locale } from 'svelte-i18n';
-	import { getURLForLanguage, languages } from '$lib/languages';
+	import { languages } from '$lib/languages';
 	import { page } from '$app/stores';
+	import { getURLForLanguage } from '$lib/utils';
 
 	const {
 		distanceUnits,
diff --git a/website/src/lib/components/Nav.svelte b/website/src/lib/components/Nav.svelte
index 42c3f56f..1ea2ae3d 100644
--- a/website/src/lib/components/Nav.svelte
+++ b/website/src/lib/components/Nav.svelte
@@ -3,8 +3,8 @@
 	import { Button } from '$lib/components/ui/button';
 	import ModeSwitch from '$lib/components/ModeSwitch.svelte';
 	import { BookOpenText, Home, Map } from 'lucide-svelte';
-	import { getURLForLanguage } from '$lib/languages';
 	import { _, locale } from 'svelte-i18n';
+	import { getURLForLanguage } from '$lib/utils';
 </script>
 
 <nav class="w-full sticky top-0 bg-background z-10">
diff --git a/website/src/lib/languages.ts b/website/src/lib/languages.ts
index d787c590..cccbd8db 100644
--- a/website/src/lib/languages.ts
+++ b/website/src/lib/languages.ts
@@ -1,17 +1,3 @@
 export const languages: Record<string, string> = {
     'en': 'English',
-};
-
-export function getURLForLanguage(route: string | null, lang: string | null | undefined): string {
-    if (route === null) {
-        return '/';
-    }
-
-    let url = route.replace('[...language]', (lang === null || lang === undefined) ? 'en' : lang).replace('/en', '');
-
-    if (url === '') {
-        return '/';
-    } else {
-        return url;
-    }
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/website/src/lib/utils.ts b/website/src/lib/utils.ts
index 89bd6e29..ca663954 100644
--- a/website/src/lib/utils.ts
+++ b/website/src/lib/utils.ts
@@ -4,6 +4,7 @@ import { cubicOut } from "svelte/easing";
 import type { TransitionConfig } from "svelte/transition";
 import { get } from "svelte/store";
 import { map } from "./stores";
+import { base } from "$app/paths";
 
 export function cn(...inputs: ClassValue[]) {
     return twMerge(clsx(inputs));
@@ -89,4 +90,18 @@ export function setGrabbingCursor() {
 
 export function setCrosshairCursor() {
     setCursor('crosshair');
+}
+
+export function getURLForLanguage(route: string | null, lang: string | null | undefined): string {
+    if (route === null) {
+        return base + '/';
+    }
+
+    let url = route.replace('[...language]', (lang === null || lang === undefined) ? 'en' : lang).replace('/en', '');
+
+    if (url === '') {
+        return base + '/';
+    } else {
+        return base + url;
+    }
 }
\ No newline at end of file
diff --git a/website/src/routes/[...language]/+page.svelte b/website/src/routes/[...language]/+page.svelte
index bfa7a3c7..05051c7e 100644
--- a/website/src/routes/[...language]/+page.svelte
+++ b/website/src/routes/[...language]/+page.svelte
@@ -13,6 +13,7 @@
 	import Toolbar from '$lib/components/toolbar/Toolbar.svelte';
 	import { currentTool, Tool } from '$lib/stores';
 	import { onDestroy, onMount } from 'svelte';
+	import { getURLForLanguage } from '$lib/utils';
 	import routingScreenshot from '$lib/assets/img/routing.png?enhanced';
 	import mapboxOutdoorsMap from '$lib/assets/img/mapbox-outdoors.png?enhanced';
 	import mapboxSatelliteMap from '$lib/assets/img/mapbox-satellite.png?enhanced';
@@ -20,7 +21,6 @@
 	import cyclosmMap from '$lib/assets/img/cyclosm.png?enhanced';
 	import waymarkedMap from '$lib/assets/img/waymarked.png?enhanced';
 	import mapScreenshot from '$lib/assets/img/map.png?enhanced';
-	import { getURLForLanguage } from '$lib/languages';
 
 	let gpxStatistics = writable(exampleGPXFile.getStatistics());
 	let slicedGPXStatistics = writable(undefined);