Merge pull request #26 from p12-sandbox/develop

Develop
p12-sandbox · Oct 19, 2021 · fb7e4be · fb7e4be · vercel · Oct 19, 2021
2 parents d7746de + 10da317
commit fb7e4be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/components/ThemeChanger.tsx b/src/components/ThemeChanger.tsx
@@ -3,13 +3,15 @@ import { useState, useEffect } from "react";
 
 export const ThemeChanger = () => {
   const [mounted, setMounted] = useState(false)
-  const { theme, setTheme } = useTheme()
+
 
   // When mounted on client, now we can show the UI
   useEffect(() => setMounted(true), [])
 
-  if (!mounted) return null
-
+  if (!mounted) {
+    return null
+  }
+  const { theme, setTheme } = useTheme()
 　if(theme === 'dark'){
     return (
       <button className="theme-changer_button" onClick={() => setTheme('light')}>

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -9,7 +9,7 @@ import "@src/styles/globals.scss";
 
 export default function MyApp({ Component, pageProps }: AppProps) {
   return (
-    <ThemeProvider>
+    <ThemeProvider defaultTheme="light">
       <Head>
         <link
           rel="icon shortcut"