diff --git a/src/App.tsx b/src/App.tsx index adcb8594e..b8de21ed0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,5 +1,6 @@ import { PeoplePage } from './components/PeoplePage'; import { Navbar } from './components/Navbar'; +import { Routes, Route, Navigate } from 'react-router-dom'; import './App.scss'; @@ -10,9 +11,16 @@ export const App = () => {
-

Home Page

-

Page not found

- + + Home Page} /> + } /> + } /> + } /> + Page not found} + /> +
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 3f63898b2..622f8828f 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -1,4 +1,8 @@ +import { NavLink, useLocation } from 'react-router-dom'; + export const Navbar = () => { + const location = useLocation(); + return ( diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx index c9c819cd3..d2c1acc6d 100644 --- a/src/components/PeopleFilters.tsx +++ b/src/components/PeopleFilters.tsx @@ -1,18 +1,45 @@ +import { useSearchParams } from 'react-router-dom'; +import { getSearchWith } from '../utils/searchHelper'; +import { SearchLink } from './SearchLink'; +import classNames from 'classnames'; + export const PeopleFilters = () => { + const [searchParams, setSearchParams] = useSearchParams(); + + const query = searchParams.get('query') || ''; + const sex = searchParams.get('sex') || ''; + const selectedCenturies = searchParams.getAll('centuries'); + + const getCenturyParams = (century: string) => { + const newCenturies = selectedCenturies.includes(century) + ? selectedCenturies.filter(item => item !== century) + : [...selectedCenturies, century]; + + return { + centuries: newCenturies.length > 0 ? newCenturies : null, + }; + }; + return ( ); diff --git a/src/components/PeoplePage.tsx b/src/components/PeoplePage.tsx index b682bad9b..d028a2527 100644 --- a/src/components/PeoplePage.tsx +++ b/src/components/PeoplePage.tsx @@ -1,8 +1,88 @@ +import { useEffect, useState } from 'react'; +import { getPeople } from '../api'; import { PeopleFilters } from './PeopleFilters'; import { Loader } from './Loader'; import { PeopleTable } from './PeopleTable'; +import { Person } from '../types'; +import { useParams, useSearchParams } from 'react-router-dom'; export const PeoplePage = () => { + const { slug } = useParams(); + + const [people, setPeople] = useState([]); + const [isLoading, setIsLoading] = useState(false); + const [hasError, setHasError] = useState(false); + + const [searchParams] = useSearchParams(); + + const query = searchParams.get('query') || ''; + const sex = searchParams.get('sex') || ''; + const centuries = searchParams.getAll('centuries'); + const sort = searchParams.get('sort'); + const order = searchParams.get('order'); + + let visiblePeople = [...people]; + + if (sex) { + visiblePeople = visiblePeople.filter(person => person.sex === sex); + } + + if (query) { + const normalizedQuery = query.toLowerCase(); + + visiblePeople = visiblePeople.filter(person => { + return ( + person.name.toLowerCase().includes(normalizedQuery) || + person.motherName?.toLowerCase().includes(normalizedQuery) || + person.fatherName?.toLowerCase().includes(normalizedQuery) + ); + }); + } + + if (centuries.length > 0) { + visiblePeople = visiblePeople.filter(person => { + const century = String(Math.ceil(person.born / 100)); + + return centuries.includes(century); + }); + } + + if (sort) { + visiblePeople.sort((personA, personB) => { + switch (sort) { + case 'name': + case 'sex': + return personA[sort].localeCompare(personB[sort]); + + case 'born': + case 'died': + return personA[sort] - personB[sort]; + + default: + return 0; + } + }); + + if (order === 'desc') { + visiblePeople.reverse(); + } + } + + const noPeopleMatching = + !isLoading && !hasError && people.length > 0 && visiblePeople.length === 0; + + const tableOfPeople = + !isLoading && !hasError && people.length > 0 && visiblePeople.length > 0; + + useEffect(() => { + setIsLoading(true); + + getPeople() + .then(setPeople) + .catch(() => setHasError(true)) + .finally(() => setIsLoading(false)); + }, []); + return ( <>

People Page

@@ -10,20 +90,30 @@ export const PeoplePage = () => {
- + {!isLoading && !hasError && people.length > 0 && }
- + {isLoading && } -

Something went wrong

+ {hasError && ( +

Something went wrong

+ )} -

There are no people on the server

+ {!isLoading && !hasError && people.length === 0 && ( +

+ There are no people on the server +

+ )} -

There are no people matching the current search criteria

+ {noPeopleMatching && ( +

There are no people matching the current search criteria

+ )} - + {tableOfPeople && ( + + )}
diff --git a/src/components/PeopleTable.tsx b/src/components/PeopleTable.tsx index fdd814b4a..dbaa56ebf 100644 --- a/src/components/PeopleTable.tsx +++ b/src/components/PeopleTable.tsx @@ -1,5 +1,49 @@ /* eslint-disable jsx-a11y/control-has-associated-label */ -export const PeopleTable = () => { +import { useSearchParams } from 'react-router-dom'; +import { Person } from '../types'; +import { PersonLink } from './PersonLink'; +import { SearchLink } from './SearchLink'; + +type Props = { + people: Person[]; + selectedSlug?: string; +}; + +export const PeopleTable = ({ people, selectedSlug }: Props) => { + const [searchParams] = useSearchParams(); + + const sort = searchParams.get('sort'); + const order = searchParams.get('order'); + + const getSortParams = (field: string) => { + if (sort !== field) { + return { + sort: field, + order: null, + }; + } + + if (sort === field && order !== 'desc') { + return { + sort: field, + order: 'desc', + }; + } + + return { + sort: null, + order: null, + }; + }; + + const getSortIcon = (field: string) => { + if (sort !== field) { + return 'fas fa-sort'; + } + + return order === 'desc' ? 'fas fa-sort-up' : 'fas fa-sort-down'; + }; + return ( { @@ -57,588 +101,43 @@ export const PeopleTable = () => { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {people.map(person => { + const mother = people.find(p => p.name === person.motherName); + const father = people.find(p => p.name === person.fatherName); + + return ( + + + + + + + + + + + ); + })}
Name - + - + - + Sex - + - + - + Born - + - + - + Died - + - + - +
- Pieter Haverbeke - m16021642- - - Lieven van Haverbeke - -
- - Anna van Hecke - - f16071670Martijntken BeelaertPaschasius van Hecke
- Lieven Haverbeke - m16311676 - - Anna van Hecke - - - Pieter Haverbeke -
- - Elisabeth Hercke - - f16321674Margriet de BrabanderWillem Hercke
- Daniel Haverbeke - m16521723 - - Elisabeth Hercke - - - Lieven Haverbeke -
- - Joanna de Pape - - f16541723Petronella WautersVincent de Pape
- - Martina de Pape - - f16661727Petronella WautersVincent de Pape
- Willem Haverbeke - m16681731 - - Elisabeth Hercke - - - Lieven Haverbeke -
- Jan Haverbeke - m16711731 - - Elisabeth Hercke - - - Lieven Haverbeke -
- - Maria de Rycke - - f16831724Laurentia van VlaenderenFrederik de Rycke
- - Livina Haverbeke - - f16921743 - - Joanna de Pape - - - Daniel Haverbeke -
- - Pieter Bernard Haverbeke - - m16951762Petronella Wauters - Willem Haverbeke -
- - Lieven de Causmaecker - - m16961724Joanna ClaesCarel de Causmaecker
- - Jacoba Lammens - - f16991740Livina de VriezeLieven Lammens
- Pieter de Decker - m17051780Petronella van de SteeneJoos de Decker
- - Laurentia Haverbeke - - f17101786 - - Maria de Rycke - - - Jan Haverbeke -
- - Elisabeth Haverbeke - - f17111754 - - Maria de Rycke - - - Jan Haverbeke -
- Jan van Brussel - m17141748Joanna van RootenJacobus van Brussel
- - Bernardus de Causmaecker - - m17211789 - - Livina Haverbeke - - - - Lieven de Causmaecker - -
- - Jan Francies Haverbeke - - m17251779Livina de Vrieze - - Pieter Bernard Haverbeke - -
- - Angela Haverbeke - - f17281734Livina de Vrieze - - Pieter Bernard Haverbeke - -
- - Petronella de Decker - - f17311781 - - Livina Haverbeke - - - Pieter de Decker -
- - Jacobus Bernardus van Brussel - - m17361809 - - Elisabeth Haverbeke - - - Jan van Brussel -
- - Pieter Antone Haverbeke - - m17531798 - - Petronella de Decker - - - - Jan Francies Haverbeke - -
- - Jan Frans van Brussel - - m17611833- - - Jacobus Bernardus van Brussel - -
- - Livina Sierens - - f17611826Maria van WaesJan Sierens
- - Joanna de Causmaecker - - f17621807- - - Bernardus de Causmaecker - -
- Carel Haverbeke - m17961837 - - Livina Sierens - - - - Pieter Antone Haverbeke - -
- - Maria van Brussel - - f18011834 - - Joanna de Causmaecker - - - - Jan Frans van Brussel - -
- Carolus Haverbeke - m18321905 - - Maria van Brussel - - - Carel Haverbeke -
- - Maria Sturm - - f18351917Seraphina SpelierCharles Sturm
- - Emma de Milliano - - f18761956Sophia van DammePetrus de Milliano
- Emile Haverbeke - m18771968 - - Maria Sturm - - - Carolus Haverbeke -
+ + {person.sex}{person.born}{person.died} + {mother ? ( + + ) : ( + person.motherName || '-' + )} + + {father ? ( + + ) : ( + person.fatherName || '-' + )} +
); diff --git a/src/components/PersonLink.tsx b/src/components/PersonLink.tsx new file mode 100644 index 000000000..9a2788bfd --- /dev/null +++ b/src/components/PersonLink.tsx @@ -0,0 +1,19 @@ +import { Link, useLocation } from 'react-router-dom'; +import { Person } from '../types'; + +type Props = { + person: Person; +}; + +export const PersonLink = ({ person }: Props) => { + const location = useLocation(); + + return ( + + {person.name} + + ); +};