-
- {{ i == 0 ? "Where" : "And" }}
-
-
-
+
-
- Empty - Choose a field to filter by
-
-
+
+
-
+ variant="subtle"
+ @click="
+ () => {
+ resource.filters = undefined;
+ resource.fetch();
+ }
+ "
+ >
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/desk/src/components/FilterPopover.vue.bak b/desk/src/components/FilterPopover.vue.bak
new file mode 100644
index 000000000..493fd5650
--- /dev/null
+++ b/desk/src/components/FilterPopover.vue.bak
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ i == 0 ? 'Where' : 'And' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Empty - Choose a field to filter by
+
+
+
+
+
diff --git a/desk/src/components/list-view/LVNavigation.vue b/desk/src/components/list-view/LVNavigation.vue
index 9ef6ed398..81e18b798 100644
--- a/desk/src/components/list-view/LVNavigation.vue
+++ b/desk/src/components/list-view/LVNavigation.vue
@@ -27,9 +27,9 @@
diff --git a/desk/src/pages/desk/DeskDashboard.vue b/desk/src/pages/desk/DeskDashboard.vue
index 846791ba2..85af489bd 100644
--- a/desk/src/pages/desk/DeskDashboard.vue
+++ b/desk/src/pages/desk/DeskDashboard.vue
@@ -4,7 +4,7 @@
-
+
@@ -48,25 +48,24 @@
diff --git a/desk/src/pages/tickets/TicketsAgent.vue b/desk/src/pages/tickets/TicketsAgent.vue
index 7d7eb9530..809085024 100644
--- a/desk/src/pages/tickets/TicketsAgent.vue
+++ b/desk/src/pages/tickets/TicketsAgent.vue
@@ -50,10 +50,6 @@ const pageLength = ref(20);
const tickets = createListManager({
doctype: 'HD Ticket',
pageLength: pageLength.value,
- filters: {
- status: 'Resolved',
- agent_group: 'Random Team',
- },
orderBy: getOrder(),
auto: true,
transform: (data) => {
diff --git a/desk/src/pages/tickets/TicketsAgentList.vue b/desk/src/pages/tickets/TicketsAgentList.vue
index 9fc3a53c3..eeb3f180e 100644
--- a/desk/src/pages/tickets/TicketsAgentList.vue
+++ b/desk/src/pages/tickets/TicketsAgentList.vue
@@ -10,7 +10,7 @@
@@ -37,7 +37,7 @@
v-if="data.agreement_status"
:label="data.agreement_status"
:theme="slaStatusColorMap[data.agreement_status]"
- variant="outline"
+ variant="subtle"
/>
@@ -49,13 +49,13 @@
"
label="Fulfilled"
theme="green"
- variant="outline"
+ variant="subtle"
/>
{{ dayjs(data.response_by).fromNow() }}
@@ -71,25 +71,19 @@
"
label="Fulfilled"
theme="green"
- variant="outline"
+ variant="subtle"
/>
{{ dayjs(data.resolution_by).fromNow() }}
-
- {{ dayjs(data.creation).fromNow() }}
-
-
- {{ dayjs(data.modified).fromNow() }}
-
{{ data.via_customer_portal ? 'Customer Portal' : 'Email' }}
diff --git a/desk/src/resources/meta.ts b/desk/src/resources/meta.ts
index 95788bf82..f67ca63d9 100644
--- a/desk/src/resources/meta.ts
+++ b/desk/src/resources/meta.ts
@@ -50,8 +50,10 @@ export const fetch = createResource({
onError: useError(),
onSuccess: (data) => {
data.fields = data.fields
- // Remove hidden fields
- .filter((f) => !f.hidden)
+ // Remove hide fields
+ .filter((f) => !f.hide)
+ // Sort fields by `label`
+ .sort((a, b) => a.label?.localeCompare(b.label))
// Sort fields by `index`
.sort((a, b) => a.index - b.index);
state[data.name] = data;
@@ -68,29 +70,57 @@ const override = computed(() => ({
subject: {
width: 'w-96',
text: 'text-gray-900',
+ index: 2,
},
status: {
width: 'w-20',
+ index: 3,
+ },
+ priority: {
+ width: 'w-20',
+ index: 4,
+ },
+ ticket_type: {
+ label: 'Type',
+ index: 5,
},
assignee: {
label: 'Assignee',
width: 'w-40',
- hidden: !authStore.isAgent,
+ index: 6,
+ hide: !authStore.isAgent,
},
conversation: {
label: 'Conversation',
width: 'w-32',
- hidden: !authStore.isAgent,
+ index: 7,
+ hide: !authStore.isAgent,
},
source: {
label: 'Source',
- hidden: !authStore.isAgent,
+ hide: !authStore.isAgent,
},
creation: {
label: 'Created',
+ type: 'timeAgo',
+ index: 100,
},
modified: {
label: 'Updated',
+ type: 'timeAgo',
+ index: 101,
+ },
+ agent_group: {
+ hide: !authStore.isAgent,
+ },
+ response_by: {
+ hide: !authStore.isAgent,
+ },
+ resolution_by: {
+ hide: !authStore.isAgent,
+ },
+ agreement_status: {
+ hide: !authStore.isAgent,
},
},
}));
diff --git a/desk/src/router/index.js b/desk/src/router/index.js
index 2d2cdf560..b2c27450f 100644
--- a/desk/src/router/index.js
+++ b/desk/src/router/index.js
@@ -1,65 +1,65 @@
-import { createRouter, createWebHistory } from "vue-router";
-import { useAuthStore } from "@/stores/auth";
-import { init as initTelemetry } from "@/telemetry";
-import { AuthPages } from "./auth";
-import { CustomerPages } from "./customer";
-import { KnowldegeBasePages } from "./knowledege-base";
-import { getPage } from "./utils";
+import { createRouter, createWebHistory } from 'vue-router';
+import { useAuthStore } from '@/stores/auth';
+import { init as initTelemetry } from '@/telemetry';
+import { AuthPages } from './auth';
+import { CustomerPages } from './customer';
+import { KnowldegeBasePages } from './knowledege-base';
+import { getPage } from './utils';
-export const WEBSITE_ROOT = "Website Root";
+export const WEBSITE_ROOT = 'Website Root';
-export const LOGIN = "AuthLogin";
-export const SIGNUP = "AuthSignup";
-export const VERIFY = "AuthVerify";
+export const LOGIN = 'AuthLogin';
+export const SIGNUP = 'AuthSignup';
+export const VERIFY = 'AuthVerify';
export const AUTH_ROUTES = [LOGIN, SIGNUP, VERIFY];
-export const ONBOARDING_PAGE = "Setup";
+export const ONBOARDING_PAGE = 'Setup';
-export const CUSTOMER_PORTAL_NEW_TICKET = "TicketNew";
-export const CUSTOMER_PORTAL_TICKET = "TicketCustomer";
+export const CUSTOMER_PORTAL_NEW_TICKET = 'TicketNew';
+export const CUSTOMER_PORTAL_TICKET = 'TicketCustomer';
-export const AGENT_PORTAL_AGENT_LIST = "AgentList";
-export const AGENT_PORTAL_CANNED_RESPONSE_LIST = "CannedResponses";
-export const AGENT_PORTAL_CANNED_RESPONSE_SINGLE = "CannedResponse";
-export const AGENT_PORTAL_CONTACT_LIST = "ContactList";
-export const AGENT_PORTAL_CUSTOMER_LIST = "CustomerList";
-export const AGENT_PORTAL_DASHBOARD = "DeskDashboard";
-export const AGENT_PORTAL_ESCALATION_RULE_LIST = "EscalationRules";
-export const AGENT_PORTAL_TEAM_LIST = "Teams";
-export const AGENT_PORTAL_TEAM_SINGLE = "Team";
-export const AGENT_PORTAL_TICKET = "TicketAgent";
-export const AGENT_PORTAL_TICKET_LIST = "TicketsAgent";
-export const AGENT_PORTAL_TICKET_TYPE_LIST = "TicketTypes";
-export const AGENT_PORTAL_TICKET_TYPE_NEW = "NewTicketType";
-export const AGENT_PORTAL_TICKET_TYPE_SINGLE = "TicketType";
-export const AGENT_PORTAL_KNOWLEDGE_BASE = "DeskKBHome";
-export const AGENT_PORTAL_KNOWLEDGE_BASE_CATEGORY = "DeskKBCategory";
-export const AGENT_PORTAL_KNOWLEDGE_BASE_SUB_CATEGORY = "DeskKBSubcategory";
-export const AGENT_PORTAL_KNOWLEDGE_BASE_ARTICLE = "DeskKBArticle";
+export const AGENT_PORTAL_AGENT_LIST = 'AgentList';
+export const AGENT_PORTAL_CANNED_RESPONSE_LIST = 'CannedResponses';
+export const AGENT_PORTAL_CANNED_RESPONSE_SINGLE = 'CannedResponse';
+export const AGENT_PORTAL_CONTACT_LIST = 'ContactList';
+export const AGENT_PORTAL_CUSTOMER_LIST = 'CustomerList';
+export const AGENT_PORTAL_DASHBOARD = 'DeskDashboard';
+export const AGENT_PORTAL_ESCALATION_RULE_LIST = 'EscalationRules';
+export const AGENT_PORTAL_TEAM_LIST = 'Teams';
+export const AGENT_PORTAL_TEAM_SINGLE = 'Team';
+export const AGENT_PORTAL_TICKET = 'TicketAgent';
+export const AGENT_PORTAL_TICKET_LIST = 'TicketsAgent';
+export const AGENT_PORTAL_TICKET_TYPE_LIST = 'TicketTypes';
+export const AGENT_PORTAL_TICKET_TYPE_NEW = 'NewTicketType';
+export const AGENT_PORTAL_TICKET_TYPE_SINGLE = 'TicketType';
+export const AGENT_PORTAL_KNOWLEDGE_BASE = 'DeskKBHome';
+export const AGENT_PORTAL_KNOWLEDGE_BASE_CATEGORY = 'DeskKBCategory';
+export const AGENT_PORTAL_KNOWLEDGE_BASE_SUB_CATEGORY = 'DeskKBSubcategory';
+export const AGENT_PORTAL_KNOWLEDGE_BASE_ARTICLE = 'DeskKBArticle';
-export const KB_PUBLIC = "KBHome";
-export const KB_PUBLIC_ARTICLE = "KBArticlePublic";
-export const KB_PUBLIC_CATEGORY = "KBCategoryPublic";
+export const KB_PUBLIC = 'KBHome';
+export const KB_PUBLIC_ARTICLE = 'KBArticlePublic';
+export const KB_PUBLIC_CATEGORY = 'KBCategoryPublic';
-export const CUSTOMER_PORTAL_LANDING = "TicketsCustomer";
+export const CUSTOMER_PORTAL_LANDING = 'TicketsCustomer';
export const AGENT_PORTAL_LANDING = AGENT_PORTAL_TICKET_LIST;
const routes = [
{
- path: "",
- component: () => getPage("HRoot"),
+ path: '',
+ component: () => getPage('HRoot'),
},
AuthPages,
CustomerPages,
KnowldegeBasePages,
{
- path: "/onboarding",
+ path: '/onboarding',
name: ONBOARDING_PAGE,
- component: () => import("@/pages/onboarding/SimpleOnboarding.vue"),
+ component: () => import('@/pages/onboarding/SimpleOnboarding.vue'),
},
{
- path: "",
- name: "AgentRoot",
- component: () => import("@/pages/desk/AgentRoot.vue"),
+ path: '',
+ name: 'AgentRoot',
+ component: () => import('@/pages/desk/AgentRoot.vue'),
meta: {
auth: true,
agent: true,
@@ -67,126 +67,126 @@ const routes = [
},
children: [
{
- path: "dashboard",
+ path: 'dashboard',
name: AGENT_PORTAL_DASHBOARD,
- component: () => import("@/pages/desk/DeskDashboard.vue"),
+ component: () => import('@/pages/desk/DeskDashboard.vue'),
},
{
- path: "tickets",
+ path: 'tickets',
name: AGENT_PORTAL_TICKET_LIST,
- component: () => getPage("TicketsAgent"),
+ component: () => getPage('TicketsAgent'),
},
{
- path: "tickets/new/:templateId?",
- name: "TicketAgentNew",
- component: () => getPage("TicketNew"),
+ path: 'tickets/new/:templateId?',
+ name: 'TicketAgentNew',
+ component: () => getPage('TicketNew'),
props: true,
meta: {
- onSuccessRoute: "TicketAgent",
- parent: "TicketsAgent",
+ onSuccessRoute: 'TicketAgent',
+ parent: 'TicketsAgent',
},
},
{
- path: "tickets/:ticketId",
+ path: 'tickets/:ticketId',
name: AGENT_PORTAL_TICKET,
- component: () => getPage("TicketAgent"),
+ component: () => getPage('TicketAgent'),
props: true,
},
{
- path: "kb",
+ path: 'kb',
name: AGENT_PORTAL_KNOWLEDGE_BASE,
- component: () => import("@/pages/knowledge-base/KnowledgeBase.vue"),
+ component: () => import('@/pages/knowledge-base/KnowledgeBase.vue'),
children: [
{
- path: ":categoryId",
+ path: ':categoryId',
name: AGENT_PORTAL_KNOWLEDGE_BASE_CATEGORY,
props: true,
component: () =>
- import("@/pages/knowledge-base/KnowledgeBaseCategory.vue"),
+ import('@/pages/knowledge-base/KnowledgeBaseCategory.vue'),
},
{
- path: ":categoryId/:subCategoryId",
+ path: ':categoryId/:subCategoryId',
name: AGENT_PORTAL_KNOWLEDGE_BASE_SUB_CATEGORY,
props: true,
component: () =>
- import("@/pages/knowledge-base/KnowledgeBaseSubcategory.vue"),
+ import('@/pages/knowledge-base/KnowledgeBaseSubcategory.vue'),
},
],
},
{
- path: "kb/articles/:articleId",
+ path: 'kb/articles/:articleId',
name: AGENT_PORTAL_KNOWLEDGE_BASE_ARTICLE,
props: true,
component: () =>
- import("@/pages/knowledge-base/KnowledgeBaseArticle.vue"),
+ import('@/pages/knowledge-base/KnowledgeBaseArticle.vue'),
},
{
- path: "customers",
+ path: 'customers',
name: AGENT_PORTAL_CUSTOMER_LIST,
- component: () => import("@/pages/desk/customer/CustomerList.vue"),
+ component: () => import('@/pages/desk/customer/CustomerList.vue'),
},
{
- path: "contacts",
+ path: 'contacts',
name: AGENT_PORTAL_CONTACT_LIST,
- component: () => import("@/pages/desk/contact/ContactList.vue"),
+ component: () => import('@/pages/desk/contact/ContactList.vue'),
},
{
- path: "agents",
+ path: 'agents',
name: AGENT_PORTAL_AGENT_LIST,
- component: () => import("@/pages/desk/agent/AgentList.vue"),
+ component: () => import('@/pages/desk/agent/AgentList.vue'),
},
{
- path: "teams",
+ path: 'teams',
name: AGENT_PORTAL_TEAM_LIST,
- component: () => import("@/pages/desk/team/TeamList.vue"),
+ component: () => import('@/pages/desk/team/TeamList.vue'),
},
{
- path: "teams/:teamId",
+ path: 'teams/:teamId',
name: AGENT_PORTAL_TEAM_SINGLE,
- component: () => import("@/pages/desk/team/TeamSingle.vue"),
+ component: () => import('@/pages/desk/team/TeamSingle.vue'),
props: true,
},
{
- path: "ticket-types",
+ path: 'ticket-types',
name: AGENT_PORTAL_TICKET_TYPE_LIST,
- component: () => import("@/pages/desk/ticket_type/TicketTypeList.vue"),
+ component: () => import('@/pages/desk/ticket_type/TicketTypeList.vue'),
},
{
- path: "ticket-types/:id",
+ path: 'ticket-types/:id',
name: AGENT_PORTAL_TICKET_TYPE_SINGLE,
- component: () => import("@/pages/desk/ticket_type/TicketType.vue"),
+ component: () => import('@/pages/desk/ticket_type/TicketType.vue'),
props: true,
},
{
- path: "ticket-types/new",
+ path: 'ticket-types/new',
name: AGENT_PORTAL_TICKET_TYPE_NEW,
- component: () => import("@/pages/desk/ticket_type/TicketType.vue"),
+ component: () => import('@/pages/desk/ticket_type/TicketType.vue'),
},
{
- path: "canned-responses",
+ path: 'canned-responses',
name: AGENT_PORTAL_CANNED_RESPONSE_LIST,
component: () =>
- import("@/pages/desk/canned_response/CannedResponseList.vue"),
+ import('@/pages/desk/canned_response/CannedResponseList.vue'),
},
{
- path: "canned-responses/:id",
+ path: 'canned-responses/:id',
name: AGENT_PORTAL_CANNED_RESPONSE_SINGLE,
component: () =>
- import("@/pages/desk/canned_response/CannedResponseSingle.vue"),
+ import('@/pages/desk/canned_response/CannedResponseSingle.vue'),
props: true,
},
{
- path: "escalation-rules",
+ path: 'escalation-rules',
name: AGENT_PORTAL_ESCALATION_RULE_LIST,
component: () =>
- import("@/pages/desk/escalation/EscalationRuleList.vue"),
+ import('@/pages/desk/escalation/EscalationRuleList.vue'),
},
],
},
];
export const router = createRouter({
- history: createWebHistory("/helpdesk/"),
+ history: createWebHistory('/helpdesk/'),
routes,
});
@@ -198,9 +198,9 @@ router.beforeEach(async (to) => {
await initTelemetry();
await authStore.init();
- if ((to.meta.agent && !authStore.hasDeskAccess) || isAuthRoute) {
- router.replace({ name: WEBSITE_ROOT });
- }
+ // if ((to.meta.agent && !authStore.hasDeskAccess) || isAuthRoute) {
+ // router.replace({ name: WEBSITE_ROOT });
+ // }
} catch {
if (!isAuthRoute) {
router.replace({
diff --git a/desk/src/telemetry.ts b/desk/src/telemetry.ts
index 9a32f929b..21eb06fdf 100644
--- a/desk/src/telemetry.ts
+++ b/desk/src/telemetry.ts
@@ -1,57 +1,57 @@
-import { useStorage } from "@vueuse/core";
-import { call } from "frappe-ui";
-import "../../../frappe/frappe/public/js/lib/posthog.js";
+import { useStorage } from '@vueuse/core';
+import { call } from 'frappe-ui';
+import '../../../frappe/frappe/public/js/lib/posthog.js';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
declare const posthog: any;
-const APP = "helpdesk";
+const APP = 'helpdesk';
const SITENAME = window.location.hostname;
-const telemetry = useStorage("telemetry", {
- enabled: false,
- project_id: "",
- host: "",
+const telemetry = useStorage('telemetry', {
+ enabled: false,
+ project_id: '',
+ host: '',
});
export async function init() {
- await set_enabled();
- if (!telemetry.value.enabled) return;
- try {
- await set_credentials();
- posthog.init(telemetry.value.project_id, {
- api_host: telemetry.value.host,
- autocapture: false,
- capture_pageview: false,
- capture_pageleave: false,
- advanced_disable_decide: true,
- });
- posthog.identify(SITENAME);
- } catch (e) {
- console.trace("Failed to initialize telemetry", e);
- telemetry.value.enabled = false;
- }
+ await set_enabled();
+ if (!telemetry.value.enabled) return;
+ try {
+ await set_credentials();
+ posthog.init(telemetry.value.project_id, {
+ api_host: telemetry.value.host,
+ autocapture: false,
+ capture_pageview: false,
+ capture_pageleave: false,
+ advanced_disable_decide: true,
+ });
+ posthog.identify(SITENAME);
+ } catch (e) {
+ console.trace('Failed to initialize telemetry', e);
+ telemetry.value.enabled = false;
+ }
}
async function set_enabled() {
- if (telemetry.value.enabled) return;
+ if (telemetry.value.enabled) return;
- await call("helpdesk.api.telemetry.is_enabled").then((res) => {
- telemetry.value.enabled = res;
- });
+ await call('helpdesk.api.telemetry.is_enabled').then((res) => {
+ telemetry.value.enabled = res;
+ });
}
async function set_credentials() {
- if (!telemetry.value.enabled) return;
- if (telemetry.value.project_id && telemetry.value.host) return;
+ if (!telemetry.value.enabled) return;
+ if (telemetry.value.project_id && telemetry.value.host) return;
- await call("helpdesk.api.telemetry.get_credentials").then((res) => {
- telemetry.value.project_id = res.project_id;
- telemetry.value.host = res.telemetry_host;
- });
+ await call('helpdesk.api.telemetry.get_credentials').then((res) => {
+ telemetry.value.project_id = res.project_id;
+ telemetry.value.host = res.telemetry_host;
+ });
}
export function capture(event: string) {
- if (!telemetry.value.enabled) return;
- posthog.capture(`${APP}_${event}`);
+ if (!telemetry.value.enabled) return;
+ posthog.capture(`${APP}_${event}`);
}
diff --git a/helpdesk/api/dashboard.py b/helpdesk/api/dashboard.py
index 478011158..c0d07a3ed 100644
--- a/helpdesk/api/dashboard.py
+++ b/helpdesk/api/dashboard.py
@@ -9,10 +9,9 @@
@frappe.whitelist()
-def get_all():
+def get(date_start=None, date_end=None):
if not is_agent():
- err = _("You are not allowed to access dashboard")
- frappe.throw(err, frappe.PermissionError)
+ return []
return [
avg_first_response_time(),
resolution_within_sla(),
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
index 1359b3e68..e80bec867 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
@@ -69,12 +69,14 @@ def get_list_select(query: Query):
.where(QBCommunication.sent_or_received == "Sent")
)
- query = (
- query.select(QBTicket.star)
- .select(count_comment)
- .select(count_msg_incoming)
- .select(count_msg_outgoing)
- )
+ query = query.select(QBTicket.star)
+
+ if is_agent():
+ query = (
+ query.select(count_comment)
+ .select(count_msg_incoming)
+ .select(count_msg_outgoing)
+ )
return query
From 3dc47b6e58832dab9c216dea9d81fcfd67428c3a Mon Sep 17 00:00:00 2001
From: Sabu Siyad
Date: Tue, 21 Nov 2023 12:47:14 +0530
Subject: [PATCH 13/20] chore: update sidebar
---
desk/src/assets/logos/helpdesk.png | Bin 0 -> 980 bytes
desk/src/components/AppSidebar.vue | 58 ++++++++--------
desk/src/components/SidebarLink.vue | 29 +++-----
.../src/components/list-view/LVNavigation.vue | 36 +++++-----
desk/src/stores/sidebar.ts | 18 +----
helpdesk/api/dashboard.py | 64 ++++++++++++++++--
6 files changed, 118 insertions(+), 87 deletions(-)
create mode 100644 desk/src/assets/logos/helpdesk.png
diff --git a/desk/src/assets/logos/helpdesk.png b/desk/src/assets/logos/helpdesk.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7fa2fab9898bb245966dbe38490ccb1e3f77224
GIT binary patch
literal 980
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)oCO|{#S9E$svykh8Km+7D9BhG
z?vQfRxa{8g;~}$Y70WS&
zj)wAWeWxNWvPAC7xWpD>zPLyv(JagBG(X#Cl_EXgCkvS@A1$)mqg42PLVA$PHc^jH
zYMHzCEuF5a;S<1bXd7ta{aar~K;raomilYk^8%GSgMX{O6I}5r$Wo!uUE!qm(NA6h
zlQ?oZvbU&xI>&qa*Ot7GJX-qPs`p}|^Q8nO+~Y;P(lof1YjA1za`Y_rf635wD6-B>
zs`g!gh*<88>6?Y!#4}}bi|a2594KYiXcj(yqSE2ObvA(F&V>
zQMiPQ8>R+mNa4L!f9~7=8=ms-^-PpVZ;X$Zt9yHjr=X1G__<^9zvk-C5~^<9d|=6*
ztZMG#=dRt)`J@-1`{5JMoR4K(pSSo+;Ob&lQiI
zj;%;m{b}VMYyQM=r^pT8Jt7t+J<5l@8`Iq;ug@HFI+F%!2mV
zo+|8`#B%!gCz%yt3WuT_Wg0VuEdBrdb5pzcI_c1nxzE&hWpO#AC>=ITx($qQo^g73v
z64FU$isWsQ0~#+$vVFc2zV+tbwSATvvWdy*yp4}tgBNPVG)(HX`1RwdpHl9t3KxII
zDJD$2vyZ*wc(QeZ*wM_4xEU^oFTR_1=@y%%_0}D4pU>O!{y^jm_74s(O78hy@RPf|
zZN`O39y7mXKasf?^LX3wTz;9C^==!)rta|6<*jLuIk?ksdHI}$Dt*pwQfIRoH@!R@
zYsE6{(Xn2;zp`$<=eADW(3fwb`#idL+vOkp6YBqN)yY>b0cJu5Pgg&ebxsLQ0Gm6X
A-T(jq
literal 0
HcmV?d00001
diff --git a/desk/src/components/AppSidebar.vue b/desk/src/components/AppSidebar.vue
index 15496fc4f..71aa6ff7a 100644
--- a/desk/src/components/AppSidebar.vue
+++ b/desk/src/components/AppSidebar.vue
@@ -1,18 +1,36 @@
-
+
+
+
+
+
@@ -45,23 +63,14 @@
-
@@ -69,6 +78,7 @@
import { computed } from 'vue';
import { useRoute } from 'vue-router';
import { storeToRefs } from 'pinia';
+import { Dropdown } from 'frappe-ui';
import { useAuthStore } from '@/stores/auth';
import { useKeymapStore } from '@/stores/keymap';
// import { useNotificationStore } from '@/stores/notification';
@@ -88,6 +98,7 @@ import {
import { useDevice } from '@/composables';
import { SidebarLink } from '@/components';
// import UserMenu from './UserMenu.vue';
+import HelpdeskLogo from '@/assets/logos/helpdesk.png';
import LucideArrowLeftFromLine from '~icons/lucide/arrow-left-from-line';
import LucideArrowRightFromLine from '~icons/lucide/arrow-right-from-line';
import LucideArrowUpFromLine from '~icons/lucide/arrow-up-from-line';
@@ -107,7 +118,6 @@ const route = useRoute();
const authStore = useAuthStore();
const keymapStore = useKeymapStore();
// const notificationStore = useNotificationStore();
-const { isExpanded, width } = storeToRefs(useSidebarStore());
const device = useDevice();
const menuOptions = computed(() =>
@@ -175,22 +185,14 @@ const menuOptions = computed(() =>
].filter((option) => !option.hide)
);
-const profileSettings = [
+const dropdownOptions = [
{
label: 'Shortcuts',
icon: 'command',
onClick: () => keymapStore.toggleVisibility(true),
},
- // {
- // label: 'Customer portal',
- // icon: 'users',
- // onClick: () => {
- // const path = router.resolve({ name: CUSTOMER_PORTAL_LANDING });
- // window.open(path.href, '_blank');
- // },
- // },
{
- label: 'Log out',
+ label: 'Logout',
icon: 'log-out',
onClick: () => authStore.logout(),
},
diff --git a/desk/src/components/SidebarLink.vue b/desk/src/components/SidebarLink.vue
index 68ccb441e..3fed51a14 100644
--- a/desk/src/components/SidebarLink.vue
+++ b/desk/src/components/SidebarLink.vue
@@ -1,31 +1,19 @@
-
+
{{ label }}
@@ -38,14 +26,13 @@
-
-