diff --git a/src/app.html b/src/app.html
index 0a202eee..d6761601 100644
--- a/src/app.html
+++ b/src/app.html
@@ -1,6 +1,6 @@
-
+
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 7b6a7643..d0070b06 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -5,17 +5,21 @@ import { serializeNonPOJOs } from "$lib/utils";
export const handle = sequence(async ({ event, resolve }) => {
// Use a ternary operator instead of the logical OR for better compatibility
- const pbURL = import.meta.env.VITE_USEAST_POCKETBASE_URL; //isUS ? import.meta.env.VITE_USEAST_POCKETBASE_URL : import.meta.env.VITE_EU_POCKETBASE_URL;
- const apiURL = import.meta.env.VITE_USEAST_API_URL; //isUS ? import.meta.env.VITE_USEAST_API_URL : import.meta.env.VITE_EU_API_URL;
- const fastifyURL = import.meta.env.VITE_USEAST_FASTIFY_URL; //isUS ? import.meta.env.VITE_USEAST_FASTIFY_URL : import.meta.env.VITE_EU_FASTIFY_URL;
- const wsURL = import.meta.env.VITE_USEAST_WS_URL; //isUS ? import.meta.env.VITE_USEAST_WS_URL : import.meta.env.VITE_EU_WS_URL;
-
+ const pbURL = import.meta.env.VITE_USEAST_POCKETBASE_URL;
+ const apiURL = import.meta.env.VITE_USEAST_API_URL;
+ const fastifyURL = import.meta.env.VITE_USEAST_FASTIFY_URL;
+ const wsURL = import.meta.env.VITE_USEAST_WS_URL;
+
+ const themeMode = event?.cookies?.get("theme-mode");
+
+
event.locals = {
pb: new PocketBase(pbURL),
apiURL,
fastifyURL,
wsURL,
apiKey: import.meta.env.VITE_STOCKNEAR_API_KEY,
+ themeMode,
};
const authCookie = event?.request?.headers?.get("cookie") || "";
@@ -33,7 +37,9 @@ export const handle = sequence(async ({ event, resolve }) => {
}
}
- const response = await resolve(event);
+ const response = await resolve(event, {
+ transformPageChunk: ({html}) => html.replace('data-theme=""', `data-theme="${themeMode}"`)
+ });
// Use a more compatible way to set the cookie
const cookieString = event?.locals?.pb?.authStore?.exportToCookie({
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index 58fed78a..86d27ed9 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -1,9 +1,7 @@
-export const ssr = true;
export const load = ({ locals, cookies }) => {
- const { user, isUSRegion, wsURL } = locals;
- const themeMode = cookies.get("theme-mode") || "dark"; // Default to dark
+ const { user, isUSRegion, wsURL, themeMode } = locals;
return {
user: user || undefined,
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 0b16f652..cd050713 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -54,6 +54,7 @@
export let data;
+ console.log(data?.themeMode, $mode)
let hideHeader = false;
BProgress.configure({
showSpinner: false,