From bf740b2b6caed6281ccf68808513c0db3001d86b Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 6 Oct 2020 13:52:31 +0000
Subject: [PATCH]

---
 ayanova/src/api/gzutil.js                     | 16 ++++----
 ayanova/src/components/wiki-control.vue       |  5 ++-
 ayanova/src/plugins/vuetify.js                | 40 +++++++++++++++++++
 ayanova/src/views/adm-attachments.vue         |  4 +-
 ayanova/src/views/adm-history.vue             |  4 +-
 ayanova/src/views/adm-report-templates.vue    |  6 +--
 ayanova/src/views/adm-translation.vue         |  6 +--
 ayanova/src/views/adm-translations.vue        |  6 +--
 ayanova/src/views/adm-user.vue                |  4 +-
 ayanova/src/views/adm-users.vue               |  4 +-
 ayanova/src/views/ay-history.vue              |  4 +-
 ayanova/src/views/ay-report-edit.vue          |  6 +--
 ayanova/src/views/cust-user.vue               |  4 +-
 ayanova/src/views/cust-users.vue              |  4 +-
 ayanova/src/views/home-notifications.vue      |  4 +-
 .../src/views/home-notify-subscription.vue    |  4 +-
 .../src/views/home-notify-subscriptions.vue   |  4 +-
 ayanova/src/views/ops-backup.vue              |  2 +-
 ayanova/src/views/ops-jobs.vue                |  2 +-
 ayanova/src/views/widget.vue                  |  4 +-
 ayanova/src/views/widgets.vue                 |  4 +-
 21 files changed, 90 insertions(+), 47 deletions(-)

diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js
index a830507e..8deca19f 100644
--- a/ayanova/src/api/gzutil.js
+++ b/ayanova/src/api/gzutil.js
@@ -11,12 +11,12 @@ const icons = {
   powerpoint: "$ayiFilePowerpoint",
   excel: "$ayiFileExcel",
   csv: "$ayiFileCsv",
-  audio: "fa-file-audio",
-  video: "fa-file-video",
+  audio: "$ayiFileAudio",
+  video: "$ayiFileVidio",
   archive: "$ayiFileArchive",
-  code: "fa-file-code",
-  text: "fa-file-alt",
-  file: "fa-file"
+  code: "$ayiFileCode",
+  text: "$ayiFileAlt",
+  file: "$ayiFile"
 };
 const mimeTypes = {
   "image/gif": icons.image,
@@ -316,7 +316,7 @@ export default {
       case window.$gz.type.ServerJob:
         return "$ayiRobot";
       case window.$gz.type.AyaNova7Import:
-        return "fa-file-import";
+        return "$ayiFile-import";
       case window.$gz.type.TrialSeeder:
         return "fa-seedling";
       case window.$gz.type.Metrics:
@@ -351,7 +351,7 @@ export default {
           " " +
           mimeType
       );
-      return "fa-file";
+      return "$ayiFile";
     }
 
     if (!mimeType) {
@@ -369,7 +369,7 @@ export default {
       return iconFromExtension;
     }
 
-    return "fa-file";
+    return "$ayiFile";
   },
   ///////////////////////////////////////////////
   // attempt to detect image extension name
diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
index 250197be..b479fabc 100644
--- a/ayanova/src/components/wiki-control.vue
+++ b/ayanova/src/components/wiki-control.vue
@@ -316,7 +316,10 @@
           </v-col>
         </v-row>
         <v-btn depressed tile @click="toggleReveal">
-          Wiki<v-icon v-text="reveal ? '$ayiEyeSlash' : '$ayiEye'" right></v-icon
+          Wiki<v-icon
+            v-text="reveal ? '$ayiEyeSlash' : '$ayiEye'"
+            right
+          ></v-icon
         ></v-btn>
       </v-sheet>
     </template>
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index 5212d330..e24f728a 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -38,7 +38,11 @@ import {
   faEye,
   faEyeSlash,
   faFan,
+  faFile,
+  faFileAlt,
   faFileArchive,
+  faFileAudio,
+  faFileCode,
   faFileContract,
   faFileCsv,
   faFileExcel,
@@ -46,6 +50,7 @@ import {
   faFileMedicalAlt,
   faFilePdf,
   faFilePowerpoint,
+  faFileVideo,
   faFileWord,
   faFolder,
   faHistory,
@@ -111,7 +116,11 @@ library.add(
   faEye,
   faEyeSlash,
   faFan,
+  faFile,
+  faFileAlt,
   faFileArchive,
+  faFileAudio,
+  faFileCode,
   faFileContract,
   faFileCsv,
   faFileExcel,
@@ -119,6 +128,7 @@ library.add(
   faFileMedicalAlt,
   faFilePdf,
   faFilePowerpoint,
+  faFileVideo,
   faFileWord,
   faFolder,
   faHistory,
@@ -300,12 +310,36 @@ const CUSTOM_ICONS = {
       icon: ["fas", "fan"]
     }
   },
+  ayiFile: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file"]
+    }
+  },
   ayiFileArchive: {
     component: FontAwesomeIcon,
     props: {
       icon: ["fas", "file-archive"]
     }
   },
+  ayiFileAlt: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-alt"]
+    }
+  },
+  ayiFileAudio: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-audio"]
+    }
+  },
+  ayiFileCode: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-code"]
+    }
+  },
   ayiFileContract: {
     component: FontAwesomeIcon,
     props: {
@@ -348,6 +382,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "file-powerpoint"]
     }
   },
