Skip to content

Commit

Permalink
move to node 4.x and use eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
madhums committed Nov 17, 2015
1 parent ecf6c66 commit 34c31c3
Show file tree
Hide file tree
Showing 30 changed files with 412 additions and 413 deletions.
19 changes: 19 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"extends": "eslint:recommended",
"env": {
"browser": true,
"node": true,
"mocha": true
},
"parser": "babel-eslint",
"rules": {
"strict": [2, "global"],
"quotes": [2, "single", "avoid-escape"],
"semi": [2, "always"],
"space-before-function-paren": [2, "always"],
"no-console": 0
},
"globals": {

}
}
32 changes: 0 additions & 32 deletions .jshintrc

This file was deleted.

6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ services:
- mongodb
language: node_js
node_js:
- "0.12"
- "0.11"
- "0.10"
- "iojs"
- "4.2.2"
- "5.0.0"
32 changes: 16 additions & 16 deletions app/controllers/articles.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
'use strict';

/**
* Module dependencies.
*/

var mongoose = require('mongoose')
var Article = mongoose.model('Article')
var utils = require('../../lib/utils')
var extend = require('util')._extend
const mongoose = require('mongoose');
const Article = mongoose.model('Article');
const utils = require('../../lib/utils');
const assign = require('object-assign');


/**
* Load
*/

