fix region page; other dependencies

matt4446 · Apr 1, 2016 · d0400b8 · d0400b8
1 parent 6d6b1c6
commit d0400b8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/app/app.js b/app/app.js
diff --git a/app/controls/nav/nav.ts b/app/controls/nav/nav.ts
@@ -33,6 +33,11 @@ import {NxNavBack} from "./nav-back";
             </Border>
         </StackLayout>
     `,
+    // template: `
+    // <ActionBar>
+
+    // </ActionBar>
+    // `,
     directives: [IonIcon,NavIcon, NxNavBack],
     providers: [],
     inputs: [ "showBack", "showMenu", "title" ],

diff --git a/app/decorators/app.ts b/app/decorators/app.ts
@@ -87,11 +87,7 @@ export function App(config: IAppConfig) {
 
         config.selector = 'main';
         //config.template = "<nav></nav><router-outlet></router-outlet>";
-        config.template = `
-            <StackLayout>
-                <page-router-outlet></page-router-outlet>
-            </StackLayout>
-        `;
+        config.template = `<page-router-outlet></page-router-outlet>`;
 
         config.providers = config.providers ? config.providers.concat(NS_ROUTER_PROVIDERS, HTTP_PROVIDERS) : [NS_ROUTER_PROVIDERS, HTTP_PROVIDERS];
 
@@ -106,7 +102,7 @@ export function App(config: IAppConfig) {
             let page: Page = injector.get(Page);
             let router: LocationStrategy = injector.get(LocationStrategy);
             //router.
-            page.actionBarHidden = true;
+            //page.actionBarHidden = true;
             //page.
         });
 

diff --git a/app/pages/regionsPage/regionsPage.ts b/app/pages/regionsPage/regionsPage.ts
@@ -26,12 +26,10 @@ import {ActionItem} from "ui/action-bar";
 export class RegionsPage 
 {
     constructor(
-
         private http: Http,
         private logger: Logger, 
         private router: Router,
-        private regions: ProviderService,
-        private page: Page)
+        private regions: ProviderService)
     {
 
         this.logger.Notify("Regions page started");

diff --git a/app/pages/startPage/startPage.html b/app/pages/startPage/startPage.html
@@ -2,11 +2,14 @@
 <nx-drawer>
     <start-nav drawer-aside-left></start-nav>
 
-    <nx-nav>
+    <!--<nx-nav>
         <label class="nx-header-title" [text]="'Whats my Score' | Title" style="horizontal-align:center"></label>
         
         <ion-icon nav-right nav="true" icon="ion-android-favorite"></ion-icon>
-    </nx-nav>
+    </nx-nav>-->
+    <ActionBar>
+
+    </ActionBar>
 
     <ScrollView>
         <StackLayout class="inset">

diff --git a/hooks/before-prepare/nativescript-dev-typescript.js b/hooks/before-prepare/nativescript-dev-typescript.js
diff --git a/package.json b/package.json
@@ -6,9 +6,8 @@
 		}
 	},
 	"dependencies": {
-		"tns-core-modules": "~1.7.1",
-		"nativescript-angular": "~0.0.37",
-		"angular2": "2.0.0-beta.9",
+		"tns-core-modules": "^2.0.0-angular-2",
+		"nativescript-intl": "^0.0.2",
 		"parse5": "1.4.2",
 		"punycode": "1.3.2",
 		"querystring": "0.2.0",
@@ -29,7 +28,7 @@
 		"grunt-shell": "1.1.2",
 		"grunt-ts": "5.0.0-beta.5",
 		"nativescript-dev-less": "0.0.9",
-		"nativescript-dev-typescript": "~0.2.3",
+		"nativescript-dev-typescript": "^0.3.1",
 		"shelljs": "^0.5.3",
 		"typescript": "1.8.2",
 		"webpack": "^1.12.9"