This commit is contained in:
2020-10-05 23:46:29 +00:00
parent a6d7ddf66e
commit e0b3222507
14 changed files with 105 additions and 25 deletions

View File

@@ -322,7 +322,7 @@ export default {
case window.$gz.type.Metrics: case window.$gz.type.Metrics:
return "fa-file-medical-alt"; return "fa-file-medical-alt";
case window.$gz.type.Translation: case window.$gz.type.Translation:
return "fa-language"; return "$ayiLanguage";
case window.$gz.type.UserOptions: case window.$gz.type.UserOptions:
return "$ayiUserCog"; return "$ayiUserCog";
case window.$gz.type.FileAttachment: case window.$gz.type.FileAttachment:

View File

@@ -522,7 +522,7 @@ function initNavPanel() {
//PURCHASE ORDER RECEIPTS //PURCHASE ORDER RECEIPTS
sub.push({ sub.push({
title: "InventoryPurchaseOrderReceipts", title: "InventoryPurchaseOrderReceipts",
icon: "fa-dolly-flatbed", icon: "$ayiDollyFlatbed",
route: "/inv-purchase-order-receipts", route: "/inv-purchase-order-receipts",
key: key++ key: key++
}); });
@@ -534,13 +534,13 @@ function initNavPanel() {
//ADJUSTMENTS //ADJUSTMENTS
sub.push({ sub.push({
title: "InventoryPartInventoryAdjustments", title: "InventoryPartInventoryAdjustments",
icon: "fa-dolly", icon: "$ayiDolly",
route: "/inv-adjustments", route: "/inv-adjustments",
key: key++ key: key++
}); });
//**** INVENTORY (TOP GROUP) //**** INVENTORY (TOP GROUP)
addNavItem("Inventory", "fa-box", undefined, sub, key++, "inventory"); addNavItem("Inventory", "$ayiBox", undefined, sub, key++, "inventory");
} }
//**** VENDORS (TOP GROUP) //**** VENDORS (TOP GROUP)
@@ -555,7 +555,7 @@ function initNavPanel() {
role.InventoryLimited role.InventoryLimited
]) ])
) { ) {
addNavItem("VendorList", "fa-store", "/vendors", [], key++, "vendor"); addNavItem("VendorList", "$ayiStore", "/vendors", [], key++, "vendor");
} }
//****************** ACCOUNTING //****************** ACCOUNTING
@@ -571,7 +571,7 @@ function initNavPanel() {
//FAKE subitem as is still TBD //FAKE subitem as is still TBD
sub.push({ sub.push({
title: "Accounting", title: "Accounting",
icon: "fa-calculator", icon: "$ayiCalculator",
route: "/acc-accounting", route: "/acc-accounting",
key: key++ key: key++
}); });
@@ -579,7 +579,7 @@ function initNavPanel() {
// ** ACCOUNTING (TOP) // ** ACCOUNTING (TOP)
addNavItem( addNavItem(
"Accounting", "Accounting",
"fa-calculator", "$ayiCalculator",
undefined, undefined,
sub, sub,
key++, key++,
@@ -595,7 +595,7 @@ function initNavPanel() {
// GLOBAL SETTINGS // GLOBAL SETTINGS
sub.push({ sub.push({
title: "AdministrationGlobalSettings", title: "AdministrationGlobalSettings",
icon: "fa-cogs", icon: "$ayiCogs",
route: "/adm-global-settings", route: "/adm-global-settings",
key: key++ key: key++
}); });
@@ -621,7 +621,7 @@ function initNavPanel() {
//TRANSLATION //TRANSLATION
sub.push({ sub.push({
title: "TranslationList", title: "TranslationList",
icon: "fa-language", icon: "$ayiLanguage",
route: "/adm-translations", route: "/adm-translations",
key: key++ key: key++
}); });
@@ -629,7 +629,7 @@ function initNavPanel() {
//REPORT TEMPLATES //REPORT TEMPLATES
sub.push({ sub.push({
title: "ReportList", title: "ReportList",
icon: "fa-th-list", icon: "$ayiThList",
route: "/adm-report-templates", route: "/adm-report-templates",
key: key++ key: key++
}); });
@@ -637,7 +637,7 @@ function initNavPanel() {
//FILES IN DATABASE //FILES IN DATABASE
sub.push({ sub.push({
title: "Attachments", title: "Attachments",
icon: "fa-folder", icon: "$ayiFolder",
route: "/adm-attachments", route: "/adm-attachments",
key: key++ key: key++
}); });
@@ -653,7 +653,7 @@ function initNavPanel() {
// ** ADMINISTRATION (TOP) // ** ADMINISTRATION (TOP)
addNavItem( addNavItem(
"Administration", "Administration",
"fa-user-tie", "$ayiUserTie",
undefined, undefined,
sub, sub,
key++, key++,

View File

@@ -46,7 +46,7 @@
<template v-else> <template v-else>
<v-tabs v-model="tab" color="primary"> <v-tabs v-model="tab" color="primary">
<v-tabs-slider></v-tabs-slider> <v-tabs-slider></v-tabs-slider>
<v-tab key="list"><v-icon>fa-folder</v-icon></v-tab> <v-tab key="list"><v-icon>$ayiFolder</v-icon></v-tab>
<v-tab key="attach"><v-icon>fa-paperclip</v-icon></v-tab> <v-tab key="attach"><v-icon>fa-paperclip</v-icon></v-tab>
<v-tabs-items v-model="tab"> <v-tabs-items v-model="tab">
<v-tab-item key="list"> <v-tab-item key="list">

View File

@@ -16,26 +16,33 @@ import {
faAddressCard, faAddressCard,
faBars, faBars,
faBell, faBell,
faBox,
faBoxes, faBoxes,
faBullhorn, faBullhorn,
faBusinessTime, faBusinessTime,
faCalculator,
faCalendarAlt, faCalendarAlt,
faCalendarCheck, faCalendarCheck,
faCalendarDay, faCalendarDay,
faCaretDown, faCaretDown,
faChevronDown, faChevronDown,
faChild, faChild,
faCogs,
faDiceD20, faDiceD20,
faDolly,
faDollyFlatbed,
faEllipsisV, faEllipsisV,
faEye, faEye,
faEyeSlash, faEyeSlash,
faFan, faFan,
faFileContract, faFileContract,
faFolder,
faHistory, faHistory,
faHome, faHome,
faInbox, faInbox,
faInfoCircle, faInfoCircle,
faKey, faKey,
faLanguage,
faPallet, faPallet,
faPaperPlane, faPaperPlane,
faPencilAlt, faPencilAlt,
@@ -48,13 +55,16 @@ import {
faSitemap, faSitemap,
faSlidersH, faSlidersH,
faStickyNote, faStickyNote,
faStore,
faTachometerAlt, faTachometerAlt,
faThList,
faTicketAlt, faTicketAlt,
faToolbox, faToolbox,
faTools, faTools,
faUser, faUser,
faUserCog, faUserCog,
faUsers faUsers,
faUserTie
} from "@fortawesome/free-solid-svg-icons"; } from "@fortawesome/free-solid-svg-icons";
//import { faUserCircle as farUserCircle } from "@fortawesome/free-regular-svg-icons"; //import { faUserCircle as farUserCircle } from "@fortawesome/free-regular-svg-icons";
Vue.component("font-awesome-icon", FontAwesomeIcon); Vue.component("font-awesome-icon", FontAwesomeIcon);
@@ -64,26 +74,33 @@ library.add(
faAddressCard, faAddressCard,
faBars, faBars,
faBell, faBell,
faBox,
faBoxes, faBoxes,
faBullhorn, faBullhorn,
faBusinessTime, faBusinessTime,
faCalculator,
faCalendarAlt, faCalendarAlt,
faCalendarCheck, faCalendarCheck,
faCalendarDay, faCalendarDay,
faCaretDown, faCaretDown,
faChevronDown, faChevronDown,
faChild, faChild,
faCogs,
faDiceD20, faDiceD20,
faDolly,
faDollyFlatbed,
faEllipsisV, faEllipsisV,
faEye, faEye,
faEyeSlash, faEyeSlash,
faFan, faFan,
faFileContract, faFileContract,
faFolder,
faHistory, faHistory,
faHome, faHome,
faInbox, faInbox,
faInfoCircle, faInfoCircle,
faKey, faKey,
faLanguage,
faPallet, faPallet,
faPaperPlane, faPaperPlane,
faPencilAlt, faPencilAlt,
@@ -96,13 +113,16 @@ library.add(
faSitemap, faSitemap,
faSlidersH, faSlidersH,
faStickyNote, faStickyNote,
faStore,
faTachometerAlt, faTachometerAlt,
faThList,
faTicketAlt, faTicketAlt,
faToolbox, faToolbox,
faTools, faTools,
faUser, faUser,
faUserCog, faUserCog,
faUsers faUsers,
faUserTie
); );
const CUSTOM_ICONS = { const CUSTOM_ICONS = {
@@ -124,6 +144,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "bell"] icon: ["fas", "bell"]
} }
}, },
ayiBox: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "box"]
}
},
ayiBoxes: { ayiBoxes: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -142,6 +168,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "business-time"] icon: ["fas", "business-time"]
} }
}, },
ayiCalculator: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "calculator"]
}
},
ayiCalendarAlt: { ayiCalendarAlt: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -166,6 +198,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "child"] icon: ["fas", "child"]
} }
}, },
ayiCogs: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "cogs"]
}
},
ayiCustomize: { ayiCustomize: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -178,6 +216,18 @@ const CUSTOM_ICONS = {
icon: ["fas", "dice-d20"] icon: ["fas", "dice-d20"]
} }
}, },
ayiDolly: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "dolly"]
}
},
ayiDollyFlatbed: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "dolly-flatbed"]
}
},
ayiEye: { ayiEye: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -208,6 +258,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "file-contract"] icon: ["fas", "file-contract"]
} }
}, },
ayiFolder: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "folder"]
}
},
ayiHistory: { ayiHistory: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -238,6 +294,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "key"] icon: ["fas", "key"]
} }
}, },
ayiLanguage: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "language"]
}
},
ayiPallet: { ayiPallet: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -304,12 +366,24 @@ const CUSTOM_ICONS = {
icon: ["fas", "sticky-note"] icon: ["fas", "sticky-note"]
} }
}, },
ayiStore: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "store"]
}
},
ayiTachometer: { ayiTachometer: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
icon: ["fas", "tachometer-alt"] icon: ["fas", "tachometer-alt"]
} }
}, },
ayiThList: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "th-list"]
}
},
ayiTicket: { ayiTicket: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -346,6 +420,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "users"] icon: ["fas", "users"]
} }
}, },
ayiUserTie: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "user-tie"]
}
},
//VUETIFY REQUIRED ONES //VUETIFY REQUIRED ONES
//https://vuetifyjs.com/en/features/icons/#using-custom-icons //https://vuetifyjs.com/en/features/icons/#using-custom-icons
dropdown: { dropdown: {

View File

@@ -12,7 +12,7 @@ export default {
beforeCreate() { beforeCreate() {
window.$gz.eventBus.$emit("menu-change", { window.$gz.eventBus.$emit("menu-change", {
isMain: true, isMain: true,
icon: "fa-calculator", icon: "$ayiCalculator",
title: "Accounting", title: "Accounting",
helpUrl: "form-acc-accounting" helpUrl: "form-acc-accounting"
}); });

View File

@@ -287,7 +287,7 @@ function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: true, isMain: true,
icon: "fa-folder", icon: "$ayiFolder",
title: "Attachments", title: "Attachments",
helpUrl: "form-adm-attachments", helpUrl: "form-adm-attachments",
menuItems: [] menuItems: []

View File

@@ -35,7 +35,7 @@ export default {
beforeCreate() { beforeCreate() {
window.$gz.eventBus.$emit("menu-change", { window.$gz.eventBus.$emit("menu-change", {
isMain: true, isMain: true,
icon: "fa-cogs", icon: "$ayiCogs",
title: "AdministrationGlobalSettings", title: "AdministrationGlobalSettings",
helpUrl: "form-adm-global-settings", helpUrl: "form-adm-global-settings",
formData: { formData: {

View File

@@ -583,7 +583,7 @@ async function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: false, isMain: false,
icon: "fa-language", icon: "$ayiLanguage",
title: "Translation", title: "Translation",
helpUrl: "form-adm-translation", helpUrl: "form-adm-translation",
formData: { formData: {

View File

@@ -122,7 +122,7 @@ function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: true, isMain: true,
icon: "fa-language", icon: "$ayiLanguage",
title: "TranslationList", title: "TranslationList",
helpUrl: "form-adm-translations", helpUrl: "form-adm-translations",
menuItems: [], menuItems: [],

View File

@@ -300,7 +300,7 @@ function generateMenu(vm) {
//plus it's related to this form and people think Customize for the whole shebang //plus it's related to this form and people think Customize for the whole shebang
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Translation", title: "Translation",
icon: "fa-language", icon: "$ayiLanguage",
data: "adm-translations", data: "adm-translations",
key: "app:nav" key: "app:nav"
}); });

View File

@@ -12,7 +12,7 @@ export default {
beforeCreate() { beforeCreate() {
window.$gz.eventBus.$emit("menu-change", { window.$gz.eventBus.$emit("menu-change", {
isMain: true, isMain: true,
icon: "fa-language", icon: "$ayiLanguage",
title: "Translation", title: "Translation",
helpUrl: "form-home-translation" helpUrl: "form-home-translation"
}); });

View File

@@ -12,7 +12,7 @@ export default {
beforeCreate() { beforeCreate() {
window.$gz.eventBus.$emit("menu-change", { window.$gz.eventBus.$emit("menu-change", {
isMain: true, isMain: true,
icon: "fa-dolly", icon: "$ayiDolly",
title: "InventoryPartInventoryAdjustments", title: "InventoryPartInventoryAdjustments",
helpUrl: "form-inv-adjustments" helpUrl: "form-inv-adjustments"
}); });

View File

@@ -12,7 +12,7 @@ export default {
beforeCreate() { beforeCreate() {
window.$gz.eventBus.$emit("menu-change", { window.$gz.eventBus.$emit("menu-change", {
isMain: true, isMain: true,
icon: "fa-dolly-flatbed", icon: "$ayiDollyFlatbed",
title: "InventoryPurchaseOrderReceipts", title: "InventoryPurchaseOrderReceipts",
helpUrl: "form-inv-purchase-order-receipts" helpUrl: "form-inv-purchase-order-receipts"
}); });

View File

@@ -12,7 +12,7 @@ export default {
beforeCreate() { beforeCreate() {
window.$gz.eventBus.$emit("menu-change", { window.$gz.eventBus.$emit("menu-change", {
isMain: true, isMain: true,
icon: "fa-store", icon: "$ayiStore",
title: "VendorList", title: "VendorList",
helpUrl: "form-vendors" helpUrl: "form-vendors"
}); });