From da5aabca172c11b9d398dc47664786a1f84913bd Mon Sep 17 00:00:00 2001
From: Gabriel Bourgault <dizco@users.noreply.github.com>
Date: Mon, 30 Jul 2018 22:28:50 -0700
Subject: [PATCH] feat(icons): Update font awesome to 5.2.0

---
 angular.json                                         |  2 +-
 package-lock.json                                    | 11 ++++++-----
 package.json                                         |  2 +-
 src/app/pages/ui-features/icons/icons.component.html |  2 +-
 src/app/pages/ui-features/icons/icons.component.ts   | 12 ++++++------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/angular.json b/angular.json
index c7c0132ef4..3a329f8191 100644
--- a/angular.json
+++ b/angular.json
@@ -32,7 +32,7 @@
               "node_modules/typeface-exo/index.css",
               "node_modules/roboto-fontface/css/roboto/roboto-fontface.css",
               "node_modules/ionicons/scss/ionicons.scss",
-              "node_modules/font-awesome/scss/font-awesome.scss",
+              "node_modules/@fortawesome/fontawesome-free/css/all.css",
               "node_modules/socicon/css/socicon.css",
               "node_modules/nebular-icons/scss/nebular-icons.scss",
               "node_modules/angular-tree-component/dist/angular-tree-component.css",
diff --git a/package-lock.json b/package-lock.json
index feba51a721..4c600d9a3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -689,6 +689,12 @@
         "viz.js": "1.8.0"
       }
     },
+    "@fortawesome/fontawesome-free": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.2.0.tgz",
+      "integrity": "sha512-4pgStJx9UmydKc7wwF6Xjw4dFqzUnQejeuP2aUNHWazayWbmMbrx5rieN9+oob4bUwkf1thS3am0Ko+uhFHpNA==",
+      "dev": true
+    },
     "@nebular/auth": {
       "version": "2.0.0-rc.9",
       "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-2.0.0-rc.9.tgz",
@@ -5048,11 +5054,6 @@
         "readable-stream": "2.3.4"
       }
     },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
diff --git a/package.json b/package.json
index 71c8edbaab..0797fc71a0 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,6 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.5.1",
     "echarts": "^4.0.2",
-    "font-awesome": "4.7.0",
     "intl": "1.2.5",
     "ionicons": "2.0.1",
     "leaflet": "1.2.0",
@@ -83,6 +82,7 @@
     "@angular/compiler-cli": "6.0.0",
     "@angular/language-service": "6.0.0",
     "@compodoc/compodoc": "1.0.1",
+    "@fortawesome/fontawesome-free": "^5.2.0",
     "@types/d3-color": "1.0.5",
     "@types/googlemaps": "3.30.4",
     "@types/jasmine": "2.5.54",
diff --git a/src/app/pages/ui-features/icons/icons.component.html b/src/app/pages/ui-features/icons/icons.component.html
index c40b3225db..0aedaf9d60 100644
--- a/src/app/pages/ui-features/icons/icons.component.html
+++ b/src/app/pages/ui-features/icons/icons.component.html
@@ -19,7 +19,7 @@
       <nb-card-body>
         <div class="icon"
              *ngFor="let icon of icons.fontAwesome">
-          <i class="fa {{ icon }}" [nbPopover]="icon"></i>
+          <i class="{{ icon }}" [nbPopover]="icon"></i>
         </div>
       </nb-card-body>
       <nb-card-footer>
diff --git a/src/app/pages/ui-features/icons/icons.component.ts b/src/app/pages/ui-features/icons/icons.component.ts
index 4af2704b58..07e9bf9ef9 100644
--- a/src/app/pages/ui-features/icons/icons.component.ts
+++ b/src/app/pages/ui-features/icons/icons.component.ts
@@ -44,12 +44,12 @@ export class IconsComponent {
     ],
 
     fontAwesome: [
-      'fa fa-adjust', 'fa fa-anchor', 'fa fa-archive', 'fa fa-area-chart', 'fa fa-arrows', 'fa fa-arrows-h',
-      'fa fa-arrows-v', 'fa fa-asterisk', 'fa fa-at', 'fa fa-automobile', 'fa fa-ban', 'fa fa-bank',
-      'fa fa-bar-chart', 'fa fa-bar-chart-o', 'fa fa-barcode', 'fa fa-bars', 'fa fa-bed', 'fa fa-beer',
-      'fa fa-bell', 'fa fa-bell-o', 'fa fa-bell-slash', 'fa fa-bell-slash-o', 'fa fa-bicycle', 'fa fa-binoculars',
-      'fa fa-birthday-cake', 'fa fa-bolt', 'fa fa-bomb', 'fa fa-book', 'fa fa-bookmark', 'fa fa-bookmark-o',
-      'fa fa-briefcase', 'fa fa-bug', 'fa fa-building', 'fa fa-building-o', 'fa fa-bullhorn',
+      'fa fa-adjust', 'fa fa-anchor', 'fa fa-archive', 'fa fa-chart-area', 'fa fa-arrows-alt', 'fa fa-arrows-alt-h',
+      'fa fa-arrows-alt-v', 'fa fa-asterisk', 'fa fa-at', 'fa fa-car', 'fa fa-ban', 'fa fa-university',
+      'fa fa-chart-bar', 'far fa-chart-bar', 'fa fa-barcode', 'fa fa-bars', 'fa fa-bed', 'fa fa-beer',
+      'fa fa-bell', 'far fa-bell', 'fa fa-bell-slash', 'far fa-bell-slash', 'fa fa-bicycle', 'fa fa-binoculars',
+      'fa fa-birthday-cake', 'fa fa-bolt', 'fa fa-bomb', 'fa fa-book', 'fa fa-bookmark', 'far fa-bookmark',
+      'fa fa-briefcase', 'fa fa-bug', 'fa fa-building', 'far fa-building', 'fa fa-bullhorn',
     ],
   };