From 675e9768b7782d44c6932b085ff50ad4f5509063 Mon Sep 17 00:00:00 2001 From: stherrienaspnet Date: Tue, 7 Mar 2017 14:45:05 -0500 Subject: [PATCH 1/4] Fixed angular-validation-match integration --- templates/app/client/app/app.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/app/client/app/app.js b/templates/app/client/app/app.js index 2937399dd..c4ed63bb8 100644 --- a/templates/app/client/app/app.js +++ b/templates/app/client/app/app.js @@ -4,6 +4,8 @@ import angular from 'angular'; import ngCookies from 'angular-cookies'; import ngResource from 'angular-resource'; import ngSanitize from 'angular-sanitize'; +import ngValidationMatch from 'angular-validation-match'; + <%_ if(filters.socketio) { _%> import 'angular-socket-io';<% } %> <%_ if(filters.ngroute) { _%> @@ -14,7 +16,6 @@ import uiRouter from 'angular-ui-router';<% } %> import uiBootstrap from 'angular-ui-bootstrap';<% } %> // import ngMessages from 'angular-messages'; <%_ if(filters.auth) { _%> -// import ngValidationMatch from 'angular-validation-match';<% } %> import {routeConfig} from './app.config'; @@ -38,6 +39,7 @@ angular.module('<%= scriptAppName %>', [ ngCookies, ngResource, ngSanitize, + 'validation.match', <%_ if(filters.socketio) { %> 'btford.socket-io',<% } %> <%_ if(filters.ngroute) { %> From 52d0fcdbcdb7780f1d05f2a53ab7c4fbd6a16cbb Mon Sep 17 00:00:00 2001 From: stherrienaspnet Date: Tue, 7 Mar 2017 16:16:59 -0500 Subject: [PATCH 2/4] Fixed last commit --- templates/app/client/app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/app/client/app/app.js b/templates/app/client/app/app.js index c4ed63bb8..0d1c8eb4b 100644 --- a/templates/app/client/app/app.js +++ b/templates/app/client/app/app.js @@ -5,7 +5,6 @@ import ngCookies from 'angular-cookies'; import ngResource from 'angular-resource'; import ngSanitize from 'angular-sanitize'; import ngValidationMatch from 'angular-validation-match'; - <%_ if(filters.socketio) { _%> import 'angular-socket-io';<% } %> <%_ if(filters.ngroute) { _%> @@ -16,6 +15,7 @@ import uiRouter from 'angular-ui-router';<% } %> import uiBootstrap from 'angular-ui-bootstrap';<% } %> // import ngMessages from 'angular-messages'; <%_ if(filters.auth) { _%> +// <% } %> import {routeConfig} from './app.config'; From 0ee708f452b706decef949e98a69d93b106f384f Mon Sep 17 00:00:00 2001 From: stherrienaspnet Date: Wed, 8 Mar 2017 19:41:25 -0500 Subject: [PATCH 3/4] Removed comment --- templates/app/client/app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/app/client/app/app.js b/templates/app/client/app/app.js index 0d1c8eb4b..e86e3e4ff 100644 --- a/templates/app/client/app/app.js +++ b/templates/app/client/app/app.js @@ -15,7 +15,7 @@ import uiRouter from 'angular-ui-router';<% } %> import uiBootstrap from 'angular-ui-bootstrap';<% } %> // import ngMessages from 'angular-messages'; <%_ if(filters.auth) { _%> -// <% } %> +<% } %> import {routeConfig} from './app.config'; From e6b24b33b5ef5c22249da893afe6eaf5e4b085a0 Mon Sep 17 00:00:00 2001 From: stherrienaspnet Date: Wed, 8 Mar 2017 20:14:11 -0500 Subject: [PATCH 4/4] Display Generator Version --- src/generators/app/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/generators/app/index.js b/src/generators/app/index.js index d66e6f9c6..c1ce3c28a 100644 --- a/src/generators/app/index.js +++ b/src/generators/app/index.js @@ -96,6 +96,7 @@ export class Generator extends Base { }, info: function () { this.log(this.yoWelcome); + this.log('Angular Fullstack v' + this.rootGeneratorVersion() +'\n'); this.log('Out of the box I create an AngularJS app with an Express server.\n'); }, checkForConfig: function() {