Almost working bark park

ionic/components/app/test/barkpark/index.js

@@ -7,7 +7,7 @@ import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/fo
 import {Log} from 'ionic/util'
 
 import {
-  Router, Routable, List, Item, Nav, NavController,
+  Router, Routable, List, Item, HeaderTemplate, Nav, NavController,
   Toolbar, ToolbarTitle, Button, Input, Tabs,
   Tab, Content, Aside
 } from 'ionic/ionic'
@@ -15,7 +15,7 @@ import {
 @Component()
 @View({
   templateUrl: 'pages/login.html',
-  directives: [FormDirectives, Button, Input, Content, Toolbar, ToolbarTitle]
+  directives: [FormDirectives, Button, Input, Content, Toolbar, HeaderTemplate]
 })
 export class LoginPage {
   constructor( @Parent() viewport: NavController ) {
@@ -58,9 +58,10 @@ new Routable(LoginPage, {
   directives: [FormDirectives, Button, Input]
 })
 export class SignupPage {
-  constructor( @Parent() viewport: NavController ) { //, fb: FormBuilder ) {
+  constructor( nav: NavController ) { //, fb: FormBuilder ) {
+
+    this.nav = nav
 
-    this.viewport = viewport
     Log.log('SIGNUP PAGE')
 
     var fb = new FormBuilder()
@@ -73,14 +74,14 @@ export class SignupPage {
   }
 
   doLogin(event) {
-    this.viewport.pop()
+    this.nav.pop()
   }
   doSignup(event) {
     Log.log('Doing signup')
     event.preventDefault();
     console.log(this.signupForm.value);
 
-    this.viewport.push(AppPage)
+    this.nav.push(AppPage)
     //this.viewport.push(SecondPage)
   }
 }
@@ -95,8 +96,8 @@ export class SignupPage {
   directives: [FormDirectives, Button, Input, Tabs, Tab]
 })
 export class AppPage {
-  constructor( @Parent() viewport: NavController ) { //, fb: FormBuilder ) {
-    this.viewport = viewport
+  constructor( nav: NavController ) { //, fb: FormBuilder ) {
+    this.nav = nav;
     this.streamTab = StreamTab
   }
 }
@@ -107,8 +108,8 @@ export class AppPage {
   directives: [For, Content, List, Item]
 })
 class StreamTab {
-  constructor(@Parent() nav: NavController) {
-    this.nav = viewport;
+  constructor(nav: NavController) {
+    this.nav = nav;
     this.posts = [
       {'title': 'Just barked my first bark'},
       {'title': 'Went poopy' }
@@ -130,8 +131,8 @@ class StreamTab {
   directives: [Content]
 })
 class PostDetail {
-  constructor(@Parent() nav: NavController) {
-    this.nav = viewport;
+  constructor(nav: NavController) {
+    this.nav = nav;
     this.title = 'Hello'
   }
   selectItem() {
@@ -145,7 +146,7 @@ class PostDetail {
   directives: [Content]
 })
 class SplashPage {
-  constructor(@Parent() nav: NavController) {
+  constructor(nav: NavController) {
     this.nav = nav;
     window.nav = nav;
   }
@@ -168,16 +169,6 @@ class IonicApp {
       var nav = window.nav;
 
       var route = Router;//new Router()
-
-      /*
-      route.map('login', {
-        url: '/login',
-        paramResolver(urlParts) {
-          return Login(urlParts.id);
-        }
-      })
-      */
-
       route.on('/login', (data) => {
 
         nav.push(LoginPage, null, {

ionic/components/aside/test/basic/main.html

@@ -1,5 +1,6 @@
 <ion-view>
   <ion-aside [content]="content" style="background-color: red">
+    <h2 style="color: white">LEFT</h2>
     <!--
     <ion-list inset>
       <div class="list-header">
@@ -21,16 +22,11 @@
   -->
   </ion-aside>
 
-  <ion-content #content>
-
+  <ion-content #content style="background-color: blue">
+    <h2 style="color: white">HELLO</h2>
   </ion-content>
 
-  <!--
   <ion-aside side="right" [content]="content" style="background-color: green">
-    Right!
-    <p>...</p>
-    <p>...</p>
-    <p>...</p>
+    <h2 style="color: white">RIGHT</h2>
   </ion-aside>
--->
 </ion-view>

ionic/util/util.js

@@ -33,7 +33,7 @@ export function merge(dst) {
 function _baseExtend(dst, objs, deep) {
   for (var i = 0, ii = objs.length; i < ii; ++i) {
     var obj = objs[i];
-    if (!isObject(obj) && !isFunction(obj)) continue;
+    if (!obj || !isObject(obj) && !isFunction(obj)) continue;
     var keys = Object.keys(obj);
     for (var j = 0, jj = keys.length; j < jj; j++) {
       var key = keys[j];