diff --git a/api/src/email/sendgrid.js b/api/src/email/sendgrid.js
index 79dc68536..b3b7d5264 100644
--- a/api/src/email/sendgrid.js
+++ b/api/src/email/sendgrid.js
@@ -67,9 +67,9 @@ const sendTeamMemberInvite = function(email, team) {
return sendVerify
}
-const sendTeamCreateConfirmation = function(email, teamName, botName, sessionToken) {
+const sendTeamCreateConfirmation = function(email, teamName, botName) {
const dev = process.env.NODE_ENV === 'development' ? true : false
- console.log('sendTeamMemberInvite', email, team)
+ console.log('sendTeamMemberInvite', email, teamName, botName)
const API_KEY = process.env.SG_APIKEY
let origin = 'https://teams.advancedalgos.net'
if (dev){
@@ -91,7 +91,7 @@ const sendTeamCreateConfirmation = function(email, teamName, botName, sessionTok
}
],
dynamic_template_data: {
- "aateamdeveloplink": "https://develop.advancedalgos.net/index.html?" + sessionToken,
+ "aadeveloplink": "https://develop.advancedalgos.net/index.html",
"aateamname": teamName,
"aabotname": botName,
"subject": "Team " + teamName + " has been created!"
diff --git a/api/src/index.js b/api/src/index.js
index b728d30d9..fbd2663d0 100644
--- a/api/src/index.js
+++ b/api/src/index.js
@@ -155,34 +155,31 @@ const resolvers = {
const encodedAuthId = encodeURI(authId)
const getUserModuleUser = await axios.get(`https://users-api.advancedalgos.net/graphql?query=%7B%0A%20%20userByAuthId(authId%3A%22${encodedAuthId}%22)%7B%0A%20%20%20%20id%0A%09%09email%0A%20%20%20%20alias%0A%20%20%7D%0A%7D`)
- console.log('getUserModuleUserId: ', await getUserModuleUser.data)
-
const alias = await getUserModuleUser.data.data.userByAuthId.alias
- const email = await getUserModuleUser.data.data.userByAuthId.email
+ const email = getUserModuleUser.data.data.userByAuthId.email
const avatar = 'https://algobotcommstorage.blob.core.windows.net/aateammodule/aa-avatar-default.png'
const banner = 'https://algobotcommstorage.blob.core.windows.net/aateammodule/aa-banner-default.png'
- console.log('getUserModuleUserId: ', alias, email)
- /*
+/*
+ const createTeamUrl = encodeURI(`${slug}/${name}/${alias}/${botSlug}`)
+ const platformUrl = 'https://develop.advancedalgos.net/AABrowserAPI/teamSetup/'
+ // const platformUrl = 'http://localhost:1337/AABrowserAPI/teamSetup/'
+ const createPlatformTeam = await axios.get(`${platformUrl}${createTeamUrl}`)
+ console.log('createPlatformTeam: ', await createPlatformTeam)
+
+ // const sessionToken = getUserModuleUser.data.data.userByAuthId.id
+ update session token on user module
+ const updateUserSession = await axios.post('https://users-api.advancedalgos.net/graphql', {
+ query: 'mutation { language }'
+ })
+
+*/
const createTeam = await ctx.db.mutation.createTeam({ data: {name: name, slug: slug, owner: authId, members: {create: {member: {connect: {authId: authId}}, role: 'OWNER'}}, profile: {create: {avatar: avatar, banner: banner}}, fb: {create: {name: botName, slug: botSlug, kind:'TRADER', avatar: avatar, status: {create: {status: 'ACTIVE', reason: "Cloned on team creation"}}}}, status: {create: {status: 'ACTIVE', reason:"Team created"}}} }, TEAMS_FRAGMENT)
.catch((err) => {
console.log('createTeam error: ', err)
return err
})
- */
- const createTeamUrl = encodeURI(`${slug}/${name}/${alias}/${botSlug}`)
- // const platformUrl = 'https://develop.advancedalgos.net/AABrowserAPI/teamSetup/'
- const platformUrl = 'http://localhost:1337/AABrowserAPI/teamSetup/'
- const createPlatformTeam = await axios.get(`${platformUrl}${createTeamUrl}`)
- console.log('createPlatformTeam: ', await createPlatformTeam)
-
- /* update session token on user module
- const updateUserSession = await axios.post('https://users-api.advancedalgos.net/graphql', {
- query: 'mutation { language }'
- })
- */
-
- sendTeamCreateConfirmation(email, name, botName, sessionToken)
+ sendTeamCreateConfirmation(email, name, botName)
return createTeam
},
@@ -193,8 +190,8 @@ const resolvers = {
return err
})
},
- async updateFB(parent, { teamId, avatar}, ctx, info) {
- return ctx.db.mutation.updateTeam({data:{profile: {update: {avatar: avatar}}}, where:{slug: teamId}}, info)
+ async updateFB(parent, { fbId, avatar}, ctx, info) {
+ return ctx.db.mutation.updateFinancialBeings({data:{avatar:avatar}, where:{id:fbId}}, info)
.catch((err) => {
console.log('createTeam error: ', err)
return err
diff --git a/api/src/schema.graphql b/api/src/schema.graphql
index d09e62db9..f817ef0ff 100644
--- a/api/src/schema.graphql
+++ b/api/src/schema.graphql
@@ -23,7 +23,7 @@ type Mutation {
verifyTeamInvite(token: String!): TeamMembers
createTeam(name: String!, slug: String!, botName: String!, botSlug: String!): Team @isAuthenticated
updateTeamProfile(slug: String!, description: String, motto: String, avatar: String, banner: String): Team @isAuthenticated
- updateFB(teamId: String!, avatar: String): FinancialBeings @isAuthenticated
+ updateFB(fbId: String!, avatar: String): FinancialBeings @isAuthenticated
deleteTeam(slug: String!): Team @isAuthenticated @isOwner(type: "Team")
getAzureSAS(teamSlug: String!):String
sendMemberInviteSG(email: String!, teamId: String!): String
diff --git a/api/src/storage/azure.js b/api/src/storage/azure.js
index b718d6ef5..9d3257b5b 100644
--- a/api/src/storage/azure.js
+++ b/api/src/storage/azure.js
@@ -145,7 +145,7 @@ const createSASQueryURL = async (containerName) => {
// console.log(`ContainerCheck marker: `, listContainersResponse)
marker = listContainersResponse.marker;
for (const container of listContainersResponse.containerItems) {
- // console.log(`ContainerCheck: ${container.name} | ${containerName} | ${marker}`)
+ console.log(`ContainerCheck: ${container.name} | ${containerName} | ${marker}`)
if(container.name === containerName){
containerCheck = container.name
}
diff --git a/client/src/graphql/teams/UpdateFBMutation.js b/client/src/graphql/teams/UpdateFBMutation.js
index 3103dd7bf..c9ba2d8a2 100644
--- a/client/src/graphql/teams/UpdateFBMutation.js
+++ b/client/src/graphql/teams/UpdateFBMutation.js
@@ -2,39 +2,13 @@
import gql from 'graphql-tag'
const UPDATE_FB = gql`
- mutation UpdateFBMutation($teamSlug: String!, $avatar: String) {
- updateFB(teamId, $teamSlug, avatar: $avatar) {
+ mutation UpdateFBMutation($fbId: String!, $avatar: String) {
+ updateFB(fbId: $fbId, avatar: $avatar) {
id
name
slug
- owner
- status {
- status
- reason
- createdAt
- }
- createdAt
- profile {
- avatar
- banner
- description
- motto
- updatedAt
- }
- members {
- role
- email
- member {
- alias
- authId
- }
- status {
- id
- status
- reason
- createdAt
- }
- }
+ avatar
+ kind
}
}
`
diff --git a/client/src/views/dashboard/FinancialBeings.js b/client/src/views/dashboard/FinancialBeings.js
index c4d13ee80..447d85789 100644
--- a/client/src/views/dashboard/FinancialBeings.js
+++ b/client/src/views/dashboard/FinancialBeings.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
import Typography from '@material-ui/core/Typography'
import { withStyles } from '@material-ui/core/styles'
-import { MessageCard } from '@advancedalgos/web-components'
+import ManageFBList from './components/ManageFBList'
const styles = theme => ({
tableContainer: {
@@ -17,9 +17,7 @@ const FinancialBeings = ({ classes }) => (
Financial Beings
-
-
-
+
)
diff --git a/client/src/views/dashboard/TeamMembers.js b/client/src/views/dashboard/TeamMembers.js
index eca8f461e..3ce25fdf4 100644
--- a/client/src/views/dashboard/TeamMembers.js
+++ b/client/src/views/dashboard/TeamMembers.js
@@ -4,7 +4,8 @@ import PropTypes from 'prop-types'
import Typography from '@material-ui/core/Typography'
import { withStyles } from '@material-ui/core/styles'
-import ManageTeamMembersList from './components/ManageTeamMembersList'
+// import ManageTeamMembersList from './components/ManageTeamMembersList'
+import { MessageCard } from '@advancedalgos/web-components'
const styles = theme => ({
tableContainer: {
@@ -16,8 +17,9 @@ const TeamMembers = ({ classes }) => (
Team Members
+
-
+
)
diff --git a/client/src/views/dashboard/components/CreateTeamDialog.js b/client/src/views/dashboard/components/CreateTeamDialog.js
index 75f9a0cb9..aa35f1334 100644
--- a/client/src/views/dashboard/components/CreateTeamDialog.js
+++ b/client/src/views/dashboard/components/CreateTeamDialog.js
@@ -66,11 +66,14 @@ export class CreateTeamDialog extends Component {
}
render () {
- const { classes } = this.props
+ const { classes, authId } = this.props
return (
{(createTeam, { loading, error, data }) => {
let errors
@@ -252,7 +255,8 @@ export class CreateTeamDialog extends Component {
}
CreateTeamDialog.propTypes = {
- classes: PropTypes.object.isRequired
+ classes: PropTypes.object.isRequired,
+ authId: PropTypes.string
}
export default withStyles(styles)(CreateTeamDialog)
diff --git a/client/src/views/dashboard/components/ManageFBEdit.js b/client/src/views/dashboard/components/ManageFBEdit.js
new file mode 100644
index 000000000..ba150bc83
--- /dev/null
+++ b/client/src/views/dashboard/components/ManageFBEdit.js
@@ -0,0 +1,223 @@
+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 EditIcon from '@material-ui/icons/Edit'
+import TextField from '@material-ui/core/TextField'
+import Dialog from '@material-ui/core/Dialog'
+import DialogActions from '@material-ui/core/DialogActions'
+import DialogContent from '@material-ui/core/DialogContent'
+import DialogContentText from '@material-ui/core/DialogContentText'
+import DialogTitle from '@material-ui/core/DialogTitle'
+import Typography from '@material-ui/core/Typography'
+
+import { MessageCard, ImageUpload } from '@advancedalgos/web-components'
+
+import UPDATE_FB from '../../../graphql/teams/UpdateFBMutation'
+import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery'
+
+import { checkGraphQLError } from '../../../utils/graphql-errors'
+
+import GET_AZURE_SAS from '../../../graphql/teams/GetAzureSASMutation'
+
+const styles = theme => ({
+ dialogContainer: {
+ display: 'block',
+ margin: '3em',
+ minWidth: 400
+ },
+ buttonRight: {
+ justifyContent: 'flex-end'
+ }
+})
+
+export class ManageFBEdit extends Component {
+ constructor (props) {
+ super(props)
+
+ this.handleClickOpen = this.handleClickOpen.bind(this)
+ this.handleClose = this.handleClose.bind(this)
+ this.handleSubmit = this.handleSubmit.bind(this)
+ this.handleAvatar = this.handleAvatar.bind(this)
+
+ const avatar = props.fb.avatar || ''
+ this.authId = props.authId
+
+ this.state = {
+ open: false,
+ avatar: avatar
+ }
+ }
+
+ render () {
+ console.log('ManageFBEdit ', this.props, this.props.slug, this.props.fb)
+ const { classes, fb, slug } = this.props
+ return (
+
+ {(updateFB, { loading, error, data }) => {
+ let errors
+ let loader
+ if (loading) {
+ loader = (
+ Submitting team...
+ )
+ }
+ if (error) {
+ errors = error.graphQLErrors.map(({ message }, i) => {
+ const displayMessage = checkGraphQLError(message)
+ console.log('updateTeamProfile error:', displayMessage)
+ return (
+
+ {message}
+
+ )
+ })
+ }
+ return (
+
+
+
+
+ )
+ }}
+
+ )
+ }
+
+ handleClickOpen () {
+ this.setState({ open: true })
+ }
+
+ handleClose () {
+ this.setState({ open: false })
+ }
+
+ handleAvatar (avatarUrl) {
+ console.log('handleAvatar: ', avatarUrl)
+ this.setState({ avatar: `${avatarUrl}?${Math.random()}` })
+ }
+
+ async handleSubmit (e, updateFB, fbId, slug) {
+ console.log('handleSubmit: ', this.state)
+ e.preventDefault()
+
+ await updateFB({
+ variables: {
+ fbId,
+ avatar: this.state.avatar
+ }
+ })
+ this.setState({ open: false })
+ }
+}
+
+ManageFBEdit.propTypes = {
+ classes: PropTypes.object.isRequired,
+ slug: PropTypes.string.isRequired,
+ fb: PropTypes.object,
+ authId: PropTypes.string.isRequired
+}
+
+export default withStyles(styles)(ManageFBEdit)
diff --git a/client/src/views/dashboard/components/ManageFBItem.js b/client/src/views/dashboard/components/ManageFBItem.js
new file mode 100644
index 000000000..466f43f95
--- /dev/null
+++ b/client/src/views/dashboard/components/ManageFBItem.js
@@ -0,0 +1,53 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+
+import Grid from '@material-ui/core/Grid'
+import Card from '@material-ui/core/Card'
+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 ManageFBEdit from './ManageFBEdit'
+
+export const ManageFBItem = ({ classes, team, authId }) => {
+ console.log('ManageFBItem', team, team.fb[0], team.profile.avatar)
+ let avatar
+ 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'
+ }
+ return (
+
+
+
+
+
+
+ {team.fb[0].name}
+
+
+ {team.fb[0].kind}
+
+
+
+
+
+
+
+
+ )
+}
+
+ManageFBItem.propTypes = {
+ classes: PropTypes.object.isRequired,
+ team: PropTypes.object.isRequired,
+ authId: PropTypes.string.isRequired
+}
+
+export default ManageFBItem
diff --git a/client/src/views/dashboard/components/ManageFBList.js b/client/src/views/dashboard/components/ManageFBList.js
new file mode 100644
index 000000000..a865be3b9
--- /dev/null
+++ b/client/src/views/dashboard/components/ManageFBList.js
@@ -0,0 +1,150 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { Query } from 'react-apollo'
+import { withStateHandlers, lifecycle, compose } from 'recompose'
+
+import Grid from '@material-ui/core/Grid'
+import { MessageCard } from '@advancedalgos/web-components'
+import { withStyles } from '@material-ui/core/styles'
+
+import { isDefined, isString } from '../../../utils/js-helpers'
+import { getItem } from '../../../utils/local-storage'
+
+import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery'
+
+import ManageFBItem from './ManageFBItem'
+import CreateTeamDialog from './CreateTeamDialog'
+
+const styles = theme => ({
+ heroContent: {
+ maxWidth: 600,
+ margin: '0 auto',
+ padding: `${theme.spacing.unit * 8}px 0 ${theme.spacing.unit * 6}px`
+ },
+ cardGrid: {
+ padding: `${theme.spacing.unit * 8}px 0`
+ },
+ buttonRight: {
+ justifyContent: 'flex-end'
+ },
+ card: {
+ display: 'flex',
+ width: '100%'
+ },
+ cardDetails: {
+ display: 'flex',
+ flex: 1
+ },
+ cardContent: {
+ flex: 1
+ },
+ cardMedia: {
+ flex: 1,
+ width: 100,
+ height: 100,
+ maxWidth: 100,
+ justifyContent: 'flex-start'
+ }
+})
+
+export const ManageFBList = ({ classes, user = null }) => {
+ let owner
+ let authId = null
+ console.log('ManageTeamsList: ', user)
+ if (user !== null && isString(user)) {
+ owner = JSON.parse(user)
+ if (isDefined(owner.authId)) authId = owner.authId
+ }
+ console.log('ManageTeamsList 2: ', owner, authId)
+ if (authId === undefined || authId === null) {
+ return (
+
+
+
+
+
+ )
+ } else {
+ return (
+
+ {({ loading, error, data }) => {
+ console.log('GET_TEAMS_BY_OWNER: ', loading, error, data)
+
+ let errors = null
+ if (error) {
+ errors = error.graphQLErrors.map(({ message }, i) => {
+ return
+ })
+ }
+ if (!loading && !error) {
+ if (data.teamsByOwner.length > 0) {
+ return (
+
+
+ {!loading &&
+ data.teamsByOwner.map(team => (
+
+ ))}
+ {errors}
+
+
+ )
+ } else {
+ return (
+
+
+
+
+
+
+
+ )
+ }
+ } else {
+ return (
+
+
+
+ {errors !== null && }
+
+
+ )
+ }
+ }}
+
+ )
+ }
+}
+
+ManageFBList.propTypes = {
+ user: PropTypes.any,
+ classes: PropTypes.object.isRequired
+}
+
+const getUserOnMount = lifecycle({
+ componentDidMount () {
+ getItem('user').then(user => {
+ this.setState({ user })
+ }) // Set user to state
+ }
+})
+
+const mapStateToProps = withStateHandlers(() => ({ user: null }), {
+ user: ({ user }) => () => ({ user })
+})
+
+const ManageFBListAuthId = compose(
+ mapStateToProps,
+ getUserOnMount
+)(ManageFBList)
+
+export default withStyles(styles)(ManageFBListAuthId)
diff --git a/client/src/views/dashboard/components/ManageTeamEdit.js b/client/src/views/dashboard/components/ManageTeamEdit.js
index b07195112..d37a27804 100644
--- a/client/src/views/dashboard/components/ManageTeamEdit.js
+++ b/client/src/views/dashboard/components/ManageTeamEdit.js
@@ -127,11 +127,11 @@ export class ManageTeamEdit extends Component {
let avatar = null
if (this.state.avatar !== null) avatar = this.state.avatar
if (team.profile !== null && team.profile.avatar !== undefined && team.profile.avatar !== null) avatar = team.profile.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://algobotcommstorage.blob.core.windows.net/aateammodule/aa-avatar-default.png'
let banner = null
if (this.state.banner !== null) banner = this.state.banner
if (team.profile !== null && team.profile.banner !== undefined && team.profile.banner !== null) banner = team.profile.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://algobotcommstorage.blob.core.windows.net/aateammodule/aa-banner-default.png'
console.log('team images: ', avatar, banner)
if (loading || data === undefined) {