diff --git a/client/html/index.html b/client/html/index.html
index 2383147df..d7e2cb41a 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -22,9 +22,9 @@
window.canvasApp = {
sessionToken: '',
executingAt: 'Master App',
- visible: true,
+ visible: false,
topMargin: 25,
- urlPrefix: 'https://develop.advancedalgos.net/' /* 'http://localhost:1337/' */ /* 'https://develop.advancedalgos.net/' */
+ urlPrefix: 'https://develop.advancedalgos.net/' /* 'http://localhost:1337/' */ /* 'https://develop.advancedalgos.net/' */
};
loadAdvancedAlgosPlatform();
diff --git a/client/src/App.js b/client/src/App.js
index dcb3a0323..4b9d603a2 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -11,11 +11,11 @@ import { theme, globalStyles } from './styles'
import { client } from './graphql/apollo'
import Auth from './auth'
-import { Header, Footer, Home, Callback } from './views'
+import { Header, Footer, Home, Charts, Callback } from './views'
+import Users from '@advancedalgos/users-client'
import Teams from '@advancedalgos/teams-client'
import KeyVault from '@advancedalgos/key-vault-client'
-import Users from '@advancedalgos/users-client'
export const auth = new Auth(
result => console.log('Authentication successful.'),
@@ -27,30 +27,34 @@ export const MasterApp = () => (
-
-
-
- {
- auth.handleAuthentication(props)
- return
- }}
+
+
+
+ {
+ auth.handleAuthentication(props)
+ return
+ }}
/>
- }
+ }
/>
- }
+ }
/>
- }
+ }
/>
-
-
+ }
+ />
+
+
diff --git a/client/src/views/charts/index.js b/client/src/views/charts/index.js
new file mode 100644
index 000000000..740f6fc17
--- /dev/null
+++ b/client/src/views/charts/index.js
@@ -0,0 +1,57 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+import CssBaseline from '@material-ui/core/CssBaseline'
+import Typography from '@material-ui/core/Typography'
+import { withStyles } from '@material-ui/core/styles'
+
+const styles = theme => ({
+ '@global': {
+ body: {
+ backgroundColor: theme.palette.common.white
+ }
+ },
+ layout: {
+ width: '100%',
+ height: '100%'
+ },
+ heroContent: {
+ textColor: theme.palette.common.white,
+ maxWidth: 600,
+ height: 800,
+ margin: '0 auto',
+ padding: `${theme.spacing.unit * 8}px 0 ${theme.spacing.unit * 6}px`
+ }
+})
+
+class Charts extends Component {
+
+ componentDidMount () {
+ window.canvasApp.visible = true
+ let body = document.getElementById('body')
+ body.style = 'margin: 0px; padding: 0px; border: 0px; overflow:hidden;'
+ window.SHOW_FOOTER = false
+ console.log('HIDDING FOOTER')
+ }
+
+ componentWillUnmount () {
+ window.canvasApp.visible = false
+ let body = document.getElementById('body')
+ body.style = ''
+ window.SHOW_FOOTER = true
+ console.log('SHOWING FOOTER')
+ }
+
+ render () {
+ const { classes } = this.props
+ return (
+
+ )
+ }
+}
+
+Charts.propTypes = {
+ classes: PropTypes.object.isRequired
+}
+
+export default withStyles(styles)(Charts)
diff --git a/client/src/views/footer/index.js b/client/src/views/footer/index.js
index bd9442544..b77f47d3d 100644
--- a/client/src/views/footer/index.js
+++ b/client/src/views/footer/index.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { NavLink } from 'react-router-dom'
import { withStyles } from '@material-ui/core/styles'
@@ -38,111 +38,124 @@ const styles = theme => ({
}
})
-const Footer = ({ classes }) => {
- if (window.HIDE_FOOTER !== true) {
- return (
)
- } else {
- return (
-
- )
+
+ )
+ }
}
}
diff --git a/client/src/views/header/index.js b/client/src/views/header/index.js
index 9a6d7d43f..f44fee256 100644
--- a/client/src/views/header/index.js
+++ b/client/src/views/header/index.js
@@ -22,6 +22,7 @@ import { LoggedOut } from './LoggedOut'
import AALogo from '../../assets/advanced-algos/aa-logo-dark.svg'
+const ChartsLink = props =>
const UsersLink = props =>
const TeamsLink = props =>
const KeyVaultLink = props =>
@@ -104,6 +105,10 @@ class Header extends Component {
>
+
+
diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js
index 15aa3a7d1..419275798 100644
--- a/client/src/views/home/index.js
+++ b/client/src/views/home/index.js
@@ -26,24 +26,33 @@ const styles = theme => ({
class Home extends Component {
- componentDidMount () {
- window.canvasApp.visible = true
- let body = document.getElementById('body')
- body.style = 'margin: 0px; padding: 0px; border: 0px; overflow:hidden;'
- window.HIDE_FOOTER = true
- }
-
- componentWillUnmount () {
- window.canvasApp.visible = false
- let body = document.getElementById('body')
- body.style = ''
- window.HIDE_FOOTER = false
- }
-
render () {
const { classes } = this.props
return (
-
+
+
+
+
+
+ Collaborate. Innovate. Evolve.
+
+
+ Welcome to the Advanced Algos Platform
+
+
+
+
+
)
}
}
diff --git a/client/src/views/index.js b/client/src/views/index.js
index c3cf45256..aa19b1c86 100644
--- a/client/src/views/index.js
+++ b/client/src/views/index.js
@@ -1,6 +1,7 @@
import Header from './header'
import Footer from './footer'
import Home from './home'
+import Charts from './charts'
import Callback from './callback'
-export { Header, Footer, Home, Callback }
+export { Header, Footer, Home, Charts, Callback }