diff --git a/.npmignore b/.npmignore index ec6ff802d..c823223d9 100644 --- a/.npmignore +++ b/.npmignore @@ -1,2 +1,3 @@ angular-fullstack-deps test +.idea diff --git a/angular-fullstack-deps b/angular-fullstack-deps index 29cd1a011..7c3662328 160000 --- a/angular-fullstack-deps +++ b/angular-fullstack-deps @@ -1 +1 @@ -Subproject commit 29cd1a01184213b1c4a278d0f98b9a46ef000c7d +Subproject commit 7c3662328ffd32f819ae381825399ed578c11f98 diff --git a/app/generator.js b/app/generator.js index 5bb5bc92d..cd5e5d1be 100644 --- a/app/generator.js +++ b/app/generator.js @@ -144,7 +144,9 @@ export default class Generator extends Base { this.scriptExt = answers.transpiler === 'ts' ? 'ts' : 'js'; this.templateExt = answers.markup; - this.styleExt = answers.stylesheet === 'sass' ? 'scss' : answers.stylesheet; + + var styleExt = {sass: 'scss', stylus: 'styl'}[answers.stylesheet]; + this.styleExt = styleExt ? styleExt : answers.stylesheet; cb(); }.bind(this)); diff --git a/app/templates/Gruntfile(grunt).js b/app/templates/Gruntfile(grunt).js index 87846d184..5f12dcfce 100644 --- a/app/templates/Gruntfile(grunt).js +++ b/app/templates/Gruntfile(grunt).js @@ -161,7 +161,7 @@ module.exports = function (grunt) { }, src: ['<%%= yeoman.server %>/**/*.{spec,integration}.js'] }, - all: ['<%%= yeoman.client %>/{app,components}/**/!(*.spec|*.mock).js'], + all: ['<%%= yeoman.client %>/{app,components}/**/!(*.spec|*.mock|app.constant).js'], test: { src: ['<%%= yeoman.client %>/{app,components}/**/*.{spec,mock}.js'] } @@ -424,7 +424,8 @@ module.exports = function (grunt) { dest: '<%%= yeoman.dist %>', src: [ 'package.json', - '<%%= yeoman.server %>/**/*' + '<%%= yeoman.server %>/**/*', + '!<%%= yeoman.server %>/config/local.env.sample.js' ] }] }, @@ -636,7 +637,7 @@ module.exports = function (grunt) { files: [{ expand: true, cwd: '<%%= yeoman.server %>', - src: ['**/*.{js,json}'], + src: ['**/*.js'], dest: '<%%= yeoman.dist %>/<%%= yeoman.server %>' }] } diff --git a/app/templates/_bower.json b/app/templates/_bower.json index b0de0c559..59b5007ca 100644 --- a/app/templates/_bower.json +++ b/app/templates/_bower.json @@ -12,7 +12,7 @@ "angular-cookies": "~1.4.0", "angular-sanitize": "~1.4.0",<% if (filters.ngroute) { %> "angular-route": "~1.4.0",<% } if (filters.uibootstrap) { %> - "angular-bootstrap": "~0.13.0",<% } %> + "angular-bootstrap": "~1.1.2",<% } %> "font-awesome": ">=4.1.0", "lodash": "~2.4.1"<% if(filters.socketio) { %>, "angular-socket-io": "~0.7.0"<% } if (filters.uirouter) { %>, diff --git a/app/templates/_package.json b/app/templates/_package.json index 13c47e4e3..b68dc4c34 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -150,8 +150,8 @@ "karma-ng-jade2js-preprocessor": "^0.2.0",<% } else { %> "karma-ng-html2js-preprocessor": "~0.2.0",<% } %> "karma-spec-reporter": "~0.0.20", - "sinon-chai": "^2.8.0",<% if (filters.mocha) { %> - "mocha": "^2.2.5", + "sinon-chai": "^2.8.0", + "mocha": "^2.2.5",<% if (filters.mocha) { %> "karma-mocha": "^0.2.0", "karma-chai-plugins": "^0.6.0",<% } if (filters.jasmine) { %> "jasmine-core": "^2.3.4", diff --git a/app/templates/client/app/app(less).less b/app/templates/client/app/app(less).less index 9cfcfdb16..db107e3e5 100644 --- a/app/templates/client/app/app(less).less +++ b/app/templates/client/app/app(less).less @@ -24,7 +24,6 @@ } <% } %> // injector -@import 'account/login/login.less'; @import 'admin/admin.less'; @import 'main/main.less'; // endinjector diff --git a/app/templates/client/app/app(sass).scss b/app/templates/client/app/app(sass).scss index e20f3f0ad..fc95c6bdc 100644 --- a/app/templates/client/app/app(sass).scss +++ b/app/templates/client/app/app(sass).scss @@ -24,7 +24,6 @@ <% } %> // Component styles are injected through grunt // injector -@import 'account/login/login.scss'; @import 'admin/admin.scss'; @import 'main/main.scss'; // endinjector diff --git a/app/templates/client/app/app(stylus).styl b/app/templates/client/app/app(stylus).styl index de156ca97..ffb293544 100644 --- a/app/templates/client/app/app(stylus).styl +++ b/app/templates/client/app/app(stylus).styl @@ -45,7 +45,6 @@ <% } %> // Component styles are injected through grunt // injector -@import "account/login/login" @import "admin/admin" @import "main/main" // endinjector diff --git a/app/templates/client/app/main/main(html).html b/app/templates/client/app/main/main(html).html index 0ee458852..1c413a22a 100644 --- a/app/templates/client/app/main/main(html).html +++ b/app/templates/client/app/main/main(html).html @@ -11,7 +11,7 @@

