From 2ed0b2dcaefa74aa7878c12df349ba18bccba9f8 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Fri, 20 Sep 2019 11:05:28 +0530
Subject: [PATCH] only import used fa icons

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 ui/src/components/widgets/InstanceView.vue |  2 +-
 ui/src/core/ext.js                         | 16 ++++++++++++++++
 ui/src/main.js                             | 10 +---------
 ui/vue.config.js                           |  1 +
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 ui/src/core/ext.js

diff --git a/ui/src/components/widgets/InstanceView.vue b/ui/src/components/widgets/InstanceView.vue
index f2963486ebd..8c8dd19e739 100644
--- a/ui/src/components/widgets/InstanceView.vue
+++ b/ui/src/components/widgets/InstanceView.vue
@@ -339,7 +339,7 @@ export default {
         } else if (osname.includes('oracle')) {
           this.osLogo = 'java'
         } else {
-          this.osLogo = 'cloud'
+          this.osLogo = 'linux'
         }
       })
     }
diff --git a/ui/src/core/ext.js b/ui/src/core/ext.js
new file mode 100644
index 00000000000..2d8b02c936f
--- /dev/null
+++ b/ui/src/core/ext.js
@@ -0,0 +1,16 @@
+import Vue from 'vue'
+
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+
+// import { fab } from '@fortawesome/free-brands-svg-icons'
+// import { fas } from '@fortawesome/free-solid-svg-icons'
+// import { far } from '@fortawesome/free-regular-svg-icons'
+
+import { faCentos, faUbuntu, faSuse, faRedhat, faFedora, faLinux, faFreebsd, faApple, faWindows, faJava } from '@fortawesome/free-brands-svg-icons'
+import { faMicrochip, faMemory, faDatabase, faEthernet, faCompactDisc } from '@fortawesome/free-solid-svg-icons'
+
+library.add(faCentos, faUbuntu, faSuse, faRedhat, faFedora, faLinux, faFreebsd, faApple, faWindows, faJava)
+library.add(faMicrochip, faMemory, faDatabase, faEthernet, faCompactDisc)
+
+Vue.component('font-awesome-icon', FontAwesomeIcon)
diff --git a/ui/src/main.js b/ui/src/main.js
index 1b66963a84d..33b4f05b4d7 100644
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -7,18 +7,10 @@ import { VueAxios } from './utils/request'
 
 import bootstrap from './core/bootstrap'
 import './core/use'
+import './core/ext'
 import './permission' // permission control
 import './utils/filter' // global filter
 
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { fab } from '@fortawesome/free-brands-svg-icons'
-import { fas } from '@fortawesome/free-solid-svg-icons'
-import { far } from '@fortawesome/free-regular-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-
-library.add(fab, far, fas)
-Vue.component('font-awesome-icon', FontAwesomeIcon)
-
 Vue.config.productionTip = false
 Vue.use(VueAxios, router)
 
diff --git a/ui/vue.config.js b/ui/vue.config.js
index 6db2c4a77be..b2a2d4e0881 100644
--- a/ui/vue.config.js
+++ b/ui/vue.config.js
@@ -93,6 +93,7 @@ module.exports = {
     proxy: {
       '/client/api': {
         target: process.env.API_URL || 'http://localhost:8080/client/api',
+        secure: false,
         ws: false,
         changeOrigin: true
       }