diff --git a/README.md b/README.md index 064a39440..631432b3b 100644 --- a/README.md +++ b/README.md @@ -28,4 +28,4 @@ implement the ability to filter and sort people in the table. - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline). - Use the [React TypeScript cheat sheet](https://mate-academy.github.io/fe-program/js/extra/react-typescript). - Open one more terminal and run tests with `npm test` to ensure your solution is correct. -- Replace `` with your Github username in the [DEMO LINK](https://.github.io/react_people-table-advanced/) and add it to the PR description. +- Replace `` with your Github username in the [DEMO LINK](https://aholubko.github.io/react_people-table-advanced/) and add it to the PR description. diff --git a/src/App.tsx b/src/App.tsx index adcb8594e..de5257661 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,19 +2,28 @@ import { PeoplePage } from './components/PeoplePage'; import { Navbar } from './components/Navbar'; import './App.scss'; +import { Navigate, Route, Routes } from 'react-router-dom'; +import { HomePage } from './pages/HomePage'; +import { NotFoundPage } from './pages/NotFoundPage'; export const App = () => { return (
-
+
-

Home Page

-

Page not found

- + + } /> + } /> + + } /> + } /> + + } /> +
-
+
); }; diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 3f63898b2..93eef2d14 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -1,4 +1,9 @@ +import classNames from 'classnames'; +import { Link, useLocation } from 'react-router-dom'; + export const Navbar = () => { + const { pathname } = useLocation(); + return ( diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx index c9c819cd3..9aab98954 100644 --- a/src/components/PeopleFilters.tsx +++ b/src/components/PeopleFilters.tsx @@ -1,18 +1,46 @@ +import { useSearchParams } from 'react-router-dom'; +import { SearchLink } from './SearchLink'; +import classNames from 'classnames'; + export const PeopleFilters = () => { + const [searchParams, setSearchParams] = useSearchParams(); + const centuryButtons = [16, 17, 18, 19, 20]; + + const sex = searchParams.get('sex') || ''; + const query = searchParams.get('query') || ''; + const centuries = searchParams.getAll('centuries'); + return ( ); diff --git a/src/components/PeoplePage.tsx b/src/components/PeoplePage.tsx index b682bad9b..a1ec7a48f 100644 --- a/src/components/PeoplePage.tsx +++ b/src/components/PeoplePage.tsx @@ -1,29 +1,123 @@ import { PeopleFilters } from './PeopleFilters'; +import { useEffect, useState } from 'react'; +import { Person } from '../types'; +import { getPeople } from '../api'; import { Loader } from './Loader'; import { PeopleTable } from './PeopleTable'; +import { useSearchParams } from 'react-router-dom'; export const PeoplePage = () => { + const noMatchingPeopleMessage = + 'There are no people matching the current search criteria'; + const [people, setPeople] = useState([]); + const [isLoading, setIsLoading] = useState(false); + const [errorMessage, setErrorMessage] = 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; + const normalizedQuery = query?.trim().toLowerCase(); + + if (query.trim() !== '') { + visiblePeople = visiblePeople.filter( + person => + person.name.toLowerCase().includes(normalizedQuery) || + person.motherName?.toLowerCase().includes(normalizedQuery) || + person.fatherName?.toLowerCase().includes(normalizedQuery), + ); + } + + if (sex) { + visiblePeople = visiblePeople.filter(person => person.sex === sex); + } + + if (centuries.length > 0) { + visiblePeople = visiblePeople.filter(person => { + const century = Math.ceil(person.born / 100).toString(); + + return centuries.includes(century); + }); + } + + if (sort) { + const sortedPeople = [...visiblePeople]; + + sortedPeople.sort((person1, person2) => { + switch (sort) { + case 'name': + + case 'sex': + return person1[sort].localeCompare(person2[sort]); + + case 'born': + + case 'died': + return person1[sort] - person2[sort]; + + default: + return 0; + } + }); + + if (order === 'desc') { + sortedPeople.reverse(); + } + + visiblePeople = sortedPeople; + } + + useEffect(() => { + setIsLoading(true); + + getPeople() + .then(setPeople) + .catch(() => setErrorMessage(true)) + .finally(() => setIsLoading(false)); + }, []); + return ( <>

People Page

-
- -
+ {!isLoading && !errorMessage && people.length > 0 && ( +
+ +
+ )}
- + {isLoading && } -

Something went wrong

+ {errorMessage && ( +

+ Something went wrong +

+ )} -

There are no people on the server

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

+ There are no people on the server +

+ )} -

There are no people matching the current search criteria

+ {!isLoading && + !errorMessage && + people.length > 0 && + visiblePeople.length === 0 &&

{noMatchingPeopleMessage}

} - + {!isLoading && !errorMessage && people.length > 0 && ( + + )}
diff --git a/src/components/PeopleTable.tsx b/src/components/PeopleTable.tsx index fdd814b4a..11614c670 100644 --- a/src/components/PeopleTable.tsx +++ b/src/components/PeopleTable.tsx @@ -1,5 +1,40 @@ -/* eslint-disable jsx-a11y/control-has-associated-label */ -export const PeopleTable = () => { +import { useParams, useSearchParams } from 'react-router-dom'; +import { Person } from '../types'; +import { PersonLink } from './PersonLink'; +import classNames from 'classnames'; +import { SearchLink } from './SearchLink'; + +type Props = { + people: Person[]; +}; + +export const PeopleTable = ({ people }: Props) => { + const { slug } = useParams(); + 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 (!order) { + 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-down' : 'fas fa-sort-up'; + }; + return ( { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {people.map(person => { + const mother = people.find( + currentPerson => currentPerson.name === person.motherName, + ); + const father = people.find( + currentPerson => currentPerson.name === person.fatherName, + ); + + return ( + + + + + + + + + + ); + })}
Name - + - + - + Sex - + - + - + Born - + - + - + Died - + - + - + Mother Father
- 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} + {!person.motherName ? ( + '-' + ) : mother ? ( + + ) : ( + person.motherName + )} + + {!person.fatherName ? ( + '-' + ) : father ? ( + + ) : ( + person.fatherName + )} +
); diff --git a/src/components/PersonLink.tsx b/src/components/PersonLink.tsx new file mode 100644 index 000000000..56ed0fbde --- /dev/null +++ b/src/components/PersonLink.tsx @@ -0,0 +1,25 @@ +import { Link, useLocation } from 'react-router-dom'; +import { Person } from '../types'; +import classNames from 'classnames'; + +type Props = { + person: Person; +}; + +export const PersonLink = ({ person }: Props) => { + const { search } = useLocation(); + + return ( + + {person.name} + + ); +}; diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx new file mode 100644 index 000000000..e4cd51ac5 --- /dev/null +++ b/src/pages/HomePage.tsx @@ -0,0 +1,3 @@ +export const HomePage = () => { + return

Home Page

; +}; diff --git a/src/pages/NotFoundPage.tsx b/src/pages/NotFoundPage.tsx new file mode 100644 index 000000000..87fe719a7 --- /dev/null +++ b/src/pages/NotFoundPage.tsx @@ -0,0 +1,3 @@ +export const NotFoundPage = () => { + return

Page not found

; +};