From b0a95a6c7507262084cc6e9b8c84f2a2f3f6b3aa Mon Sep 17 00:00:00 2001
From: Stephen Hazleton <shazleto@gmail.com>
Date: Sun, 30 Oct 2016 18:38:32 +1100
Subject: [PATCH] Tidying up, updating deps, bringing inline with Ionic

---
 .editorconfig            | 17 +++++++++++++++++
 config.xml               |  2 +-
 package.json             | 29 ++++++++++++++---------------
 src/declarations.d.ts    | 14 ++++++++++++++
 src/index.html           |  6 +++---
 src/theme/variables.scss |  3 +--
 tsconfig.json            | 20 +++++++++++---------
 7 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 src/declarations.d.ts

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..51873bc
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
\ No newline at end of file
diff --git a/config.xml b/config.xml
index d4be612..93aeb5d 100644
--- a/config.xml
+++ b/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.ionicframework.clickerf0281363" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <name>ClickerDEV</name>
+  <name>Clicker</name>
   <description>An awesome Ionic/Cordova app.</description>
   <author email="shazleto@gmail.com" href="http://ionicframework.com/">Stephen Hazleton</author>
   <content src="index.html"/>
diff --git a/package.json b/package.json
index 6489233..1d25806 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@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/storage": "1.1.6",
     "ionic-angular": "2.0.0-rc.1",
     "ionic-native": "2.2.3",
     "ionicons": "3.0.0",
@@ -35,24 +35,23 @@
     "zone.js": "0.6.21"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "0.0.36",
-    "@types/jasmine": "^2.2.30",
+    "@ionic/app-scripts": "0.0.38",
+    "@types/jasmine": "2.5.36",
     "angular-cli": "1.0.0-beta.17",
     "codelyzer": "~0.0.26",
-    "jasmine-core": "2.4.1",
-    "jasmine-spec-reporter": "2.5.0",
-    "karma": "1.2.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-cli": "^1.0.1",
-    "karma-jasmine": "^1.0.2",
-    "karma-mocha-reporter": "2.1.0",
-    "karma-remap-istanbul": "^0.2.1",
-    "protractor": "4.0.9",
+    "jasmine-core": "2.5.2",
+    "jasmine-spec-reporter": "2.7.0",
+    "karma": "1.3.0",
+    "karma-chrome-launcher": "2.0.0",
+    "karma-cli": "1.0.1",
+    "karma-jasmine": "1.0.2",
+    "karma-mocha-reporter": "2.2.0",
+    "karma-remap-istanbul": "0.2.1",
+    "protractor": "4.0.10",
     "protractor-jasmine2-screenshot-reporter": "0.3.2",
-    "ts-node": "1.3.0",
     "tslint": "3.15.1",
-    "tslint-eslint-rules": "1.5.0",
-    "typescript": "2.0.3"
+    "tslint-eslint-rules": "2.1.0",
+    "typescript": "2.0.6"
   },
   "description": "Clicker: An Ionic project",
   "cordovaPlugins": [
diff --git a/src/declarations.d.ts b/src/declarations.d.ts
new file mode 100644
index 0000000..423e2f1
--- /dev/null
+++ b/src/declarations.d.ts
@@ -0,0 +1,14 @@
+/*
+  Declaration files are how the Typescript compiler knows about the type information(or shape) of an object.
+  They're what make intellisense work and make Typescript know all about your code.
+
+  A wildcard module is declared below to allow third party libraries to be used in an app even if they don't
+  provide their own type declarations.
+
+  To learn more about using third party libraries in an Ionic app, check out the docs here:
+  http://ionicframework.com/docs/v2/resources/third-party-libs/
+
+  For more info on type definition files, check out the Typescript docs here:
+  https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html
+*/
+declare module '*';
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 19836fd..c88e29b 100644
--- a/src/index.html
+++ b/src/index.html
@@ -10,6 +10,9 @@
   <link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico">
   <link rel="manifest" href="manifest.json">
   <meta name="theme-color" content="#4e8ef7">
+  
+  <!-- cordova.js required for cordova apps -->
+  <script src="cordova.js"></script>
 
   <!-- un-comment this code to enable service worker
   <script>
@@ -28,9 +31,6 @@
   <!-- Ionic's root component and where the app will load -->
   <ion-app></ion-app>
 
-  <!-- cordova.js required for cordova apps -->
-  <script src="cordova.js"></script>
-
   <!-- The polyfills js is generated during the build process -->
   <script src="build/polyfills.js"></script>
 
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index d5dce4b..49e7c6b 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -27,8 +27,7 @@ $colors: (
   secondary:  #32db64,
   danger:     #f53d3d,
   light:      #f4f4f4,
-  dark:       #222,
-  favorite:   #69BB7B
+  dark:       #222
 );
 
 
diff --git a/tsconfig.json b/tsconfig.json
index 8f122b0..4417a62 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,18 +4,20 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
-    "module": "es6",
+    "lib": [
+      "dom",
+      "es2015"
+    ],
+    "module": "es2015",
     "moduleResolution": "node",
-    "sourceMap": true,
-    "target": "es5",
-    "typeRoots": [
-      "node_modules/@types",
-      "../node_modules/@types"
-    ]
+    "target": "es5"
   },
   "exclude": [
     "node_modules",
     "**/*.e2e.ts"
-  ]
+  ],
+  "compileOnSave": false,
+  "atom": {
+    "rewriteTsconfig": false
+  }
 }