From 17292a0c7804540a64b20b551a8e2479a7beef04 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 5 Aug 2014 17:26:27 -0700 Subject: Update routes --- routes/calculator.js | 11 ----------- routes/users.js | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'routes') diff --git a/routes/calculator.js b/routes/calculator.js index 3e067df6..3201735f 100644 --- a/routes/calculator.js +++ b/routes/calculator.js @@ -1,21 +1,10 @@ (function() { - exports["new"] = function(req, res) { - return res.render('calculator/setup'); - }; - exports.sweep = function(req, res) { return res.render('calculator/sweep', { layout: 'layout' }); }; - exports.show = function(req, res) { - return res.render('calculator/show', { - layout: 'layout', - x: 'meow' - }); - }; - exports.ticker = function(req, res) { var fs; fs = require('fs'); diff --git a/routes/users.js b/routes/users.js index 137d5bb9..e4198a1d 100644 --- a/routes/users.js +++ b/routes/users.js @@ -42,7 +42,7 @@ show: function(req, res) { return db.hgetall("user:" + req.params.user, function(err, obj) { if (obj) { - return res.render('calculator/show', { + return res.render('users/show', { user: req.params.user, layout: 'layout' }); @@ -98,13 +98,13 @@ }); }, edit: function(req, res) { - return res.render('calculator/setup', { + return res.render('users/edit', { user: req.params.user, layout: 'layout' }); }, update: function(req, res) { - if (!(req.params.user === req.user.username || req.user.username === 'admin' || req.user.username === 'ben')) { + if (!(req.params.user === req.user.username || req.user.username === 'admin')) { return; } if (req.body.password === '') { -- cgit v1.2.3