From 9d8acf855057b6d80a621f64dca1cf5a24110937 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 3 Apr 2020 10:45:53 +0300
Subject: [PATCH 1/2] feat: implement new LazyLoadService

---
 .../apps/dev-app/src/app/app.component.ts     | 20 +++++++++---------
 .../app/angular/src/app/app.component.ts      | 21 ++++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

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 ea971ac3f4..d9018f0a39 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
@@ -1,5 +1,6 @@
-import { LazyLoadService } from '@abp/ng.core';
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
+import { concat } from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -12,14 +13,13 @@ export class AppComponent implements OnInit {
   constructor(private lazyLoadService: LazyLoadService) {}
 
   ngOnInit() {
-    this.lazyLoadService
-      .load(
-        ['fontawesome-all.min.css', 'fontawesome-v4-shims.min.css'],
-        'style',
-        null,
-        'head',
-        'afterbegin',
-      )
-      .subscribe();
+    concat(
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'),
+      ),
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'),
+      ),
+    ).subscribe();
   }
 }
diff --git a/templates/app/angular/src/app/app.component.ts b/templates/app/angular/src/app/app.component.ts
index 6508fc9831..0c397f5bb8 100644
--- a/templates/app/angular/src/app/app.component.ts
+++ b/templates/app/angular/src/app/app.component.ts
@@ -1,5 +1,6 @@
-import { LazyLoadService } from '@abp/ng.core';
+import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
+import { concat } from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -10,15 +11,15 @@ import { Component, OnInit } from '@angular/core';
 })
 export class AppComponent implements OnInit {
   constructor(private lazyLoadService: LazyLoadService) {}
-  async ngOnInit() {
-    this.lazyLoadService
-      .load(
-        ['fontawesome-all.min.css', 'fontawesome-v4-shims.min.css'],
-        'style',
-        null,
-        'head',
-        'afterbegin'
+
+  ngOnInit() {
+    concat(
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
+      ),
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css')
       )
-      .subscribe();
+    ).subscribe();
   }
 }

From f9d56c64418326e9a93be50bc66392a2060fa203 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 3 Apr 2020 11:06:59 +0300
Subject: [PATCH 2/2] refactor: use forkJoin instead of concat

---
 npm/ng-packs/apps/dev-app/src/app/app.component.ts |  8 ++++----
 templates/app/angular/src/app/app.component.ts     | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

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 d9018f0a39..8187365734 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
@@ -1,6 +1,6 @@
 import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
-import { concat } from 'rxjs';
+import { forkJoin } from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -13,12 +13,12 @@ export class AppComponent implements OnInit {
   constructor(private lazyLoadService: LazyLoadService) {}
 
   ngOnInit() {
-    concat(
+    forkJoin(
       this.lazyLoadService.load(
-        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'),
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'),
       ),
       this.lazyLoadService.load(
-        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'),
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'),
       ),
     ).subscribe();
   }
diff --git a/templates/app/angular/src/app/app.component.ts b/templates/app/angular/src/app/app.component.ts
index 0c397f5bb8..e4e827c766 100644
--- a/templates/app/angular/src/app/app.component.ts
+++ b/templates/app/angular/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
-import { concat } from 'rxjs';
+import { forkJoin } from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -13,13 +13,13 @@ export class AppComponent implements OnInit {
   constructor(private lazyLoadService: LazyLoadService) {}
 
   ngOnInit() {
-    concat(
-      this.lazyLoadService.load(
-        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
-      ),
+    forkJoin(
       this.lazyLoadService.load(
         LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css')
       )
+      this.lazyLoadService.load(
+        LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
+      ),
     ).subscribe();
   }
 }