diff --git a/app/app.js b/app/app.js
index e050c5f..5e85a91 100644
--- a/app/app.js
+++ b/app/app.js
@@ -45,4 +45,4 @@ var AppMain = (function () {
return AppMain;
}());
exports.AppMain = AppMain;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxRQUFPLGtCQUFrQixDQUFDLENBQUE7QUFFMUIsb0JBQWtCLGtCQUFrQixDQUFDLENBQUE7QUFFckMsUUFBUTtBQUNSLDBCQUEwQiw2QkFBNkIsQ0FBQyxDQUFBO0FBQ3hELDRCQUE0QixpQ0FBaUMsQ0FBQyxDQUFBO0FBQzlELDJCQUEyQiwrQkFBK0IsQ0FBQyxDQUFBO0FBQzNELHNDQUFzQyxxREFBcUQsQ0FBQyxDQUFBO0FBQzVGLFlBQVk7QUFDWix1QkFBcUIsb0JBQW9CLENBQUMsQ0FBQTtBQVUxQyx1QkFBMEIsaUJBQWlCLENBQUMsQ0FBQTtBQUc1QyxtRUFBbUU7QUFpQm5FO0lBQ0ksaUJBQW9CLE1BQWE7UUFBYixXQUFNLEdBQU4sTUFBTSxDQUFPO1FBRTdCLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFDN0MsQ0FBQztJQXBCTDtRQUFDLFNBQUcsQ0FBQztZQUNELFFBQVEsRUFBRSxNQUFNO1lBQ2hCLFNBQVMsRUFBRSxDQUFDLGVBQU0sQ0FBQztZQUNuQixnQkFBZ0IsRUFBRSxDQUFDO29CQUNmLElBQUksRUFBRSxVQUFVO29CQUNoQixRQUFRLEVBQUUsY0FBTSxPQUFBLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLFFBQVEsRUFBekMsQ0FBeUM7aUJBQzVELENBQUM7WUFDRixVQUFVLEVBQUUsRUFBRTtTQUNqQixDQUFDO1FBRUQsb0JBQVcsQ0FBQztZQUNULEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUscUJBQVMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFO1lBQ2xELEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxTQUFTLEVBQUUseUJBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFO1lBQzdELEVBQUUsSUFBSSxFQUFFLG9CQUFvQixFQUFFLFNBQVMsRUFBRSx1QkFBVSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUU7WUFDckUsRUFBRSxJQUFJLEVBQUUsK0NBQStDLEVBQUUsU0FBUyxFQUFFLDZDQUFxQixFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRTtTQUMxSCxDQUFDOztlQUFBO0lBTUYsY0FBQztBQUFELENBQUMsQUFMRCxJQUtDO0FBTFksZUFBTyxVQUtuQixDQUFBIn0=
\ No newline at end of file
+//# sourceMappingURL=app.js.map
\ No newline at end of file
diff --git a/app/controls/nav/nav.ts b/app/controls/nav/nav.ts
index 60327ec..1072f7b 100644
--- a/app/controls/nav/nav.ts
+++ b/app/controls/nav/nav.ts
@@ -33,6 +33,11 @@ import {NxNavBack} from "./nav-back";
`,
+ // template: `
+ //
+
+ //
+ // `,
directives: [IonIcon,NavIcon, NxNavBack],
providers: [],
inputs: [ "showBack", "showMenu", "title" ],
diff --git a/app/decorators/app.ts b/app/decorators/app.ts
index cffda07..2730d85 100644
--- a/app/decorators/app.ts
+++ b/app/decorators/app.ts
@@ -87,11 +87,7 @@ export function App(config: IAppConfig) {
config.selector = 'main';
//config.template = "";
- config.template = `
-
-
-
- `;
+ config.template = ``;
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
index ffeac7a..a5eae47 100644
--- 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
index c752fcf..ce01ec7 100644
--- a/app/pages/startPage/startPage.html
+++ b/app/pages/startPage/startPage.html
@@ -2,11 +2,14 @@
-
+
+
+
+
diff --git a/hooks/before-prepare/nativescript-dev-typescript.js b/hooks/before-prepare/nativescript-dev-typescript.js
deleted file mode 100644
index 7116ebd..0000000
--- a/hooks/before-prepare/nativescript-dev-typescript.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require("nativescript-dev-typescript/lib/before-prepare.js");
diff --git a/package.json b/package.json
index e27d6bd..7d58ceb 100644
--- 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"