exports.load = function (req, res, next, id){
var User = mongoose.model('User');

Article.load(id, function (err, article) {
if (err) return next(err);
if (!article) return next(new Error('not found'));
Expand All @@ -28,9 +28,9 @@ exports.load = function (req, res, next, id){
*/

exports.index = function (req, res){
var page = (req.params.page > 0 ? req.params.page : 1) - 1;
var perPage = 30;
var options = {
const page = (req.params.page > 0 ? req.params.page : 1) - 1;
const perPage = 30;
const options = {
perPage: perPage,
page: page
};
Expand Down Expand Up @@ -65,8 +65,8 @@ exports.new = function (req, res){
*/

exports.create = function (req, res) {
var article = new Article(req.body);
var images = req.files.image
const article = new Article(req.body);
const images = req.files.image
? [req.files.image]
: undefined;

Expand Down Expand Up @@ -100,14 +100,14 @@ exports.edit = function (req, res) {
*/

exports.update = function (req, res){
var article = req.article;
var images = req.files.image
const article = req.article;
const images = req.files.image
? [req.files.image]
: undefined;

// make sure no one changes the user
delete req.body.user;
article = extend(article, req.body);
assign(article, req.body);

article.uploadAndSave(images, function (err) {
if (!err) {
Expand Down Expand Up @@ -138,8 +138,8 @@ exports.show = function (req, res){
*/

exports.destroy = function (req, res){
var article = req.article;
article.remove(function (err){
const article = req.article;
article.remove(function () {
req.flash('info', 'Deleted successfully');
res.redirect('/articles');
});
Expand Down
15 changes: 7 additions & 8 deletions app/controllers/comments.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
'use strict';

/**
* Module dependencies.
*/

var mongoose = require('mongoose');
var utils = require('../../lib/utils');
const utils = require('../../lib/utils');

/**
* Load comment
*/

exports.load = function (req, res, next, id) {
var article = req.article;
const article = req.article;
utils.findByParam(article.comments, { id: id }, function (err, comment) {
if (err) return next(err);
req.comment = comment;
Expand All @@ -24,23 +24,22 @@ exports.load = function (req, res, next, id) {
*/

exports.create = function (req, res) {
var article = req.article;
var user = req.user;
console.log(req.body);
const article = req.article;
const user = req.user;
if (!req.body.body) return res.redirect('/articles/'+ article.id);

article.addComment(user, req.body, function (err) {
if (err) return res.render('500');
res.redirect('/articles/'+ article.id);
});
}
};

/**
* Delete comment
*/

exports.destroy = function (req, res) {
var article = req.article;
const article = req.article;
article.removeComment(req.params.commentId, function (err) {
if (err) {
req.flash('error', 'Oops! The comment was not found');
Expand Down
16 changes: 9 additions & 7 deletions app/controllers/tags.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
'use strict';

/**
* Module dependencies.
*/

var mongoose = require('mongoose');
var Article = mongoose.model('Article');
const mongoose = require('mongoose');
const Article = mongoose.model('Article');

/**
* List items tagged with a tag
*/

exports.index = function (req, res) {
var criteria = { tags: req.params.tag };
var perPage = 5;
var page = (req.params.page > 0 ? req.params.page : 1) - 1;
var options = {
const criteria = { tags: req.params.tag };
const perPage = 5;
const page = (req.params.page > 0 ? req.params.page : 1) - 1;
const options = {
perPage: perPage,
page: page,
criteria: criteria
};

Article.list(options, function(err, articles) {
Article.list(options, function (err, articles) {
if (err) return res.render('500');
Article.count(criteria).exec(function (err, count) {
res.render('articles/index', {
Expand Down
25 changes: 14 additions & 11 deletions app/controllers/users.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
'use strict';

/**
* Module dependencies.
*/

var mongoose = require('mongoose');
var User = mongoose.model('User');
var utils = require('../../lib/utils');
const mongoose = require('mongoose');
const User = mongoose.model('User');
const utils = require('../../lib/utils');

/**
* Load
*/

exports.load = function (req, res, next, id) {
var options = {
const options = {
criteria: { _id : id }
};
User.load(options, function (err, user) {
Expand All @@ -28,19 +29,19 @@ exports.load = function (req, res, next, id) {
*/

exports.create = function (req, res) {
var user = new User(req.body);
const user = new User(req.body);
user.provider = 'local';
user.save(function (err) {
if (err) {
return res.render('users/signup', {
errors: utils.errors(err.errors),
errors: utils.errors(err.errors || err.message),
user: user,
title: 'Sign up'
});
}

// manually login the user once successfully signed up
req.logIn(user, function(err) {
req.logIn(user, function (err) {
if (err) req.flash('info', 'Sorry! We are not able to log you in!');
return res.redirect('/');
});
Expand All @@ -52,14 +53,14 @@ exports.create = function (req, res) {
*/

exports.show = function (req, res) {
var user = req.profile;
const user = req.profile;
res.render('users/show', {
title: user.name,
user: user
});
};

exports.signin = function (req, res) {};
exports.signin = function () {};

/**
* Auth callback
Expand Down Expand Up @@ -108,7 +109,9 @@ exports.session = login;
*/

function login (req, res) {
var redirectTo = req.session.returnTo ? req.session.returnTo : '/';
const redirectTo = req.session.returnTo
? req.session.returnTo
: '/';
delete req.session.returnTo;
res.redirect(redirectTo);
};
}
18 changes: 9 additions & 9 deletions app/mailer/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
'use strict';

/**
* Module dependencies.
*/

var mongoose = require('mongoose');
var Notifier = require('notifier');
var config = require('config');
const Notifier = require('notifier');
const swig = require('swig');
const config = require('config');

/**
* Process the templates using swig - refer to notifier#processTemplate method
Expand All @@ -17,7 +18,6 @@ var config = require('config');
*/

Notifier.prototype.processTemplate = function (tplPath, locals) {
var swig = require('swig');
locals.filename = tplPath;
return swig.renderFile(tplPath, locals);
};
Expand All @@ -37,12 +37,12 @@ module.exports = {
*/

comment: function (options, cb) {
var article = options.article;
var author = article.user;
var user = options.currentUser;
var notifier = new Notifier(config.notifier);
const article = options.article;
const author = article.user;
const user = options.currentUser;
const notifier = new Notifier(config.notifier);

var obj = {
const obj = {
to: author.email,
from: '[email protected]',
subject: user.name + ' added a comment on your article ' + article.title,
Expand Down
Loading

0 comments on commit 34c31c3

Please sign in to comment.