From aa4d8f9d41feb500092c9b22da421bf2a4b2ab16 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Fri, 6 Oct 2017 23:56:35 -0400 Subject: [PATCH 01/10] updated all components to lazy loaded --- src/app/app.component.html | 26 ++++++++++++-------------- src/app/app.module.ts | 20 ++++++-------------- src/app/app.routing.ts | 8 ++++---- src/app/companies/companies.module.ts | 10 ++++++++++ src/app/companies/companies.routing.ts | 10 ++++++++++ src/app/operators/operators.module.ts | 10 ++++++++++ src/app/operators/operators.routing.ts | 10 ++++++++++ src/app/rxjs/rxjs.module.ts | 10 ++++++++++ src/app/rxjs/rxjs.routing.ts | 10 ++++++++++ src/app/team/team.module.ts | 10 ++++++++++ src/app/team/team.routing.ts | 10 ++++++++++ 11 files changed, 102 insertions(+), 32 deletions(-) create mode 100644 src/app/companies/companies.module.ts create mode 100644 src/app/companies/companies.routing.ts create mode 100644 src/app/operators/operators.module.ts create mode 100644 src/app/operators/operators.routing.ts create mode 100644 src/app/rxjs/rxjs.module.ts create mode 100644 src/app/rxjs/rxjs.routing.ts create mode 100644 src/app/team/team.module.ts create mode 100644 src/app/team/team.routing.ts diff --git a/src/app/app.component.html b/src/app/app.component.html index 46c4151c..fc79b1bb 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,24 +1,22 @@
- + RxJS Docs - - - - - + + + + + {{menu.title}} - - + +
- -
\ No newline at end of file + + diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0c5f249a..46435bec 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,34 +1,26 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { MdToolbarModule, MdSidenavModule, MdIconModule, MdButtonModule, MdListModule } from '@angular/material'; +import { MatToolbarModule, MatSidenavModule, MatIconModule, MatButtonModule, MatListModule } from '@angular/material'; import { RouterModule } from '@angular/router'; import { RXJS_DOC_ROUTES } from './app.routing'; import { AppComponent } from './app.component'; -import { OperatorsComponent } from './operators/operators.component'; -import { CompaniesComponent } from './companies/companies.component'; -import { TeamComponent } from './team/team.component'; -import { RxjsComponent } from './rxjs/rxjs.component'; @NgModule({ declarations: [ AppComponent, - OperatorsComponent, - CompaniesComponent, - TeamComponent, - RxjsComponent ], imports: [ BrowserModule, BrowserAnimationsModule, RouterModule.forRoot(RXJS_DOC_ROUTES), - MdToolbarModule, - MdSidenavModule, - MdIconModule, - MdButtonModule, - MdListModule + MatToolbarModule, + MatSidenavModule, + MatIconModule, + MatButtonModule, + MatListModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index d7db3e43..43780d58 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -7,9 +7,9 @@ import { RxjsComponent } from './rxjs/rxjs.component'; import { TeamComponent } from './team/team.component'; export const RXJS_DOC_ROUTES: Routes = [ - { path: '', component: RxjsComponent }, - { path: 'operators', component: OperatorsComponent }, - { path: 'team', component: TeamComponent }, - { path: 'companies', component: CompaniesComponent }, + { path: '', loadChildren: './rxjs/rxjs.module#RxjsModule' }, + { path: 'operators', loadChildren: './operators/operators.module#OperatorsModule' }, + { path: 'team', loadChildren: './team/team.module#TeamModule' }, + { path: 'companies', loadChildren: './companies/companies.module#CompaniesModule' }, { path: '**', redirectTo: '' } ]; diff --git a/src/app/companies/companies.module.ts b/src/app/companies/companies.module.ts new file mode 100644 index 00000000..36434fcd --- /dev/null +++ b/src/app/companies/companies.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; + +import { CompaniesComponent } from './companies.component'; +import { routing } from './companies.routing'; + +@NgModule({ + imports: [routing], + declarations: [CompaniesComponent] +}) +export class CompaniesModule { } \ No newline at end of file diff --git a/src/app/companies/companies.routing.ts b/src/app/companies/companies.routing.ts new file mode 100644 index 00000000..e7849e0a --- /dev/null +++ b/src/app/companies/companies.routing.ts @@ -0,0 +1,10 @@ +import { ModuleWithProviders } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { CompaniesComponent } from './companies.component'; + +const routes: Routes = [ + { path: '', component: CompaniesComponent } +]; + +export const routing: ModuleWithProviders = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/app/operators/operators.module.ts b/src/app/operators/operators.module.ts new file mode 100644 index 00000000..e645bc94 --- /dev/null +++ b/src/app/operators/operators.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; + +import { OperatorsComponent } from './operators.component'; +import { routing } from './operators.routing'; + +@NgModule({ + imports: [routing], + declarations: [OperatorsComponent] +}) +export class OperatorsModule { } \ No newline at end of file diff --git a/src/app/operators/operators.routing.ts b/src/app/operators/operators.routing.ts new file mode 100644 index 00000000..2c6fc3b2 --- /dev/null +++ b/src/app/operators/operators.routing.ts @@ -0,0 +1,10 @@ +import { ModuleWithProviders } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { OperatorsComponent } from './operators.component'; + +const routes: Routes = [ + { path: '', component: OperatorsComponent } +]; + +export const routing: ModuleWithProviders = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/app/rxjs/rxjs.module.ts b/src/app/rxjs/rxjs.module.ts new file mode 100644 index 00000000..6ad8c9b2 --- /dev/null +++ b/src/app/rxjs/rxjs.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; + +import { RxjsComponent } from './rxjs.component'; +import { routing } from './rxjs.routing'; + +@NgModule({ + imports: [routing], + declarations: [RxjsComponent] +}) +export class RxjsModule { } \ No newline at end of file diff --git a/src/app/rxjs/rxjs.routing.ts b/src/app/rxjs/rxjs.routing.ts new file mode 100644 index 00000000..37187d3a --- /dev/null +++ b/src/app/rxjs/rxjs.routing.ts @@ -0,0 +1,10 @@ +import { ModuleWithProviders } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { RxjsComponent } from './rxjs.component'; + +const routes: Routes = [ + { path: '', component: RxjsComponent } +]; + +export const routing: ModuleWithProviders = RouterModule.forChild(routes); \ No newline at end of file diff --git a/src/app/team/team.module.ts b/src/app/team/team.module.ts new file mode 100644 index 00000000..59c72102 --- /dev/null +++ b/src/app/team/team.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; + +import { TeamComponent } from './team.component'; +import { routing } from './team.routing'; + +@NgModule({ + imports: [routing], + declarations: [TeamComponent] +}) +export class TeamModule { } \ No newline at end of file diff --git a/src/app/team/team.routing.ts b/src/app/team/team.routing.ts new file mode 100644 index 00000000..1944cbd5 --- /dev/null +++ b/src/app/team/team.routing.ts @@ -0,0 +1,10 @@ +import { ModuleWithProviders } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { TeamComponent } from './team.component'; + +const routes: Routes = [ + { path: '', component: TeamComponent } +]; + +export const routing: ModuleWithProviders = RouterModule.forChild(routes); \ No newline at end of file From e3f12151830bf4604a7d9637b7a8fe66837197a7 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Sat, 7 Oct 2017 01:13:03 -0400 Subject: [PATCH 02/10] updated spec file to match material input changes --- src/app/app.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index dc143d2a..7f1c584b 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { MdToolbarModule, MdSidenavModule, MdIconModule, MdButtonModule, MdListModule } from '@angular/material'; +import { MatToolbarModule, MatSidenavModule, MatIconModule, MatButtonModule, MatListModule } from '@angular/material'; import { AppComponent } from './app.component'; describe('AppComponent', () => { @@ -10,7 +10,7 @@ describe('AppComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule, BrowserAnimationsModule, MdToolbarModule, MdSidenavModule, MdIconModule, MdButtonModule, MdListModule], + imports: [RouterTestingModule, BrowserAnimationsModule, MatToolbarModule, MatSidenavModule, MatIconModule, MatButtonModule, MatListModule], declarations: [AppComponent] }) .compileComponents(); From 775ec23055eebb614d317740ef1e9db18f529e57 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Sat, 7 Oct 2017 01:24:01 -0400 Subject: [PATCH 03/10] resolved lint issues --- src/app/app.component.spec.ts | 10 +++++++++- src/app/companies/companies.component.ts | 2 +- src/app/companies/companies.module.ts | 2 +- src/app/companies/companies.routing.ts | 2 +- src/app/operators/operators.module.ts | 2 +- src/app/operators/operators.routing.ts | 2 +- src/app/rxjs/rxjs.module.ts | 2 +- src/app/rxjs/rxjs.routing.ts | 2 +- src/app/team/team.module.ts | 2 +- src/app/team/team.routing.ts | 2 +- 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 7f1c584b..f004ca25 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -10,7 +10,15 @@ describe('AppComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule, BrowserAnimationsModule, MatToolbarModule, MatSidenavModule, MatIconModule, MatButtonModule, MatListModule], + imports: [ + RouterTestingModule, + BrowserAnimationsModule, + MatToolbarModule, + MatSidenavModule, + MatIconModule, + MatButtonModule, + MatListModule + ], declarations: [AppComponent] }) .compileComponents(); diff --git a/src/app/companies/companies.component.ts b/src/app/companies/companies.component.ts index 2e895b37..53634219 100644 --- a/src/app/companies/companies.component.ts +++ b/src/app/companies/companies.component.ts @@ -11,5 +11,5 @@ export class CompaniesComponent implements OnInit { ngOnInit() { } - } + diff --git a/src/app/companies/companies.module.ts b/src/app/companies/companies.module.ts index 36434fcd..6389143f 100644 --- a/src/app/companies/companies.module.ts +++ b/src/app/companies/companies.module.ts @@ -7,4 +7,4 @@ import { routing } from './companies.routing'; imports: [routing], declarations: [CompaniesComponent] }) -export class CompaniesModule { } \ No newline at end of file +export class CompaniesModule { } diff --git a/src/app/companies/companies.routing.ts b/src/app/companies/companies.routing.ts index e7849e0a..f8990455 100644 --- a/src/app/companies/companies.routing.ts +++ b/src/app/companies/companies.routing.ts @@ -7,4 +7,4 @@ const routes: Routes = [ { path: '', component: CompaniesComponent } ]; -export const routing: ModuleWithProviders = RouterModule.forChild(routes); \ No newline at end of file +export const routing: ModuleWithProviders = RouterModule.forChild(routes); diff --git a/src/app/operators/operators.module.ts b/src/app/operators/operators.module.ts index e645bc94..a349e1c5 100644 --- a/src/app/operators/operators.module.ts +++ b/src/app/operators/operators.module.ts @@ -7,4 +7,4 @@ import { routing } from './operators.routing'; imports: [routing], declarations: [OperatorsComponent] }) -export class OperatorsModule { } \ No newline at end of file +export class OperatorsModule { } diff --git a/src/app/operators/operators.routing.ts b/src/app/operators/operators.routing.ts index 2c6fc3b2..6d9078e4 100644 --- a/src/app/operators/operators.routing.ts +++ b/src/app/operators/operators.routing.ts @@ -7,4 +7,4 @@ const routes: Routes = [ { path: '', component: OperatorsComponent } ]; -export const routing: ModuleWithProviders = RouterModule.forChild(routes); \ No newline at end of file +export const routing: ModuleWithProviders = RouterModule.forChild(routes); diff --git a/src/app/rxjs/rxjs.module.ts b/src/app/rxjs/rxjs.module.ts index 6ad8c9b2..53e1d345 100644 --- a/src/app/rxjs/rxjs.module.ts +++ b/src/app/rxjs/rxjs.module.ts @@ -7,4 +7,4 @@ import { routing } from './rxjs.routing'; imports: [routing], declarations: [RxjsComponent] }) -export class RxjsModule { } \ No newline at end of file +export class RxjsModule { } diff --git a/src/app/rxjs/rxjs.routing.ts b/src/app/rxjs/rxjs.routing.ts index 37187d3a..8604d68b 100644 --- a/src/app/rxjs/rxjs.routing.ts +++ b/src/app/rxjs/rxjs.routing.ts @@ -7,4 +7,4 @@ const routes: Routes = [ { path: '', component: RxjsComponent } ]; -export const routing: ModuleWithProviders = RouterModule.forChild(routes); \ No newline at end of file +export const routing: ModuleWithProviders = RouterModule.forChild(routes); diff --git a/src/app/team/team.module.ts b/src/app/team/team.module.ts index 59c72102..32836909 100644 --- a/src/app/team/team.module.ts +++ b/src/app/team/team.module.ts @@ -7,4 +7,4 @@ import { routing } from './team.routing'; imports: [routing], declarations: [TeamComponent] }) -export class TeamModule { } \ No newline at end of file +export class TeamModule { } diff --git a/src/app/team/team.routing.ts b/src/app/team/team.routing.ts index 1944cbd5..a188b823 100644 --- a/src/app/team/team.routing.ts +++ b/src/app/team/team.routing.ts @@ -7,4 +7,4 @@ const routes: Routes = [ { path: '', component: TeamComponent } ]; -export const routing: ModuleWithProviders = RouterModule.forChild(routes); \ No newline at end of file +export const routing: ModuleWithProviders = RouterModule.forChild(routes); From a6363f5b5945c91d1d0d19b02e282890d43dbb44 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Sat, 7 Oct 2017 01:31:55 -0400 Subject: [PATCH 04/10] changed md to mat for icon-button --- src/app/app.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index fc79b1bb..337e92c0 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,6 +1,6 @@
-