From 7bbe3cf288ec480e56cc33a5d3248c00567e137f Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sun, 12 Nov 2023 10:08:44 +0100 Subject: [PATCH] fix: keep dark theme on login redirect --- frontend/src/routes/(root)/+layout.svelte | 2 +- .../user/login_callback/[client_name]/+page.svelte | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/routes/(root)/+layout.svelte b/frontend/src/routes/(root)/+layout.svelte index e79964f8ca..2dc27528aa 100644 --- a/frontend/src/routes/(root)/+layout.svelte +++ b/frontend/src/routes/(root)/+layout.svelte @@ -136,7 +136,7 @@ // every 1 hour if (i % 12 == 0) { - UserService.refreshUserToken() + await UserService.refreshUserToken() } try { diff --git a/frontend/src/routes/user/login_callback/[client_name]/+page.svelte b/frontend/src/routes/user/login_callback/[client_name]/+page.svelte index 6177402c8c..08d12985ec 100644 --- a/frontend/src/routes/user/login_callback/[client_name]/+page.svelte +++ b/frontend/src/routes/user/login_callback/[client_name]/+page.svelte @@ -75,6 +75,16 @@ await logoutWithRedirect(rd ?? undefined) } }) + + const darkMode = + window.localStorage.getItem('dark-mode') ?? + (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light') + + if (darkMode === 'dark') { + document.documentElement.classList.add('dark') + } else { + document.documentElement.classList.remove('dark') + }