Built using Angular Fullstack v2.0.9 from commit e3fd00f

DaftMonk · Aug 16, 2014 · 118f576 · 118f576
1 parent 35dc1ad
commit 118f576
Show file tree

Hide file tree

Showing 44 changed files with 208 additions and 185 deletions.
diff --git a/.buildignore b/.buildignore
@@ -0,0 +1 @@
+*.coffee
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ node_modules
 public
 .tmp
 .sass-cache
+.idea
 client/bower_components
 dist
 /server/config/local.env.js
diff --git a/.travis.yml b/.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
+  - gem install sass
+  - bower install
 services: mongodb
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -3,6 +3,8 @@
     "insertRoutes": true,
     "registerRoutesFile": "server/routes.js",
     "routesNeedle": "// Insert routes below",
+    "routesBase": "/api/",
+    "pluralizeRoutes": true,
     "insertSockets": true,
     "registerSocketsFile": "server/config/socketio.js",
     "socketsNeedle": "// Insert sockets below",
@@ -14,6 +16,7 @@
       "socketio": true,
       "mongoose": true,
       "auth": true,
+      "oauth": true,
       "googleAuth": true,
       "twitterAuth": true
     }

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,6 +1,13 @@
+// Generated on 2014-08-16 using generator-angular-fullstack 2.0.9
 'use strict';
 
 module.exports = function (grunt) {
+  var localConfig;
+  try {
+    localConfig = require('./server/config/local.env');
+  } catch(e) {
+    localConfig = {};
+  }
 
   // Load grunt tasks automatically, when needed
   require('jit-grunt')(grunt, {
@@ -9,7 +16,8 @@ module.exports = function (grunt) {
     ngtemplates: 'grunt-angular-templates',
     cdnify: 'grunt-google-cdn',
     protractor: 'grunt-protractor-runner',
-    injector: 'grunt-asset-injector'
+    injector: 'grunt-asset-injector',
+    buildcontrol: 'grunt-build-control'
   });
 
   // Time how long tasks take. Can help when optimizing build times
@@ -19,6 +27,7 @@ module.exports = function (grunt) {
   grunt.initConfig({
 
     // Project settings
+    pkg: grunt.file.readJSON('package.json'),
     yeoman: {
       // configurable paths
       client: require('./bower.json').appPath || 'client',
@@ -201,11 +210,11 @@ module.exports = function (grunt) {
     },
 
     // Automatically inject Bower components into the app
-    bowerInstall: {
+    wiredep: {
       target: {
         src: '<%= yeoman.client %>/index.html',
         ignorePath: '<%= yeoman.client %>/',
-        exclude: [/bootstrap-sass-official/, /bootstrap.js/, /bootstrap.css/, /font-awesome.css/ ]
+        exclude: [/bootstrap-sass-official/, /bootstrap.js/, '/json3/', '/es5-shim/', /bootstrap.css/, /font-awesome.css/ ]
       }
     },
 
@@ -277,7 +286,7 @@ module.exports = function (grunt) {
 
     // Allow the use of non-minsafe AngularJS files. Automatically makes it
     // minsafe compatible so Uglify does not destroy the ng references
-    ngmin: {
+    ngAnnotate: {
       dist: {
         files: [{
           expand: true,
@@ -292,7 +301,7 @@ module.exports = function (grunt) {
     ngtemplates: {
       options: {
         // This should be the name of your apps angular module
-        module: 'fullstackDemoApp',
+        module: 'demoApp',
         htmlmin: {
           collapseBooleanAttributes: true,
           collapseWhitespace: true,
@@ -319,7 +328,7 @@ module.exports = function (grunt) {
     // Replace Google CDN references
     cdnify: {
       dist: {
-        html: ['<%= yeoman.dist %>/*.html']
+        html: ['<%= yeoman.dist %>/public/*.html']
       }
     },
 
@@ -361,6 +370,28 @@ module.exports = function (grunt) {
       }
     },
 
+    buildcontrol: {
+      options: {
+        dir: 'dist',
+        commit: true,
+        push: true,
+        connectCommits: false,
+        message: 'Built %sourceName% from commit %sourceCommit% on branch %sourceBranch%'
+      },
+      heroku: {
+        options: {
+          remote: 'heroku',
+          branch: 'master'
+        }
+      },
+      openshift: {
+        options: {
+          remote: 'openshift',
+          branch: 'master'
+        }
+      }
+    },
+
     // Run some tasks in parallel to speed up the build process
     concurrent: {
       server: [
@@ -420,7 +451,7 @@ module.exports = function (grunt) {
       prod: {
         NODE_ENV: 'production'
       },
-      all: require('./server/config/local.env')
+      all: localConfig
     },
 
     // Compiles Sass to CSS
@@ -513,7 +544,7 @@ module.exports = function (grunt) {
     setTimeout(function () {
       grunt.log.writeln('Done waiting!');
       done();
-    }, 500);
+    }, 1500);
   });
 
   grunt.registerTask('express-keepalive', 'Keep grunt running', function() {
@@ -522,7 +553,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('serve', function (target) {
     if (target === 'dist') {
-      return grunt.task.run(['build', 'env:all', 'env:prod', 'express:prod', 'open', 'express-keepalive']);
+      return grunt.task.run(['build', 'env:all', 'env:prod', 'express:prod', 'wait', 'open', 'express-keepalive']);
     }
 
     if (target === 'debug') {
@@ -532,7 +563,7 @@ module.exports = function (grunt) {
         'injector:sass', 
         'concurrent:server',
         'injector',
-        'bowerInstall',
+        'wiredep',
         'autoprefixer',
         'concurrent:debug'
       ]);
@@ -544,7 +575,7 @@ module.exports = function (grunt) {
       'injector:sass', 
       'concurrent:server',
       'injector',
-      'bowerInstall',
+      'wiredep',
       'autoprefixer',
       'express:dev',
       'wait',
@@ -587,7 +618,7 @@ module.exports = function (grunt) {
         'injector:sass', 
         'concurrent:test',
         'injector',
-        'bowerInstall',
+        'wiredep',
         'autoprefixer',
         'express:dev',
         'protractor'
@@ -605,12 +636,12 @@ module.exports = function (grunt) {
     'injector:sass', 
     'concurrent:dist',
     'injector',
-    'bowerInstall',
+    'wiredep',
     'useminPrepare',
     'autoprefixer',
     'ngtemplates',
     'concat',
-    'ngmin',
+    'ngAnnotate',
     'copy:dist',
     'cdnify',
     'cssmin',

diff --git a/bower.json b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "fullstack-demo",
+  "name": "demo",
   "version": "0.0.0",
   "dependencies": {
     "angular": ">=1.2.*",

diff --git a/client/app/account/account.js b/client/app/account/account.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('fullstackDemoApp')
+angular.module('demoApp')
   .config(function ($stateProvider) {
     $stateProvider
       .state('login', {
@@ -16,6 +16,7 @@ angular.module('fullstackDemoApp')
       .state('settings', {
         url: '/settings',
         templateUrl: 'app/account/settings/settings.html',
-        controller: 'SettingsCtrl'
+        controller: 'SettingsCtrl',
+        authenticate: true
       });
   });
diff --git a/client/app/account/login/login.controller.js b/client/app/account/login/login.controller.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('fullstackDemoApp')
+angular.module('demoApp')
   .controller('LoginCtrl', function ($scope, Auth, $location, $window) {
     $scope.user = {};
     $scope.errors = {};

diff --git a/client/app/account/login/login.html b/client/app/account/login/login.html
@@ -4,27 +4,32 @@
   <div class="row">
     <div class="col-sm-12">
       <h1>Login</h1>
-      <p>Try <a href="/signup">creating an account</a>, it's super easy!</p>
+      <p>Accounts are reset on server restart from <code>server/config/seed.js</code>. Default account is <code>test@test.com</code> / <code>test</code></p>
+      <p>Admin account is <code>admin@admin.com</code> / <code>admin</code></p>
     </div>
     <div class="col-sm-12">
       <form class="form" name="form" ng-submit="login(form)" novalidate>
 
         <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>
 
@@ -37,7 +42,6 @@ <h1>Login</h1>
           </a>
         </div>
 
-
         <hr>
         <div>
           <a class="btn btn-google-plus" href="" ng-click="loginOauth('google')">
@@ -51,4 +55,4 @@ <h1>Login</h1>
     </div>
   </div>
   <hr>
-</div>
+</div>
diff --git a/client/app/account/login/login.scss b/client/app/account/login/login.scss
@@ -4,34 +4,22 @@
 $btnText:                           #fff;
 $btnTextAlt:                        #000;
 
-$btnFacebookBackground:             #3B5998;
-$btnFacebookBackgroundHighlight:    #133783;
-
 $btnTwitterBackground:              #2daddc;
 $btnTwitterBackgroundHighlight:     #0271bf;
-
-$btnGithubBackground:               #fafafa;
-$btnGithubBackgroundHighlight:      #ccc;
-
 $btnGooglePlusBackground:           #dd4b39;
 $btnGooglePlusBackgroundHighlight:  #c53727;
-
+$btnGithubBackground:               #fafafa;
+$btnGithubBackgroundHighlight:      #ccc;
 
 // Social buttons
 // --------------------------------------------------
 
-.btn-facebook {
-  @include button-variant($btnText, $btnFacebookBackgroundHighlight, $btnFacebookBackgroundHighlight);
-}
-
 .btn-twitter {
   @include button-variant($btnText, $btnTwitterBackground, $btnTwitterBackgroundHighlight);
 }
-
+.btn-google-plus {
+  @include button-variant($btnText, $btnGooglePlusBackground, $btnGooglePlusBackgroundHighlight);
+}
 .btn-github {
   @include button-variant($btnTextAlt, $btnGithubBackground, $btnGithubBackgroundHighlight);
 }
-
-.btn-google-plus {
-  @include button-variant($btnText, $btnGooglePlusBackground, $btnGooglePlusBackgroundHighlight);
-}
diff --git a/client/app/account/settings/settings.controller.js b/client/app/account/settings/settings.controller.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('fullstackDemoApp')
+angular.module('demoApp')
   .controller('SettingsCtrl', function ($scope, User, Auth) {
     $scope.errors = {};
 

diff --git a/client/app/account/signup/signup.controller.js b/client/app/account/signup/signup.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
-angular.module('fullstackDemoApp')
-  .controller('SignupCtrl', function ($scope, Auth, $location) {
+angular.module('demoApp')
+  .controller('SignupCtrl', function ($scope, Auth, $location, $window) {
     $scope.user = {};
     $scope.errors = {};
 
@@ -30,4 +30,8 @@ angular.module('fullstackDemoApp')
         });
       }
     };
-  });
+
+    $scope.loginOauth = function(provider) {
+      $window.location.href = '/auth/' + provider;
+    };
+  });
diff --git a/client/app/account/signup/signup.html b/client/app/account/signup/signup.html
@@ -62,7 +62,18 @@ <h1>Sign up</h1>
             Login
           </a>
         </div>
+
+        <hr>
+        <div>
+          <a class="btn btn-google-plus" href="" ng-click="loginOauth('google')">
+            <i class="fa fa-google-plus"></i> Connect with Google+
+          </a>
+          <a class="btn btn-twitter" href="" ng-click="loginOauth('twitter')">
+            <i class="fa fa-twitter"></i> Connect with Twitter
+          </a>
+        </div>
       </form>
     </div>
   </div>
-</div>
+  <hr>
+</div>