Merge pull request #17 from gdi2290/ts

mgonto · mgonto · commit ec45a9411a40 · 2015-06-09T13:36:12.000-07:00
fix(app): types yo
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,5 @@ dist
 public/__build__/**
 .webpack.json
 
+
+build/
diff --git a/index.html b/index.html
@@ -18,9 +18,9 @@
 </head>
 <body>
 
-  <app>
+  <auth-app>
     Loading...
-  </app>
+  </auth-app>
 
   <!-- Commmon files to be cached -->
   <script src="/build/common.js"></script>
diff --git a/src/app/LoggedInOutlet.ts b/src/app/LoggedInOutlet.ts
@@ -1,21 +1,27 @@
-import {Directive} from 'angular2/angular2';
-import {RouterOutlet} from 'angular2/router';
+import {Directive, Attribute, ElementRef, DynamicComponentLoader} from 'angular2/angular2';
+import {Router, RouterOutlet} from 'angular2/router';
+import {Injector} from 'angular2/di';
 import {Login} from '../login/login';
 
 @Directive({selector: 'loggedin-router-outlet'})
 export class LoggedInOutlet extends RouterOutlet {
-  publicRoutes: any;
+  publicRoutes: any
+  constructor(
+    elementRef: ElementRef,
+    _loader: DynamicComponentLoader,
+    _parentRouter: Router,
+    _injector: Injector,
+    @Attribute('name') nameAttr: string) {
 
-  constructor(viewContainer, loader, router, injector, name) {
-    super(viewContainer, loader, router, injector, name);
+    super(elementRef, _loader, _parentRouter, _injector, nameAttr);
     this.publicRoutes = {
       '/login': true,
       '/signup': true
     }
   }
 
   canActivate(instruction) {
-    var url = this._router.lastNavigationAttempt;
+    var url = this._parentRouter.lastNavigationAttempt;
     if (!this.publicRoutes[url] && !localStorage.getItem('jwt')) {
       instruction.component = Login;
     }
diff --git a/src/home/home.html b/src/home/home.html
@@ -1,14 +1,14 @@
 <div class="home">
   <div class="jumbotron centered">
     <h1>Welcome to the angular2 authentication sample!</h1>
-    <h2 *if="jwt">Your JWT is:</h2>
-    <pre *if="jwt" class="jwt"><code>{{ jwt }}</code></pre>
-    <pre *if="jwt" class="jwt"><code>{{ decodedJwt | json }}</code></pre>
+    <h2 *ng-if="jwt">Your JWT is:</h2>
+    <pre *ng-if="jwt" class="jwt"><code>{{ jwt }}</code></pre>
+    <pre *ng-if="jwt" class="jwt"><code>{{ decodedJwt | json }}</code></pre>
     <p>Click any of the buttons to call an API and get a response</p>
     <p><a class="btn btn-primary btn-lg" role="button" (click)="callAnonymousApi()">Call Anonymous API</a></p>
     <p><a class="btn btn-primary btn-lg" role="button" (click)="callSecuredApi()">Call Secure API</a></p>
     <p><a class="btn btn-primary btn-lg" role="button" (click)="logout()">Logout</a></p>
-    <h2 *if="response">The response of calling the <span class="red">{{api}}</span> API is:</h2>
-    <h3 *if="response">{{response}}</h3>
+    <h2 *ng-if="response">The response of calling the <span class="red">{{api}}</span> API is:</h2>
+    <h3 *ng-if="response">{{response}}</h3>
   </div>
 </div>
diff --git a/src/index.ts b/src/index.ts
@@ -8,14 +8,12 @@ import { bind } from 'angular2/di';
 import { PipeRegistry } from 'angular2/change_detection';
 
 import { App } from './app/app';
-import { pipes } from './utils/pipes/pipes';
 
 bootstrap(
   App,
   [
     shadowDomInjectables,
     formInjectables,
-    routerInjectables,
-    bind(PipeRegistry).toValue(new PipeRegistry(pipes))
+    routerInjectables
   ]
 );
diff --git a/typings/_custom/ng2.d.ts b/typings/_custom/ng2.d.ts
@@ -129,6 +129,16 @@ declare module "angular2/src/router/location" {
 declare module "angular2/router" {
   class Instruction {}
   class Router {
+    _registry: any;
+    _pipeline: any;
+    parent: any;
+    hostComponent: any;
+    navigating: boolean;
+    lastNavigationAttempt: string;
+    previousUrl: string;
+    _currentInstruction: any;
+    _outlets: any;
+    _subject: any;
     navigate(url: string): Promise<any>;
     config(config: any): Promise<any>;
     deactivate(): Promise<any>;
@@ -141,10 +151,23 @@ declare module "angular2/router" {
     parent: Router;
   }
   class RouterOutlet {
-    _router: Router;
+    constructor(elementRef: any, _loader: any, _parentRouter: any, _injector: any, nameAttr: any)
+    _loader: any;
+    _parentRouter: any;
+    _injector: any;
+    _childRouter: any;
+    _componentRef: any;
+    _elementRef: any;
+    _currentInstruction: any;
+    /**
+     * Given an instruction, update the contents of this viewport.
+     */
+    activate(instruction: any): any;
+    deactivate(): any;
+    canDeactivate(instruction: any): any;
   }
+  class RouteParams {}
   var RouterLink: any;
-  var RouteParams: any;
   var routerInjectables: any;
   var RouteConfigAnnotation: any;
   var RouteConfig: any;

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,12 @@ import { bind } from 'angular2/di';`
`8`	`8`	`import { PipeRegistry } from 'angular2/change_detection';`
`9`	`9`
`10`	`10`	`import { App } from './app/app';`
`11`		`-import { pipes } from './utils/pipes/pipes';`
`12`	`11`
`13`	`12`	`bootstrap(`
`14`	`13`	`App,`
`15`	`14`	`[`
`16`	`15`	`shadowDomInjectables,`
`17`	`16`	`formInjectables,`
`18`		`- routerInjectables,`
`19`		`- bind(PipeRegistry).toValue(new PipeRegistry(pipes))`
	`17`	`+ routerInjectables`
`20`	`18`	`]`
`21`	`19`	`);`