From e526a6fd64391d28f4c25427e05c70fb83c538de Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 1 Jul 2025 17:38:15 +0530 Subject: [PATCH] fix: moved sirebar settings to settings store --- frontend/src/components/AppSidebar.vue | 3 ++- frontend/src/components/MobileLayout.vue | 4 +++- frontend/src/stores/session.js | 7 ------- frontend/src/stores/settings.js | 7 +++++++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue index 9a96b146..3d7ce6f2 100644 --- a/frontend/src/components/AppSidebar.vue +++ b/frontend/src/components/AppSidebar.vue @@ -225,7 +225,7 @@ import { IntermediateStepModal, } from 'frappe-ui/frappe' -const { user, sidebarSettings } = sessionStore() +const { user } = sessionStore() const { userResource } = usersStore() let sidebarStore = useSidebar() const socket = inject('$socket') @@ -236,6 +236,7 @@ const isModerator = ref(false) const isInstructor = ref(false) const pageToEdit = ref(null) const settingsStore = useSettings() +const { sidebarSettings } = settingsStore const showOnboarding = ref(false) const showIntermediateModal = ref(false) const currentStep = ref({}) diff --git a/frontend/src/components/MobileLayout.vue b/frontend/src/components/MobileLayout.vue index 1288c110..40cb3855 100644 --- a/frontend/src/components/MobileLayout.vue +++ b/frontend/src/components/MobileLayout.vue @@ -58,11 +58,13 @@ import { getSidebarLinks } from '@/utils' import { useRouter } from 'vue-router' import { watch, ref, onMounted } from 'vue' import { sessionStore } from '@/stores/session' +import { useSettings } from '@/stores/settings' import { usersStore } from '@/stores/user' import * as icons from 'lucide-vue-next' -const { logout, user, sidebarSettings } = sessionStore() +const { logout, user } = sessionStore() let { isLoggedIn } = sessionStore() +const { sidebarSettings } = useSettings() const router = useRouter() let { userResource } = usersStore() const sidebarLinks = ref(getSidebarLinks()) diff --git a/frontend/src/stores/session.js b/frontend/src/stores/session.js index c78ae9af..17697079 100644 --- a/frontend/src/stores/session.js +++ b/frontend/src/stores/session.js @@ -54,12 +54,6 @@ export const sessionStore = defineStore('lms-session', () => { }, }) - const sidebarSettings = createResource({ - url: 'lms.lms.api.get_sidebar_settings', - cache: 'Sidebar Settings', - auto: false, - }) - const livecodeURL = createResource({ url: 'frappe.client.get_single_value', params: { @@ -77,7 +71,6 @@ export const sessionStore = defineStore('lms-session', () => { logout, brand, branding, - sidebarSettings, livecodeURL, } }) diff --git a/frontend/src/stores/settings.js b/frontend/src/stores/settings.js index 205354ba..b323ef0f 100644 --- a/frontend/src/stores/settings.js +++ b/frontend/src/stores/settings.js @@ -29,11 +29,18 @@ export const useSettings = defineStore('settings', () => { cache: ['preventSkippingVideos'], }) + const sidebarSettings = createResource({ + url: 'lms.lms.api.get_sidebar_settings', + cache: 'Sidebar Settings', + auto: false, + }) + return { isSettingsOpen, activeTab, learningPaths, allowGuestAccess, preventSkippingVideos, + sidebarSettings, } })