From 34f2c35087b8388df6be8e4a67bbf0e4db1cae87 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 6 Nov 2018 16:33:55 +0100
Subject: [PATCH] Charts Integration

---
 client/html/index.html           | 31 ++++++++++-------------
 client/package.json              |  2 +-
 client/src/views/charts/index.js | 43 +++++++++++++++++++++++++++++---
 client/src/views/header/index.js | 13 +---------
 4 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/client/html/index.html b/client/html/index.html
index f4b045162..815824fb7 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -35,31 +35,28 @@
 
   <script type="text/javascript">
     function loadCanvas(){
+      if (window.canvasApp.visible === undefined) {
+        window.canvasApp = {
+            sessionToken: '',
+            executingAt: 'Master App',
+            visible: false,
+            topMargin: 150,
+            urlPrefix: 'https://develop.advancedalgos.net/'  /* 'http://localhost:1337/'   */   /*  'https://develop.advancedalgos.net/'  */
+        };
 
-      window.canvasApp = {
-          sessionToken: '',
-          executingAt: 'Master App',
-          visible: false,
-          topMargin: 25,
-          urlPrefix: 'https://develop.advancedalgos.net/'  /* 'http://localhost:1337/'   */   /*  'https://develop.advancedalgos.net/'  */
-      };
+        loadAdvancedAlgosPlatform();
+      }
 
-      loadAdvancedAlgosPlatform();
-    }
-
-    function startScripts(){
 
       window.dispatchEvent(new Event('resize')) // This is a momentary workaround to start the slider
-      //loadCanvas()
     }
+
   </script>
 </head>
 
-<body id="body" onload="startScripts()">
+<body id="body" onload="loadCanvas()" onresize="window.canvasApp.eventHandler.raiseEvent('Browser Resized')">
 
-
-
-<div id='box_wrapper' class='landing_page header_style_1 header_wrapper_height_auto slider_style_1' onresize="window.canvasApp.eventHandler.raiseEvent('Browser Resized')">
+<div id='box_wrapper' class='landing_page header_style_1 header_wrapper_height_auto slider_style_1'>
     <div id="masterApp"></div>
     <div id="canvasApp"></div>
 </div>
@@ -138,7 +135,5 @@
 <script src="js/email-signup.js" type="text/javascript"></script>
 <script src="js/contact.js" type="text/javascript"></script>
 
-
-
 </body>
 </html>
diff --git a/client/package.json b/client/package.json
index 4afb60972..8d8d7471d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@advancedalgos/key-vault-client": "^0.0.20",
     "@advancedalgos/teams-client": "0.0.24",
-    "@advancedalgos/users-client": "^0.0.15",
+    "@advancedalgos/users-client": "^0.0.16",
     "@advancedalgos/events-client": "^0.0.1",
     "@advancedalgos/web-components": "0.0.13",
     "@babel/core": "^7.1.2",
diff --git a/client/src/views/charts/index.js b/client/src/views/charts/index.js
index 8cf31ef85..60bce90a4 100644
--- a/client/src/views/charts/index.js
+++ b/client/src/views/charts/index.js
@@ -32,6 +32,8 @@ class Charts extends Component {
     let body = document.getElementById('body')
     body.style = 'margin: 0px; padding: 0px; border: 0px; overflow:hidden;'
     this.props.hideFooter()
+
+    window.dispatchEvent(new Event('load')) // This is a workaround to solve the problem that the slider does not show up
   }
 
   componentWillUnmount () {
@@ -41,10 +43,45 @@ class Charts extends Component {
     this.props.showFooter()
   }
 
-  render () {
-    const { classes } = this.props
+  addSlider () {
     return (
-      <React.Fragment />
+      <section id='mainslider' className='fullwidth no_padding_container no_margin_col'>
+        <div className='container'>
+          <div className='row'>
+            <div className='col-sm-12'>
+              <div className='flexslider'>
+                <ul className='slides text-center'>
+                  <li>
+                    <img src='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg' alt='' />
+                    <div className='slide_description_wrapper slider_textblock_center'>
+                      <div className='slide_description to_animate'>
+                        <div data-animation='fadeInUp' align='center'>
+                          <div>
+                            <div>
+                              <h3>Advanced Algos Charts</h3>
+                              <h4 className='white-text'>
+                                <br />Map of markets and competitions.
+                              </h4>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+    )
+  }
+
+  render () {
+    return (
+      <React.Fragment>
+        {this.addSlider()}
+      </React.Fragment>
     )
   }
 }
diff --git a/client/src/views/header/index.js b/client/src/views/header/index.js
index ad210042e..eee420eb0 100644
--- a/client/src/views/header/index.js
+++ b/client/src/views/header/index.js
@@ -117,21 +117,10 @@ class Header extends Component {
                               Home
                             </Button>
                         </li>
-                        <li className='menu-item-has-children'>
+                        <li>
                           <Button component={ChartsLink} color='inherit'>
                               Charts
                             </Button>
-                          <ul className='sub-menu'>
-                            <li>
-                              <a href='https://www.advancedalgos.net/about-evolution.shtml' className='sf-with-ul'>Evolution</a>
-                            </li>
-                            <li>
-                              <a href='https://www.advancedalgos.net/about-superalgo.shtml' className='sf-with-ul'>Superalgos</a>
-                            </li>
-                            <li>
-                              <a href='https://www.advancedalgos.net/about-supermind.shtml' className='sf-with-ul'>Supermind</a>
-                            </li>
-                          </ul>
                         </li>
                         <li className='menu-item-has-children'>
                           <Button component={UsersLink} color='inherit'>