diff options
| author | Adam Soltys <[email protected]> | 2014-08-05 17:26:27 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2014-08-05 17:26:27 -0700 |
| commit | 17292a0c7804540a64b20b551a8e2479a7beef04 (patch) | |
| tree | 5a5c525753d3048c55cfd9190099b1f65af8a2c1 /src | |
| parent | 91da53cb29966298074e63f89b60e8401444781d (diff) | |
| download | coinos-server-17292a0c7804540a64b20b551a8e2479a7beef04.tar.gz coinos-server-17292a0c7804540a64b20b551a8e2479a7beef04.zip | |
Update routes
Diffstat (limited to 'src')
| -rw-r--r-- | src/app.coffee | 2 | ||||
| -rw-r--r-- | src/routes/calculator.coffee | 6 | ||||
| -rw-r--r-- | src/routes/users.coffee | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/app.coffee b/src/app.coffee index e0930713..9fff6ab0 100644 --- a/src/app.coffee +++ b/src/app.coffee @@ -55,7 +55,7 @@ app.get('/users/new', users.new) app.post('/users', users.create) app.get('/:user/edit', authorize, users.edit) -app.post('/:user/update', authorize, users.update) +app.post('/:user', users.update) app.get('/:user/transactions.json', authorize, transactions.json) app.post('/:user/transactions', transactions.create) diff --git a/src/routes/calculator.coffee b/src/routes/calculator.coffee index 891fdce8..c329a27c 100644 --- a/src/routes/calculator.coffee +++ b/src/routes/calculator.coffee @@ -1,12 +1,6 @@ -exports.new = (req, res) -> - res.render('calculator/setup') - exports.sweep = (req, res) -> res.render('calculator/sweep', layout: 'layout') -exports.show = (req, res) -> - res.render('calculator/show', layout: 'layout', x: 'meow') - exports.ticker = (req, res) -> fs = require('fs') fs.readFile("./public/js/rates.json", (err, data) -> diff --git a/src/routes/users.coffee b/src/routes/users.coffee index db4dde03..4499653b 100644 --- a/src/routes/users.coffee +++ b/src/routes/users.coffee @@ -31,7 +31,7 @@ module.exports = (sessions) -> show: (req, res) -> db.hgetall("user:"+req.params.user, (err, obj) -> if obj - res.render('calculator/show', + res.render('users/show', user: req.params.user, layout: 'layout' ) @@ -76,14 +76,14 @@ module.exports = (sessions) -> ) edit: (req, res) -> - res.render('calculator/setup', + res.render('users/edit', user: req.params.user, layout: 'layout' ) update: (req, res) -> return unless req.params.user is req.user.username or - req.user.username is 'admin' or req.user.username is 'ben' + req.user.username is 'admin' if req.body.password is '' delete req.body.password db.hmset("user:"+req.params.user, req.body, -> |
