Use bower, grunt and browserify instead of connect-assets

3 files changed, 34 insertions, 42 deletions

diff --git a/src/app.coffee b/src/app.coffee
index caab1bcb..df3c0433 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -7,7 +7,6 @@ passport = require('./passport')
 config = require('./config')
 fs = require('fs')
 
-calculator = require("./routes/calculator")
 sessions = require("./routes/sessions")(passport)
 transactions = require("./routes/transactions")
 users = require("./routes/users")(sessions)
@@ -63,14 +62,40 @@ do fetchRates = ->
   setTimeout(fetchRates, 120000)
 
 app.get('/', cache, sessions.new)
-app.get('/address', cache, calculator.address)
-app.get('/register', cache, users.new)
-app.get('/sweep', calculator.sweep)
-app.get('/ticker', cache, calculator.ticker)
+
+app.get('/address', cache, (req, res) ->
+  res.render('address', 
+    layout: 'layout',
+    js: (-> global.js), 
+    css: (-> global.css)
+  )
+)
+
+app.get('/ticker', cache, (req, res) ->
+  fs = require('fs')
+  fs.readFile("./public/js/rates.json", (err, data) ->
+    req.query.currency ||= 'CAD'
+    req.query.symbol ||= 'quadrigacx'
+    req.query.type ||= 'bid'
+
+    try 
+      exchange = JSON.parse(data)[req.query.currency][req.query.symbol]['rates'][req.query.type].toString()
+    catch e 
+      exchange = "0"
+
+    res.writeHead(200, 
+      'Content-Length': exchange.length,
+      'Content-Type': 'text/plain')
+    res.write(exchange)
+    res.end()
+  )
+)
+
 app.get('/token', cache, (req, res) ->
   res.write(config.blockcypher_token)
   res.end()
 )
+
 app.get('/tips', cache, (req, res) ->
   res.render('tips', 
     notice: true,
@@ -84,6 +109,7 @@ app.get('/login', cache, sessions.new)
 app.post('/login', sessions.create)
 app.get('/logout', sessions.destroy)
 
+app.get('/register', cache, users.new)
 app.get('/users/new', cache, users.new)
 app.post('/users', users.create)
 app.get('/verify/:token', users.verify)
@@ -102,8 +128,6 @@ app.get('/:user/report', authorize, transactions.index)
 app.get('/:user.json', users.json)
 app.get('/:user', cache, users.show)
 
-app.use(require('connect-assets')(src: 'public', detectChanges: false))
-
 app.use((err, req, res, next) ->
   res.status(500)
   res.send('An error occurred');
diff --git a/src/routes/calculator.coffee b/src/routes/calculator.coffee
deleted file mode 100644
index 0fadc34e..00000000
--- a/src/routes/calculator.coffee
+++ /dev/null
@@ -1,34 +0,0 @@
-exports.address = (req, res) ->
-  res.render('calculator/address', 
-    layout: 'layout',
-    js: (-> global.js), 
-    css: (-> global.css)
-  )
-
-exports.sweep = (req, res) ->
-  res.render('calculator/sweep', 
-    layout: 'layout',
-    navigation: true,
-    js: (-> global.js), 
-    css: (-> global.css)
-  )
-
-exports.ticker = (req, res) ->
-  fs = require('fs')
-  fs.readFile("./public/js/rates.json", (err, data) ->
-    req.query.currency ||= 'CAD'
-    req.query.symbol ||= 'quadrigacx'
-    req.query.type ||= 'bid'
-
-    try 
-      exchange = JSON.parse(data)[req.query.currency][req.query.symbol]['rates'][req.query.type].toString()
-    catch e 
-      exchange = "0"
-
-    res.writeHead(200, 
-      'Content-Length': exchange.length,
-      'Content-Type': 'text/plain')
-    res.write(exchange)
-    res.end()
-  )
-
diff --git a/src/routes/users.coffee b/src/routes/users.coffee
index 91279c19..f46c69cf 100644
--- a/src/routes/users.coffee
+++ b/src/routes/users.coffee
@@ -37,7 +37,7 @@ module.exports = (sessions) ->
 
         if obj.logo and obj.logo.length > 3
           ext = obj.logo.substr(obj.logo.length - 3)
-          path = "public/assets/img/logos/#{obj.username}.#{ext}"
+          path = "public/img/logos/#{obj.username}.#{ext}"
           fs.lstat(path, (err, stats) ->
             if ext in ['jpg', 'png', 'gif'] and (err or not stats.isFile())
               try
@@ -155,6 +155,7 @@ module.exports = (sessions) ->
           db.hmset("user:#{req.params.user}", password: hash, ->
             if req.xhr
               res.send({})
+              res.end()
             else
               res.redirect("/#{req.params.user}") 
           )
@@ -162,6 +163,7 @@ module.exports = (sessions) ->
       else
         if req.xhr
           res.send({})
+          res.end()
         else
           res.redirect("/#{req.params.user}")
     )