Skip to content
This repository was archived by the owner on Oct 1, 2018. It is now read-only.

Commit cc325cc

Browse files
btronconebtroncone
authored
Merge pull request #152 from brandonroberts/routing-modules
refactor(routes): Refactor routing into routing modules
2 parents c3e4561 + cf88cb1 commit cc325cc

15 files changed

+116
-100
lines changed

‎src/app/app-routing.module.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { ModuleWithProviders, NgModule } from '@angular/core';
2+
import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
3+
4+
export const routes: Routes = [
5+
{ path: '', loadChildren: './rxjs/rxjs.module#RxjsModule' },
6+
{
7+
path: 'operators',
8+
loadChildren: './operators/operators.module#OperatorsModule'
9+
},
10+
{ path: 'team', loadChildren: './team/team.module#TeamModule' },
11+
{
12+
path: 'companies',
13+
loadChildren: './companies/companies.module#CompaniesModule'
14+
},
15+
{ path: '**', redirectTo: '' }
16+
];
17+
18+
@NgModule({
19+
imports: [
20+
RouterModule.forRoot(routes, {
21+
preloadingStrategy: PreloadAllModules
22+
})
23+
],
24+
exports: [RouterModule]
25+
})
26+
export class AppRoutingModule {}

‎src/app/app.module.ts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { BrowserModule } from "@angular/platform-browser";
2-
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
3-
import { NgModule } from "@angular/core";
4-
import { RouterModule, PreloadAllModules } from "@angular/router";
1+
import { BrowserModule } from '@angular/platform-browser';
2+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
3+
import { NgModule } from '@angular/core';
54

6-
import { AppComponent } from "./app.component";
7-
import { RXJS_DOC_ROUTES } from "./app.routing";
8-
import { ToolbarModule } from "./toolbar/toolbar.module";
9-
import { MatSidenavModule, MatListModule } from "@angular/material";
5+
import { AppComponent } from './app.component';
6+
import { ToolbarModule } from './toolbar/toolbar.module';
7+
import { MatSidenavModule, MatListModule } from '@angular/material';
8+
import { AppRoutingModule } from './app-routing.module';
109

1110
@NgModule({
1211
declarations: [AppComponent],
@@ -16,9 +15,7 @@ import { MatSidenavModule, MatListModule } from "@angular/material";
1615
ToolbarModule,
1716
MatListModule,
1817
MatSidenavModule,
19-
RouterModule.forRoot(RXJS_DOC_ROUTES, {
20-
preloadingStrategy: PreloadAllModules
21-
})
18+
AppRoutingModule
2219
],
2320
providers: [],
2421
bootstrap: [AppComponent]

‎src/app/app.routing.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/app/companies/companies-routing.module.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { NgModule } from '@angular/core';
2+
import { Routes, RouterModule } from '@angular/router';
3+
4+
import { CompaniesComponent } from './companies.component';
5+
6+
const routes: Routes = [{ path: '', component: CompaniesComponent }];
7+
8+
@NgModule({
9+
imports: [RouterModule.forChild(routes)],
10+
exports: [RouterModule]
11+
})
12+
export class CompaniesRoutingModule {}

‎src/app/companies/companies.module.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { NgModule } from "@angular/core";
1+
import { NgModule } from '@angular/core';
22

3-
import { CompaniesComponent } from "./companies.component";
4-
import { routing } from "./companies.routing";
5-
import { SharedModule } from "../shared.module";
6-
import { environment } from "../../environments/environment";
3+
import { CompaniesComponent } from './companies.component';
4+
import { CompaniesRoutingModule } from './companies-routing.module';
5+
import { SharedModule } from '../shared.module';
6+
import { environment } from '../../environments/environment';
77

88
@NgModule({
9-
imports: [routing, SharedModule],
9+
imports: [CompaniesRoutingModule, SharedModule],
1010
declarations: [CompaniesComponent]
1111
})
1212
export class CompaniesModule {}

‎src/app/companies/companies.routing.ts‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/app/operators/operators-routing.module.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { NgModule } from '@angular/core';
2+
import { Routes, RouterModule } from '@angular/router';
3+
4+
import { OperatorsComponent } from './operators.component';
5+
6+
const routes: Routes = [{ path: '', component: OperatorsComponent }];
7+
8+
@NgModule({
9+
imports: [RouterModule.forChild(routes)],
10+
exports: [RouterModule]
11+
})
12+
export class OperatorsRoutingModule {}

‎src/app/operators/operators.module.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ import {
22
NgModule,
33
InjectionToken,
44
CUSTOM_ELEMENTS_SCHEMA
5-
} from "@angular/core";
6-
import { LayoutModule } from "@angular/cdk/layout";
7-
import { ClipboardModule } from "ngx-clipboard";
5+
} from '@angular/core';
6+
import { LayoutModule } from '@angular/cdk/layout';
7+
import { ClipboardModule } from 'ngx-clipboard';
88

