From 561ab2d01e059da44c0e5b34f5527fe946a1448c Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 8 Aug 2014 07:11:56 -0700 Subject: Use connect-assets for js and css --- routes/users.js | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) (limited to 'routes/users.js') diff --git a/routes/users.js b/routes/users.js index e4198a1d..8065e4f1 100644 --- a/routes/users.js +++ b/routes/users.js @@ -27,34 +27,37 @@ return res.end(); }); }, - index: function(req, res) { - return; - return db.keys('*', function(err, obj) { - res.write(JSON.stringify(obj)); - return res.end(); - }); - }, - list: function(req, res) { - return res.render('users/index', { - layout: 'layout' - }); - }, show: function(req, res) { return db.hgetall("user:" + req.params.user, function(err, obj) { if (obj) { return res.render('users/show', { user: req.params.user, - layout: 'layout' + layout: 'layout', + navigation: true, + js: (function() { + return global.js; + }), + css: (function() { + return global.css; + }) }); } else { return res.render('sessions/new', { - notice: true + notice: true, + layout: 'layout', + js: (function() { + return global.js; + }), + css: (function() { + return global.css; + }) }); } }); }, "new": function(req, res) { return res.render('users/new', { + layout: 'layout', js: (function() { return global.js; }), @@ -74,6 +77,7 @@ if (req.body.confirm !== req.body.password) { errormsg += "Passwords must match"; return res.render('users/new', { + layout: 'layout', js: (function() { return global.js; }), @@ -100,7 +104,14 @@ edit: function(req, res) { return res.render('users/edit', { user: req.params.user, - layout: 'layout' + layout: 'layout', + navigation: true, + js: (function() { + return global.js; + }), + css: (function() { + return global.css; + }) }); }, update: function(req, res) { -- cgit v1.2.3