From f896c6ef6511027184cb6ecb15ff54dd9cb9e784 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 5 Oct 2020 23:13:42 +0000 Subject: [PATCH] --- ayanova/src/api/gzutil.js | 2 +- ayanova/src/api/initialize.js | 38 ++++----------- ayanova/src/plugins/vuetify.js | 56 +++++++++++++++++++++++ ayanova/src/views/adm-license.vue | 4 +- ayanova/src/views/ay-history.vue | 2 +- ayanova/src/views/cust-customers.vue | 2 +- ayanova/src/views/cust-headoffices.vue | 2 +- ayanova/src/views/customer-workorders.vue | 2 +- ayanova/src/views/home-dashboard.vue | 2 +- ayanova/src/views/home-memos.vue | 2 +- ayanova/src/views/home-reminders.vue | 2 +- ayanova/src/views/home-schedule.vue | 2 +- ayanova/src/views/svc-workorders.vue | 2 +- 13 files changed, 78 insertions(+), 40 deletions(-) diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js index b0cc97fe..9e510211 100644 --- a/ayanova/src/api/gzutil.js +++ b/ayanova/src/api/gzutil.js @@ -308,7 +308,7 @@ export default { case window.$gz.type.ServerState: return "fa-door-open"; case window.$gz.type.License: - return "fa-ticket-alt"; + return "$ayiTicket"; case window.$gz.type.LogFile: return "fa-glasses"; case window.$gz.type.PickListTemplate: diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 53d4bb7f..5b40aff5 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -72,7 +72,7 @@ function initNavPanel() { //WORKORDERS subitem sub.push({ title: "WorkOrderList", - icon: "fa-tools", + icon: "$ayiTools", route: "/customer-workorders", key: key++ }); @@ -108,13 +108,12 @@ function initNavPanel() { ) { addNavItem( "HelpLicense", - "fa-ticket-alt", + "$ayiTicket", "/adm-license", [], key++, "license" ); - //addNavItem("Logout", "fa-sign-out-alt", "/login", [], key++, "logout"); window.$gz.store.commit("setHomePage", "/adm-license"); return; } @@ -142,7 +141,7 @@ function initNavPanel() { //KPI / METRICS / CHARTS AND STUFF APPROPRIATE TO ROLE sub.push({ title: "Dashboard", - icon: "fa-tachometer-alt", + icon: "$ayiTachometer", route: "/home-dashboard", key: key++ }); @@ -185,7 +184,7 @@ function initNavPanel() { //SCHEDULE (personal) sub.push({ title: "Schedule", - icon: "fa-calendar-day", + icon: "$ayiCalendarDay", route: "/home-schedule", key: key++ }); @@ -193,7 +192,7 @@ function initNavPanel() { //MEMOS sub.push({ title: "MemoList", - icon: "fa-inbox", + icon: "$ayiInbox", route: "/home-memos", key: key++ }); @@ -201,7 +200,7 @@ function initNavPanel() { //REMINDERS (SCHEDULE MARKERS) sub.push({ title: "ReminderList", - icon: "fa-sticky-note", + icon: "$ayiStickyNote", route: "/home-reminders", key: key++ }); @@ -214,23 +213,6 @@ function initNavPanel() { key: key++ }); - //Moved these two into user settings - // //USER TRANSLATE - // sub.push({ - // title: "Translation", - // icon: "fa-language", - // route: "/home-translation", - // key: key++ - // }); - - // //SET LOGIN - // sub.push({ - // title: "SetLoginPassword", - // icon: "fa-key", - // route: "/home-password", - // key: key++ - // }); - //USER NOTIFICATION SUBSCRIPTIONS if ( //all but subcontractors (arbitrary decision without any facts ;) @@ -280,7 +262,7 @@ function initNavPanel() { //CUSTOMERS subitem sub.push({ title: "CustomerList", - icon: "fa-address-card", + icon: "$ayiAddressCard", route: "/cust-customers", key: key++ }); @@ -288,7 +270,7 @@ function initNavPanel() { //HEAD OFFICES subitem sub.push({ title: "HeadOfficeList", - icon: "fa-sitemap", + icon: "$ayiSitemap", route: "/cust-headoffices", key: key++ }); @@ -359,7 +341,7 @@ function initNavPanel() { ) { sub.push({ title: "WorkOrderList", - icon: "fa-tools", + icon: "$ayiTools", route: "/svc-workorders", key: key++ }); @@ -621,7 +603,7 @@ function initNavPanel() { // LICENSE sub.push({ title: "HelpLicense", - icon: "fa-ticket-alt", + icon: "$ayiTicket", route: "/adm-license", key: key++ }); diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js index daed69fa..26e82e20 100644 --- a/ayanova/src/plugins/vuetify.js +++ b/ayanova/src/plugins/vuetify.js @@ -12,10 +12,12 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; Vue.component("font-awesome-icon", FontAwesomeIcon); // Register component globally import { + faAddressCard, faBars, faBell, faBullhorn, faCalendarCheck, + faCalendarDay, faCaretDown, faChevronDown, faChild, @@ -24,13 +26,18 @@ import { faEyeSlash, faHistory, faHome, + faInbox, faInfoCircle, faKey, faQuestionCircle, faSearch, faSignInAlt, faSignOutAlt, + faSitemap, faSlidersH, + faStickyNote, + faTachometerAlt, + faTicketAlt, faTools, faUser, faUserCog @@ -39,10 +46,12 @@ import { Vue.component("font-awesome-icon", FontAwesomeIcon); library.add( + faAddressCard, faBars, faBell, faBullhorn, faCalendarCheck, + faCalendarDay, faCaretDown, faChevronDown, faChild, @@ -51,19 +60,30 @@ library.add( faEyeSlash, faHistory, faHome, + faInbox, faInfoCircle, faKey, faQuestionCircle, faSearch, faSignInAlt, faSignOutAlt, + faSitemap, faSlidersH, + faStickyNote, + faTachometerAlt, + faTicketAlt, faTools, faUser, faUserCog ); const CUSTOM_ICONS = { + ayiAddressCard: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "address-card"] + } + }, ayiBell: { component: FontAwesomeIcon, props: { @@ -82,6 +102,12 @@ const CUSTOM_ICONS = { icon: ["fas", "calendar-check"] } }, + ayiCalendarDay: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "calendar-day"] + } + }, ayiChild: { component: FontAwesomeIcon, props: { @@ -124,6 +150,12 @@ const CUSTOM_ICONS = { icon: ["fas", "home"] } }, + ayiInbox: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "inbox"] + } + }, ayiInfoCircle: { component: FontAwesomeIcon, props: { @@ -160,6 +192,30 @@ const CUSTOM_ICONS = { icon: ["fas", "sign-out-alt"] } }, + ayiSitemap: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "sitemap"] + } + }, + ayiStickyNote: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "sticky-note"] + } + }, + ayiTachometer: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "tachometer-alt"] + } + }, + ayiTicket: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "ticket-alt"] + } + }, ayiTools: { component: FontAwesomeIcon, props: { diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue index a7f140c1..ecf9a7d0 100644 --- a/ayanova/src/views/adm-license.vue +++ b/ayanova/src/views/adm-license.vue @@ -543,7 +543,7 @@ function clickHandler(menuItem) { function generateMenu(vm) { let menuOptions = { isMain: true, - icon: "fa-ticket-alt", + icon: "$ayiTicket", title: "HelpLicense", helpUrl: "form-adm-license", formData: { @@ -564,7 +564,7 @@ function generateMenu(vm) { //Trigger license check menuOptions.menuItems.push({ title: "CheckForLicense", - icon: "fa-ticket-alt", + icon: "$ayiTicket", key: FORM_KEY + ":fetch", vm: vm }); diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue index add7aa50..3954862e 100644 --- a/ayanova/src/views/ay-history.vue +++ b/ayanova/src/views/ay-history.vue @@ -429,7 +429,7 @@ function populateEventTypeList(vm) { }, 7: { name: vm.$ay.t("EventLicenseFetch"), - icon: "fa-ticket-alt" + icon: "$ayiTicket" }, 8: { name: vm.$ay.t("EventLicenseTrialRequest"), diff --git a/ayanova/src/views/cust-customers.vue b/ayanova/src/views/cust-customers.vue index fb15432a..9f3f2353 100644 --- a/ayanova/src/views/cust-customers.vue +++ b/ayanova/src/views/cust-customers.vue @@ -12,7 +12,7 @@ export default { beforeCreate() { window.$gz.eventBus.$emit("menu-change", { isMain: true, - icon: "fa-address-card", + icon: "$ayiAddressCard", title: "CustomerList", helpUrl: "form-cust-customers" }); diff --git a/ayanova/src/views/cust-headoffices.vue b/ayanova/src/views/cust-headoffices.vue index f754584e..8828332d 100644 --- a/ayanova/src/views/cust-headoffices.vue +++ b/ayanova/src/views/cust-headoffices.vue @@ -12,7 +12,7 @@ export default { beforeCreate() { window.$gz.eventBus.$emit("menu-change", { isMain: true, - icon: "fa-sitemap", + icon: "$ayiSitemap", title: "HeadOfficeList", helpUrl: "form-cust-headoffices" }); diff --git a/ayanova/src/views/customer-workorders.vue b/ayanova/src/views/customer-workorders.vue index cee2de00..673e132c 100644 --- a/ayanova/src/views/customer-workorders.vue +++ b/ayanova/src/views/customer-workorders.vue @@ -12,7 +12,7 @@ export default { beforeCreate() { window.$gz.eventBus.$emit("menu-change", { isMain: true, - icon: "fa-tools", + icon: "$ayiTools", title: "WorkOrderList", helpUrl: "form-customer-workorders" }); diff --git a/ayanova/src/views/home-dashboard.vue b/ayanova/src/views/home-dashboard.vue index 64c37206..ed13a402 100644 --- a/ayanova/src/views/home-dashboard.vue +++ b/ayanova/src/views/home-dashboard.vue @@ -27,7 +27,7 @@ export default { beforeCreate() { window.$gz.eventBus.$emit("menu-change", { isMain: true, - icon: "fa-tachometer-alt", + icon: "$ayiTachometer", title: "Dashboard", helpUrl: "form-home-dashboard" }); diff --git a/ayanova/src/views/home-memos.vue b/ayanova/src/views/home-memos.vue index ec77bad8..11863949 100644 --- a/ayanova/src/views/home-memos.vue +++ b/ayanova/src/views/home-memos.vue @@ -12,7 +12,7 @@ export default { beforeCreate() { window.$gz.eventBus.$emit("menu-change", { isMain: true, - icon: "fa-inbox", + icon: "$ayiInbox", title: "MemoList", helpUrl: "form-home-memos" }); diff --git a/ayanova/src/views/home-reminders.vue b/ayanova/src/views/home-reminders.vue index 9a6aa195..c635cc33 100644 --- a/ayanova/src/views/home-reminders.vue +++ b/ayanova/src/views/home-reminders.vue @@ -12,7 +12,7 @@ export default { beforeCreate() { window.$gz.eventBus.$emit("menu-change", { isMain: true, - icon: "fa-sticky-note", + icon: "$ayiStickyNote", title: "ReminderList", helpUrl: "form-home-reminders" }); diff --git a/ayanova/src/views/home-schedule.vue b/ayanova/src/views/home-schedule.vue index 62d146d0..f16b7943 100644 --- a/ayanova/src/views/home-schedule.vue +++ b/ayanova/src/views/home-schedule.vue @@ -12,7 +12,7 @@ export default { beforeCreate() { window.$gz.eventBus.$emit("menu-change", { isMain: true, - icon: "fa-calendar-day", + icon: "$ayiCalendarDay", title: "Schedule", helpUrl: "form-home-schedule" }); diff --git a/ayanova/src/views/svc-workorders.vue b/ayanova/src/views/svc-workorders.vue index 7a0173fb..70dc0d5c 100644 --- a/ayanova/src/views/svc-workorders.vue +++ b/ayanova/src/views/svc-workorders.vue @@ -12,7 +12,7 @@ export default { beforeCreate() { window.$gz.eventBus.$emit("menu-change", { isMain: true, - icon: "fa-tools", + icon: "$ayiTools", title: "WorkOrderList", helpUrl: "form-svc-workorders" });