Merge branch 'master' of github.com:DaftMonk/generator-angular-fullstack

Author: DaftMonk

app/index.js

@@ -42,6 +42,16 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({
         default: true,
       }], function (answers) {
         this.skipConfig = answers.skipConfig;
+
+        // NOTE: temp(?) fix for #403
+        if(typeof this.oauth==='undefined') {
+          var strategies = Object.keys(this.filters).filter(function(key) {
+            return key.match(/Auth$/) && key;
+          });
+
+          if(strategies.length) this.config.set('oauth', true);
+        }
+
         cb();
       }.bind(this));
     } else {

app/templates/.travis.yml

@@ -1,8 +1,9 @@
 language: node_js
 node_js:
-  - '0.8'
   - '0.10'
+  - '0.11'
 before_script:
-  - 'npm install -g bower grunt-cli'
-  - 'bower install'
+  - npm install -g bower grunt-cli<% if (filters.sass) { %>
+  - gem install sass<% } %>
+  - bower install
 services: mongodb

app/templates/_package.json

@@ -56,7 +56,7 @@
     "grunt-nodemon": "~0.2.0",
     "grunt-angular-templates": "^0.5.4",
     "grunt-dom-munger": "^3.4.0",
-    "grunt-protractor-runner": "^0.2.4",
+    "grunt-protractor-runner": "^1.1.0",
     "grunt-asset-injector": "^0.1.0",
     "grunt-karma": "~0.8.2",
     "grunt-mocha-test": "~0.10.2",<% if(filters.sass) { %>

app/templates/client/app/account(auth)/login/login(html).html

@@ -13,19 +13,23 @@ <h1>Login</h1>
         <div class="form-group">
           <label>Email</label>
 
-          <input type="text" name="email" class="form-control" ng-model="user.email">
+          <input type="email" name="email" class="form-control" ng-model="user.email" required>
         </div>
 
         <div class="form-group">
           <label>Password</label>
 
-          <input type="password" name="password" class="form-control" ng-model="user.password">
+          <input type="password" name="password" class="form-control" ng-model="user.password" required>
         </div>
 
         <div class="form-group has-error">
           <p class="help-block" ng-show="form.email.$error.required && form.password.$error.required && submitted">
              Please enter your email and password.
           </p>
+          <p class="help-block" ng-show="form.email.$error.email && submitted">
+             Please enter a valid email.
+          </p>
+
           <p class="help-block">{{ errors.other }}</p>
         </div>
 

app/templates/client/app/admin(auth)/admin.controller(coffee).coffee

@@ -3,9 +3,8 @@
 angular.module '<%= scriptAppName %>'
 .controller 'AdminCtrl', ($scope, $http, Auth, User) ->
 
-  $http.get '/api/users'
-  .success (users) ->
-    $scope.users = users
+  # Use the User $resource to fetch all users
+  $scope.users = User.query()
 
   $scope.delete = (user) ->
     User.remove id: user._id

app/templates/client/app/admin(auth)/admin.controller(js).js

@@ -3,9 +3,8 @@
 angular.module('<%= scriptAppName %>')
   .controller('AdminCtrl', function ($scope, $http, Auth, User) {
 
-    $http.get('/api/users').success(function(users) {
-      $scope.users = users;
-    });
+    // Use the User $resource to fetch all users
+    $scope.users = User.query();
 
     $scope.delete = function(user) {
       User.remove({ id: user._id });

test/fixtures/package.json

@@ -56,7 +56,7 @@
     "grunt-nodemon": "~0.2.0",
     "grunt-angular-templates": "^0.5.4",
     "grunt-dom-munger": "^3.4.0",
-    "grunt-protractor-runner": "^0.2.4",
+    "grunt-protractor-runner": "^1.1.0",
     "grunt-asset-injector": "^0.1.0",
     "grunt-karma": "~0.8.2",
     "grunt-mocha-test": "~0.10.2",