Merge remote-tracking branch 'asoltys/master'

1 files changed, 24 insertions, 4 deletions

diff --git a/app.js b/app.js
index c82f895e..cc79d0cc 100644
--- a/app.js
+++ b/app.js
@@ -105,13 +105,31 @@
 
   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('/sweep', calculator.sweep);
+  app.get('/token', cache, function(req, res) {
+    res.write(config.blockcypher_token);
+    return res.end();
+  });
 
-  app.get('/address', cache, calculator.address);
+  app.get('/tips', cache, function(req, res) {
+    return res.render('tips', {
+      notice: true,
+      layout: 'layout',
+      js: (function() {
+        return global.js;
+      }),
+      css: (function() {
+        return global.css;
+      })
+    });
+  });
 
   app.get('/login', cache, sessions["new"]);
 
@@ -125,11 +143,13 @@
 
   app.get('/verify/:token', users.verify);
 
-  app.get('/:user/profile', authorize, users.profile);
+  app.post('/:user', authorize, users.update);
 
   app.get('/:user/edit', authorize, users.edit);
 
-  app.post('/:user', authorize, users.update);
+  app.get('/:user/profile', authorize, users.profile);
+
+  app.get('/:user/wallet', authorize, users.wallet);
 
   app.get('/:user/transactions.json', authorize, transactions.json);