aboutsummaryrefslogtreecommitdiffstats
path: root/app.coffee
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2013-11-08 22:18:11 -0800
committerAdam Soltys <[email protected]>2013-11-08 22:18:36 -0800
commit5c5ae752fcc8e32399948c743315c5a0b6ad6ab1 (patch)
tree2c09dc9cf74d2b0a70fcf22c4d714f726645330f /app.coffee
parent2e18f69d99deacca727054d301b21a7c357fd6dc (diff)
downloadcoinos-server-5c5ae752fcc8e32399948c743315c5a0b6ad6ab1.tar.gz
coinos-server-5c5ae752fcc8e32399948c743315c5a0b6ad6ab1.zip
Create merchant list stub
Diffstat (limited to 'app.coffee')
-rw-r--r--app.coffee3
1 files changed, 2 insertions, 1 deletions
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)