From 59528d7c0a301c805b03bf77492e489c0e723e79 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Fri, 6 Nov 2015 12:56:12 -0800
Subject: Bitcoin tips page

---
 views/tips.html | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 views/tips.html

(limited to 'views')

diff --git a/views/tips.html b/views/tips.html
new file mode 100644
index 00000000..a4ac19ba
--- /dev/null
+++ b/views/tips.html
@@ -0,0 +1,11 @@
+<h1>Congratulations</h1>
+
+<p>
+If you're here, you've probably received a Bitcoin tip from me. I've created a short YouTube video to explain what to do next and show how you can create your own paper wallets.  Enjoy, and if you have any questions, don't hesitate to contact me!</p>
+
+<p>
+-Adam Soltys<br />
+<a href="mailto:asoltys@gmail.com">asoltys@gmail.com</a>
+</p>
+
+<iframe width="420" height="315" src="https://www.youtube.com/embed/be4J_OpciTc" frameborder="0" allowfullscreen></iframe>
-- 
cgit v1.2.3


From cfed6f916ea7d63821385db338daecc4a2bda4c2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Wed, 11 Nov 2015 14:59:37 -0800
Subject: New payment received sound

---
 public/js/calculator.coffee |   5 +----
 public/success.wav          | Bin 0 -> 57388 bytes
 views/users/show.html       |   2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 public/success.wav

(limited to 'views')

diff --git a/public/js/calculator.coffee b/public/js/calculator.coffee
index cc45cae5..4d6b0013 100644
--- a/public/js/calculator.coffee
+++ b/public/js/calculator.coffee
@@ -116,17 +116,14 @@ listen = ->
     g.blockchain = new WebSocket("wss://ws.blockchain.info/inv")
 
     g.blockchain.onopen = -> 
-      $('#connection').fadeIn().removeClass('glyphicon-exclamation-sign').addClass('glyphicon-signal')
       clear(SOCKET_FAIL)
       g.blockchain.send('{"op":"addr_sub", "addr":"' + g.user.address + '"}')
     
     g.blockchain.onerror =  ->
-      $('#connection').addClass('glyphicon-exclamation-sign').removeClass('glyphicon-signal')
       g.blockchain = null
       fail(SOCKET_FAIL)
 
     g.blockchain.onclose = ->
-      $('#connection').addClass('glyphicon-exclamation-sign').removeClass('glyphicon-signal')
       g.blockchain = null
       fail(SOCKET_FAIL)
       listen()
@@ -151,7 +148,7 @@ logTransaction = (txid, amount) ->
     $('#amount').blur()
     $('#payment').hide()
     $('#received').fadeIn('slow')
