Revert "Working Version of Integration with web site style"

This reverts commit f9894bcc2e.
This commit is contained in:
Nikola Bjelo committed 2018-11-06 18:45:42 +01:00
1 parent 9f37169ba0
commit e94014c10f
142 files changed
+718 -37660

No files matched your search

-9
View File
@@ -18,15 +18,6 @@ import Teams from '@advancedalgos/teams-client'
import Events from '@advancedalgos/events-client'
import KeyVault from '@advancedalgos/key-vault-client'
// The following are the style sheets needed for the Header, Responsive Menu, and Footer. It also impacts html at the body.
import '../css/bootstrap.css'
import '../css/saira.css'
import '../css/shortcodes.css'
import '../css/responsive.css'
import '../css/fontawesome.css'
import '../css/general.css'
import '../css/fonts.css'
export const auth = new Auth(
result => console.log('Authentication successful.'),
client
+98 -52
View File
@@ -49,59 +49,105 @@ class Footer extends Component {
return (<div />)
} else {
return (
<React.Fragment>
<footer id='footer' className='dark_section footerStyleDark'><hr />
<div className='container'>
<div className='row margintop-25'>
<div className='col-md-4 col-sm-4 '>
<div className='logo'>
<a href='index.shtml'>
<img src='img/logos/advanced-algos/aa-logo-dark.svg' alt='Advanced Algos Ltd. Logo' />
</a>
</div>
<div className='logo_descr'>
<p><strong>Advanced Algos Ltd.</strong><br />Ground Floor, Palace Court, Church Street,<br />St. Julians&nbsp;STJ3049, Malta</p>
<p><a href='legal-privacy-statement.shtml'>Privacy Statement</a> | <a href='legal-terms-of-service.shtml'>Terms of Service</a></p>
</div>
</div>
<footer className={classNames(classes.footer, classes.layout)}>
<Grid
container
spacing={32}
justify='space-evenly'
className={classNames(classes.footerContainer)}
>
<Grid item xs>
<Typography variant='h6' color='textPrimary' gutterBottom>
Pages
</Typography>
<NavLink to='/' className={classNames(classes.footerLink)}>
<Typography variant='subtitle1' color='textSecondary'>
Home
</Typography>
</NavLink>
<NavLink to='/teams' className={classNames(classes.footerLink)}>
<Typography variant='subtitle1' color='textSecondary'>
Teams
</Typography>
</NavLink>
<NavLink to='/key-vault' className={classNames(classes.footerLink)}>
<Typography variant='subtitle1' color='textSecondary'>
Key Vault
</Typography>
</NavLink>
</Grid>
<Grid item xs>
<Typography variant='h6' color='textPrimary' gutterBottom>
Support
</Typography>
<div className='col-md-2 col-sm-2' />
<div className='col-md-6 col-sm-6'>
<div className='signup-form-container'>
<h3 className='sc_title margintop20'>Stay in touch!</h3>
<p>Opt-in our mailing list to stay up to date with the Advanced Algos Project.</p>
<form id='email-signup' action='#' className='form-inline'>
<div className='message display-none'>Thank you for your interest! We'll keep you informed</div>
<div className='form-group'>
<input className='btn btn-lg' name='email' id='signup_email' type='email' placeholder='Enter your email' required />
<button id='email-submit' className='btn btn-info btn-lg' type='submit'><span className='glyphicon glyphicon-refresh animate-spin display-none' /> Submit</button>
</div>
</form>
</div>
<p>Meet us on Social Networks:</p>
<div className='socPage widgetWrap'>
<ul>
<li><a className='fab fa-telegram-plane' href='https://t.me/advancedalgoscommunity' title='Join us on Telgram' /></li>
<li><a className='fab fa-twitter' href='https://twitter.com/advancedalgos' title='Follow us on Twitter' /></li>
<li><a className='fab fa-facebook-f' href='https://www.facebook.com/Advanced-Algos-173249670001615/' title='Meet us on Facebook' /></li>
</ul>
</div>
</div>
</div>
</div>
</footer>
<section id='copyright' className='dark_section copyWrap no_padding_container'>
<div className='container'>
<div className='row copy'>
<div className='col-sm-6 margin_bottom_micro'>
<p>&copy; Advanced Algos Ltd. 2018 | All Rights Reserved</p>
</div>
</div>
</div>
</section>
</React.Fragment>
<a
href='https://advancedalgos.net/documentation-quick-start.shtml'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
Documentation
</Typography>
</a>
<a
href='https://t.me/advancedalgoscommunity'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
Telegram
</Typography>
</a>
</Grid>
<Grid item xs>
<Typography variant='h6' color='textPrimary' gutterBottom>
Modules
</Typography>
<a
href='https://develop.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
Platform
</Typography>
</a>
<a
href='https://users.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
Users
</Typography>
</a>
<a
href='https://teams.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
Teams
</Typography>
</a>
<a
href='https://keyvault.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
Key Vault
</Typography>
</a>
</Grid>
<Grid item xs>
<NavLink to='/'>
<img alt='' src={aalogo} width={98} height={140} />
</NavLink>
</Grid>
</Grid>
</footer>
)
}
}
+63 -149
View File
@@ -1,6 +1,5 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import jwtDecode from 'jwt-decode'
import { withStyles } from '@material-ui/core/styles'
import AppBar from '@material-ui/core/AppBar'
@@ -22,9 +21,6 @@ import { getItem } from '../../utils/local-storage'
import { LoggedIn } from './LoggedIn'
import { LoggedOut } from './LoggedOut'
// menues
import {UsersMenu} from '@advancedalgos/users-client'
import AALogo from '../../assets/advanced-algos/aa-logo-dark.svg'
const ChartsLink = props => <Link to='/charts' {...props} />
@@ -81,162 +77,80 @@ class Header extends Component {
async componentDidMount () {
const user = window.localStorage.getItem('user')
this.setState({ user })
frontManualStart() // This call is necesary to start the jQuery based scripts that deals with the Responsive Header.
}
render () {
let { classes, auth } = this.props
if (window.localStorage.getItem('access_token')) {
if (jwtDecode(window.localStorage.getItem('access_token')).exp < new Date().getTime() / 1000) {
window.localStorage.clear()
window.location.reload()
}
}
let user = JSON.parse(this.state.user)
return (
<React.Fragment>
<div className={classes.root}>
<div className={classes.root}>
<AppBar
position='static'
classes={{ root: classes.appBar, colorDefault: classes.colorDefault }}
>
<Toolbar>
<img className={classes.img} src={AALogo} alt='Advanced Algos' />
<Typography
variant='h6'
color='inherit'
className={classes.toolbarTitle}
>
&nbsp;
</Typography>
<AppBar
position='static'
classes={{ root: classes.appBar, colorDefault: classes.colorDefault }}
>
<IconButton
className={classes.menuButton}
color='inherit'
title='Home'
component={HomeLink}
>
<HomeIcon />
</IconButton>
<header id='header' className='light_section'>
<div className='container'>
<div className='row'>
<div className='col-sm-12 topWrap styleShaded'>
<div className='logo logo_left with_text'>
<a href='https://www.advancedalgos.net/index.shtml' className='navbar-brand'><img src='https://www.advancedalgos.net/img/logos/advanced-algos/aa-logo-dark.svg' alt='Advanced Algos Logo' className='logo_main' /></a>
</div>
<a href='#' className='openResponsiveMenu'>Menu</a>
<nav id='mainmenu_wrapper' className='menuTopWrap topMenuStyleLine'>
<ul id='mainmenu' className='nav sf-menu inited '>
<li>
<Button component={HomeLink} color='inherit'>
Home
</Button>
</li>
<li className='menu-item-has-children'>
<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'>
Users
</Button>
<UsersMenu />
</li>
<li className='menu-item-has-children'>
<Button component={TeamsLink} color='inherit'>
Teams
</Button>
<ul className='sub-menu'>
<li className='menu-item-has-children'>
<a href='developers-system-modules.shtml'>System Modules</a>
<ul>
<li>
<a href='#'>Module A</a>
</li>
<li>
<a href='#'>Module B</a>
</li>
<li className='menu-item-has-children'>
<a href='#'>Module C</a>
<ul>
<li><a href='#'>Module C1</a></li>
<li><a href='#'>Module C2</a></li>
<li><a href='#'>Module C3</a></li>
</ul>
</li>
</ul>
</li>
<li>
<a href='developers-breed-compete.shtml'>Breed &amp; Compete</a>
</li>
<li>
<a href='documentation-quick-start.shtml'>Documentation</a>
</li>
</ul>
<Button component={ChartsLink} color='inherit'>
Charts
</Button>
<Button component={UsersLink} color='inherit'>
Users
</Button>
<Button component={TeamsLink} color='inherit'>
Teams
</Button>
<Button component={EventsLink} color='inherit'>
Events
</Button>
<Button component={KeyVaultLink} color='inherit'>
Key Vault
</Button>
</li>
<li className='menu-item-has-children'>
<Button component={EventsLink} color='inherit'>
Events
</Button>
<ul className='sub-menu'>
<li>
<a href='https://www.advancedalgos.net/competition.shtml' className='sf-with-ul'>The <span className='red_text'>ALGO</span> Arena</a>
</li>
<li className='menu-item-has-children'>
<a href='#'>Current Events</a>
<ul className='sub-menu'>
<li>
<a href='https://www.advancedalgos.net/competition-bitcoin-argentina-fb-group.shtml' className='sf-with-ul'>Bitcoin Argentina</a>
</li>
</ul>
</li>
</ul>
</li>
<li className='menu-item-has-children'>
<Button component={KeyVaultLink} color='inherit'>
Key Vault
</Button>
<ul className='sub-menu'>
<li>
<a href='https://www.advancedalgos.net/competition.shtml' className='sf-with-ul'>The <span className='red_text'>ALGO</span> Arena</a>
</li>
<li className='menu-item-has-children'>
<a href='#'>Current Events</a>
<ul className='sub-menu'>
<li>
<a href='https://www.advancedalgos.net/competition-bitcoin-argentina-fb-group.shtml' className='sf-with-ul'>Bitcoin Argentina</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
<Button
href='https://www.advancedalgos.net/documentation-quick-start.shtml'
color='inherit'
>
Docs
</Button>
</li>
<li>
{this.state.user !== undefined && this.state.user !== null ? (
<React.Fragment>
<LoggedIn user={user} auth={auth} styles={styles} />
</React.Fragment>
) : (
<LoggedOut auth={auth} styles={styles} />
)}
</li>
</ul>
</nav>
</div>
</div>
</div>
</header>
<Button
href='https://www.advancedalgos.net/documentation-quick-start.shtml'
color='inherit'
target='_blank'
>
Docs
</Button>
</AppBar>
</div>
</React.Fragment>
{this.state.user !== undefined && this.state.user !== null ? (
<React.Fragment>
<LoggedIn user={user} auth={auth} styles={styles} />
</React.Fragment>
) : (
<LoggedOut auth={auth} styles={styles} />
)}
<IconButton
className={classes.menuButton}
color='inherit'
title='Exit'
href='http://www.advancedalgos.net/'
>
<ExitIcon />
</IconButton>
</Toolbar>
</AppBar>
</div>
)
}
}
+20 -54
View File
@@ -26,65 +26,31 @@ const styles = theme => ({
class Home extends Component {
componentDidMount () {
window.dispatchEvent(new Event('load')) // This is a workaround to solve the problem that the slider does not show up
}
render () {
const { classes } = this.props
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 slider_height_max'>
<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 Platform</h3>
<h4 className='white-text'>
<br />Enabling the evolutionary race towards the emergence of superalgos
</h4>
</div>
</div>
</div>
</div>
</div>
</li>
</ul>
</div>
</div>
</div>
<CssBaseline />
<main className={classes.layout}>
<div className={classes.heroContent}>
<Typography
variant='display3'
align='center'
color='textPrimary'
gutterBottom
>
Collaborate. Innovate. Evolve.
</Typography>
<Typography
variant='title'
align='center'
color='textSecondary'
component='h3'
>
Welcome to the Advanced Algos Platform
</Typography>
</div>
</section>
<section id='intro' className='light_section'>
<div className='container'>
<div className='row'>
<div className='col-sm-12 text-center'>
<h1 className='sc_title'>Welcome to the Superalgos Platform!</h1>
<h5 className='sc_title sc_title_underline'>CO-CREATE >> COMPETE >> EVOLVE</h5>
</div>
</div>
<div className='row'>
<div className='col-sm-6'>
<p>Before you begin, please be aware <strong>this is a development environment in pre-alpha stage</strong>. The features available as of today are limited but already functional. However, you may encounter occasional instability and errors.</p>
<p>The Superalgos Platform is the place is which we meet to collaborate in the quest to make trading algorithms evolve. You will be able to register, create or join a team, fork a functional trading bot and eventually put it to compete with other people's forks.</p>
</div>
<div className='col-sm-6'>
<p>Feel free to explore the menu in the top-right corner or visit the <a href='https://www.advancedalgos.net/documentation-quick-start.shtml' target='_blank'>Quick Start Guide</a>. Reporting of bugs at the corresponding <a href='https://github.com/AdvancedAlgos' target='_blank' rel='nofollow'>Advanced Algos Github repository</a> is highly appreciated.</p>
<p>Get in touch with the rest of the community and get answers to your questions in our <a href='https://t.me/advancedalgoscommunity' target='_blank' rel='nofollow'>Telegram Group</a>. Have fun!</p>
</div>
</div>
</div>
</section>
</main>
</React.Fragment>
)