+ {!this.state.edit &&
+ {!this.state.edit &&
+
+
+
+
+
+
+
+
+ }
+ {this.state.edit &&
+
+
+
+
+
+
+
+
+ }
+
+
+
diff --git a/client/src/views/dashboard/components/ManageTeamEdit.js b/client/src/views/dashboard/components/ManageTeamEdit.js
index d10302c66..d51e31b3c 100644
--- a/client/src/views/dashboard/components/ManageTeamEdit.js
+++ b/client/src/views/dashboard/components/ManageTeamEdit.js
@@ -129,11 +129,11 @@ export class ManageTeamEdit extends Component {
let avatar = null
if (team.profile !== null && team.profile.avatar !== undefined && team.profile.avatar !== null) avatar = team.profile.avatar
if (this.state.avatar !== null) avatar = this.state.avatar
- if (this.state.avatar === null && team.profile !== null && team.profile.avatar === undefined) avatar = 'https://algobotcommstorage.blob.core.windows.net/aateammodule/aa-avatar-default.png'
+ if (this.state.avatar === null && team.profile !== null && team.profile.avatar === undefined) avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
let banner = null
if (team.profile !== null && team.profile.banner !== undefined && team.profile.banner !== null) banner = team.profile.banner
if (this.state.banner !== null) banner = this.state.banner
- if (this.state.banner === null && team.profile !== null && team.profile.banner === undefined) banner = 'https://algobotcommstorage.blob.core.windows.net/aateammodule/aa-banner-default.png'
+ if (this.state.banner === null && team.profile !== null && team.profile.banner === undefined) banner = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-banner-default.png'
log.debug('team images: ', avatar, banner)
if (loading || data === undefined) {
diff --git a/client/src/views/dashboard/components/ManageTeamsItem.js b/client/src/views/dashboard/components/ManageTeamsItem.js
index 51e0ee937..cedb75aa9 100644
--- a/client/src/views/dashboard/components/ManageTeamsItem.js
+++ b/client/src/views/dashboard/components/ManageTeamsItem.js
@@ -20,7 +20,7 @@ export const ManageTeamsItem = ({ classes, team, authId }) => {
if (team.profile.avatar !== undefined && team.profile.avatar !== 'a') {
avatar = team.profile.avatar
} else {
- avatar = 'https://algobotcommstorage.blob.core.windows.net/aateammodule/aa-avatar-default.png'
+ avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
}
return (
diff --git a/client/src/views/financial-beings/components/ManageFBItem.js b/client/src/views/financial-beings/components/ManageFBItem.js
index 2316742c8..743d253ea 100644
--- a/client/src/views/financial-beings/components/ManageFBItem.js
+++ b/client/src/views/financial-beings/components/ManageFBItem.js
@@ -18,7 +18,7 @@ export const ManageFBItem = ({ classes, team }) => {
if (team.fb[0].avatar !== undefined && team.fb[0].avatar !== 'a') {
avatar = team.fb[0].avatar
} else {
- avatar = 'https://algobotcommstorage.blob.core.windows.net/aateammodule/aa-avatar-default.png'
+ avatar = 'https://aadevelop.blob.core.windows.net/module-teams/module-default/aa-avatar-default.png'
}
return (
diff --git a/client/src/views/financial-beings/components/ManageFBList.js b/client/src/views/financial-beings/components/ManageFBList.js
index 9893f4812..69ca35323 100644
--- a/client/src/views/financial-beings/components/ManageFBList.js
+++ b/client/src/views/financial-beings/components/ManageFBList.js
@@ -15,10 +15,13 @@ import log from '../../../utils/log'
import ManageFBItem from './ManageFBItem'
const styles = theme => ({
+ root: {
+ flexGrow: 1
+ },
heroContent: {
- maxWidth: 600,
- margin: '0 auto',
- padding: `${theme.spacing.unit * 8}px 0 ${theme.spacing.unit * 6}px`
+ maxWidth: 800,
+ margin: `${theme.spacing.unit * 4}px auto`,
+ padding: 0
},
cardGrid: {
padding: `${theme.spacing.unit * 8}px 0`
@@ -63,17 +66,21 @@ export const ManageFBList = ({ classes }) => (
if (!loading && !error) {
if (data.teams_TeamsByOwner.length > 0) {
return (
-
- {!loading &&
- data.teams_TeamsByOwner.map(team => (
-
+
You don’t have any financial being. To create one, create a team first!
-
+
After you create a team, a default trading algobot will be cloned and added to your team so
that you can begin experimenting right away.
diff --git a/client/src/views/landing/index.js b/client/src/views/landing/index.js
index d38cf2501..de88b4997 100644
--- a/client/src/views/landing/index.js
+++ b/client/src/views/landing/index.js
@@ -1,6 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
+import Typography from '@material-ui/core/Typography'
import { withStyles } from '@material-ui/core/styles'
import { BannerTopBar } from '../common'
@@ -21,9 +22,33 @@ const styles = theme => ({
})
const Landing = ({ classes, ...props }) => (
-
+
)
}}
diff --git a/client/src/views/manage-teams/components/ManageTeamProfile.js b/client/src/views/manage-teams/components/ManageTeamProfile.js
new file mode 100644
index 000000000..51297cbc9
--- /dev/null
+++ b/client/src/views/manage-teams/components/ManageTeamProfile.js
@@ -0,0 +1,180 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+import Paper from '@material-ui/core/Paper'
+import Grid from '@material-ui/core/Grid'
+import Button from '@material-ui/core/Button'
+import { withStyles } from '@material-ui/core/styles'
+
+import { Link } from 'react-router-dom'
+
+import ManageTeamProfileView from './ManageTeamProfileView'
+import ManageTeamProfileEdit from './ManageTeamProfileEdit'
+
+import log from '../../../utils/log'
+
+const styles = theme => ({
+ root: {
+ flexGrow: 1
+ },
+ '@global': {
+ body: {
+ backgroundColor: theme.palette.common.white
+ }
+ },
+ layout: {
+ width: 'auto',
+ marginLeft: theme.spacing.unit * 3,
+ marginRight: theme.spacing.unit * 3,
+ marginBottom: theme.spacing.unit * 6,
+ [theme.breakpoints.up(800 + theme.spacing.unit * 3 * 2)]: {
+ width: 800,
+ marginLeft: 'auto',
+ marginRight: 'auto'
+ }
+ },
+ paper: {
+ marginTop: 0,
+ marginBottom: theme.spacing.unit * 1,
+ padding: 0,
+ [theme.breakpoints.up(800 + theme.spacing.unit * 3 * 2)]: {
+ marginTop: theme.spacing.unit * 3,
+ marginBottom: theme.spacing.unit * 2,
+ padding: `0 0 ${theme.spacing.unit * 2}px`
+ }
+ },
+ heroContent: {
+ maxWidth: 800,
+ margin: '0 auto',
+ padding: 0
+ },
+ teamContent: {
+ margin: `${theme.spacing.unit * 1}px ${theme.spacing.unit * 3}px 0 0`
+ },
+ banner: {
+ maxWidth: '100%',
+ height: 'auto'
+ },
+ avatar: {
+ maxWidth: 100,
+ height: 100,
+ margin: `${theme.spacing.unit * 1}px 0 0 ${theme.spacing.unit * 3}px `
+ },
+ profileButtons: {
+ width: '90%',
+ margin: `${theme.spacing.unit * 3}px auto 0`,
+ padding: `${theme.spacing.unit * 2}px ${theme.spacing.unit * 2}px 0`,
+ borderTop: '1px solid #CCCCCC'
+ }
+})
+
+export class ManageTeamProfile extends Component {
+ constructor (props) {
+ super(props)
+
+ this.toggleEdit = this.toggleEdit.bind(this)
+ this.handleSave = this.handleSave.bind(this)
+ this.handleUpdate = this.handleUpdate.bind(this)
+
+ this.state = {
+ edit: false,
+ save: false
+ }
+ }
+
+ render () {
+ const { classes, team, slug, match } = this.props
+ log.debug('ManageTeamProfile render', this.state)
+ return (
+
+
)
} else {
return (
@@ -83,7 +90,7 @@ export const ManageFBList = ({ classes }) => (
+
+ {!loading &&
+ data.teams_TeamsByOwner.map(team => (
+
+
+
+
+
+
+ Welcome to the Teams Module!
+
+
+ Multidisciplinary groups of humans joining forces to breed financial beings and compete.
+
+
+
)
Landing.propTypes = {
diff --git a/client/src/views/manage-teams/components/CreateTeamDialog.js b/client/src/views/manage-teams/components/CreateTeamDialog.js
index a46652833..d99eaa966 100644
--- a/client/src/views/manage-teams/components/CreateTeamDialog.js
+++ b/client/src/views/manage-teams/components/CreateTeamDialog.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
import { Mutation } from 'react-apollo'
import { withStyles } from '@material-ui/core/styles'
+import Grid from '@material-ui/core/Grid'
import Button from '@material-ui/core/Button'
import AddIcon from '@material-ui/icons/Add'
import TextField from '@material-ui/core/TextField'
@@ -34,14 +35,8 @@ const styles = theme => ({
marginLeft: '20%',
marginBottom: 10
},
- buttonRight: {
- // position: 'absolute',
- // right: '3em'
- marginTop: '1em',
- marginRight: 'auto',
- marginLeft: 'auto',
- display: 'block',
- lineHeight: '1em'
+ buttonFab: {
+ backgroundColor: '#CCCCCC'
}
})
@@ -93,12 +88,12 @@ export class CreateTeamDialog extends Component {
})
}
return (
-
+
+ One of the core propositions of Advanced Algos revolves around people teaming up to breed financial beings and compete in algorithmic trading competitions. Both developing and competing are team activities.
+
+
+ If you are a user of the system but still haven’t joined any teams, the Teams Module is the right place to find one or even create your own.
+
+
+
+
+ You may join and participate in as many teams as you wish.
+
+
+ When you create your own team, you become the team’s owner and may allow more people in the team at your sole discretion. It has been shown that larger teams tend to become more intelligent.
+
+
+
+
-
+
+
+
+
+
+ )
+ }
+
+ toggleEdit () {
+ this.setState({ edit: !this.state.edit })
+ }
+
+ handleSave (e) {
+ e.preventDefault()
+ log.debug('handleSave')
+ this.setState({ save: true })
+ }
+
+ handleUpdate () {
+ log.debug('handleUpdate')
+ this.setState({ edit: false, save: false })
+ }
+}
+
+ManageTeamProfile.propTypes = {
+ classes: PropTypes.object.isRequired,
+ team: PropTypes.object.isRequired,
+ match: PropTypes.object.isRequired,
+ slug: PropTypes.string.isRequired
+}
+
+export default withStyles(styles)(ManageTeamProfile)
diff --git a/client/src/views/manage-teams/components/ManageTeamProfileEdit.js b/client/src/views/manage-teams/components/ManageTeamProfileEdit.js
new file mode 100644
index 000000000..f66d481f9
--- /dev/null
+++ b/client/src/views/manage-teams/components/ManageTeamProfileEdit.js
@@ -0,0 +1,376 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import { Mutation } from 'react-apollo'
+import { withStyles } from '@material-ui/core/styles'
+
+import Grid from '@material-ui/core/Grid'
+import TextField from '@material-ui/core/TextField'
+import Typography from '@material-ui/core/Typography'
+
+import { ImageUpload } from '@advancedalgos/web-components'
+
+import UPDATE_TEAM_PROFILE from '../../../graphql/teams/UpdateTeamProfileMutation'
+import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery'
+
+import { checkGraphQLError } from '../../../utils/graphql-errors'
+import log from '../../../utils/log'
+
+const styles = theme => ({
+ root: {
+ flexGrow: 1
+ },
+ '@global': {
+ body: {
+ backgroundColor: theme.palette.common.white
+ }
+ },
+ layout: {
+ width: '100%',
+ marginBottom: theme.spacing.unit * 6,
+ [theme.breakpoints.up(800 + theme.spacing.unit * 3 * 2)]: {
+ width: 800,
+ marginLeft: 'auto',
+ marginRight: 'auto'
+ }
+ },
+ paper: {
+ marginTop: 0,
+ marginBottom: theme.spacing.unit * 3,
+ padding: 0,
+ [theme.breakpoints.up(800 + theme.spacing.unit * 3 * 2)]: {
+ marginTop: theme.spacing.unit * 3,
+ marginBottom: theme.spacing.unit * 6,
+ padding: `0 0 ${theme.spacing.unit * 2}px`
+ }
+ },
+ heroContent: {
+ maxWidth: 800,
+ margin: '0 auto',
+ padding: `0 0 ${theme.spacing.unit * 2}px`
+ },
+ editContentContainer: {
+ marginBottom: `${theme.spacing.unit * 3}px`
+ },
+ metaContainer: {
+ marginTop: `${theme.spacing.unit * 1}px`,
+ alignSelf: 'stretch',
+ borderRight: '1px solid #CCCCCC'
+ },
+ teamMeta: {
+ margin: `${theme.spacing.unit * 3}px 0 0`,
+ paddingLeft: `${theme.spacing.unit * 2}px`,
+ textAlign: 'center',
+ height: '100%'
+ },
+ teamContent: {
+ '& h2': {
+ padding: `${theme.spacing.unit * 4}px ${theme.spacing.unit * 3}px 0`
+ },
+ '& h4': {
+ padding: `0 ${theme.spacing.unit * 3}px 0`
+ },
+ '& h6': {
+ padding: `0 ${theme.spacing.unit * 3}px 0`
+ }
+ },
+ editInput: {
+ padding: `0 ${theme.spacing.unit * 3}px ${theme.spacing.unit * 2}px`,
+ '& label': {
+ display: 'none',
+ padding: `0 ${theme.spacing.unit * 4}px 0`
+ }
+ },
+ banner: {
+ maxWidth: '100%',
+ height: 'auto',
+ width: '100%'
+ },
+ avatar: {
+ maxWidth: 125,
+ height: 125,
+ margin: `0 auto ${theme.spacing.unit * 2}px`,
+ verticalAlign: 'middle',
+ borderRadius: '50%'
+ }
+})
+
+export class ManageTeamProfileEdit extends Component {
+ constructor (props) {
+ super(props)
+
+ this.handleClickOpen = this.handleClickOpen.bind(this)
+ this.handleClose = this.handleClose.bind(this)
+ this.handleChange = this.handleChange.bind(this)
+ this.handleSubmit = this.handleSubmit.bind(this)
+ this.handleAvatar = this.handleAvatar.bind(this)
+ this.handleBanner = this.handleBanner.bind(this)
+ this.startSave = this.startSave.bind(this)
+
+ log.debug('ManageTeamProfileEdit constructor', props.team)
+ const motto = props.team.profile.motto || ''
+ const description = props.team.profile.description || ''
+ const avatar = props.team.profile.avatar || null
+ const banner = props.team.profile.banner || null
+
+ this.state = {
+ open: false,
+ motto: motto,
+ description: description,
+ avatar: avatar,
+ banner: banner,
+ save: false
+ }
+ }
+
+ render () {
+ const { classes, team, match, save, handleUpdate } = this.props
+ log.debug('ManageTeamProfileEdit render', this.props, this.props.slug, this.props.team, match)
+
+ const created = new Date(team.createdAt)
+
+ return (
+
+
+
+
+ )
+ }}
+
+
+
+ {team.fb[0].name}
+
+
+ {team.fb[0].kind}
+
+
+
+
+
+
+
+
+
+
+ You don’t have any teams. Create one!
+
+
+ To begin developing on the Advanced Algos platform, as well as participate in Algobot competitions,
+ you'll need to create a team. A default trading algobot will be cloned and added to your team so
+ that you can begin experimenting right away.
+
+
+
+
+
+ )
+ }
+
+ toggleEdit () {
+ this.setState({ edit: !this.state.edit })
+ }
+
+ handleSave () {
+ this.setState({ save: !this.state.edit })
+ }
+}
+
+ManageTeamProfile.propTypes = {
+ classes: PropTypes.object.isRequired,
+ team: PropTypes.object.isRequired,
+ match: PropTypes.object.isRequired,
+ slug: PropTypes.string.isRequired
+}
+
+export default withStyles(styles)(ManageTeamProfile)
diff --git a/client/src/views/manage-teams/components/ManageTeamsItem.js b/client/src/views/manage-teams/components/ManageTeamsItem.js
index a4522a4d3..7ec8dc9f7 100644
--- a/client/src/views/manage-teams/components/ManageTeamsItem.js
+++ b/client/src/views/manage-teams/components/ManageTeamsItem.js
@@ -7,14 +7,16 @@ import CardActions from '@material-ui/core/CardActions'
import CardContent from '@material-ui/core/CardContent'
import CardMedia from '@material-ui/core/CardMedia'
import Typography from '@material-ui/core/Typography'
+import Button from '@material-ui/core/Button'
+import EditIcon from '@material-ui/icons/Edit'
+
+import { Link } from 'react-router-dom'
-import ManageTeamDetails from './ManageTeamDetails'
import ManageTeamDelete from './ManageTeamDelete'
-import ManageTeamEdit from './ManageTeamEdit'
import log from '../../../utils/log'
-export const ManageTeamsItem = ({ classes, team, ...props }) => {
+export const ManageTeamsItem = ({ classes, team, match, ...props }) => {
log.debug('ManageTeamsItem', team, team.profile, team.profile.avatar)
let avatar
if (team.profile.avatar !== undefined && team.profile.avatar !== 'a') {
@@ -36,13 +38,22 @@ export const ManageTeamsItem = ({ classes, team, ...props }) => {
{team.name}
+
)
} else {
return (
-
+
+ {!loading &&
+ data.teams_TeamsByOwner.map(team => {
+ if (slug === team.slug) {
+ return (
+
+
+
+
+
+
+
+ You don’t have any teams. Create one!
+
+
+ To begin developing on the Advanced Algos platform, as well as participate in Algobot competitions,
+ you'll need to create a team. A default trading algobot will be cloned and added to your team so
+ that you can begin experimenting right away.
+
+
-
-
+
+
)
}
} else {
return (
-
+
+
+ {errors === null &&
+
+ Loading...
+
+ }
+ {errors !== null &&
+
+ {errors}
+
+ }
+
-
+
)
}
}}
@@ -124,7 +151,8 @@ export const ManageTeamsList = ({ classes, user = null, ...props }) => (
ManageTeamsList.propTypes = {
user: PropTypes.any,
- classes: PropTypes.object.isRequired
+ classes: PropTypes.object.isRequired,
+ match: PropTypes.object
}
export default withStyles(styles)(ManageTeamsList)
diff --git a/client/src/views/manage-teams/index.js b/client/src/views/manage-teams/index.js
index 1e5a72f92..23a195750 100644
--- a/client/src/views/manage-teams/index.js
+++ b/client/src/views/manage-teams/index.js
@@ -1,47 +1,25 @@
import React from 'react'
import PropTypes from 'prop-types'
-import { withStyles } from '@material-ui/core/styles'
-import Grid from '@material-ui/core/Grid'
-
import { BannerTopBar } from '../common'
import ManageTeamsList from './components/ManageTeamsList'
-const styles = theme => ({
- container: {
- width: 'auto',
- marginTop: theme.spacing.unit * 3,
- marginLeft: theme.spacing.unit * 3,
- marginRight: theme.spacing.unit * 3,
- marginBottom: theme.spacing.unit * 6,
- [theme.breakpoints.up(800 + theme.spacing.unit * 3 * 2)]: {
- width: 800,
- marginLeft: 'auto',
- marginRight: 'auto'
- }
- }
-})
-
-const ManageTeams = ({ classes, ...props }) => (
+const ManageTeams = ({ match, ...props }) => (
-
-
-
-
+
)
ManageTeams.propTypes = {
- classes: PropTypes.object.isRequired
+ match: PropTypes.object
}
-export default withStyles(styles)(ManageTeams)
+export default ManageTeams
diff --git a/client/src/views/team-members/components/InviteMemberDialog.js b/client/src/views/team-members/components/InviteMemberDialog.js
new file mode 100644
index 000000000..422eab16c
--- /dev/null
+++ b/client/src/views/team-members/components/InviteMemberDialog.js
@@ -0,0 +1,207 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import { Mutation } from 'react-apollo'
+import { withStyles } from '@material-ui/core/styles'
+
+import Button from '@material-ui/core/Button'
+import AddIcon from '@material-ui/icons/Add'
+import TextField from '@material-ui/core/TextField'
+import FormControl from '@material-ui/core/FormControl'
+import FormHelperText from '@material-ui/core/FormHelperText'
+import Dialog from '@material-ui/core/Dialog'
+import DialogActions from '@material-ui/core/DialogActions'
+import DialogContent from '@material-ui/core/DialogContent'
+import DialogTitle from '@material-ui/core/DialogTitle'
+import Typography from '@material-ui/core/Typography'
+import { isEmpty } from '../../../utils/js-helpers'
+
+import SEND_MEMBER_INVITE from '../../../graphql/teams/SendMemberInvite'
+
+// import { checkGraphQLError } from '../../../utils/graphql-errors'
+
+const styles = theme => ({
+ dialogStyle: {
+ padding: '3em'
+ },
+ buttonRight: {
+ // position: 'absolute',
+ // right: '3em'
+ marginTop: '1em',
+ marginRight: 'auto',
+ marginLeft: 'auto',
+ display: 'block',
+ lineHeight: '1em'
+ }
+})
+
+export class InviteMemberDialog extends Component {
+ constructor (props) {
+ super(props)
+
+ this.handleClickOpen = this.handleClickOpen.bind(this)
+ this.handleClose = this.handleClose.bind(this)
+ this.handleChange = this.handleChange.bind(this)
+ this.handleSubmit = this.handleSubmit.bind(this)
+ this.validate = this.validate.bind(this)
+
+ this.state = {
+ open: false,
+ email: '',
+ errors: {
+ email: ''
+ }
+ }
+ }
+
+ render () {
+ const { classes, teamId } = this.props
+
+ if (this.state.open) {
+ return (
+
+
+
+
+
+ )
+ }}
+
+
+
+ {team.fb[0].name}
+
+
+ {team.fb[0].kind}
+
+
+
+
+
{!loading &&
data.teams_Teams.edges.map(team => (
-
+
)
}
} else {
return (
-