Skip to content

Commit

Permalink
Tidying up, updating deps, bringing inline with Ionic
Browse files Browse the repository at this point in the history
  • Loading branch information
lathonez committed Oct 30, 2016
1 parent d145a55 commit b0a95a6
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 30 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down
29 changes: 14 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,31 @@
"@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",
"rxjs": "5.0.0-beta.12",
"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": [
Expand Down
14 changes: 14 additions & 0 deletions src/declarations.d.ts
Original file line number Diff line number Diff line change
@@ -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 '*';
6 changes: 3 additions & 3 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions src/theme/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ $colors: (
secondary: #32db64,
danger: #f53d3d,
light: #f4f4f4,
dark: #222,
favorite: #69BB7B
dark: #222
);


Expand Down
20 changes: 11 additions & 9 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

0 comments on commit b0a95a6

Please sign in to comment.