Fixes the code to load the theme from preferences (#599)

Lukasdotcom · Oct 25, 2023 · 8844cb8 · 8844cb8
1 parent 22afedc
commit 8844cb8
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -192,14 +192,15 @@ function MyApp({ Component, pageProps }: AppProps) {
   // Used to create the theme for the website and starts of in dark to not blind dark theme users
   const [colorMode, setColorMode] = useState<"light" | "dark" | string>("dark");
   function updateColorMode(theme: "light" | "dark" | string, force = false) {
-    if (force || (session && session?.user.theme !== theme)) {
+    if (force) {
       fetch("/api/user", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
         },
         body: JSON.stringify({ theme }),
       });
+      localStorage.theme = theme;
     }
     if (colorMode !== theme) {
       setColorMode(theme);
@@ -210,12 +211,9 @@ function MyApp({ Component, pageProps }: AppProps) {
   // Sets the color scheme based on preferences)
   useEffect(() => {
     // Grabs the online preferences if they exist
-    if (
-      session &&
-      (session.user.theme === "dark" || session.user.theme === "light")
-    ) {
+    if (session && session.user.theme !== "" && session.user.theme) {
       updateColorMode(session.user.theme);
-    } else if (localStorage.theme !== "") {
+    } else if (localStorage.theme !== "" && localStorage.theme) {
       // Uses localstorage if available
       updateColorMode(localStorage.theme);
     } else {