More merge conflicts

client/src/App.js

@@ -155,11 +155,7 @@ class App extends Component {
                 <Route exact path='/teams/:slug' component={Teams} />
                 <Route
                   exact
-<<<<<<< HEAD
-                  path='/(dashboard|manage-teams|team-members|settings)/'
-=======
                   path='/(dashboard|manage-teams|team-members|financial-beings|settings)/'
->>>>>>> feature/client-refactor-react
                   render={props => <Dashboard {...props} auth={auth} />}
                 />
                 <Route

client/src/graphql/teams/UpdateTeamProfileMutation.js

@@ -2,10 +2,6 @@
 import gql from 'graphql-tag'
 
 const UPDATE_TEAM_PROFILE = gql`
-<<<<<<< HEAD
-  mutation UpdateTeamProfileMutation($slug: String!, $owner: String!, $description: String, $motto: String) {
-    updateTeamProfile(slug: $slug, owner: $owner, description: $description, motto: $motto) {
-=======
   mutation UpdateTeamProfileMutation(
     $slug: String!
     $owner: String!
@@ -18,7 +14,6 @@ const UPDATE_TEAM_PROFILE = gql`
       description: $description
       motto: $motto
     ) {
->>>>>>> feature/client-refactor-react
       id
       name
       slug

client/src/views/about/index.js

@@ -34,20 +34,12 @@ const About = ({ classes }) => (
     <main className={classes.layout}>
       <div className={classes.heroContent}>
         <Typography
-<<<<<<< HEAD
-          variant='display3'
-=======
           variant='display1'
->>>>>>> feature/client-refactor-react
           align='center'
           color='textPrimary'
           gutterBottom
         >
-<<<<<<< HEAD
-          Collaborate. Innovate. Evolve.
-=======
           Welcome to Advanced Algos Teams!
->>>>>>> feature/client-refactor-react
         </Typography>
         <Typography
           variant='title'
@@ -55,37 +47,37 @@ const About = ({ classes }) => (
           color='textSecondary'
           component='h3'
         >
-<<<<<<< HEAD
-          Welcome to the Advanced Algos Teams Module
-=======
-          This module is responsible for managing teams and their members across the Advanced Algos system. You can browser teams and their details, and with an account, create and manage your own teams.
+          This module is responsible for managing teams and their members across
+          the Advanced Algos system. You can browser teams and their details,
+          and with an account, create and manage your own teams.
         </Typography>
-        <Typography
-          align='center'
-          color='textSecondary'
-          component='p'
-        >
-          <strong>Development Status</strong><br />This module is is currently under heavy development. Implementation started 1st of September 2018 and this is the result of the 1st sprint of 2 weeks of work.
+        <Typography align='center' color='textSecondary' component='p'>
+          <strong>Development Status</strong>
+          <br />
+          This module is is currently under heavy development. Implementation
+          started 1st of September 2018 and this is the result of the 1st sprint
+          of 2 weeks of work.
         </Typography>
-        <Typography
-          align='center'
-          color='textSecondary'
-          component='p'
-        >
-          <strong>What can you do?</strong><br />Basic team creation and management.
+        <Typography align='center' color='textSecondary' component='p'>
+          <strong>What can you do?</strong>
+          <br />
+          Basic team creation and management.
         </Typography>
-        <Typography
-          align='center'
-          color='textSecondary'
-          component='p'
-        >
-          <strong>What is next?</strong><br />
+        <Typography align='center' color='textSecondary' component='p'>
+          <strong>What is next?</strong>
+          <br />
           <ol>
             <li> Managing team profile images.</li>
-            <li> Managing team members - inviting members and administrating roles</li>
-            <li> More detailed team profiles + allowing members to apply to recruiting teams</li>
+            <li>
+              {' '}
+              Managing team members - inviting members and administrating roles
+            </li>
+            <li>
+              {' '}
+              More detailed team profiles + allowing members to apply to
+              recruiting teams
+            </li>
           </ol>
->>>>>>> feature/client-refactor-react
         </Typography>
       </div>
     </main>

client/src/views/common/MessageCard.js

@@ -27,13 +27,9 @@ export const MessageCard = ({ classes, message, children }) => (
   <Card className={classes.card}>
     <div className={classes.cardDetails}>
       <CardContent className={classes.cardContent}>
-<<<<<<< HEAD
-        <Typography variant='headline' align='center' gutterBottom>{message}</Typography>
-=======
         <Typography variant='headline' align='center' gutterBottom>
           {message}
         </Typography>
->>>>>>> feature/client-refactor-react
         {children}
       </CardContent>
     </div>

client/src/views/dashboard/TeamMembers.js

@@ -15,11 +15,7 @@ const styles = theme => ({
 const TeamMembers = ({ classes }) => (
   <div>
     <Typography variant='display1' gutterBottom>
-<<<<<<< HEAD
-      Members
-=======
       Team Members
->>>>>>> feature/client-refactor-react
     </Typography>
     <div className={classes.tableContainer}>
       <MessageCard message='Coming soon. Invite and manage team members' />

client/src/views/dashboard/components/CreateTeamDialog.js

@@ -11,16 +11,8 @@ 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'
-<<<<<<< HEAD
-import DialogContentText from '@material-ui/core/DialogContentText'
 import DialogTitle from '@material-ui/core/DialogTitle'
 import Typography from '@material-ui/core/Typography'
-
-import { getItem } from '../../../utils/local-storage'
-=======
-import DialogTitle from '@material-ui/core/DialogTitle'
-import Typography from '@material-ui/core/Typography'
->>>>>>> feature/client-refactor-react
 import { isEmpty } from '../../../utils/js-helpers'
 
 import CREATE_TEAM from '../../../graphql/teams/CreateTeamMutation'
@@ -79,13 +71,9 @@ export class CreateTeamDialog extends Component {
           let errors
           let loader = null
           if (loading) {
-<<<<<<< HEAD
-            loader = <Typography variant='subheading'>Submitting team...</Typography>
-=======
             loader = (
               <Typography variant='subheading'>Submitting team...</Typography>
             )
->>>>>>> feature/client-refactor-react
           }
           if (error) {
             errors = error.graphQLErrors.map(({ message }, i) => {
@@ -99,9 +87,6 @@ export class CreateTeamDialog extends Component {
           }
           return (
             <div>
-<<<<<<< HEAD
-              <Button variant='fab' color='primary' aria-label='Add' className={classes.buttonRight} onClick={this.handleClickOpen}>
-=======
               <Button
                 variant='fab'
                 color='primary'
@@ -109,7 +94,6 @@ export class CreateTeamDialog extends Component {
                 className={classes.buttonRight}
                 onClick={this.handleClickOpen}
               >
->>>>>>> feature/client-refactor-react
                 <AddIcon />
               </Button>
               <Dialog
@@ -119,15 +103,10 @@ export class CreateTeamDialog extends Component {
               >
                 <DialogTitle id='form-dialog-title'>Create a Team</DialogTitle>
                 <DialogContent>
-<<<<<<< HEAD
-                  <DialogContentText>Team Name:</DialogContentText>
-                  <FormControl required error={e => (this.state.errors.name !== '' || error)}>
-=======
                   <FormControl
                     required
                     error={this.state.errors.name !== '' || error}
                   >
->>>>>>> feature/client-refactor-react
                     <TextField
                       autoFocus
                       margin='dense'
@@ -139,15 +118,10 @@ export class CreateTeamDialog extends Component {
                       onChange={this.handleChange}
                       error={this.state.errors.name !== '' || error}
                     />
-<<<<<<< HEAD
-                    {this.state.errors.name !== '' && (<FormHelperText>{this.state.errors.name}</FormHelperText>)}
-                    {error && (<FormHelperText>{errors}</FormHelperText>)}
-=======
                     {this.state.errors.name !== '' && (
                       <FormHelperText>{this.state.errors.name}</FormHelperText>
                     )}
                     {error && <FormHelperText>{errors}</FormHelperText>}
->>>>>>> feature/client-refactor-react
                     {loader}
                   </FormControl>
                 </DialogContent>
@@ -155,18 +129,12 @@ export class CreateTeamDialog extends Component {
                   <Button onClick={this.handleClose} color='primary'>
                     Cancel
                   </Button>
-<<<<<<< HEAD
-                  <Button onClick={e => {
-                    this.handleSubmit(e, createTeam, this.state.name)
-                  }} color='primary'>
-=======
                   <Button
                     onClick={e => {
                       this.handleSubmit(e, createTeam, this.state.name, authId)
                     }}
                     color='primary'
                   >
->>>>>>> feature/client-refactor-react
                     Create Team
                   </Button>
                 </DialogActions>
@@ -197,24 +165,12 @@ export class CreateTeamDialog extends Component {
     }
   }
 
-<<<<<<< HEAD
-  async handleSubmit (e, createTeam, name) {
-    e.preventDefault()
-    const currentUser = await getItem('user')
-    let authId = JSON.parse(currentUser)
-    authId = authId.authId
-    console.log('createTeam submit: ', authId, name)
-    const slug = this.slugify(name)
-    await createTeam({ variables: { name, slug, owner: authId } })
-    this.setState({ name: '' })
-=======
   async handleSubmit (e, createTeam, name, authId) {
     e.preventDefault()
     console.log('createTeam submit: ', authId, name)
     const slug = this.slugify(name)
     await createTeam({ variables: { name, slug, owner: authId } })
     this.setState({ name: '', open: false })
->>>>>>> feature/client-refactor-react
   }
 
   validate (data) {

client/src/views/dashboard/components/DashTeam.js

@@ -42,14 +42,10 @@ export const DashTeam = ({ classes, user = null }) => {
   return (
     <Grid item md={6} style={{ position: 'relative' }}>
       <Typography variant='display1' gutterBottom>
-<<<<<<< HEAD
-        Teams <Link to='/manage-teams' className={classes.dashLink}>Manage Teams</Link>
-=======
         Teams{' '}
         <Link to='/manage-teams' className={classes.dashLink}>
           Manage Teams
         </Link>
->>>>>>> feature/client-refactor-react
       </Typography>
       <Query query={GET_TEAMS_BY_OWNER} variables={{ authId }}>
         {({ loading, error, data }) => {

client/src/views/dashboard/components/DashTeamItem.js

@@ -9,12 +9,8 @@ import Card from '@material-ui/core/Card'
 import CardContent from '@material-ui/core/CardContent'
 import CardMedia from '@material-ui/core/CardMedia'
 import CardActions from '@material-ui/core/CardActions'
-<<<<<<< HEAD
-import Button from '@material-ui/core/Button'
-=======
 
 import ManageTeamDetails from './ManageTeamDetails'
->>>>>>> feature/client-refactor-react
 
 const styles = theme => ({
   card: {
@@ -54,21 +50,11 @@ export const DashTeamItem = ({ classes, team }) => (
             {team.createdAt}
           </Typography>
           <Typography variant='subheading' paragraph>
-<<<<<<< HEAD
-            Members:6
-          </Typography>
-        </CardContent>
-        <CardActions>
-          <Button size='small' color='primary' className={classes.buttonRight}>
-            Details
-          </Button>
-=======
             Members: {team.members.length}
           </Typography>
         </CardContent>
         <CardActions>
           <ManageTeamDetails team={team} />
->>>>>>> feature/client-refactor-react
         </CardActions>
       </div>
     </Card>

client/src/views/dashboard/components/DrawerLinks.js

@@ -16,10 +16,6 @@ const DashboardLink = props => <Link to='/dashboard' {...props} />
 const TeamsLink = props => <Link to='/manage-teams' {...props} />
 const MembersLink = props => <Link to='/team-members' {...props} />
 const SettingsLink = props => <Link to='/settings' {...props} />
-<<<<<<< HEAD
-const DocumentationLink = props => <a href='https://advancedalgos.net/documentation-quick-start.shtml' target='_blank' {...props} />
-const SupportLink = props => <a href='https://t.me/advancedalgoscommunity' target='_blank' {...props} />
-=======
 const FBLink = props => <Link to='/financial-beings' {...props} />
 const DocumentationLink = props => (
   <a
@@ -31,7 +27,6 @@ const DocumentationLink = props => (
 const SupportLink = props => (
   <a href='https://t.me/advancedalgoscommunity' target='_blank' {...props} />
 )
->>>>>>> feature/client-refactor-react
 
 export const MainDrawerItems = (
   <div>

client/src/views/dashboard/components/ManageTeamDelete.js

@@ -37,13 +37,7 @@ export class ManageTeamDelete extends Component {
     this.handleSubmit = this.handleSubmit.bind(this)
 
     this.state = {
-<<<<<<< HEAD
-      open: false,
-      motto: '',
-      description: ''
-=======
       open: false
->>>>>>> feature/client-refactor-react
     }
   }
 
@@ -71,27 +65,14 @@ export class ManageTeamDelete extends Component {
             variables: { authId }
           }
         ]}
-<<<<<<< HEAD
-        update={(cache, { data: { deleteTeam } }) => {
-          const data = cache.readQuery({ query: GET_TEAMS_BY_OWNER })
-          console.log('Mutation cache update: ', deleteTeam, data)
-          data.getTeamsByOwner.push(deleteTeam)
-          cache.writeQuery({ query: GET_TEAMS_BY_OWNER, data })
-        }}
-=======
->>>>>>> feature/client-refactor-react
       >
         {(deleteTeam, { loading, error, data }) => {
           let errors
           let loader
           if (loading) {
-<<<<<<< HEAD
-            loader = <Typography variant='caption'>Submitting team...</Typography>
-=======
             loader = (
               <Typography variant='caption'>Submitting team...</Typography>
             )
->>>>>>> feature/client-refactor-react
           }
           if (error) {
             errors = error.graphQLErrors.map(({ message }, i) => {
@@ -106,16 +87,12 @@ export class ManageTeamDelete extends Component {
           }
           return (
             <div>
-<<<<<<< HEAD
-              <Button size='small' color='primary' className={classes.buttonRight} onClick={this.handleClickOpen}>
-=======
               <Button
                 size='small'
                 color='primary'
                 className={classes.buttonRight}
                 onClick={this.handleClickOpen}
               >
->>>>>>> feature/client-refactor-react
                 <DeleteIcon /> Delete
               </Button>
               <Dialog
@@ -124,12 +101,6 @@ export class ManageTeamDelete extends Component {
                 aria-labelledby='form-dialog-title'
               >
                 <div classes={classes.dialogContainer}>
-<<<<<<< HEAD
-                  <DialogTitle id='form-dialog-title'>Delete Team Team</DialogTitle>
-                  <DialogContent>
-                    <Typography variant='subheading' color='primary'>DANGER - Deleting your team cannot be undone</Typography>
-                    <Typography variant='subheading'>Are you sure you want to delete this team?</Typography>
-=======
                   <DialogTitle id='form-dialog-title'>
                     Delete Team Team
                   </DialogTitle>
@@ -140,7 +111,6 @@ export class ManageTeamDelete extends Component {
                     <Typography variant='subheading'>
                       Are you sure you want to delete this team?
                     </Typography>
->>>>>>> feature/client-refactor-react
                     {loader}
                     {errors}
                   </DialogContent>
@@ -148,11 +118,6 @@ export class ManageTeamDelete extends Component {
                     <Button onClick={this.handleClose} color='primary'>
                       Cancel
                     </Button>
-<<<<<<< HEAD
-                    <Button onClick={e => {
-                      this.handleSubmit(e, deleteTeam, this.props.slug, authId)
-                    }} color='primary'>
-=======
                     <Button
                       onClick={e => {
                         this.handleSubmit(
@@ -164,7 +129,6 @@ export class ManageTeamDelete extends Component {
                       }}
                       color='primary'
                     >
->>>>>>> feature/client-refactor-react
                       Delete Team
                     </Button>
                   </DialogActions>
@@ -180,10 +144,7 @@ export class ManageTeamDelete extends Component {
   async handleSubmit (e, deleteTeam, slug, authId) {
     e.preventDefault()
     await deleteTeam({ variables: { slug, owner: authId } })
-<<<<<<< HEAD
-=======
     this.setState({ open: false })
->>>>>>> feature/client-refactor-react
   }
 }
 

client/src/views/dashboard/components/ManageTeamDetails.js

@@ -38,16 +38,12 @@ export class ManageTeamDetails extends Component {
     const { name, members, profile, createdAt } = this.props.team
     return (
       <div>
-<<<<<<< HEAD
-        <Button size='small' color='primary' className={this.props.classes.buttonRight} onClick={this.handleClickOpen}>
-=======
         <Button
           size='small'
           color='primary'
           className={this.props.classes.buttonRight}
           onClick={this.handleClickOpen}
         >
->>>>>>> feature/client-refactor-react
           <DetailsIcon /> Details
         </Button>
         <Dialog
@@ -56,13 +52,9 @@ export class ManageTeamDetails extends Component {
           aria-labelledby='form-dialog-title'
         >
           <div classes={this.props.classes.dialogContainer}>
-<<<<<<< HEAD
-            <DialogTitle id='form-dialog-title'>{name} Team Details</DialogTitle>
-=======
             <DialogTitle id='form-dialog-title'>
               {name} Team Details
             </DialogTitle>
->>>>>>> feature/client-refactor-react
             <DialogContent>
               <Typography
                 variant='display3'
@@ -85,25 +77,18 @@ export class ManageTeamDetails extends Component {
                 Members: {members.length}
               </Typography>
               <Typography variant='subheading' color='primary'>
-<<<<<<< HEAD
-                Team Admin:
-                {
-                  members.map(member => {
-                    if (member.role === 'OWNER' || member.role === 'ADMIN') {
-                      return member.member.alias
-                    }
-                  })
-                }
-=======
                 Team Admin:&nbsp;
                 {members.map(member => {
                   if (member.role === 'OWNER' || member.role === 'ADMIN') {
-                    if (member.member !== null && member.member.alias !== undefined && member.member.alias !== null) {
+                    if (
+                      member.member !== null &&
+                      member.member.alias !== undefined &&
+                      member.member.alias !== null
+                    ) {
                       return member.member.alias
                     }
                   }
                 })}
->>>>>>> feature/client-refactor-react
               </Typography>
             </DialogContent>
             <DialogActions>

client/src/views/dashboard/components/ManageTeamEdit.js

@@ -66,13 +66,9 @@ export class ManageTeamEdit extends Component {
           let errors
           let loader
           if (loading) {
-<<<<<<< HEAD
-            loader = <Typography variant='caption'>Submitting team...</Typography>
-=======
             loader = (
               <Typography variant='caption'>Submitting team...</Typography>
             )
->>>>>>> feature/client-refactor-react
           }
           if (error) {
             errors = error.graphQLErrors.map(({ message }, i) => {
@@ -87,16 +83,12 @@ export class ManageTeamEdit extends Component {
           }
           return (
             <div>
-<<<<<<< HEAD
-              <Button size='small' color='primary' className={classes.buttonRight} onClick={this.handleClickOpen}>
-=======
               <Button
                 size='small'
                 color='primary'
                 className={classes.buttonRight}
                 onClick={this.handleClickOpen}
               >
->>>>>>> feature/client-refactor-react
                 <EditIcon /> Edit
               </Button>
               <Dialog
@@ -105,13 +97,9 @@ export class ManageTeamEdit extends Component {
                 aria-labelledby='form-dialog-title'
               >
                 <div classes={classes.dialogContainer}>
-<<<<<<< HEAD
-                  <DialogTitle id='form-dialog-title'>Edit Team Details</DialogTitle>
-=======
                   <DialogTitle id='form-dialog-title'>
                     Edit Team Details
                   </DialogTitle>
->>>>>>> feature/client-refactor-react
                   <DialogContent>
                     <TextField
                       autoFocus
@@ -152,18 +140,12 @@ export class ManageTeamEdit extends Component {
                     <Button onClick={this.handleClose} color='primary'>
                       Cancel
                     </Button>
-<<<<<<< HEAD
-                    <Button onClick={e => {
-                      this.handleSubmit(e, updateTeamProfile, this.props.slug)
-                    }} color='primary'>
-=======
                     <Button
                       onClick={e => {
                         this.handleSubmit(e, updateTeamProfile, this.props.slug)
                       }}
                       color='primary'
                     >
->>>>>>> feature/client-refactor-react
                       Update Team
                     </Button>
                   </DialogActions>
@@ -201,9 +183,6 @@ export class ManageTeamEdit extends Component {
     const currentUser = await getItem('user')
     let authId = JSON.parse(currentUser)
     authId = authId.authId
-<<<<<<< HEAD
-    await updateTeamProfile({ variables: { slug, owner: authId, description: this.state.description, motto: this.state.motto } })
-=======
     await updateTeamProfile({
       variables: {
         slug,
@@ -213,7 +192,6 @@ export class ManageTeamEdit extends Component {
       }
     })
     this.setState({ description: '', motto: '', open: false })
->>>>>>> feature/client-refactor-react
   }
 }
 

client/src/views/dashboard/components/ManageTeamsList.js

@@ -66,28 +66,18 @@ export const ManageTeamsList = ({ classes, user = null }) => {
     )
   } else {
     return (
-<<<<<<< HEAD
-      <Query query={GET_TEAMS_BY_OWNER} fetchPolicy='network-only' variables={{ authId }}>
-=======
       <Query
         query={GET_TEAMS_BY_OWNER}
         fetchPolicy='network-only'
         variables={{ authId }}
       >
->>>>>>> feature/client-refactor-react
         {({ loading, error, data }) => {
           console.log('GET_TEAMS_BY_OWNER: ', loading, error, data)
 
           let errors = null
           if (error) {
             errors = error.graphQLErrors.map(({ message }, i) => {
-<<<<<<< HEAD
-              return (
-                <MessageCard message={message} />
-              )
-=======
               return <MessageCard message={message} />
->>>>>>> feature/client-refactor-react
             })
           }
           if (!loading && !error) {
@@ -127,11 +117,7 @@ export const ManageTeamsList = ({ classes, user = null }) => {
               <Grid container spacing={40}>
                 <Grid item xs={12}>
                   <MessageCard message='Loading...' />
-<<<<<<< HEAD
-                  if (errors !== null) (<MessageCard message={errors} />)
-=======
                   {errors !== null && <MessageCard message={errors} />}
->>>>>>> feature/client-refactor-react
                 </Grid>
               </Grid>
             )

client/src/views/dashboard/index.js

@@ -12,10 +12,7 @@ import { MainDrawerItems, SecondaryDrawerItems } from './components/DrawerLinks'
 
 import Overview from './Overview'
 import ManageTeams from './ManageTeams'
-<<<<<<< HEAD
-=======
 import FinancialBeings from './FinancialBeings'
->>>>>>> feature/client-refactor-react
 import TeamMembers from './TeamMembers'
 import Settings from './Settings'
 
@@ -69,10 +66,7 @@ const Dashboard = ({ classes }) => (
         <Route exact path='/dashboard' component={Overview} />
         <Route exact path='/manage-teams' component={ManageTeams} />
         <Route exact path='/team-members' component={TeamMembers} />
-<<<<<<< HEAD
-=======
         <Route exact path='/financial-beings' component={FinancialBeings} />
->>>>>>> feature/client-refactor-react
         <Route exact path='/settings' component={Settings} />
       </Switch>
     </main>

client/src/views/footer/index.js

@@ -67,28 +67,20 @@ const Footer = ({ classes }) => {
           </NavLink>
         </Grid>
         <Grid item xs>
-<<<<<<< HEAD
-          <a href='https://t.me/advancedalgoscommunity' target='_blank>' className={classNames(classes.footerLink)}>
-=======
           <a
             href='https://t.me/advancedalgoscommunity'
             target='_blank>'
             className={classNames(classes.footerLink)}
           >
->>>>>>> feature/client-refactor-react
             <Typography variant='title' color='textPrimary' gutterBottom>
               Support
             </Typography>
           </a>
-<<<<<<< HEAD
-          <a href='https://advancedalgos.net/documentation-quick-start.shtml' target='_blank>' className={classNames(classes.footerLink)}>
-=======
           <a
             href='https://advancedalgos.net/documentation-quick-start.shtml'
             target='_blank>'
             className={classNames(classes.footerLink)}
           >
->>>>>>> feature/client-refactor-react
             <Typography variant='subheading' color='textSecondary'>
               Documentation
             </Typography>

client/src/views/index.js

@@ -8,9 +8,6 @@ import Teams from './teams'
 
 import { theme, globalStyles } from './theme'
 
-<<<<<<< HEAD
-export { NavBar, Footer, Callback, Home, About, Dashboard, Teams, theme, globalStyles }
-=======
 export {
   NavBar,
   Footer,
@@ -22,4 +19,3 @@ export {
   theme,
   globalStyles
 }
->>>>>>> feature/client-refactor-react

client/src/views/navbar/index.js

@@ -82,14 +82,10 @@ class NavBar extends Component {
 
     return (
       <div className={classes.root}>
-<<<<<<< HEAD
-        <AppBar position='static' classes={{ root: classes.appBar, colorDefault: classes.colorDefault }}>
-=======
         <AppBar
           position='static'
           classes={{ root: classes.appBar, colorDefault: classes.colorDefault }}
         >
->>>>>>> feature/client-refactor-react
           <Toolbar>
             <img className={classes.img} src={AALogo} alt='Advanced Algos' />
             <Typography
@@ -108,17 +104,12 @@ class NavBar extends Component {
             >
               <HomeIcon />
             </IconButton>
-<<<<<<< HEAD
-            <Button component={TeamsLink} color='inherit'>Teams</Button>
-            <Button component={AboutLink} color='inherit'>About</Button>
-=======
             <Button component={TeamsLink} color='inherit'>
               Teams
             </Button>
             <Button component={AboutLink} color='inherit'>
               About
             </Button>
->>>>>>> feature/client-refactor-react
 
             {this.state.user !== undefined && this.state.user !== null ? (
               <React.Fragment>

client/src/views/teams/components/TeamsDetails.js

@@ -63,36 +63,22 @@ const TeamsDetails = ({ classes, team }) => (
           <Typography variant='subheading' color='textSecondary'>
             {team.createdAt}
           </Typography>
-<<<<<<< HEAD
-=======
           <Typography variant='subheading' color='textSecondary'>
             Motto: {team.profile.motto}
           </Typography>
           <Typography variant='subheading' color='textSecondary'>
             Description: {team.profile.description}
           </Typography>
->>>>>>> feature/client-refactor-react
           <Typography variant='subheading' paragraph gutterBottom>
             Members: {team.members.length}
           </Typography>
           <Typography variant='subheading' color='primary'>
-<<<<<<< HEAD
-            Team Admin:
-            {
-              team.members.map(member => {
-                if (member.role === 'OWNER' || member.role === 'ADMIN') {
-                  return member.member.alias
-                }
-              })
-            }
-=======
             Team Admin:&nbsp;
             {team.members.map(member => {
               if (member.role === 'OWNER' || member.role === 'ADMIN') {
                 return member.member.alias
               }
             })}
->>>>>>> feature/client-refactor-react
           </Typography>
         </div>
       </Paper>

client/src/views/teams/components/TeamsItem.js

@@ -37,11 +37,7 @@ export const TeamsItem = ({ classes, team }) => (
         </CardContent>
       </CardActionArea>
       <CardActions>
-<<<<<<< HEAD
-        <Link to={`/teams/${team.slug}`} >
-=======
         <Link to={`/teams/${team.slug}`}>
->>>>>>> feature/client-refactor-react
           <Button size='small' color='primary' className={classes.buttonRight}>
             Details
           </Button>

client/src/views/teams/components/TeamsList.js

@@ -39,11 +39,7 @@ const styles = theme => ({
 })
 
 export const TeamsList = ({ classes, match }) => (
-<<<<<<< HEAD
-  <Query query={GET_ALL_TEAMS_QUERY} fetchPolicy='cache-and-network' >
-=======
   <Query query={GET_ALL_TEAMS_QUERY} fetchPolicy='cache-and-network'>
->>>>>>> feature/client-refactor-react
     {({ loading, error, data }) => {
       console.log('GET_ALL_TEAMS: ', loading, error, data, match)
       let slug = null
@@ -69,14 +65,7 @@ export const TeamsList = ({ classes, match }) => (
                   data.teams.edges.map(team => {
                     if (team.node.slug === slug) {
                       return (
-<<<<<<< HEAD
-                        <TeamsDetails
-                          key={team.node.id}
-                          team={team.node}
-                        />
-=======
                         <TeamsDetails key={team.node.id} team={team.node} />
->>>>>>> feature/client-refactor-react
                       )
                     }
                   })}