From e4957fe45548b7910996aab2dc6b0f9f425e7c04 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 18 Oct 2019 16:08:24 +0300
Subject: [PATCH] feat: upgrade font awesome

---
 npm/ng-packs/angular.json                     |  9 ++++++--
 .../apps/dev-app/src/app/app.component.ts     |  8 ++++++-
 .../dev-app/src/app/home/home.component.html  |  2 +-
 npm/ng-packs/package.json                     | 21 ++++++++++---------
 .../packages/theme-shared/ng-package.json     |  1 +
 .../packages/theme-shared/package.json        |  3 ++-
 .../lib/components/button/button.component.ts |  2 +-
 templates/app/angular/angular.json            |  9 ++++++--
 .../app/angular/src/app/app.component.ts      |  8 ++++++-
 .../angular/src/app/home/home.component.html  |  2 +-
 10 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json
index f1c7d18a46..cfa01cf43f 100644
--- a/npm/ng-packs/angular.json
+++ b/npm/ng-packs/angular.json
@@ -435,9 +435,14 @@
               "apps/dev-app/src/styles.scss",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
               {
-                "input": "node_modules/font-awesome/css/font-awesome.min.css",
+                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
                 "lazy": true,
-                "bundleName": "font-awesome.min"
+                "bundleName": "fontawesome-all.min"
+              },
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
+                "lazy": true,
+                "bundleName": "fontawesome-v4-shims.min"
               },
               {
                 "input": "node_modules/primeng/resources/themes/nova-light/theme.css",
diff --git a/npm/ng-packs/apps/dev-app/src/app/app.component.ts b/npm/ng-packs/apps/dev-app/src/app/app.component.ts
index e89c73184d..4780afbfd5 100644
--- a/npm/ng-packs/apps/dev-app/src/app/app.component.ts
+++ b/npm/ng-packs/apps/dev-app/src/app/app.component.ts
@@ -14,7 +14,13 @@ export class AppComponent implements OnInit {
   ngOnInit() {
     this.lazyLoadService
       .load(
-        ['primeng.min.css', 'primeicons.css', 'primeng-nova-light-theme.css', 'font-awesome.min.css'],
+        [
+          'primeng.min.css',
+          'primeicons.css',
+          'primeng-nova-light-theme.css',
+          'fontawesome-all.min.css',
+          'fontawesome-v4-shims.min.css',
+        ],
         'style',
         null,
         'head',
diff --git a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
index 4fafc67398..79220d16c4 100644
--- a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
+++ b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
@@ -6,7 +6,7 @@
     </p>
     <p *ngIf="!hasLoggedIn">
       <a routerLink="/account/login" [state]="{ redirectUrl: '/' }" class="btn btn-primary" role="button"
-        ><i class="fa fa-sign-in"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
+        ><i class="fa fa-sign-in mr-1"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
       >
     </p>
     <hr />
diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index 3774a5705d..abee172af0 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -7,13 +7,17 @@
     "abpng": "abpng",
     "commit": "git-cz && node scripts/push.js",
     "lint": "ng lint --fix",
-    "build:scripts": "cd scripts && npm install && npm run build"
+    "scripts:build": "cd scripts && npm install && npm run build"
   },
   "devDependencies": {
-    "@abp/ng.core": "^0.9.0",
-    "@abp/ng.feature-management": "^0.9.0",
-    "@abp/ng.permission-management": "^0.9.0",
-    "@abp/ng.theme.shared": "^0.9.0",
+    "@abp/ng.account.config": "0.9.2",
+    "@abp/ng.core": "0.9.2",
+    "@abp/ng.feature-management": "0.9.2",
+    "@abp/ng.identity.config": "0.9.2",
+    "@abp/ng.permission-management": "0.9.2",
+    "@abp/ng.setting-management.config": "0.9.2",
+    "@abp/ng.tenant-management.config": "0.9.2",
+    "@abp/ng.theme.shared": "0.9.2",
     "@angular-builders/jest": "^8.2.0",
     "@angular-devkit/build-angular": "~0.803.6",
     "@angular-devkit/build-ng-packagr": "~0.803.6",
@@ -29,6 +33,7 @@
     "@angular/platform-browser": "~8.2.8",
     "@angular/platform-browser-dynamic": "~8.2.8",
     "@angular/router": "~8.1.2",
+    "@fortawesome/fontawesome-free": "^5.11.2",
     "@ng-bootstrap/ng-bootstrap": "^5.1.0",
     "@ngneat/spectator": "^4.4.0",
     "@ngx-validate/core": "^0.0.7",
@@ -64,11 +69,7 @@
     "tsickle": "^0.37.0",
     "tslint": "~5.20.0",
     "typescript": "~3.5.3",
-    "zone.js": "~0.9.1",
-    "@abp/ng.account.config": "^0.9.0",
-    "@abp/ng.identity.config": "0.9.0",
-    "@abp/ng.tenant-management.config": "^0.9.0",
-    "@abp/ng.setting-management.config": "^0.9.0"
+    "zone.js": "~0.9.1"
   },
   "dependencies": {
     "tslib": "^1.10.0"
diff --git a/npm/ng-packs/packages/theme-shared/ng-package.json b/npm/ng-packs/packages/theme-shared/ng-package.json
index 984eb7c61a..a879347afd 100644
--- a/npm/ng-packs/packages/theme-shared/ng-package.json
+++ b/npm/ng-packs/packages/theme-shared/ng-package.json
@@ -7,6 +7,7 @@
   "whitelistedNonPeerDependencies": [
     "@abp/ng.core",
     "@angular/cdk",
+    "@fortawesome/fontawesome-free",
     "@ng-bootstrap/ng-bootstrap",
     "@ngx-validate/core",
     "bootstrap",
diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json
index 813efd2932..0480977d6f 100644
--- a/npm/ng-packs/packages/theme-shared/package.json
+++ b/npm/ng-packs/packages/theme-shared/package.json
@@ -4,6 +4,7 @@
   "dependencies": {
     "@abp/ng.core": "^0.9.2",
     "@angular/cdk": "^8.0.1",
+    "@fortawesome/fontawesome-free": "5.10.1",
     "@ng-bootstrap/ng-bootstrap": "^5.1.0",
     "@ngx-validate/core": "^0.0.7",
     "bootstrap": "^4.3.1",
@@ -11,7 +12,7 @@
     "font-awesome": "^4.7.0",
     "ngx-perfect-scrollbar": "^8.0.0",
     "primeicons": "^2.0.0",
-    "primeng": "^8.0.3"
+    "primeng": "^8.0.4"
   },
   "publishConfig": {
     "access": "public"
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts
index 99d58d3124..569484867b 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts
@@ -55,7 +55,7 @@ export class ButtonComponent implements OnInit {
   @Input() type = 'button';
 
   get icon(): string {
-    return `${this.loading ? 'fa fa-pulse fa-spinner' : this.iconClass || 'd-none'}`;
+    return `${this.loading ? 'fa fa-spinner fa-spin' : this.iconClass || 'd-none'}`;
   }
 
   constructor(private renderer: Renderer2) {}
diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json
index f7bb4656fe..4b1f31497b 100644
--- a/templates/app/angular/angular.json
+++ b/templates/app/angular/angular.json
@@ -29,9 +29,14 @@
               "src/styles.scss",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
               {
-                "input": "node_modules/font-awesome/css/font-awesome.min.css",
+                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
                 "lazy": true,
-                "bundleName": "font-awesome.min"
+                "bundleName": "fontawesome-all.min"
+              },
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
+                "lazy": true,
+                "bundleName": "fontawesome-v4-shims.min"
               },
               {
                 "input": "node_modules/primeng/resources/themes/nova-light/theme.css",
diff --git a/templates/app/angular/src/app/app.component.ts b/templates/app/angular/src/app/app.component.ts
index e89c73184d..4780afbfd5 100644
--- a/templates/app/angular/src/app/app.component.ts
+++ b/templates/app/angular/src/app/app.component.ts
@@ -14,7 +14,13 @@ export class AppComponent implements OnInit {
   ngOnInit() {
     this.lazyLoadService
       .load(
-        ['primeng.min.css', 'primeicons.css', 'primeng-nova-light-theme.css', 'font-awesome.min.css'],
+        [
+          'primeng.min.css',
+          'primeicons.css',
+          'primeng-nova-light-theme.css',
+          'fontawesome-all.min.css',
+          'fontawesome-v4-shims.min.css',
+        ],
         'style',
         null,
         'head',
diff --git a/templates/app/angular/src/app/home/home.component.html b/templates/app/angular/src/app/home/home.component.html
index 4fafc67398..79220d16c4 100644
--- a/templates/app/angular/src/app/home/home.component.html
+++ b/templates/app/angular/src/app/home/home.component.html
@@ -6,7 +6,7 @@
     </p>
     <p *ngIf="!hasLoggedIn">
       <a routerLink="/account/login" [state]="{ redirectUrl: '/' }" class="btn btn-primary" role="button"
-        ><i class="fa fa-sign-in"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
+        ><i class="fa fa-sign-in mr-1"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
       >
     </p>
     <hr />