From e159419169df64f9ff1dc36e8336c04fd6ebb827 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Wed, 24 Apr 2019 15:22:02 -0400 Subject: [PATCH] feat(projects): add sorter --- src/components/projects/Projects.jsx | 81 +++++++++++++++++++--------- 1 file changed, 55 insertions(+), 26 deletions(-) diff --git a/src/components/projects/Projects.jsx b/src/components/projects/Projects.jsx index fa19c0f..2b94481 100644 --- a/src/components/projects/Projects.jsx +++ b/src/components/projects/Projects.jsx @@ -1,4 +1,4 @@ -import React from 'react' +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"; @@ -8,6 +8,16 @@ 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: { @@ -24,12 +34,12 @@ const styles = theme => ({ } }) -// function sortByTitle(a, b) { -// if (!a.manifest || !b.manifest) { -// return 0; -// } -// return a.manifest.title.localeCompare(b.manifest.title) -// } +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) { @@ -40,34 +50,53 @@ function sortByDate(a, b) { } 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)); }) - projects.sort(sortByDate) + let sortFunction = (sortType === SORT_TYPES.name) ? sortByTitle : sortByDate; + projects.sort(sortFunction); return (

Projects

{projects.length === 0 && } {projects.length > 0 && - - {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}

- -
- ) - })} -
} + + + 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}

+ +
+ ) + })} +
+
+ }
) }