Merge pull request #972 from shawnrivers/dev

Dev
shawnrivers · Sep 24, 2020 · 2eb3436 · 2eb3436
2 parents d9fe6c1 + aeeaab3
commit 2eb3436
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/client/features/Member/template.tsx b/src/client/features/Member/template.tsx
@@ -142,7 +142,9 @@ export const MemberPage: React.FC<MemberPageProps> = props => {
             <InfoItemLabel>
               <Translation text="birthday" />
             </InfoItemLabel>
-            <InfoItemValue>{formatDate(birthday)}</InfoItemValue>
+            <InfoItemValue>
+              <time dateTime={birthday}>{formatDate(birthday)}</time>
+            </InfoItemValue>
             <InfoItemLabel>
               <Translation text="height" />
             </InfoItemLabel>

diff --git a/src/client/store/app/context.tsx b/src/client/store/app/context.tsx
@@ -18,9 +18,7 @@ type Context = {
 };
 
 export const Context = React.createContext<Context>({
-  themeMode: 'auto',
-  themeKey: 'light',
-  language: 'ja',
+  ...getInitialState(),
   setThemeKey: () => null,
   setTheme: () => null,
   setLanguage: () => null,

diff --git a/src/client/store/app/reducer.ts b/src/client/store/app/reducer.ts
@@ -8,13 +8,10 @@ type State = {
   language: Language;
 };
 
-export const getInitialState = (
-  theme?: ThemeMode | null,
-  language?: Language | null
-): State => ({
-  themeMode: theme ?? 'auto',
-  themeKey: theme === 'dark' ? 'dark' : 'light',
-  language: language ?? 'ja',
+export const getInitialState = (): State => ({
+  themeMode: 'auto',
+  themeKey: 'dark',
+  language: 'ja',
 });
 
 type Action =