'Allo, 'Allo!

Features:

<% if (filters.socketio) { %> diff --git a/app/templates/client/app/main/main(jade).jade b/app/templates/client/app/main/main(jade).jade index 3191ca2d2..5a732f9dc 100644 --- a/app/templates/client/app/main/main(jade).jade +++ b/app/templates/client/app/main/main(jade).jade @@ -10,7 +10,7 @@ header#banner.hero-unit h1.page-header Features: ul.nav.nav-tabs.nav-stacked.col-md-4.col-lg-4.col-sm-6(ng-repeat='thing in main.awesomeThings') li - a(href='#', tooltip='{{thing.info}}') + a(href='#', uib-tooltip='{{thing.info}}') | {{thing.name}}<% if (filters.socketio) { %> button.close(type='button', ng-click='main.deleteThing(thing)') ×<% } %><% if (filters.socketio) { %> diff --git a/app/templates/client/components/modal(uibootstrap)/modal.service.js b/app/templates/client/components/modal(uibootstrap)/modal.service.js index d878f69dd..d7807e6b5 100644 --- a/app/templates/client/components/modal(uibootstrap)/modal.service.js +++ b/app/templates/client/components/modal(uibootstrap)/modal.service.js @@ -1,19 +1,19 @@ 'use strict'; angular.module('<%= scriptAppName %>') - .factory('Modal', function($rootScope, $modal) { + .factory('Modal', function($rootScope, $uibModal) { /** * Opens a modal * @param {Object} scope - an object to be merged with modal's scope * @param {String} modalClass - (optional) class(es) to be applied to the modal - * @return {Object} - the instance $modal.open() returns + * @return {Object} - the instance $uibModal.open() returns */ function openModal(scope = {}, modalClass = 'modal-default') { var modalScope = $rootScope.$new(); angular.extend(modalScope, scope); - return $modal.open({ + return $uibModal.open({ templateUrl: 'components/modal/modal.html', windowClass: modalClass, scope: modalScope diff --git a/app/templates/client/components/navbar/navbar(html).html b/app/templates/client/components/navbar/navbar(html).html index 8337fb6c2..4b6692d36 100644 --- a/app/templates/client/components/navbar/navbar(html).html +++ b/app/templates/client/components/navbar/navbar(html).html @@ -9,7 +9,7 @@ <%= lodash.slugify(lodash.humanize(appname)) %> -