Merge branch 'dev'

* dev: 1.12.0 update deps yarn protractor side config-const new side module proper mini component bower updates #511: component sub-generator - test file and updated main.scss component-subgenerator: basic implementation Revert "break build" break build turn slack integration back on turn slack integration back on #511 component sub-generator - mini component example Revert "#487 travis, run protractor - give it another go travis-ci/travis-ci#272 (comment)" #487 travis, run protractor - give it another go travis-ci/travis-ci#272 (comment) #495 travis, mattermost - also add gitter webhook #495 travis - mattermost integration
mwaylabs · Apr 12, 2017 · c0d9457 · c0d9457
2 parents adb082f + bf885d1
commit c0d9457
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,12 @@ notifications:
   email: false
   slack:
     rooms:
-      - m-wayteam:id3DFokHndVEGtjOM9fR0DVj#generator-m-services
+      - m-wayteam:U1iFZyUui2QAUDtcbRS8ybZX#generator-m-services
     on_success: change  # options: [always|never|change] default: always
     on_failure: change  # options: [always|never|change] default: always
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/87130ded51c12384d4e7
+      - https://mattermost.mwaysolutions.com/hooks/7b794wboitdaxrzjkxcjt3enjr
+    on_success: always  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
diff --git a/README.md b/README.md
@@ -57,9 +57,9 @@ Head over to the Generator-M-Ionic [repository](https://github.com/mwaylabs/gene
 ---
 
 # My Project
-This project was generated with Generator-M-Ionic v1.11.0. For more info visit the [repository](https://github.com/mwaylabs/generator-m-ionic) or check out the README below.
+This project was generated with Generator-M-Ionic v1.12.0. For more info visit the [repository](https://github.com/mwaylabs/generator-m-ionic) or check out the README below.
 
-# Generator-M-Ionic v1.11.0
+# Generator-M-Ionic v1.12.0
 
 [![NPM version](http://img.shields.io/npm/v/generator-m-ionic.svg?style=flat-square)][npm-url]
 [![Coverage Status](http://img.shields.io/coveralls/mwaylabs/generator-m-ionic/master.svg?style=flat-square)][coveralls-url]
@@ -77,6 +77,7 @@ Development:
 [![Dev Coverage Status](http://img.shields.io/coveralls/mwaylabs/generator-m-ionic/dev.svg?style=flat-square)][coveralls-url]
 [![Dev Build Status](https://img.shields.io/travis/mwaylabs/generator-m-ionic/dev.svg?style=flat-square)][travis-url]
 [![Dev Dependency Status](http://img.shields.io/david/mwaylabs/generator-m-ionic/dev.svg?style=flat-square)](https://david-dm.org/mwaylabs/generator-m-ionic/dev)
+[![Greenkeeper badge](https://badges.greenkeeper.io/mwaylabs/generator-m-ionic.svg)](https://greenkeeper.io/)
 
 
 ## Why you need it
@@ -140,6 +141,16 @@ This Generator delivers **highly advanced workflows for Angular 1 & Ionic 1** wi
 
 **[Read more ...](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/intro/whats_in_the_box.md)**
 
+
+**Latest releases**
+- **Component subgenerator**: [see here](https://github.com/mwaylabs/generator-m-ionic/blob/master/docs/guides/sub_generators.md#angularjs-components).
+- **Yarn** integration: [see here](https://github.com/mwaylabs/generator-m-ionic/blob/master/docs/guides/questions.md#npm-or-yarn).
+- Test setup improvements [#489](https://github.com/mwaylabs/generator-m-ionic/pull/489).
+- **Livereload** for the device! Wohoo! See [how it's done](https://github.com/mwaylabs/generator-m-ionic/blob/master/docs/guides/development_intro.md#run-on-device-or-emulator-with-livereload).
+- Integrations into [Ionic Cloud](https://github.com/mwaylabs/generator-m-ionic/blob/master/docs/ecosystems/ionic_platform.md), [Relution & Greenhouse](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/guides/greenhouse.md).
+- [and many more ...](https://github.com/mwaylabs/generator-m-ionic/releases)
+
+
 ### What's new
 **Ionic Blog Series** - Great ride through everything Generator-M-Ionic has to offer:
 > Advanced workflows for building rock-solid Ionic Apps
@@ -148,13 +159,6 @@ This Generator delivers **highly advanced workflows for Angular 1 & Ionic 1** wi
   - [Part 2: Mountain](http://blog.ionic.io/advanced-workflows-for-building-rock-solid-ionic-apps-part-2/)
   - [Part 3: Orbit](http://blog.ionic.io/advanced-workflows-for-building-rock-solid-ionic-apps-part-3/)
 
-**Latest releases**
-- **Yarn integration**: [see here](https://github.com/mwaylabs/generator-m-ionic/blob/master/docs/guides/questions.md#npm-or-yarn).
-- **Test setup improvements** [#489](https://github.com/mwaylabs/generator-m-ionic/pull/489).
-- **Livereload** for the device! Wohoo! See [how it's done](https://github.com/mwaylabs/generator-m-ionic/blob/master/docs/guides/development_intro.md#run-on-device-or-emulator-with-livereload).
-- **Integrations** into [Ionic Cloud](https://github.com/mwaylabs/generator-m-ionic/blob/master/docs/ecosystems/ionic_platform.md), [Relution & Greenhouse](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/guides/greenhouse.md).
-- [and many more ...](https://github.com/mwaylabs/generator-m-ionic/releases)
-
 ## Guides
 ##### Quick Start
 - [Quick Start](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/intro/quick_start.md) for the experienced developer.
@@ -183,7 +187,6 @@ This Generator delivers **highly advanced workflows for Angular 1 & Ionic 1** wi
 - [App Icons and splash screens](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/guides/icons_splash_screens.md), a simple setup or different sets for different builds - all is possible.
 - [Use Environments](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/guides/environments.md) manage different API Endpoints and much more with just a single parameter.
 - [Gulp defaults](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/guides/gulp_defaults.md), spare yourself some tedious typing on the command line.
-- [Generator Update (experimental)](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/guides/generator_update.md) can help you update to a new generator version.
 
 
 ##### Building & Continuous Integration
@@ -195,8 +198,6 @@ This Generator delivers **highly advanced workflows for Angular 1 & Ionic 1** wi
 ##### Ecosystems
 - [Greenhouse & Relution](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/ecosystems/greenhouse.md) - build and distribute your apps using these powerful cloud services
 - [Ionic Cloud](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/ecosystems/ionic_platform.md) (beta) - a powerful suite of hybrid-focused mobile backend services and tools
-- [Appmobi](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/ecosystems/appmobi.md) - Secure Mobile Development Platform
-- [ApiOmat](https://github.com/mwaylabs/generator-m-ionic/tree/master/docs/ecosystems/apiomat.md) (beta) - Enterprise Backend as a Service
 
 ## Generator Insights
 We've published 3 blog articles on our company blog delivering deep insights into the why and how of the generator:

diff --git a/app/index.html b/app/index.html
@@ -29,7 +29,7 @@
 
     <!-- the nav bar will be updated as we navigate between views -->
     <!-- <ion-nav-bar> can be removed when using sidemenu (contained in menu.html) -->
-    <ion-nav-bar class="bar-calm">
+    <ion-nav-bar class="bar-light">
       <ion-nav-back-button></ion-nav-back-button>
     </ion-nav-bar>
     <!-- the current view will be rendered in the <ion-nav-view> directive -->
@@ -65,6 +65,7 @@
     <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="main/components/mini/mini-component.js"></script>
     <script src="blank/blank.js"></script>
     <script src="blank/constants/blank-config-const.js"></script>
     <script src="app.js"></script>

diff --git a/app/main/components/mini/_mini-component.scss b/app/main/components/mini/_mini-component.scss
@@ -0,0 +1,7 @@
+mini {
+  display:block;
+
+  .green {
+    color: green;
+  }
+}
diff --git a/app/main/components/mini/mini-component.html b/app/main/components/mini/mini-component.html
@@ -0,0 +1,8 @@
+<h4>Your mini component</h4>
+currentState: <span class="green">{{ ctrl.currentState }}</span>
+<br>
+content: {{ ctrl.content }}
+<br><br>
+transcluded content:
+<div ng-transclude>
+</div>
diff --git a/app/main/components/mini/mini-component.js b/app/main/components/mini/mini-component.js
@@ -0,0 +1,18 @@
+'use strict';
+angular.module('main')
+.component('mini', {
+  templateUrl: 'main/components/mini/mini-component.html',
+  restrict: 'EA',
+  transclude: true,
+  bindings: {
+    content: '=', // bind via attribute
+  },
+  controllerAs: 'ctrl', // enable controllerAs syntax
+  controller: function (
+    $scope,
+    $state
+  ) {
+    // retrieve some info via dependency injection
+    this.currentState = $state.current.name;
+  }
+});
diff --git a/app/main/styles/main.scss b/app/main/styles/main.scss
@@ -1 +1,4 @@
 
+
+// added via yo m-ionic:component subgenerator
+@import '../components/mini/mini-component';
diff --git a/app/main/templates/list-detail.html b/app/main/templates/list-detail.html
@@ -10,5 +10,10 @@
       And I'm really good at it.
     </p>
 
+    <mini
+      content="'some content via attribute'">
+      Some <span class="green">transcluded</span> content
+    </mini>
+
   </ion-content>
 </ion-view>
diff --git a/app/side/templates/menu.html b/app/side/templates/menu.html
@@ -5,7 +5,7 @@
 
     <!-- header bar -->
     <!-- the nav bar will be updated as we navigate between views -->
-    <ion-nav-bar class="bar-balanced">
+    <ion-nav-bar class="bar-royal">
       <!-- back button, shown if applicable -->
       <ion-nav-back-button>
       </ion-nav-back-button>
@@ -25,7 +25,7 @@
   <ion-side-menu side="left">
 
     <!-- menu header -->
-    <ion-header-bar class="bar-balanced">
+    <ion-header-bar class="bar-royal">
       <h1 class="title">Nav</h1>
     </ion-header-bar>
 

diff --git a/bower.json b/bower.json
@@ -15,9 +15,9 @@
     "angular-mocks": "~1.5.0"
   },
   "resolutions": {
-    "angular": "~1.5.0",
-    "angular-animate": "~1.5.0",
-    "angular-sanitize": "~1.5.0",
+    "angular": "~1.5.11",
+    "angular-animate": "~1.5.11",
+    "angular-sanitize": "~1.5.11",
     "angular-ui-router": "~0.4.2"
   },
   "name": "my-project",

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,9 +11,9 @@ var paths = gulp.paths = {
   dist: 'www',
   jsFiles: ['app/**/*.js', '!app/bower_components/**/*.js'],
   jsonFiles: ['app/**/*.json', '!app/bower_components/**/*.json'],
-  scssFiles: ['app/*/styles/**/*.scss'],
+  scssFiles: ['app/*/styles/**/*.scss', 'app/*/components/**/*.scss'],
   cssFiles: ['.tmp/*/styles/*.css'],
-  templates: ['app/*/templates/**/*'],
+  templates: ['app/*/templates/**/*.html', 'app/*/components/**/*.html'],
   contrib: ['gulpfile.js', 'gulp/**/*.js', 'hooks/**/*.js'],
   karma: ['test/karma/**/*.js'],
   protractor: ['test/protractor/**/*.js']

diff --git a/package.json b/package.json
@@ -13,7 +13,8 @@
     "run:ios": "gulp --cordova 'run ios",
     "run:android": "gulp --cordova 'run android'",
     "watch:build": "gulp watch-build",
-    "build": "gulp build --minify"
+    "build": "gulp build --minify",
+    "postinstall": "./node_modules/protractor/bin/webdriver-manager update"
   },
   "devDependencies": {
     "browser-sync": "^2.8.3",
@@ -26,7 +27,7 @@
     "gulp-angular-filesort": "^1.1.1",
     "gulp-autoprefixer": "^3.0.1",
     "gulp-changed": "^2.0.0",
-    "gulp-csso": "^2.0.0",
+    "gulp-csso": "^3.0.0",
     "gulp-eslint": "^3.0.0",
     "gulp-filter": "^5.0.0",
     "gulp-htmlmin": "^3.0.0",
@@ -38,7 +39,7 @@
     "gulp-natural-sort": "^0.1.0",
     "gulp-ng-annotate": "^2.0.0",
     "gulp-plumber": "^1.0.1",
-    "gulp-protractor": "^3.0.0",
+    "gulp-protractor": "^4.1.0",
     "gulp-rename": "^1.2.2",
     "gulp-rev": "^7.1.2",
     "gulp-rev-replace": "^0.4.3",
@@ -54,12 +55,13 @@
     "karma-jasmine": "^1.0.2",
     "karma-ng-html2js-preprocessor": "^1.0.0",
     "karma-phantomjs-launcher": "^1.0.0",
-    "karma-spec-reporter": "^0.0.30",
+    "karma-spec-reporter": "^0.0.31",
     "lodash": "^4.3.0",
     "main-bower-files": "^2.9.0",
     "minimist": "^1.2.0",
     "phantomjs-prebuilt": "^2.1.4",
     "plist": "git://github.com/akofman/plist.js.git#3f256fd21ab3ad3ada0f491cfc905098a2631342",
+    "protractor": "^5.1.1",
     "proxy-middleware": "^0.15.0",
     "require-dir": "^0.3.0",
     "vinyl-paths": "^2.0.0",

diff --git a/test/karma/main/mini-component.spec.js b/test/karma/main/mini-component.spec.js
@@ -0,0 +1,17 @@
+'use strict';
+
+describe('module: main, component: mini', function () {
+  var $componentController;
+
+  beforeEach(module('main'));
+  beforeEach(inject(function (_$componentController_) {
+    $componentController = _$componentController_;
+  }));
+
+  it('controller exists', function () {
+    // Here we are passing actual bindings to the component
+    var ctrl = $componentController('mini');
+
+    expect(ctrl).toBeDefined();
+  });
+});
diff --git a/test/protractor/side/debug.spec.js b/test/protractor/side/debug.spec.js
@@ -3,7 +3,7 @@
 describe('Debug page', function () {
 
   beforeEach(function () {
-    browser.get('/#/side/debug');
+    browser.get('#/side/debug');
   });
 
   it('should grade passwords', function () {