Tidy up, upgrade to rc1

.travis.yml

@@ -38,11 +38,11 @@ before_script:
   - sh -e /etc/init.d/xvfb start
 
 script:
-  - npm test                             # unit tests
-  - npm run build                        # ionic build
+  - ng tets --watch=false                # unit tests
+  # - npm run build                        # ionic build
   # Serve with python as ionic serve needs interaction
-  - cd www && python -m SimpleHTTPServer 8100 >> python_serve.log 2>&1 &
-  - npm run e2e                          # run e2e tests against ionic
+  # - cd www && python -m SimpleHTTPServer 8100 >> python_serve.log 2>&1 &
+  # - npm run e2e                          # run e2e tests against ionic
 
 after_failure:
   - cat /home/travis/build/lathonez/clicker/python_serve.log

package.json

@@ -12,22 +12,30 @@
     "build:before": "build",
     "run:before": "build",
     "e2e": "gulp --gulpfile test/gulpfile.ts --cwd ./ build-e2e && protractor test/protractor.conf.js",
-    "karma": "gulp --gulpfile test/gulpfile.ts --cwd ./ karma-debug",
     "postinstall": "ionic state restore && webdriver-manager update",
     "start": "ionic serve",
     "test": "ng test"
   },
   "version": "2.0.0",
   "dependencies": {
-    "ionic-angular": "2.0.0-rc.0",
-    "ionicons": "3.0.0",
+    "@angular/common": "2.0.0",
+    "@angular/compiler": "2.0.0",
+    "@angular/compiler-cli": "0.6.2",
+    "@angular/core": "2.0.0",
+    "@angular/forms": "2.0.0",
+    "@angular/http": "2.0.0",
+    "@angular/platform-browser": "2.0.0",
+    "@angular/platform-browser-dynamic": "2.0.0",
+    "@angular/platform-server": "2.0.0",
     "@ionic/storage": "1.0.3",
-    "ionic-native": "2.0.3",
-    "core-js": "^2.4.1",
-    "ts-helpers": "^1.1.1"
+    "ionic-angular": "2.0.0-rc.1",
+    "ionic-native": "2.2.3",
+    "ionicons": "3.0.0",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "0.6.21"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "latest",
+    "@ionic/app-scripts": "0.0.36",
     "@types/jasmine": "^2.2.30",
     "angular-cli": "1.0.0-beta.16",
     "codelyzer": "~0.0.26",

src/app/app.component.ts

@@ -2,7 +2,7 @@ import { Component, ViewChild }          from '@angular/core';
 import { Platform, MenuController, Nav } from 'ionic-angular';
 import { StatusBar }                     from 'ionic-native';
 import { ClickerList, Page2 }            from '../pages';
-import { Config }                        from '../config/config';
+import { environment }                   from '../environments/environment';
 
 @Component({
   templateUrl: 'app.html',
@@ -36,8 +36,7 @@ export class ClickerApp {
       // 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();
-      console.log('api URL ' + Config.apiURL);
-      console.log('api key ' + Config.apiKey);
+      console.log('environment ' + environment);
     });
   }
 

src/app/app.spec.ts

@@ -1,5 +1,5 @@
 import { ClickerApp }                      from './app.component';
-import { MenuMock, NavMock, PlatformMock } from '../../test/mocks';
+import { MenuMock, NavMock, PlatformMock } from '../mocks';
 import { Page2 }                           from '../pages';
 
 let instance: ClickerApp = null;

src/environments/environment.prod.ts

@@ -0,0 +1,3 @@
+export const environment: any = {
+  production: true,
+};

src/environments/environment.ts

@@ -0,0 +1,8 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `angular-cli.json`.
+
+export const environment: any = {
+  production: false,
+};

src/index.html

@@ -8,7 +8,7 @@
   <meta name="msapplication-tap-highlight" content="no">
 
   <link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico">
-  <link rel="manifest" href="assets/manifest.json">
+  <link rel="manifest" href="manifest.json">
   <meta name="theme-color" content="#4e8ef7">
 
   <!-- un-comment this code to enable service worker

src/test.ts

@@ -10,8 +10,7 @@ import 'zone.js/dist/fake-async-test';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TestBed } from '@angular/core/testing';
 import { App, MenuController, NavController, Platform, Config, Keyboard, Form, IonicModule }  from 'ionic-angular';
-// import { PagesModule } from './pages';
-import { ConfigMock, NavMock, PlatformMock } from '../test/mocks';
+import { ConfigMock, NavMock, PlatformMock } from './mocks';
 import { ClickersServiceMock } from './services/clickers.mock';
 import { ClickersService } from './services';
 

src/theme/variables.scss

@@ -32,6 +32,27 @@ $colors: (
 );
 
 
+// App iOS Variables
+// --------------------------------------------------
+// iOS only Sass variables can go here
+
+
+
+
+// App Material Design Variables
+// --------------------------------------------------
+// Material Design only Sass variables can go here
+
+
+
+
+// App Windows Variables
+// --------------------------------------------------
+// Windows only Sass variables can go here
+
+
+
+
 // App Theme
 // --------------------------------------------------
 // Ionic apps can have different themes applied, which can