diff --git a/.editorconfig b/.editorconfig index 636ceea4..ed90a068 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,36 +1,25 @@ # EditorConfig is awesome: http://EditorConfig.org -# Howto with your editor: -# Sublime: https://github.com/sindresorhus/editorconfig-sublime +# How-to with your editor: http://editorconfig.org/#download # top-most EditorConfig file root = true # Unix-style newlines with a newline ending every file -[**] +[*] end_of_line = lf +indent_style = tab insert_final_newline = true -# Standard at: https://github.com/felixge/node-style-guide -[**.js, **.json] +[{Dockerfile,Procfile}] +trim_trailing_whitespace = true + +# Standard at: https://github.com/felixge/node-style-guide +[{*.js,*.json}] trim_trailing_whitespace = true -indent_style = tab quote_type = single curly_bracket_next_line = false spaces_around_operators = true space_after_control_statements = true space_after_anonymous_functions = false spaces_in_brackets = false - -# No Standard. Please document a standard if different from .js -[**.yml, **.html, **.css] -trim_trailing_whitespace = true -indent_style = tab - -# No standard. Please document a standard if different from .js -[**.md] -indent_style = tab - -# Standard at: -[Makefile] -indent_style = tab \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 96dc98b1..de61a992 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,4 +26,4 @@ ENV NODE_ENV development # Port 3000 for server # Port 35729 for livereload EXPOSE 3000 35729 -CMD ["grunt"] \ No newline at end of file +CMD ["grunt"] diff --git a/app/controllers/articles.server.controller.js b/app/controllers/articles.server.controller.js index f23f2abb..f5b4d27f 100644 --- a/app/controllers/articles.server.controller.js +++ b/app/controllers/articles.server.controller.js @@ -117,4 +117,4 @@ exports.hasAuthorization = function(req, res, next) { }); } next(); -}; \ No newline at end of file +}; diff --git a/app/controllers/core.server.controller.js b/app/controllers/core.server.controller.js index f2af8e1f..5dfdd5e4 100644 --- a/app/controllers/core.server.controller.js +++ b/app/controllers/core.server.controller.js @@ -8,4 +8,4 @@ exports.index = function(req, res) { user: req.user || null, request: req }); -}; \ No newline at end of file +}; diff --git a/app/controllers/errors.server.controller.js b/app/controllers/errors.server.controller.js index 41078b4d..5944d786 100644 --- a/app/controllers/errors.server.controller.js +++ b/app/controllers/errors.server.controller.js @@ -39,4 +39,4 @@ exports.getErrorMessage = function(err) { } return message; -}; \ No newline at end of file +}; diff --git a/app/controllers/users.server.controller.js b/app/controllers/users.server.controller.js index 64e772e9..06ef00ea 100755 --- a/app/controllers/users.server.controller.js +++ b/app/controllers/users.server.controller.js @@ -13,4 +13,4 @@ module.exports = _.extend( require('./users/users.authorization.server.controller'), require('./users/users.password.server.controller'), require('./users/users.profile.server.controller') -); \ No newline at end of file +); diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index c15c8a11..d34642b5 100644 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -24,7 +24,7 @@ exports.signup = function(req, res) { user.provider = 'local'; user.displayName = user.firstName + ' ' + user.lastName; - // Then save the user + // Then save the user user.save(function(err) { if (err) { return res.status(400).send({ @@ -203,4 +203,4 @@ exports.removeOAuthProvider = function(req, res, next) { } }); } -}; \ No newline at end of file +}; diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js index 765aad0b..e246baed 100644 --- a/app/controllers/users/users.password.server.controller.js +++ b/app/controllers/users/users.password.server.controller.js @@ -142,7 +142,7 @@ exports.reset = function(req, res, next) { if (err) { res.status(400).send(err); } else { - // Return authenticated user + // Return authenticated user res.json(user); done(err, user); diff --git a/app/controllers/users/users.profile.server.controller.js b/app/controllers/users/users.profile.server.controller.js index dd38936f..8e438f7c 100644 --- a/app/controllers/users/users.profile.server.controller.js +++ b/app/controllers/users/users.profile.server.controller.js @@ -53,4 +53,4 @@ exports.update = function(req, res) { */ exports.me = function(req, res) { res.json(req.user || null); -}; \ No newline at end of file +}; diff --git a/app/models/article.server.model.js b/app/models/article.server.model.js index 3f6fd0df..f2b89db8 100644 --- a/app/models/article.server.model.js +++ b/app/models/article.server.model.js @@ -31,4 +31,4 @@ var ArticleSchema = new Schema({ } }); -mongoose.model('Article', ArticleSchema); \ No newline at end of file +mongoose.model('Article', ArticleSchema); diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js index 840464af..66d31bf6 100755 --- a/app/models/user.server.model.js +++ b/app/models/user.server.model.js @@ -143,4 +143,4 @@ UserSchema.statics.findUniqueUsername = function(username, suffix, callback) { }); }; -mongoose.model('User', UserSchema); \ No newline at end of file +mongoose.model('User', UserSchema); diff --git a/app/routes/articles.server.routes.js b/app/routes/articles.server.routes.js index 7d840e6f..9a93d059 100644 --- a/app/routes/articles.server.routes.js +++ b/app/routes/articles.server.routes.js @@ -19,4 +19,4 @@ module.exports = function(app) { // Finish by binding the article middleware app.param('articleId', articles.articleByID); -}; \ No newline at end of file +}; diff --git a/app/routes/core.server.routes.js b/app/routes/core.server.routes.js index 1db9d400..71388226 100644 --- a/app/routes/core.server.routes.js +++ b/app/routes/core.server.routes.js @@ -4,4 +4,4 @@ module.exports = function(app) { // Root routing var core = require('../../app/controllers/core.server.controller'); app.route('/').get(core.index); -}; \ No newline at end of file +}; diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js index 3120e9ab..a3005346 100644 --- a/app/routes/users.server.routes.js +++ b/app/routes/users.server.routes.js @@ -54,4 +54,4 @@ module.exports = function(app) { // Finish by binding the user middleware app.param('userId', users.userByID); -}; \ No newline at end of file +}; diff --git a/app/tests/article.server.routes.test.js b/app/tests/article.server.routes.test.js index 7eb5f772..c583c3f3 100644 --- a/app/tests/article.server.routes.test.js +++ b/app/tests/article.server.routes.test.js @@ -116,7 +116,7 @@ describe('Article CRUD tests', function() { .end(function(articleSaveErr, articleSaveRes) { // Set message assertion (articleSaveRes.body.message).should.match('Title cannot be blank'); - + // Handle article save error done(articleSaveErr); }); @@ -250,7 +250,7 @@ describe('Article CRUD tests', function() { }); it('should not be able to delete an article if not signed in', function(done) { - // Set article user + // Set article user article.user = user; // Create new article model instance diff --git a/app/views/404.server.view.html b/app/views/404.server.view.html index 0074fa45..40407617 100644 --- a/app/views/404.server.view.html +++ b/app/views/404.server.view.html @@ -5,4 +5,4 @@ 
 	{{url}} is not a valid path.
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/views/500.server.view.html b/app/views/500.server.view.html index 8e6711b7..cc3b1478 100644 --- a/app/views/500.server.view.html +++ b/app/views/500.server.view.html @@ -5,4 +5,4 @@ 
 	{{error}}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/views/layout.server.view.html b/app/views/layout.server.view.html index 6c038146..9e9cebd4 100644 --- a/app/views/layout.server.view.html +++ b/app/views/layout.server.view.html @@ -78,4 +78,4 @@ - \ No newline at end of file + diff --git a/app/views/templates/reset-password-confirm-email.server.view.html b/app/views/templates/reset-password-confirm-email.server.view.html index 626ddc3f..bfbcb157 100644 --- a/app/views/templates/reset-password-confirm-email.server.view.html +++ b/app/views/templates/reset-password-confirm-email.server.view.html @@ -10,4 +10,4 @@

