Use connect-assets for js and css

4 files changed, 35 insertions, 19 deletions

diff --git a/src/routes/calculator.coffee b/src/routes/calculator.coffee
index c329a27c..4f3ac0b5 100644
--- a/src/routes/calculator.coffee
+++ b/src/routes/calculator.coffee
@@ -1,5 +1,10 @@
 exports.sweep = (req, res) ->
-  res.render('calculator/sweep', layout: 'layout')
+  res.render('calculator/sweep', 
+    layout: 'layout',
+    navigation: true,
+    js: (-> global.js), 
+    css: (-> global.css)
+  )
 
 exports.ticker = (req, res) ->
   fs = require('fs')
diff --git a/src/routes/sessions.coffee b/src/routes/sessions.coffee
index 885b8f7c..3de4d438 100644
--- a/src/routes/sessions.coffee
+++ b/src/routes/sessions.coffee
@@ -1,13 +1,22 @@
 module.exports = (passport) ->
   new: (req, res) ->
-    res.render('sessions/new')
+    res.render('sessions/new', 
+      layout: 'layout',
+      js: (-> global.js), 
+      css: (-> global.css)
+    )
 
   create: (req, res, next) ->
     passport.authenticate('local', (err, user, info) ->
       if (err)
         return next(err)
       if (!user) 
-        return res.render('sessions/new', badpw: true)
+        return res.render('sessions/new', 
+          layout: 'layout',  
+          js: (-> global.js), 
+          css: (-> global.css),
+          badpw: true
+        )
       req.login(user, (err) ->
         if (err) 
           return next(err)
diff --git a/src/routes/transactions.coffee b/src/routes/transactions.coffee
index 0bdaeed6..b4653362 100644
--- a/src/routes/transactions.coffee
+++ b/src/routes/transactions.coffee
@@ -33,6 +33,9 @@ module.exports =
   index: (req, res) ->
     res.render('transactions/index',  
       user: req.params.user,
-      layout: 'layout'
+      layout: 'layout',
+      navigation: true,
+      js: (-> global.js), 
+      css: (-> global.css)
     )
 
diff --git a/src/routes/users.coffee b/src/routes/users.coffee
index 4499653b..a213f678 100644
--- a/src/routes/users.coffee
+++ b/src/routes/users.coffee
@@ -16,33 +16,28 @@ module.exports = (sessions) ->
       res.end()
     )
 
-  index: (req, res) -> 
-    return
-    db.keys('*', (err, obj) ->
-      res.write(JSON.stringify(obj))
-      res.end()
-    )
-
-  list: (req, res) ->
-    res.render('users/index', 
-      layout: 'layout'
-    )
-
   show: (req, res) ->
     db.hgetall("user:"+req.params.user, (err, obj) ->
       if obj 
         res.render('users/show', 
           user: req.params.user, 
-          layout: 'layout'
+          layout: 'layout',
+          navigation: true,
+          js: (-> global.js), 
+          css: (-> global.css)
         )
       else 
         res.render('sessions/new', 
-          notice: true
+          notice: true,
+          layout: 'layout',
+          js: (-> global.js), 
+          css: (-> global.css)
         )
     )
 
   new: (req, res) ->
     res.render('users/new', 
+      layout: 'layout',
       js: (-> global.js), 
       css: (-> global.css)
     )
@@ -57,6 +52,7 @@ module.exports = (sessions) ->
         if req.body.confirm != req.body.password
           errormsg += "Passwords must match"
           return res.render('users/new',
+            layout: 'layout',
             js: (-> global.js), 
             css: (-> global.css),
             error: errormsg
@@ -78,7 +74,10 @@ module.exports = (sessions) ->
   edit: (req, res) ->
     res.render('users/edit', 
       user: req.params.user, 
-      layout: 'layout'
+      layout: 'layout',
+      navigation: true,
+      js: (-> global.js), 
+      css: (-> global.css)
     )
 
   update: (req, res) ->