upgrades and small ts changes

app/controls/card/card.control.ts

@@ -1,10 +1,9 @@
-import { Component, ViewChild, ElementRef } from "@angular/core";
+import { Component, ElementRef, ViewChild } from "@angular/core";
+import { Observable, Subject, Subscription } from 'rxjs/Rx';
+
+import { CardView } from "nativescript-cardview";
 import { Logger } from "../../providers/logger";
-import { CardView } from "cardview";
 import { registerElement } from "nativescript-angular/element-registry";
-import { Observable, Subscription, Subject} from 'rxjs/Rx';
-
-//import { Color } from "color";
 
 registerElement("CardView", () => {
     console.log("Adding CardView");

app/controls/content/content.control.ts

@@ -15,11 +15,8 @@ import {
 import { NxPullToRefresh, NxPullToRefreshAnimateElement } from '../pullToRefresh/pullToRefresh.control';
 import { Observable, Subject, Subscription } from 'rxjs/Rx';
 
-import { AnimationPromise } from "ui/animation";
-import { Button } from "ui/button";
 import { Logger } from "../../providers/logger";
 import { PullToRefresh } from "nativescript-pulltorefresh";
-import { StackLayout } from "ui/layouts/stack-layout";
 
 @Component({
     selector:"nx-content",
@@ -59,7 +56,7 @@ export class NxContent implements OnInit, AfterViewInit {
     @Input()
     public refreshComplete : boolean = true;
 
-    private transition: AnimationPromise = null; 
+    //private transition: AnimationPromise = null; 
 
     private refreshPage(args){      
         this.logger.Notify("content restart ->"); 

app/controls/searchList/searchList.ts

@@ -1,9 +1,12 @@
-import { Component, Input , Output,EventEmitter } from "@angular/core";
-import { Logger} from "../../providers/logger";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+
+import { Logger } from "../../providers/logger";
 import { Observable } from "data/observable";
-//var observable = require("data/observable");
 import { SearchBar } from "ui/search-bar"
 
+//var observable = require("data/observable");
+
+
 
 @Component({
     selector: "search-list",
@@ -18,7 +21,7 @@ export class SearchList {
         this.logger.Notify("SearchList control Started");
 
         var searchBar = new SearchBar();
-        SearchBar.textProperty
+
     }
 
     //@Input() 

app/pages/competition/information/information.page.ts

@@ -1,16 +1,15 @@
 import {AppRoutingService} from "../../../context/router.context";
 import {ClubService} from "../../../providers/leagues/clubService";
-import {CompetitionCache} from '../../../providers/leagues/competitionCache';
+import {CompetitionCache} from "../../../providers/leagues/competitionCache";
 import {CompetitionNav} from "../../nav/competition.nav";
 import {CompetitionService} from "../../../providers/leagues/competitionService";
-import {Component} from '@angular/core';
+import {Component} from "@angular/core";
 import {GradeService} from "../../../providers/leagues/gradeService";
 import {ICompetition} from "../../../models/models";
 import {Logger} from "../../../providers/logger";
 
 @Component({
     selector: "grade-list-page",
-    templateUrl: "pages/competition/information/page.html",
     template: `
         <nx-drawer>
             <competition-nav drawer-aside-left></competition-nav>

app/pages/pages.ref.ts

@@ -1,6 +1,6 @@
 export { StatsPage } from "./competition/stats/stats.page";
-export { TestPage } from "./test/test.page";
-export { ParallaxTestPage } from "./test/parallax.page";
+// export { TestPage } from "./test/test.page";
+// export { ParallaxTestPage } from "./test/parallax.page";
 export { StartPage } from "./start/start.page";
 export { StartListSearchControl } from "./start/start.list.search.control";
 export { StartListControl} from "./start/stat.list.start.control";

app/vendor-platform.android.ts

@@ -0,0 +1,3 @@
+require("application");
+require("ui/frame");
+require("ui/frame/activity");

app/vendor.ts

@@ -0,0 +1,13 @@
+require("./vendor-platform");
+
+require("reflect-metadata");
+require("@angular/platform-browser");
+require("@angular/core");
+require("@angular/common");
+require("@angular/forms");
+require("@angular/http");
+require("@angular/router");
+
+require("nativescript-angular/platform-static");
+require("nativescript-angular/forms");
+require("nativescript-angular/router");

package.json

@@ -2,43 +2,71 @@
   "nativescript": {
     "id": "whatsmyscore.breakoutdeveloper.com",
     "tns-android": {
-      "version": "2.5.0"
+      "version": "3.0.0"
+    },
+    "tns-ios": {
+      "version": "3.0.0"
     }
   },
+  "scripts": {
+    "tslint": "tslint \"app/**/*.ts\"",
+    "ns-bundle": "ns-bundle",
+    "start-android-bundle": "npm run ns-bundle --android --start-app",
+    "start-ios-bundle": "npm run ns-bundle --ios --start-app",
+    "build-android-bundle": "npm run ns-bundle --android --build-app",
+    "build-ios-bundle": "npm run ns-bundle --ios --build-app"
+  },
   "dependencies": {
-    "@angular/common": "2.4.3",
-    "@angular/compiler": "2.4.3",
-    "@angular/core": "2.4.3",
-    "@angular/forms": "2.4.3",
-    "@angular/http": "2.4.3",
-    "@angular/platform-browser": "2.4.3",
-    "@angular/platform-browser-dynamic": "2.4.3",
-    "@angular/router": "3.4.3",
+    "@angular/common": "~4.1.0",
+    "@angular/compiler": "~4.1.0",
+    "@angular/core": "~4.1.0",
+    "@angular/forms": "~4.1.0",
+    "@angular/http": "~4.1.0",
+    "@angular/platform-browser": "~4.1.0",
+    "@angular/router": "~4.1.0",
     "ionicons": "~2.0.0",
     "lodash": "^4.13.1",
-    "moment": "~2.11.2",
-    "nativescript-angular": "1.4.0",
-    "nativescript-cardview": "1.0.1",
+    "moment": "~2.18.1",
+    "nativescript-angular": "~3.0.0",
+    "nativescript-cardview": "^2.0.0-rc.0",
     "nativescript-enumerable": "~3.3.7",
-    "nativescript-floatingactionbutton": "~2.2.4",
-    "nativescript-pulltorefresh": "~1.1.4",
-    "nativescript-telerik-ui": "~1.6.1",
-    "nativescript-theme-core": "^1.0.2",
-    "nativescript-videoplayer": "~0.2.0",
+    "nativescript-fancyalert": "^1.1.2",
+    "nativescript-floatingactionbutton": "^3.0.0",
+    "nativescript-pulltorefresh": "^2.0.0-rc.1",
+    "nativescript-social-share": "~1.3.2",
+    "nativescript-telerik-ui": "~2.0.1",
+    "nativescript-theme-core": "~1.0.2",
+    "nativescript-videoplayer": "^3.0.5",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~5.0.1",
-    "tns-core-modules": "^2.5.1",
-    "underscore": "~1.8.3"
+    "rxjs": "^5.3.1",
+    "tns-core-modules": "^3.0.0",
+    "underscore": "~1.8.3",
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "babel-traverse": "6.4.5",
-    "babel-types": "6.4.5",
-    "babylon": "6.4.5",
+    "@types/lodash": "~4.14.64",
+    "@angular/compiler-cli": "~4.1.0",
+    "@ngtools/webpack": "1.3.1",
+    "babel-traverse": "6.24.1",
+    "babel-types": "6.24.1",
+    "babylon": "6.17.0",
+    "codelyzer": "^3.0.1",
+    "copy-webpack-plugin": "~4.0.1",
+    "extract-text-webpack-plugin": "~2.1.0",
+    "filewalker": "^0.1.3",
+    "jasmine-core": "^2.6.1",
+    "karma": "^1.7.0",
+    "karma-jasmine": "^1.0.2",
+    "karma-nativescript-launcher": "^0.4.0",
     "lazy": "1.0.11",
-    "nativescript-dev-android-snapshot": "^0.*.*",
-    "nativescript-dev-sass": "^0.4.2",
-    "nativescript-dev-typescript": "^0.3.5",
-    "typescript": "~2.1.0",
-    "zone.js": "~0.7.2"
+    "nativescript-css-loader": "~0.26.0",
+    "nativescript-dev-typescript": "^0.4.2",
+    "nativescript-dev-webpack": "^0.5.0",
+    "raw-loader": "~0.5.1",
+    "resolve-url-loader": "~2.0.2",
+    "tslint": "^5.2.0",
+    "typescript": "~2.3.2",
+    "webpack": "~2.5.1",
+    "webpack-sources": "~0.2.3"
   }
 }

references.d.ts

@@ -1,2 +1,2 @@
 /// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
-/// <reference path="./node_modules/nativescript-cardview/cardview.d.ts" />
+/// <reference path="./node_modules/nativescript-cardview/index.d.ts" />

tsconfig.aot.json

@@ -0,0 +1,40 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "application": ["node_modules/tns-core-modules/application"],
+      "application-settings": ["node_modules/tns-core-modules/application-settings"],
+      "camera": ["node_modules/tns-core-modules/camera"],
+      "color": ["node_modules/tns-core-modules/color"],
+      "connectivity": ["node_modules/tns-core-modules/connectivity"],
+      "console": ["node_modules/tns-core-modules/console"],
+      "data/*": ["node_modules/tns-core-modules/data/*"],
+      "fetch": ["node_modules/tns-core-modules/fetch"],
+      "file-system": ["node_modules/tns-core-modules/file-system"],
+      "fps-meter": ["node_modules/tns-core-modules/fps-meter"],
+      "globals": ["node_modules/tns-core-modules/globals"],
+      "http": ["node_modules/tns-core-modules/http"],
+      "image-asset": ["node_modules/tns-core-modules/image-asset"],
+      "image-source": ["node_modules/tns-core-modules/image-source"],
+      "location": ["node_modules/tns-core-modules/location"],
+      "platform": ["node_modules/tns-core-modules/platform"],
+      "text": ["node_modules/tns-core-modules/text"],
+      "timer": ["node_modules/tns-core-modules/timer"],
+      "trace": ["node_modules/tns-core-modules/trace"],
+      "ui/*": ["node_modules/tns-core-modules/ui/*"],
+      "utils/*": ["node_modules/tns-core-modules/utils/*"],
+      "xhr": ["node_modules/tns-core-modules/xhr"],
+      "xml": ["node_modules/tns-core-modules/xml"]
+    },
+    "skipLibCheck": true
+  },
+  "exclude": [
+    "node_modules",
+    "platforms"
+  ],
+  "angularCompilerOptions": {
+    "skipMetadataEmit": true,
+    "genDir": "./"
+  }
+}