Use bower, grunt and browserify instead of connect-assets

10 files changed, 43 insertions, 24 deletions

diff --git a/views/calculator/address.html b/views/address.html
index 19275e52..19275e52 100644
--- a/views/calculator/address.html
+++ b/views/address.html
diff --git a/views/calculator/sweep.html b/views/calculator/sweep.html
deleted file mode 100644
index 92be828c..00000000
--- a/views/calculator/sweep.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{{#yield-scripts}}
-<script src='/js/jquery-1.8.2.min.js'></script>
-<script src='/js/llqrcode.js'></script>
-<script src='/js/webqr.js'></script>
-<script src='/js/bitcoinjs-min.js'></script>
-<script src='/js/sweep.js'></script>
-{{/yield-scripts}}
-<canvas id="qr-canvas" height="1000" width="1000" style="display: none"></canvas>
-<div id="outdiv"></div>
-<div id="result"></div>
diff --git a/views/layout.html b/views/layout.html
index e63e3c47..72643d14 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -3,8 +3,18 @@
     <meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1" />
     <title>CoinOS</title>
-    <link href="/assets/img/favicon.ico" rel="shortcut icon" />
-    {{#css}}css/calculator{{/css}}
+    <link href="/img/favicon.ico" rel="shortcut icon" />
+    <link rel="stylesheet" href="/jquery-ui/themes/ui-lightness/jquery-ui.min.css" />
+    <link rel="stylesheet" href="/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="/bootstrap/dist/css/bootstrap-theme.min.css" />
+    <link rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" />
+    <link rel="stylesheet" href="/css/coinos.css" />
+    <script src="/jquery/dist/jquery.min.js"></script>
+    <script src="/jquery-ui/jquery-ui.min.js"></script>
+    <script src="/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script src="/js/bitcoinjs.min.js"></script>
+    <script src="/js/qrcode.js"></script>
     {{{yield-styles}}}
     {{{yield-scripts}}}
   </head>
@@ -25,9 +35,6 @@
               <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>
-              <!--
-              <li><a href="/help"><span class="glyphicon glyphicon-info-sign"></span> Help</a></li>
--->
             </ul>
           </div>
         </div>
diff --git a/views/sessions/new.html b/views/sessions/new.html
index cf28a9ed..c9923744 100644
--- a/views/sessions/new.html
+++ b/views/sessions/new.html
@@ -1,6 +1,7 @@
 {{#yield-scripts}}
-  {{#css}}css/signin{{/css}}
-  {{#js}}js/signin{{/js}}
+  <link rel="stylesheet" href="/css/signin.css" />
+  <script src="/js/jquery-1.8.2.min.js"></script>
+  <script src="/js/signin.js"></script>
 {{/yield-scripts}}
 
 <div id="main-logo"></div>
diff --git a/views/transactions/index.html b/views/transactions/index.html
index d48d28f1..07c0c7db 100644
--- a/views/transactions/index.html
+++ b/views/transactions/index.html
@@ -1,5 +1,5 @@
 {{#yield-scripts}}
-  {{#js}}js/report{{/js}}
+<script src="/js/report.js"></script>
 {{/yield-scripts}}
 
 <h1>Payments Received</h1>
diff --git a/views/users/edit.html b/views/users/edit.html
index beb98973..80b1e3c7 100644
--- a/views/users/edit.html
+++ b/views/users/edit.html
@@ -1,5 +1,24 @@
 {{#yield-scripts}}
-  {{#js}}js/setup{{/js}}
+<script src="/js/jquery-1.8.2.min.js"></script>
+<script src="/js/jquery-ui.min.js"></script>
+<script src="/js/jquery.printElement.min.js"></script>
+<script src="/js/check_password.js"></script>
+<script src="/js/bootstrap.min.js"></script>
+<script src="/js/jsbn.js"></script>
+<script src="/js/jsbn2.js"></script>
+<script src="/js/crypto-min.js"></script>
+<script src="/js/2.5.3-crypto-sha256.js"></script>
+<script src="/js/sha512.js"></script>
+<script src="/js/rfc1751.js"></script>
+<script src="/js/bitcoinjs-min-1.0.2.js"></script>
+<script src="/js/bitcoinjs-min.js"></script>
+<script src="/js/modsqrt.js"></script>
+<script src="/js/bip32.js"></script>
+<script src="/js/secure_random.js"></script>
+<script src="/js/qrcode.js"></script>
+<script src="/js/aes.js"></script>
+<script src="/js/key.js"></script>
+<script src="/js/setup.js"></script>
 {{/yield-scripts}}
 
 <form id="setup" action="/{{user}}" method="post" style="display: none">
diff --git a/views/users/new.html b/views/users/new.html
index ab3a9edd..7941725f 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -1,5 +1,5 @@
 {{#yield-scripts}}
-  {{#js}}js/register{{/js}}
+<script src="/js/register.js"></script>
 {{/yield-scripts}}
 
 <div id="main-logo"></div>
diff --git a/views/users/profile.html b/views/users/profile.html
index dffa559c..9fcdc03e 100644
--- a/views/users/profile.html
+++ b/views/users/profile.html
@@ -1,5 +1,7 @@
 {{#yield-scripts}}
-  {{#js}}js/profile{{/js}}
+<script src="/js/jquery-1.8.2.min.js"></script>
+<script src="/js/bootstrap.min.js"></script>
+<script src="/js/profile.js"></script>
 {{/yield-scripts}}
 
 <form id="profile" action="/{{user}}" method="post" style="display: none">
diff --git a/views/users/show.html b/views/users/show.html
index f37afad4..ef177239 100644
--- a/views/users/show.html
+++ b/views/users/show.html
@@ -1,5 +1,5 @@
 {{#yield-scripts}}
-  {{#js}}js/calculator{{/js}}
+  <script src="/js/calculator.js"></script>
 {{/yield-scripts}}
 
 {{#verified}}
@@ -15,7 +15,7 @@ Your email has been verified. Thank you!
   <input id="user" type="hidden" value="{{user}}" />
 
   <h1 id="title"></h1>
-  <a href="/{{user}}/edit"><img id="logo" src="/assets/img/bitcoin.png" alt="Logo" /></a>
+  <a href="/{{user}}/edit"><img id="logo" src="/img/bitcoin.png" alt="Logo" /></a>
 
   <form role="form">
     <div class="form-group">
diff --git a/views/users/wallet.html b/views/users/wallet.html
index f61f0a9c..25564f5d 100644
--- a/views/users/wallet.html
+++ b/views/users/wallet.html
@@ -1,5 +1,5 @@
 {{#yield-scripts}}
-  {{#js}}js/wallet{{/js}}
+  <script src="/js/wallet.js"></script>
 {{/yield-scripts}}
 
 <h1>Wallet</h1>