Skip to content

Commit

Permalink
starting to merge cfg
Browse files Browse the repository at this point in the history
  • Loading branch information
lathonez committed Oct 4, 2016
1 parent a992f38 commit 055bf22
Show file tree
Hide file tree
Showing 10 changed files with 119 additions and 206 deletions.
24 changes: 10 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,29 @@
*.log
*.tmp
*.tmp.*
*.map
log.txt
*.sublime-project
*.sublime-workspace
.vscode/
npm-debug.log*

.idea/
.sass-cache/
.tmp/
.versions/
coverage/
bower_components/
dist/
node_modules/
tmp/
temp/
typings/
www/build/
hooks/
platforms/
plugins/
plugins/android.json
plugins/ios.json
www/
$RECYCLE.BIN/
.io-config.json

# dynamic config files generated at build time
config.xml
config/config.ts

.DS_Store
Thumbs.db
UserInterfaceState.xcuserstate

platforms
plugins

.travis/travis_rsa.pem
39 changes: 39 additions & 0 deletions config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?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>
<description>An awesome Ionic/Cordova app.</description>
<author email="shazleto@gmail.com" href="http://ionicframework.com/">Stephen Hazleton</author>
<content src="index.html"/>
<access origin="*"/>
<allow-intent href="http://*/*"/>
<allow-intent href="https://*/*"/>
<allow-intent href="tel:*"/>
<allow-intent href="sms:*"/>
<allow-intent href="mailto:*"/>
<allow-intent href="geo:*"/>
<platform name="android">
<allow-intent href="market:*"/>
</platform>
<platform name="ios">
<allow-intent href="itms:*"/>
<allow-intent href="itms-apps:*"/>
</platform>
<preference name="webviewbounce" value="false"/>
<preference name="UIWebViewBounce" value="false"/>
<preference name="DisallowOverscroll" value="true"/>
<preference name="android-minSdkVersion" value="16"/>
<preference name="BackupWebStorage" value="none"/>
<preference name="SplashScreenDelay" value="0"/>
<preference name="FadeSplashScreen" value="false"/>
<preference name="FadeSplashScreenDuration" value="0"/>
<preference name="SplashScreenBackgroundColor" value="0xFFFFFFFF"/>
<feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar"/>
</feature>
<plugin name="cordova-plugin-device" spec="~1.1.3"/>
<plugin name="cordova-plugin-console" spec="~1.0.4"/>
<plugin name="cordova-plugin-whitelist" spec="~1.3.0"/>
<plugin name="cordova-plugin-splashscreen" spec="~4.0.0"/>
<plugin name="cordova-plugin-statusbar" spec="~2.2.0"/>
<plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
</widget>
6 changes: 6 additions & 0 deletions config/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
'use strict';

export class Config {
public static apiURL: string = 'dev.mycorp.io';
public static apiKey: string = 'mydevapikey';
}
120 changes: 0 additions & 120 deletions gulpfile.js

This file was deleted.

4 changes: 0 additions & 4 deletions ionic.project

This file was deleted.

15 changes: 0 additions & 15 deletions ngrx.md

This file was deleted.

