From 2d7032f4eddf0d77cda478504a326e871fa0be12 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 25 Oct 2024 17:09:58 +0530
Subject: [PATCH] chore: renamed SettingsModal to Settings and moved it to
 AppSidebar

---
 frontend/src/App.vue                                        | 2 --
 frontend/src/components/Layouts/AppSidebar.vue              | 6 ++++--
 .../components/Settings/{SettingsModal.vue => Settings.vue} | 4 ++--
 frontend/src/components/UserDropdown.vue                    | 6 +++---
 frontend/src/composables/settings.js                        | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename frontend/src/components/Settings/{SettingsModal.vue => Settings.vue} (98%)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index d523281a..b735b073 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -2,13 +2,11 @@
   <Layout v-if="session().isLoggedIn">
     <router-view />
   </Layout>
-  <SettingsModal />
   <Dialogs />
   <Toasts />
 </template>
 
 <script setup>
-import SettingsModal from '@/components/Settings/SettingsModal.vue'
 import { Dialogs } from '@/utils/dialogs'
 import { sessionStore as session } from '@/stores/session'
 import { Toasts } from 'frappe-ui'
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 75bedeab..723ac60a 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -96,6 +96,7 @@
       </SidebarLink>
     </div>
     <Notifications />
+    <Settings />
   </div>
 </template>
 
@@ -115,9 +116,10 @@ import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
 import NotificationsIcon from '@/components/Icons/NotificationsIcon.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import Notifications from '@/components/Notifications.vue'
+import Settings from '@/components/Settings/Settings.vue'
 import { viewsStore } from '@/stores/views'
 import { notificationsStore } from '@/stores/notifications'
-import { showSettingsModal, activeSettingsPage } from '@/composables/settings'
+import { showSettings, activeSettingsPage } from '@/composables/settings'
 import { FeatherIcon, TrialBanner } from 'frappe-ui'
 import { useStorage } from '@vueuse/core'
 import { computed, h } from 'vue'
@@ -233,7 +235,7 @@ function getIcon(routeName, icon) {
 }
 
 function showBillingSettingPage() {
-  showSettingsModal.value = true
+  showSettings.value = true
   activeSettingsPage.value = 'Billing'
 }
 </script>
diff --git a/frontend/src/components/Settings/SettingsModal.vue b/frontend/src/components/Settings/Settings.vue
similarity index 98%
rename from frontend/src/components/Settings/SettingsModal.vue
rename to frontend/src/components/Settings/Settings.vue
index 81c4fe8c..24a58a3e 100644
--- a/frontend/src/components/Settings/SettingsModal.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog
-    v-model="showSettingsModal"
+    v-model="showSettings"
     :options="{ size: '5xl' }"
     @close="activeSettingsPage = ''"
   >
@@ -55,7 +55,7 @@ import TwilioSettings from '@/components/Settings/TwilioSettings.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import {
   isWhatsappInstalled,
-  showSettingsModal,
+  showSettings,
   activeSettingsPage,
 } from '@/composables/settings'
 import { Dialog, Plans, Billing } from 'frappe-ui'
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index 64d799fa..98b80736 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -51,9 +51,9 @@ import CRMLogo from '@/components/Icons/CRMLogo.vue'
 import Apps from '@/components/Apps.vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/users'
-import { showSettingsModal } from '@/composables/settings'
+import { showSettings } from '@/composables/settings'
 import { Dropdown } from 'frappe-ui'
-import { computed, ref, markRaw} from 'vue'
+import { computed, ref, markRaw } from 'vue'
 
 const props = defineProps({
   isCollapsed: {
@@ -94,7 +94,7 @@ let dropdownOptions = ref([
       {
         icon: 'settings',
         label: computed(() => __('Settings')),
-        onClick: () => (showSettingsModal.value = true),
+        onClick: () => (showSettings.value = true),
       },
       {
         icon: 'log-out',
diff --git a/frontend/src/composables/settings.js b/frontend/src/composables/settings.js
index 1fc6ea3f..e4f27c47 100644
--- a/frontend/src/composables/settings.js
+++ b/frontend/src/composables/settings.js
@@ -34,5 +34,5 @@ export const mobileSidebarOpened = ref(false)
 
 export const isMobileView = computed(() => window.innerWidth < 768)
 
-export const showSettingsModal = ref(false)
-export const activeSettingsPage = ref('')
\ No newline at end of file
+export const showSettings = ref(false)
+export const activeSettingsPage = ref('')