updating application to run on latest

Author: aaronksaunders

package.json

@@ -1,28 +1,37 @@
 {
-  "name": "ionic-hello-world",
+  "name": "ionicRel2-angularfire2",
   "author": "Ionic Framework",
   "homepage": "http://ionicframework.com/",
   "private": true,
   "scripts": {
-    "build": "ionic-app-scripts build --dev",
-    "watch": "ionic-app-scripts watch",
-    "serve:before": "watch",
-    "emulate:before": "build",
-    "deploy:before": "build",
-    "build:before": "build",
-    "run:before": "build"
+    "clean": "ionic-app-scripts clean",
+    "build": "ionic-app-scripts build",
+    "ionic:build": "ionic-app-scripts build",
+    "ionic:serve": "ionic-app-scripts serve"
   },
   "dependencies": {
-    "@ionic/storage": "^1.0.3",
-    "angularfire2": "2.0.0-beta.5",
-    "firebase": "3.4.1",
-    "ionic-angular": "^2.0.0-rc.0",
-    "ionic-native": "^2.0.3",
-    "ionicons": "^3.0.0"
+    "@angular/common": "2.2.1",
+    "@angular/compiler": "2.2.1",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
+    "@angular/forms": "2.2.1",
+    "@angular/http": "2.2.1",
+    "@angular/platform-browser": "2.2.1",
+    "@angular/platform-browser-dynamic": "2.2.1",
+    "@angular/platform-server": "2.2.1",
+    "@ionic/storage": "1.1.7",
+    "angularfire2": "^2.0.0-beta.7",
+    "firebase": "^3.6.6",
+    "ionic-angular": "2.0.0-rc.5",
+    "ionic-native": "2.2.11",
+    "ionicons": "3.0.0",
+    "rxjs": "5.0.0-beta.12",
+    "sw-toolbox": "3.4.0",
+    "zone.js": "0.6.26"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "^0.0.23",
-    "typescript": "^2.0.3"
+    "@ionic/app-scripts": "1.0.0",
+    "typescript": "2.0.9"
   },
   "cordovaPlugins": [
     "cordova-plugin-device",

src/app/app.component.ts

@@ -1,12 +1,12 @@
 import { Component } from '@angular/core';
 import { Platform } from 'ionic-angular';
-import { StatusBar } from 'ionic-native';
+import { StatusBar, Splashscreen } from 'ionic-native';
 
 import { HomePage } from '../pages/home/home';
 
 
 @Component({
-  template: `<ion-nav [root]="rootPage"></ion-nav>`
+  templateUrl: 'app.html'
 })
 export class MyApp {
   rootPage = HomePage;
@@ -16,6 +16,7 @@ export class MyApp {
       // Okay, so the platform is ready and our plugins are available.
       // Here you can do any higher level native things you might need.
       StatusBar.styleDefault();
+      Splashscreen.hide();
     });
   }
-}
+}

src/app/app.html

@@ -0,0 +1 @@
+<ion-nav [root]="rootPage"></ion-nav>

src/app/app.module.ts

@@ -1,7 +1,5 @@
-import { BrowserModule } from '@angular/platform-browser';
-
-import { NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from 'ionic-angular';
+import { NgModule, ErrorHandler } from '@angular/core';
+import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
 import { MyApp } from './app.component';
 import { HomePage } from '../pages/home/home';
 
@@ -11,15 +9,16 @@ import { AngularFireModule } from 'angularfire2';
 
 // Must export the config
 export const firebaseConfig = {
-  apiKey: '<your-key>',
-  authDomain: '<your-project-authdomain>',
-  databaseURL: '<your-database-URL>',
-  storageBucket: '<your-storage-bucket>'
+//  apiKey: '<your-key>',
+//  authDomain: '<your-project-authdomain>',
+//  databaseURL: '<your-database-URL>',
+//  storageBucket: '<your-storage-bucket>'
+
+
 };
 
 @NgModule({
   imports: [
-    BrowserModule,
     FormsModule,
     ReactiveFormsModule,   
     AngularFireModule.initializeApp(firebaseConfig),
@@ -34,6 +33,6 @@ export const firebaseConfig = {
     MyApp,
     HomePage
   ],
-  providers: []
+  providers: [{provide: ErrorHandler, useClass: IonicErrorHandler}]
 })
 export class AppModule { }

src/app/main.prod.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { AngularFire, AuthProviders, AuthMethods, FirebaseAuthState, FirebaseAuth } from 'angularfire2';
+import { AngularFire, AuthProviders, AuthMethods, FirebaseAuthState, AngularFireAuth } from 'angularfire2';
 
 import { NavController } from 'ionic-angular';
 import { Validators, FormBuilder, FormControl, FormGroup } from '@angular/forms';
@@ -12,7 +12,7 @@ import { Validators, FormBuilder, FormControl, FormGroup } from '@angular/forms'
   //directives: [REACTIVE_FORM_DIRECTIVES]
 })
 
-export class HomePage {
+export class HomePage implements OnInit {
 
   currentUser;
   error;
@@ -26,7 +26,7 @@ export class HomePage {
     public af: AngularFire,
     private builder: FormBuilder,
     public navCtrl: NavController,
-    public auth$: FirebaseAuth) {
+    public auth$: AngularFireAuth) {
 
   }
 

src/app/main.dev.ts renamed to src/app/main.ts

@@ -1,13 +1,7 @@
 {
   "compilerOptions": {
-    "typeRoots": [
-      "../node_modules/@types/**"
-    ],
-    "types": [
-      "firebase"
-    ],
     "allowSyntheticDefaultImports": true,
-    "declaration": true,
+    "declaration": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "lib": [
@@ -16,8 +10,12 @@
     ],
     "module": "es2015",
     "moduleResolution": "node",
+    "sourceMap": true,
     "target": "es5"
   },
+  "include": [
+    "src/**/*.ts"
+  ],
   "exclude": [
     "node_modules"
   ],