Skip to content
Snippets Groups Projects
Commit 01d0bb33 authored by Deborah Kurata's avatar Deborah Kurata
Browse files

Update to the RC 1 Router.

parent 296d3649
No related branches found
No related tags found
No related merge requests found
import { Component } from '@angular/core';
import { HTTP_PROVIDERS } from '@angular/http';
import 'rxjs/Rx'; // Load all features
import { ROUTER_PROVIDERS, RouteConfig, ROUTER_DIRECTIVES } from '@angular/router-deprecated';
import { ROUTER_PROVIDERS, Routes, ROUTER_DIRECTIVES } from '@angular/router';
import { ProductListComponent } from './products/product-list.component';
import { ProductService } from './products/product.service';
......@@ -16,8 +16,8 @@ import { ProductDetailComponent } from './products/product-detail.component';
<div class='container-fluid'>
<a class='navbar-brand'>{{pageTitle}}</a>
<ul class='nav navbar-nav'>
<li><a [routerLink]="['Welcome']">Home</a></li>
<li><a [routerLink]="['Products']">Product List</a></li>
<li><a [routerLink]="['/welcome']">Home</a></li>
<li><a [routerLink]="['/products']">Product List</a></li>
</ul>
</div>
</nav>
......@@ -31,10 +31,11 @@ import { ProductDetailComponent } from './products/product-detail.component';
HTTP_PROVIDERS,
ROUTER_PROVIDERS]
})
@RouteConfig([
{ path: '/welcome', name: 'Welcome', component: WelcomeComponent, useAsDefault: true },
{ path: '/products', name: 'Products', component: ProductListComponent },
{ path: '/product/:id', name: 'ProductDetail', component: ProductDetailComponent }
@Routes([
{ path: '/', component: WelcomeComponent },
{ path: '/welcome', component: WelcomeComponent },
{ path: '/products', component: ProductListComponent },
{ path: '/product/:id', component: ProductDetailComponent }
])
export class AppComponent {
pageTitle: string = 'Acme Product Management';
......
import { Component, OnInit } from '@angular/core';
import { RouteParams, Router } from '@angular/router-deprecated';
import { Component } from '@angular/core';
import { Router, OnActivate, RouteSegment } from '@angular/router';
import { IProduct } from './product';
import { ProductService } from './product.service';
......@@ -9,23 +9,19 @@ import { StarComponent } from '../shared/star.component';
templateUrl: 'app/products/product-detail.component.html',
directives: [StarComponent]
})
export class ProductDetailComponent implements OnInit {
export class ProductDetailComponent implements OnActivate {
pageTitle: string = 'Product Detail';
product: IProduct;
errorMessage: string;
constructor(private _productService: ProductService,
private _router: Router,
private _routeParams: RouteParams) {
private _router: Router) {
}
ngOnInit() {
if (!this.product) {
let id = +this._routeParams.get('id');
// this.pageTitle += `: ${id}`;
routerOnActivate(curr: RouteSegment): void {
let id = +curr.getParam('id');
this.getProduct(id);
}
}
getProduct(id: number) {
this._productService.getProduct(id)
......@@ -35,7 +31,7 @@ export class ProductDetailComponent implements OnInit {
}
onBack(): void {
this._router.navigate(['Products']);
this._router.navigate(['/products']);
}
}
......@@ -44,7 +44,7 @@
[style.width.px]='imageWidth'
[style.margin.px]='imageMargin'>
</td>
<td> <a [routerLink]="['ProductDetail',{id: product.productId}]">
<td> <a [routerLink]="['/product', product.productId]">
{{product.productName}}
</a>
</td>
......
import { Component, OnInit } from '@angular/core';
import { ROUTER_DIRECTIVES } from '@angular/router-deprecated';
import { ROUTER_DIRECTIVES } from '@angular/router';
import { IProduct } from './product';
import { ProductFilterPipe } from './product-filter.pipe';
......
......@@ -21,7 +21,6 @@
"@angular/platform-browser": "2.0.0-rc.1",
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
"@angular/router": "2.0.0-rc.1",
"@angular/router-deprecated": "2.0.0-rc.1",
"@angular/upgrade": "2.0.0-rc.1",
"systemjs": "0.19.27",
......
......@@ -24,7 +24,7 @@
'@angular/http',
'@angular/platform-browser',
'@angular/platform-browser-dynamic',
'@angular/router-deprecated'
'@angular/router'
];
// add package entries for angular packages in the form
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment