8 files changed, 208 insertions, 74 deletions

diff --git a/cmd/web/Makefile b/cmd/web/Makefile
index 52e2289..7315d5e 100644
--- a/cmd/web/Makefile
+++ b/cmd/web/Makefile
@@ -4,7 +4,7 @@ export PATH := $(PATH):./node_modules/.bin
 
 SRC_DIR=js
 BUILD_DIR=build/js
-JSX_SRC= header_footer.jsx main.jsx signup.jsx signin.jsx otp.jsx poloniex.jsx password_reset.jsx change_password.jsx account.jsx
+JSX_SRC= header_footer.jsx main.jsx signup.jsx signin.jsx otp.jsx poloniex.jsx password_reset.jsx change_password.jsx account.jsx balance.jsx
 JS_SRC= cookies.js app.js api.js
 STATIC_FILES= index.html style.css fontello.css
 STATIC_FILES+=$(addprefix fonts/, fontello.eot fontello.svg fontello.ttf fontello.woff fontello.woff2)
diff --git a/cmd/web/js/account.jsx b/cmd/web/js/account.jsx
index 43e7083..d30abe7 100644
--- a/cmd/web/js/account.jsx
+++ b/cmd/web/js/account.jsx
@@ -8,7 +8,7 @@ class PoloniexConfiguration extends React.Component {
   }
 
   checkCredentials = () => {
-    Api.Call('MARKET_BALANCE', {'name': 'poloniex', 'currency': 'BTC'}, function(err, status, data) {
+    Api.Call('MARKET_TEST_CREDENTIALS', {'name': 'poloniex'}, function(err, status, data) {
       if (err) {
         console.error(err, data);
         if (err.code === 'invalid_market_credentials') {
@@ -28,13 +28,6 @@ class PoloniexConfiguration extends React.Component {
   }
 
   handleCredentialsSubmit = () => {
-
-    /*
-     *If (!this.state.apiKey || !this.state.apiSecret) {
-     *  return;
-     *}
-     */
-
     Api.Call('UPDATE_MARKET', {'key': this.state.apiKey, 'secret': this.state.apiSecret, 'name': 'poloniex'}, function(err, status, data) {
       if (err) {
         console.error(err, data);
diff --git a/cmd/web/js/api.js b/cmd/web/js/api.js
index c9b4ef5..f892a6b 100644
--- a/cmd/web/js/api.js
+++ b/cmd/web/js/api.js
@@ -74,15 +74,24 @@ var ApiEndpoints = {
       return '/market/' + params.name;
     }
   },
-  'MARKET_BALANCE': {
+  'MARKET_TEST_CREDENTIALS': {
     'type': 'GET',
     'auth': true,
     'parameters': [
-      {'name': 'name',     'mandatory': true, 'inquery': false},
-      {'name': 'currency', 'mandatory': true, 'inquery': true},
+      {'name': 'name', 'mandatory': true, 'inquery': false},
+    ],
+    'buildUrl': function(params) {
+      return '/market/' + params.name + '/test-credentials';
+    }
+  },
+  'MARKET_GET_PORTFOLIO': {
+    'type': 'GET',
+    'auth': true,
+    'parameters': [
+      {'name': 'name', 'mandatory': true, 'inquery': false},
     ],
     'buildUrl': function(params) {
-      return '/market/' + params.name + '/balance';
+      return '/market/' + params.name + '/portfolio';
     }
   },
   'UPDATE_MARKET': {
diff --git a/cmd/web/js/balance.jsx b/cmd/web/js/balance.jsx
new file mode 100644
index 0000000..d141aa8
--- /dev/null
+++ b/cmd/web/js/balance.jsx
@@ -0,0 +1,99 @@
+import React from 'react';
+import moment from 'moment';
+
+class CurrencyLogo extends React.Component {
+    render = () => {
+      return <div className="d-inline-block h-100">
+               <img className="currency-logo align-top"
+                  src={'/public/icons/black/' + this.props.currency.toLowerCase() + '.svg' }
+                  title={this.props.currency}
+                  alt={this.props.currency} />
+             </div>;
+    }
+ }
+
+ var formatVariation = (variation) => {
+  var variationAbs = Math.abs(variation);
+  if (variation === 0.0) {
+    return <span>{variationAbs}%</span>;
+  } else if (variation > 0) {
+    return <span className="performance-up">+{variationAbs}%</span>;
+  }
+  return <span className="performance-down">-{variationAbs}%</span>;
+};
+
+
+class CurrencyRateHeader extends React.Component {
+    render = () => {
+        return <React.Fragment>
+              <div className="row text-center">
+                <div className="d-inline col-2">Asset</div>
+                <div className="d-inline col-2">Position</div>
+                <div className="d-inline col-2">Qty</div>
+                <div className="d-inline col-2">Value (BTC)</div>
+                <div className="d-inline col-2">Weight</div>
+                <div className="d-inline col-2">Perf %</div>
+              </div>
+            </React.Fragment>;
+    }
+}
+
+class CurrencyRate extends React.Component {
+    render = () => {
+        return <React.Fragment>
+              <div className="row text-center">
+                <div className="d-inline col-2 text-left"><CurrencyLogo currency={this.props.currency} /><span>{this.props.currency}</span></div>
+                <div className="d-inline col-2">{this.props.positionType}</div>
+                <div className="d-inline col-2">{this.props.quantity}</div>
+                <div className="d-inline col-2">{this.props.BTCValue}</div>
+                <div className="d-inline col-2">{this.props.weight}%</div>
+                <div className="d-inline col-2">{formatVariation(this.props.positionPerformanceP)}</div>
+              </div>
+            </React.Fragment>;
+    }
+}
+
+class Assets extends React.Component {
+    render = () => {
+        var currencies = Object.keys(this.props.balances).map(function(currency) {
+            var balance = this.props.balances[currency];
+            balance.currency = currency;
+            return <div className="row" key={currency}>
+                    <div className="col-12"><CurrencyRate {...balance} /></div>
+                  </div>;
+        }.bind(this));
+
+        return <div className="assets">
+          <CurrencyRateHeader />
+          {currencies}
+        </div>;
+    }
+}
+
+class PFBalance extends React.Component {
+    render = () => {
+        var date = moment(this.props.periodStart).format('MMM Do, h:mma');
+        return <React.Fragment>
+            <div className="h-100 align-self-center balance">
+              <div className="row">
+                <div className="col-8">
+                   Current balance
+                </div>
+                <div className="col-4 text-center h-100 btcValue">
+                  <CurrencyLogo currency="BTC" /> <span className="h-100 align-middle"><strong>{this.props.balance}</strong></span>
+                </div>
+              </div>
+              <div className="row">
+                <div className="col-8">
+                  <em>since {date}</em>
+                </div>
+                <div className="col-4 variation text-center">
+                   <strong>{formatVariation(this.props.variationP)}</strong>
+                </div>
+              </div>
+            </div>
+        </React.Fragment>;
+    }
+}
+
+export {PFBalance, Assets};
diff --git a/cmd/web/js/poloniex.jsx b/cmd/web/js/poloniex.jsx
index edac368..6019ef8 100644
--- a/cmd/web/js/poloniex.jsx
+++ b/cmd/web/js/poloniex.jsx
@@ -1,30 +1,45 @@
 import Api from './api.js';
 import React from 'react';
+import {PFBalance, Assets} from './balance.js';
 
 class PoloniexController extends React.Component {
   constructor(props) {
     super(props);
-    this.state = {'flag': 'loading', 'valueCurrency': null, 'balanceValue': null, 'balance': null};
+    this.state = {'flag': 'loading', 'periodStart': null, 'variationP': null, 'balance': null, 'balances': null};
   }
 
-  loadBalance = () => {
-    Api.Call('MARKET_BALANCE', {'name': 'poloniex', 'currency': 'BTC'}, function(err, status, data) {
+  testCredentials = () => {
+    Api.Call('MARKET_TEST_CREDENTIALS', {'name': 'poloniex'}, function(err, status, data) {
       if (err) {
         console.error(err, data);
         if (err.code === 'invalid_market_credentials') {
-          this.setState({'flag': 'invalidCredentials', 'valueCurrency': null, 'balanceValue': null, 'balance': null});
+          this.setState({'flag': 'invalidCredentials', 'variationP': null, 'balance': null, 'balances': null, 'periodStart': null});
         } else if (err.code === 'ip_restricted_api_key') {
-          this.setState({'flag': 'ipRestricted', 'valueCurrency': null, 'balanceValue': null, 'balance': null});
+          this.setState({'flag': 'ipRestricted', 'variationP': null, 'balance': null, 'balances': null, 'periodStart': null});
         }
         return;
       }
 
-      this.setState({'flag': 'ok', 'valueCurrency': data.valueCurrency, 'balanceValue': data.value, 'balance': data.balance});
+      this.loadPortfolio();
+    }.bind(this));
+  }
+
+  loadPortfolio = () => {
+    Api.Call('MARKET_GET_PORTFOLIO', {'name': 'poloniex'}, function(err, status, data) {
+      if (err) {
+        console.error(err, data);
+        if (err.code === 'not_found') {
+          this.setState({'flag': 'noReport', 'variationP': null, 'balance': null, 'balances': null, 'periodStart': null});
+        }
+        return;
+      }
+
+      this.setState({'flag': 'ok', 'variationP': data.performance.variationP, 'balance': data.value, 'balances': data.balances, 'periodStart': data.periodStart});
     }.bind(this));
   }
 
   componentDidMount = () => {
-    this.loadBalance();
+    this.testCredentials();
   }
 
   render = () => {
@@ -33,10 +48,13 @@ class PoloniexController extends React.Component {
       case 'loading':
         displayText = 'Loading data from poloniex...';
         break;
+      case 'noReport':
+        displayText = 'Your account is setup ! Reporting will start next Monday !';
+        break;
       case 'invalidCredentials':
       case 'ipRestricted':
       case 'emptyCredentials':
-        displayText = <div>Please provide poloniex credentials in <a href="/account">Account</a> page.</div>;
+        displayText = <div>Please provide poloniex credentials in <a href="/account"><u>Account</u></a> page.</div>;
         break;
       default:
         displayText = null;
@@ -44,59 +62,55 @@ class PoloniexController extends React.Component {
     return (
       <div>
         <PoloniexBalance  balanceCurrency={this.state.valueCurrency}
-                          balanceValue={this.state.balanceValue}
+                          variationP={this.state.variationP}
+                          periodStart={this.state.periodStart}
                           balance={this.state.balance}
+                          balances={this.state.balances}
                           displayText={displayText}/>
       </div>
     );
   }
 }
 
-class CurrencyLogo extends React.Component {
+class Panel extends React.Component {
   render = () => {
-    return <img className="currency-logo"
-                src={'/public/icons/black/' + this.props.currency.toLowerCase() + '.svg' }
-                title={this.props.currency}
-                alt={this.props.currency} />;
+    if (this.props.component === null) {
+      return <div></div>;
+    }
+
+    return (
+      <div className="row">
+        <div className="box col-12">
+          <div className="row">
+            <div className="col-4">{this.props.title}</div>
+          </div>
+          <hr/>
+          {this.props.component}
+        </div>
+      </div>);
   }
 }
 
 class PoloniexBalance extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {'hideMsg': true, 'msg': '', 'msgOk': false};
-  }
-
-  computeCurrencyRatio = (currency) => {
-    return (parseFloat(this.props.balance[currency].btcValue) / parseFloat(this.props.balanceValue) * 100.0).toFixed(1);
-  }
 
   render = () => {
-    var dashboard = null;
-
-    if (this.props.balanceValue !== null) {
+    var balancePanel = null;
+    var assetsPanel  = null;
+    var messagePanel = null;
 
-      var balance = Object.keys(this.props.balance).map(function(currency) {
-        return <div key={currency}>
-                 <div>
-                 <CurrencyLogo currency={currency} /> {this.props.balance[currency].amount} {currency} ({this.computeCurrencyRatio(currency)}%)
-                 </div>
-               </div>;
-      }.bind(this));
-
-      dashboard =
+    if (this.props.variationP !== null) {
+      balancePanel =
         <div className="row">
-          <div className="col-6 align-self-center h-100 balances">
-              {balance}
-          </div>
-          <div className="offset-1 col-5 h-100 align-self-center">
-            <div className="text-center">
-              Balance ({this.props.balanceCurrency}): <span>{this.props.balanceValue}</span><CurrencyLogo currency={this.props.balanceCurrency} />
-            </div>
+          <div className="col-12 offset-md-1 col-md-10 align-self-center h-100 balances">
+            <PFBalance variationP={this.props.variationP} balance={this.props.balance} periodStart={this.props.periodStart}/>
           </div>
         </div>;
+
+      assetsPanel =
+        <Assets balances={this.props.balances} />;
+
     } else {
-      dashboard =
+      messagePanel =
         <div className="row">
           <div className="col-12 text-center">
            <span>{this.props.displayText}</span>
@@ -105,15 +119,11 @@ class PoloniexBalance extends React.Component {
     }
 
     return (
-      <div className="row">
-        <div className="box offset-2 col-8 portfolio">
-          <div className="row">
-            <div className="col-4">Portfolio</div>
-          </div>
-          <hr/>
-          {dashboard}
-        </div>
-      </div>
+      <React.Fragment>
+        <Panel title="Balance" component={balancePanel}/>
+        <Panel title="Assets"  component={assetsPanel}/>
+        <Panel title="Balance" component={messagePanel}/>
+      </React.Fragment>
     );
   }
 }
diff --git a/cmd/web/package.json b/cmd/web/package.json
index a867313..0bfb4e9 100644
--- a/cmd/web/package.json
+++ b/cmd/web/package.json
@@ -12,6 +12,7 @@
     "classnames": "^2.2.5",
     "debowerify": "^1.3.1",
     "localenvify": "^1.0.1",
+    "moment": "^2.22.1",
     "page": "^1.8.3",
     "path-to-regexp": "^1.2.1",
     "qs": "^6.5.1",
diff --git a/cmd/web/static/style.css b/cmd/web/static/style.css
index 2212168..e4da176 100644
--- a/cmd/web/static/style.css
+++ b/cmd/web/static/style.css
@@ -54,6 +54,14 @@ h1 {
   margin-top: 5px;
 }
 
+.performance-up {
+  color: green;
+}
+
+.performance-down {
+  color: red;
+}
+
 .sign-in .form-control {
   margin-bottom: 20px;
   border-radius: 2px;
@@ -63,16 +71,12 @@ h1 {
 
 .config-status {
   margin-bottom: 10px;
-  font-size: 0.9em;
 }
 
-.config-status .icon-cancel-circled {
-  color: red;
-}
+.config-status .icon-cancel-circled {}
+
+.config-status .icon-ok-circled {}
 
-.config-status .icon-ok-circled {
-  color: green;
-}
 .config-status i {
   font-size: 1.2em;
 }
@@ -123,13 +127,27 @@ h1 {
   display: inline-block;
   margin-left: 5px;
   margin-right: 5px;
-}
-
-.portfolio .currency-logo {
+  
   height: 24px;
   width: 24px;
 }
 
+.balance > .btcValue {
+  font-size: 1.2em;
+}
+
+.balance > .variation {
+  font-size: 1.2em;
+}
+
+.balance > .row {
+  margin-bottom: 10px;
+}
+
+.assets > .row {
+  margin-bottom: 10px;
+}
+
 .balances > div {
   margin-bottom: 5px;
 }
diff --git a/cmd/web/yarn.lock b/cmd/web/yarn.lock
index b4a18f4..366391a 100644
--- a/cmd/web/yarn.lock
+++ b/cmd/web/yarn.lock
@@ -3078,6 +3078,10 @@ module-deps@^5.0.1:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
+moment@^2.22.1:
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+
 mout@~0.9.0:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/mout/-/mout-0.9.1.tgz#84f0f3fd6acc7317f63de2affdcc0cee009b0477"