Fixed up some jshint stuff

This commit is contained in:
Fergal Moran
2014-03-25 16:36:41 +00:00
parent ff20c82312
commit 512f8924fa
6 changed files with 111 additions and 115 deletions

View File

@@ -7,7 +7,6 @@
"curly": true, "curly": true,
"eqeqeq": true, "eqeqeq": true,
"immed": true, "immed": true,
"indent": 2,
"latedef": true, "latedef": true,
"newcap": true, "newcap": true,
"noarg": true, "noarg": true,

View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('robotoPromotoApp') angular.module('robotoPromotoApp')
.factory('Auth', function Auth($location, $rootScope, Session, User, $cookieStore) { .factory('Auth', function Auth($location, $rootScope, Session, User, $cookieStore) {
// Get currentUser from cookie // Get currentUser from cookie
$rootScope.currentUser = $cookieStore.get('user') || null; $rootScope.currentUser = $cookieStore.get('user') || null;
@@ -9,103 +9,100 @@ angular.module('robotoPromotoApp')
return { return {
/** /**
* Authenticate user * Authenticate user
* *
* @param {Object} user - login info * @param {Object} user - login info
* @param {Function} callback - optional * @param {Function} callback - optional
* @return {Promise} * @return {Promise}
*/ */
login: function(user, callback) { login: function(user, callback) {
var cb = callback || angular.noop; var cb = callback || angular.noop;
return Session.save({ return Session.save({
email: user.email, email: user.email,
password: user.password password: user.password
}, function(user) { }, function(user) {
$rootScope.currentUser = user; $rootScope.currentUser = user;
return cb(); return cb();
}, function(err) { }, function(err) {
return cb(err); return cb(err);
}).$promise; }).$promise;
}, },
/** /**
* Unauthenticate user * Unauthenticate user
* *
* @param {Function} callback - optional * @param {Function} callback - optional
* @return {Promise} * @return {Promise}
*/ */
logout: function(callback) { logout: function(callback) {
var cb = callback || angular.noop; var cb = callback || angular.noop;
return Session.delete(function() { return Session.delete(function() {
$rootScope.currentUser = null; $rootScope.currentUser = null;
return cb(); return cb();
}, },
function(err) { function(err) {
return cb(err); return cb(err);
}).$promise; }).$promise;
}, },
/** /**
* Create a new user * Create a new user
* *
* @param {Object} user - user info * @param {Object} user - user info
* @param {Function} callback - optional * @param {Function} callback - optional
* @return {Promise} * @return {Promise}
*/ */
createUser: function(user, callback) { createUser: function(user, callback) {
var cb = callback || angular.noop; var cb = callback || angular.noop;
return User.save(user, function(user) {
$rootScope.currentUser = user;
return cb(user);
}, function(err) {
return cb(err);
}).$promise;
},
return User.save(user, /**
function(user) { * Change password
$rootScope.currentUser = user; *
return cb(user); * @param {String} oldPassword
}, * @param {String} newPassword
function(err) { * @param {Function} callback - optional
return cb(err); * @return {Promise}
}).$promise; */
}, changePassword: function(oldPassword, newPassword, callback) {
var cb = callback || angular.noop;
/** return User.update({
* Change password oldPassword: oldPassword,
* newPassword: newPassword
* @param {String} oldPassword }, function(user) {
* @param {String} newPassword return cb(user);
* @param {Function} callback - optional }, function(err) {
* @return {Promise} return cb(err);
*/ }).$promise;
changePassword: function(oldPassword, newPassword, callback) { },
var cb = callback || angular.noop;
return User.update({ /**
oldPassword: oldPassword, * Gets all available info on authenticated user
newPassword: newPassword *
}, function(user) { * @return {Object} user
return cb(user); */
}, function(err) { currentUser: function() {
return cb(err); return User.get();
}).$promise; },
},
/** /**
* Gets all available info on authenticated user * Simple check to see if a user is logged in
* *
* @return {Object} user * @return {Boolean}
*/ */
currentUser: function() { isLoggedIn: function() {
return User.get(); var user = $rootScope.currentUser;
}, return !!user;
},
/**
* Simple check to see if a user is logged in
*
* @return {Boolean}
*/
isLoggedIn: function() {
var user = $rootScope.currentUser;
return !!user;
},
}; };
}); });

View File

@@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('robotoPromotoApp') angular.module('robotoPromotoApp')
.factory('Session', function ($resource) { .factory('Session', function ($resource) {
return $resource('/api/session/'); return $resource('/api/session/');
}); });

View File

@@ -1,19 +1,19 @@
'use strict'; 'use strict';
angular.module('robotoPromotoApp') angular.module('robotoPromotoApp')
.factory('User', function ($resource) { .factory('User', function ($resource) {
return $resource('/api/users/:id', { return $resource('/api/users/:id', {
id: '@id' id: '@id'
}, { //parameters default }, { //parameters default
update: { update: {
method: 'PUT', method: 'PUT',
params: {} params: {}
}, },
get: { get: {
method: 'GET', method: 'GET',
params: { params: {
id:'me' id:'me'
} }
} }
}); });
}); });

View File

@@ -27,7 +27,6 @@
<!-- Add your site or application content here --> <!-- Add your site or application content here -->
<div class="container" ng-view=""></div> <div class="container" ng-view=""></div>
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID --> <!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
<script> <script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

View File

@@ -8,7 +8,8 @@
"connect-mongo": "~0.4.0", "connect-mongo": "~0.4.0",
"passport": "~0.2.0", "passport": "~0.2.0",
"passport-local": "~0.1.6", "passport-local": "~0.1.6",
"ejs": "~0.8.4" "ejs": "~0.8.4",
"ng-grid": "~2.0.1"
}, },
"devDependencies": { "devDependencies": {
"grunt": "~0.4.1", "grunt": "~0.4.1",