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 @@ @@ -8,14 +6,14 @@

Navigation