From 074b6e3cc6ce3917459175ebc7481b58d3ca728f Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Wed, 7 Feb 2018 16:04:31 +0100 Subject: Fix the backend --- src/server/app.js | 76 +++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 39 deletions(-) (limited to 'src/server/app.js') diff --git a/src/server/app.js b/src/server/app.js index 3477ed5..df6ab4c 100644 --- a/src/server/app.js +++ b/src/server/app.js @@ -1,64 +1,62 @@ -const express = require('express') -const path = require('path') -const logger = require('morgan') -const cookieParser = require('cookie-parser') -const bodyParser = require('body-parser') -const compression = require('compression') +const express = require('express'); +const path = require('path'); +const logger = require('morgan'); +const cookieParser = require('cookie-parser'); +const bodyParser = require('body-parser'); +const compression = require('compression'); -const routes = require('./routes/index') -const getSchedule = require('./routes/getSchedule') -const manifest = require('./routes/manifest') -const slack = require('./routes/slack') +const routes = require('./routes/index'); +const getSchedule = require('./routes/getSchedule'); +const manifest = require('./routes/manifest'); -const app = express() +const app = express(); -app.use(compression()) +app.use(compression()); // view engine setup -app.set('views', path.join(__dirname, '../client/views')) -app.set('view engine', 'jade') +app.set('views', path.join(__dirname, '../client/views')); +app.set('view engine', 'jade'); -app.use(logger('dev')) -app.use(bodyParser.json()) -app.use(bodyParser.urlencoded({ extended: false })) -app.use(cookieParser()) +app.use(logger('dev')); +app.use(bodyParser.json()); +app.use(bodyParser.urlencoded({ extended: false })); +app.use(cookieParser()); -app.use('/manifest.webmanifest', manifest) -app.use(express.static(path.join(__dirname, '../client/static'))) +app.use('/manifest.webmanifest', manifest); +app.use(express.static(path.join(__dirname, '../client/static'))); -app.use('/', routes) -app.use('/get', getSchedule) -app.use('/slack', slack) +app.use('/', routes); +app.use('/get', getSchedule); // catch 404 and forward to error handler -app.use(function (req, res, next) { - const err = new Error('Not Found') - err.status = 404 - next(err) -}) +app.use((req, res, next) => { + const err = new Error('Not Found'); + err.status = 404; + next(err); +}); // error handlers // development error handler // will print stacktrace if (app.get('env') === 'development') { - app.use(function (err, req, res, next) { - res.status(err.status || 500) + app.use((err, req, res) => { + res.status(err.status || 500); res.render('error', { message: err.message, - error: err - }) - }) + error: err, + }); + }); } // production error handler // no stacktraces leaked to user -app.use(function (err, req, res, next) { - res.status(err.status || 500) +app.use((err, req, res) => { + res.status(err.status || 500); res.render('error', { message: err.message, - error: {} - }) -}) + error: {}, + }); +}); -module.exports = app +module.exports = app; -- cgit v1.1