Skip to content

Commit

Permalink
Use arrow functions and let (part of issue #17)
Browse files Browse the repository at this point in the history
  • Loading branch information
gluxon committed Apr 6, 2015
1 parent 389c97c commit 978e644
Show file tree
Hide file tree
Showing 17 changed files with 190 additions and 195 deletions.
3 changes: 3 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
// Relaxing
"esnext": true,

// Environments
"node": true
}
44 changes: 22 additions & 22 deletions app/controllers/admin.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
var mongoose = require('mongoose');
var express = require('express');
var Theme = mongoose.model('Theme')
let mongoose = require('mongoose');
let express = require('express');
let Theme = mongoose.model('Theme')
, Schedule = mongoose.model('Schedule')
, Marquee = mongoose.model('Marquee')
, Notice = mongoose.model('Notice')
, User = mongoose.model('User');

var router = express.Router();
let router = express.Router();

router.get(/.*/, function(req, res, next) {
router.get(/.*/, (req, res, next) => {
// Generate data for views
res.locals.authenticated = req.session.authenticated;
res.locals.appVersion = require(__dirname + '/../../package.json').version;
res.locals.appVersion = require(`${__dirname}/../../package.json`).version;

User.getActive(function(err, user) {
User.getActive((err, user) => {
// Check if we need to do one-time setup
if (!user && req.url != '/setup') {
req.flash('warning', 'Y\'all need to give me your password first.');
Expand All @@ -26,26 +26,26 @@ router.get(/.*/, function(req, res, next) {
});
});

router.get('/', function(req, res) {
router.get('/', (req, res) => {
res.render('admin/welcome');
});

router.get('/setup', function(req, res) {
User.getActive(function(err, user) {
router.get('/setup', (req, res) => {
User.getActive((err, user) => {
if (user) {
res.status(403);
res.render(__dirname + '/../views/403');
res.render(`${__dirname}/../views/403`);
return;
}
res.render('admin/setup');
});
});

router.post('/setup', function(req, res) {
User.getActive(function(err, user) {
router.post('/setup', (req, res) => {
User.getActive((err, user) => {
if (user) {
res.status(403);
res.render(__dirname + '/../views/403');
res.render(`${__dirname}/../views/403`);
return;
}
User.create({
Expand All @@ -61,8 +61,8 @@ router.post('/setup', function(req, res) {
}
});

router.post('/login', function(req, res) {
User.getActive(function(err, user) {
router.post('/login', (req, res) => {
User.getActive((err, user) => {
user.checkPassword(req.body.password, checkPassword);
});

Expand All @@ -77,21 +77,21 @@ router.post('/login', function(req, res) {
}
});

router.get('/logout', function(req, res) {
router.get('/logout', (req, res) => {
req.session.authenticated = false;
req.flash('success', 'Bye bye!');
res.redirect('/admin');
});

router.get('/refresh', function(req, res) {
router.get('/refresh', (req, res) => {
req.app.locals.io.emit('refresh');
res.redirect(req.header('Referer') || '/admin');
});

var themesRoute = require(__dirname + '/themes');
var schedulesRoute = require(__dirname + '/schedules');
var marqueeRoute = require(__dirname + '/marquee');
var noticesRoute = require(__dirname + '/notices');
let themesRoute = require(`${__dirname}/themes`);
let schedulesRoute = require(`${__dirname}/schedules`);
let marqueeRoute = require(`${__dirname}/marquee`);
let noticesRoute = require(`${__dirname}/notices`);

router.use('/themes', themesRoute);
router.use('/schedules', schedulesRoute);
Expand Down
22 changes: 10 additions & 12 deletions app/controllers/clock.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
var express = require('express');
var moment = require('moment');
var async = require('async');
var mongoose = require('mongoose');
var Schedule = mongoose.model('Schedule')
let express = require('express');
let moment = require('moment');
let async = require('async');
let mongoose = require('mongoose');
let Schedule = mongoose.model('Schedule')
, Marquee = mongoose.model('Marquee')
, Notice = mongoose.model('Notice');

var router = express.Router();

router.get('/', function(req, res) {
var self = this;
let router = express.Router();

router.get('/', (req, res) => {
async.parallel({
'schedule': function(callback) {
'schedule': (callback) => {
Schedule.getActive(callback);
},

'marquees': function(callback){
'marquees': (callback) => {
Marquee.getAll(callback);
},

'notices': function(callback) {
'notices': (callback) => {
Notice.getAll(callback);
}
},
Expand Down
28 changes: 14 additions & 14 deletions app/controllers/marquee.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
var express = require('express');
var mongoose = require('mongoose');
var Marquee = mongoose.model('Marquee');
let express = require('express');
let mongoose = require('mongoose');
let Marquee = mongoose.model('Marquee');

var router = express.Router();
let router = express.Router();

router.get('/', function(req, res) {
Marquee.getAll(function(err, marquees) {
router.get('/', (req, res) => {
Marquee.getAll((err, marquees) => {
res.locals.marquees = marquees;
res.render('admin/marquee/index');
});
});

router.param('marquee', function(req, res, next, id) {
Marquee.findById(id, function (err, marquee) {
router.param('marquee', (req, res, next, id) => {
Marquee.findById(id, (err, marquee) => {
if (err) return next(err);
req.marquee = marquee;
next();
});
});

router.post('/create', function(req, res) {
router.post('/create', (req, res) => {
Marquee.create({
'text': req.body.marquee.text
}, redirectToLanding);
Expand All @@ -31,23 +31,23 @@ router.post('/create', function(req, res) {
}
});

router.get('/:marquee/delete', function(req, res) {
req.marquee.remove(function (err) {
router.get('/:marquee/delete', (req, res) => {
req.marquee.remove((err) => {
if (err) throw err;
req.flash('success', 'The marquee has been destroyed.');
res.redirect('/admin/marquee');
});
});

router.get('/:marquee/edit', function(req, res) {
router.get('/:marquee/edit', (req, res) => {
res.locals.marquee = req.marquee;
res.render('admin/marquee/edit');
});

router.post('/:marquee/edit', function(req, res) {
router.post('/:marquee/edit', (req, res) => {
req.marquee.text = req.body.marquee.text;

req.marquee.save(function(err) {
req.marquee.save((err) => {
if (err) throw err;
req.flash('success', 'The marquee has been modified.');
res.redirect('/admin/marquee');
Expand Down
28 changes: 14 additions & 14 deletions app/controllers/notices.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
var express = require('express');
var mongoose = require('mongoose');
var Notice = mongoose.model('Notice');
let express = require('express');
let mongoose = require('mongoose');
let Notice = mongoose.model('Notice');

var router = express.Router();
let router = express.Router();

router.get('/', function(req, res) {
Notice.getAll(function(err, notices) {
router.get('/', (req, res) => {
Notice.getAll((err, notices) => {
res.locals.notices = notices;
res.render('admin/notices/index');
});
});

router.param('notice', function(req, res, next, id) {
Notice.findById(id, function (err, notice) {
router.param('notice', (req, res, next, id) => {
Notice.findById(id, (err, notice) => {
if (err) return next(err);
req.notice = notice;
next();
});
});

router.post('/create', function(req, res) {
router.post('/create', (req, res) => {
Notice.create({
'text': req.body.notice.text
}, redirectToLanding);
Expand All @@ -31,23 +31,23 @@ router.post('/create', function(req, res) {
}
});

router.get('/:notice/delete', function(req, res) {
req.notice.remove(function (err) {
router.get('/:notice/delete', (req, res) => {
req.notice.remove((err) => {
if (err) throw err;
req.flash('success', 'The notice has been destroyed.');
res.redirect('/admin/notices');
});
});

router.get('/:notice/edit', function(req, res) {
router.get('/:notice/edit', (req, res) => {
res.locals.notice = req.notice;
res.render('admin/notices/edit');
});

router.post('/:notice/edit', function(req, res) {
router.post('/:notice/edit', (req, res) => {
req.notice.text = req.body.notice.text;

req.notice.save(function(err) {
req.notice.save((err) => {
if (err) throw err;
req.flash('success', 'The notice has been modified.');
res.redirect('/admin/notices');
Expand Down
Loading

0 comments on commit 978e644

Please sign in to comment.