diff --git a/README.md b/README.md index 064a39440..549d4ae79 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://ihorshtoiko.github.io/react_people-table-advanced/) and add it to the PR description. diff --git a/package-lock.json b/package-lock.json index df276ce8a..a2d822adb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@cypress/react18": "^2.0.1", - "@mate-academy/scripts": "^1.9.12", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/students-ts-config": "*", "@mate-academy/stylelint-config": "*", "@types/node": "^20.14.10", @@ -1184,10 +1184,11 @@ } }, "node_modules/@mate-academy/scripts": { - "version": "1.9.12", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", - "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz", + "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 919fbd42b..586badc1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react_people-table-advanced", - "homepage": "react_people-table-advanced", + "homepage": "https://ihorshtoiko.github.io/react_people-table-advanced/", "version": "0.1.0", "keywords": [], "author": "Mate Academy", @@ -16,7 +16,7 @@ }, "devDependencies": { "@cypress/react18": "^2.0.1", - "@mate-academy/scripts": "^1.9.12", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/students-ts-config": "*", "@mate-academy/stylelint-config": "*", "@types/node": "^20.14.10", diff --git a/src/App.tsx b/src/App.tsx index adcb8594e..5549aaedf 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,20 +1,21 @@ -import { PeoplePage } from './components/PeoplePage'; +import { Route, Routes, Navigate } from 'react-router-dom'; import { Navbar } from './components/Navbar'; - +import { PeoplePage } from './components/PeoplePage'; import './App.scss'; -export const App = () => { - return ( -
- - -
-
-

Home Page

-

Page not found

- -
+export const App = () => ( +
+ +
+
+ + Home Page} /> + } /> + } /> + } /> + Page not found} /> +
-
- ); -}; + +
+); diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 3f63898b2..dd2d37572 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -1,3 +1,5 @@ +import { NavLink } from 'react-router-dom'; + export const Navbar = () => { return ( diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx index c9c819cd3..47e09088f 100644 --- a/src/components/PeopleFilters.tsx +++ b/src/components/PeopleFilters.tsx @@ -1,18 +1,37 @@ +import { useSearchParams } from 'react-router-dom'; +import { getSearchWith } from '../utils/searchHelper'; +import { SearchLink } from './SearchLink'; + export const PeopleFilters = () => { + const [searchParams, setSearchParams] = useSearchParams(); + + const query = searchParams.get('query') ?? ''; + const sex = searchParams.get('sex'); + const century = searchParams.getAll('centuries'); + return ( ); diff --git a/src/components/PeoplePage.tsx b/src/components/PeoplePage.tsx index b682bad9b..590173ff7 100644 --- a/src/components/PeoplePage.tsx +++ b/src/components/PeoplePage.tsx @@ -1,29 +1,96 @@ import { PeopleFilters } from './PeopleFilters'; import { Loader } from './Loader'; +import { getPeople } from '../api'; import { PeopleTable } from './PeopleTable'; +import { useEffect, useState } from 'react'; +import { Person } from '../types'; +import { useSearchParams } from 'react-router-dom'; export const PeoplePage = () => { + const [people, setPeople] = useState([]); + const [error, setError] = useState(false); + const [isLoading, setIsLoading] = useState(false); + const [searchParams] = useSearchParams(); + + const query = searchParams.get('query') ?? ''; + const sex = searchParams.get('sex'); + const century = searchParams.getAll('centuries'); + const sort = searchParams.get('sort'); + const order = searchParams.get('order'); + + const visiblePeople = people.filter(person => { + const matchesQuery = + person.name.toLowerCase().includes(query.toLowerCase()) || + person.motherName?.toLowerCase().includes(query.toLowerCase()) || + person.fatherName?.toLowerCase().includes(query.toLowerCase()); + const matchesSex = !sex || person.sex === sex; + const matchesCentury = + century.length === 0 || + century.includes(String(Math.ceil(person.born / 100))); + + return matchesQuery && matchesSex && matchesCentury; + }); + + let sortedPeople = [...visiblePeople].sort((a, b) => { + if (sort === 'name' || sort === 'sex') { + return (a[sort as keyof Person] as string).localeCompare( + b[sort as keyof Person] as string, + ); + } + + if (sort === 'born' || sort === 'died') { + return ( + (a[sort as keyof Person] as number) - + (b[sort as keyof Person] as number) + ); + } + + return 0; + }); + + if (order === 'desc') { + sortedPeople = sortedPeople.reverse(); + } + + useEffect(() => { + setIsLoading(true); + getPeople() + .then(data => setPeople(data)) + .catch(() => setError(true)) + .finally(() => setIsLoading(false)); + }, []); + return ( <>

People Page

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

Something went wrong

- -

There are no people on the server

- -

There are no people matching the current search criteria

- - + {isLoading && } + {error && ( +

Something went wrong

+ )} + {!isLoading && !error && people.length === 0 && ( +

+ There are no people on the server +

+ )} + {!isLoading && !error && people.length > 0 && ( + + )} + {!isLoading && + !error && + sortedPeople.length === 0 && + people.length > 0 && ( +

+ There are no people matching the current search criteria +

+ )}
diff --git a/src/components/PeopleTable.tsx b/src/components/PeopleTable.tsx index fdd814b4a..29cdcab09 100644 --- a/src/components/PeopleTable.tsx +++ b/src/components/PeopleTable.tsx @@ -1,5 +1,47 @@ /* eslint-disable jsx-a11y/control-has-associated-label */ -export const PeopleTable = () => { +import { Person } from '../types'; +import { useParams, Link, useSearchParams } from 'react-router-dom'; +import { PersonLink } from './PersonLink'; +import { SearchLink } from './SearchLink'; + +type Props = { + people: Person[]; +}; + +export const PeopleTable = ({ people }: Props) => { + const [searchParams] = useSearchParams(); + const sort = searchParams.get('sort'); + const order = searchParams.get('order'); + + const { slug } = useParams(); + + //#region sort functions + const getSortParams = (field: string) => { + if (sort !== field) { + return { sort: field, order: null }; + } + + if (order === null) { + return { sort: field, order: 'desc' }; + } + + return { sort: null, order: null }; + }; + + const getSortIcons = (field: string) => { + if (sort !== field) { + return 'fa-sort'; + } + + if (order === null) { + return 'fa-sort-up'; + } + + return 'fa-sort-down'; + }; + + //#endregion + return ( { @@ -57,588 +99,31 @@ export const PeopleTable = () => { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {people.map(person => ( + + + + + + + + + ))}
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.name} + + {person.sex}{person.born}{person.died} + + + +
); diff --git a/src/components/PersonLink.tsx b/src/components/PersonLink.tsx new file mode 100644 index 000000000..df2974fb3 --- /dev/null +++ b/src/components/PersonLink.tsx @@ -0,0 +1,26 @@ +import { Link } from 'react-router-dom'; +import { Person } from '../types'; + +type Props = { + name: string | null; + people: Person[]; +}; + +export const PersonLink = ({ name, people }: Props) => { + if (!name) { + return '-'; + } + + const person = people.find(p => p.name === name); + + return person ? ( + + {name} + + ) : ( + name + ); +}; diff --git a/tsconfig.json b/tsconfig.json index cfb168bb2..d0d4ba9e0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,6 @@ { "extends": "@mate-academy/students-ts-config", - "include": [ - "src" - ], + "include": ["src"], "compilerOptions": { "sourceMap": false, "types": ["node", "cypress"]