diff --git a/ionic/components/app/test/barkpark/index.js b/ionic/components/app/test/barkpark/index.js index a3fb14a4d3..393327d21e 100644 --- a/ionic/components/app/test/barkpark/index.js +++ b/ionic/components/app/test/barkpark/index.js @@ -8,7 +8,7 @@ import {Log} from 'ionic/util' import { Router, Routable, List, Item, HeaderTemplate, Nav, NavController, - Toolbar, ToolbarTitle, Button, Input, Tabs, + Toolbar, Button, Input, Tabs, Tab, Content, Aside } from 'ionic/ionic' @@ -143,13 +143,16 @@ class PostDetail { @Component() @View({ templateUrl: 'pages/splash.html', - directives: [Content] + directives: [Content, Button] }) class SplashPage { constructor(nav: NavController) { this.nav = nav; window.nav = nav; } + doLogin() { + this.nav.push(LoginPage); + } } @@ -165,15 +168,13 @@ class IonicApp { constructor() { this.firstPage = SplashPage//AppPage//LoginPage + /* setTimeout(() => { var nav = window.nav; var route = Router;//new Router() route.on('/login', (data) => { - - nav.push(LoginPage, null, { - animate: false - }) + nav.push(LoginPage); }) @@ -185,6 +186,7 @@ class IonicApp { route.otherwise('/login'); }, 200); + */ } } diff --git a/ionic/components/app/test/barkpark/pages/login.html b/ionic/components/app/test/barkpark/pages/login.html index a3ff8de4f5..f64c937bb1 100644 --- a/ionic/components/app/test/barkpark/pages/login.html +++ b/ionic/components/app/test/barkpark/pages/login.html @@ -1,7 +1,7 @@ -
-

+ + Login -

+
diff --git a/ionic/components/app/test/barkpark/pages/splash.html b/ionic/components/app/test/barkpark/pages/splash.html index 20ebd4b810..bdeab6e013 100644 --- a/ionic/components/app/test/barkpark/pages/splash.html +++ b/ionic/components/app/test/barkpark/pages/splash.html @@ -1,3 +1,4 @@

BARK PARK

+