57 changes: 26 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
{
"name": "Clicker",
"author": "Stephen Hazleton",
"homepage": "https://github.com/lathonez/clicker",
"private": true,
"scripts": {
"build": "ionic-app-scripts build",
"watch": "ionic-app-scripts watch",
"serve:before": "watch",
"emulate:before": "build",
"deploy:before": "build",
"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 && typings install && webdriver-manager update",
"start": "ionic serve",
"test": "gulp --gulpfile test/gulpfile.ts --cwd ./ unit-test"
},
"version": "2.0.0",
"dependencies": {
"@angular/common": "2.0.0-rc.4",
"@angular/compiler": "2.0.0-rc.4",
"@angular/core": "2.0.0-rc.4",
"@angular/forms": "0.2.0",
"@angular/http": "2.0.0-rc.4",
"@angular/platform-browser": "2.0.0-rc.4",
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
"@ngrx/core": "1.0.1",
"@ngrx/effects": "1.1.1",
"@ngrx/store": "2.0.1",
"es6-shim": "0.35.1",
"ionic-angular": "2.0.0-beta.11",
"ionic-native": "1.3.21",
"ionic-angular": "2.0.0-rc.0",
"ionicons": "3.0.0",
"@ionic/storage": "1.0.3",
"ionic-native": "2.0.3"
"ngrx-store-freeze": "0.1.0",
"ngrx-store-logger": "0.1.7",
"reflect-metadata": "0.1.8",
"rxjs": "5.0.0-beta.6",
"zone.js": "0.6.12"
"ngrx-store-logger": "0.1.7"
},
"devDependencies": {
"browserify": "13.1.0",
Expand All @@ -29,12 +38,7 @@
"gulp-tslint": "6.1.1",
"gulp-typescript": "2.13.6",
"gulp-watch": "4.3.9",
"ionic-gulp-browserify-typescript": "2.0.0",
"ionic-gulp-fonts-copy": "1.0.0",
"ionic-gulp-html-copy": "1.0.0",
"ionic-gulp-sass-build": "1.0.0",
"ionic-gulp-scripts-copy": "2.0.1",
"ionic-gulp-tslint": "1.1.0",
"@ionic/app-scripts": "latest",
"isparta": "4.0.0",
"jasmine-core": "2.5.0",
"jasmine-spec-reporter": "2.7.0",
Expand All @@ -53,11 +57,10 @@
"tsify": "1.0.5",
"tslint": "3.15.1",
"tslint-eslint-rules": "1.5.0",
"typescript": "2.0.3",
"typings": "1.3.3"
},
"name": "clicker",
"version": "1.14.0",
"description": "clicker: An Ionic project",
"description": "Clicker: An Ionic project",
"cordovaPlugins": [
"cordova-plugin-device",
"cordova-plugin-console",
Expand All @@ -67,14 +70,6 @@
"ionic-plugin-keyboard"
],
"cordovaPlatforms": [],
"scripts": {
"build": "gulp --gulpfile test/gulpfile.ts --cwd ./ build-app",
"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 && typings install && webdriver-manager update",
"start": "ionic serve",
"test": "gulp --gulpfile test/gulpfile.ts --cwd ./ unit-test"
},
"repository": {
"type": "git",
"url": "https://github.com/lathonez/clicker.git"
Expand Down
39 changes: 27 additions & 12 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<html lang="en" dir="ltr">
<head>
<title>Clickers</title>
<meta charset="UTF-8">
<title>Clickers</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="format-detection" content="telephone=no">
<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">
<meta name="theme-color" content="#4e8ef7">

<!-- un-comment this code to enable service worker
<script>
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('service-worker.js')
.then(() => console.log('service worker installed'))
.catch(err => console.log('Error', err));
}
</script>-->

<link href="build/main.css" rel="stylesheet">

<link ios-href="build/css/app.ios.css" rel="stylesheet">
<link md-href="build/css/app.md.css" rel="stylesheet">
<link wp-href="build/css/app.wp.css" rel="stylesheet">
</head>
<body>

<!-- 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>
<!-- Polyfill needed for platforms without Promise and Collection support -->
<script src="build/js/es6-shim.min.js"></script>
<!-- Zone.js and Reflect-metadata -->
<script src="build/js/Reflect.js"></script>
<script src="build/js/zone.js"></script>
<!-- the bundle which is built from the app's source code -->
<script src="build/js/app.bundle.js"></script>

<!-- The polyfills js is generated during the build process -->
<script src="build/polyfills.js"></script>

<!-- The bundle js is generated during the build process -->
<script src="build/main.js"></script>

</body>
</html>

0 comments on commit 055bf22

Please sign in to comment.