-    $('#chaching')[0].play()
+    $('#success')[0].play()
     g.user.index++
 
     $.post("/#{g.user.username}/transactions",
diff --git a/public/success.wav b/public/success.wav
new file mode 100644
index 00000000..50547d2b
Binary files /dev/null and b/public/success.wav differ
diff --git a/views/users/show.html b/views/users/show.html
index 5b8314a3..f37afad4 100644
--- a/views/users/show.html
+++ b/views/users/show.html
@@ -44,6 +44,6 @@ Your email has been verified. Thank you!
   </div>
 
   <button type="button" id="received" class="btn btn-success">Payment Received.  Thank you!</button>
-  <audio id="chaching" src="/cash_register.wav" hidden="true" enablejavascript="true">
+  <audio id="success" src="/success.wav" hidden="true" enablejavascript="true">
 </div>
 
-- 
cgit v1.2.3


From a50564c1e992bb17af3d06af4e7ea44da5bc5595 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Wed, 11 Nov 2015 20:19:19 -0800
Subject: Move address management to separate wallet page

---
 app.js                   |  16 +++---
 public/js/setup.coffee   | 104 ----------------------------------
 public/js/wallet.coffee  | 144 +++++++++++++++++++++++++++++++++++++++++++++++
 routes/users.js          |  15 ++++-
 src/app.coffee           |  11 ++--
 src/routes/users.coffee  |  11 +++-
 views/layout.html        |   5 +-
 views/users/edit.html    |  70 +----------------------
 views/users/profile.html |   2 +-
 views/users/wallet.html  |  78 +++++++++++++++++++++++++
 10 files changed, 266 insertions(+), 190 deletions(-)
 create mode 100644 public/js/wallet.coffee
 create mode 100644 views/users/wallet.html

(limited to 'views')

diff --git a/app.js b/app.js
index dab0d431..5f381065 100644
--- a/app.js
+++ b/app.js
@@ -1,5 +1,5 @@
 (function() {
-  var RedisStore, app, authorize, bodyParser, cache, calculator, config, cookieParser, express, fetchRates, fs, passport, path, request, session, sessionStore, sessions, tips, transactions, users;
+  var RedisStore, app, authorize, bodyParser, cache, calculator, config, cookieParser, express, fetchRates, fs, passport, path, request, session, sessionStore, sessions, transactions, users;
 
   request = require('request');
 
@@ -103,15 +103,15 @@
     return setTimeout(fetchRates, 120000);
   })();
 
-  tips = app.get('/', cache, sessions["new"]);
+  app.get('/', cache, sessions["new"]);
 
-  app.get('/register', cache, users["new"]);
+  app.get('/address', cache, calculator.address);
 
-  app.get('/ticker', cache, calculator.ticker);
+  app.get('/register', cache, users["new"]);
 
   app.get('/sweep', calculator.sweep);
 
-  app.get('/address', cache, calculator.address);
+  app.get('/ticker', cache, calculator.ticker);
 
   app.get('/tips', cache, function(req, res) {
     return res.render('tips', {
@@ -138,11 +138,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);
 
diff --git a/public/js/setup.coffee b/public/js/setup.coffee
index 465cfb39..01705cdd 100644
--- a/public/js/setup.coffee
+++ b/public/js/setup.coffee
@@ -56,7 +56,6 @@ $(->
       $('#email').val(data.email)
       $('#title').val(data.title)
       $('#logo').val(data.logo)
-      $('#pubkey').val(data.pubkey)
       $('#address').val(data.address)
       $("#symbol option[value='#{data.symbol}']").attr('selected', 'selected')
       $('#commission').val(data.commission)
@@ -72,96 +71,6 @@ $(->
     $('#unit').append("<option value='#{v}'>#{v}</option>")
   )
 
-  $('#pubkey').blur(->
-    if check_address($(this).val())
-      $(this).parent().removeClass('has-error')
-    else 
-      $(this).parent().addClass('has-error')
-  )
-
-  $('#generate').click(->
-    key = new Key()
-    g.pubkey = key.extended_public_key_string()
-    g.privkey = key.extended_private_key_string()
-
-    $('#modal').modal()
-    $('#privkey_text').html(g.privkey)
-    $('#qr').html('')
-    new QRCode('qr', text: g.privkey, width: 260, height: 260)
-  )
-
-  $('#encryption-password').keyup((e) ->
-    return if e.keyCode is 9 or e.keyCode is 16
-    g.enc_privkey = CryptoJS.AES.encrypt(g.privkey, $(this).val()).toString()
-    g.enc_privkey = g.privkey if $(this).val() == ''
-    $('#privkey_text').html(g.enc_privkey)
-    $('#qr').html('')
-    new QRCode('qr', text: g.enc_privkey, width: 260, height: 260)
-
-    if $(this).val()
-      $('#status').html('(Encrypted)')
-    else
-      $('#status').html('(Unencrypted)')
-  )
-
-  $('#confirm').blur(->
-    $('#confirm_error').remove() 
-    if $('#password').val() != $('#confirm').val()
-      $('#password, #confirm').parent().addClass('has-error')
-      $('#confirm').parent().after('<div id="confirm_error" class="alert alert-danger">Passwords don\'t match</div>')
-    else
-      $('#password, #confirm').parent().removeClass('has-error')
-  )
-
-  $('#encryption-password, #encryption-confirm').keyup((e) -> check_passwords(e) unless e.keyCode is 9)
-  $('#encryption-password, #encryption-confirm').blur((e) -> check_passwords(e))
-
-  check_passwords = (e) ->
-    if $('#encryption-password').val() != $('#encryption-confirm').val() or $('#encryption-password').val() is ''
-      $('#encryption-password, #encryption-confirm').parent().addClass('has-error')
-      $('#modal .alert').removeClass('alert-success').addClass('alert-danger')
-    else
-      $('#encryption-password, #encryption-confirm').parent().removeClass('has-error')
-      $('#modal .alert').removeClass('alert-danger').addClass('alert-success')
-
-    if $('.progress-bar-success').length > 0
-      $('#encryption-password').parent().removeClass('has-error')
-    else
-      $('#encryption-password').parent().addClass('has-error')
-
-  $('#print').click(->
-    $('#key-dialog').printElement(printMode: 'popup')
-  )
-
-  $('a[data-toggle="tab"]').on('shown.bs.tab', (e) ->
-    $('#print').toggle(e.target.attributes.href.value == '#step1')
-  )
-
-  $('#close').click(-> 
-    $('#modal .form-control').blur()
-    if $('#modal .has-error').length > 0
-      $('#step1_link').click()
-      $('#modal .has-error').effect('shake', 500)
-    else
-      g.update_key = true
-      $('#modal').modal('hide')
-  )
-  $('#encrypt').submit(-> $('#close').click(); return false)
-
-  $('#modal').on('show.bs.modal', -> 
-    $('#encryption-password, #encryption-confirm').val('').keyup().parent().removeClass('has-error')
-    $('#modal .alert').removeClass('alert-success').addClass('alert-danger')
-  )
-
-  $('#modal').on('shown.bs.modal', -> 
-    g.update_key = false
-    $('#encryption-password').focus()
-  ).on('hidden.bs.modal', ->
-    if g.update_key
-      $('#pubkey').val(g.pubkey) 
-      $('#privkey').val(g.enc_privkey)
-  )
-
   $('#setup').submit(->
     $('#setup .form-control').blur()
     if $('#setup .has-error').length > 0
@@ -170,16 +79,3 @@ $(->
   )
 )
 
-check_address = (address) ->
-  try
-    bitcoin.Address.fromBase58Check(address)
-    return true
-  catch
-    return isBip32(address)
-
-isBip32 = (address) ->
-  try
-    new BIP32(address)
-    return true
-  catch
-    return false
diff --git a/public/js/wallet.coffee b/public/js/wallet.coffee
new file mode 100644
index 00000000..8ced085f
--- /dev/null
+++ b/public/js/wallet.coffee
@@ -0,0 +1,144 @@
+#= require ../js/jquery-1.8.2.min.js
+#= require ../js/jquery-ui.min.js
+#= require ../js/jquery.printElement.min.js
+#= require ../js/check_password.js
+#= require ../js/bootstrap.min.js
+#= require ../js/jsbn.js
+#= require ../js/jsbn2.js
+#= require ../js/crypto-min.js
+#= require ../js/2.5.3-crypto-sha256.js
+#= require ../js/sha512.js
+#= require ../js/rfc1751.js
+#= require ../js/bitcoinjs-min-1.0.2.js
+#= require ../js/bitcoinjs-min.js
+#= require ../js/modsqrt.js
+#= require ../js/bip32.js
+#= require ../js/secure_random.js
+#= require ../js/qrcode.js
+#= require ../js/aes.js
+#= require ../js/key.js
+
+g = exports ? this
+g.proceed = false
+
+$(->
+  $('#encryption-password').pwstrength(showVerdicts: false)
+
+  user = $('#username').val()
+  $.getJSON("/#{user}.json", (data) ->
+    $('#pubkey').val(data.pubkey)
+    $('#address').val(data.address)
+    $('#setup').fadeIn()
+  )
+
+  $('#pubkey').blur(->
+    if check_address($(this).val())
+      $(this).parent().removeClass('has-error')
+    else 
+      $(this).parent().addClass('has-error')
+  )
+
+  $('#generate').click(->
+    key = new Key()
+    g.pubkey = key.extended_public_key_string()
+    g.privkey = key.extended_private_key_string()
+
+    $('#modal').modal()
+    $('#privkey_text').html(g.privkey)
+    $('#qr').html('')
+    new QRCode('qr', text: g.privkey, width: 260, height: 260)
+  )
+
+  $('#encryption-password').keyup((e) ->
+    return if e.keyCode is 9 or e.keyCode is 16
+    g.enc_privkey = CryptoJS.AES.encrypt(g.privkey, $(this).val()).toString()
+    g.enc_privkey = g.privkey if $(this).val() == ''
+    $('#privkey_text').html(g.enc_privkey)
+    $('#qr').html('')
+    new QRCode('qr', text: g.enc_privkey, width: 260, height: 260)
+
+    if $(this).val()
+      $('#status').html('(Encrypted)')
+    else
+      $('#status').html('(Unencrypted)')
+  )
+
+  $('#confirm').blur(->
+    $('#confirm_error').remove() 
+    if $('#password').val() != $('#confirm').val()
+      $('#password, #confirm').parent().addClass('has-error')
+      $('#confirm').parent().after('<div id="confirm_error" class="alert alert-danger">Passwords don\'t match</div>')
+    else
+      $('#password, #confirm').parent().removeClass('has-error')
+  )
+
+  $('#encryption-password, #encryption-confirm').keyup((e) -> check_passwords(e) unless e.keyCode is 9)
+  $('#encryption-password, #encryption-confirm').blur((e) -> check_passwords(e))
+
+  check_passwords = (e) ->
+    if $('#encryption-password').val() != $('#encryption-confirm').val() or $('#encryption-password').val() is ''
+      $('#encryption-password, #encryption-confirm').parent().addClass('has-error')
+      $('#modal .alert').removeClass('alert-success').addClass('alert-danger')
+    else
+      $('#encryption-password, #encryption-confirm').parent().removeClass('has-error')
+      $('#modal .alert').removeClass('alert-danger').addClass('alert-success')
+
+    if $('.progress-bar-success').length > 0
+      $('#encryption-password').parent().removeClass('has-error')
+    else
+      $('#encryption-password').parent().addClass('has-error')
+
+  $('#print').click(->
+    $('#key-dialog').printElement(printMode: 'popup')
+  )
+
+  $('a[data-toggle="tab"]').on('shown.bs.tab', (e) ->
+    $('#print').toggle(e.target.attributes.href.value == '#step1')
+  )
+
+  $('#close').click(-> 
+    $('#modal .form-control').blur()
+    if $('#modal .has-error').length > 0
+      $('#step1_link').click()
+      $('#modal .has-error').effect('shake', 500)
+    else
+      g.update_key = true
+      $('#modal').modal('hide')
+  )
+  $('#encrypt').submit(-> $('#close').click(); return false)
+
+  $('#modal').on('show.bs.modal', -> 
+    $('#encryption-password, #encryption-confirm').val('').keyup().parent().removeClass('has-error')
+    $('#modal .alert').removeClass('alert-success').addClass('alert-danger')
+  )
+
+  $('#modal').on('shown.bs.modal', -> 
+    g.update_key = false
+    $('#encryption-password').focus()
+  ).on('hidden.bs.modal', ->
+    if g.update_key
+      $('#pubkey').val(g.pubkey) 
+      $('#privkey').val(g.enc_privkey)
+  )
+
+  $('#setup').submit(->
+    $('#setup .form-control').blur()
+    if $('#setup .has-error').length > 0
+      $('#setup .has-error').effect('shake', 500)
+      return false
+  )
+)
+
+check_address = (address) ->
+  try
+    bitcoin.Address.fromBase58Check(address)
+    return true
+  catch
+    return isBip32(address)
+
+isBip32 = (address) ->
+  try
+    new BIP32(address)
+    return true
+  catch
+    return false
diff --git a/routes/users.js b/routes/users.js
index 28b89797..36914152 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -54,7 +54,7 @@
             if (req.query.verified != null) {
               options.verified = true;
             }
-            if (obj.logo.length > 3) {
+            if (obj.logo && obj.logo.length > 3) {
               ext = obj.logo.substr(obj.logo.length - 3);
               path = "public/assets/img/logos/" + obj.username + "." + ext;
               fs.lstat(path, function(err, stats) {
@@ -243,6 +243,19 @@
             });
           }
         });
+      },
+      wallet: function(req, res) {
+        return res.render('users/wallet', {
+          user: req.params.user,
+          layout: 'layout',
+          navigation: true,
+          js: (function() {
+            return global.js;
+          }),
+          css: (function() {
+            return global.css;
+          })
+        });
       }
     };
   };
diff --git a/src/app.coffee b/src/app.coffee
index f62b7696..554ef303 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -62,13 +62,11 @@ do fetchRates = ->
   )
   setTimeout(fetchRates, 120000)
 
