From 4bd12d29e4561b35c052310fb93e1cd56e96850e Mon Sep 17 00:00:00 2001 From: Steve Van Opstal Date: Sat, 27 Aug 2016 13:31:48 +0200 Subject: [PATCH] feat(boot): use modules --- src/client/app.routes.ts | 6 ++---- src/client/boot.ts | 16 ++++++---------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/client/app.routes.ts b/src/client/app.routes.ts index 642c464..9c3ed62 100644 --- a/src/client/app.routes.ts +++ b/src/client/app.routes.ts @@ -1,15 +1,13 @@ -import {provideRouter, RouterConfig} from '@angular/router'; +import {Routes} from '@angular/router'; import {BuildComponent} from './build/build.component'; import {ChampionsComponent} from './champions/champions.component'; import {FeaturesComponent} from './features/features.component'; import {RegionsComponent} from './region/region.component'; -export const routes: RouterConfig = [ +export const ROUTES: Routes = [ {path: ':region/:champion/summoner/:summoner', component: BuildComponent}, {path: ':region/:champion/build', component: BuildComponent}, {path: ':region/:champion', component: FeaturesComponent}, {path: ':region', component: ChampionsComponent}, {path: '', component: RegionsComponent} ]; - -export const APP_ROUTER_PROVIDERS = [provideRouter(routes)]; diff --git a/src/client/boot.ts b/src/client/boot.ts index 49a3de1..4ec47b8 100644 --- a/src/client/boot.ts +++ b/src/client/boot.ts @@ -19,14 +19,13 @@ */ import {enableProdMode, NgModule} from '@angular/core'; -import {HTTP_BINDINGS} from '@angular/http'; +import {HttpModule} from '@angular/http'; import {BrowserModule} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {ROUTER_DIRECTIVES} from '@angular/router'; +import {RouterModule} from '@angular/router'; import {AppComponent} from './app.component'; -import {APP_ROUTER_PROVIDERS} from './app.routes'; - +import {ROUTES} from './app.routes'; import {BuildComponent} from './build/build.component'; import {ChampionsComponent} from './champions/champions.component'; import {FeaturesComponent} from './features/features.component'; @@ -37,12 +36,9 @@ if (ENV === 'production') { } @NgModule({ - declarations: [ - ROUTER_DIRECTIVES, AppComponent, BuildComponent, ChampionsComponent, FeaturesComponent, - RegionsComponent - ], - imports: [BrowserModule], - providers: [APP_ROUTER_PROVIDERS, HTTP_BINDINGS], + declarations: + [AppComponent, BuildComponent, ChampionsComponent, FeaturesComponent, RegionsComponent], + imports: [BrowserModule, RouterModule.forRoot(ROUTES), HttpModule], bootstrap: [AppComponent] }) class AppModule {