From e0994f3a83ee53cdd5dbd1a9eae7cad6e06e1708 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Nov 2018 07:04:51 +0100 Subject: [PATCH 1/6] Teams Directory text standarized --- client/src/views/teams/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/views/teams/index.js b/client/src/views/teams/index.js index d68e5658f..1352292e1 100644 --- a/client/src/views/teams/index.js +++ b/client/src/views/teams/index.js @@ -31,7 +31,7 @@ const styles = theme => ({ const Teams = ({ classes, match }) => ( - +
From 37191522e7d1278be6c97ee6e2c3e07530c8fb64 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Nov 2018 07:28:38 +0100 Subject: [PATCH 2/6] Revert "Teams Directory text standarized" This reverts commit e0994f3a83ee53cdd5dbd1a9eae7cad6e06e1708. --- client/src/views/teams/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/views/teams/index.js b/client/src/views/teams/index.js index 1352292e1..d68e5658f 100644 --- a/client/src/views/teams/index.js +++ b/client/src/views/teams/index.js @@ -31,7 +31,7 @@ const styles = theme => ({ const Teams = ({ classes, match }) => ( - +
From 3d64883801d7e10e7b5b4645ab4fa9edf79e2a0b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Nov 2018 07:31:41 +0100 Subject: [PATCH 3/6] Banner Title standarized @ directory view --- client/src/views/teams/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/views/teams/index.js b/client/src/views/teams/index.js index d68e5658f..b928a03be 100644 --- a/client/src/views/teams/index.js +++ b/client/src/views/teams/index.js @@ -31,7 +31,7 @@ const styles = theme => ({ const Teams = ({ classes, match }) => ( - +
From fc9bdb2c00ba741ae9ca1eb4f24eb6f21e9286c1 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Nov 2018 07:36:45 +0100 Subject: [PATCH 4/6] Text updated at Landing View --- client/src/views/landing/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/views/landing/index.js b/client/src/views/landing/index.js index de88b4997..170caadf0 100644 --- a/client/src/views/landing/index.js +++ b/client/src/views/landing/index.js @@ -23,7 +23,7 @@ const styles = theme => ({ const Landing = ({ classes, ...props }) => ( - +
Welcome to the Teams Module! From 5e91cfc0974c9260fd616aa50a0698e9e88dae84 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Nov 2018 07:41:07 +0100 Subject: [PATCH 5/6] Your Teams view texts standarized --- client/src/views/manage-teams/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/views/manage-teams/index.js b/client/src/views/manage-teams/index.js index 23a195750..28cb2c10c 100644 --- a/client/src/views/manage-teams/index.js +++ b/client/src/views/manage-teams/index.js @@ -8,10 +8,10 @@ const ManageTeams = ({ match, ...props }) => (
+ />
From 554b5284602b4edf35bd46b08b2cb7cf5539b644 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Nov 2018 08:30:43 +0100 Subject: [PATCH 6/6] Create New Team form adjusted to standards --- .../manage-teams/components/CreateTeamForm.js | 49 +++++++++++++------ .../components/ManageTeamsList.js | 46 ++++++++++------- 2 files changed, 62 insertions(+), 33 deletions(-) diff --git a/client/src/views/manage-teams/components/CreateTeamForm.js b/client/src/views/manage-teams/components/CreateTeamForm.js index 29cdd04e0..e0f43cc36 100644 --- a/client/src/views/manage-teams/components/CreateTeamForm.js +++ b/client/src/views/manage-teams/components/CreateTeamForm.js @@ -8,6 +8,7 @@ import TextField from '@material-ui/core/TextField' import FormControl from '@material-ui/core/FormControl' import FormHelperText from '@material-ui/core/FormHelperText' import Typography from '@material-ui/core/Typography' +import Grid from '@material-ui/core/Grid' import { isEmpty } from '../../../utils/js-helpers' import CREATE_TEAM from '../../../graphql/teams/CreateTeamMutation' @@ -20,14 +21,22 @@ const styles = theme => ({ width: '100%', margin: '3em 0 1em' }, + typography: { + width: '80%', + marginLeft: '10%', + marginTop: 40 + }, dialogStyle: { padding: '3em' }, textField: { - marginBottom: 10 + width: '80%', + marginLeft: '10%', + marginTop: 25 }, submitButton: { - margin: `${theme.spacing.unit * 2}px ${theme.spacing.unit * 6}px` + margin: theme.spacing.unit, + marginTop: theme.spacing.unit * 3 } }) @@ -84,7 +93,10 @@ export class CreateTeamForm extends Component { error={this.state.nameError !== '' || this.state.botNameError !== '' || error !== null} className={classes.formContainer} > - Create a name for your team + + Give a nice and memorable name to your team. + + {this.state.nameError} )} -
- Create a name for your teams bot. + + Give a name for to the bot you are forking. {errors}} {loader} - + + + + + + + + ) }} diff --git a/client/src/views/manage-teams/components/ManageTeamsList.js b/client/src/views/manage-teams/components/ManageTeamsList.js index 7800064b9..264acc851 100644 --- a/client/src/views/manage-teams/components/ManageTeamsList.js +++ b/client/src/views/manage-teams/components/ManageTeamsList.js @@ -22,6 +22,11 @@ const styles = theme => ({ root: { flexGrow: 1 }, + typography: { + width: '80%', + marginLeft: '10%', + marginTop: 40 + }, heroContent: { maxWidth: 800, margin: `${theme.spacing.unit * 4}px auto`, @@ -53,6 +58,13 @@ const styles = theme => ({ height: 100, maxWidth: 100, justifyContent: 'flex-start' + }, + paper: { + width: '100%', + flexGrow: 1, + padding: 10, + marginTop: '5%', + marginBottom: '10%' } }) @@ -109,25 +121,23 @@ export const ManageTeamsList = ({ classes, match, ...props }) => ( ) } else { 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. - - - - - -
+
+ + + + Your First Team + + + + To begin developing on the Advanced Algos platform, as well as to participate in trading competitions, + you will need to create a team or become a member of an existing one. Currently, the only option is to create your own team. As part of the same process, an already existing trading bot will be forked for you so that you do not have to start from scratch. It will be added to your team so + that you can begin experimenting right away. + + + +
+ ) } } else {