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..77fc93ccf 100644 --- a/package.json +++ b/package.json @@ -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..01755eae1 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,6 +2,10 @@ import { PeoplePage } from './components/PeoplePage'; import { Navbar } from './components/Navbar'; import './App.scss'; +import { Navigate, Route, Routes } from 'react-router-dom'; + +const HomePage = () =>

Home Page

; +const NotFoundPage = () =>

Page not found

; export const App = () => { return ( @@ -10,9 +14,14 @@ export const App = () => {
-

Home Page

-

Page not found

- + + } /> + } /> + + } /> + + } /> +
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 3f63898b2..4ac1b022d 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -1,4 +1,9 @@ +import { NavLink, useLocation } from 'react-router-dom'; +import classNames from 'classnames'; + export const Navbar = () => { + const { search } = useLocation(); + return ( diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx index c9c819cd3..6585bffa7 100644 --- a/src/components/PeopleFilters.tsx +++ b/src/components/PeopleFilters.tsx @@ -1,18 +1,59 @@ +import { useSearchParams } from 'react-router-dom'; +import classNames from 'classnames'; +import { SearchLink } from './SearchLink'; +import { getSearchWith } from '../utils/searchHelper'; + export const PeopleFilters = () => { + const [searchParams, setSearchParams] = useSearchParams(); + + const sex = searchParams.get('sex'); + const query = searchParams.get('query') || ''; + + const handleQueryChange = (event: React.ChangeEvent) => { + const newQuery = event.target.value || null; + + const newSearch = getSearchWith(searchParams, { query: newQuery }); + + setSearchParams(newSearch); + }; + + const selectedCenturies = searchParams.getAll('centuries'); + + const toggleCentury = (century: string) => { + if (selectedCenturies.includes(century)) { + const updatedCenturies = selectedCenturies.filter(c => c !== century); + + return updatedCenturies.length > 0 ? updatedCenturies : null; + } + + return [...selectedCenturies, century]; + }; + return ( ); diff --git a/src/components/PeoplePage.tsx b/src/components/PeoplePage.tsx index b682bad9b..7ddc36b78 100644 --- a/src/components/PeoplePage.tsx +++ b/src/components/PeoplePage.tsx @@ -1,8 +1,81 @@ +import { useEffect, useState } from 'react'; +import { useSearchParams } from 'react-router-dom'; +import { getPeople } from '../api'; +import { Person } from '../types/Person'; import { PeopleFilters } from './PeopleFilters'; import { Loader } from './Loader'; import { PeopleTable } from './PeopleTable'; export const PeoplePage = () => { + const [people, setPeople] = useState([]); + const [isLoading, setIsLoading] = useState(false); + const [hasError, setHasError] = useState(false); + + const [searchParams] = useSearchParams(); + + useEffect(() => { + setIsLoading(true); + getPeople() + .then(setPeople) + .catch(() => setHasError(true)) + .finally(() => setIsLoading(false)); + }, []); + + const sex = searchParams.get('sex'); + const query = searchParams.get('query')?.toLowerCase().trim() || ''; + const centuries = searchParams.getAll('centuries'); + const sortField = searchParams.get('sort') as keyof Person | null; + const sortOrder = searchParams.get('order'); + + const visiblePeople = people.filter(person => { + if (sex && person.sex !== sex) { + return false; + } + + if (query) { + const matchName = person.name.toLowerCase().includes(query); + const matchMother = person.motherName?.toLowerCase().includes(query); + const matchFather = person.fatherName?.toLowerCase().includes(query); + + if (!matchName && !matchMother && !matchFather) { + return false; + } + } + + if (centuries.length > 0) { + const personCentury = Math.ceil(person.born / 100).toString(); + + if (!centuries.includes(personCentury)) { + return false; + } + } + + return true; + }); + + if (sortField) { + visiblePeople.sort((a, b) => { + let result = 0; + + switch (sortField) { + case 'name': + case 'sex': + result = String(a[sortField]).localeCompare(String(b[sortField])); + break; + case 'born': + case 'died': + result = Number(a[sortField]) - Number(b[sortField]); + break; + } + + return sortOrder === 'desc' ? -result : result; + }); + } + + const showFilters = !isLoading && !hasError && people.length > 0; + const noPeopleOnServer = !isLoading && !hasError && people.length === 0; + const noMatch = showFilters && visiblePeople.length === 0; + return ( <>

People Page

@@ -10,20 +83,32 @@ export const PeoplePage = () => {
- + {showFilters && }
- + {isLoading && } -

Something went wrong

+ {hasError && ( +

+ Something went wrong +

+ )} -

There are no people on the server

+ {noPeopleOnServer && ( +

+ There are no people on the server +

+ )} -

There are no people matching the current search criteria

+ {noMatch && ( +

There are no people matching the current search criteria

+ )} - + {!isLoading && !hasError && visiblePeople.length > 0 && ( + + )}
diff --git a/src/components/PeopleTable.tsx b/src/components/PeopleTable.tsx index fdd814b4a..e95723749 100644 --- a/src/components/PeopleTable.tsx +++ b/src/components/PeopleTable.tsx @@ -1,5 +1,43 @@ /* eslint-disable jsx-a11y/control-has-associated-label */ -export const PeopleTable = () => { +import { + useSearchParams, + useParams, + useLocation, + Link, +} from 'react-router-dom'; +import { SearchLink } from './SearchLink'; +import { Person } from '../types/Person'; +type Props = { + people: Person[]; +}; + +export const PeopleTable: React.FC = ({ people }) => { + const [searchParams] = useSearchParams(); + const { slug } = useParams(); + const location = useLocation(); + const sortField = searchParams.get('sort'); + const sortOrder = searchParams.get('order'); + + const getSortParams = (field: string) => { + if (sortField !== field) { + return { sort: field, order: null }; + } + + if (sortOrder !== 'desc') { + return { sort: field, order: 'desc' }; + } + + return { sort: null, order: null }; + }; + + const getSortIcon = (field: string) => { + if (sortField !== field) { + return 'fas fa-sort'; + } + + return sortOrder === 'desc' ? 'fas fa-sort-down' : 'fas fa-sort-up'; + }; + return ( { @@ -57,588 +95,65 @@ 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.name} + + {person.sex}{person.born}{person.died} + {/* Якщо матір знайдено в базі - малюємо червоне посилання, інакше просто текст */} + {mother ? ( + + {mother.name} + + ) : ( + person.motherName || '-' + )} + + {/* Аналогічно для батька, але без червоного класу */} + {father ? ( + + {father.name} + + ) : ( + person.fatherName || '-' + )} +
);