Merge pull request coreui#12 from damingerdai/develop

Develop

Author: damingerdai

package.json

@@ -7,21 +7,21 @@
     "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
-		"e2e": "ng e2e",
-		"precommit": "ng lint daming-core-ui && sass-lint -v -q",
+    "e2e": "ng e2e",
+    "precommit": "ng lint daming-core-ui && sass-lint -v -q",
     "sass": "sass-lint -v -q",
     "push": "ng build --prod --base-href ./ && npx angular-cli-ghpages --dir=dist/daming-core-ui "
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.2.13",
-    "@angular/common": "~7.2.13",
-    "@angular/compiler": "~7.2.13",
-    "@angular/core": "~7.2.13",
-    "@angular/forms": "~7.2.13",
-    "@angular/platform-browser": "~7.2.13",
-    "@angular/platform-browser-dynamic": "~7.2.13",
-    "@angular/router": "~7.2.13",
+    "@angular/animations": "^7.2.15",
+    "@angular/common": "~7.2.15",
+    "@angular/compiler": "~7.2.15",
+    "@angular/core": "~7.2.15",
+    "@angular/forms": "~7.2.15",
+    "@angular/platform-browser": "~7.2.15",
+    "@angular/platform-browser-dynamic": "~7.2.15",
+    "@angular/router": "~7.2.15",
     "@coreui/angular": "^2.2.3",
     "@coreui/coreui": "^2.1.6",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
@@ -37,16 +37,16 @@
     "ngx-bootstrap": "^3.1.4",
     "ngx-perfect-scrollbar": "^7.2.0",
     "ngx-toastr": "^9.1.1",
-    "rxjs": "~6.4.0",
+    "rxjs": "~6.5.1",
     "simple-line-icons": "^2.4.1",
     "tslib": "^1.9.0",
     "zone.js": "~0.8.29"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.12.0",
-    "@angular/cli": "~7.3.8",
-    "@angular/compiler-cli": "~7.2.13",
-    "@angular/language-service": "~7.2.13",
+    "@angular/cli": "~7.3.9",
+    "@angular/compiler-cli": "~7.2.15",
+    "@angular/language-service": "~7.2.15",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
@@ -65,4 +65,4 @@
     "tslint": "~5.11.0",
     "typescript": "~3.2.2"
   }
-}
+}

src/app/app.component.spec.ts

@@ -2,30 +2,30 @@ import { TestBed, async } from '@angular/core/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
+	beforeEach(async(() => {
+		TestBed.configureTestingModule({
+			declarations: [
+				AppComponent
+			],
+		}).compileComponents();
+	}));
 
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
+	it('should create the app', () => {
+		const fixture = TestBed.createComponent(AppComponent);
+		const app = fixture.debugElement.componentInstance;
+		expect(app).toBeTruthy();
+	});
 
