Merge pull request #156 from AAVikings/develop

Fixing issues
This commit is contained in:
z@tOr authored and GitHub committed 2019-02-10 17:47:53 -03:00
commit 821c1e8e57
4 files changed
+13 -18

No files matched your search

+7 -8
View File
@@ -2,10 +2,10 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Superalgos</title>
<title>Superalgos Platform</title>
<meta name="description" content="The system enabling a collective of humans and machines to collaborate and compete while co-building trading algorithms.">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Responsible for loading all web modules and running them">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="https://fonts.googleapis.com/css?family=Saira+Condensed:300,600|Saira:300,600&amp;subset=latin-ext,vietnamese" rel="stylesheet">
@@ -18,18 +18,17 @@
<script type="text/javascript">
function loadCanvas(){
if (window.canvasApp.visible === undefined) {
window.canvasApp = {
sessionToken: '',
executingAt: 'Master App',
visible: false,
topMargin: 130,
urlPrefix: 'https://charts-dev.superalgos.org/' , /* 'http://localhost:1337/' */ /* 'https://charts-dev.superalgos.org/' */
urlPrefix: '<%= process.env.CANVAS_URL %>',
graphQL: {
masterAppApiUrl: 'https://platform-api-dev.superalgos.org/graphql'
},
context: {}
masterAppApiUrl: '<%= process.env.PLATFORM_API_URL %>',
},
context: {}
};
let delay = 0
@@ -37,12 +36,12 @@
setTimeout(loadAdvancedAlgosPlatform, delay)
}
}
function onResize(){
if (window.canvasApp === undefined) {return}
if (window.canvasApp.eventHandler === undefined) {return}
window.canvasApp.eventHandler.raiseEvent('Browser Resized')
}
</script>
</head>
+3 -7
View File
@@ -48,7 +48,8 @@ export const defaultOptions = {
},
languageDictionary: {
title: 'Platform Dev'
}
},
avatar:null
}
export const inviteOptions = {
@@ -180,9 +181,6 @@ class Auth {
alias: authResult.idTokenPayload.nickname
}
setItem('user', JSON.stringify(user))
if (window.location.href.includes(`callback`)) {
// window.location.href = '/dashboard'
}
return true
}
}
@@ -200,9 +198,7 @@ class Auth {
alias: response.data.users_Authenticate.alias
}
setItem('user', JSON.stringify(user))
if (window.location.href.includes(`callback`)) {
window.location.href = '/'
}
window.location.href = '/'
return response.data
} catch (err) {
return console.log('Sign in or create account error: ', err)
+2 -2
View File
@@ -34,9 +34,9 @@ class Footer extends Component {
className={classes.footerContainer}
>
<Grid item xs={12} sm={4} md={4}>
<NavLink to='/'>
<a target='_blank' href='https://superalgos.org/' className={classes.linkStrong}>
<img alt='' src={aalogo} width={'100%'} height={'auto'} className={classes.footerLogo} />
</NavLink>
</a>
<Grid container className={classes.descriptionLeft} direction='column'>
<Typography className={classNames(classes.textLight, classes.descriptionText)} ><strong>Superalgos Ltd.</strong></Typography>
<Typography className={classNames(classes.textLight, classes.descriptionText)} gutterBottom>Ground Floor, Palace Court, Church Street,<br />St. Julians&nbsp;STJ3049, Malta</Typography>
+1 -1
View File
@@ -35,7 +35,7 @@ export const LoggedIn = props => {
<ul className='subMenu'>
<li><Link to='/users/user' onClick={() => closeAll()}> Your Profile </Link></li>
<li><a href='#' onClick={() => auth.logout()}> Logout </a></li>
<li><a href='https://www.superalgos.org'> Exit Platform </a></li>
<li><a href='https://superalgos.org'> Exit Platform </a></li>
</ul>
</li>
)