From 59afb3d0ba38ef8fe093e057fab52d8457df1d8b Mon Sep 17 00:00:00 2001
From: Scott <scott.grant@live.com.au>
Date: Mon, 17 Oct 2016 21:31:28 +1100
Subject: [PATCH] Setting up the look of the homepage design and desired
 features. Removes the about page Fixes issue with wallet linking

---
 web/app/index.html                |   1 -
 web/app/views/about/about.html    | 179 ------------------------------
 web/app/views/about/about.js      |  14 ---
 web/app/views/about/about_test.js |  16 ---
 web/app/views/home/home.html      |  79 ++++++++-----
 web/app/views/wallets/wallets.js  |   2 +-
 6 files changed, 53 insertions(+), 238 deletions(-)
 delete mode 100644 web/app/views/about/about.html
 delete mode 100644 web/app/views/about/about.js
 delete mode 100644 web/app/views/about/about_test.js

diff --git a/web/app/index.html b/web/app/index.html
index e171f66a..2ad53cbd 100644
--- a/web/app/index.html
+++ b/web/app/index.html
@@ -33,7 +33,6 @@
         <ul class="nav navbar-nav">
             <li><a href="#!/">Dashboard</a></li>
             <li><a href="#!/wallets">Wallets</a></li>
-            <li><a href="#!/about">About</a></li>
         </ul>
 		<ul class="nav navbar-nav pull-right">
 			<li class=""><a href="#!/settings">Settings</a></li>
