From 53c53c009e5524e577a1a8631fe18f65f2f53682 Mon Sep 17 00:00:00 2001
From: diced <pranaco2@gmail.com>
Date: Thu, 26 Aug 2021 21:41:30 -0700
Subject: [PATCH] fix(components): white text on links when light theme

---
 src/components/Layout.tsx    | 62 +++++++++++++++---------------------
 src/lib/themes/ayu_dark.ts   |  2 +-
 src/lib/themes/ayu_light.ts  |  2 +-
 src/lib/themes/ayu_mirage.ts |  2 +-
 src/lib/themes/nord.ts       |  2 +-
 src/lib/themes/polar.ts      |  2 +-
 6 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 7539aab..2487aca 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -221,12 +221,10 @@ export default function Layout({ children, user, loading, noPaper }) {
                     </Typography>
                   </MenuItem>
                   <Divider />
-                  <Link href='/dashboard/manage'>
-                    <a style={{ color: 'white', textDecoration: 'none' }}>
-                      <MenuItem onClick={handleClose(null)}>
-                        <AccountIcon sx={{ mr: 2 }} /> Manage Account
-                      </MenuItem>
-                    </a>
+                  <Link href='/dashboard/manage' passHref>
+                    <MenuItem onClick={handleClose(null)}>
+                      <AccountIcon sx={{ mr: 2 }} /> Manage Account
+                    </MenuItem>
                   </Link>
                   <MenuItem onClick={handleClose('copy')}>
                     <CopyIcon sx={{ mr: 2 }} /> Copy Token
@@ -234,12 +232,10 @@ export default function Layout({ children, user, loading, noPaper }) {
                   <MenuItem onClick={handleClose('reset')}>
                     <ResetIcon sx={{ mr: 2 }} /> Reset Token
                   </MenuItem>
-                  <Link href='/auth/logout'>
-                    <a style={{ color: 'white', textDecoration: 'none' }}>
-                      <MenuItem onClick={handleClose(null)}>
-                        <LogoutIcon sx={{ mr: 2 }} /> Logout
-                      </MenuItem>
-                    </a>
+                  <Link href='/auth/logout' passHref>
+                    <MenuItem onClick={handleClose(null)}>
+                      <LogoutIcon sx={{ mr: 2 }} /> Logout
+                    </MenuItem>
                   </Link>
                   <MenuItem>
                     <BrushIcon sx={{ mr: 2 }} />
@@ -266,23 +262,19 @@ export default function Layout({ children, user, loading, noPaper }) {
       <Divider />
       <List>
         {items.map((item, i) => (
-          <Link key={i} href={item.link}>
-            <a href={item.link} style={{ color: 'white', textDecoration: 'none' }}>
-              <ListItem button>
-                <ListItemIcon>{item.icon}</ListItemIcon>
-                <ListItemText primary={item.text} />
-              </ListItem>
-            </a>
+          <Link key={i} href={item.link} passHref>
+            <ListItem button>
+              <ListItemIcon>{item.icon}</ListItemIcon>
+              <ListItemText primary={item.text} />
+            </ListItem>
           </Link>
         ))}
         {user && user.administrator && (
           <Link href='/dashboard/users' passHref>
-            <a style={{ color: 'white', textDecoration: 'none' }}>
-              <ListItem button>
-                <ListItemIcon><UsersIcon /></ListItemIcon>
-                <ListItemText primary='Users' />
-              </ListItem>
-            </a>
+            <ListItem button>
+              <ListItemIcon><UsersIcon /></ListItemIcon>
+              <ListItemText primary='Users' />
+            </ListItem>
           </Link>
         )}
       </List>
@@ -346,12 +338,10 @@ export default function Layout({ children, user, loading, noPaper }) {
                   </Typography>
                 </MenuItem>
                 <Divider />
-                <Link href='/dash/manage'>
-                  <a style={{ color: 'white', textDecoration: 'none' }}>
-                    <MenuItem onClick={handleClose(null)}>
-                      <AccountIcon sx={{ mr: 2 }} /> Manage Account
-                    </MenuItem>
-                  </a>
+                <Link href='/dash/manage' passHref>
+                  <MenuItem onClick={handleClose(null)}>
+                    <AccountIcon sx={{ mr: 2 }} /> Manage Account
+                  </MenuItem>
                 </Link>
                 <MenuItem onClick={handleClose('copy')}>
                   <CopyIcon sx={{ mr: 2 }} /> Copy Token
@@ -359,12 +349,10 @@ export default function Layout({ children, user, loading, noPaper }) {
                 <MenuItem onClick={handleClose('reset')}>
                   <ResetIcon sx={{ mr: 2 }} /> Reset Token
                 </MenuItem>
-                <Link href='/auth/logout'>
-                  <a style={{ color: 'white', textDecoration: 'none' }}>
-                    <MenuItem onClick={handleClose(null)}>
-                      <LogoutIcon sx={{ mr: 2 }} /> Logout
-                    </MenuItem>
-                  </a>
+                <Link href='/auth/logout' passHref>
+                  <MenuItem onClick={handleClose(null)}>
+                    <LogoutIcon sx={{ mr: 2 }} /> Logout
+                  </MenuItem>
                 </Link>
               </Menu>
             </Box>
diff --git a/src/lib/themes/ayu_dark.ts b/src/lib/themes/ayu_dark.ts
index 5d0b586..a59283f 100644
--- a/src/lib/themes/ayu_dark.ts
+++ b/src/lib/themes/ayu_dark.ts
@@ -9,7 +9,7 @@ export default createTheme({
   error: '#F07178',
   warning: '#F29668',
   info: '#95E6CB',
-  border: '#0D1016',
+  border: '#191e29',
   background: {
     main: '#0A0E14',
     paper: '#0D1016'
diff --git a/src/lib/themes/ayu_light.ts b/src/lib/themes/ayu_light.ts
index 7d8fb74..746c777 100644
--- a/src/lib/themes/ayu_light.ts
+++ b/src/lib/themes/ayu_light.ts
@@ -9,7 +9,7 @@ export default createTheme({
   error: '#F07171',
   warning: '#ED9366',
   info: '#95E6CB',
-  border: '#FFFFFF',
+  border: '#e3e3e3',
   background: {
     main: '#FAFAFA',
     paper: '#FFFFFF'
diff --git a/src/lib/themes/ayu_mirage.ts b/src/lib/themes/ayu_mirage.ts
index ee0ab86..6f2749a 100644
--- a/src/lib/themes/ayu_mirage.ts
+++ b/src/lib/themes/ayu_mirage.ts
@@ -9,7 +9,7 @@ export default createTheme({
   error: '#F28779',
   warning: '#F29E74',
   info: '#95E6CB',
-  border: '#232834',
+  border: '#363c4d',
   background: {
     main: '#1F2430',
     paper: '#232834'
diff --git a/src/lib/themes/nord.ts b/src/lib/themes/nord.ts
index 469679c..ab603f6 100644
--- a/src/lib/themes/nord.ts
+++ b/src/lib/themes/nord.ts
@@ -9,7 +9,7 @@ export default createTheme({
   error: '#BF616A',
   warning: '#EBCB8B',
   info: '#5E81AC',
-  border: '#3B4252',
+  border: '#565e70',
   background: {
     main: '#2E3440',
     paper: '#3B4252'
diff --git a/src/lib/themes/polar.ts b/src/lib/themes/polar.ts
index 21c5722..b3ffd28 100644
--- a/src/lib/themes/polar.ts
+++ b/src/lib/themes/polar.ts
@@ -9,7 +9,7 @@ export default createTheme({
   error: '#BF616A',
   warning: '#EBCB8B',
   info: '#5E81AC',
-  border: '#E5E9F0',
+  border: '#989fab',
   background: {
     main: '#D8DEE9',
     paper: '#E5E9F0'