diff --git a/client/src/components/DescendentsTree.js b/client/src/components/DescendentsTree.js
new file mode 100644
index 000000000..3a8ebf1c4
--- /dev/null
+++ b/client/src/components/DescendentsTree.js
@@ -0,0 +1,150 @@
+import React, { Component } from 'react'
+import {graphql, compose} from 'react-apollo'
+import {getDescendentsQuery} from '../queries/queries'
+
+// Materia UI
+
+import { withStyles } from '@material-ui/core/styles'
+import Card from '@material-ui/core/Card'
+import CardActionArea from '@material-ui/core/CardActionArea'
+import CardActions from '@material-ui/core/CardActions'
+import CardContent from '@material-ui/core/CardContent'
+import CardMedia from '@material-ui/core/CardMedia'
+import Button from '@material-ui/core/Button'
+import Typography from '@material-ui/core/Typography'
+import Grid from '@material-ui/core/Grid'
+
+import TextField from '@material-ui/core/TextField'
+
+// components
+import UserProfile from './UserProfile'
+
+// Images
+import PortraitImage from '../img/portrait.jpg'
+
+const styles = theme => ({
+ card: {
+ maxWidth: 150,
+ minWidth: 150,
+ paddingTop: '30',
+ marginBottom: 40
+ },
+ media: {
+ height: 0,
+ paddingTop: '56.25%', // 16:9,
+ marginTop: '30',
+ minWidth: 300
+ },
+ typography: {
+ maxWidth: 345,
+ minWidth: 300,
+ paddingTop: '30'
+ },
+ appBar: {
+ position: 'relative'
+ },
+ flex: {
+ flex: 1
+ },
+ grid: {
+ paddingTop: '30',
+ marginTop: 30
+ },
+ inputField: {
+ width: '80%',
+ marginLeft: '10%',
+ marginTop: 25
+ },
+ formTypography: {
+ width: '80%',
+ marginLeft: '10%',
+ marginTop: 40
+ },
+ button: {
+ margin: theme.spacing.unit,
+ marginTop: theme.spacing.unit * 3
+ }
+})
+
+class YourDescendents extends Component {
+
+ constructor (props) {
+ super(props)
+
+ this.state = {
+ alias: '',
+ firstName: '',
+ middleName: '',
+ lastName: ''
+ }
+ }
+
+ displayUsers () {
+ let data = this.props.getUsersBySearchFields
+ const { classes } = this.props
+
+ if (data.loading) {
+ return (
Loading Users...
)
+ } else {
+ if (data.usersSearch === undefined) {
+ return ( No Users to Display
)
+ } else {
+ return data.usersSearch.map(user => {
+ return (
+
+
+ {
+ this.setState({ selected: user.id})
+ }
+ }>
+
+
+
+
+ {user.alias}
+
+
+
+
+
+
+ {this.selectButton(user)}
+
+
+
+
+
+
+ )
+ })
+ }
+ }
+ }
+
+ render () {
+ const { classes } = this.props
+ return (
+
+
+
+ These are your decendents within the project. Your children referred you as the one who brought them to the project, while
+ your grandchildren referred your children and so on.
+
+
+
+ {this.displayUsers()}
+
+
+ )
+ }
+}
+
+export default compose(
+ graphql(getUsersBySearchFields, {name: 'getUsersBySearchFields'}),
+ withStyles(styles)
+)(YourDescendents) // This technique binds more than one query to a single component.
diff --git a/client/src/components/YourDescendents.js b/client/src/components/YourDescendents.js
index 1fea7dd49..db59b2870 100644
--- a/client/src/components/YourDescendents.js
+++ b/client/src/components/YourDescendents.js
@@ -1,68 +1,33 @@
import React, { Component } from 'react'
import {graphql, compose} from 'react-apollo'
-import {getUsersBySearchFields} from '../queries/queries'
// Materia UI
import { withStyles } from '@material-ui/core/styles'
-import Card from '@material-ui/core/Card'
-import CardActionArea from '@material-ui/core/CardActionArea'
-import CardActions from '@material-ui/core/CardActions'
-import CardContent from '@material-ui/core/CardContent'
-import CardMedia from '@material-ui/core/CardMedia'
-import Button from '@material-ui/core/Button'
import Typography from '@material-ui/core/Typography'
import Grid from '@material-ui/core/Grid'
-
-import TextField from '@material-ui/core/TextField'
+import Paper from '@material-ui/core/Paper'
// components
import UserProfile from './UserProfile'
-// Images
-import PortraitImage from '../img/portrait.jpg'
-
const styles = theme => ({
- card: {
- maxWidth: 150,
- minWidth: 150,
- paddingTop: '30',
- marginBottom: 40
- },
- media: {
- height: 0,
- paddingTop: '56.25%', // 16:9,
- marginTop: '30',
- minWidth: 300
+ root: {
+ width: '50%',
+ flexGrow: 1,
+ padding: 10,
+ marginLeft: '25%',
+ marginTop: '2%'
},
typography: {
- maxWidth: 345,
- minWidth: 300,
- paddingTop: '30'
- },
- appBar: {
- position: 'relative'
- },
- flex: {
- flex: 1
+ width: '80%',
+ marginLeft: '10%',
+ marginTop: 40,
+ marginBottom: 40
},
grid: {
paddingTop: '30',
marginTop: 30
- },
- inputField: {
- width: '80%',
- marginLeft: '10%',
- marginTop: 25
- },
- formTypography: {
- width: '80%',
- marginLeft: '10%',
- marginTop: 40
- },
- button: {
- margin: theme.spacing.unit,
- marginTop: theme.spacing.unit * 3
}
})
@@ -72,98 +37,29 @@ class YourDescendents extends Component {
super(props)
this.state = {
- alias: '',
- firstName: '',
- middleName: '',
- lastName: ''
- }
- }
-
- submitForm (e) {
- e.preventDefault()
-
- this.props.getUsersBySearchFields.variables.alias = this.state.alias
- this.props.getUsersBySearchFields.variables.firstName = this.state.firstName
- this.props.getUsersBySearchFields.variables.middleName = this.state.middleName
- this.props.getUsersBySearchFields.variables.lastName = this.state.lastName
-
- this.props.getUsersBySearchFields.refetch({})
- }
-
- displayUsers () {
- let data = this.props.getUsersBySearchFields
- const { classes } = this.props
-
- if (data.loading) {
- return ( Loading Users...
)
- } else {
- if (data.usersSearch === undefined) {
- return ( No Users to Display
)
- } else {
- return data.usersSearch.map(user => {
- return (
-
-
- {
- this.setState({ selected: user.id})
- }
- }>
-
-
-
-
- {user.alias}
-
-
-
-
-
-
- {this.selectButton(user)}
-
-
-
-
-
-
- )
- })
- }
+ id: ''
}
}
render () {
const { classes } = this.props
return (
-
-
-
-
- {this.displayUsers()}
-
-
+
+
)
}
}
export default compose(
- graphql(getUsersBySearchFields, {name: 'getUsersBySearchFields'}),
withStyles(styles)
)(YourDescendents) // This technique binds more than one query to a single component.
diff --git a/client/src/components/YourReferrer.js b/client/src/components/YourReferrer.js
index ab30cd0bf..946f2e4e7 100644
--- a/client/src/components/YourReferrer.js
+++ b/client/src/components/YourReferrer.js
@@ -132,7 +132,7 @@ class YourReferrer extends Component {
Your Referrer
-
+
{this.renderMode()}
diff --git a/client/src/queries/queries.js b/client/src/queries/queries.js
index fe02e1ce4..a9015b5db 100644
--- a/client/src/queries/queries.js
+++ b/client/src/queries/queries.js
@@ -72,6 +72,36 @@ query(
}
}
`
+const getDescendentsQuery = gql`
+query(
+ $id: String
+){
+ descendents (id: $id){
+ id
+ alias
+ firstName
+ middleName
+ lastName
+ referrerId
+ descendents {
+ id
+ alias
+ firstName
+ middleName
+ lastName
+ referrerId
+ descendents {
+ id
+ alias
+ firstName
+ middleName
+ lastName
+ referrerId
+ }
+ }
+ }
+}
+`
const getRolesQuery = gql`
{
roles {