diff --git a/web/app/views/about/about.html b/web/app/views/about/about.html
deleted file mode 100644
index d5c01f4c..00000000
--- a/web/app/views/about/about.html
+++ /dev/null
@@ -1,179 +0,0 @@
- <div class="row">
-            <div class="col-sm-8">
-            
-                <div class="jumbotron">
-                   <div class="readme boxed-group clearfix announce instapaper_body md" id="readme">
-    <h3>
-      <svg width="16" viewBox="0 0 16 16" version="1.1" height="16" class="octicon octicon-book" aria-hidden="true"><path d="M3 5h4v1H3V5zm0 3h4V7H3v1zm0 2h4V9H3v1zm11-5h-4v1h4V5zm0 2h-4v1h4V7zm0 2h-4v1h4V9zm2-6v9c0 .55-.45 1-1 1H9.5l-1 1-1-1H2c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h5.5l1 1 1-1H15c.55 0 1 .45 1 1zm-8 .5L7.5 3H2v9h6V3.5zm7-.5H9.5l-.5.5V12h6V3z"/></svg>
-      README.md
-    </h3>
-
-      <article itemprop="text" class="markdown-body entry-content"><h2><a aria-hidden="true" href="#cryptocurrency-trading-bot-written-in-golang" class="anchor" id="user-content-cryptocurrency-trading-bot-written-in-golang"><svg width="16" viewBox="0 0 16 16" version="1.1" height="16" class="octicon octicon-link" aria-hidden="true"><path d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"/></svg></a>Cryptocurrency trading bot written in Golang</h2>
-
-<p><a href="https://travis-ci.org/thrasher-/gocryptotrader"><img style="max-width:100%;" data-canonical-src="https://travis-ci.org/thrasher-/gocryptotrader.svg?branch=master" alt="Build Status" src="https://camo.githubusercontent.com/1e8eb47c187ffb439ae782f27635f82f93d08e1c/68747470733a2f2f7472617669732d63692e6f72672f74687261736865722d2f676f63727970746f7472616465722e7376673f6272616e63683d6d6173746572"></a>
-<a href="https://codecov.io/github/thrasher-/gocryptotrader?branch=master"><img style="max-width:100%;" data-canonical-src="https://codecov.io/github/thrasher-/gocryptotrader/coverage.svg?branch=master" alt="Test Coverage" src="https://camo.githubusercontent.com/c33fdbdc74ecbcef915afc325478cdf4a9317f01/68747470733a2f2f636f6465636f762e696f2f6769746875622f74687261736865722d2f676f63727970746f7472616465722f636f7665726167652e7376673f6272616e63683d6d6173746572"></a></p>
-
-<p>A cryptocurrency trading bot supporting multiple exchanges written in Golang. </p>
-
-<p><strong>Please note that this bot is under development and is not ready for production!</strong></p>
-
-<h2><a aria-hidden="true" href="#exchange-support-table" class="anchor" id="user-content-exchange-support-table"><svg width="16" viewBox="0 0 16 16" version="1.1" height="16" class="octicon octicon-link" aria-hidden="true"><path d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"/></svg></a>Exchange Support Table</h2>
-
-<table><thead>
-<tr>
-<th>Exchange</th>
-<th>REST API</th>
-<th>Streaming API</th>
-<th>FIX API</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>Alphapoint</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>ANXPRO</td>
-<td>Yes</td>
-<td>No</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>Bitfinex</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>Bitstamp</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>BTCC</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>No</td>
-</tr>
-<tr>
-<td>BTCE</td>
-<td>Yes</td>
-<td>NA</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>BTCMarkets</td>
-<td>Yes</td>
-<td>NA</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>Coinbase</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>No</td>
-</tr>
-<tr>
-<td>Gemini</td>
-<td>Yes</td>
-<td>NA</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>Huobi</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>No</td>
-</tr>
-<tr>
-<td>ItBit</td>
-<td>Yes</td>
-<td>NA</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>Kraken</td>
-<td>Yes</td>
-<td>NA</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>LakeBTC</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>LocalBitcoins</td>
-<td>Yes</td>
-<td>NA</td>
-<td>NA</td>
-</tr>
-<tr>
-<td>OKCoin (both)</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>No</td>
-</tr>
-<tr>
-<td>Poloniex</td>
-<td>Yes</td>
-<td>Yes</td>
-<td>NA</td>
-</tr>
-</tbody></table>
-
-<p>** NA means not applicable as the Exchange does not support the feature.</p>
-
-<h2><a aria-hidden="true" href="#current-features" class="anchor" id="user-content-current-features"><svg width="16" viewBox="0 0 16 16" version="1.1" height="16" class="octicon octicon-link" aria-hidden="true"><path d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"/></svg></a>Current Features</h2>
-
-<ul>
-<li>Support for all Exchange fiat and digital currencies, with the ability to individually toggle them on/off.</li>
-<li>REST API support for all exchanges.</li>
-<li>Websocket support for applicable exchanges.</li>
-<li>Ability to turn off/on certain exchanges.</li>
-<li>Ability to adjust manual polling timer for exchanges.</li>
-<li>SMS notification support via SMS Gateway.</li>
-<li>Basic event trigger system.</li>
-</ul>
-
-<h2><a aria-hidden="true" href="#planned-features" class="anchor" id="user-content-planned-features"><svg width="16" viewBox="0 0 16 16" version="1.1" height="16" class="octicon octicon-link" aria-hidden="true"><path d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"/></svg></a>Planned Features</h2>
-
-<ul>
-<li>WebGUI.</li>
-<li>FIX support.</li>
-<li>Expanding event trigger system.</li>
-<li>TALib.</li>
-<li>Trade history summary generation for tax purposes.</li>
-</ul>
-
-<p>Please feel free to submit any pull requests or suggest any desired features to be added.</p>
-
-<h2><a aria-hidden="true" href="#compiling-instructions" class="anchor" id="user-content-compiling-instructions"><svg width="16" viewBox="0 0 16 16" version="1.1" height="16" class="octicon octicon-link" aria-hidden="true"><path d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"/></svg></a>Compiling instructions</h2>
-
-<p>Download Go from <a href="https://golang.org/dl/">https://golang.org/dl/</a><br>
-Using a terminal, type go get github.com/thrasher-/gocryptotrader<br>
-Change directory to the package directory, then type go install.<br>
-Copy config_example.json to config.json.<br>
-Make any neccessary changes to the config file.<br>
-Run the application!  </p>
-
-<h2><a aria-hidden="true" href="#binaries" class="anchor" id="user-content-binaries"><svg width="16" viewBox="0 0 16 16" version="1.1" height="16" class="octicon octicon-link" aria-hidden="true"><path d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"/></svg></a>Binaries</h2>
-
-<p>Binaries will be published once the codebase reaches a stable condition.</p>
-</article>
-  </div>
-                </div>
-                
-            </div>
-            <div class="col-sm-4">
-                
-                <div class="well">
-                    <h3>Look I'm A Sidebar!</h3>
-                </div>
-
-            </div>
-        </div>
-    </main>
\ No newline at end of file
diff --git a/web/app/views/about/about.js b/web/app/views/about/about.js
deleted file mode 100644
index 88de9479..00000000
--- a/web/app/views/about/about.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict';
-
-angular.module('myApp.about', ['ngRoute'])
-
-.config(['$routeProvider', function($routeProvider) {
-  $routeProvider.when('/about', {
-    templateUrl: '/views/about/about.html',
-    controller: 'AboutController'
-  });
-}])
-
-.controller('AboutController', [function() {
-
-}]);
\ No newline at end of file
diff --git a/web/app/views/about/about_test.js b/web/app/views/about/about_test.js
deleted file mode 100644
index 07b34d6b..00000000
--- a/web/app/views/about/about_test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-describe('myApp.view2 module', function() {
-
-  beforeEach(module('myApp.view2'));
-
-  describe('view2 controller', function(){
-
-    it('should ....', inject(function($controller) {
-      //spec body
-      var view2Ctrl = $controller('View2Ctrl');
-      expect(view2Ctrl).toBeDefined();
-    }));
-
-  });
-});
\ No newline at end of file
diff --git a/web/app/views/home/home.html b/web/app/views/home/home.html
index 0eddc317..b726f334 100644
--- a/web/app/views/home/home.html
+++ b/web/app/views/home/home.html
@@ -1,28 +1,53 @@
-<h2>Dashboard</h2>
-<h3>All enabled currencies</h3>
-<div ng-repeat="exchange in exchanges">
-    <h4>{{exchange.exchangeName}}</h4>
-    <table class="table table-striped">
-        <tr>
-            <th>Currency</th>
-            <th>Last</th>
-            <th>High</th>
-            <th>Low</th>
-            <th>Volume</th>
-            <th>Bid</th>
-            <th>Ask</th>
-        </tr>
-        <tr ng-repeat="value in exchange.exchangeValues">
-            <td>{{value.CryptoCurrency}}</td>
-            <td>{{value.Last}}</td>
-            <td>{{value.High}}</td>
-            <td>{{value.Low}}</td>
-            <td>{{value.Volume}}</td>
-            <td>{{value.Bid}}</td>
-            <td>{{value.Ask}}</td>
-        </tr>
-    </table>
-    <div ng-repeat="value in exchange.exchangeValues">
-        
-    </div>
+<h1>Dashboard</h1>
+<div class="col-md-12">
+	<div class="col-md-8">
+		<div class="col-md-12">
+			<!-- This is to get a sense of scale, I don't intend on any hardcoded heights!' -->
+			<div class="col-md-6" style=" height: 300px;">
+				<h3>Sell orders</h3>
+			</div>
+			<div class="col-md-6" style=" height: 300px;">
+				<h3>Buy orders</h3>
+			</div>
+		</div>
+		<div class="col-md-12" style=" height: 300px;">
+			<h3>Market depth chart</h3>
+		</div>
+		<div class="col-md-4" style=" height: 300px;">
+			<h4>Buy</h4>
+		</div>
+		<div class="col-md-4" style=" height: 300px;">
+			<h4>Sell</h4>
+		</div>
+		<div class="col-md-4" style=" height: 300px;">
+			<h4>Wallet quick look</h4>
+			See current holding of selected currency
+		</div>
+		<div class="col-md-12">
+			<div class="col-md-6" style=" height: 400px;">
+				<h3>Trade History</h3>
+			</div>
+			<div class="col-md-6" style=" height: 400px;">
+				<h3>My Open Orders</h3>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-4">
+		<h4>All enabled currencies</h4>
+		<div ng-repeat="exchange in exchanges">
+			<h5>{{exchange.exchangeName}}</h5>
+			<table class="table table-striped">
+				<tr>
+					<th>Currency</th>
+					<th>Last</th>
+					<th>Volume</th>
+				</tr>
+				<tr ng-repeat="value in exchange.exchangeValues">
+					<td>{{value.CryptoCurrency}}</td>
+					<td>{{value.Last}}</td>
+					<td>{{value.Volume}}</td>
+				</tr>
+			</table>
+		</div>
+	</div>
 </div>
\ No newline at end of file
diff --git a/web/app/views/wallets/wallets.js b/web/app/views/wallets/wallets.js
index ace260c0..acdb386b 100644
--- a/web/app/views/wallets/wallets.js
+++ b/web/app/views/wallets/wallets.js
@@ -3,7 +3,7 @@
 angular.module('myApp.wallets', ['ngRoute'])
 
 .config(['$routeProvider', function($routeProvider) {
-  $routeProvider.when('/', {
+  $routeProvider.when('/wallets', {
     templateUrl: '/views/wallets/wallets.html',
     controller: 'WalletsController'
   });