Skip to content
This repository has been archived by the owner on Jul 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
* dev: (23 commits)
  update deps
  #490: yarn protractor issues - add protractor and postinstallgs
  #511: component subgenerator - docs
  #511: only generate component with module on main module to avoid component name conflicts
  fix: generators/app/index.js barColor generation for _index.html
  #511: generate component with module
  #511: component-subgenerator - check if module.scss exists with try/catch rather than fs in order to make it work during first run of /generator/app
  #511: component-subgenerator - add import to module's scss
  #511: component-subgenerator - add test file for component, test the subgenerator with other modules than main
  #511: component-subgenerator - finish basic implementation, allow camelCase names
  #511: component-subgenerator - finish basic implementation, with tests and gulpfile update
  #511: component-subgenerator - start implementation
  fix build
  break build
  #495: mattermost - turn slack integration back on
  #481: remove gulp update - fix tests
  #495: mattermost - turn slack integration back on
  #481: remove gulp update
  #512: bower - resolutions for angular 1.5.11
  #481: remove generator apiomat
  ...
  • Loading branch information
gruppjo committed Apr 12, 2017
2 parents 5b3f9c1 + 8cb52a9 commit 24885d0
Show file tree
Hide file tree
Showing 35 changed files with 310 additions and 936 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,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
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,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
Expand All @@ -88,13 +98,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.
Expand Down Expand Up @@ -123,7 +126,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
Expand All @@ -135,8 +137,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:
Expand Down
142 changes: 0 additions & 142 deletions docs/ecosystems/apiomat.md

This file was deleted.

46 changes: 0 additions & 46 deletions docs/ecosystems/appmobi.md

This file was deleted.

76 changes: 0 additions & 76 deletions docs/guides/generator_update.md

This file was deleted.

31 changes: 30 additions & 1 deletion docs/guides/sub_generators.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,36 @@ As you develop your app you'll want to add additional components. That's where t
- `/<module-name-in-kebap-case>/list` for `sidemenu` and `tabs` templates
4. **Done!** - see your new module in action!

#### AngularJS components
#### AngularJS Components
[AngularJS Components](https://docs.angularjs.org/guide/component) can be handily generated with the following command:

```sh
yo m-ionic:component <componentName>
```

This generates the following four files:
- a component.js file
- a component.html file
- a component.scss file
- a component.spec.js file

![image](https://cloud.githubusercontent.com/assets/1370779/24964446/95269e4c-1fa1-11e7-977b-6b97293d4458.png)

To include your component somewhere in your app, use the following syntax:
```html
<mini
content="'some content via attribute'">
Some <span class="green">transcluded</span> content
</mini>
```

**Note:** You should probably **restart your gulp watch** task.

More details on AngularJS Components can be found here:
- https://docs.angularjs.org/guide/component
- https://toddmotto.com/exploring-the-angular-1-5-component-method/

#### Other AngularJS building blocks
A handy and fast way to create different angular components, handling all the boilerplate and test file generation for you.
The `<moduleName>` is optional and defaults to the main module when left blank
```sh
Expand Down
Loading

0 comments on commit 24885d0

Please sign in to comment.