Update routes

12 files changed, 82 insertions, 29 deletions

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index b5edfb72..34569808 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -13,12 +13,18 @@ module.exports = (grunt) ->
           ext: '.css'
         ]
     coffee:
-      glob_to_multiple: 
+      server: 
         expand: true
         cwd: 'src'
         src: '**/*.coffee'
         dest: '.'
         ext: '.js'
+      client: 
+        expand: true
+        cwd: 'public/js'
+        src: '*.coffee'
+        dest: 'public/js'
+        ext: '.js'
     watch: 
       less: 
         files: ['public/css/**/*.less']
diff --git a/app.js b/app.js
index 05452d81..44822780 100644
--- a/app.js
+++ b/app.js
@@ -106,7 +106,7 @@
 
   app.get('/:user/edit', authorize, users.edit);
 
-  app.post('/:user/update', authorize, users.update);
+  app.post('/:user', users.update);
 
   app.get('/:user/transactions.json', authorize, transactions.json);
 
diff --git a/public/js/setup.coffee b/public/js/setup.coffee
index 9b4bf5d2..6d8d7445 100644
--- a/public/js/setup.coffee
+++ b/public/js/setup.coffee
@@ -59,7 +59,7 @@ $(->
     )
 
     if user
-      $('#setup').attr('action', "/#{user}/update").attr('method', 'post')
+      $('#setup').attr('action', "/#{user}").attr('method', 'post')
       $.getJSON("/#{user}.json", (data) ->
         $('#title').val(data.title)
         $('#logo').val(data.logo)
diff --git a/public/js/setup.js b/public/js/setup.js
index 56b2f067..357b908e 100644
--- a/public/js/setup.js
+++ b/public/js/setup.js
@@ -57,7 +57,7 @@
         }
       });
       if (user) {
-        $('#setup').attr('action', "/" + user + "/update").attr('method', 'post');
+        $('#setup').attr('action', "/" + user).attr('method', 'post');
         return $.getJSON("/" + user + ".json", function(data) {
           $('#title').val(data.title);
           $('#logo').val(data.logo);
diff --git a/routes/calculator.js b/routes/calculator.js
index 3e067df6..3201735f 100644
--- a/routes/calculator.js
+++ b/routes/calculator.js
@@ -1,21 +1,10 @@
 (function() {
-  exports["new"] = function(req, res) {
-    return res.render('calculator/setup');
-  };
-
   exports.sweep = function(req, res) {
     return res.render('calculator/sweep', {
       layout: 'layout'
     });
   };
 
-  exports.show = function(req, res) {
-    return res.render('calculator/show', {
-      layout: 'layout',
-      x: 'meow'
-    });
-  };
-
   exports.ticker = function(req, res) {
     var fs;
     fs = require('fs');
diff --git a/routes/users.js b/routes/users.js
index 137d5bb9..e4198a1d 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -42,7 +42,7 @@
       show: function(req, res) {
         return db.hgetall("user:" + req.params.user, function(err, obj) {
           if (obj) {
-            return res.render('calculator/show', {
+            return res.render('users/show', {
               user: req.params.user,
               layout: 'layout'
             });
@@ -98,13 +98,13 @@
         });
       },
       edit: function(req, res) {
-        return res.render('calculator/setup', {
+        return res.render('users/edit', {
           user: req.params.user,
           layout: 'layout'
         });
       },
       update: function(req, res) {
-        if (!(req.params.user === req.user.username || req.user.username === 'admin' || req.user.username === 'ben')) {
+        if (!(req.params.user === req.user.username || req.user.username === 'admin')) {
           return;
         }
         if (req.body.password === '') {
diff --git a/socket_test.js b/socket_test.js
new file mode 100644
index 00000000..a029c016
--- /dev/null
+++ b/socket_test.js
@@ -0,0 +1,64 @@
+(function() {
+  var socket, transaction;
+
+  transaction = {
+    "hash": {},
+    "version": 1,
+    "lock_time": 0,
+    "ins": [
+      {
+        "s": {},
+        "q": 4294967295,
+        "o": {}
+      }
+    ],
+    "outs": [
+      {
+        "v": {},
+        "s": {}
+      }, {
+        "v": {},
+        "s": {}
+      }
+    ],
+    "_buffer": {},
+    "txid": "8500a0893a2d83a17819673884ade21bbef07d8c92bfe51682e45873cc2d3720",
+    "vin": [
+      {
+        "n": 0,
+        "txid": "1549415465c84fb519ffb92339ef80461427502c90d5d3ac5d01f27d824feabd",
+        "vout": 1
+      }
+    ],
+    "vout": [
+      {
+        "valueSat": 10000,
+        "scriptPubKey": {
+          "addresses": ["1VAnbtCAnYccECnjaMCPnWwt81EHCVgNr"]
+        },
+        "n": 0
+      }, {
+        "valueSat": 3966838180,
+        "scriptPubKey": {
+          "addresses": ["1Ao8Swc6vSosrjednQkNZeXEXVu1ZcxYZE"]
+        },
+        "n": 1
+      }
+    ],
+    "time": 1405573125
+  };
+
+  $('body').append(transaction.vout[0].valueSat);
+
+  socket = io('ws://insight.bitpay.com');
+
+  socket.on('connect', function() {
+    $('body').append('connected');
+    return this.emit('subscribe', '1VAnbtCAnYccECnjaMCPnWwt81EHCVgNr');
+  });
+
+  socket.on('1VAnbtCAnYccECnjaMCPnWwt81EHCVgNr', function(data) {
+    return $('body').append(JSON.stringify(data));
+  });
+
+}).call(this);
diff --git a/src/app.coffee b/src/app.coffee
index e0930713..9fff6ab0 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -55,7 +55,7 @@ app.get('/users/new', users.new)
 app.post('/users', users.create)
 
 app.get('/:user/edit', authorize, users.edit)
-app.post('/:user/update', authorize, users.update)
+app.post('/:user', users.update)
 
 app.get('/:user/transactions.json', authorize, transactions.json)
 app.post('/:user/transactions', transactions.create)
diff --git a/src/routes/calculator.coffee b/src/routes/calculator.coffee
index 891fdce8..c329a27c 100644
--- a/src/routes/calculator.coffee
+++ b/src/routes/calculator.coffee
@@ -1,12 +1,6 @@
-exports.new = (req, res) ->
-  res.render('calculator/setup')
-
 exports.sweep = (req, res) ->
   res.render('calculator/sweep', layout: 'layout')
 
-exports.show = (req, res) ->
-  res.render('calculator/show', layout: 'layout', x: 'meow')
-
 exports.ticker = (req, res) ->
   fs = require('fs')
   fs.readFile("./public/js/rates.json", (err, data) ->
diff --git a/src/routes/users.coffee b/src/routes/users.coffee
index db4dde03..4499653b 100644
--- a/src/routes/users.coffee
+++ b/src/routes/users.coffee
@@ -31,7 +31,7 @@ module.exports = (sessions) ->
   show: (req, res) ->
     db.hgetall("user:"+req.params.user, (err, obj) ->
       if obj 
-        res.render('calculator/show', 
+        res.render('users/show', 
           user: req.params.user, 
           layout: 'layout'
         )
@@ -76,14 +76,14 @@ module.exports = (sessions) ->
     )
 
   edit: (req, res) ->
-    res.render('calculator/setup', 
+    res.render('users/edit', 
       user: req.params.user, 
       layout: 'layout'
     )
 
   update: (req, res) ->
     return unless req.params.user is req.user.username or 
-    req.user.username is 'admin' or req.user.username is 'ben'
+    req.user.username is 'admin'
     if req.body.password is ''
       delete req.body.password
     db.hmset("user:"+req.params.user, req.body, ->
diff --git a/views/calculator/setup.html b/views/users/edit.html
index bd98e885..0b2e3164 100644
--- a/views/calculator/setup.html
+++ b/views/users/edit.html
@@ -8,7 +8,7 @@
 <script src='/js/setup.js'></script>
 {{/yield-scripts}}
 
-<form id="setup" action="/calculator" method="get">
+<form id="setup" action="/{{user}}" method="post">
   <h1>Settings</h1>
 
   <input type="hidden" id="username" name="username" value="{{user}}" />
diff --git a/views/calculator/show.html b/views/users/show.html
index 95924789..95924789 100644
--- a/views/calculator/show.html
+++ b/views/users/show.html