Skip to content

Commit

Permalink
insignificant changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Green committed Apr 3, 2016
1 parent d0400b8 commit 616c540
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 51 deletions.
23 changes: 23 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -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" ]

}
3 changes: 1 addition & 2 deletions app/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions app/app.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@header-baclground: #4d75b8;
@primary : #387ef5;
@minor : #548CEC
@minor : #548CEC;
@primary-background : @primary;
@primary-text: #FFF;
@default-padding : 12;
Expand Down
1 change: 0 additions & 1 deletion app/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 10 additions & 2 deletions app/controls/nav/nav.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -34,7 +36,7 @@ import {NxNavBack} from "./nav-back";
</StackLayout>
`,
// template: `
// <ActionBar>
// <ActionBar title='Hi'>

// </ActionBar>
// `,
Expand All @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions app/pages/startPage/startPage.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
<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>-->
<ActionBar>

</ActionBar>
</nx-nav>

<ScrollView>
<StackLayout class="inset">
Expand Down
6 changes: 3 additions & 3 deletions app/providers/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Response>) {
Expand Down
72 changes: 37 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
"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"
}
}

0 comments on commit 616c540

Please sign in to comment.