From dfa45436d4215c7fe3c326abcbc8a2a4a636c7d7 Mon Sep 17 00:00:00 2001
From: Markus Brueckner <namenlos@geekbetrieb.de>
Date: Fri, 27 Dec 2024 08:33:44 +0100
Subject: [PATCH] Relative links to fix deployment to subpaths

---
 src/lib/session/session.ts                        | 4 ++--
 src/routes/(app)/+page.svelte                     | 6 +++---
 src/routes/(app)/survey/[surveyId]/+page.svelte   | 4 ++--
 src/routes/login/+page.server.ts                  | 2 +-
 src/routes/login/+page.svelte                     | 2 +-
 src/routes/register/+page.server.ts               | 2 +-
 src/routes/register/success/+page.svelte          | 2 +-
 src/routes/verify/[verificationCode]/+page.svelte | 5 +++--
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/lib/session/session.ts b/src/lib/session/session.ts
index 5067889..0856240 100644
--- a/src/lib/session/session.ts
+++ b/src/lib/session/session.ts
@@ -37,7 +37,7 @@ export function setSessionTokenCookie(event: RequestEvent, token: string, expire
         httpOnly: true,
         sameSite: "lax",
         expires: expiresAt,
-        path: "/"
+        path: "/" // TODO this should be limited to the path the application is running on
     });
 }
 
@@ -46,6 +46,6 @@ export function deleteSessionTokenCookie(event: RequestEvent): void {
         httpOnly: true,
         sameSite: "lax",
         maxAge: 0,
-        path: "/"
+        path: "/" // TODO this should be limited to the path the application is running on
     });
 }
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index 1011250..02cf00f 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -16,7 +16,7 @@
 		{#each data.surveys as survey}
 			<li class="grid grid-cols-2">
 				<div>
-					<Link href="/survey/{survey.id}">{survey.title}</Link>
+					<Link href="survey/{survey.id}">{survey.title}</Link>
 					<span class="mr-5 inline-block">
 						({survey.fillRate.filled}/{survey.fillRate.expected})
 						{#if survey.fillRate.filled === survey.fillRate.expected}
@@ -26,7 +26,7 @@
 				</div>
 				<div>
 					<Link
-						href="/survey/new?from={survey.id}"
+						href="survey/new?from={survey.id}"
 						class="ml-2 inline-block hover:bg-slate-200"
 						title="Duplicate survey"
 						aria-label="Duplicate survey"
@@ -37,5 +37,5 @@
 		{/each}
 	</ul>
 
-	<Link href="/survey/new">Create a new Survey</Link>
+	<Link href="survey/new">Create a new Survey</Link>
 </div>
diff --git a/src/routes/(app)/survey/[surveyId]/+page.svelte b/src/routes/(app)/survey/[surveyId]/+page.svelte
index a55d07c..52f43d4 100644
--- a/src/routes/(app)/survey/[surveyId]/+page.svelte
+++ b/src/routes/(app)/survey/[surveyId]/+page.svelte
@@ -32,7 +32,7 @@
 		await fetch('', {
 			method: 'DELETE'
 		});
-		goto('/');
+		goto('..');
 	}
 </script>
 
@@ -42,7 +42,7 @@
 			<HomeIcon />
 		</a>
 		<a
-			href="/survey/new?from={data.id}"
+			href="../survey/new?from={data.id}"
 			class="ml-2 flex items-center"
 			aria-label="Duplicate"
 			title="Duplicate"
diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index a129ae6..233708f 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -49,7 +49,7 @@ export const actions = {
                 redirect(303, redirect_uri);
             }
             else {
-                redirect(303, '/');
+                redirect(303, '.');
             }
         }
         else {
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index b945e79..7ea2ec9 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -18,7 +18,7 @@
 		>
 		{#if data.enableRegister}
 			<span class="col-span-2 mt-3 justify-self-center text-xs">
-				<Link href="/register">Click here to register</Link>, if you do not have an account yet</span
+				<Link href="../register">Click here to register</Link>, if you do not have an account yet</span
 			>
 		{/if}
 	</form>
diff --git a/src/routes/register/+page.server.ts b/src/routes/register/+page.server.ts
index 6b2d357..1bf623b 100644
--- a/src/routes/register/+page.server.ts
+++ b/src/routes/register/+page.server.ts
@@ -35,6 +35,6 @@ export const actions = {
             sendVerificationEmail(email, result.verificationCode, getBaseUrl(event.url));
         }
 
-        redirect(303, '/register/success');
+        redirect(303, 'register/success');
     }
 } satisfies Actions;
\ No newline at end of file
diff --git a/src/routes/register/success/+page.svelte b/src/routes/register/success/+page.svelte
index e42028b..21e1a1b 100644
--- a/src/routes/register/success/+page.svelte
+++ b/src/routes/register/success/+page.svelte
@@ -12,6 +12,6 @@
 		An email has been sent to your email address to activate the account. Please follow the
 		instructions in the email to be able to log in.
 	{:else}
-		Click <Link href="/login">here</Link> to log in.
+		Click <Link href="../../login">here</Link> to log in.
 	{/if}
 </p>
diff --git a/src/routes/verify/[verificationCode]/+page.svelte b/src/routes/verify/[verificationCode]/+page.svelte
index f45b359..bdc4599 100644
--- a/src/routes/verify/[verificationCode]/+page.svelte
+++ b/src/routes/verify/[verificationCode]/+page.svelte
@@ -7,6 +7,7 @@
 
 <Navbar title="Verification successful" />
 <div>
-	Congratulations! You've successfully verified your account. <Link href="/login">Click here</Link> to
-	log in.
+	Congratulations! You've successfully verified your account. <Link href="../../login"
+		>Click here</Link
+	> to log in.
 </div>