Merge branch 'master' into configure-bugs

routes/admin/index.js

@@ -12,7 +12,7 @@ router.get('/password-reset', (req, res) => {
 
   // TODO: store the redirect uri in the token or something fancy.
   // admins and regular users should probably be redirected to different places.
-  res.render('password-reset', {redirectUri: process.env.TALK_ROOT_URL});
+  res.render('admin/password-reset', {redirectUri: process.env.TALK_ROOT_URL});
 });
 
 router.get('*', (req, res) => {

routes/api/index.js

@@ -1,11 +1,15 @@
 const express = require('express');
 const authorization = require('../../middleware/authorization');
+const pkg = require('../../package.json');
 
 const router = express.Router();
 
+router.get('/', (req, res) => {
+  res.json({version: pkg.version});
+});
+
 router.use('/assets', authorization.needed('ADMIN'), require('./assets'));
 router.use('/settings', authorization.needed('ADMIN'), require('./settings'));
-
 router.use('/auth', require('./auth'));
 router.use('/users', require('./users'));
 router.use('/account', require('./account'));

routes/index.js

@@ -1,13 +1,8 @@
 const express = require('express');
 const path = require('path');
-const pkg = require('../package.json');
 
 const router = express.Router();
 
-router.get('/', (req, res) => {
-  res.json({version: pkg.version});
-});
-
 router.use('/api/v1', require('./api'));
 router.use('/admin', require('./admin'));
 router.use('/embed', require('./embed'));