+  ayiFileVidio: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-vidio"]
+    }
+  },
   ayiFileWord: {
     component: FontAwesomeIcon,
     props: {
diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index b8ffa771..83d18149 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -297,14 +297,14 @@ function generateMenu(vm) {
   //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "stub: Last report used",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report:STUBlastusedreportid",
     vm: vm
   });
diff --git a/ayanova/src/views/adm-history.vue b/ayanova/src/views/adm-history.vue
index bfe7f1d9..b6dad1d0 100644
--- a/ayanova/src/views/adm-history.vue
+++ b/ayanova/src/views/adm-history.vue
@@ -87,14 +87,14 @@ function generateMenu(vm) {
   // //Report not Print, print is a further option
   // menuOptions.menuItems.push({
   //   title: "Report",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report",
   //   vm: vm
   // });
 
   // menuOptions.menuItems.push({
   //   title: "stub: Last report used",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report:STUBlastusedreportid",
   //   vm: vm
   // });
diff --git a/ayanova/src/views/adm-report-templates.vue b/ayanova/src/views/adm-report-templates.vue
index f6e23dbe..6546aa7c 100644
--- a/ayanova/src/views/adm-report-templates.vue
+++ b/ayanova/src/views/adm-report-templates.vue
@@ -15,7 +15,7 @@
       v-model="uploadFiles"
       :label="$ay.t('Import')"
       accept=".ayrt"
-      prepend-icon="fa-file-upload"
+      prepend-icon="$ayiFile-upload"
       multiple
       chips
     ></v-file-input>
@@ -135,14 +135,14 @@ function generateMenu(vm) {
   // //Report not Print, print is a further option
   // menuOptions.menuItems.push({
   //   title: "Report",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report",
   //   vm: vm
   // });
 
   // menuOptions.menuItems.push({
   //   title: "stub: Last report used",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report:STUBlastusedreportid",
   //   vm: vm
   // });
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index 739423d2..b7804261 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -622,7 +622,7 @@ function generateMenu(vm) {
   //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
@@ -632,7 +632,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
-      icon: "fa-file-alt",
+      icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
     });
@@ -664,7 +664,7 @@ function generateMenu(vm) {
 
     menuOptions.menuItems.push({
       title: "Export",
-      icon: "fa-file-download",
+      icon: "$ayiFile-download",
       href: href,
       target: "_blank",
       key: FORM_KEY + ":export",
diff --git a/ayanova/src/views/adm-translations.vue b/ayanova/src/views/adm-translations.vue
index cb228679..70a5bb33 100644
--- a/ayanova/src/views/adm-translations.vue
+++ b/ayanova/src/views/adm-translations.vue
@@ -15,7 +15,7 @@
       v-model="uploadFiles"
       :label="$ay.t('Import')"
       accept="application/json"
-      prepend-icon="fa-file-upload"
+      prepend-icon="$ayiFile-upload"
       multiple
       chips
     ></v-file-input>
@@ -135,14 +135,14 @@ function generateMenu(vm) {
   // //Report not Print, print is a further option
   // menuOptions.menuItems.push({
   //   title: "Report",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report",
   //   vm: vm
   // });
 
   // menuOptions.menuItems.push({
   //   title: "stub: Last report used",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report:STUBlastusedreportid",
   //   vm: vm
   // });
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 8ead17f9..6bc4b391 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -695,7 +695,7 @@ function generateMenu(vm) {
   //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
@@ -705,7 +705,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
-      icon: "fa-file-alt",
+      icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
     });
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index 70d67c66..a874a0a8 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -228,14 +228,14 @@ function generateMenu(vm) {
   //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "stub: Last report used",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report:STUBlastusedreportid",
     vm: vm
   });
diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index 3954862e..ef0091d1 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -425,7 +425,7 @@ function populateEventTypeList(vm) {
     },
     6: {
       name: vm.$ay.t("EventAttachmentDownload"),
-      icon: "fa-file-download"
+      icon: "$ayiFile-download"
     },
     7: {
       name: vm.$ay.t("EventLicenseFetch"),
@@ -445,7 +445,7 @@ function populateEventTypeList(vm) {
     13: { name: vm.$ay.t("EventResetSerial"), icon: "fa-egg" },
     13: {
       name: vm.$ay.t("EventUtilityFileDownload"),
-      icon: "fa-file-download"
+      icon: "$ayiFile-download"
     }
   };
 }
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 29fd803f..74b2ced4 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -1092,7 +1092,7 @@ function generateMenu(vm) {
   // //Report not Print, print is a further option
   // menuOptions.menuItems.push({
   //   title: "Report",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report",
   //   vm: vm
   // });
@@ -1102,7 +1102,7 @@ function generateMenu(vm) {
   // if (lastReport != null) {
   //   menuOptions.menuItems.push({
   //     title: lastReport.name,
-  //     icon: "fa-file-alt",
+  //     icon: "$ayiFileAlt",
   //     key: FORM_KEY + ":report:" + lastReport.id,
   //     vm: vm
   //   });
@@ -1134,7 +1134,7 @@ function generateMenu(vm) {
 
     menuOptions.menuItems.push({
       title: "Export",
-      icon: "fa-file-download",
+      icon: "$ayiFile-download",
       href: href,
       target: "_blank",
       key: FORM_KEY + ":export",
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index a2884eee..e7ac8643 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -699,7 +699,7 @@ function generateMenu(vm) {
   //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
@@ -709,7 +709,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
-      icon: "fa-file-alt",
+      icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
     });
diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue
index cb34d748..9f1b91ea 100644
--- a/ayanova/src/views/cust-users.vue
+++ b/ayanova/src/views/cust-users.vue
@@ -217,14 +217,14 @@ function generateMenu(vm) {
   //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "stub: Last report used",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report:STUBlastusedreportid",
     vm: vm
   });
diff --git a/ayanova/src/views/home-notifications.vue b/ayanova/src/views/home-notifications.vue
index 95619d82..b4d2b8ea 100644
--- a/ayanova/src/views/home-notifications.vue
+++ b/ayanova/src/views/home-notifications.vue
@@ -278,14 +278,14 @@ function generateMenu(vm) {
   // //Report not Print, print is a further option
   // menuOptions.menuItems.push({
   //   title: "Report",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report",
   //   vm: vm
   // });
 
   // menuOptions.menuItems.push({
   //   title: "stub: Last report used",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report:STUBlastusedreportid",
   //   vm: vm
   // });
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index 6850251d..a7615ede 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -675,7 +675,7 @@ function generateMenu(vm) {
   //   //Report not Print, print is a further option
   //   menuOptions.menuItems.push({
   //     title: "Report",
-  //     icon: "fa-file-alt",
+  //     icon: "$ayiFileAlt",
   //     key: FORM_KEY + ":report",
   //     vm: vm
   //   });
@@ -685,7 +685,7 @@ function generateMenu(vm) {
   //   if (lastReport != null) {
   //     menuOptions.menuItems.push({
   //       title: lastReport.name,
-  //       icon: "fa-file-alt",
+  //       icon: "$ayiFileAlt",
   //       key: FORM_KEY + ":report:" + lastReport.id,
   //       vm: vm
   //     });
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index 32f33ff1..33fed5f4 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -181,14 +181,14 @@ function generateMenu(vm) {
   // //Report not Print, print is a further option
   // menuOptions.menuItems.push({
   //   title: "Report",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report",
   //   vm: vm
   // });
 
   // menuOptions.menuItems.push({
   //   title: "stub: Last report used",
-  //   icon: "fa-file-alt",
+  //   icon: "$ayiFileAlt",
   //   key: FORM_KEY + ":report:STUBlastusedreportid",
   //   vm: vm
   // });
diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue
index 29b06df1..f31fa3dc 100644
--- a/ayanova/src/views/ops-backup.vue
+++ b/ayanova/src/views/ops-backup.vue
@@ -79,7 +79,7 @@
                 <template v-slot:[`item.actions`]="{ item }">
                   <v-btn icon :href="item.url">
                     <v-icon small class="mr-2">
-                      fa-file-download
+                      $ayiFile-download
                     </v-icon>
                   </v-btn>
                 </template></v-data-table
diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue
index 66d40772..2cd716d9 100644
--- a/ayanova/src/views/ops-jobs.vue
+++ b/ayanova/src/views/ops-jobs.vue
@@ -19,7 +19,7 @@
         <template v-slot:[`item.actions`]="{ item }">
           <v-btn icon :href="item.url">
             <v-icon small class="mr-2">
-              fa-file-download
+              $ayiFile-download
             </v-icon>
           </v-btn>
         </template></v-data-table
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index ffd30316..c74223ff 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -708,7 +708,7 @@ function generateMenu(vm) {
   //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
@@ -718,7 +718,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
-      icon: "fa-file-alt",
+      icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
     });
diff --git a/ayanova/src/views/widgets.vue b/ayanova/src/views/widgets.vue
index 41d7844d..6b2a150c 100644
--- a/ayanova/src/views/widgets.vue
+++ b/ayanova/src/views/widgets.vue
@@ -136,7 +136,7 @@ function generateMenu(vm) {
   //Report not Print, print is a further option
   menuOptions.menuItems.push({
     title: "Report",
-    icon: "fa-file-alt",
+    icon: "$ayiFileAlt",
     key: FORM_KEY + ":report",
     vm: vm
   });
@@ -146,7 +146,7 @@ function generateMenu(vm) {
   if (lastReport != null) {
     menuOptions.menuItems.push({
       title: lastReport.name,
-      icon: "fa-file-alt",
+      icon: "$ayiFileAlt",
       key: FORM_KEY + ":report:" + lastReport.id,
       vm: vm
     });