-tips = 
-
 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('/tips', cache, (req, res) ->
   res.render('tips', 
     notice: true,
@@ -86,9 +84,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/routes/users.coffee b/src/routes/users.coffee
index b1e4fd9a..014b74b3 100644
--- a/src/routes/users.coffee
+++ b/src/routes/users.coffee
@@ -35,7 +35,7 @@ module.exports = (sessions) ->
         if req.query.verified?
           options.verified = true
 
-        if obj.logo.length > 3
+        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) ->
@@ -192,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)
+    )
diff --git a/views/layout.html b/views/layout.html
index 5be45ded..e63e3c47 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -20,8 +20,9 @@
           <div class="navbar">
             <ul class="nav navbar-nav">
               <li><a href="/{{user}}"><span class="glyphicon glyphicon-home"></span> Home</a></li>
-              <li><a href="/{{user}}/report"><span class="glyphicon glyphicon-list-alt"></span> Transactions</a></li>
-              <li><a href="/{{user}}/profile"><span class="glyphicon glyphicon-user"></span> Account Profile</a></li>
+              <li><a href="/{{user}}/report"><span class="glyphicon glyphicon-list-alt"></span> Sales</a></li>
+              <li><a href="/{{user}}/wallet"><span class="fa fa-bank"></span> Wallet</a></li>
+              <li><a href="/{{user}}/profile"><span class="glyphicon glyphicon-user"></span> Account</a></li>
               <li><a href="/{{user}}/edit"><span class="glyphicon glyphicon-cog"></span> Settings</a></li>
               <li><a href="/logout"><span class="glyphicon glyphicon-off"></span> Logout</a></li>
               <!--
