Merge pull request NativeScript#512 from NativeScript/raikov/router-snippets

hdeshev · web-flow · commit 5d88535f46be · 2016-10-28T11:21:01.000+03:00
Updated router documentation code snippets
diff --git a/tests/app/snippets/navigation/app.routes.ts b/tests/app/snippets/navigation/app.routes.ts
@@ -1,8 +1,9 @@
-import {FirstComponent, SecondComponent} from "./navigation-common";
 // >> router-config-all
+import { FirstComponent, SecondComponent } from "./navigation-common";
+
 export const routes = [
-    { path: "", redirectTo: "/first", pathMatch: "full", terminal: true },
+    { path: "", redirectTo: "/first", pathMatch: "full" },
     { path: "first", component: FirstComponent },
-    { path: "second", component: SecondComponent },
+    { path: "second", component: SecondComponent }
 ];
 // << router-config-all
diff --git a/tests/app/snippets/navigation/config-snippets.ts b/tests/app/snippets/navigation/config-snippets.ts
@@ -6,10 +6,10 @@ class GroceryComponent { }
 class GroceriesApp { }
 
 // >> router-config
-const routes = [
+export const routes = [
     { path: "login", component: LoginComponent },
     { path: "groceries", component: GroceryListComponent },
-    { path: "grocery/:id", component: GroceryComponent },
+    { path: "grocery/:id", component: GroceryComponent }
 ];
 // << router-config
 
@@ -29,7 +29,7 @@ export class GroceriesAppModule {}
 // >> router-bootstrap
 import { platformNativeScriptDynamic } from "nativescript-angular/platform";
 // >> (hide)
-function start_snippet() {  
+function start_snippet() {
 // << (hide)
 platformNativeScriptDynamic().bootstrapModule(GroceriesAppModule);
 // << router-bootstrap
diff --git a/tests/app/snippets/navigation/navigation-common.ts b/tests/app/snippets/navigation/navigation-common.ts
@@ -1,23 +1,25 @@
 // >> router-content-components
-import {Component} from '@angular/core';
+import { Component } from "@angular/core";
 
 @Component({
     selector: "first",
     template: `
-    <StackLayout>
-        <Label text="First component" class="title"></Label>
-        <Button text="GO TO SECOND" [nsRouterLink]="['/second']" class="link"></Button>
-    </StackLayout>`
+        <StackLayout>
+            <Label text="First component" class="title"></Label>
+            <Button text="GO TO SECOND" [nsRouterLink]="['/second']" class="link"></Button>
+        </StackLayout>
+    `
 })
 export class FirstComponent { }
 
 @Component({
     selector: "second",
     template: `
-    <StackLayout>
-        <Label text="Second component" class="title"></Label>
-        <Button text="GO TO FIRST" [nsRouterLink]="['/first']" class="link"></Button>
-    </StackLayout>`
+        <StackLayout>
+            <Label text="Second component" class="title"></Label>
+            <Button text="GO TO FIRST" [nsRouterLink]="['/first']" class="link"></Button>
+        </StackLayout>
+    `
 })
 export class SecondComponent { }
 // << router-content-components
diff --git a/tests/app/snippets/navigation/page-outlet.ts b/tests/app/snippets/navigation/page-outlet.ts
@@ -1,17 +1,18 @@
 import {TestApp, registerTestApp} from "../../tests/test-app";
 import { ApplicationRef } from '@angular/core';
+import { Router, NavigationStart, NavigationEnd } from "@angular/router";
 // >> page-outlet-example
+import { platformNativeScriptDynamic, NativeScriptModule } from "nativescript-angular/platform";
 import { Component, NgModule } from '@angular/core';
-import { platformNativeScriptDynamic } from "nativescript-angular/platform";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { Router, NavigationStart, NavigationEnd } from '@angular/router';
 import { routes } from "./app.routes";
+import { FirstComponent, SecondComponent } from "./navigation-common";
 
 @Component({
     selector: 'page-navigation-test',
     template: `<page-router-outlet></page-router-outlet>`
 })
-export class PageNavigationApp { 
+export class PageNavigationApp {
     // >> (hide)
     public startEvent: any;
     public endEvent: any;
@@ -38,8 +39,10 @@ export class PageNavigationApp {
 }
 
 @NgModule({
+    declarations: [PageNavigationApp, FirstComponent, SecondComponent],
     bootstrap: [PageNavigationApp],
     imports: [
+        NativeScriptModule,
         NativeScriptRouterModule,
         NativeScriptRouterModule.forRoot(routes)
     ]
