From 801ddbb3d805dc7f4b08a8991e2268a96b7d65d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bahad=C4=B1r=20Sofuo=C4=9Flu?= <bahadirsofuoglu@gmail.com>
Date: Tue, 15 Nov 2022 17:23:19 +0300
Subject: [PATCH] AppConfig changes

---
 package-lock.json                       | 14 +++++++-------
 src/layout/AppConfig.vue                |  3 +--
 src/layout/composables/layoutService.js |  8 ++++----
 src/views/uikit/Chart.vue               |  6 ++----
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2936256..772dc55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
             "name": "sakai-vue",
             "version": "0.0.0",
             "dependencies": {
-                "chart.js": "3.3.2",
+                "chart.js": "3.9.1",
                 "primeflex": "^3.2.1",
                 "primeicons": "^6.0.1",
                 "primevue": "^3.18.1",
@@ -450,9 +450,9 @@
             }
         },
         "node_modules/chart.js": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz",
-            "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA=="
+            "version": "3.9.1",
+            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
+            "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w=="
         },
         "node_modules/chokidar": {
             "version": "3.5.3",
@@ -2652,9 +2652,9 @@
             }
         },
         "chart.js": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz",
-            "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA=="
+            "version": "3.9.1",
+            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
+            "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w=="
         },
         "chokidar": {
             "version": "3.5.3",
diff --git a/src/layout/AppConfig.vue b/src/layout/AppConfig.vue
index 38a937b..203d05b 100644
--- a/src/layout/AppConfig.vue
+++ b/src/layout/AppConfig.vue
@@ -20,10 +20,9 @@ const onChangeTheme = (theme, mode) => {
     cloneLinkElement.addEventListener('load', () => {
         linkElement.remove();
         cloneLinkElement.setAttribute('id', elementId);
+        changeThemeSettings(theme, mode === 'dark');
     });
     linkElement.parentNode.insertBefore(cloneLinkElement, linkElement.nextSibling);
-
-    changeThemeSettings(theme, mode === 'dark');
 };
 const decrementScale = () => {
     setScale(layoutConfig.scale.value - 1);
diff --git a/src/layout/composables/layoutService.js b/src/layout/composables/layoutService.js
index ae2a3e0..b1bea32 100644
--- a/src/layout/composables/layoutService.js
+++ b/src/layout/composables/layoutService.js
@@ -19,17 +19,17 @@ const layoutState = reactive({
     menuHoverActive: false
 });
 
-export function useLayoutService() {
+export function useLayoutService () {
     const changeThemeSettings = (theme, darkTheme) => {
-        layoutConfig.theme = theme;
         layoutConfig.darkTheme = darkTheme;
+        layoutConfig.theme = theme;
     };
 
-    const setScale = (scale) => {
+    const setScale = scale => {
         layoutConfig.scale = scale;
     };
 
-    const setActiveMenuItem = (item) => {
+    const setActiveMenuItem = item => {
         layoutConfig.activeMenuItem = item.value || item;
     };
 
diff --git a/src/views/uikit/Chart.vue b/src/views/uikit/Chart.vue
index a57c888..2a9e599 100644
--- a/src/views/uikit/Chart.vue
+++ b/src/views/uikit/Chart.vue
@@ -225,10 +225,8 @@ const setChart = () => {
 watch(
     layoutConfig.theme,
     () => {
-        setTimeout(() => {
-            setColorOptions();
-            setChart();
-        }, 200);
+        setColorOptions();
+        setChart();
     },
     { immediate: true }
 );