Browse Source

Merge branch 'master' into dev

pull/3493/head
mehmet-erim 7 years ago
parent
commit
de27af3a63
  1. 6
      npm/ng-packs/packages/core/package.json
  2. 6
      templates/app/angular/src/app/app.component.ts

6
npm/ng-packs/packages/core/package.json

@ -7,13 +7,13 @@
"url": "https://github.com/abpframework/abp.git" "url": "https://github.com/abpframework/abp.git"
}, },
"dependencies": { "dependencies": {
"@abp/utils": "~2.3.0", "@abp/utils": "^2.4.0",
"@angular/localize": "~9.0.2", "@angular/localize": "~9.1.0",
"@ngxs/router-plugin": "^3.6.2", "@ngxs/router-plugin": "^3.6.2",
"@ngxs/storage-plugin": "^3.6.2", "@ngxs/storage-plugin": "^3.6.2",
"@ngxs/store": "^3.6.2", "@ngxs/store": "^3.6.2",
"angular-oauth2-oidc": "^8.0.4", "angular-oauth2-oidc": "^8.0.4",
"just-clone": "3.1.0", "just-clone": "^3.1.0",
"just-compare": "^1.3.0", "just-compare": "^1.3.0",
"snq": "^1.0.3", "snq": "^1.0.3",
"ts-toolbelt": "^6.3.6" "ts-toolbelt": "^6.3.6"

6
templates/app/angular/src/app/app.component.ts

@ -7,7 +7,7 @@ import { forkJoin } from 'rxjs';
template: ` template: `
<abp-loader-bar></abp-loader-bar> <abp-loader-bar></abp-loader-bar>
<router-outlet></router-outlet> <router-outlet></router-outlet>
` `,
}) })
export class AppComponent implements OnInit { export class AppComponent implements OnInit {
constructor(private lazyLoadService: LazyLoadService) {} constructor(private lazyLoadService: LazyLoadService) {}
@ -16,10 +16,10 @@ export class AppComponent implements OnInit {
forkJoin( forkJoin(
this.lazyLoadService.load( this.lazyLoadService.load(
LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css') LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css')
) ),
this.lazyLoadService.load( this.lazyLoadService.load(
LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css') LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
), )
).subscribe(); ).subscribe();
} }
} }

Loading…
Cancel
Save