Merge remote-tracking branch 'asoltys/master'

3 files changed, 38 insertions, 6 deletions

diff --git a/src/app.coffee b/src/app.coffee
index 3208ae49..caab1bcb 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -63,10 +63,22 @@ do fetchRates = ->
   setTimeout(fetchRates, 120000)
 
 app.get('/', cache, sessions.new)
+app.get('/address', cache, calculator.address)
 app.get('/register', cache, users.new)
-app.get('/ticker', cache, calculator.ticker)
 app.get('/sweep', calculator.sweep)
-app.get('/address', cache, calculator.address)
+app.get('/ticker', cache, calculator.ticker)
+app.get('/token', cache, (req, res) ->
+  res.write(config.blockcypher_token)
+  res.end()
+)
+app.get('/tips', cache, (req, res) ->
+  res.render('tips', 
+    notice: true,
+    layout: 'layout',
+    js: (-> global.js), 
+    css: (-> global.css)
+  )
+)
 
 app.get('/login', cache, sessions.new)
 app.post('/login', sessions.create)
@@ -76,9 +88,10 @@ app.get('/users/new', cache, users.new)
 app.post('/users', users.create)
 app.get('/verify/:token', users.verify)
 
-app.get('/:user/profile', authorize, users.profile)
-app.get('/:user/edit', authorize, users.edit)
 app.post('/:user', authorize, users.update)
+app.get('/:user/edit', authorize, users.edit)
+app.get('/:user/profile', authorize, users.profile)
+app.get('/:user/wallet', authorize, users.wallet)
 
 app.get('/:user/transactions.json', authorize, transactions.json)
 app.post('/:user/transactions', transactions.create)
diff --git a/src/passport.coffee b/src/passport.coffee
index 12913424..aba6ff53 100644
--- a/src/passport.coffee
+++ b/src/passport.coffee
@@ -1,5 +1,5 @@
 db = require("redis").createClient()
-bcrypt = require('bcrypt')
+bcrypt = require('bcryptjs')
 
 passport = require('passport')
 LocalStrategy = require('passport-local').Strategy
diff --git a/src/routes/users.coffee b/src/routes/users.coffee
index d3ecabaf..5daae180 100644
--- a/src/routes/users.coffee
+++ b/src/routes/users.coffee
@@ -1,6 +1,8 @@
 db = require("../redis")
 config = require("../config")
-bcrypt = require('bcrypt')
+bcrypt = require('bcryptjs')
+fs = require('fs')
+request = require('request')
 
 module.exports = (sessions) ->
   exists: (req, res) ->
@@ -33,6 +35,14 @@ module.exports = (sessions) ->
         if req.query.verified?
           options.verified = true
 
+        if obj.logo and obj.logo.length > 3
+          ext = obj.logo.substr(obj.logo.length - 3)
+          path = "public/assets/img/logos/#{obj.username}.#{ext}"
+          fs.lstat(path, (err, stats) ->
+            if ext in ['jpg', 'png', 'gif'] and (err or not stats.isFile())
+              request("#{obj.logo}").pipe(fs.createWriteStream(path))
+          )
+            
         res.render('users/show', options)
         delete req.session.verified
       else 
@@ -182,3 +192,12 @@ module.exports = (sessions) ->
           res.redirect("/#{reply.toString()}?verified")
         )
     )
+
+  wallet: (req, res) ->
+    res.render('users/wallet', 
+      user: req.params.user, 
+      layout: 'layout',
+      navigation: true,
+      js: (-> global.js), 
+      css: (-> global.css)
+    )