SamuelMarks/diff -r example2 generator-m-ionic-demo

## diff -r example2 generator-m-ionic-demo
diff -r example2/.yo-rc.json generator-m-ionic-demo/.yo-rc.json
4,6c4,6
<       "appName": "example2",
<       "appId": "com.company.example2",
<       "ionicCss": false,
---
>       "appModule": "myProject",
>       "appName": "My Project",
>       "appId": "com.company.project",
12a13
>       "ionicCss": true,
19c20,21
<         "cordova-plugin-statusbar"
---
>         "cordova-plugin-dialogs",
>         "com.ionic.keyboard"
21c23
<       "appModule": "example2"
---
>       "template": "tabs"
diff -r example2/app/app.js generator-m-ionic-demo/app/app.js
2c2
< angular.module('example2', [
---
> angular.module('myProject', [
4a5,6
>   'side',
>   'blank'
Only in generator-m-ionic-demo/app/blank: constants
Only in generator-m-ionic-demo/app/blank: styles
diff -r example2/app/index.html generator-m-ionic-demo/app/index.html
11c11
<     <title>example2</title>
---
>     <title>My Project</title>
15a16
>     <link rel="stylesheet" href="bower_components/ionic/release/css/ionic.css" />
20a22,24
>     <link rel="stylesheet" href="blank/styles/blank.css">
>     <link rel="stylesheet" href="main/styles/main.css">
>     <link rel="stylesheet" href="side/styles/side.css">
24c28
<   <body ng-app="example2">
---
>   <body ng-app="myProject">
28c32
<     <ion-nav-bar class="bar-balanced">
---
>     <ion-nav-bar class="bar-calm">
38a43,53
>     <script src="bower_components/angular/angular.js"></script>
>     <script src="bower_components/angular-animate/angular-animate.js"></script>
>     <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
>     <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
>     <script src="bower_components/ionic/release/js/ionic.js"></script>
>     <script src="bower_components/ionic/release/js/ionic-angular.js"></script>
>     <script src="bower_components/ngCordova/dist/ng-cordova.js"></script>
>     <script src="bower_components/angular-dynamic-locale/src/tmhDynamicLocale.js"></script>
>     <script src="bower_components/angular-translate/angular-translate.js"></script>
>     <script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
>     <script src="bower_components/localforage/dist/localforage.js"></script>
43a59,70
>     <script src="side/side.js"></script>
>     <script src="side/services/side-serv.js"></script>
>     <script src="side/controllers/side-menu-ctrl.js"></script>
>     <script src="side/controllers/side-debug-ctrl.js"></script>
>     <script src="side/constants/side-config-const.js"></script>
>     <script src="main/main.js"></script>
>     <script src="main/services/main-serv.js"></script>
>     <script src="main/controllers/debug-ctrl.js"></script>
>     <script src="main/constants/config-const.js"></script>
>     <script src="blank/blank.js"></script>
>     <script src="blank/constants/blank-config-const.js"></script>
>     <script src="app.js"></script>
Only in generator-m-ionic-demo/app/main/assets/images: yo@2x.png
diff -r example2/app/main/constants/config-const.js generator-m-ionic-demo/app/main/constants/config-const.js
7a8
>     'SERVER_URL': 'https://DEVSERVER/api'
Only in generator-m-ionic-demo/app/main/controllers: debug-ctrl.js
Only in example2/app/main/controllers: foo-ctrl.js
Only in example2/app/main: directives
Only in example2/app/main: filters
diff -r example2/app/main/main.js generator-m-ionic-demo/app/main/main.js
11c11
<   $urlRouterProvider.otherwise('/main');
---
>   $urlRouterProvider.otherwise('/main/list');
16,19c16,45
<       template: '<ion-view view-title="main"></ion-view>',
<       // templateUrl: 'main/templates/<someTemplate>.html',
<       // controller: 'SomeCtrl as ctrl'
<     });
---
>       abstract: true,
>       templateUrl: 'main/templates/tabs.html'
>     })
>       .state('main.list', {
>         url: '/list',
>         views: {
>           'tab-list': {
>             templateUrl: 'main/templates/list.html',
>             // controller: 'SomeCtrl as ctrl'
>           }
>         }
>       })
>       .state('main.listDetail', {
>         url: '/list/detail',
>         views: {
>           'tab-list': {
>             templateUrl: 'main/templates/list-detail.html',
>             // controller: 'SomeCtrl as ctrl'
>           }
>         }
>       })
>       .state('main.debug', {
>         url: '/debug',
>         views: {
>           'tab-debug': {
>             templateUrl: 'main/templates/debug.html',
>             controller: 'DebugCtrl as ctrl'
>           }
>         }
>       });
Only in generator-m-ionic-demo/app/main/services: main-serv.js
diff -r example2/app/main/styles/main.scss generator-m-ionic-demo/app/main/styles/main.scss
1,23d0
< /*
< To customize the look and feel of Ionic, you can override the variables
< in ionic's _variables.scss file.
<
< For example, you might change some of the default colors:
< */
<
< $light:                           #fff !default;
< $stable:                          #f8f8f8 !default;
< $positive:                        #4a87ee !default;
< $calm:                            #43cee6 !default;
< $balanced:                        #66cc33 !default;
< $energized:                       #f0b840 !default;
< $assertive:                       #ef4e3a !default;
< $royal:                           #8a6de9 !default;
< $dark:                            #444 !default;
<
< // The path for our ionicons font files, relative to the built & temporary main.css
< $ionicons-font-path: "../assets/fonts" !default;
<
< // Include all of Ionic
< @import "../../bower_components/ionic/scss/ionic";
<
Only in generator-m-ionic-demo/app/main/templates: debug.html
Only in generator-m-ionic-demo/app/main/templates: list.html
Only in generator-m-ionic-demo/app/main/templates: list-detail.html
Only in generator-m-ionic-demo/app/main/templates: tabs.html
Only in generator-m-ionic-demo/app: side
diff -r example2/bower.json generator-m-ionic-demo/bower.json
23c23
<   "name": "example2",
---
>   "name": "My Project",
diff -r example2/config.xml generator-m-ionic-demo/config.xml
2,3c2,3
< <widget id="com.company.example2" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<     <name>example2</name>
---
> <widget id="com.company.project" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
>     <name>My Project</name>
29c29,30
<     <plugin name="cordova-plugin-statusbar" spec="~2.0.0" />
---
>     <plugin name="cordova-plugin-dialogs" spec="~1.2.0" />
>     <plugin name="com.ionic.keyboard" spec="~1.0.4" />
diff -r example2/gulp/injecting.js generator-m-ionic-demo/gulp/injecting.js
52,53c52,53
<     // exclude ionic scss since we're using ionic sass
<     .pipe(wiredep.stream({exclude: ['bower_components/ionic/release/css']}))
---
>     // we're not excluding the ionic css here
>     .pipe(wiredep.stream())
58,62c58,61
< gulp.task('bower-fonts', function () {
<   // to app/main/assets/fonts (path can be set in app/main/styles/<module>.scss)
<   var DEST = 'app/main/assets/fonts';
<   var fontFiles = mainBowerFiles({filter: /\.(eot|otf|svg|ttf|woff|woff2)$/i})
<     .concat('app/main/assets/fonts/**/*');
---
> gulp.task('bower-fonts', ['clean'], function () {
>   // to do www/fonts (ionic css requires it to be in this folder)
>   var DEST = 'www/fonts';
>   var fontFiles = mainBowerFiles({filter: /\.(eot|otf|svg|ttf|woff|woff2)$/i});
Only in example2: platforms
Only in example2: plugins
diff -r example2/README.md generator-m-ionic-demo/README.md
1c1,44
< # example2
---
> # Generator-M-Ionic-Demo
> [![Dependency Status](http://img.shields.io/david/dev/mwaylabs/generator-m-ionic-demo/master.svg?style=flat-square)](https://david-dm.org/mwaylabs/generator-m-ionic-demo#info=devDependencies&view=table)
>
> Development:
>
> [![Dependency Status](http://img.shields.io/david/dev/mwaylabs/generator-m-ionic-demo/dev.svg?style=flat-square)](https://david-dm.org/mwaylabs/generator-m-ionic-demo/dev#info=devDependencies&view=table)
>
> ## What's this?
> This project was generated with the awesome [Generator-M-Ionic](https://github.com/mwaylabs/generator-m-ionic) to show all the latest features. Please report any issues to the initial [repository](https://github.com/mwaylabs/generator-m-ionic) .
>
> ## Try
> Run on your machine:
> - make sure you have all the [prerequisites](https://github.com/mwaylabs/generator-m-ionic#prerequisites) installed
> - clone `git clone git@github.com:mwaylabs/generator-m-ionic-demo.git`
>   - and install dependencies `npm install && bower install`
> - **OR**
>   - create a new directory
>   - `yo m-ionic --skip-prompts` runs the generator with default options
>   - `yo m-ionic:module side` - choose sidemenu template
>   - `yo m-ionic:module blank` - choose blank template
>   - edit the `app.js` and add the `side` and `blank` module
> - run `gulp watch`
> - **enjoy!**
> - your project is now set using the latest version of the generator and with the following [default options](https://github.com/mwaylabs/generator-m-ionic/blob/master/generators/app/sources/sample-answers.js#L7).
>
> in your browser navigate to:
> - `#/main/list` - the tabs template
> - `#/side/list` - the sidemenu template
> - `#/blank` - the blank template
>
> run test
> - run `gulp test` to run karma tests
> - run `gulp protractor` to run protractor tests
>   - **hint**: `gulp watch` and `gulp protractor` cannot be run at the same time.
>
>
> # Questions?
> Head over to the Generator-M-Ionic [repository](https://github.com/mwaylabs/generator-m-ionic) and check out the documentation. Alternatively you can talk to us:
>
> [![Join the chat at https://gitter.im/mwaylabs/generator-m-ionic](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mwaylabs/generator-m-ionic?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
>
> ---
>
> # My Project
Only in generator-m-ionic-demo/test/karma/main: debug-ctrl.spec.js
Only in example2/test/karma/main: foo-ctrl.spec.js
Only in generator-m-ionic-demo/test/karma/main: main-serv.spec.js
Only in generator-m-ionic-demo/test/karma: side
Only in generator-m-ionic-demo/test/protractor: main-debug.spec.js
Only in generator-m-ionic-demo/test/protractor: side-debug.spec.js
Only in example2: www
	diff -r example2/.yo-rc.json generator-m-ionic-demo/.yo-rc.json
	4,6c4,6
	< "appName": "example2",
	< "appId": "com.company.example2",
	< "ionicCss": false,
	---
	> "appModule": "myProject",
	> "appName": "My Project",
	> "appId": "com.company.project",
	12a13
	> "ionicCss": true,
	19c20,21
	< "cordova-plugin-statusbar"
	---
	> "cordova-plugin-dialogs",
	> "com.ionic.keyboard"
	21c23
	< "appModule": "example2"
	---
	> "template": "tabs"
	diff -r example2/app/app.js generator-m-ionic-demo/app/app.js
	2c2
	< angular.module('example2', [
	---
	> angular.module('myProject', [
	4a5,6
	> 'side',
	> 'blank'
	Only in generator-m-ionic-demo/app/blank: constants
	Only in generator-m-ionic-demo/app/blank: styles
	diff -r example2/app/index.html generator-m-ionic-demo/app/index.html
	11c11
	< <title>example2</title>
	---
	> <title>My Project</title>
	15a16
	> <link rel="stylesheet" href="bower_components/ionic/release/css/ionic.css" />
	20a22,24
	> <link rel="stylesheet" href="blank/styles/blank.css">
	> <link rel="stylesheet" href="main/styles/main.css">
	> <link rel="stylesheet" href="side/styles/side.css">
	24c28
	< <body ng-app="example2">
	---
	> <body ng-app="myProject">
	28c32
	< <ion-nav-bar class="bar-balanced">
	---
	> <ion-nav-bar class="bar-calm">
	38a43,53
	> <script src="bower_components/angular/angular.js"></script>
	> <script src="bower_components/angular-animate/angular-animate.js"></script>
	> <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
	> <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
	> <script src="bower_components/ionic/release/js/ionic.js"></script>
	> <script src="bower_components/ionic/release/js/ionic-angular.js"></script>
	> <script src="bower_components/ngCordova/dist/ng-cordova.js"></script>
	> <script src="bower_components/angular-dynamic-locale/src/tmhDynamicLocale.js"></script>
	> <script src="bower_components/angular-translate/angular-translate.js"></script>
	> <script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
	> <script src="bower_components/localforage/dist/localforage.js"></script>
	43a59,70
	> <script src="side/side.js"></script>
	> <script src="side/services/side-serv.js"></script>
	> <script src="side/controllers/side-menu-ctrl.js"></script>
	> <script src="side/controllers/side-debug-ctrl.js"></script>
	> <script src="side/constants/side-config-const.js"></script>
	> <script src="main/main.js"></script>
	> <script src="main/services/main-serv.js"></script>
	> <script src="main/controllers/debug-ctrl.js"></script>
	> <script src="main/constants/config-const.js"></script>
	> <script src="blank/blank.js"></script>
	> <script src="blank/constants/blank-config-const.js"></script>
	> <script src="app.js"></script>
	Only in generator-m-ionic-demo/app/main/assets/images: yo@2x.png
	diff -r example2/app/main/constants/config-const.js generator-m-ionic-demo/app/main/constants/config-const.js
	7a8
	> 'SERVER_URL': 'https://DEVSERVER/api'
	Only in generator-m-ionic-demo/app/main/controllers: debug-ctrl.js
	Only in example2/app/main/controllers: foo-ctrl.js
	Only in example2/app/main: directives
	Only in example2/app/main: filters
	diff -r example2/app/main/main.js generator-m-ionic-demo/app/main/main.js
	11c11
	< $urlRouterProvider.otherwise('/main');
	---
	> $urlRouterProvider.otherwise('/main/list');
	16,19c16,45
	< template: '<ion-view view-title="main"></ion-view>',
	< // templateUrl: 'main/templates/<someTemplate>.html',
	< // controller: 'SomeCtrl as ctrl'
	< });
	---
	> abstract: true,
	> templateUrl: 'main/templates/tabs.html'
	> })
	> .state('main.list', {
	> url: '/list',
	> views: {
	> 'tab-list': {
	> templateUrl: 'main/templates/list.html',
	> // controller: 'SomeCtrl as ctrl'
	> }
	> }
	> })
	> .state('main.listDetail', {
	> url: '/list/detail',
	> views: {
	> 'tab-list': {
	> templateUrl: 'main/templates/list-detail.html',
	> // controller: 'SomeCtrl as ctrl'
	> }
	> }
	> })
	> .state('main.debug', {
	> url: '/debug',
	> views: {
	> 'tab-debug': {
	> templateUrl: 'main/templates/debug.html',
	> controller: 'DebugCtrl as ctrl'
	> }
	> }
	> });
	Only in generator-m-ionic-demo/app/main/services: main-serv.js
	diff -r example2/app/main/styles/main.scss generator-m-ionic-demo/app/main/styles/main.scss
	1,23d0
	< /*
	< To customize the look and feel of Ionic, you can override the variables
	< in ionic's _variables.scss file.
	<
	< For example, you might change some of the default colors:
	< */
	<
	< $light: #fff !default;
	< $stable: #f8f8f8 !default;
	< $positive: #4a87ee !default;
	< $calm: #43cee6 !default;
	< $balanced: #66cc33 !default;
	< $energized: #f0b840 !default;
	< $assertive: #ef4e3a !default;
	< $royal: #8a6de9 !default;
	< $dark: #444 !default;
	<
	< // The path for our ionicons font files, relative to the built & temporary main.css
	< $ionicons-font-path: "../assets/fonts" !default;
	<
	< // Include all of Ionic
	< @import "../../bower_components/ionic/scss/ionic";
	<
	Only in generator-m-ionic-demo/app/main/templates: debug.html
	Only in generator-m-ionic-demo/app/main/templates: list.html
	Only in generator-m-ionic-demo/app/main/templates: list-detail.html
	Only in generator-m-ionic-demo/app/main/templates: tabs.html
	Only in generator-m-ionic-demo/app: side
	diff -r example2/bower.json generator-m-ionic-demo/bower.json
	23c23
	< "name": "example2",
	---
	> "name": "My Project",
	diff -r example2/config.xml generator-m-ionic-demo/config.xml
	2,3c2,3
	< <widget id="com.company.example2" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
	< <name>example2</name>
	---
	> <widget id="com.company.project" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
	> <name>My Project</name>
	29c29,30
	< <plugin name="cordova-plugin-statusbar" spec="~2.0.0" />
	---
	> <plugin name="cordova-plugin-dialogs" spec="~1.2.0" />
	> <plugin name="com.ionic.keyboard" spec="~1.0.4" />
	diff -r example2/gulp/injecting.js generator-m-ionic-demo/gulp/injecting.js
	52,53c52,53
	< // exclude ionic scss since we're using ionic sass
	< .pipe(wiredep.stream({exclude: ['bower_components/ionic/release/css']}))
	---
	> // we're not excluding the ionic css here
	> .pipe(wiredep.stream())
	58,62c58,61
	< gulp.task('bower-fonts', function () {
	< // to app/main/assets/fonts (path can be set in app/main/styles/<module>.scss)
	< var DEST = 'app/main/assets/fonts';
	< var fontFiles = mainBowerFiles({filter: /\.(eot\|otf\|svg\|ttf\|woff\|woff2)$/i})
	< .concat('app/main/assets/fonts/*/');
	---
	> gulp.task('bower-fonts', ['clean'], function () {
	> // to do www/fonts (ionic css requires it to be in this folder)
	> var DEST = 'www/fonts';
	> var fontFiles = mainBowerFiles({filter: /\.(eot\|otf\|svg\|ttf\|woff\|woff2)$/i});
	Only in example2: platforms
	Only in example2: plugins
	diff -r example2/README.md generator-m-ionic-demo/README.md
	1c1,44
	< # example2
	---
	> # Generator-M-Ionic-Demo
	> [![Dependency Status](http://img.shields.io/david/dev/mwaylabs/generator-m-ionic-demo/master.svg?style=flat-square)](https://david-dm.org/mwaylabs/generator-m-ionic-demo#info=devDependencies&view=table)
	>
	> Development:
	>
	> [![Dependency Status](http://img.shields.io/david/dev/mwaylabs/generator-m-ionic-demo/dev.svg?style=flat-square)](https://david-dm.org/mwaylabs/generator-m-ionic-demo/dev#info=devDependencies&view=table)
	>
	> ## What's this?
	> This project was generated with the awesome [Generator-M-Ionic](https://github.com/mwaylabs/generator-m-ionic) to show all the latest features. Please report any issues to the initial [repository](https://github.com/mwaylabs/generator-m-ionic) .
	>
	> ## Try
	> Run on your machine:
	> - make sure you have all the [prerequisites](https://github.com/mwaylabs/generator-m-ionic#prerequisites) installed
	> - clone `git clone git@github.com:mwaylabs/generator-m-ionic-demo.git`
	> - and install dependencies `npm install && bower install`
	> - OR
	> - create a new directory
	> - `yo m-ionic --skip-prompts` runs the generator with default options
	> - `yo m-ionic:module side` - choose sidemenu template
	> - `yo m-ionic:module blank` - choose blank template
	> - edit the `app.js` and add the `side` and `blank` module
	> - run `gulp watch`
	> - enjoy!
	> - your project is now set using the latest version of the generator and with the following [default options](https://github.com/mwaylabs/generator-m-ionic/blob/master/generators/app/sources/sample-answers.js#L7).
	>
	> in your browser navigate to:
	> - `#/main/list` - the tabs template
	> - `#/side/list` - the sidemenu template
	> - `#/blank` - the blank template
	>
	> run test
	> - run `gulp test` to run karma tests
	> - run `gulp protractor` to run protractor tests
	> - hint: `gulp watch` and `gulp protractor` cannot be run at the same time.
	>
	>
	> # Questions?
	> Head over to the Generator-M-Ionic [repository](https://github.com/mwaylabs/generator-m-ionic) and check out the documentation. Alternatively you can talk to us:
	>
	> [![Join the chat at https://gitter.im/mwaylabs/generator-m-ionic](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mwaylabs/generator-m-ionic?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
	>
	> ---
	>
	> # My Project
	Only in generator-m-ionic-demo/test/karma/main: debug-ctrl.spec.js
	Only in example2/test/karma/main: foo-ctrl.spec.js
	Only in generator-m-ionic-demo/test/karma/main: main-serv.spec.js
	Only in generator-m-ionic-demo/test/karma: side
	Only in generator-m-ionic-demo/test/protractor: main-debug.spec.js
	Only in generator-m-ionic-demo/test/protractor: side-debug.spec.js
	Only in example2: www