aboutsummaryrefslogtreecommitdiffstats
path: root/src/routes
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2015-11-28 23:57:34 -0800
committerAdam Soltys <[email protected]>2015-11-30 21:10:59 -0800
commit41f8c6831bb91c0b0be1219b1566e59e48673465 (patch)
tree39626cf1a8fe7b8d73f750ccaf433bfa8c425d6b /src/routes
parentf2bff842cbe16c18923b905f70ed168096648727 (diff)
downloadcoinos-server-41f8c6831bb91c0b0be1219b1566e59e48673465.tar.gz
coinos-server-41f8c6831bb91c0b0be1219b1566e59e48673465.zip
Use bower, grunt and browserify instead of connect-assets
Diffstat (limited to 'src/routes')
-rw-r--r--src/routes/calculator.coffee34
-rw-r--r--src/routes/users.coffee4
2 files changed, 3 insertions, 35 deletions
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}")
)