Fixing where the routes are pulled in.

This commit is contained in:
Andrew Davidson 2016-01-23 17:29:19 -05:00
parent e57e1b6672
commit 44ad65a5b0

10
app.js
View file

@ -25,11 +25,6 @@ var genPhotos = require('./genPhotos.js');
// Get config variables // Get config variables
var config = require('./config.js').config; var config = require('./config.js').config;
// Pull in all our routes.
require('./routes-post.js')(app);
require('./routes-photo.js')(app);
require('./routes-preview.js')(app);
// view engine setup // view engine setup
app.set('views', path.join(__dirname, 'views')); app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade'); app.set('view engine', 'jade');
@ -89,6 +84,11 @@ app.use(passport.session());
// Require logins for all admin pages other pages have to be handled separately. // Require logins for all admin pages other pages have to be handled separately.
app.all('/admin*', require('connect-ensure-login').ensureLoggedIn()); app.all('/admin*', require('connect-ensure-login').ensureLoggedIn());
// Pull in all our external routes.
require('./routes-post.js')(app);
require('./routes-photo.js')(app);
require('./routes-preview.js')(app);
// User management routing // User management routing
app.get('/login', function(req, res) { app.get('/login', function(req, res) {
res.render('admin-login', {user: req.user}); res.render('admin-login', {user: req.user});