chore: update to alpha 29

Author: PatrickJS

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "angular2-full-app-demo",
+  "name": "angular2-authentication-sample",
   "version": "0.0.0",
   "description": "This is a sample that shows how to add authentication to an Angular 2 (ng2) app",
   "main": "",
@@ -11,17 +11,20 @@
     "type": "git",
     "url": "https://github.com/auth0/angular2-authentication-sample.git"
   },
-  "author": "Martin Gontovnikas (http://gon.to) <martin@gon.to>",
+  "contributors": [
+    "Martin Gontovnikas (http://gon.to) <martin@gon.to>",
+    "PatrickJS <github@gdi2290.com>"
+  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/auth0/angular2-authentication-sample/issues"
   },
   "homepage": "https://github.com/auth0/angular2-authentication-sample",
   "dependencies": {
-    "angular2": "2.0.0-alpha.26",
+    "angular2": "2.0.0-alpha.29",
     "raw-loader": "^0.5.1",
     "reflect-metadata": "^0.1.0",
-    "rtts_assert": "2.0.0-alpha.26",
+    "rtts_assert": "2.0.0-alpha.29",
     "rx": "^2.5.3",
     "zone.js": "^0.5.0",
     "bootstrap": "~3.3.4",

src/app/LoggedInOutlet.ts

@@ -3,29 +3,27 @@ import {Router, RouterOutlet} from 'angular2/router';
 import {Injector} from 'angular2/di';
 import {Login} from '../login/login';
 
-@Directive({selector: 'router-outlet'})
+@Directive({
+  selector: 'router-outlet'
+})
 export class LoggedInRouterOutlet extends RouterOutlet {
   publicRoutes: any
-  constructor(
-    elementRef: ElementRef,
-    _loader: DynamicComponentLoader,
-    _parentRouter: Router,
-    _injector: Injector,
-    @Attribute('name') nameAttr: string) {
+  constructor(public _elementRef: ElementRef, public _loader: DynamicComponentLoader,
+              public _parentRouter: Router, @Attribute('name') nameAttr: string) {
+      super(_elementRef, _loader, _parentRouter, nameAttr);
 
       this.publicRoutes = {
         '/login': true,
         '/signup': true
       };
 
-      super(elementRef, _loader, _parentRouter, _injector, nameAttr);
   }
 
   activate(instruction) {
     var url = this._parentRouter.lastNavigationAttempt;
     if (!this.publicRoutes[url] && !localStorage.getItem('jwt')) {
       instruction.component = Login;
     }
-    super.activate(instruction);
+    return super.activate(instruction);
   }
 }

src/app/app.html

@@ -1,2 +1 @@
-<router-outlet>
-</router-outlet>
+<router-outlet></router-outlet>

src/app/app.ts

@@ -1,12 +1,11 @@
 /// <reference path="../../typings/tsd.d.ts" />
 
 import {View, Component} from 'angular2/angular2';
+import {Location, RouteConfig, RouterLink, Router} from 'angular2/router';
+import {LoggedInRouterOutlet} from './LoggedInOutlet';
 import {Home} from '../home/home';
 import {Login} from '../login/login';
 import {Signup} from '../signup/signup';
-import {RouteConfig, RouterOutlet, RouterLink, Router} from 'angular2/router';
-import {BrowserLocation} from 'angular2/src/router/browser_location';
-import {LoggedInRouterOutlet} from './LoggedInOutlet';
 
 let template = require('./app.html');
 
@@ -15,33 +14,16 @@ let template = require('./app.html');
   selector: 'auth-app'
 })
 @View({
-  template:`${template}`,
-  directives: [LoggedInRouterOutlet]
+  template: template,
+  directives: [ LoggedInRouterOutlet ]
 })
 @RouteConfig([
-  { path: '/home',          as: 'home',      component: Home },
-  { path: '/login',     as: 'login', component: Login },
-  { path: '/signup',    as: 'signup',      component: Signup }
+  { path: '/',       redirectTo: '/home' },
+  { path: '/home',   as: 'home',   component: Home },
+  { path: '/login',  as: 'login',  component: Login },
+  { path: '/signup', as: 'signup', component: Signup }
 ])
 export class App {
-  router: Router;
-  constructor(router: Router, browserLocation: BrowserLocation) {
-    // we need to manually go to the correct uri until the router is fixed
-    this.router = router;
-    let uri = browserLocation.path();
-    if (uri === '' || uri === '/') {
-      router.navigate('/home');
-    } else {
-      router.navigate(uri);
-    }
-  }
-
-  goTo(event, url) {
-    event.preventDefault();
-    this.router.navigate(url).then(() => {
-      console.log("Router successfully to", url);
-    }, () => {
-      console.log("Error going to URL", url);
-    });
+  constructor(public router: Router) {
   }
 }

src/common/formInjectables.ts

@@ -13,18 +13,17 @@ let template = require('./home.html');
   selector: 'home'
 })
 @View({
-  template:`<style>${styles}</style>\n${template}`,
-  directives: [coreDirectives]
+  styles: [ styles ],
+  template: template,
+  directives: [ coreDirectives ]
 })
 export class Home {
   jwt: string;
   decodedJwt: string;
-  router: Router;
   response: string;
   api: string;
 
-  constructor(router: Router) {
-    this.router = router;
+  constructor(public router: Router) {
     this.jwt = localStorage.getItem('jwt');
     this.decodedJwt = this.jwt && window.jwt_decode(this.jwt);
   }

src/home/home.ts

@@ -1,17 +1,18 @@
 /// <reference path="../typings/tsd.d.ts" />
 
-import {routerInjectables} from 'angular2/router';
-import {formInjectables} from './common/formInjectables';
 import { bootstrap } from 'angular2/angular2';
 import { bind } from 'angular2/di';
-import { PipeRegistry } from 'angular2/change_detection';
+import { routerInjectables } from 'angular2/router';
+import { formInjectables } from 'angular2/forms';
+import { httpInjectables } from 'angular2/http';
 
 import { App } from './app/app';
 
 bootstrap(
   App,
   [
     formInjectables,
-    routerInjectables
+    routerInjectables,
+    httpInjectables
   ]
 );

src/index.ts

@@ -13,7 +13,8 @@ let template = require('./login.html');
   selector: 'login'
 })
 @View({
-  template:`<style>${styles}</style>\n${template}`,
+  styles: [ styles ],
+  template: template,
   directives: [RouterLink]
 })
 export class Login {

src/login/login.ts

@@ -12,15 +12,12 @@ let template = require('./signup.html');
   selector: 'signup'
 })
 @View({
-  directives: [RouterLink, coreDirectives],
-  template:`<style>${styles}</style>\n${template}`
-
+  directives: [ RouterLink, coreDirectives ],
+  styles: [ styles ],
+  template: template
 })
 export class Signup {
-  router: Router;
-
-  constructor(router: Router) {
-    this.router = router;
+  constructor(public router: Router) {
   }
 
   signup(event, username, password) {