diff --git a/frontend/src/lib/components/Footer.svelte b/frontend/src/lib/components/Footer.svelte
index 104da8b..2c97000 100644
--- a/frontend/src/lib/components/Footer.svelte
+++ b/frontend/src/lib/components/Footer.svelte
@@ -1,24 +1,22 @@
diff --git a/frontend/src/lib/components/Header.svelte b/frontend/src/lib/components/Header.svelte
index 5c0db04..f5faa92 100644
--- a/frontend/src/lib/components/Header.svelte
+++ b/frontend/src/lib/components/Header.svelte
@@ -1,6 +1,7 @@
-->
-
-
Backend vom Carsharing Zeug
-
+
+
Backend vom Carsharing Zeug
+
diff --git a/frontend/src/routes/auth/about/[id]/+page.server.js b/frontend/src/routes/auth/about/[id]/+page.server.js
index d00b653..77bb614 100644
--- a/frontend/src/routes/auth/about/[id]/+page.server.js
+++ b/frontend/src/routes/auth/about/[id]/+page.server.js
@@ -2,6 +2,7 @@ import { BASE_API_URI } from '$lib/utils/constants';
import { formatError, userDatesFromRFC3339 } from '$lib/utils/helpers';
import { fail, redirect } from '@sveltejs/kit';
import { formDataToObject, processUserFormData } from '$lib/utils/processing';
+import { base } from '$app/paths';
/**
* @typedef {Object} UpdateData
@@ -12,7 +13,7 @@ import { formDataToObject, processUserFormData } from '$lib/utils/processing';
export async function load({ locals, params }) {
// redirect user if not logged in
if (!locals.user) {
- throw redirect(302, `/auth/login?next=/auth/about/${params.id}`);
+ throw redirect(302, `${base}/auth/login?next=${base}/auth/about/${params.id}`);
}
}
@@ -57,7 +58,7 @@ export const actions = {
const response = await res.json();
locals.user = response;
userDatesFromRFC3339(locals.user);
- throw redirect(303, `/auth/about/${response.id}`);
+ throw redirect(303, `${base}/auth/about/${response.id}`);
},
/**
diff --git a/frontend/src/routes/auth/admin/users/+layout.server.js b/frontend/src/routes/auth/admin/users/+layout.server.js
index 325dc6b..68ca066 100644
--- a/frontend/src/routes/auth/admin/users/+layout.server.js
+++ b/frontend/src/routes/auth/admin/users/+layout.server.js
@@ -1,6 +1,7 @@
import { BASE_API_URI } from '$lib/utils/constants';
import { redirect } from '@sveltejs/kit';
import { userDatesFromRFC3339, refreshCookie } from '$lib/utils/helpers';
+import { base } from '$app/paths';
/** @type {import('./$types').LayoutServerLoad} */
export async function load({ cookies, fetch, locals }) {
@@ -15,7 +16,7 @@ export async function load({ cookies, fetch, locals }) {
if (!response.ok) {
// Clear the invalid JWT cookie
cookies.delete('jwt', { path: '/' });
- throw redirect(302, '/auth/login?next=admin/users/');
+ throw redirect(302, `${base}/auth/login?next=${base}admin/users/`);
}
const data = await response.json();
@@ -42,6 +43,6 @@ export async function load({ cookies, fetch, locals }) {
// In case of any error, clear the JWT cookie
cookies.delete('jwt', { path: '/' });
- throw redirect(302, '/auth/login?next=admin/users/');
+ throw redirect(302, `${base}/auth/login?next=${base}/admin/users/`);
}
}
diff --git a/frontend/src/routes/auth/admin/users/+page.server.js b/frontend/src/routes/auth/admin/users/+page.server.js
index 29933f4..d125d38 100644
--- a/frontend/src/routes/auth/admin/users/+page.server.js
+++ b/frontend/src/routes/auth/admin/users/+page.server.js
@@ -10,15 +10,16 @@ import {
processSubscriptionFormData,
processUserFormData
} from '$lib/utils/processing';
+import { base } from '$app/paths';
/** @type {import('./$types').PageServerLoad} */
export async function load({ locals }) {
// redirect user if not logged in
if (!locals.user) {
- throw redirect(302, `/auth/login?next=/auth/admin/users`);
+ throw redirect(302, `${base}/auth/login?next=${base}/auth/admin/users`);
}
if (locals.user.role_id === 0) {
- throw redirect(302, `/auth/about/${locals.user.id}`);
+ throw redirect(302, `${base}/auth/about/${locals.user.id}`);
}
}
@@ -66,7 +67,7 @@ export const actions = {
console.log('Server success response:', response);
locals.user = response;
userDatesFromRFC3339(locals.user);
- throw redirect(303, `/auth/admin/users`);
+ throw redirect(303, `${base}/auth/admin/users`);
},
/**
@@ -108,7 +109,7 @@ export const actions = {
const response = await res.json();
console.log('Server success response:', response);
- throw redirect(303, `/auth/admin/users`);
+ throw redirect(303, `${base}/auth/admin/users`);
},
/**
@@ -148,7 +149,7 @@ export const actions = {
const response = await res.json();
console.log('Server success response:', response);
- throw redirect(303, `/auth/admin/users`);
+ throw redirect(303, `${base}/auth/admin/users`);
},
/**
@@ -188,6 +189,6 @@ export const actions = {
const response = await res.json();
console.log('Server success response:', response);
- throw redirect(303, `/auth/admin/users`);
+ throw redirect(303, `${base}/auth/admin/users`);
}
};
diff --git a/frontend/src/routes/auth/login/+page.svelte b/frontend/src/routes/auth/login/+page.svelte
index 0ab0585..fecbec3 100644
--- a/frontend/src/routes/auth/login/+page.svelte
+++ b/frontend/src/routes/auth/login/+page.svelte
@@ -1,5 +1,6 @@