diff --git a/src/actions/delegates.js b/src/actions/delegates.js index cb6acf3..121bd3a 100644 --- a/src/actions/delegates.js +++ b/src/actions/delegates.js @@ -23,7 +23,7 @@ const createDelegate = (newDelegate, delegateInfo, pledge, profile, idx) => { const delegateRecordExists = (profile, pledge, idx, existing) => { const record = existing.find(delegate => { const { delegateIndex } = delegate - if ( + if (profile && profile.id === delegate.profile.id && pledge.idPledge === delegate.idPledge && idx === delegateIndex diff --git a/src/components/MainCointainer.jsx b/src/components/MainCointainer.jsx index 015ce16..061c541 100644 --- a/src/components/MainCointainer.jsx +++ b/src/components/MainCointainer.jsx @@ -18,11 +18,13 @@ import ListItem from '@material-ui/core/ListItem'; import ListItemIcon from '@material-ui/core/ListItemIcon'; import ListItemText from '@material-ui/core/ListItemText'; import InboxIcon from '@material-ui/icons/MoveToInbox'; +import ProjectIcon from '@material-ui/icons/Work'; import { ScaleLoader } from 'react-spinners' import FundsManagement from './FundsManagement' import ContractAdmin from './ContractAdmin' import TransferGraph from './TransfersGraph' import Dashboard from './Dashboard' +import Projects from './projects/Projects' import Project from './projects/Project' import BackProject from './projects/BackProject' import CreateProject from './projects/CreateProject' @@ -92,6 +94,15 @@ const styles = theme => ({ } }) +const MenuItem = ({to, name, className, icon}) => ( + + + {icon} + + + +) + class PersistentDrawerLeft extends React.Component { state = { open: false, @@ -153,40 +164,15 @@ class PersistentDrawerLeft extends React.Component { {theme.direction === 'ltr' ? : } - + - - - - - - + }/> + }/> + }/> + }/> + }/> - - - - - - - - - - - - - - - - - - - - - - - - - +
} /> + } /> diff --git a/src/components/projects/Projects.jsx b/src/components/projects/Projects.jsx new file mode 100644 index 0000000..2b94481 --- /dev/null +++ b/src/components/projects/Projects.jsx @@ -0,0 +1,113 @@ +import React, {Fragment, useState} from 'react' +import { withStyles } from '@material-ui/core/styles' +import {withDatabase} from "@nozbe/watermelondb/DatabaseProvider"; +import withObservables from "@nozbe/with-observables"; +import {Q} from "@nozbe/watermelondb"; +import PropTypes from 'prop-types' +import {useProjectData} from "./hooks"; +import Loading from "../base/Loading"; +import Grid from '@material-ui/core/Grid'; +import {Link} from "react-router-dom"; +import Radio from '@material-ui/core/Radio'; +import RadioGroup from '@material-ui/core/RadioGroup'; +import FormControlLabel from '@material-ui/core/FormControlLabel'; +import FormControl from '@material-ui/core/FormControl'; +import FormLabel from '@material-ui/core/FormLabel'; + +const SORT_TYPES = { + date: 'date', + name: 'name' +} + +const styles = theme => ({ + root: { + margin: '1.75rem 4.5rem', + ...theme.typography.body1 + }, + link: { + textDecoration: 'none', + ...theme.typography.body1, + '&:hover': { + textDecoration: 'underline', + cursor: 'pointer' + } + } +}) + +function sortByTitle(a, b) { + if (!a.manifest || !b.manifest) { + return 0; + } + return a.manifest.title.localeCompare(b.manifest.title) +} + +// No date field, but we can use the ID +function sortByDate(a, b) { + if (parseInt(a.projectId, 10) > parseInt(b.projectId, 10)) { + return -1; + } + return 1; +} + +function Projects({projectAddedEvents, classes}) { + const [sortType, setSortType] = useState(SORT_TYPES.date); + + const projects = projectAddedEvents.map(event => { + return Object.assign({projectId: event.returnValues.idProject}, useProjectData(event.returnValues.idProject, '', projectAddedEvents)); + }) + + let sortFunction = (sortType === SORT_TYPES.name) ? sortByTitle : sortByDate; + projects.sort(sortFunction); + + return (
+

Projects

+ {projects.length === 0 && } + {projects.length > 0 && + + + Sort by + setSortType(value)} + > + } label="Date" /> + } label="Name" /> + + + + {projects.map((project, index) => { + if (!project.manifest) { + return '' + } + return ( + + +

{project.manifest.title}

+

{project.manifest.subtitle}

+

{project.manifest.description}

+

{project.manifest.avatar && + avatar}{project.manifest.creator}

+ +
+ ) + })} +
+
+ } +
) +} + +Projects.propTypes = { + projectAddedEvents: PropTypes.array, + classes: PropTypes.object +} + +const StyledProject = withStyles(styles)(Projects) +export default withDatabase(withObservables([], ({ database }) => ({ + projectAddedEvents: database.collections.get('lp_events').query( + Q.where('event', 'ProjectAdded') + ).observe() +}))(StyledProject))