Skip to content

Async Module Missing #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d31c494
Porting scss template instead of less
Lunatic83 Oct 10, 2014
3daa16a
Gulp migration in progress, scss completed
Lunatic83 Oct 13, 2014
dca09b0
Gulp migration in progress, scss completed
Lunatic83 Oct 13, 2014
27546a2
Gulp html working
Lunatic83 Oct 14, 2014
b84e562
Sources moved into app
Lunatic83 Oct 15, 2014
2c6ab34
Fix modal templateUrl path
Lunatic83 Oct 15, 2014
067be8f
Gulp file app path fixed
Lunatic83 Oct 15, 2014
02dc93b
Gulp watch fixed
Lunatic83 Oct 15, 2014
c749675
Fix gulp watch and index.html template
Lunatic83 Oct 17, 2014
7c965cc
Fix gulpfile watch css
Lunatic83 Oct 17, 2014
e7aa2b8
Architecture started and cg-gas working
Lunatic83 Oct 21, 2014
afd9682
Module adapted for cg-gas:architecture
Lunatic83 Oct 22, 2014
09bce55
Architecture completed
Lunatic83 Oct 24, 2014
2bd83c1
Architecture completed
Lunatic83 Oct 24, 2014
4231f09
Readme update 3.2.1
Lunatic83 Oct 24, 2014
3735d0d
Readme update 3.2.1
Lunatic83 Oct 24, 2014
aef493c
Fix architecture and skipinit added
Lunatic83 Oct 27, 2014
ee5d4ae
fix partial, architecture skipinit developed, readme.md updated
Lunatic83 Oct 28, 2014
ed34f5d
3.3.1 Merging Gulp angular-kickstart management and app structure.
Lunatic83 Nov 10, 2014
491cb28
fix readme client app
Lunatic83 Nov 10, 2014
30c2b49
fix architecture.js readme
Lunatic83 Nov 10, 2014
af33430
fix architecture.js readme
Lunatic83 Nov 10, 2014
fb92669
fix architecture.js readme
Lunatic83 Nov 10, 2014
51e5f9f
Release version fixed
Lunatic83 Nov 10, 2014
1e3e58f
v3.3.2 - Changed AngularJS from 1.2 to 1.3 and all other dependences,…
Lunatic83 Nov 19, 2014
d08a908
3.3.3 npm publish fixed
Lunatic83 Nov 19, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
language: node_js
node_js:
- '0.8'
- '0.10'
before_install:
- 'gem update --system'
- 'gem install sass'
- 'npm install -g gulp'
- 'npm install -g bower'
- 'bower install'
branches:
only:
- master
215 changes: 137 additions & 78 deletions README.md

Large diffs are not rendered by default.

68 changes: 46 additions & 22 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ var CgangularGenerator = module.exports = function CgangularGenerator(args, opti
marker: cgUtils.JS_MARKER,
template: '<script src="<%= filename %>"></script>'
},
less: {
scss: {
relativeToModule: true,
file: '<%= module %>.less',
marker: cgUtils.LESS_MARKER,
file: '<%= module %>.scss',
marker: cgUtils.SCSS_MARKER,
template: '@import "<%= filename %>";'
}
};
this.config.set('inject',inject);
this.config.save();
this.installDependencies({ skipInstall: options['skip-install'] });
this.installDependencies({ skipInstall: options['skip-install'], callback: options.callback});
});

this.pkg = JSON.parse(this.readFileAsString(path.join(__dirname, '../package.json')));
Expand All @@ -38,31 +38,53 @@ util.inherits(CgangularGenerator, yeoman.generators.Base);
CgangularGenerator.prototype.askFor = function askFor() {
var cb = this.async();

var prompts = [{
name: 'appname',
message: 'What would you like the angular app/module name to be?',
default: path.basename(process.cwd())
}];
if(this.options.appoptions===undefined || this.options.appoptions.name===undefined){
var prompts = [{
name: 'appname',
message: 'What would you like the angular app/module name to be?',
default: path.basename(process.cwd())
}];

this.prompt(prompts, function (props) {
this.appname = props.appname;
this.prompt(prompts, function (props) {
this.appname = props.appname;
cb();
}.bind(this));
}else{
this.appname = this.options.appoptions.name;
cb();
}.bind(this));
}

};

CgangularGenerator.prototype.askForUiRouter = function askFor() {
var cb = this.async();

var prompts = [{
name: 'router',
type:'list',
message: 'Which router would you like to use?',
default: 0,
choices: ['Standard Angular Router','Angular UI Router']
}];
if(this.options.appoptions===undefined || this.options.appoptions.uirouter===undefined){
var prompts = [{
name: 'router',
type:'list',
message: 'Which router would you like to use?',
default: 0,
choices: ['Standard Angular Router','Angular UI Router [optimized]']
}];

this.prompt(prompts, function (props) {
if (props.router === 'Angular UI Router') {
this.prompt(prompts, function (props) {
if (props.router === 'Angular UI Router [optimized]') {
this.uirouter = true;
this.routerJs = 'bower_components/angular-ui-router/release/angular-ui-router.js';
this.routerModuleName = 'ui.router';
this.routerViewDirective = 'ui-view';
} else {
this.uirouter = false;
this.routerJs = 'bower_components/angular-route/angular-route.js';
this.routerModuleName = 'ngRoute';
this.routerViewDirective = 'ng-view';
}
this.config.set('uirouter',this.uirouter);
cb();
}.bind(this));
}else{
if(this.options.appoptions.uirouter){
this.uirouter = true;
this.routerJs = 'bower_components/angular-ui-router/release/angular-ui-router.js';
this.routerModuleName = 'ui.router';
Expand All @@ -73,9 +95,11 @@ CgangularGenerator.prototype.askForUiRouter = function askFor() {
this.routerModuleName = 'ngRoute';
this.routerViewDirective = 'ng-view';
}

this.config.set('uirouter',this.uirouter);
cb();
}.bind(this));
}

};

CgangularGenerator.prototype.app = function app() {
Expand Down
3 changes: 2 additions & 1 deletion app/templates/skeleton/.bowerrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"directory" : "bower_components"
"directory": "app/vendor",
"json": "bower.json"
}
6 changes: 4 additions & 2 deletions app/templates/skeleton/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
temp/
.tmp/
dist/
node_modules/
_SpecRunner.html
.DS_Store
test-results.xml
test-results.xml
bower_components/
.sass_cache/
5 changes: 4 additions & 1 deletion app/templates/skeleton/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"eqnull": true,
"browser": true,
"smarttabs": true,
"node": true,
"globals": {
"jQuery": true,
"angular": true,
Expand All @@ -26,6 +27,8 @@
"expect": true,
"xdescribe": true,
"xit": true,
"spyOn": true
"spyOn": true,
"require": true,
"strict":false
}
}
12 changes: 12 additions & 0 deletions app/templates/skeleton/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
language: node_js
node_js:
- '0.10'
before_install:
- 'gem update --system'
- 'gem install sass'
- 'npm install -g gulp'
- 'npm install -g bower'
- 'bower install'
branches:
only:
- master
Loading