From bab25eeb55111dfac9995009d0c2563e1b0d9a33 Mon Sep 17 00:00:00 2001
From: Saeid Doroudi <doroudi@outlook.com>
Date: Sun, 21 Jan 2024 10:56:57 +0330
Subject: [PATCH] dark mode should be improved Fixes #11

---
 src/App.vue                         | 3 ++-
 src/common/theme/theme-overrides.ts | 2 --
 src/components.d.ts                 | 7 +++++++
 src/components/Sidebar.vue          | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 3a3e937..041effa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,6 +6,7 @@ import { messageRtl } from 'naive-ui/es/message/styles'
 import { tableRtl } from 'naive-ui/es/table/styles'
 import scrollbarRtl from 'naive-ui/es/_internal/scrollbar/styles/rtl'
 import { tagRtl } from 'naive-ui/es/tag/styles'
+import { darkTheme, lightTheme } from 'naive-ui'
 import themeOverrides from '~/common/theme/theme-overrides'
 
 const layout = useLayoutStore()
@@ -52,7 +53,7 @@ watch(() => layout.activeLanguage, () => {
 </script>
 
 <template>
-  <n-config-provider :theme-overrides="themeOverrides" :rtl="layout.isRtl ? rtlStyles : []" :preflight-style-disabled="false">
+  <n-config-provider :theme="isDark ? darkTheme : lightTheme" :theme-overrides="themeOverrides" :rtl="layout.isRtl ? rtlStyles : []" :preflight-style-disabled="false">
     <n-notification-provider placement="bottom-right">
       <n-message-provider placement="bottom-right">
         <n-dialog-provider>
diff --git a/src/common/theme/theme-overrides.ts b/src/common/theme/theme-overrides.ts
index 6b085ab..bf89223 100644
--- a/src/common/theme/theme-overrides.ts
+++ b/src/common/theme/theme-overrides.ts
@@ -6,8 +6,6 @@ const themeOverrides: GlobalThemeOverrides = {
     errorColor: '#FF0055',
     warningColor: '#FF8000',
     borderRadius: '5px',
-    textColor1: 'var(--text)',
-    textColor2: 'var(--dark)',
   },
   Tag: {
     borderRadius: '4px',
diff --git a/src/components.d.ts b/src/components.d.ts
index f0eb139..e96fab8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -26,12 +26,14 @@ declare module 'vue' {
     Navbar: typeof import('./components/Navbar.vue')['default']
     NBadge: typeof import('naive-ui')['NBadge']
     NButton: typeof import('naive-ui')['NButton']
+    NCard: typeof import('naive-ui')['NCard']
     NColorPicker: typeof import('naive-ui')['NColorPicker']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
     NDataTable: typeof import('naive-ui')['NDataTable']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDrawer: typeof import('naive-ui')['NDrawer']
     NDrawerContent: typeof import('naive-ui')['NDrawerContent']
+    NDynamicTags: typeof import('naive-ui')['NDynamicTags']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
     NIcon: typeof import('naive-ui')['NIcon']
@@ -41,10 +43,15 @@ declare module 'vue' {
     NLayoutSider: typeof import('naive-ui')['NLayoutSider']
     NMenu: typeof import('naive-ui')['NMenu']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']
+    NModal: typeof import('naive-ui')['NModal']
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NPageHeader: typeof import('naive-ui')['NPageHeader']
     NPopselect: typeof import('naive-ui')['NPopselect']
+    NSelect: typeof import('naive-ui')['NSelect']
     NSpace: typeof import('naive-ui')['NSpace']
+    NSwitch: typeof import('naive-ui')['NSwitch']
+    NTreeSelect: typeof import('naive-ui')['NTreeSelect']
+    NUpload: typeof import('naive-ui')['NUpload']
     OrderManagement: typeof import('./components/Orders/OrderManagement.vue')['default']
     ProductsManagement: typeof import('./components/Products/ProductsManagement.vue')['default']
     ReviewManagement: typeof import('./components/Review/ReviewManagement.vue')['default']
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index d16df79..96393ed 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -153,7 +153,7 @@ const menuOptions: MenuOption[] = [
 
 function renderIcon(icon: any, showBadge = false) {
   if (showBadge)
-    return () => h(NBadge, { processing: true, dot: true, type: 'success', offset: [-2, 2] }, { default: () => h(NIcon, { color: '#000' }, { default: () => h(icon) }) })
+    return () => h(NBadge, { processing: true, dot: true, type: 'success', offset: [-2, 2] }, { default: () => h(NIcon, { }, { default: () => h(icon) }) })
 
   return () => h(NIcon, null, { default: () => h(icon) })
 }