diff --git a/controllers/users.js b/controllers/users.js index 4ab2c61a59..e7e1724273 100644 --- a/controllers/users.js +++ b/controllers/users.js @@ -1,5 +1,6 @@ -var mongoose = require('mongoose'); -var User = require('../models/user'); +var mongoose = require('mongoose'), + passport = require('passport'), + User = require('../models/user'); exports.account = function(req, res) { res.render('account', { user: req.user }); diff --git a/server.js b/server.js index 37fdf9444c..87309aeec9 100755 --- a/server.js +++ b/server.js @@ -41,13 +41,16 @@ app.use(app.router); // Routes app.get('/', home.index); -app.get('/partials/:name', home.partials); + //app.get('/account', auth.ensureAuthenticated, users.account); -//app.get('/logout', users.logout); -//app.post('/login', users.postlogin); -//app.get('/login', users.getlogin); +app.get('/logout', users.logout); +app.post('/login', users.postlogin); //app.get('/admin', auth.ensureAuthenticated, auth.ensureAdmin(), users.admin); //app.get('/api/name', api.name); +app.get('/partials/login', users.getlogin); + +app.get('/partials/:name', home.partials); + app.get('*', home.index);