X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=cmd%2Fweb%2Fjs%2Fpoloniex.jsx;h=db6b1c43da71f123ec830dc8d6a8f89bffbe8146;hb=50c6eea630c5bf6d1513d093125f11ce30deaff5;hp=96384fd35ac501ee62a918a2620c90d5af9d3564;hpb=989fb5c7dbba174f54f3ae69df788d6685fff46b;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FFront.git

diff --git a/cmd/web/js/poloniex.jsx b/cmd/web/js/poloniex.jsx
index 96384fd..db6b1c4 100644
--- a/cmd/web/js/poloniex.jsx
+++ b/cmd/web/js/poloniex.jsx
@@ -1,11 +1,10 @@
 import Api from './api.js';
-import classNames from 'classnames';
 import React from 'react';
 
 class PoloniexController extends React.Component {
   constructor(props) {
     super(props);
-    this.state = {'apiKey': '', 'apiSecret': '', 'flag': 'loading', 'valueCurrency': null, 'balanceValue': null, 'balance': null};
+    this.state = {'apiKey': '', 'apiSecret': '', 'apiRequested': false, 'flag': 'loading', 'valueCurrency': null, 'balanceValue': null, 'balance': null};
   }
 
   handleCredentialsChange = (key, secret) => {
@@ -33,6 +32,8 @@ class PoloniexController extends React.Component {
         console.error(err, data);
         if (err.code === 'invalid_market_credentials') {
           this.setState({'flag': 'invalidCredentials', 'valueCurrency': null, 'balanceValue': null, 'balance': null});
+        } else if (err.code === 'ip_restricted_api_key') {
+          this.setState({'flag': 'ipRestricted', 'valueCurrency': null, 'balanceValue': null, 'balance': null});
         }
         return;
       }
@@ -43,6 +44,7 @@ class PoloniexController extends React.Component {
 
   componentDidMount = () => {
     Api.Call('MARKET', {'name': 'poloniex'}, function(err, status, data) {
+      this.setState({'apiRequested': true});
       if (err) {
         console.error(err, data);
         return;
@@ -68,12 +70,18 @@ class PoloniexController extends React.Component {
       case 'invalidCredentials':
         displayText = 'Invalid poloniex credentials';
         break;
+      case 'ipRestricted':
+        displayText = 'Your API key is IP restricted. Please whitelist us.';
+        break;
       case 'emptyCredentials':
         displayText = 'Please provide poloniex credentials';
         break;
       default:
         displayText = null;
     }
+    if (this.state.apiRequested === false) {
+      return <div></div>;
+    }
     return (
       <div>
         <PoloniexBalance  balanceCurrency={this.state.valueCurrency}
@@ -90,31 +98,46 @@ class PoloniexController extends React.Component {
   }
 }
 
+class CurrencyLogo 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} />;
+  }
+}
+
 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 balance = Object.keys(this.props.balance).map(function(currency) {
-        return <div key={currency}><i className={classNames('cc', currency)}></i> {this.props.balance[currency]}</div>;
+        return <div key={currency}>
+                 <div>
+                 <CurrencyLogo currency={currency} /> {this.props.balance[currency].amount} {currency} ({this.computeCurrencyRatio(currency)}%)
+                 </div>
+               </div>;
       }.bind(this));
 
       dashboard =
         <div className="row">
-          <div className="col-4 align-self-center h-100">
-            <div>
+          <div className="col-6 align-self-center h-100 balances">
               {balance}
-            </div>
           </div>
-          <div className="offset-1 col-7 h-100 align-self-center">
+          <div className="offset-1 col-5 h-100 align-self-center">
             <div className="text-center">
-              Balance ({this.props.balanceCurrency}): <span>{this.props.balanceValue} <i className={classNames('cc', this.props.balanceCurrency)}></i></span>
+              Balance ({this.props.balanceCurrency}): <span>{this.props.balanceValue}</span><CurrencyLogo currency={this.props.balanceCurrency} />
             </div>
           </div>
         </div>;
@@ -129,7 +152,7 @@ class PoloniexBalance extends React.Component {
 
     return (
       <div className="row">
-        <div className="box offset-2 col-8">
+        <div className="box offset-2 col-8 portfolio">
           <div className="row">
             <div className="col-4">Portfolio</div>
           </div>
@@ -173,7 +196,7 @@ class PoloniexCredentialsForm extends React.Component {
 
     return (
         <div className="row api-credentials-form">
-          <div className="offset-3 col-6 box">
+          <div className="offset-2 col-8 box">
             <span className="text-center">Poloniex credentials</span>
             <hr/>
             <form role="form" onSubmit={this.handleSubmit}>