From 8d2ae6619396f3891bc1107cbb1c61c9612a7f81 Mon Sep 17 00:00:00 2001
From: Seth Ladygo <alx-git@arclight.industries>
Date: Wed, 15 Jan 2020 15:09:45 -0800
Subject: [PATCH] vuetify: update mdi icon set

---
 cateditor/package-lock.json              | 12 ++++++------
 cateditor/package.json                   |  2 +-
 cateditor/src/components/CatalogList.vue | 20 ++++++++++++++------
 cateditor/src/pages/editor/main.js       |  9 +++++----
 cateditor/src/pages/list/main.js         |  8 ++++----
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/cateditor/package-lock.json b/cateditor/package-lock.json
index 532d804..f95a32b 100644
--- a/cateditor/package-lock.json
+++ b/cateditor/package-lock.json
@@ -2600,6 +2600,12 @@
         "postcss": "^7.0.0"
       }
     },
+    "@mdi/font": {
+      "version": "4.7.95",
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.7.95.tgz",
+      "integrity": "sha512-/SWooHIFz2dXkQJk3VhEXSbBplOU1lIkGSELAmw0peFEgR8KPqyM//M3vD8WDZETuEOSRVhVqLevP3okrsM5dw==",
+      "dev": true
+    },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
@@ -13188,12 +13194,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "material-design-icons-iconfont": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-5.0.1.tgz",
-      "integrity": "sha512-Xg6rIdGrfySTqiTZ6d+nQbcFepS6R4uKbJP0oAqyeZXJY/bX6mZDnOmmUJusqLXfhIwirs0c++a6JpqVa8RFvA==",
-      "dev": true
-    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
diff --git a/cateditor/package.json b/cateditor/package.json
index 6633691..344fa12 100644
--- a/cateditor/package.json
+++ b/cateditor/package.json
@@ -17,6 +17,7 @@
     "vuex": "^3.1.2"
   },
   "devDependencies": {
+    "@mdi/font": "^4.7.95",
     "@vue/cli": "^4.1.2",
     "@vue/cli-plugin-babel": "^4.1.2",
     "@vue/cli-plugin-eslint": "^4.1.2",
@@ -27,7 +28,6 @@
     "eslint-plugin-vue": "^6.1.2",
     "eslint-plugin-vuetify": "^1.0.0-beta.5",
     "fibers": "^4.0.2",
-    "material-design-icons-iconfont": "^5.0.1",
     "node-sass": "^4.13.0",
     "sass": "^1.24.4",
     "sass-loader": "^8.0.2",
diff --git a/cateditor/src/components/CatalogList.vue b/cateditor/src/components/CatalogList.vue
index 304356b..eedb202 100644
--- a/cateditor/src/components/CatalogList.vue
+++ b/cateditor/src/components/CatalogList.vue
@@ -28,7 +28,7 @@
                 <v-col cols="5" class="px-8">
                   <v-text-field
                     v-model="search"
-                    append-icon="search"
+                    append-icon="mdi-magnify"
                     label="Search"
                     single-line
                     hide-details
@@ -74,7 +74,7 @@
                 <v-col cols="5" class="px-8">
                   <v-text-field
                     v-model="search"
-                    append-icon="search"
+                    append-icon="mdi-magnify"
                     label="Search"
                     single-line
                     hide-details
@@ -157,15 +157,23 @@
               <td class="grey--text">Materials</td>
               <td>{{ selectedCatalog.materials }}</td>
             </tr>
-            <tr v-if="selectedCatalog.public">
+            <tr>
               <td class="grey--text">Public</td>
               <td>
-                <span class="group"><v-icon color="blue">group</v-icon></span></td>
+                <span class="group">
+                  <v-icon v-if="selectedCatalog.public" color="black">mdi-checkbox-marked-outline</v-icon>
+                  <v-icon v-else color="black">mdi-checkbox-blank-outline</v-icon>
+                </span>
+              </td>
             </tr>
-            <tr v-if="selectedCatalog.show_prices">
+            <tr>
               <td class="grey--text">Show prices</td>
               <td>
-                <span class="group"><v-icon color="green">monetization_on</v-icon></span></td>
+                <span class="group">
+                  <v-icon v-if="selectedCatalog.show_prices" color="black">mdi-checkbox-marked-outline</v-icon>
+                  <v-icon v-else color="black">mdi-checkbox-blank-outline</v-icon>
+                </span>
+              </td>
             </tr>
             <tr v-if="selectedCatalog.build_progress < 100">
               <td class="grey--text">PDF Build</td>
diff --git a/cateditor/src/pages/editor/main.js b/cateditor/src/pages/editor/main.js
index edf32e1..fe65448 100644
--- a/cateditor/src/pages/editor/main.js
+++ b/cateditor/src/pages/editor/main.js
@@ -1,9 +1,10 @@
 import Vue from 'vue'
 import Vuetify from 'vuetify/lib'
+
 import Vue2Filters from 'vue2-filters'
 import App from './App.vue'
 import { store } from './store'
-import 'material-design-icons-iconfont/dist/material-design-icons.css' // Ensure you are using css-loader
+import '@mdi/font/css/materialdesignicons.css' // Ensure you are using css-loader
 
 Vue.config.productionTip = false
 Vue.use(Vue2Filters)
@@ -29,9 +30,9 @@ const opts = {
   options: {
     customProperties: true
   },
-  // icons: {
-  //   iconfont: 'md',
-  // },
+  icons: {
+    iconfont: 'mdi',
+  },
 }
 
 new Vue({
diff --git a/cateditor/src/pages/list/main.js b/cateditor/src/pages/list/main.js
index 7cdbdc6..fe65448 100644
--- a/cateditor/src/pages/list/main.js
+++ b/cateditor/src/pages/list/main.js
@@ -4,7 +4,7 @@ import Vuetify from 'vuetify/lib'
 import Vue2Filters from 'vue2-filters'
 import App from './App.vue'
 import { store } from './store'
-import 'material-design-icons-iconfont/dist/material-design-icons.css' // Ensure you are using css-loader
+import '@mdi/font/css/materialdesignicons.css' // Ensure you are using css-loader
 
 Vue.config.productionTip = false
 Vue.use(Vue2Filters)
@@ -30,9 +30,9 @@ const opts = {
   options: {
     customProperties: true
   },
-  // icons: {
-  //   iconfont: 'md',
-  // },
+  icons: {
+    iconfont: 'mdi',
+  },
 }
 
 new Vue({