From 2140aaf2f8e57fcf15c59938d3e7b5f11a495ef9 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@maschek.info>
Date: Sat, 12 Jul 2025 16:02:33 +0200
Subject: [PATCH] revert 51ed8da26c0f4e21ffda02eaee1fe083460af8ef

revert updated code to use base path in code
---
 .gitignore                           |  1 -
 src/hooks.server.ts                  |  6 +++---
 src/routes/+layout.svelte            | 10 ++++------
 src/routes/+page.server.ts           |  3 ++-
 src/routes/dokumente/+page.server.ts |  3 +--
 src/routes/login/+page.server.ts     |  9 +++++----
 src/routes/schaetzung/+page.svelte   |  4 ++--
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6df5422..78745ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,3 @@ pdfgen/*
 documents/*
 user-data/*
 tmp-user-data/*
-logs/*
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index ec3c550..42ab891 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -1,9 +1,8 @@
 import type { Handle } from "@sveltejs/kit";
 import { error, redirect } from "@sveltejs/kit";
-import { base } from "$app/paths";
 
 import SessionStore from "$lib/server/session_store"
-import { init_db, close_db } from "$lib/server/database";
+import { init_db, close_db, get_user } from "$lib/server/database";
 
 import Logs from "$lib/server/log";
 
@@ -57,6 +56,7 @@ export let handle: Handle = async function ({ event, resolve }) {
 		"Referrer-Policy": "strict-origin-when-cross-origin"
 	})
 	
+	console.log(event.url.href)
 	if (event.route.id == null) {
 		Logs.route.info(`Tried to access a route which does not exist: ${event.url.href}`)
 		return error(404, "This page does not exist.");
@@ -78,7 +78,7 @@ export let handle: Handle = async function ({ event, resolve }) {
 			return await resolve(event);
 		} else {
 			event.url.searchParams.set("redirect", event.route.id);
-			return redirect(302, `${base}/login?${event.url.searchParams}`);
+			return redirect(302, `/login?${event.url.searchParams}`);
 		}
 	}
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 5e7cdde..6dee6d5 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-	import { base } from "$app/paths";
-
 	let { children } = $props();
 </script>
 
@@ -8,14 +6,14 @@
 <div class={classlist}>
 	<h1>Navigation</h1>
 	<ul>
-		<li><a href="{base}/">Stundenliste</a></li>
-		<li><a href="{base}/schaetzung">Stundenschätzung</a></li>
-		<li><a href="{base}/dokumente">Dokumente</a></li>
+		<li><a href="/">Stundenliste</a></li>
+		<li><a href="/schaetzung">Stundenschätzung</a></li>
+		<li><a href="/dokumente">Dokumente</a></li>
 		
 		<li style="height: 20px"></li>
 		<li>Benutzerverwaltung</li>
 		<li>
-			<form method="POST" action="{base}/login?/logout">
+			<form method="POST" action="/login?/logout">
 				<button type="submit">Logout</button>
 			</form>
 		</li>
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 20aba74..8bbbfa9 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -4,7 +4,7 @@ import { SQLiteError } from "bun:sqlite";
 import type { FileProperties } from "$lib/server/docstore"
 import type { RecordEntry, EstimatesEntry } from "$lib/db_types";
 
-import { fail } from '@sveltejs/kit';
+import { fail, redirect } from '@sveltejs/kit';
 
 import Logs from "$lib/server/log"
 import { toInt, parseDate, isTimeValidHHMM } from "$lib/util"
@@ -230,6 +230,7 @@ export const actions = {
 			return fail(500, { })
 		}
 		
+		redirect(303, '/');
 		return { success: true };
 	},
 	remove_entry: async ({ locals, request })=> {
diff --git a/src/routes/dokumente/+page.server.ts b/src/routes/dokumente/+page.server.ts
index 8541d30..08dc250 100644
--- a/src/routes/dokumente/+page.server.ts
+++ b/src/routes/dokumente/+page.server.ts
@@ -1,6 +1,5 @@
 import type { PageServerLoad, Actions } from "./$types";
 import { fail, redirect } from "@sveltejs/kit"
-import { base } from "$app/paths"
 
 import { toInt } from "$lib/util"
 
@@ -65,7 +64,7 @@ export const actions = {
 		}
 		
 
-		redirect(303, `${base}/dokumente`)
+		redirect(303, "dokumente")
 	}
 
 } satisfies Actions;
diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index a2e233e..00cbea3 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -1,7 +1,6 @@
 import type { Actions } from "@sveltejs/kit";
 import type { PageServerLoad } from "./$types";
 import { fail, redirect } from "@sveltejs/kit";
-import { base } from "$app/paths"
 
 import { authorize_password } from "$lib/server/auth";
 import SessionStore from "$lib/server/session_store";
@@ -23,6 +22,8 @@ export const actions = {
 		if (locals.user != null) {
 			redirect(302, redirect_url);
 		}
+
+		console.log("logging in");
 		
 		const params = await request.formData();
 		const username = params.get("username") as string | null;
@@ -46,7 +47,7 @@ export const actions = {
 			httpOnly: true,
 			secure: true,
 			sameSite: 'strict',
-			path: base
+			path: '/'
 		})
 		
 		redirect(302, redirect_url);
@@ -65,8 +66,8 @@ export const actions = {
 
 		SessionStore.logout_user_session(token);
 		
-		cookies.delete("session_id", { path: base });
+		cookies.delete("session_id", { path: "/" });
 
-		return redirect(302, `${base}/login`);
+		return redirect(302, "/login");
 	}
 } satisfies Actions;
diff --git a/src/routes/schaetzung/+page.svelte b/src/routes/schaetzung/+page.svelte
index 887964a..5b61b44 100644
--- a/src/routes/schaetzung/+page.svelte
+++ b/src/routes/schaetzung/+page.svelte
@@ -55,7 +55,7 @@
 </script>
 
 <form id="form_add_quart" method="POST" action="?/add_quarter" use:enhance></form>
-<form id="form_create_pdf" method="POST" action="{base}/dokumente?/create_estimate" use:enhance></form>
+<form id="form_create_pdf" method="POST" action="/dokumente?/create_estimate" use:enhance></form>
 
 <h1>Stundenschätzung</h1>
 
@@ -130,7 +130,7 @@
 								<button type="submit">Download PDF</button>
 							</form>
 						{:else}
-							<form method="POST" action="{base}/dokumente?/create_estimate" use:enhance>
+							<form method="POST" action="/dokumente?/create_estimate" use:enhance>
 								<input type="hidden" name="year" value={year} />
 								<input type="hidden" name="quarter" value={quarter} />
 								<button type="submit">Create PDF</button>