diff --git a/views/users/edit.html b/views/users/edit.html
index 0e0af3df..344d4543 100644
--- a/views/users/edit.html
+++ b/views/users/edit.html
@@ -9,26 +9,15 @@
   <input type="hidden" id="email" name="email" />
 
   <div class="form-group">
-    <label for="title">Store Name:</label>
+    <label for="title">Store Name <small>(optional)</small>:</label>
     <input type="text" id="title" name="title" class="form-control" />
   </div>
 
   <div class="form-group">
-    <label for="logo">Logo:</label>
+    <label for="logo">Logo <small>(optional)</small>:</label>
     <input type="text" id="logo" name="logo" class="form-control" />
   </div>
 
-  <div class="form-group">
-    <label for="pubkey">Bitcoin Public Key:</label>
-    <div class="input-group">
-      <input type="text" id="pubkey" name="pubkey" class="form-control" placeholder="xpub..." />
-      <input type="hidden" id="privkey" name="privkey" />
-      <span class="input-group-btn">
-        <button id="generate" type="button" class="btn">New</button>
-      </span>
-    </div>
-  </div>
-
   <div class="form-group">
     <label for="currency">Currency:</label>
     <select id="currency" name="currency" class="form-control">
@@ -54,58 +43,3 @@
  
   <input class="btn btn-primary" type="submit" value="Done" />
 </form>
-
-<div class="modal fade" id="modal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title">New Extended Key</h4>
-      </div>
-
-      <div class="modal-body">
-        <ul class="nav nav-tabs" role="tablist">
-          <li class="active"><a id="step1_link" href="#step1" role="tab" data-toggle="tab">Key</a></li>
-          <li><a href="#step2" role="tab" data-toggle="tab">What's this?</a></li>
-        </ul>
-        <div class="tab-content">
-          <div id="step1" class="tab-pane active">
-            <form id="encrypt">
-              <div class="form-group">
-                <label for="encryption-password">Encryption Password:</label>
-                <input type="password" id="encryption-password" name="encryption-password" class="form-control" />
-              </div>
-
-              <div class="form-group">
-                <label for="encryption-confirm">Confirm Password:</label>
-                <input type="password" id="encryption-confirm" name="encryption-confirm" class="form-control" />
-              </div>
-
-              <input type="submit" style="position: absolute; left: -9999px" />
-            </form>
-
-            <div id="key-dialog" class="alert alert-danger">
-              Extended Private Key <span id="status">(Unencrypted)</span>
-              <pre id="privkey_text"></pre>
-              <div id="qr"></div>
-            </div>
-          </div>
-          <div id="step2" class="tab-pane">
-            <p>This is a Bitcoin extended key, also known as an <a href="https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki"><abbr title="Hierarchical Deterministic Wallet">HD Wallet</abbr></a>.</p>
-            <p>The <b>public</b> portion of the key is stored and used by CoinOS to generate a separate receiving address for every payment to your account.  This prevents people from seeing transactions to your account other than their own.</p>
-            <p>The <b>private</b> portion of the key (displayed on the 'Key' tab) will not be accessible after you close this window.  You are responsible for safely storing it and making copies of it, either by printing it out or saving it somewhere on your computer or online.</p>
-            <p>Encrypting the key with a strong password provides a safeguard against someone gaining access to a copy of the key.  They will need to know your password to decrypt the key.  Keep the password written down and backed up separately from the key.</p> 
-            <p class="text-danger"><b>IMPORTANT: We cannot reset your password.  If you lose it or forget it, any funds sent to your account will be lost forever.</b></p>
-
-            <img src="/assets/img/forever.gif" width="370px" />
-          </div>
-
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" id="print" class="btn btn-primary"><span class="glyphicon glyphicon-print"></span> Print</button>
-        <button type="button" id="close" class="btn btn-primary">Got it!</button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/views/users/profile.html b/views/users/profile.html
index 6d05d61d..dffa559c 100644
--- a/views/users/profile.html
+++ b/views/users/profile.html
@@ -21,7 +21,7 @@
   </div>
 
   <div class="form-group">
