From 8920be0e5a04b698133592dcbf0778a8da730ea7 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Mon, 17 Sep 2018 17:18:51 -0700 Subject: [PATCH] More merge conflicts --- client/src/App.js | 4 -- .../teams/UpdateTeamProfileMutation.js | 5 -- client/src/views/about/index.js | 58 ++++++++----------- client/src/views/common/MessageCard.js | 4 -- client/src/views/dashboard/TeamMembers.js | 4 -- .../dashboard/components/CreateTeamDialog.js | 44 -------------- .../views/dashboard/components/DashTeam.js | 4 -- .../dashboard/components/DashTeamItem.js | 14 ----- .../views/dashboard/components/DrawerLinks.js | 5 -- .../dashboard/components/ManageTeamDelete.js | 39 ------------- .../dashboard/components/ManageTeamDetails.js | 25 ++------ .../dashboard/components/ManageTeamEdit.js | 22 ------- .../dashboard/components/ManageTeamsList.js | 14 ----- client/src/views/dashboard/index.js | 6 -- client/src/views/footer/index.js | 8 --- client/src/views/index.js | 4 -- client/src/views/navbar/index.js | 9 --- .../views/teams/components/TeamsDetails.js | 14 ----- .../src/views/teams/components/TeamsItem.js | 4 -- .../src/views/teams/components/TeamsList.js | 11 ---- 20 files changed, 30 insertions(+), 268 deletions(-) diff --git a/client/src/App.js b/client/src/App.js index 524450afc..2fdbb7578 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -155,11 +155,7 @@ class App extends Component { >>>>>> feature/client-refactor-react render={props => } /> >>>>>> feature/client-refactor-react id name slug diff --git a/client/src/views/about/index.js b/client/src/views/about/index.js index 08fb90fb2..fd3069a0d 100644 --- a/client/src/views/about/index.js +++ b/client/src/views/about/index.js @@ -34,20 +34,12 @@ const About = ({ classes }) => (
>>>>>> feature/client-refactor-react align='center' color='textPrimary' gutterBottom > -<<<<<<< HEAD - Collaborate. Innovate. Evolve. -======= Welcome to Advanced Algos Teams! ->>>>>>> feature/client-refactor-react ( 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. - - Development Status
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. + + Development Status +
+ 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. - - What can you do?
Basic team creation and management. + + What can you do? +
+ Basic team creation and management. - - What is next?
+ + What is next? +
  1. Managing team profile images.
    2. -
  2. Managing team members - inviting members and administrating roles
    3. -
  3. More detailed team profiles + allowing members to apply to recruiting teams
    4. +
  4. + {' '} + Managing team members - inviting members and administrating roles +
    5. +
  5. + {' '} + More detailed team profiles + allowing members to apply to + recruiting teams +
->>>>>>> feature/client-refactor-react
diff --git a/client/src/views/common/MessageCard.js b/client/src/views/common/MessageCard.js index 1216aa4f7..fff952915 100644 --- a/client/src/views/common/MessageCard.js +++ b/client/src/views/common/MessageCard.js @@ -27,13 +27,9 @@ export const MessageCard = ({ classes, message, children }) => (
-<<<<<<< HEAD - {message} -======= {message} ->>>>>>> feature/client-refactor-react {children}
diff --git a/client/src/views/dashboard/TeamMembers.js b/client/src/views/dashboard/TeamMembers.js index 643ca44e2..8d86d4155 100644 --- a/client/src/views/dashboard/TeamMembers.js +++ b/client/src/views/dashboard/TeamMembers.js @@ -15,11 +15,7 @@ const styles = theme => ({ const TeamMembers = ({ classes }) => (
-<<<<<<< HEAD - Members -======= Team Members ->>>>>>> feature/client-refactor-react
diff --git a/client/src/views/dashboard/components/CreateTeamDialog.js b/client/src/views/dashboard/components/CreateTeamDialog.js index a1d0c2877..d215581a4 100644 --- a/client/src/views/dashboard/components/CreateTeamDialog.js +++ b/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 = Submitting team... -======= loader = ( Submitting team... ) ->>>>>>> feature/client-refactor-react } if (error) { errors = error.graphQLErrors.map(({ message }, i) => { @@ -99,9 +87,6 @@ export class CreateTeamDialog extends Component { } return (
-<<<<<<< HEAD - Create a Team -<<<<<<< HEAD - Team Name: - (this.state.errors.name !== '' || error)}> -======= ->>>>>>> feature/client-refactor-react -<<<<<<< HEAD - {this.state.errors.name !== '' && ({this.state.errors.name})} - {error && ({errors})} -======= {this.state.errors.name !== '' && ( {this.state.errors.name} )} {error && {errors}} ->>>>>>> feature/client-refactor-react {loader} @@ -155,18 +129,12 @@ export class CreateTeamDialog extends Component { -<<<<<<< HEAD - @@ -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) { diff --git a/client/src/views/dashboard/components/DashTeam.js b/client/src/views/dashboard/components/DashTeam.js index c9b86189e..1f6fc42c7 100644 --- a/client/src/views/dashboard/components/DashTeam.js +++ b/client/src/views/dashboard/components/DashTeam.js @@ -42,14 +42,10 @@ export const DashTeam = ({ classes, user = null }) => { return ( -<<<<<<< HEAD - Teams Manage Teams -======= Teams{' '} Manage Teams ->>>>>>> feature/client-refactor-react {({ loading, error, data }) => { diff --git a/client/src/views/dashboard/components/DashTeamItem.js b/client/src/views/dashboard/components/DashTeamItem.js index c39cff76c..e917b9006 100644 --- a/client/src/views/dashboard/components/DashTeamItem.js +++ b/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} -<<<<<<< HEAD - Members:6 - - - - -======= Members: {team.members.length} ->>>>>>> feature/client-refactor-react
diff --git a/client/src/views/dashboard/components/DrawerLinks.js b/client/src/views/dashboard/components/DrawerLinks.js index 1bbeb5733..91f83641a 100644 --- a/client/src/views/dashboard/components/DrawerLinks.js +++ b/client/src/views/dashboard/components/DrawerLinks.js @@ -16,10 +16,6 @@ const DashboardLink = props => const TeamsLink = props => const MembersLink = props => const SettingsLink = props => -<<<<<<< HEAD -const DocumentationLink = props => -const SupportLink = props => -======= const FBLink = props => const DocumentationLink = props => ( ( const SupportLink = props => ( ) ->>>>>>> feature/client-refactor-react export const MainDrawerItems = (
diff --git a/client/src/views/dashboard/components/ManageTeamDelete.js b/client/src/views/dashboard/components/ManageTeamDelete.js index 714ea123e..9f88ba9a3 100644 --- a/client/src/views/dashboard/components/ManageTeamDelete.js +++ b/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 = Submitting team... -======= loader = ( Submitting team... ) ->>>>>>> feature/client-refactor-react } if (error) { errors = error.graphQLErrors.map(({ message }, i) => { @@ -106,16 +87,12 @@ export class ManageTeamDelete extends Component { } return (
-<<<<<<< HEAD -
-<<<<<<< HEAD - Delete Team Team - - DANGER - Deleting your team cannot be undone - Are you sure you want to delete this team? -======= Delete Team Team @@ -140,7 +111,6 @@ export class ManageTeamDelete extends Component { Are you sure you want to delete this team? ->>>>>>> feature/client-refactor-react {loader} {errors} @@ -148,11 +118,6 @@ export class ManageTeamDelete extends Component { -<<<<<<< HEAD - @@ -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 } } diff --git a/client/src/views/dashboard/components/ManageTeamDetails.js b/client/src/views/dashboard/components/ManageTeamDetails.js index 8d4d7aa61..b4a736166 100644 --- a/client/src/views/dashboard/components/ManageTeamDetails.js +++ b/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 (
-<<<<<<< HEAD -
-<<<<<<< HEAD - {name} Team Details -======= {name} Team Details ->>>>>>> feature/client-refactor-react -<<<<<<< HEAD - Team Admin: - { - members.map(member => { - if (member.role === 'OWNER' || member.role === 'ADMIN') { - return member.member.alias - } - }) - } -======= Team Admin:  {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 diff --git a/client/src/views/dashboard/components/ManageTeamEdit.js b/client/src/views/dashboard/components/ManageTeamEdit.js index 5b5d8c98d..7d10e1a7a 100644 --- a/client/src/views/dashboard/components/ManageTeamEdit.js +++ b/client/src/views/dashboard/components/ManageTeamEdit.js @@ -66,13 +66,9 @@ export class ManageTeamEdit extends Component { let errors let loader if (loading) { -<<<<<<< HEAD - loader = Submitting team... -======= loader = ( Submitting team... ) ->>>>>>> feature/client-refactor-react } if (error) { errors = error.graphQLErrors.map(({ message }, i) => { @@ -87,16 +83,12 @@ export class ManageTeamEdit extends Component { } return (
-<<<<<<< HEAD -
-<<<<<<< HEAD - Edit Team Details -======= Edit Team Details ->>>>>>> feature/client-refactor-react Cancel -<<<<<<< HEAD - @@ -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 } } diff --git a/client/src/views/dashboard/components/ManageTeamsList.js b/client/src/views/dashboard/components/ManageTeamsList.js index 17e47b902..d72921486 100644 --- a/client/src/views/dashboard/components/ManageTeamsList.js +++ b/client/src/views/dashboard/components/ManageTeamsList.js @@ -66,28 +66,18 @@ export const ManageTeamsList = ({ classes, user = null }) => { ) } else { return ( -<<<<<<< HEAD - -======= ->>>>>>> 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 ( - - ) -======= return ->>>>>>> feature/client-refactor-react }) } if (!loading && !error) { @@ -127,11 +117,7 @@ export const ManageTeamsList = ({ classes, user = null }) => { -<<<<<<< HEAD - if (errors !== null) () -======= {errors !== null && } ->>>>>>> feature/client-refactor-react ) diff --git a/client/src/views/dashboard/index.js b/client/src/views/dashboard/index.js index 27a5462c4..b83675af4 100644 --- a/client/src/views/dashboard/index.js +++ b/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 }) => ( -<<<<<<< HEAD -======= ->>>>>>> feature/client-refactor-react diff --git a/client/src/views/footer/index.js b/client/src/views/footer/index.js index 0043ca32d..2fb5b72e9 100644 --- a/client/src/views/footer/index.js +++ b/client/src/views/footer/index.js @@ -67,28 +67,20 @@ const Footer = ({ classes }) => { -<<<<<<< HEAD - -======= ->>>>>>> feature/client-refactor-react Support -<<<<<<< HEAD - -======= ->>>>>>> feature/client-refactor-react Documentation diff --git a/client/src/views/index.js b/client/src/views/index.js index 95457e1ad..195ec74ff 100644 --- a/client/src/views/index.js +++ b/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 diff --git a/client/src/views/navbar/index.js b/client/src/views/navbar/index.js index 8f7c1f768..f144156e0 100644 --- a/client/src/views/navbar/index.js +++ b/client/src/views/navbar/index.js @@ -82,14 +82,10 @@ class NavBar extends Component { return (
-<<<<<<< HEAD - -======= ->>>>>>> feature/client-refactor-react Advanced Algos -<<<<<<< HEAD - - -======= ->>>>>>> feature/client-refactor-react {this.state.user !== undefined && this.state.user !== null ? ( diff --git a/client/src/views/teams/components/TeamsDetails.js b/client/src/views/teams/components/TeamsDetails.js index d7c2fb5a7..5383895b6 100644 --- a/client/src/views/teams/components/TeamsDetails.js +++ b/client/src/views/teams/components/TeamsDetails.js @@ -63,36 +63,22 @@ const TeamsDetails = ({ classes, team }) => ( {team.createdAt} -<<<<<<< HEAD -======= Motto: {team.profile.motto} Description: {team.profile.description} ->>>>>>> feature/client-refactor-react Members: {team.members.length} -<<<<<<< HEAD - Team Admin: - { - team.members.map(member => { - if (member.role === 'OWNER' || member.role === 'ADMIN') { - return member.member.alias - } - }) - } -======= Team Admin:  {team.members.map(member => { if (member.role === 'OWNER' || member.role === 'ADMIN') { return member.member.alias } })} ->>>>>>> feature/client-refactor-react
diff --git a/client/src/views/teams/components/TeamsItem.js b/client/src/views/teams/components/TeamsItem.js index e32e68e9a..9f0d78bf9 100644 --- a/client/src/views/teams/components/TeamsItem.js +++ b/client/src/views/teams/components/TeamsItem.js @@ -37,11 +37,7 @@ export const TeamsItem = ({ classes, team }) => ( -<<<<<<< HEAD - -======= ->>>>>>> feature/client-refactor-react diff --git a/client/src/views/teams/components/TeamsList.js b/client/src/views/teams/components/TeamsList.js index 4a8b7bea5..8b628e2c3 100644 --- a/client/src/views/teams/components/TeamsList.js +++ b/client/src/views/teams/components/TeamsList.js @@ -39,11 +39,7 @@ const styles = theme => ({ }) export const TeamsList = ({ classes, match }) => ( -<<<<<<< HEAD - -======= ->>>>>>> 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 - -======= ->>>>>>> feature/client-refactor-react ) } })}