Merge remote-tracking branch 'upstream/master'

This commit is contained in:
mati108@gmail.com committed 2018-10-16 16:02:38 -03:00
commit dca92c9ea1
6 files changed
+186 -244

No files matched your search

Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 KiB

+72 -68
View File
@@ -39,107 +39,111 @@ const styles = theme => ({
})
const Footer = ({ classes }) => {
return (
<footer className={classNames(classes.footer, classes.layout)}>
<Grid
container
spacing={32}
justify='space-evenly'
className={classNames(classes.footerContainer)}
if (window.HIDE_FOOTER !== true) {
return (<div />)
} else {
return (
<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>
<Grid item xs>
<Typography variant='h6' color='textPrimary' gutterBottom>
Pages
</Typography>
<NavLink to='/' className={classNames(classes.footerLink)}>
<Typography variant='subtitle1' color='textSecondary'>
<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'>
</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'>
</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>
</NavLink>
</Grid>
<Grid item xs>
<Typography variant='h6' color='textPrimary' gutterBottom>
Support
</Typography>
<a
href='https://advancedalgos.net/documentation-quick-start.shtml'
target='_blank>'
className={classNames(classes.footerLink)}
<a
href='https://advancedalgos.net/documentation-quick-start.shtml'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
<Typography variant='subtitle1' color='textSecondary'>
Documentation
</Typography>
</a>
<a
href='https://t.me/advancedalgoscommunity'
target='_blank>'
className={classNames(classes.footerLink)}
</a>
<a
href='https://t.me/advancedalgoscommunity'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
<Typography variant='subtitle1' color='textSecondary'>
Telegram
</Typography>
</a>
</Grid>
<Grid item xs>
<Typography variant='h6' color='textPrimary' gutterBottom>
</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)}
<a
href='https://develop.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
<Typography variant='subtitle1' color='textSecondary'>
Platform
</Typography>
</a>
<a
href='https://users.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
</a>
<a
href='https://users.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
<Typography variant='subtitle1' color='textSecondary'>
Users
</Typography>
</a>
<a
href='https://teams.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
</a>
<a
href='https://teams.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
<Typography variant='subtitle1' color='textSecondary'>
Teams
</Typography>
</a>
<a
href='https://keyvault.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
</a>
<a
href='https://keyvault.advancedalgos.net'
target='_blank>'
className={classNames(classes.footerLink)}
>
<Typography variant='subtitle1' color='textSecondary'>
<Typography variant='subtitle1' color='textSecondary'>
Key Vault
</Typography>
</a>
</a>
</Grid>
<Grid item xs>
<NavLink to='/'>
<img alt='' src={aalogo} width={98} height={140} />
</NavLink>
</Grid>
</Grid>
<Grid item xs>
<NavLink to='/'>
<img alt='' src={aalogo} width={98} height={140} />
</NavLink>
</Grid>
</Grid>
</footer>
)
</footer>
)
}
}
Footer.propTypes = {
+24 -29
View File
@@ -1,12 +1,10 @@
import React from 'react'
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'
import BackgroundImage from '../../assets/advanced-algos/evolution.jpg'
const styles = theme => ({
'@global': {
body: {
@@ -14,7 +12,6 @@ const styles = theme => ({
}
},
layout: {
backgroundImage: `url(${BackgroundImage})`,
width: '100%',
height: '100%'
},
@@ -27,31 +24,29 @@ const styles = theme => ({
}
})
const Home = ({ classes }) => (
<React.Fragment>
<CssBaseline />
<main className={classes.layout}>
<div className={classes.heroContent}>
<Typography
variant='h3'
align='center'
color='textPrimary'
gutterBottom
>
Collaborate. Innovate. Evolve.
</Typography>
<Typography
variant='h6'
align='center'
color='textSecondary'
component='h3'
>
Welcome to Advanced Algos
</Typography>
</div>
</main>
</React.Fragment>
)
class Home extends Component {
componentDidMount () {
window.CANVAS_VISIBLE = true
let body = document.getElementById('body')
body.style = 'margin: 0px; padding: 0px; border: 0px; overflow:hidden;'
window.HIDE_FOOTER = true
}
componentWillUnmount () {
window.CANVAS_VISIBLE = false
let body = document.getElementById('body')
body.style = ''
window.HIDE_FOOTER = false
}
render () {
const { classes } = this.props
return (
<React.Fragment />
)
}
}
Home.propTypes = {
classes: PropTypes.object.isRequired