aboutsummaryrefslogtreecommitdiffstats
path: root/routes
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2014-07-15 00:44:25 -0700
committerAdam Soltys <[email protected]>2014-07-15 00:44:25 -0700
commit5255f026a68be987dbccc191900752d7e9daf1af (patch)
tree62e17454a7d364b39d9a7adca27fcfec32bd4a78 /routes
parent3b565f4f4dcea55779e00493e7cf507cf8392010 (diff)
downloadcoinos-server-5255f026a68be987dbccc191900752d7e9daf1af.tar.gz
coinos-server-5255f026a68be987dbccc191900752d7e9daf1af.zip
Add menu, change view engine, use Grunt
Diffstat (limited to 'routes')
-rw-r--r--routes/calculator.coffee7
-rw-r--r--routes/sessions.coffee11
-rw-r--r--routes/transactions.coffee3
-rw-r--r--routes/users.coffee10
4 files changed, 7 insertions, 24 deletions
diff --git a/routes/calculator.coffee b/routes/calculator.coffee
index dc9a6d43..89f56e6f 100644
--- a/routes/calculator.coffee
+++ b/routes/calculator.coffee
@@ -1,11 +1,8 @@
exports.new = (req, res) ->
- res.render('calculator/setup', js: (-> global.js), css: (-> global.css))
+ res.render('calculator/setup')
exports.show = (req, res) ->
- res.render('calculator/show',
- js: (-> global.js),
- css: (-> global.css),
- )
+ res.render('calculator/show', layout: 'layout')
exports.ticker = (req, res) ->
fs = require('fs')
diff --git a/routes/sessions.coffee b/routes/sessions.coffee
index 3e8f5cf0..775c52ac 100644
--- a/routes/sessions.coffee
+++ b/routes/sessions.coffee
@@ -1,20 +1,13 @@
module.exports = (passport) ->
new: (req, res) ->
- res.render('sessions/new',
- js: (-> global.js),
- css: (-> global.css)
- )
+ res.render('sessions/new')
create: (req, res, next) ->
passport.authenticate('local', (err, user, info) ->
if (err)
return next(err)
if (!user)
- return res.render('sessions/new',
- js: (-> global.js),
- css: (-> global.css),
- badpw: true
- )
+ return res.render('sessions/new', badpw: true)
req.login(user, (err) ->
if (err)
return next(err)
diff --git a/routes/transactions.coffee b/routes/transactions.coffee
index 3444b6c1..0bdaeed6 100644
--- a/routes/transactions.coffee
+++ b/routes/transactions.coffee
@@ -33,7 +33,6 @@ module.exports =
index: (req, res) ->
res.render('transactions/index',
user: req.params.user,
- js: (-> global.js),
- css: (-> global.css)
+ layout: 'layout'
)
diff --git a/routes/users.coffee b/routes/users.coffee
index beae3eb0..db4dde03 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -25,8 +25,6 @@ module.exports = (sessions) ->
list: (req, res) ->
res.render('users/index',
- js: (-> global.js),
- css: (-> global.css),
layout: 'layout'
)
@@ -35,13 +33,10 @@ module.exports = (sessions) ->
if obj
res.render('calculator/show',
user: req.params.user,
- js: (-> global.js),
- css: (-> global.css)
+ layout: 'layout'
)
else
res.render('sessions/new',
- js: (-> global.js),
- css: (-> global.css),
notice: true
)
)
@@ -83,8 +78,7 @@ module.exports = (sessions) ->
edit: (req, res) ->
res.render('calculator/setup',
user: req.params.user,
- js: (-> global.js),
- css: (-> global.css)
+ layout: 'layout'
)
update: (req, res) ->