-    <label for="confirm">Confirm New Password:</label>
+    <label for="confirm">Confirm Password:</label>
     <input type="password" id="confirm" name="confirm" class="form-control" />
   </div>
 
diff --git a/views/users/wallet.html b/views/users/wallet.html
new file mode 100644
index 00000000..f17b4ae6
--- /dev/null
+++ b/views/users/wallet.html
@@ -0,0 +1,78 @@
+{{#yield-scripts}}
+  {{#js}}js/wallet{{/js}}
+{{/yield-scripts}}
+
+<form id="setup" action="/{{user}}" method="post" style="display: none">
+  <h1>Wallet</h1>
+
+  <input type="hidden" id="username" name="username" value="{{user}}" />
+  <input type="hidden" id="email" name="email" />
+
+  <div class="form-group">
+    <label for="pubkey">Bitcoin Public Key:</label>
+    <div class="input-group">
+      <input type="text" id="pubkey" name="pubkey" class="form-control" placeholder="xpub..." />
+      <input type="hidden" id="privkey" name="privkey" />
+      <span class="input-group-btn">
+        <button id="generate" type="button" class="btn">New</button>
+      </span>
+    </div>
+  </div>
+
+  <input class="btn btn-primary" type="submit" value="Done" />
+</form>
+
+<div class="modal fade" id="modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+        <h4 class="modal-title">New Extended Key</h4>
+      </div>
+
+      <div class="modal-body">
+        <ul class="nav nav-tabs" role="tablist">
+          <li class="active"><a id="step1_link" href="#step1" role="tab" data-toggle="tab">Key</a></li>
+          <li><a href="#step2" role="tab" data-toggle="tab">What's this?</a></li>
+        </ul>
+        <div class="tab-content">
+          <div id="step1" class="tab-pane active">
+            <form id="encrypt">
+              <div class="form-group">
+                <label for="encryption-password">Encryption Password:</label>
+                <input type="password" id="encryption-password" name="encryption-password" class="form-control" />
+              </div>
+
+              <div class="form-group">
+                <label for="encryption-confirm">Confirm Password:</label>
+                <input type="password" id="encryption-confirm" name="encryption-confirm" class="form-control" />
+              </div>
+
+              <input type="submit" style="position: absolute; left: -9999px" />
+            </form>
+
+            <div id="key-dialog" class="alert alert-danger">
+              Extended Private Key <span id="status">(Unencrypted)</span>
+              <pre id="privkey_text"></pre>
+              <div id="qr"></div>
+            </div>
+          </div>
+          <div id="step2" class="tab-pane">
+            <p>This is a Bitcoin extended key, also known as an <a href="https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki"><abbr title="Hierarchical Deterministic Wallet">HD Wallet</abbr></a>.</p>
+            <p>The <b>public</b> portion of the key is stored and used by CoinOS to generate a separate receiving address for every payment to your account.  This prevents people from seeing transactions to your account other than their own.</p>
+            <p>The <b>private</b> portion of the key (displayed on the 'Key' tab) will not be accessible after you close this window.  You are responsible for safely storing it and making copies of it, either by printing it out or saving it somewhere on your computer or online.</p>
+            <p>Encrypting the key with a strong password provides a safeguard against someone gaining access to a copy of the key.  They will need to know your password to decrypt the key.  Keep the password written down and backed up separately from the key.</p> 
+            <p class="text-danger"><b>IMPORTANT: We cannot reset your password.  If you lose it or forget it, any funds sent to your account will be lost forever.</b></p>
+
+            <img src="/assets/img/forever.gif" width="370px" />
+          </div>
+
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" id="print" class="btn btn-primary"><span class="glyphicon glyphicon-print"></span> Print</button>
+        <button type="button" id="close" class="btn btn-primary">Got it!</button>
+      </div>
+    </div>
+  </div>
+</div>
-- 
cgit v1.2.3


From 53b0e8108e459d31b2e47766e18a9e7713a8c1c8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Wed, 11 Nov 2015 20:39:02 -0800
Subject: Dropdown for discount

---
 views/users/edit.html | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'views')

diff --git a/views/users/edit.html b/views/users/edit.html
index 344d4543..beb98973 100644
--- a/views/users/edit.html
+++ b/views/users/edit.html
@@ -31,8 +31,21 @@
   </div>
 
   <div class="form-group">
-    <label for="commission">Commission (+) / Discount (-) %:</label>
-    <input type="text" id="commission" name="commission" class="form-control" />
+    <label for="commission">Discount:</label>
+
+    <select id="commission" name="commission" class="form-control">
+      <option value="0">None</option>
+      <option value="-1">1%</option>
+      <option value="-2">2%</option>
+      <option value="-3">3%</option>
+      <option value="-4">4%</option>
+      <option value="-5">5%</option>
+      <option value="-10">10%</option>
+      <option value="-15">15%</option>
+      <option value="-20">20%</option>
+      <option value="-25">25%</option>
+      <option value="-50">50%</option>
+    </select>
   </div>
 
   <div class="form-group">
-- 
cgit v1.2.3


From 1e7eb384be681e69f33c11e8a0ec9b9751b084c0 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Thu, 12 Nov 2015 10:17:28 -0800
Subject: Update wallet creation wording

---
 public/js/wallet.coffee       |  1 +
 views/calculator/address.html |  1 -
 views/users/wallet.html       | 22 +++++++++++-----------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'views')

diff --git a/public/js/wallet.coffee b/public/js/wallet.coffee
index 8ced085f..6bf17031 100644
--- a/public/js/wallet.coffee
+++ b/public/js/wallet.coffee
@@ -44,6 +44,7 @@ $(->
     g.privkey = key.extended_private_key_string()
 
     $('#modal').modal()
+    $('#pubkey_text').html(g.pubkey)
     $('#privkey_text').html(g.privkey)
     $('#qr').html('')
     new QRCode('qr', text: g.privkey, width: 260, height: 260)
diff --git a/views/calculator/address.html b/views/calculator/address.html
index 54d988cb..19275e52 100644
--- a/views/calculator/address.html
+++ b/views/calculator/address.html
@@ -15,7 +15,6 @@
   <div id="pubqr"></div>
 </div>
 
-
 <div id="key-dialog" class="alert alert-danger">
   <span id="status"></span> Private Key
   <pre id="privkey"></pre>
diff --git a/views/users/wallet.html b/views/users/wallet.html
index f17b4ae6..c7c91949 100644
--- a/views/users/wallet.html
+++ b/views/users/wallet.html
@@ -9,7 +9,7 @@
   <input type="hidden" id="email" name="email" />
 
   <div class="form-group">
-    <label for="pubkey">Bitcoin Public Key:</label>
+    <label for="pubkey">Bitcoin Receiving Address or HD Wallet Pubkey:</label>
     <div class="input-group">
       <input type="text" id="pubkey" name="pubkey" class="form-control" placeholder="xpub..." />
       <input type="hidden" id="privkey" name="privkey" />
@@ -27,24 +27,24 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title">New Extended Key</h4>
+        <h4 class="modal-title">New HD Wallet</h4>
       </div>
 
       <div class="modal-body">
         <ul class="nav nav-tabs" role="tablist">
-          <li class="active"><a id="step1_link" href="#step1" role="tab" data-toggle="tab">Key</a></li>
+          <li class="active"><a id="step1_link" href="#step1" role="tab" data-toggle="tab">Wallet Keys</a></li>
           <li><a href="#step2" role="tab" data-toggle="tab">What's this?</a></li>
         </ul>
         <div class="tab-content">
           <div id="step1" class="tab-pane active">
             <form id="encrypt">
               <div class="form-group">
-                <label for="encryption-password">Encryption Password:</label>
+                <label for="encryption-password">Encryption Passphrase <small>(16+ characters)</small>:</label>
                 <input type="password" id="encryption-password" name="encryption-password" class="form-control" />
               </div>
 
               <div class="form-group">
-                <label for="encryption-confirm">Confirm Password:</label>
+                <label for="encryption-confirm">Confirm Passphrase:</label>
                 <input type="password" id="encryption-confirm" name="encryption-confirm" class="form-control" />
               </div>
 
@@ -52,17 +52,17 @@
             </form>
 
             <div id="key-dialog" class="alert alert-danger">
-              Extended Private Key <span id="status">(Unencrypted)</span>
+              Master Public Key 
+              <pre id="pubkey_text"></pre>
+              Master Private Key <span id="status">(Unencrypted)</span>
               <pre id="privkey_text"></pre>
               <div id="qr"></div>
             </div>
           </div>
           <div id="step2" class="tab-pane">
-            <p>This is a Bitcoin extended key, also known as an <a href="https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki"><abbr title="Hierarchical Deterministic Wallet">HD Wallet</abbr></a>.</p>
-            <p>The <b>public</b> portion of the key is stored and used by CoinOS to generate a separate receiving address for every payment to your account.  This prevents people from seeing transactions to your account other than their own.</p>
-            <p>The <b>private</b> portion of the key (displayed on the 'Key' tab) will not be accessible after you close this window.  You are responsible for safely storing it and making copies of it, either by printing it out or saving it somewhere on your computer or online.</p>
-            <p>Encrypting the key with a strong password provides a safeguard against someone gaining access to a copy of the key.  They will need to know your password to decrypt the key.  Keep the password written down and backed up separately from the key.</p> 
-            <p class="text-danger"><b>IMPORTANT: We cannot reset your password.  If you lose it or forget it, any funds sent to your account will be lost forever.</b></p>
+            <p>An <abbr title="Hierarchical Deterministic Wallet">HD Wallet</abbr> is a master key that can be used to derive several Bitcoin addresses. CoinOS will use the master key that's generated here to derive a new address for every payment to your account so that people can't link separate payments together and invade your customers' privacy.</p>
+            <p>The master <b>pubkey</b> is what's used to derive the addresses and the master <b>private</b> key is what's needed to authorize payments out from the wallet.  CoinOS will get you to encrypt the private key with a strong passphrase before it's stored on our server so that no one but you can access your funds.  The password could be a different password from the one you use to login to your account, or it could be the same, but what's important is that you remember it.  You'll need to enter the password whenever you make a transaction out of the wallet.</p> 
+            <p class="text-danger"><b>IMPORTANT: We cannot recover or reset your password.  If you lose it or forget it, any funds sent to your account will be lost forever, so make it memorable or write it down.</b></p>
 
             <img src="/assets/img/forever.gif" width="370px" />
           </div>
-- 
cgit v1.2.3


From 4b7a8754512a6965570482d330865190a6320e9d Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Fri, 13 Nov 2015 08:19:22 -0800
Subject: Get wallet balance

---
 app.js                  |   5 ++
 public/js/wallet.coffee | 132 ++++++++++++------------------------------------
 src/app.coffee          |   4 ++
 views/users/wallet.html |  94 +++++++++++++---------------------
 4 files changed, 78 insertions(+), 157 deletions(-)

(limited to 'views')

diff --git a/app.js b/app.js
index 5f381065..cc79d0cc 100644
--- a/app.js
+++ b/app.js
@@ -113,6 +113,11 @@
 
   app.get('/ticker', cache, calculator.ticker);
 
+  app.get('/token', cache, function(req, res) {
+    res.write(config.blockcypher_token);
+    return res.end();
+  });
+
   app.get('/tips', cache, function(req, res) {
     return res.render('tips', {
       notice: true,
diff --git a/public/js/wallet.coffee b/public/js/wallet.coffee
index 6bf17031..fcbbd062 100644
--- a/public/js/wallet.coffee
+++ b/public/js/wallet.coffee
@@ -22,7 +22,39 @@ g = exports ? this
 g.proceed = false
 
 $(->
-  $('#encryption-password').pwstrength(showVerdicts: false)
+  api = 'https://api.blockcypher.com/v1/btc/main'
+  addresses = []
+  balance = 0
+  token = ''
+  $('#balance, #amount').hide()
+  $.get("/token", (data) -> 
+    token = data
+    $.get("#{api}/wallets/hd/yummy/addresses?token=#{token}", (data) -> 
+      for c in data.chains
+        for a in c.chain_addresses
+          addresses.push(a.address)
+
+      chunks = []
+      for i in [0 .. addresses.length] by 10 
+        chunks.push(addresses.slice(i,i+10))
+
+      doSetTimeout = (c,i) ->
+        setTimeout(->
+          $.get("#{api}/addrs/#{c.join(';')}/balance?token=#{token}", (addresses) -> 
+            for address in addresses
+              balance = parseInt(balance) + parseInt(address.final_balance)
+              val = (balance / 100000000).toFixed(8)
+
+            $('#balance').html(val)
+            $('#amount').val(val)
+            $('#balance, #amount').fadeIn()
+          )
+        , i*1500)
+
+      for c, i in chunks
+        doSetTimeout(c, i)
+    )
+  )
 
   user = $('#username').val()
   $.getJSON("/#{user}.json", (data) ->
@@ -30,104 +62,6 @@ $(->
     $('#address').val(data.address)
     $('#setup').fadeIn()
   )
-
-  $('#pubkey').blur(->
-    if check_address($(this).val())
-      $(this).parent().removeClass('has-error')
-    else 
-      $(this).parent().addClass('has-error')
-  )
-
-  $('#generate').click(->
-    key = new Key()
-    g.pubkey = key.extended_public_key_string()
-    g.privkey = key.extended_private_key_string()
-
-    $('#modal').modal()
-    $('#pubkey_text').html(g.pubkey)
-    $('#privkey_text').html(g.privkey)
-    $('#qr').html('')
-    new QRCode('qr', text: g.privkey, width: 260, height: 260)
-  )
-
-  $('#encryption-password').keyup((e) ->
-    return if e.keyCode is 9 or e.keyCode is 16
-    g.enc_privkey = CryptoJS.AES.encrypt(g.privkey, $(this).val()).toString()
-    g.enc_privkey = g.privkey if $(this).val() == ''
-    $('#privkey_text').html(g.enc_privkey)
-    $('#qr').html('')
-    new QRCode('qr', text: g.enc_privkey, width: 260, height: 260)
-
-    if $(this).val()
-      $('#status').html('(Encrypted)')
-    else
-      $('#status').html('(Unencrypted)')
-  )
-
-  $('#confirm').blur(->
-    $('#confirm_error').remove() 
-    if $('#password').val() != $('#confirm').val()
-      $('#password, #confirm').parent().addClass('has-error')
-      $('#confirm').parent().after('<div id="confirm_error" class="alert alert-danger">Passwords don\'t match</div>')
-    else
-      $('#password, #confirm').parent().removeClass('has-error')
-  )
-
-  $('#encryption-password, #encryption-confirm').keyup((e) -> check_passwords(e) unless e.keyCode is 9)
-  $('#encryption-password, #encryption-confirm').blur((e) -> check_passwords(e))
-
-  check_passwords = (e) ->
-    if $('#encryption-password').val() != $('#encryption-confirm').val() or $('#encryption-password').val() is ''
-      $('#encryption-password, #encryption-confirm').parent().addClass('has-error')
-      $('#modal .alert').removeClass('alert-success').addClass('alert-danger')
-    else
-      $('#encryption-password, #encryption-confirm').parent().removeClass('has-error')
-      $('#modal .alert').removeClass('alert-danger').addClass('alert-success')
-
-    if $('.progress-bar-success').length > 0
-      $('#encryption-password').parent().removeClass('has-error')
-    else
-      $('#encryption-password').parent().addClass('has-error')
-
-  $('#print').click(->
-    $('#key-dialog').printElement(printMode: 'popup')
-  )
-
-  $('a[data-toggle="tab"]').on('shown.bs.tab', (e) ->
-    $('#print').toggle(e.target.attributes.href.value == '#step1')
-  )
-
-  $('#close').click(-> 
-    $('#modal .form-control').blur()
-    if $('#modal .has-error').length > 0
-      $('#step1_link').click()
-      $('#modal .has-error').effect('shake', 500)
-    else
-      g.update_key = true
-      $('#modal').modal('hide')
-  )
-  $('#encrypt').submit(-> $('#close').click(); return false)
-
-  $('#modal').on('show.bs.modal', -> 
-    $('#encryption-password, #encryption-confirm').val('').keyup().parent().removeClass('has-error')
-    $('#modal .alert').removeClass('alert-success').addClass('alert-danger')
-  )
-
-  $('#modal').on('shown.bs.modal', -> 
-    g.update_key = false
-    $('#encryption-password').focus()
-  ).on('hidden.bs.modal', ->
-    if g.update_key
-      $('#pubkey').val(g.pubkey) 
-      $('#privkey').val(g.enc_privkey)
-  )
-
-  $('#setup').submit(->
-    $('#setup .form-control').blur()
-    if $('#setup .has-error').length > 0
-      $('#setup .has-error').effect('shake', 500)
-      return false
-  )
 )
 
 check_address = (address) ->
diff --git a/src/app.coffee b/src/app.coffee
index 554ef303..caab1bcb 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -67,6 +67,10 @@ 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('/token', cache, (req, res) ->
+  res.write(config.blockcypher_token)
+  res.end()
+)
 app.get('/tips', cache, (req, res) ->
   res.render('tips', 
     notice: true,
diff --git a/views/users/wallet.html b/views/users/wallet.html
index c7c91949..873a12d1 100644
--- a/views/users/wallet.html
+++ b/views/users/wallet.html
@@ -9,70 +9,48 @@
   <input type="hidden" id="email" name="email" />
 
   <div class="form-group">
-    <label for="pubkey">Bitcoin Receiving Address or HD Wallet Pubkey:</label>
-    <div class="input-group">
-      <input type="text" id="pubkey" name="pubkey" class="form-control" placeholder="xpub..." />
-      <input type="hidden" id="privkey" name="privkey" />
-      <span class="input-group-btn">
-        <button id="generate" type="button" class="btn">New</button>
-      </span>
-    </div>
+    <label>Available Balance:</label>
+    <b id="balance" class="lead">0.05154234</b> BTC
   </div>
 
-  <input class="btn btn-primary" type="submit" value="Done" />
-</form>
-
-<div class="modal fade" id="modal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title">New HD Wallet</h4>
-      </div>
-
-      <div class="modal-body">
-        <ul class="nav nav-tabs" role="tablist">
-          <li class="active"><a id="step1_link" href="#step1" role="tab" data-toggle="tab">Wallet Keys</a></li>
-          <li><a href="#step2" role="tab" data-toggle="tab">What's this?</a></li>
-        </ul>
-        <div class="tab-content">
-          <div id="step1" class="tab-pane active">
-            <form id="encrypt">
-              <div class="form-group">
-                <label for="encryption-password">Encryption Passphrase <small>(16+ characters)</small>:</label>
-                <input type="password" id="encryption-password" name="encryption-password" class="form-control" />
-              </div>
-
-              <div class="form-group">
-                <label for="encryption-confirm">Confirm Passphrase:</label>
-                <input type="password" id="encryption-confirm" name="encryption-confirm" class="form-control" />
-              </div>
-
-              <input type="submit" style="position: absolute; left: -9999px" />
-            </form>
-
-            <div id="key-dialog" class="alert alert-danger">
-              Master Public Key 
-              <pre id="pubkey_text"></pre>
-              Master Private Key <span id="status">(Unencrypted)</span>
-              <pre id="privkey_text"></pre>
-              <div id="qr"></div>
-            </div>
+  <div>
+    <ul class="nav nav-tabs" role="tablist">
+      <li role="presentation" class="active"><a href="#withdraw" aria-controls="withdraw" role="tab" data-toggle="tab">Withdraw</a></li>
+      <li role="presentation"><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">Manage Keys</a></li>
+    </ul>
+
+    <div class="tab-content">
+      <div role="tabpanel" class="tab-pane active" id="withdraw">
+        <div class="form-group">
+          <label for="amount">Amount:</label>
+          <div class="input-group">
+            <input type="number" id="amount" name="amount" class="form-control" value="0.05154232" />
+            <span class="input-group-btn">
+              <button type="button" class="btn">BTC</button>
+            </span>
+            <span class="input-group-btn">
+              <button type="button" class="btn">Max</button>
+            </span>
           </div>
-          <div id="step2" class="tab-pane">
-            <p>An <abbr title="Hierarchical Deterministic Wallet">HD Wallet</abbr> is a master key that can be used to derive several Bitcoin addresses. CoinOS will use the master key that's generated here to derive a new address for every payment to your account so that people can't link separate payments together and invade your customers' privacy.</p>
-            <p>The master <b>pubkey</b> is what's used to derive the addresses and the master <b>private</b> key is what's needed to authorize payments out from the wallet.  CoinOS will get you to encrypt the private key with a strong passphrase before it's stored on our server so that no one but you can access your funds.  The password could be a different password from the one you use to login to your account, or it could be the same, but what's important is that you remember it.  You'll need to enter the password whenever you make a transaction out of the wallet.</p> 
-            <p class="text-danger"><b>IMPORTANT: We cannot recover or reset your password.  If you lose it or forget it, any funds sent to your account will be lost forever, so make it memorable or write it down.</b></p>
+        </div>
 
-            <img src="/assets/img/forever.gif" width="370px" />
+        <div class="form-group">
+          <label for="amount">Recipient:</label>
+          <div class="input-group">
+            <input type="text" id="recipient" name="recipient" class="form-control" />
+            <span class="input-group-btn">
+              <button type="button" class="btn"><span class="glyphicon glyphicon-camera"></span></button>
+            </span>
           </div>
-
-        </div>
+        </div>  
       </div>
-      <div class="modal-footer">
-        <button type="button" id="print" class="btn btn-primary"><span class="glyphicon glyphicon-print"></span> Print</button>
-        <button type="button" id="close" class="btn btn-primary">Got it!</button>
+      <div role="tabpanel" class="tab-pane" id="settings">
+        <div class="form-group">
+          <label for="pubkey">Bitcoin Receiving Address or HD Wallet Pubkey:</label>
+            <input type="text" id="pubkey" name="pubkey" class="form-control" placeholder="xpub..."  />
+            <input type="hidden" id="privkey" name="privkey" />
+        </div>
       </div>
     </div>
   </div>
-</div>
+</form>
-- 
cgit v1.2.3