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/routes/index.js | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'src/server/routes/index.js') diff --git a/src/server/routes/index.js b/src/server/routes/index.js index d2267ba..7e97fea 100644 --- a/src/server/routes/index.js +++ b/src/server/routes/index.js @@ -1,31 +1,30 @@ -'use strict' +const express = require('express'); -const express = require('express') -const router = express.Router() -const getMeetingpointData = require('../lib/getMeetingpointData') +const router = express.Router(); +const getMeetingpointData = require('../lib/getMeetingpointData'); /* GET home page. */ -router.get(['/', '/s/*', '/t/*', '/r/*', '/c/*'], function (req, res, next) { - getMeetingpointData().then(data => { - const isBeta = process.env.BETA === '1' +router.get(['/', '/s/*', '/t/*', '/r/*', '/c/*'], (req, res) => { + getMeetingpointData().then((data) => { + const isBeta = process.env.BETA === '1'; - let flags = [] + const flags = []; if (isBeta) { - flags.push('BETA') - flags.push('NO_FEATURE_DETECT') + flags.push('BETA'); + flags.push('NO_FEATURE_DETECT'); } else if (req.query.nfd != null) { - flags.push('NO_FEATURE_DETECT') + flags.push('NO_FEATURE_DETECT'); } - const flagsStr = `var FLAGS = ${JSON.stringify(flags)};` - const usersStr = `var USERS = ${JSON.stringify(data.users)};` - const validWeekNumbersStr = `var VALID_WEEK_NUMBERS = ${JSON.stringify(data.validWeekNumbers)}` + const flagsStr = `var FLAGS = ${JSON.stringify(flags)};`; + const usersStr = `var USERS = ${JSON.stringify(data.users)};`; + const validWeekNumbersStr = `var VALID_WEEK_NUMBERS = ${JSON.stringify(data.validWeekNumbers)}`; - res.render('index', { flagsStr, usersStr, validWeekNumbersStr }) - }).catch(function () { - console.error('Unable to get user info, emergency redirect!') - res.render('redirect') - }) -}) + res.render('index', { flagsStr, usersStr, validWeekNumbersStr }); + }).catch(() => { + console.error('Unable to get user info, emergency redirect!'); + res.render('redirect'); + }); +}); -module.exports = router +module.exports = router; -- cgit v1.1