diff --git a/.gitignore b/.gitignore
index 78745ad..6df5422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ pdfgen/*
documents/*
user-data/*
tmp-user-data/*
+logs/*
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 42ab891..ec3c550 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -1,8 +1,9 @@
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, get_user } from "$lib/server/database";
+import { init_db, close_db } from "$lib/server/database";
import Logs from "$lib/server/log";
@@ -56,7 +57,6 @@ 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, `/login?${event.url.searchParams}`);
+ return redirect(302, `${base}/login?${event.url.searchParams}`);
}
}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 6dee6d5..5e7cdde 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,4 +1,6 @@
@@ -6,14 +8,14 @@
Navigation
- - Stundenliste
- - Stundenschätzung
- - Dokumente
+ - Stundenliste
+ - Stundenschätzung
+ - Dokumente
- Benutzerverwaltung
-
-
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 8bbbfa9..20aba74 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, redirect } from '@sveltejs/kit';
+import { fail } from '@sveltejs/kit';
import Logs from "$lib/server/log"
import { toInt, parseDate, isTimeValidHHMM } from "$lib/util"
@@ -230,7 +230,6 @@ 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 08dc250..8541d30 100644
--- a/src/routes/dokumente/+page.server.ts
+++ b/src/routes/dokumente/+page.server.ts
@@ -1,5 +1,6 @@
import type { PageServerLoad, Actions } from "./$types";
import { fail, redirect } from "@sveltejs/kit"
+import { base } from "$app/paths"
import { toInt } from "$lib/util"
@@ -64,7 +65,7 @@ export const actions = {
}
- redirect(303, "dokumente")
+ redirect(303, `${base}/dokumente`)
}
} satisfies Actions;
diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index 00cbea3..a2e233e 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -1,6 +1,7 @@
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";
@@ -22,8 +23,6 @@ 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;
@@ -47,7 +46,7 @@ export const actions = {
httpOnly: true,
secure: true,
sameSite: 'strict',
- path: '/'
+ path: base
})
redirect(302, redirect_url);
@@ -66,8 +65,8 @@ export const actions = {
SessionStore.logout_user_session(token);
- cookies.delete("session_id", { path: "/" });
+ cookies.delete("session_id", { path: base });
- return redirect(302, "/login");
+ return redirect(302, `${base}/login`);
}
} satisfies Actions;
diff --git a/src/routes/schaetzung/+page.svelte b/src/routes/schaetzung/+page.svelte
index 5b61b44..887964a 100644
--- a/src/routes/schaetzung/+page.svelte
+++ b/src/routes/schaetzung/+page.svelte
@@ -55,7 +55,7 @@
-
+
Stundenschätzung
@@ -130,7 +130,7 @@
{:else}
-