Merge remote-tracking branch 'asoltys/master'

7 files changed, 89 insertions, 75 deletions

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/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/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:[email protected]">[email protected]</a>
+</p>
+
+<iframe width="420" height="315" src="https://www.youtube.com/embed/be4J_OpciTc" frameborder="0" allowfullscreen></iframe>
diff --git a/views/users/edit.html b/views/users/edit.html
index 0e0af3df..beb98973 100644
--- a/views/users/edit.html
+++ b/views/users/edit.html
@@ -9,27 +9,16 @@
   <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">
     </select>
@@ -42,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">
@@ -54,58 +56,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/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>
 
diff --git a/views/users/wallet.html b/views/users/wallet.html
new file mode 100644
index 00000000..873a12d1
--- /dev/null
+++ b/views/users/wallet.html
@@ -0,0 +1,56 @@
+{{#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>Available Balance:</label>
+    <b id="balance" class="lead">0.05154234</b> BTC
+  </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>
+
+        <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 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>
+</form>