The {{appName}} Support Team

- \ No newline at end of file + diff --git a/app/views/templates/reset-password-email.server.view.html b/app/views/templates/reset-password-email.server.view.html index 262edf00..4869dfd8 100644 --- a/app/views/templates/reset-password-email.server.view.html +++ b/app/views/templates/reset-password-email.server.view.html @@ -15,4 +15,4 @@

The {{appName}} Support Team

- \ No newline at end of file + diff --git a/bower.json b/bower.json index a49e0339..51e86553 100644 --- a/bower.json +++ b/bower.json @@ -11,6 +11,6 @@ "angular-bootstrap": "~0.11.2", "angular-bootstrap": "~0.12.0", "angular-ui-utils": "~0.1.1", - "angular-ui-router": "~0.2.11" + "angular-ui-router": "~0.2.11" } } diff --git a/config/config.js b/config/config.js index 3baa02e5..ef4a4c2c 100644 --- a/config/config.js +++ b/config/config.js @@ -27,7 +27,7 @@ module.exports.getGlobbedFiles = function(globPatterns, removeRoot) { // The output array var output = []; - // If glob pattern is array so we use each pattern in a recursive way, otherwise we use glob + // If glob pattern is array so we use each pattern in a recursive way, otherwise we use glob if (_.isArray(globPatterns)) { globPatterns.forEach(function(globPattern) { output = _.union(output, _this.getGlobbedFiles(globPattern, removeRoot)); @@ -73,4 +73,4 @@ module.exports.getJavaScriptAssets = function(includeTests) { module.exports.getCSSAssets = function() { var output = this.getGlobbedFiles(this.assets.lib.css.concat(this.assets.css), 'public/'); return output; -}; \ No newline at end of file +}; diff --git a/config/env/all.js b/config/env/all.js index 2c302c83..34bc24e7 100644 --- a/config/env/all.js +++ b/config/env/all.js @@ -69,4 +69,4 @@ module.exports = { 'public/modules/*/tests/*.js' ] } -}; \ No newline at end of file +}; diff --git a/config/env/secure.js b/config/env/secure.js index 9ced6d7e..320d0fb5 100644 --- a/config/env/secure.js +++ b/config/env/secure.js @@ -71,4 +71,4 @@ module.exports = { } } } -}; \ No newline at end of file +}; diff --git a/config/env/test.js b/config/env/test.js index 1d42d4e7..f9e3116f 100644 --- a/config/env/test.js +++ b/config/env/test.js @@ -56,4 +56,4 @@ module.exports = { } } } -}; \ No newline at end of file +}; diff --git a/config/init.js b/config/init.js index 34af434f..3a5b1e52 100644 --- a/config/init.js +++ b/config/init.js @@ -28,4 +28,4 @@ module.exports = function() { } }); -}; \ No newline at end of file +}; diff --git a/config/logger.js b/config/logger.js index 98b3a4c5..e6d1f1dc 100644 --- a/config/logger.js +++ b/config/logger.js @@ -33,4 +33,4 @@ module.exports = { return options; } -}; \ No newline at end of file +}; diff --git a/config/passport.js b/config/passport.js index fabbf77c..5abfae76 100755 --- a/config/passport.js +++ b/config/passport.js @@ -7,7 +7,7 @@ var passport = require('passport'), User = require('mongoose').model('User'), path = require('path'), config = require('./config'); - + /** * Module init function. */ @@ -30,4 +30,4 @@ module.exports = function() { config.getGlobbedFiles('./config/strategies/**/*.js').forEach(function(strategy) { require(path.resolve(strategy))(); }); -}; \ No newline at end of file +}; diff --git a/config/strategies/facebook.js b/config/strategies/facebook.js index 5508bece..34ddc68f 100644 --- a/config/strategies/facebook.js +++ b/config/strategies/facebook.js @@ -38,4 +38,4 @@ module.exports = function() { users.saveOAuthUserProfile(req, providerUserProfile, done); } )); -}; \ No newline at end of file +}; diff --git a/config/strategies/github.js b/config/strategies/github.js index 97c7c767..f10a413e 100644 --- a/config/strategies/github.js +++ b/config/strategies/github.js @@ -43,4 +43,4 @@ module.exports = function() { users.saveOAuthUserProfile(req, providerUserProfile, done); } )); -}; \ No newline at end of file +}; diff --git a/config/strategies/google.js b/config/strategies/google.js index f8b454c6..8044ed4e 100644 --- a/config/strategies/google.js +++ b/config/strategies/google.js @@ -38,4 +38,4 @@ module.exports = function() { users.saveOAuthUserProfile(req, providerUserProfile, done); } )); -}; \ No newline at end of file +}; diff --git a/config/strategies/linkedin.js b/config/strategies/linkedin.js index c6ce0900..1ee5b3f5 100644 --- a/config/strategies/linkedin.js +++ b/config/strategies/linkedin.js @@ -39,4 +39,4 @@ module.exports = function() { users.saveOAuthUserProfile(req, providerUserProfile, done); } )); -}; \ No newline at end of file +}; diff --git a/config/strategies/local.js b/config/strategies/local.js index 7101cac2..ad560524 100644 --- a/config/strategies/local.js +++ b/config/strategies/local.js @@ -35,4 +35,4 @@ module.exports = function() { }); } )); -}; \ No newline at end of file +}; diff --git a/config/strategies/twitter.js b/config/strategies/twitter.js index 2bc57cb2..5dcc93f4 100644 --- a/config/strategies/twitter.js +++ b/config/strategies/twitter.js @@ -42,4 +42,4 @@ module.exports = function() { users.saveOAuthUserProfile(req, providerUserProfile, done); } )); -}; \ No newline at end of file +}; diff --git a/fig.yml b/fig.yml index 4726a151..967ac7d1 100644 --- a/fig.yml +++ b/fig.yml @@ -9,4 +9,4 @@ web: db: image: mongo ports: - - "27017:27017" \ No newline at end of file + - "27017:27017" diff --git a/server.js b/server.js index abb888cf..6d5f4c2d 100755 --- a/server.js +++ b/server.js @@ -46,4 +46,4 @@ console.log(chalk.green('Database:\t\t\t' + config.db.uri)); if (process.env.NODE_ENV === 'secure') { console.log(chalk.green('HTTPs:\t\t\t\ton')); } -console.log('--'); \ No newline at end of file +console.log('--');