diff --git a/.github/helpers/site_config_mariadb.json b/.github/helpers/site_config_mariadb.json index 5c814f5c4..55618e6b1 100644 --- a/.github/helpers/site_config_mariadb.json +++ b/.github/helpers/site_config_mariadb.json @@ -11,6 +11,6 @@ "root_login": "root", "root_password": "root", "host_name": "http://test_site:8000", - "install_apps": ["frappedesk"], + "install_apps": ["helpdesk"], "throttle_user_limit": 100 } diff --git a/desk/src/components/desk/sidebar/LinkGroup.vue b/desk/src/components/desk/sidebar/LinkGroup.vue new file mode 100644 index 000000000..7d07d9440 --- /dev/null +++ b/desk/src/components/desk/sidebar/LinkGroup.vue @@ -0,0 +1,20 @@ + + + + + + + diff --git a/desk/src/components/desk/SideBarMenu.vue b/desk/src/components/desk/sidebar/SideBar.vue similarity index 55% rename from desk/src/components/desk/SideBarMenu.vue rename to desk/src/components/desk/sidebar/SideBar.vue index 9dc96e575..7c190b13a 100644 --- a/desk/src/components/desk/SideBarMenu.vue +++ b/desk/src/components/desk/sidebar/SideBar.vue @@ -1,81 +1,15 @@ - - - - - - - - - - - - - - - - - {{ option.label }} - - - + + - - - - - - {{ option.label }} - - - + import { ref } from "vue"; -import { useRoute } from "vue-router"; -import { Dropdown, Avatar } from "frappe-ui"; import { useAuthStore } from "@/stores/auth"; +import { useSidebarStore } from "@/stores/sidebar"; +import UserMenu from "./UserMenu.vue"; +import LinkGroup from "./LinkGroup.vue"; import IconDashboard from "@/assets/icons/dashboard.svg?component"; import IconDashboardSolid from "@/assets/icons/dashboard-solid.svg?component"; import IconTicket from "@/assets/icons/ticket.svg?component"; @@ -124,8 +59,8 @@ import IconKnowledgeBaseSolid from "@/assets/icons/knowledge-base-solid.svg?comp import IconSettings from "@/assets/icons/settings.svg?component"; import IconSettingsSolid from "@/assets/icons/settings-solid.svg?component"; -const route = useRoute(); const authStore = useAuthStore(); +const sidebarStore = useSidebarStore(); const isMac = navigator.userAgent.indexOf("Mac OS X") != -1; const showKeyboardShortcuts = ref(false); @@ -149,33 +84,25 @@ const menuOptions = [ label: "Dashboard", icon: IconDashboard, iconActive: IconDashboardSolid, - to: { - name: "Dashboard", - }, + to: "Dashboard", }, { label: "Tickets", icon: IconTicket, iconActive: IconTicketSolid, - to: { - name: "DeskTickets", - }, + to: "DeskTickets", }, { label: "Customers", icon: IconCustomer, iconActive: IconCustomerSolid, - to: { - name: "Customers", - }, + to: "Customers", }, { label: "Contacts", icon: IconContact, iconActive: IconContactSolid, - to: { - name: "Contacts", - }, + to: "Contacts", }, ]; @@ -184,17 +111,13 @@ const footerOptions = [ label: "Knowledge Base", icon: IconKnowledgeBase, iconActive: IconKnowledgeBaseSolid, - to: { - name: "DeskKBHome", - }, + to: "DeskKBHome", }, { label: "Settings", icon: IconSettings, iconActive: IconSettingsSolid, - to: { - name: "Settings", - }, + to: "Settings", }, ]; @@ -219,18 +142,4 @@ const profileSettings = [ handler: () => authStore.logout(), }, ]; - -const routeMap = { - "Knowledge Base": "/kb", - Contacts: "/contacts", - Customers: "/customers", - Dashboard: "/dashboard", - Reports: "/reports", - Settings: "/settings", - Tickets: "/tickets", -}; - -function isActive(label: string) { - return route.path.includes(routeMap[label]); -} diff --git a/desk/src/components/desk/sidebar/SidebarLink.vue b/desk/src/components/desk/sidebar/SidebarLink.vue new file mode 100644 index 000000000..2920fb629 --- /dev/null +++ b/desk/src/components/desk/sidebar/SidebarLink.vue @@ -0,0 +1,63 @@ + + + + + + + {{ label }} + + + + + + diff --git a/desk/src/components/desk/sidebar/UserMenu.vue b/desk/src/components/desk/sidebar/UserMenu.vue new file mode 100644 index 000000000..41776664f --- /dev/null +++ b/desk/src/components/desk/sidebar/UserMenu.vue @@ -0,0 +1,50 @@ + + + + + + + + {{ authStore.userName }} + + + + + + + + + diff --git a/desk/src/pages/desk/Desk.vue b/desk/src/pages/desk/Desk.vue index faa9cbf67..293213c80 100644 --- a/desk/src/pages/desk/Desk.vue +++ b/desk/src/pages/desk/Desk.vue @@ -5,8 +5,8 @@ > - - + + @@ -18,15 +18,15 @@