Merge branch 'develop'
This commit is contained in:
commit
129691e269
3 files changed
+32
-9
No files matched your search
@@ -96,21 +96,42 @@ const Footer = ({ classes }) => {
|
||||
<Typography variant='title' color='textPrimary' gutterBottom>
|
||||
Modules
|
||||
</Typography>
|
||||
<NavLink to='/' className={classNames(classes.footerLink)}>
|
||||
<a
|
||||
href='https://develop.advancedalgos.net'
|
||||
target='_blank>'
|
||||
className={classNames(classes.footerLink)}
|
||||
>
|
||||
<Typography variant='subheading' color='textSecondary'>
|
||||
Teams
|
||||
Platform
|
||||
</Typography>
|
||||
</NavLink>
|
||||
<NavLink to='/' className={classNames(classes.footerLink)}>
|
||||
</a>
|
||||
<a
|
||||
href='https://users.advancedalgos.net'
|
||||
target='_blank>'
|
||||
className={classNames(classes.footerLink)}
|
||||
>
|
||||
<Typography variant='subheading' color='textSecondary'>
|
||||
Users
|
||||
</Typography>
|
||||
</NavLink>
|
||||
<NavLink to='/' className={classNames(classes.footerLink)}>
|
||||
</a>
|
||||
<a
|
||||
href='https://teams.advancedalgos.net'
|
||||
target='_blank>'
|
||||
className={classNames(classes.footerLink)}
|
||||
>
|
||||
<Typography variant='subheading' color='textSecondary'>
|
||||
KeyVault
|
||||
Teams
|
||||
</Typography>
|
||||
</NavLink>
|
||||
</a>
|
||||
<a
|
||||
href='https://keyvault.advancedalgos.net'
|
||||
target='_blank>'
|
||||
className={classNames(classes.footerLink)}
|
||||
>
|
||||
<Typography variant='subheading' color='textSecondary'>
|
||||
Key Vault
|
||||
</Typography>
|
||||
</a>
|
||||
</Grid>
|
||||
<Grid item xs>
|
||||
<NavLink to='/'>
|
||||
|
||||
@@ -20,7 +20,8 @@ const userSchema = new Schema({
|
||||
isDataAnalyst: Boolean,
|
||||
roleId: String,
|
||||
avatarHandle: String,
|
||||
avatarChangeDate: String
|
||||
avatarChangeDate: String,
|
||||
sessionToken: String
|
||||
})
|
||||
|
||||
global.UserSchema = global.UserSchema || mongoose.model('User', userSchema)
|
||||
|
||||
@@ -43,6 +43,7 @@ const UserType = new GraphQLObjectType({
|
||||
isDataAnalyst: {type: GraphQLInt},
|
||||
avatarHandle: {type: GraphQLString},
|
||||
avatarChangeDate: {type: GraphQLString},
|
||||
sessionToken: {type: GraphQLString},
|
||||
role: {
|
||||
type: RoleType,
|
||||
resolve (parent, args) {
|
||||
|
||||
Reference in new issue
Block a user