From 5c5ae752fcc8e32399948c743315c5a0b6ad6ab1 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 8 Nov 2013 22:18:11 -0800 Subject: Create merchant list stub --- app.coffee | 3 ++- routes/users.coffee | 15 ++++++++++++++- views/layout.html | 31 +++++-------------------------- views/users/index.html | 7 +++++++ 4 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 views/users/index.html diff --git a/app.coffee b/app.coffee index 50a25e0b..9adbe83c 100644 --- a/app.coffee +++ b/app.coffee @@ -43,8 +43,8 @@ app.get('/logout', sessions.destroy) app.get('/:user/exists', users.exists) app.get('/:user.json', users.json) -app.get('/:user', users.show) +app.get('/users', users.index) app.get('/users/new', users.new) app.post('/users', users.create) @@ -54,6 +54,7 @@ app.post('/:user/update', authorize, users.update) app.get('/:user/transactions.json', authorize, transactions.json) app.post('/:user/transactions', authorize, transactions.create) app.get('/:user/report', authorize, transactions.index) +app.get('/:user', users.show) app.use((err, req, res, next) -> res.status(500) diff --git a/routes/users.coffee b/routes/users.coffee index 718a649a..29300f90 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -3,7 +3,6 @@ bcrypt = require('bcrypt') module.exports = (sessions) -> exists: (req, res) -> - db.hgetall("user:"+req.params.user, (err, obj) -> if obj? then res.write('true') else res.write('false') res.end() @@ -16,6 +15,19 @@ module.exports = (sessions) -> res.end() ) + index: (req, res) -> + db.keys('*', (err, obj) -> + res.write(JSON.stringify(obj)) + res.end() + ) + + list: (req, res) -> + res.render('users/index', + js: (-> global.js), + css: (-> global.css), + layout: 'layout' + ) + show: (req, res) -> res.render('calculator/show', user: req.params.user, @@ -37,6 +49,7 @@ module.exports = (sessions) -> ) ) ) + create: (req, res) -> userkey = "user:"+req.body.username db.hgetall(userkey, (err, obj) -> diff --git a/views/layout.html b/views/layout.html index 04f0be2d..4f83e237 100644 --- a/views/layout.html +++ b/views/layout.html @@ -1,35 +1,14 @@ - - Vancouver Bitcoin + + Bitcoin Payment Calculator - {{#js}}index{{/js}} - {{#css}}index{{/css}} - - + {{#css}}calculator{{/css}} -

- +

- + diff --git a/views/users/index.html b/views/users/index.html new file mode 100644 index 00000000..3bf10b58 --- /dev/null +++ b/views/users/index.html @@ -0,0 +1,7 @@ +

Merchants

+ +

-- cgit v1.2.3