diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000..9db8fc6 --- /dev/null +++ b/.jshintrc @@ -0,0 +1,23 @@ +{ + "undef": true, + "nonew": true, + "curly": false, + "noarg": true, + "forin": true, + "noempty": false, + "eqeqeq": false, + "strict": false, + "bitwise": true, + "newcap": false, + "camelcase": true, + "browser": true, + "node": true, + "devel": true, + "shadow": true, + "eqnull": true, + "mocha": true, + "jasmine": true, + "qunit": true, + "predef": [ "android", "__extends", "java", "javax", "Promise" ] + +} diff --git a/app/app.css b/app/app.css index fe7863e..2e2efc7 100644 --- a/app/app.css +++ b/app/app.css @@ -1,2 +1 @@ -@minor : #548CEC -@primary-background : @primary;.icon{font-size:20;margin:3}.ion-icon{font-family:"Ionicons";font-size:26;margin-right:12;color:#4d75b8}.fa-icon{font-family:"FontAwesome"}.material-icon{font-family:'Material-Design-Iconic-Font'}.inset{padding:12}.note{font-size:14;color:#666666}Page{background-color:white;font-size:20;padding:0}label{font-size:20;color:black}button{font-size:20;background-color:#387ef5;color:#FFF}.nx-header{padding:12;padding-top:8;padding-bottom:8;border-radius:4;font-size:26;background-color:#4d75b8;color:#FFF}.nx-header-ext{background-color:#4d75b8}.nx-header-title{font-weight:bold;color:#FFF}.nx-list{margin-bottom:12}.nx-item{border-bottom-width:1;border-color:#c8c7cc;border-style:solid;padding-top:12;padding-bottom:12}.item-button{font-size:20;background-color:#c8c7cc;color:#FFF}.nx-nav-inner{margin-bottom:6;margin-top:24}.nx-nav{background-color:#387ef5}.nx-nav .ion-icon{color:#FFF}.nx-nav Label{color:#FFF}.nav-title{color:#FFF}.sidebar{border-right-width:1;border-color:#c8c7cc;border-style:solid;padding-top:12;padding-bottom:12}.active{background-color:#387ef5} \ No newline at end of file +.icon{font-size:20;margin:3}.ion-icon{font-family:"Ionicons";font-size:26;margin-right:12;color:#4d75b8}.fa-icon{font-family:"FontAwesome"}.material-icon{font-family:'Material-Design-Iconic-Font'}.inset{padding:12}.note{font-size:14;color:#666666}Page{background-color:white;font-size:20;padding:0}label{font-size:20;color:black}button{font-size:20;background-color:#387ef5;color:#FFF}.nx-header{padding:12;padding-top:8;padding-bottom:8;border-radius:4;font-size:26;background-color:#4d75b8;color:#FFF}.nx-header-ext{background-color:#4d75b8}.nx-header-title{font-weight:bold;color:#FFF}.nx-list{margin-bottom:12}.nx-item{border-bottom-width:1;border-color:#c8c7cc;border-style:solid;padding-top:12;padding-bottom:12}.item-button{font-size:20;background-color:#c8c7cc;color:#FFF}.nx-nav-inner{margin-bottom:6;margin-top:24}.nx-nav{background-color:#387ef5}.nx-nav .ion-icon{color:#FFF}.nx-nav Label{color:#FFF}.nav-title{color:#FFF}.sidebar{border-right-width:1;border-color:#c8c7cc;border-style:solid;padding-top:12;padding-bottom:12}.active{background-color:#387ef5} \ No newline at end of file diff --git a/app/app.js b/app/app.js index 5e85a91..58f834a 100644 --- a/app/app.js +++ b/app/app.js @@ -1,4 +1,3 @@ -"use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); @@ -18,6 +17,9 @@ var regionCompetitionPage_1 = require("./pages/regionCompetitionPage/regionCompe //providers var logger_1 = require("./providers/logger"); var router_1 = require("angular2/router"); +// ---- ADD THIS LINE ---- +require('nativescript-liveedit'); +// ----------------------- //app decorator - save some code writing. Wrapper around @Component var AppMain = (function () { function AppMain(logger) { @@ -43,6 +45,6 @@ var AppMain = (function () { __metadata('design:paramtypes', [logger_1.Logger]) ], AppMain); return AppMain; -}()); +})(); exports.AppMain = AppMain; //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/app/app.less b/app/app.less index e95eee4..d35465c 100644 --- a/app/app.less +++ b/app/app.less @@ -2,7 +2,7 @@ @header-baclground: #4d75b8; @primary : #387ef5; -@minor : #548CEC +@minor : #548CEC; @primary-background : @primary; @primary-text: #FFF; @default-padding : 12; diff --git a/app/app.ts b/app/app.ts index a380850..b0e2cd9 100644 --- a/app/app.ts +++ b/app/app.ts @@ -20,7 +20,6 @@ import {IonIcon} from "./controls/icons/ion-icon"; import {RouteConfig} from "angular2/router"; - //app decorator - save some code writing. Wrapper around @Component @App({ selector: "main", diff --git a/app/controls/nav/nav.ts b/app/controls/nav/nav.ts index 1072f7b..ce523a3 100644 --- a/app/controls/nav/nav.ts +++ b/app/controls/nav/nav.ts @@ -5,6 +5,8 @@ import { IonIcon,NavIcon} from "../icons/ion-icon"; import { Observable, Subscription, Subject} from 'rxjs/Rx'; import {Router, Location, Instruction} from 'angular2/router'; import {NxNavBack} from "./nav-back"; +import {Page} from "ui/page"; + @Control({ selector:"nx-nav", //create 1 row template; 3 columns; 2 for the icons on the sides @@ -34,7 +36,7 @@ import {NxNavBack} from "./nav-back"; `, // template: ` - // + // // // `, @@ -49,11 +51,17 @@ export class NxNav { public constructor( private router: Router, private location: Location, private element: ElementRef, - private logger: Logger) { + private logger: Logger, + private page : Page) { this.logger.Notify("nx-nav"); } + + ngOnInit() { + this.page.actionBarHidden = true; + this.page.actionBar.update(); + } public title : string = "Default Title"; public showBack : boolean = true; diff --git a/app/pages/startPage/startPage.html b/app/pages/startPage/startPage.html index ce01ec7..c752fcf 100644 --- a/app/pages/startPage/startPage.html +++ b/app/pages/startPage/startPage.html @@ -2,14 +2,11 @@ - - - - + diff --git a/app/providers/logger.ts b/app/providers/logger.ts index 8a15df5..666763d 100644 --- a/app/providers/logger.ts +++ b/app/providers/logger.ts @@ -62,9 +62,9 @@ export class Logger { } public NotifyObjectProperties(object: any) { - for (let item in object) { - console.log("Property: " + item); - } + // for (let item in object) { + // console.log("Property: " + item); + // } } public NotifyResponse(requestObservable: Observable) { diff --git a/package.json b/package.json index 7d58ceb..d4c35eb 100644 --- a/package.json +++ b/package.json @@ -1,36 +1,38 @@ { - "nativescript": { - "id": "whatsmyscore.breakoutdeveloper.com", - "tns-android": { - "version": "1.7.1" - } - }, - "dependencies": { - "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", - "url": "0.10.3", - "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-beta.2", - "zone.js": "0.5.15", - "font-awesome": "~4.5.0", - "ionicons": "~2.0.0", - "material-design-iconic-font": "~2.2.0", - "nativescript-cardview": "~1.0.1", - "moment": "~2.11.2" - }, - "devDependencies": { - "grunt": "0.4.5", - "grunt-contrib-clean": "0.6.0", - "grunt-contrib-copy": "0.8.0", - "grunt-shell": "1.1.2", - "grunt-ts": "5.0.0-beta.5", - "nativescript-dev-less": "0.0.9", - "nativescript-dev-typescript": "^0.3.1", - "shelljs": "^0.5.3", - "typescript": "1.8.2", - "webpack": "^1.12.9" - } -} \ No newline at end of file + "nativescript": { + "id": "whatsmyscore.breakoutdeveloper.com", + "tns-android": { + "version": "1.7.1" + } + }, + "dependencies": { + "nativescript-angular": "~0.0.38", + "nativescript-intl": "^0.0.2", + "angular2": "~2.0.0-beta.13", + "font-awesome": "~4.5.0", + "ionicons": "~2.0.0", + "material-design-iconic-font": "~2.2.0", + "moment": "~2.11.2", + "nativescript-cardview": "~1.0.1", + "parse5": "1.4.2", + "punycode": "1.3.2", + "querystring": "0.2.0", + "reflect-metadata": "0.1.2", + "rxjs": "5.0.0-beta.2", + "tns-core-modules": "^2.0.0-angular-2", + "url": "0.10.3", + "zone.js": "0.5.15" + }, + "devDependencies": { + "grunt": "0.4.5", + "grunt-contrib-clean": "0.6.0", + "grunt-contrib-copy": "0.8.0", + "grunt-shell": "1.1.2", + "grunt-ts": "5.0.0-beta.5", + "nativescript-dev-less": "0.0.9", + "nativescript-dev-typescript": "^0.3.1", + "shelljs": "^0.5.3", + "typescript": "1.8.2", + "webpack": "^1.12.9" + } +}