From 41f8c6831bb91c0b0be1219b1566e59e48673465 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Sat, 28 Nov 2015 23:57:34 -0800
Subject: Use bower, grunt and browserify instead of connect-assets

---
 src/routes/calculator.coffee | 34 ----------------------------------
 src/routes/users.coffee      |  4 +++-
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 src/routes/calculator.coffee

(limited to 'src/routes')

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}")
     )
-- 
cgit v1.2.3