Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Unknown committed 2019-02-11 15:52:08 +01:00
commit 04bff5afa3
9 files changed
+56 -71

No files matched your search

+4 -8
View File
@@ -47,8 +47,9 @@ export const defaultOptions = {
primaryColor: '#e3493c'
},
languageDictionary: {
title: 'Platform Dev'
}
title: 'Superalgos Platform'
},
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>
)
+1 -1
View File
@@ -87,7 +87,7 @@ const operationsMenus = {
const allMenus = [
usersMenus,
teamsMenus,
eventsMenus,
// eventsMenus,
// financialBeingsMenus,
keyvaultMenus,
operationsMenus