Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
commit
04bff5afa3
9 files changed
+56
-71
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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 STJ3049, Malta</Typography>
|
||||
|
||||
@@ -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>
|
||||
)
|
||||
|
||||
@@ -87,7 +87,7 @@ const operationsMenus = {
|
||||
const allMenus = [
|
||||
usersMenus,
|
||||
teamsMenus,
|
||||
eventsMenus,
|
||||
// eventsMenus,
|
||||
// financialBeingsMenus,
|
||||
keyvaultMenus,
|
||||
operationsMenus
|
||||
|
||||
Reference in new issue
Block a user