From 0d45eae6e833da1d2fdd74b29b359f44057e4bd8 Mon Sep 17 00:00:00 2001
From: maxid <97409287+maxdorninger@users.noreply.github.com>
Date: Sun, 21 Dec 2025 16:32:31 +0100
Subject: [PATCH] remove all occurrences of base

---
 web/src/lib/components/login-card.svelte               |  7 ++++---
 .../lib/components/recommended-media-carousel.svelte   | 10 +++++++---
 web/src/lib/components/signup-card.svelte              |  4 ++--
 web/src/routes/dashboard/notifications/+page.svelte    |  6 +++---
 web/src/routes/dashboard/settings/+page.svelte         |  4 ++--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/web/src/lib/components/login-card.svelte b/web/src/lib/components/login-card.svelte
index d3f2cbc..e82b4a2 100644
--- a/web/src/lib/components/login-card.svelte
+++ b/web/src/lib/components/login-card.svelte
@@ -5,7 +5,6 @@
 	import { Label } from '$lib/components/ui/label/index.js';
 	import { goto } from '$app/navigation';
 	import { toast } from 'svelte-sonner';
-	import { base } from '$app/paths';
 	import * as Alert from '$lib/components/ui/alert/index.js';
 	import AlertCircleIcon from '@lucide/svelte/icons/alert-circle';
 	import LoadingBar from '$lib/components/loading-bar.svelte';
@@ -49,7 +48,7 @@
 			console.log('Received User Data: ', response);
 			successMessage = 'Login successful! Redirecting...';
 			toast.success(successMessage);
-			goto(resolve('/dashboard', {}));
+			await goto(resolve('/dashboard', {}));
 		} else {
 			toast.error('Login failed!');
 			errorMessage = `Login failed! Please check your credentials and try again.`;
@@ -127,7 +126,9 @@
 			>
 		{/each}
 		<div class="mt-4 text-center text-sm">
-			<Button href="{base}/login/signup/" variant="link">Don't have an account? Sign up</Button>
+			<Button href={resolve('/login/signup/', {})} variant="link"
+				>Don't have an account? Sign up</Button
+			>
 		</div>
 	</Card.Content>
 </Card.Root>
diff --git a/web/src/lib/components/recommended-media-carousel.svelte b/web/src/lib/components/recommended-media-carousel.svelte
index 5932d5d..95a552a 100644
--- a/web/src/lib/components/recommended-media-carousel.svelte
+++ b/web/src/lib/components/recommended-media-carousel.svelte
@@ -3,8 +3,8 @@
 	import { Skeleton } from '$lib/components/ui/skeleton';
 	import { Button } from '$lib/components/ui/button';
 	import { ChevronRight } from 'lucide-svelte';
-	import { base } from '$app/paths';
 	import type { components } from '$lib/api/api';
+	import { resolve } from '$app/paths';
 
 	let {
 		media,
@@ -31,12 +31,16 @@
 		{/each}
 	{/if}
 	{#if isShow}
-		<Button class="md:col-start-2" variant="secondary" href="{base}/dashboard/tv/add-show">
+		<Button class="md:col-start-2" variant="secondary" href={resolve('/dashboard/tv/add-show', {})}>
 			More recommendations
 			<ChevronRight />
 		</Button>
 	{:else}
-		<Button class="md:col-start-2" variant="secondary" href="{base}/dashboard/movies/add-movie">
+		<Button
+			class="md:col-start-2"
+			variant="secondary"
+			href={resolve('/dashboard/movies/add-movie', {})}
+		>
 			More recommendations
 			<ChevronRight />
 		</Button>
diff --git a/web/src/lib/components/signup-card.svelte b/web/src/lib/components/signup-card.svelte
index 09c3ae4..e1d4f8d 100644
--- a/web/src/lib/components/signup-card.svelte
+++ b/web/src/lib/components/signup-card.svelte
@@ -8,9 +8,9 @@
 	import AlertCircleIcon from '@lucide/svelte/icons/alert-circle';
 	import LoadingBar from '$lib/components/loading-bar.svelte';
 	import CheckCircle2Icon from '@lucide/svelte/icons/check-circle-2';
-	import { base } from '$app/paths';
 	import { handleOauth } from '$lib/utils.ts';
 	import client from '$lib/api';
+	import { resolve } from '$app/paths';
 
 	let email = $state('');
 	let password = $state('');
@@ -125,7 +125,7 @@
 			>
 		{/each}
 		<div class="mt-4 text-center text-sm">
-			<Button href="{base}/login/" variant="link">Already have an account? Login</Button>
+			<Button href={resolve('/login/', {})} variant="link">Already have an account? Login</Button>
 		</div>
 	</Card.Content>
 </Card.Root>
diff --git a/web/src/routes/dashboard/notifications/+page.svelte b/web/src/routes/dashboard/notifications/+page.svelte
index 415788f..fc66a06 100644
--- a/web/src/routes/dashboard/notifications/+page.svelte
+++ b/web/src/routes/dashboard/notifications/+page.svelte
@@ -5,9 +5,9 @@
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
 	import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
 
-	import { base } from '$app/paths';
 	import client from '$lib/api';
 	import type { components } from '$lib/api/api';
+	import { resolve } from '$app/paths';
 
 	let unreadNotifications: components['schemas']['Notification'][] = [];
 	let readNotifications: components['schemas']['Notification'][] = [];
@@ -99,11 +99,11 @@
 		<Breadcrumb.Root>
 			<Breadcrumb.List>
 				<Breadcrumb.Item class="hidden md:block">
-					<Breadcrumb.Link href="{base}/dashboard">MediaManager</Breadcrumb.Link>
+					<Breadcrumb.Link href={resolve('/dashboard', {})}>MediaManager</Breadcrumb.Link>
 				</Breadcrumb.Item>
 				<Breadcrumb.Separator class="hidden md:block" />
 				<Breadcrumb.Item>
-					<Breadcrumb.Link href="{base}/dashboard">Home</Breadcrumb.Link>
+					<Breadcrumb.Link href={resolve('/dashboard', {})}>Home</Breadcrumb.Link>
 				</Breadcrumb.Item>
 				<Breadcrumb.Separator class="hidden md:block" />
 				<Breadcrumb.Item>
diff --git a/web/src/routes/dashboard/settings/+page.svelte b/web/src/routes/dashboard/settings/+page.svelte
index 6aa00a4..8265b5c 100644
--- a/web/src/routes/dashboard/settings/+page.svelte
+++ b/web/src/routes/dashboard/settings/+page.svelte
@@ -7,7 +7,7 @@
 	import { Separator } from '$lib/components/ui/separator';
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
 	import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
-	import { base } from '$app/paths';
+	import { resolve } from '$app/paths';
 	import type { components } from '$lib/api/api';
 
 	let currentUser: () => components['schemas']['UserRead'] = getContext('user');
@@ -31,7 +31,7 @@
 		<Breadcrumb.Root>
 			<Breadcrumb.List>
 				<Breadcrumb.Item class="hidden md:block">
-					<Breadcrumb.Link href="{base}/dashboard">MediaManager</Breadcrumb.Link>
+					<Breadcrumb.Link href={resolve('/dashboard', {})}>MediaManager</Breadcrumb.Link>
 				</Breadcrumb.Item>
 				<Breadcrumb.Separator class="hidden md:block" />
 				<Breadcrumb.Item>