From fb9d15a8f0797ba8e5c318e861993a84145d1b7c Mon Sep 17 00:00:00 2001 From: Barry Low Date: Mon, 12 Nov 2018 23:14:52 -0800 Subject: [PATCH 1/5] Add shared to from AAWeb to create/delete team --- api/src/graphql/resolvers/Mutation/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/graphql/resolvers/Mutation/index.js b/api/src/graphql/resolvers/Mutation/index.js index 7afc8a29e..ce02192d1 100644 --- a/api/src/graphql/resolvers/Mutation/index.js +++ b/api/src/graphql/resolvers/Mutation/index.js @@ -64,7 +64,7 @@ export const resolvers = { // const platformUrl = 'http://localhost:1337/AABrowserAPI/teamSetup/' logger.info(`${platformUrl}${createTeamUrl}/${authId}`) - const createPlatformTeam = await axios.get(`${platformUrl}${createTeamUrl}/${authId}`) + const createPlatformTeam = await axios.get(`${platformUrl}${createTeamUrl}/${authId}/${process.env.AAWEB_TEAM_SHARED_SECRET}`) .then((result) => { console.log('createPlatformTeam result:', result.data) if(result.data.message === 'Team Name already taken'){ @@ -148,7 +148,7 @@ export const resolvers = { const alias = await result.data.users_User.alias // const email = result.data.users_User.email - const deleteTeamUrl = encodeURI(`${slug}/${alias}/${botSlug}`) + const deleteTeamUrl = encodeURI(`${slug}/${alias}/${botSlug}/${process.env.AAWEB_DELETE_TEAM_SHARED_SECRET}`) logger.info('deleteTeamUrl:') logger.info(JSON.stringify(await deleteTeamUrl)) From a3d6aa2393616ebe4316df32b02f081ade4fdcd7 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Mon, 12 Nov 2018 23:26:37 -0800 Subject: [PATCH 2/5] Add Team Landing --- client/src/index.js | 4 ++- client/src/views/index.js | 2 ++ client/src/views/landing/index.js | 33 +++++++++++++++++++ .../src/views/teams/components/TeamsItem.js | 4 +-- 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 client/src/views/landing/index.js diff --git a/client/src/index.js b/client/src/index.js index c5381d25c..a4deab1a1 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -11,6 +11,7 @@ import { FinancialBeings, Settings, Teams, + Landing, globalStyles } from './views' @@ -37,7 +38,8 @@ class App extends Component { return (
- + + ({ + 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 Landing = ({ classes, ...props }) => ( +
+ +
+) + +Landing.propTypes = { + classes: PropTypes.object.isRequired +} + +export default withStyles(styles)(Landing) diff --git a/client/src/views/teams/components/TeamsItem.js b/client/src/views/teams/components/TeamsItem.js index 28ae53a9c..543cf810b 100644 --- a/client/src/views/teams/components/TeamsItem.js +++ b/client/src/views/teams/components/TeamsItem.js @@ -36,10 +36,10 @@ export const TeamsItem = ({ classes, team }) => { /> - + {team.name} - + {team.name} From 348d396f23c9197c6b5858dfda03ed6ef922051d Mon Sep 17 00:00:00 2001 From: Barry Low Date: Mon, 12 Nov 2018 23:33:17 -0800 Subject: [PATCH 3/5] Update teams landing route --- client/package-lock.json | 2 +- client/src/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 142f5ecb1..c95653147 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,6 +1,6 @@ { "name": "@advancedalgos/teams-client", - "version": "0.0.24", + "version": "0.0.26", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/client/src/index.js b/client/src/index.js index a4deab1a1..366f95c98 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -39,7 +39,7 @@ class App extends Component {
- + Date: Mon, 12 Nov 2018 23:34:19 -0800 Subject: [PATCH 4/5] 0.0.27 --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index b81521f70..b323cf745 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "@advancedalgos/teams-client", - "version": "0.0.26", + "version": "browse-teams", "description": "Advanced Algos Team client-side web app", "main": "src/index.js", "scripts": { From 9de3a4ffc03e2df7ff46c280296854e5d4bc6b8d Mon Sep 17 00:00:00 2001 From: Barry Low Date: Mon, 12 Nov 2018 23:38:35 -0800 Subject: [PATCH 5/5] 0.0.27 --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index b81521f70..6ddf5d50f 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "@advancedalgos/teams-client", - "version": "0.0.26", + "version": "0.0.27", "description": "Advanced Algos Team client-side web app", "main": "src/index.js", "scripts": {