From cf88cb10cbdb4a99dc38dca56d8bafb9672c25ac Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Fri, 17 Nov 2017 14:15:30 -0600 Subject: [PATCH] refactor(routes): Refactor routing into routing modules --- src/app/app-routing.module.ts | 26 ++++++++++++++ src/app/app.module.ts | 19 +++++----- src/app/app.routing.ts | 15 -------- src/app/companies/companies-routing.module.ts | 12 +++++++ src/app/companies/companies.module.ts | 12 +++---- src/app/companies/companies.routing.ts | 10 ------ src/app/operators/operators-routing.module.ts | 12 +++++++ src/app/operators/operators.module.ts | 36 +++++++++---------- src/app/operators/operators.routing.ts | 10 ------ src/app/rxjs/rxjs-routing.module.ts | 12 +++++++ src/app/rxjs/rxjs.module.ts | 10 +++--- src/app/rxjs/rxjs.routing.ts | 10 ------ src/app/team/team-routing.module.ts | 12 +++++++ src/app/team/team.module.ts | 10 +++--- src/app/team/team.routing.ts | 10 ------ 15 files changed, 116 insertions(+), 100 deletions(-) create mode 100644 src/app/app-routing.module.ts delete mode 100644 src/app/app.routing.ts create mode 100644 src/app/companies/companies-routing.module.ts delete mode 100644 src/app/companies/companies.routing.ts create mode 100644 src/app/operators/operators-routing.module.ts delete mode 100644 src/app/operators/operators.routing.ts create mode 100644 src/app/rxjs/rxjs-routing.module.ts delete mode 100644 src/app/rxjs/rxjs.routing.ts create mode 100644 src/app/team/team-routing.module.ts delete mode 100644 src/app/team/team.routing.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts new file mode 100644 index 00000000..381a7339 --- /dev/null +++ b/src/app/app-routing.module.ts @@ -0,0 +1,26 @@ +import { ModuleWithProviders, NgModule } from '@angular/core'; +import { Routes, RouterModule, PreloadAllModules } from '@angular/router'; + +export const routes: Routes = [ + { 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: '' } +]; + +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { + preloadingStrategy: PreloadAllModules + }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 96331b8b..a1c48130 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,12 +1,11 @@ -import { BrowserModule } from "@angular/platform-browser"; -import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { NgModule } from "@angular/core"; -import { RouterModule, PreloadAllModules } from "@angular/router"; +import { BrowserModule } from '@angular/platform-browser'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { NgModule } from '@angular/core'; -import { AppComponent } from "./app.component"; -import { RXJS_DOC_ROUTES } from "./app.routing"; -import { ToolbarModule } from "./toolbar/toolbar.module"; -import { MatSidenavModule, MatListModule } from "@angular/material"; +import { AppComponent } from './app.component'; +import { ToolbarModule } from './toolbar/toolbar.module'; +import { MatSidenavModule, MatListModule } from '@angular/material'; +import { AppRoutingModule } from './app-routing.module'; @NgModule({ declarations: [AppComponent], @@ -16,9 +15,7 @@ import { MatSidenavModule, MatListModule } from "@angular/material"; ToolbarModule, MatListModule, MatSidenavModule, - RouterModule.forRoot(RXJS_DOC_ROUTES, { - preloadingStrategy: PreloadAllModules - }) + AppRoutingModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts deleted file mode 100644 index 43780d58..00000000 --- a/src/app/app.routing.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ModuleWithProviders } from '@angular/core'; -import { Routes } from '@angular/router'; - -import { CompaniesComponent } from './companies/companies.component'; -import { OperatorsComponent } from './operators/operators.component'; -import { RxjsComponent } from './rxjs/rxjs.component'; -import { TeamComponent } from './team/team.component'; - -export const RXJS_DOC_ROUTES: Routes = [ - { 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-routing.module.ts b/src/app/companies/companies-routing.module.ts new file mode 100644 index 00000000..9531d7b2 --- /dev/null +++ b/src/app/companies/companies-routing.module.ts @@ -0,0 +1,12 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { CompaniesComponent } from './companies.component'; + +const routes: Routes = [{ path: '', component: CompaniesComponent }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class CompaniesRoutingModule {} diff --git a/src/app/companies/companies.module.ts b/src/app/companies/companies.module.ts index aeece1fe..2509466c 100644 --- a/src/app/companies/companies.module.ts +++ b/src/app/companies/companies.module.ts @@ -1,12 +1,12 @@ -import { NgModule } from "@angular/core"; +import { NgModule } from '@angular/core'; -import { CompaniesComponent } from "./companies.component"; -import { routing } from "./companies.routing"; -import { SharedModule } from "../shared.module"; -import { environment } from "../../environments/environment"; +import { CompaniesComponent } from './companies.component'; +import { CompaniesRoutingModule } from './companies-routing.module'; +import { SharedModule } from '../shared.module'; +import { environment } from '../../environments/environment'; @NgModule({ - imports: [routing, SharedModule], + imports: [CompaniesRoutingModule, SharedModule], declarations: [CompaniesComponent] }) export class CompaniesModule {} diff --git a/src/app/companies/companies.routing.ts b/src/app/companies/companies.routing.ts deleted file mode 100644 index f8990455..00000000 --- a/src/app/companies/companies.routing.ts +++ /dev/null @@ -1,10 +0,0 @@ -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); diff --git a/src/app/operators/operators-routing.module.ts b/src/app/operators/operators-routing.module.ts new file mode 100644 index 00000000..83354d0e --- /dev/null +++ b/src/app/operators/operators-routing.module.ts @@ -0,0 +1,12 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { OperatorsComponent } from './operators.component'; + +const routes: Routes = [{ path: '', component: OperatorsComponent }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class OperatorsRoutingModule {} diff --git a/src/app/operators/operators.module.ts b/src/app/operators/operators.module.ts index 908fa12e..86d8c4b9 100644 --- a/src/app/operators/operators.module.ts +++ b/src/app/operators/operators.module.ts @@ -2,25 +2,25 @@ import { NgModule, InjectionToken, CUSTOM_ELEMENTS_SCHEMA -} from "@angular/core"; -import { LayoutModule } from "@angular/cdk/layout"; -import { ClipboardModule } from "ngx-clipboard"; +} from '@angular/core'; +import { LayoutModule } from '@angular/cdk/layout'; +import { ClipboardModule } from 'ngx-clipboard'; -import { ALL_OPERATORS, OperatorDoc } from "../../operator-docs"; -import { OperatorsRoutingModule } from "./operators.routing"; -import { OperatorsComponent, OPERATORS_TOKEN } from "./operators.component"; -import { OperatorComponent } from "./components/operator/operator.component"; -import { OperatorHeaderComponent } from "./components/operator-header/operator-header.component"; -import { OperatorParametersComponent } from "./components/operator-parameters/operator-parameters.component"; -import { OperatorExamplesComponent } from "./components/operator-examples/operator-examples.component"; -import { RelatedOperatorsComponent } from "./components/related-operators/related-operators.component"; -import { OperatorExtrasComponent } from "./components/operator-extras/operator-extras.component"; -import { AdditionalResourcesComponent } from "./components/additional-resources/additional-resources.component"; -import { MarbleDiagramComponent } from "./components/marble-diagram/marble-diagram.component"; -import { WalkthroughComponent } from "./components/walkthrough/walkthrough.component"; -import { HighlightJsDirective } from "./directives/highlight-js.directive"; -import { SafeUrlPipe } from "./pipes/safe-url.pipe"; -import { SharedModule } from "../shared.module"; +import { ALL_OPERATORS, OperatorDoc } from '../../operator-docs'; +import { OperatorsRoutingModule } from './operators-routing.module'; +import { OperatorsComponent, OPERATORS_TOKEN } from './operators.component'; +import { OperatorComponent } from './components/operator/operator.component'; +import { OperatorHeaderComponent } from './components/operator-header/operator-header.component'; +import { OperatorParametersComponent } from './components/operator-parameters/operator-parameters.component'; +import { OperatorExamplesComponent } from './components/operator-examples/operator-examples.component'; +import { RelatedOperatorsComponent } from './components/related-operators/related-operators.component'; +import { OperatorExtrasComponent } from './components/operator-extras/operator-extras.component'; +import { AdditionalResourcesComponent } from './components/additional-resources/additional-resources.component'; +import { MarbleDiagramComponent } from './components/marble-diagram/marble-diagram.component'; +import { WalkthroughComponent } from './components/walkthrough/walkthrough.component'; +import { HighlightJsDirective } from './directives/highlight-js.directive'; +import { SafeUrlPipe } from './pipes/safe-url.pipe'; +import { SharedModule } from '../shared.module'; @NgModule({ declarations: [ diff --git a/src/app/operators/operators.routing.ts b/src/app/operators/operators.routing.ts deleted file mode 100644 index 5980120e..00000000 --- a/src/app/operators/operators.routing.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { OperatorsComponent } from './operators.component'; - -const routes: Routes = [ - { path: '', component: OperatorsComponent } -]; - -export const OperatorsRoutingModule: ModuleWithProviders = RouterModule.forChild(routes); diff --git a/src/app/rxjs/rxjs-routing.module.ts b/src/app/rxjs/rxjs-routing.module.ts new file mode 100644 index 00000000..3fdf4e87 --- /dev/null +++ b/src/app/rxjs/rxjs-routing.module.ts @@ -0,0 +1,12 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { RxjsComponent } from './rxjs.component'; + +const routes: Routes = [{ path: '', component: RxjsComponent }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class RxjsRoutingModule {} diff --git a/src/app/rxjs/rxjs.module.ts b/src/app/rxjs/rxjs.module.ts index 0c93ac40..bb02c110 100644 --- a/src/app/rxjs/rxjs.module.ts +++ b/src/app/rxjs/rxjs.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from "@angular/core"; +import { NgModule } from '@angular/core'; -import { RxjsComponent } from "./rxjs.component"; -import { routing } from "./rxjs.routing"; -import { SharedModule } from "../shared.module"; +import { RxjsComponent } from './rxjs.component'; +import { RxjsRoutingModule } from './rxjs-routing.module'; +import { SharedModule } from '../shared.module'; @NgModule({ - imports: [routing, SharedModule], + imports: [RxjsRoutingModule, SharedModule], declarations: [RxjsComponent] }) export class RxjsModule {} diff --git a/src/app/rxjs/rxjs.routing.ts b/src/app/rxjs/rxjs.routing.ts deleted file mode 100644 index 8604d68b..00000000 --- a/src/app/rxjs/rxjs.routing.ts +++ /dev/null @@ -1,10 +0,0 @@ -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); diff --git a/src/app/team/team-routing.module.ts b/src/app/team/team-routing.module.ts new file mode 100644 index 00000000..b55e24a8 --- /dev/null +++ b/src/app/team/team-routing.module.ts @@ -0,0 +1,12 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { TeamComponent } from './team.component'; + +const routes: Routes = [{ path: '', component: TeamComponent }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class TeamRoutingModule {} diff --git a/src/app/team/team.module.ts b/src/app/team/team.module.ts index a2268215..c1bff6bf 100644 --- a/src/app/team/team.module.ts +++ b/src/app/team/team.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from "@angular/core"; +import { NgModule } from '@angular/core'; -import { TeamComponent } from "./team.component"; -import { routing } from "./team.routing"; -import { SharedModule } from "../shared.module"; +import { TeamComponent } from './team.component'; +import { TeamRoutingModule } from './team-routing.module'; +import { SharedModule } from '../shared.module'; @NgModule({ - imports: [routing, SharedModule], + imports: [TeamRoutingModule, SharedModule], declarations: [TeamComponent] }) export class TeamModule {} diff --git a/src/app/team/team.routing.ts b/src/app/team/team.routing.ts deleted file mode 100644 index a188b823..00000000 --- a/src/app/team/team.routing.ts +++ /dev/null @@ -1,10 +0,0 @@ -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);