X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=cmd%2Fweb%2Fjs%2Fmain.jsx;h=c95c74888b978f60eea72c99dafbbea87c08b79a;hb=ee902062a71c1ef31176cf5061555618b288b1d4;hp=eb530577fa2ae53e4a075cde960f109fea702d19;hpb=7a9e5112eaaea58d55f181d3e5296e4ff839921c;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FFront.git

diff --git a/cmd/web/js/main.jsx b/cmd/web/js/main.jsx
index eb53057..c95c748 100644
--- a/cmd/web/js/main.jsx
+++ b/cmd/web/js/main.jsx
@@ -1,18 +1,40 @@
-var SignupForm    = require('./signup.js').SignupForm;
-var SigninForm    = require('./signin.js').SigninForm;
-var OtpEnrollForm = require('./otp.js').OtpEnrollForm;
-var PoloniexForm  = require('./poloniex.js').PoloniexForm;
-var App           = require('./app.js');
-var Api           = require('./api.js').Api;
-var cookies       = require('./cookies.js');
-
-var Logo = React.createClass({
-  render: function() {
-    return (<div id='logo'>
-              <a href='/'>Cryptoportfolio</a>
-            </div>);
+import SignupForm from './signup.js';
+import SigninForm from './signin.js';
+import OtpEnrollForm from './otp.js';
+import PoloniexController from './poloniex.js';
+import App from './app.js';
+import Api from './api.js';
+import cookies from './cookies.js';
+import React from 'react';
+
+class Header extends React.Component {
+  render = () => {
+    if (this.props.displayLogout === true) {
+      return <div id="header" className="row">
+                <div className="offset-4 col-4">
+                  <Logo />
+                </div>
+                <div className="offset-2 col-2 align-self-center h-100">
+                  <a href="/signout"><u>Logout</u></a>
+                </div>
+              </div>;
+    }
+      return <div id="header" className="row">
+                <div className="offset-4 col-4">
+                  <Logo />
+                </div>
+              </div>;
+
   }
-});
+}
+
+class Logo extends React.Component {
+  render() {
+    return <div id="logo" className="w-100">
+             <h1><a href="/">CryptoPF</a></h1>
+           </div>;
+  }
+}
 
 App.page('/signup', false, function(context) {
   if (App.isUserSignedIn()) {
@@ -20,12 +42,10 @@ App.page('/signup', false, function(context) {
     return;
   }
 
-  App.mount(
-    <div>
-      <Logo />
+  App.mount(<div>
+      <Header />
       <SignupForm onSuccess={App.onUserSignUp}/>
-    </div>
-  );
+    </div>);
 });
 
 App.page('/signin', false, function(context) {
@@ -34,12 +54,10 @@ App.page('/signin', false, function(context) {
     return;
   }
 
-  App.mount(
-    <div>
-      <Logo />
+  App.mount(<div>
+      <Header />
       <SigninForm onSuccess={App.onUserSignIn}/>
-    </div>
-  );
+    </div>);
 });
 
 App.page('/signout', true, function(context) {
@@ -49,21 +67,22 @@ App.page('/signout', true, function(context) {
 });
 
 App.page('/me', true, function(context) {
-  Api.Call('MARKET', {'name': 'poloniex'}, function(err, status, data) {
-    if (err) {
-      console.error(err, data);
-      return;
-    }
+  App.mount(<div>
+      <Header displayLogout={true} />
+      <PoloniexController/>
+    </div>);
+});
 
-    App.mount(
-      <div>
-        <Logo />
-        <p>Poloniex</p>
-        <PoloniexForm apiKey={data.key} apiSecret={data.secret}/>
+App.page('/not_confirmed', true, function(context) {
+  App.mount(<div>
+      <Header displayLogout={true}/>
+      <div className="row">
+        <div className="box offset-3 col-6 text-center">
+          <p>Please be patient, you account is being confirmed...</p>
+          <p><a href="/me"><u>Refresh</u></a></p>
+        </div>
       </div>
-    );
-
-  }.bind(this));
+    </div>);
 });
 
 App.page('/otp/setup', true, function(context) {
@@ -73,23 +92,19 @@ App.page('/otp/setup', true, function(context) {
       return;
     }
 
-    App.mount(
-      <div>
-        <Logo />
+    App.mount(<div>
+        <Header displayLogout={true}/>
         <OtpEnrollForm onSuccess={App.onUserValidateOtp} img={'data:image/png;base64,' + data.base64img} secret={data.secret}/>
-      </div>
-    );
+      </div>);
 
-  }.bind(this));
+  });
 });
 
 App.page('/otp/validate', true, function(context) {
-  App.mount(
-    <div>
-      <Logo />
+  App.mount(<div>
+      <Header displayLogout={true}/>
       <OtpEnrollForm onSuccess={App.onUserValidateOtp} />
-    </div>
-  );
+    </div>);
 });
 
 App.page('/', false, function(context) {