9-
import { ALL_OPERATORS, OperatorDoc } from "../../operator-docs";
10-
import { OperatorsRoutingModule } from "./operators.routing";
11-
import { OperatorsComponent, OPERATORS_TOKEN } from "./operators.component";
12-
import { OperatorComponent } from "./components/operator/operator.component";
13-
import { OperatorHeaderComponent } from "./components/operator-header/operator-header.component";
14-
import { OperatorParametersComponent } from "./components/operator-parameters/operator-parameters.component";
15-
import { OperatorExamplesComponent } from "./components/operator-examples/operator-examples.component";
16-
import { RelatedOperatorsComponent } from "./components/related-operators/related-operators.component";
17-
import { OperatorExtrasComponent } from "./components/operator-extras/operator-extras.component";
18-
import { AdditionalResourcesComponent } from "./components/additional-resources/additional-resources.component";
19-
import { MarbleDiagramComponent } from "./components/marble-diagram/marble-diagram.component";
20-
import { WalkthroughComponent } from "./components/walkthrough/walkthrough.component";
21-
import { HighlightJsDirective } from "./directives/highlight-js.directive";
22-
import { SafeUrlPipe } from "./pipes/safe-url.pipe";
23-
import { SharedModule } from "../shared.module";
9+
import { ALL_OPERATORS, OperatorDoc } from '../../operator-docs';
10+
import { OperatorsRoutingModule } from './operators-routing.module';
11+
import { OperatorsComponent, OPERATORS_TOKEN } from './operators.component';
12+
import { OperatorComponent } from './components/operator/operator.component';
13+
import { OperatorHeaderComponent } from './components/operator-header/operator-header.component';
14+
import { OperatorParametersComponent } from './components/operator-parameters/operator-parameters.component';
15+
import { OperatorExamplesComponent } from './components/operator-examples/operator-examples.component';
16+
import { RelatedOperatorsComponent } from './components/related-operators/related-operators.component';
17+
import { OperatorExtrasComponent } from './components/operator-extras/operator-extras.component';
18+
import { AdditionalResourcesComponent } from './components/additional-resources/additional-resources.component';
19+
import { MarbleDiagramComponent } from './components/marble-diagram/marble-diagram.component';
20+
import { WalkthroughComponent } from './components/walkthrough/walkthrough.component';
21+
import { HighlightJsDirective } from './directives/highlight-js.directive';
22+
import { SafeUrlPipe } from './pipes/safe-url.pipe';
23+
import { SharedModule } from '../shared.module';
2424

2525
@NgModule({
2626
declarations: [

‎src/app/operators/operators.routing.ts‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/app/rxjs/rxjs-routing.module.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { NgModule } from '@angular/core';
2+
import { Routes, RouterModule } from '@angular/router';
3+
4+
import { RxjsComponent } from './rxjs.component';
5+
6+
const routes: Routes = [{ path: '', component: RxjsComponent }];
7+
8+
@NgModule({
9+
imports: [RouterModule.forChild(routes)],
10+
exports: [RouterModule]
11+
})
12+
export class RxjsRoutingModule {}

0 commit comments

Comments
 (0)