-  it(`should have as title 'daming-core-ui'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('daming-core-ui');
-  });
+	it(`should have as title 'daming-core-ui'`, () => {
+		const fixture = TestBed.createComponent(AppComponent);
+		const app = fixture.debugElement.componentInstance;
+		expect(app.title).toEqual('daming-core-ui');
+	});
 
-  it('should render title in a h1 tag', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to daming-core-ui!');
-  });
+	it('should render title in a h1 tag', () => {
+		const fixture = TestBed.createComponent(AppComponent);
+		fixture.detectChanges();
+		const compiled = fixture.debugElement.nativeElement;
+		expect(compiled.querySelector('h1').textContent).toContain('Welcome to daming-core-ui!');
+	});
 });

src/app/app.component.ts

@@ -5,35 +5,35 @@ import { setTheme } from 'ngx-bootstrap/utils';
 import { filter, map, mergeMap } from 'rxjs/operators';
 
 @Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+	selector: 'app-root',
+	templateUrl: './app.component.html',
+	styleUrls: ['./app.component.scss']
 })
 export class AppComponent implements OnInit {
 
-  title = 'damingerdai-ui';
+	title = 'damingerdai-ui';
 
-  constructor(
-    private titleService: Title,
-    private router: Router,
-    private activatedRoute: ActivatedRoute
-  ) {
-    setTheme('bs4'); // or 'bs3'
-  }
+	constructor(
+		private titleService: Title,
+		private router: Router,
+		private activatedRoute: ActivatedRoute
+	) {
+		setTheme('bs4'); // or 'bs3'
+	}
 
-  ngOnInit() {
-    this.router.events
-      .pipe(
-        filter(event => event instanceof NavigationEnd),
-        map(() => this.activatedRoute),
-        map((route) => {
-          while (route.firstChild) {
-            route = route.firstChild;
-          }
-          return route;
-        }),
-        mergeMap(route => route.data),
-        map(data => data as { title: string })
-      ).subscribe(event => this.titleService.setTitle(event.title || this.title));
-  }
+	ngOnInit() {
+		this.router.events
+			.pipe(
+				filter(event => event instanceof NavigationEnd),
+				map(() => this.activatedRoute),
+				map((route) => {
+					while (route.firstChild) {
+						route = route.firstChild;
+					}
+					return route;
+				}),
+				mergeMap(route => route.data),
+				map(data => data as { title: string })
+			).subscribe(event => this.titleService.setTitle(event.title || this.title));
+	}
 }

src/app/app.module.ts

@@ -9,19 +9,19 @@ import { RoutesModule } from './routes/routes.module';
 import { SharedModule } from './shared/shared.module';
 
 @NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule,
-    BrowserAnimationsModule,
-    HttpClientModule,
-    CoreModule,
-    LayoutModule,
-    RoutesModule,
-    SharedModule.forRoot(),
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
+	declarations: [
+		AppComponent
+	],
+	imports: [
+		BrowserModule,
+		BrowserAnimationsModule,
+		HttpClientModule,
+		CoreModule,
+		LayoutModule,
+		RoutesModule,
+		SharedModule.forRoot(),
+	],
+	providers: [],
+	bootstrap: [AppComponent]
 })
 export class AppModule { }

src/app/core/core.module.ts

@@ -5,19 +5,19 @@ import { throwIfAlreadyLoaded } from './module-import-guard';
 
 
 @NgModule({
-  declarations: [],
-  imports: [
-    CommonModule
-  ],
-  providers: [
-    {
-      provide: NAV_DATA,
-      useValue: navItems
-    },
-  ]
+	declarations: [],
+	imports: [
+		CommonModule
+	],
+	providers: [
+		{
+			provide: NAV_DATA,
+			useValue: navItems
+		},
+	]
 })
 export class CoreModule {
-  constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
-    throwIfAlreadyLoaded(parentModule, 'CoreModule');
-  }
+	constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
+		throwIfAlreadyLoaded(parentModule, 'CoreModule');
+	}
 }

src/app/core/module-import-guard.ts

@@ -1,6 +1,6 @@
 // https://angular.io/styleguide#!#04-12
 export function throwIfAlreadyLoaded(parentModule: any, moduleName: string) {
-    if (parentModule) {
-        throw new Error(`${moduleName} has already been loaded. Import Core modules in the AppModule only.`);
-    }
+	if (parentModule) {
+		throw new Error(`${moduleName} has already been loaded. Import Core modules in the AppModule only.`);
+	}
 }

src/app/core/nav/nav.service.spec.ts

@@ -3,10 +3,10 @@ import { TestBed } from '@angular/core/testing';
 import { NavService } from './nav.service';
 
 describe('NavService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+	beforeEach(() => TestBed.configureTestingModule({}));
 
-  it('should be created', () => {
-    const service: NavService = TestBed.get(NavService);
-    expect(service).toBeTruthy();
-  });
+	it('should be created', () => {
+		const service: NavService = TestBed.get(NavService);
+		expect(service).toBeTruthy();
+	});
 });

src/app/core/nav/nav.service.ts

@@ -4,21 +4,21 @@ import { NavData, NAV_DATA } from '../../routes/nav';
 import { CoreModule } from '../core.module';
 
 @Injectable({
-  providedIn: CoreModule,
+	providedIn: CoreModule,
 })
 export class NavService {
 
-  private navs: NavData[];
+	private navs: NavData[];
 
-  private navsSource = new Subject<NavData[]>();
+	private navsSource = new Subject<NavData[]>();
 
-  nav$ = this.navsSource.asObservable();
+	nav$ = this.navsSource.asObservable();
 
-  constructor(@Inject(NAV_DATA) navs: NavData[]) {
-    this.navs = navs;
-  }
+	constructor(@Inject(NAV_DATA) navs: NavData[]) {
+		this.navs = navs;
+	}
 
-  getNavs() {
-    return this.navs;
-  }
+	getNavs() {
+		return this.navs;
+	}
 }

src/app/layout/aside/aside.component.spec.ts

@@ -3,23 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { AsideComponent } from './aside.component';
 
 describe('AsideComponent', () => {
-  let component: AsideComponent;
-  let fixture: ComponentFixture<AsideComponent>;
+	let component: AsideComponent;
+	let fixture: ComponentFixture<AsideComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ AsideComponent ]
-    })
-    .compileComponents();
-  }));
+	beforeEach(async(() => {
+		TestBed.configureTestingModule({
+			declarations: [AsideComponent]
+		})
+			.compileComponents();
+	}));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AsideComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+	beforeEach(() => {
+		fixture = TestBed.createComponent(AsideComponent);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	});
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
 });

src/app/layout/aside/aside.component.ts

@@ -1,15 +1,15 @@
 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-layout-aside',
-  templateUrl: './aside.component.html',
-  styleUrls: ['./aside.component.scss']
+	selector: 'app-layout-aside',
+	templateUrl: './aside.component.html',
+	styleUrls: ['./aside.component.scss']
 })
 export class AsideComponent implements OnInit {
 
-  constructor() { }
+	constructor() { }
 
-  ngOnInit() {
-  }
+	ngOnInit() {
+	}
 
 }