From 73132cbcc1e40d756b28b5a29f6d8ff9a5761fd4 Mon Sep 17 00:00:00 2001
From: Rupert Wisdom <rupert.wisdom@yahoo.com>
Date: Thu, 2 Jul 2026 08:08:43 -0400
Subject: [PATCH 1/2] Implement filtering and sorting features

---
 README.md                        |   2 +-
 src/App.tsx                      |  32 +-
 src/components/CenturyFilter.tsx |  45 +++
 src/components/NameFilter.tsx    |  27 ++
 src/components/Navbar.tsx        |  28 +-
 src/components/PeopleFilters.tsx | 111 ++----
 src/components/PeoplePage.tsx    | 113 +++++-
 src/components/PeopleTable.tsx   | 656 +++----------------------------
 src/components/PersonLink.tsx    |  26 ++
 src/components/SortLink.tsx      |  33 ++
 10 files changed, 364 insertions(+), 709 deletions(-)
 create mode 100644 src/components/CenturyFilter.tsx
 create mode 100644 src/components/NameFilter.tsx
 create mode 100644 src/components/PersonLink.tsx
 create mode 100644 src/components/SortLink.tsx

diff --git a/README.md b/README.md
index 064a39440..8ac7d3085 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 `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_people-table-advanced/) and add it to the PR description.
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://RupertWisdomjm.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..f9ba57822 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,20 +1,24 @@
+import { Navigate, Route, Routes } from 'react-router-dom';
+
 import { PeoplePage } from './components/PeoplePage';
 import { Navbar } from './components/Navbar';
 
-import './App.scss';
-
-export const App = () => {
-  return (
-    <div data-cy="app">
-      <Navbar />
+export const App = () => (
+  <div data-cy="app">
+    <Navbar />
 
-      <div className="section">
-        <div className="container">
-          <h1 className="title">Home Page</h1>
-          <h1 className="title">Page not found</h1>
-          <PeoplePage />
-        </div>
+    <div className="section">
+      <div className="container">
+        <Routes>
+          <Route path="/" element={<h1 className="title mt-6">Home Page</h1>} />
+          <Route path="home" element={<Navigate to="/" replace />} />
+          <Route path="people">
+            <Route index element={<PeoplePage />} />
+            <Route path=":slug" element={<PeoplePage />} />
+          </Route>
+          <Route path="*" element={<h1 className="title">Page not found</h1>} />
+        </Routes>
       </div>
     </div>
-  );
-};
+  </div>
+);
diff --git a/src/components/CenturyFilter.tsx b/src/components/CenturyFilter.tsx
new file mode 100644
index 000000000..49face8e1
--- /dev/null
+++ b/src/components/CenturyFilter.tsx
@@ -0,0 +1,45 @@
+import classNames from 'classnames';
+import { useSearchParams } from 'react-router-dom';
+import { SearchLink } from './SearchLink';
+
+const AVAILABLE_CENTURIES = ['16', '17', '18', '19', '20'];
+
+export const CenturyFilter = () => {
+    const [searchParams] = useSearchParams();
+    const centuries = searchParams.getAll('centuries');
+
+    return (
+        <div className="level is-flex-grow-1 is-mobile" data-cy="CenturyFilter">
+            <div className="level-left">
+            {AVAILABLE_CENTURIES.map(century => (
+                <SearchLink
+                data-cy="century"
+                key={century}
+                className={classNames('button', 'mr-1', {
+                'is-info': centuries.includes(century),
+                })}
+                params={{
+                centuries: centuries.includes(century) // if this century is already selected
+                    ? centuries.filter(c => c !== century) // we remove it from the selected
+                    : [...centuries, century], // otherwise we add it to the selected
+                }}
+                >
+                {century}
+                </SearchLink>
+            ))}
+        </div>
+
+        <div className="level-right ml-4">
+            <SearchLink
+                data-cy="centuryALL"
+                params={{ centuries: null }}
+                className={classNames('button', 'is-success', {
+                'is-outlined': centuries.length > 0,
+                })}
+            >
+            All
+            </SearchLink>
+            </div>
+        </div>
+    );
+};
diff --git a/src/components/NameFilter.tsx b/src/components/NameFilter.tsx
new file mode 100644
index 000000000..97e559868
--- /dev/null
+++ b/src/components/NameFilter.tsx
@@ -0,0 +1,27 @@
+import { useSearchParams } from 'react-router-dom';
+import { getSearchWith } from '../utils/searchHelper';
+
+export const NameFilter = () => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const query = searchParams.get('query') || '';
+
+  return (
+    <p className="control has-icons-left">
+      <input
+        data-cy="NameFilter"
+        value={query}
+        onChange={event => setSearchParams(
+          getSearchWith(searchParams, {
+            query: event.target.value || null,
+          }),
+        )}
+        className="input"
+        type="text"
+        placeholder="Search"
+      />
+      <span className="icon is-left">
+        <i className="fas fa-search" aria-hidden="true" />
+      </span>
+    </p>
+  );
+};
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 3f63898b2..3a590afce 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -1,4 +1,20 @@
+import classNames from 'classnames';
+import { NavLink, useLocation } from 'react-router-dom';
+
+type Status = {
+  isActive: boolean;
+};
+
+const getNavLinkClassName = ({ isActive }: Status) => {
+  return classNames('navbar-item', {
+    'has-background-grey-lighter': isActive,
+  });
+};
+
 export const Navbar = () => {
+  const location = useLocation();
+  console.log('location', location.pathname);
+
   return (
     <nav
       data-cy="nav"
@@ -8,17 +24,17 @@ export const Navbar = () => {
     >
       <div className="container">
         <div className="navbar-brand">
-          <a className="navbar-item" href="#/">
+          <NavLink className={getNavLinkClassName} to="/">
             Home
-          </a>
+          </NavLink>
 
-          <a
+          <NavLink
             aria-current="page"
-            className="navbar-item has-background-grey-lighter"
-            href="#/people"
+            className={getNavLinkClassName}
+            to={{ pathname: 'people', search: location.search }}
           >
             People
-          </a>
+          </NavLink>
         </div>
       </div>
     </nav>
diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx
index c9c819cd3..de07da5f6 100644
--- a/src/components/PeopleFilters.tsx
+++ b/src/components/PeopleFilters.tsx
@@ -1,95 +1,58 @@
+import { useSearchParams } from 'react-router-dom';
+import classNames from 'classnames';
+
+import { CenturyFilter } from './CenturyFilter';
+import { NameFilter } from './NameFilter';
+import { SearchLink } from './SearchLink';
+
 export const PeopleFilters = () => {
+  const [searchParams] = useSearchParams();
+  const sex = searchParams.get('sex');
+
   return (
     <nav className="panel">
-      <p className="panel-heading">Filters</p>
+      <p className="panel-heading">
+        Filters
+      </p>
 
       <p className="panel-tabs" data-cy="SexFilter">
-        <a className="is-active" href="#/people">
+        <SearchLink
+          params={{ sex: null }}
+          className={classNames({ 'is-active': !sex })}
+        >
           All
-        </a>
-        <a className="" href="#/people?sex=m">
+        </SearchLink>
+
+        <SearchLink
+          params={{ sex: 'm' }}
+          className={classNames({ 'is-active': sex === 'm' })}
+        >
           Male
-        </a>
-        <a className="" href="#/people?sex=f">
+        </SearchLink>
+
+        <SearchLink
+          params={{ sex: 'f' }}
+          className={classNames({ 'is-active': sex === 'f' })}
+        >
           Female
-        </a>
+        </SearchLink>
       </p>
 
       <div className="panel-block">
-        <p className="control has-icons-left">
-          <input
-            data-cy="NameFilter"
-            type="search"
-            className="input"
-            placeholder="Search"
-          />
-
-          <span className="icon is-left">
-            <i className="fas fa-search" aria-hidden="true" />
-          </span>
-        </p>
+        <NameFilter />
       </div>
 
       <div className="panel-block">
-        <div className="level is-flex-grow-1 is-mobile" data-cy="CenturyFilter">
-          <div className="level-left">
-            <a
-              data-cy="century"
-              className="button mr-1"
-              href="#/people?centuries=16"
-            >
-              16
-            </a>
-
-            <a
-              data-cy="century"
-              className="button mr-1 is-info"
-              href="#/people?centuries=17"
-            >
-              17
-            </a>
-
-            <a
-              data-cy="century"
-              className="button mr-1 is-info"
-              href="#/people?centuries=18"
-            >
-              18
-            </a>
-
-            <a
-              data-cy="century"
-              className="button mr-1 is-info"
-              href="#/people?centuries=19"
-            >
-              19
-            </a>
-
-            <a
-              data-cy="century"
-              className="button mr-1"
-              href="#/people?centuries=20"
-            >
-              20
-            </a>
-          </div>
-
-          <div className="level-right ml-4">
-            <a
-              data-cy="centuryALL"
-              className="button is-success is-outlined"
-              href="#/people"
-            >
-              All
-            </a>
-          </div>
-        </div>
+        <CenturyFilter />
       </div>
 
       <div className="panel-block">
-        <a className="button is-link is-outlined is-fullwidth" href="#/people">
+        <SearchLink
+          className="button is-link is-outlined is-fullwidth"
+          params={{ sex: null, query: null, centuries: null }}
+        >
           Reset all filters
-        </a>
+        </SearchLink>
       </div>
     </nav>
   );
diff --git a/src/components/PeoplePage.tsx b/src/components/PeoplePage.tsx
index b682bad9b..0a3c00429 100644
--- a/src/components/PeoplePage.tsx
+++ b/src/components/PeoplePage.tsx
@@ -1,29 +1,122 @@
+import { useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
+
+import { getPeople } from '../api';
 import { PeopleFilters } from './PeopleFilters';
 import { Loader } from './Loader';
 import { PeopleTable } from './PeopleTable';
+import type { Person } from '../types/Person';
 
 export const PeoplePage = () => {
+  const [loaded, setLoaded] = useState(false);
+  const [hasError, setError] = useState(false);
+  const [people, setPeople] = useState<Person[]>([]);
+  const [searchParams] = useSearchParams();
+
+  const sex = searchParams.get('sex');
+  const query = searchParams.get('query');
+  const centuries = searchParams.getAll('centuries');
+  const sortField = searchParams.get('sort');
+  const isReversed = searchParams.get('order') === 'desc';
+
+  useEffect(() => {
+    setLoaded(false);
+
+    getPeople()
+      .then(peopleFromServer => {
+        const preparedPeople = peopleFromServer.map(p => ({ ...p }));
+
+        preparedPeople.forEach(person => {
+          Object.assign(person, {
+            mother:
+              preparedPeople.find(m => m.name === person.motherName) || null,
+            father:
+              preparedPeople.find(f => f.name === person.fatherName) || null,
+          });
+        });
+
+        setPeople(preparedPeople);
+      })
+      .catch(() => setError(true))
+      .finally(() => setLoaded(true));
+  }, []);
+
+  let visiblePeople = [...people];
+
+  // #region Filtering and sorting
+  if (sex) {
+    visiblePeople = visiblePeople.filter(person => person.sex === sex);
+  }
+
+  if (centuries.length > 0) {
+    const getCentury = (person: Person) => Math.ceil(person.born / 100);
+
+    visiblePeople = visiblePeople.filter(person =>
+      centuries.includes(getCentury(person).toString()),
+    );
+  }
+
+  if (query) {
+    const lowerQuery = query.toLocaleLowerCase();
+
+    visiblePeople = visiblePeople.filter(p => {
+      return [p.name, p.motherName || '', p.fatherName || '']
+        .join('\n')
+        .toLocaleLowerCase()
+        .includes(lowerQuery);
+    });
+  }
+
+  if (sortField) {
+    visiblePeople.sort((a, b) => {
+      switch (sortField) {
+        case 'name':
+        case 'sex':
+          return a[sortField].localeCompare(b[sortField]);
+
+        case 'born':
+        case 'died':
+          return a[sortField] - b[sortField];
+
+        default:
+          return 0;
+      }
+    });
+
+    if (isReversed) {
+      visiblePeople.reverse();
+    }
+  }
+
   return (
     <>
-      <h1 className="title">People Page</h1>
+      <h1 className="title mt-6">People Page</h1>
 
       <div className="block">
         <div className="columns is-desktop is-flex-direction-row-reverse">
-          <div className="column is-7-tablet is-narrow-desktop">
-            <PeopleFilters />
-          </div>
+          {loaded && (
+            <div className="column is-7-tablet is-narrow-desktop">
+              <PeopleFilters />
+            </div>
+          )}
 
           <div className="column">
             <div className="box table-container">
-              <Loader />
-
-              <p data-cy="peopleLoadingError">Something went wrong</p>
+              {!loaded && <Loader />}
 
-              <p data-cy="noPeopleMessage">There are no people on the server</p>
+              {loaded && hasError && (
+                <p data-cy="peopleLoadingError">Something went wrong</p>
+              )}
 
-              <p>There are no people matching the current search criteria</p>
+              {loaded && !hasError && people.length === 0 && (
+                <p data-cy="noPeopleMessage">
+                  There are no people on the server
+                </p>
+              )}
 
-              <PeopleTable />
+              {loaded && !hasError && people.length > 0 && (
+                <PeopleTable people={visiblePeople} />
+              )}
             </div>
           </div>
         </div>
diff --git a/src/components/PeopleTable.tsx b/src/components/PeopleTable.tsx
index fdd814b4a..78b1c7240 100644
--- a/src/components/PeopleTable.tsx
+++ b/src/components/PeopleTable.tsx
@@ -1,5 +1,21 @@
-/* eslint-disable jsx-a11y/control-has-associated-label */
-export const PeopleTable = () => {
+import classNames from 'classnames';
+import { FC } from 'react';
+import { useParams } from 'react-router-dom';
+import { Person } from '../types/Person';
+import { PersonLink } from './PersonLink';
+import { SortLink } from './SortLink';
+
+type Props = {
+  people: Person[];
+};
+
+export const PeopleTable: FC<Props> = ({ people }) => {
+  const { slug } = useParams();
+
+  if (people.length === 0) {
+    return <p>There are no people matching the current search criteria</p>;
+  }
+
   return (
     <table
       data-cy="peopleTable"
@@ -10,44 +26,28 @@ export const PeopleTable = () => {
           <th>
             <span className="is-flex is-flex-wrap-nowrap">
               Name
-              <a href="#/people?sort=name">
-                <span className="icon">
-                  <i className="fas fa-sort" />
-                </span>
-              </a>
+              <SortLink field="name" />
             </span>
           </th>
 
           <th>
             <span className="is-flex is-flex-wrap-nowrap">
               Sex
-              <a href="#/people?sort=sex">
-                <span className="icon">
-                  <i className="fas fa-sort" />
-                </span>
-              </a>
+              <SortLink field="sex" />
             </span>
           </th>
 
           <th>
             <span className="is-flex is-flex-wrap-nowrap">
               Born
-              <a href="#/people?sort=born&amp;order=desc">
-                <span className="icon">
-                  <i className="fas fa-sort-up" />
-                </span>
-              </a>
+              <SortLink field="born" />
             </span>
           </th>
 
           <th>
             <span className="is-flex is-flex-wrap-nowrap">
               Died
-              <a href="#/people?sort=died">
-                <span className="icon">
-                  <i className="fas fa-sort" />
-                </span>
-              </a>
+              <SortLink field="died" />
             </span>
           </th>
 
@@ -57,588 +57,36 @@ export const PeopleTable = () => {
       </thead>
 
       <tbody>
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/pieter-haverbeke-1602">Pieter Haverbeke</a>
-          </td>
-          <td>m</td>
-          <td>1602</td>
-          <td>1642</td>
-          <td>-</td>
-          <td>
-            <a href="#/people/lieven-van-haverbeke-1570">
-              Lieven van Haverbeke
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a className="has-text-danger" href="#/people/anna-van-hecke-1607">
-              Anna van Hecke
-            </a>
-          </td>
-          <td>f</td>
-          <td>1607</td>
-          <td>1670</td>
-          <td>Martijntken Beelaert</td>
-          <td>Paschasius van Hecke</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/lieven-haverbeke-1631">Lieven Haverbeke</a>
-          </td>
-          <td>m</td>
-          <td>1631</td>
-          <td>1676</td>
-          <td>
-            <a className="has-text-danger" href="#/people/anna-van-hecke-1607">
-              Anna van Hecke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/pieter-haverbeke-1602">Pieter Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/elisabeth-hercke-1632"
-            >
-              Elisabeth Hercke
-            </a>
-          </td>
-          <td>f</td>
-          <td>1632</td>
-          <td>1674</td>
-          <td>Margriet de Brabander</td>
-          <td>Willem Hercke</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/daniel-haverbeke-1652">Daniel Haverbeke</a>
-          </td>
-          <td>m</td>
-          <td>1652</td>
-          <td>1723</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/elisabeth-hercke-1632"
-            >
-              Elisabeth Hercke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/lieven-haverbeke-1631">Lieven Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a className="has-text-danger" href="#/people/joanna-de-pape-1654">
-              Joanna de Pape
-            </a>
-          </td>
-          <td>f</td>
-          <td>1654</td>
-          <td>1723</td>
-          <td>Petronella Wauters</td>
-          <td>Vincent de Pape</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a className="has-text-danger" href="#/people/martina-de-pape-1666">
-              Martina de Pape
-            </a>
-          </td>
-          <td>f</td>
-          <td>1666</td>
-          <td>1727</td>
-          <td>Petronella Wauters</td>
-          <td>Vincent de Pape</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/willem-haverbeke-1668">Willem Haverbeke</a>
-          </td>
-          <td>m</td>
-          <td>1668</td>
-          <td>1731</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/elisabeth-hercke-1632"
-            >
-              Elisabeth Hercke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/lieven-haverbeke-1631">Lieven Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/jan-haverbeke-1671">Jan Haverbeke</a>
-          </td>
-          <td>m</td>
-          <td>1671</td>
-          <td>1731</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/elisabeth-hercke-1632"
-            >
-              Elisabeth Hercke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/lieven-haverbeke-1631">Lieven Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person" className="has-background-warning">
-          <td>
-            <a className="has-text-danger" href="#/people/maria-de-rycke-1683">
-              Maria de Rycke
-            </a>
-          </td>
-          <td>f</td>
-          <td>1683</td>
-          <td>1724</td>
-          <td>Laurentia van Vlaenderen</td>
-          <td>Frederik de Rycke</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/livina-haverbeke-1692"
-            >
-              Livina Haverbeke
-            </a>
-          </td>
-          <td>f</td>
-          <td>1692</td>
-          <td>1743</td>
-          <td>
-            <a className="has-text-danger" href="#/people/joanna-de-pape-1654">
-              Joanna de Pape
-            </a>
-          </td>
-          <td>
-            <a href="#/people/daniel-haverbeke-1652">Daniel Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/pieter-bernard-haverbeke-1695">
-              Pieter Bernard Haverbeke
-            </a>
-          </td>
-          <td>m</td>
-          <td>1695</td>
-          <td>1762</td>
-          <td>Petronella Wauters</td>
-          <td>
-            <a href="#/people/willem-haverbeke-1668">Willem Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/lieven-de-causmaecker-1696">
-              Lieven de Causmaecker
-            </a>
-          </td>
-          <td>m</td>
-          <td>1696</td>
-          <td>1724</td>
-          <td>Joanna Claes</td>
-          <td>Carel de Causmaecker</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a className="has-text-danger" href="#/people/jacoba-lammens-1699">
-              Jacoba Lammens
-            </a>
-          </td>
-          <td>f</td>
-          <td>1699</td>
-          <td>1740</td>
-          <td>Livina de Vrieze</td>
-          <td>Lieven Lammens</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/pieter-de-decker-1705">Pieter de Decker</a>
-          </td>
-          <td>m</td>
-          <td>1705</td>
-          <td>1780</td>
-          <td>Petronella van de Steene</td>
-          <td>Joos de Decker</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/laurentia-haverbeke-1710"
-            >
-              Laurentia Haverbeke
-            </a>
-          </td>
-          <td>f</td>
-          <td>1710</td>
-          <td>1786</td>
-          <td>
-            <a className="has-text-danger" href="#/people/maria-de-rycke-1683">
-              Maria de Rycke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/jan-haverbeke-1671">Jan Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/elisabeth-haverbeke-1711"
-            >
-              Elisabeth Haverbeke
-            </a>
-          </td>
-          <td>f</td>
-          <td>1711</td>
-          <td>1754</td>
-          <td>
-            <a className="has-text-danger" href="#/people/maria-de-rycke-1683">
-              Maria de Rycke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/jan-haverbeke-1671">Jan Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/jan-van-brussel-1714">Jan van Brussel</a>
-          </td>
-          <td>m</td>
-          <td>1714</td>
-          <td>1748</td>
-          <td>Joanna van Rooten</td>
-          <td>Jacobus van Brussel</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/bernardus-de-causmaecker-1721">
-              Bernardus de Causmaecker
-            </a>
-          </td>
-          <td>m</td>
-          <td>1721</td>
-          <td>1789</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/livina-haverbeke-1692"
-            >
-              Livina Haverbeke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/lieven-de-causmaecker-1696">
-              Lieven de Causmaecker
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/jan-francies-haverbeke-1725">
-              Jan Francies Haverbeke
-            </a>
-          </td>
-          <td>m</td>
-          <td>1725</td>
-          <td>1779</td>
-          <td>Livina de Vrieze</td>
-          <td>
-            <a href="#/people/pieter-bernard-haverbeke-1695">
-              Pieter Bernard Haverbeke
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/angela-haverbeke-1728"
-            >
-              Angela Haverbeke
-            </a>
-          </td>
-          <td>f</td>
-          <td>1728</td>
-          <td>1734</td>
-          <td>Livina de Vrieze</td>
-          <td>
-            <a href="#/people/pieter-bernard-haverbeke-1695">
-              Pieter Bernard Haverbeke
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/petronella-de-decker-1731"
-            >
-              Petronella de Decker
-            </a>
-          </td>
-          <td>f</td>
-          <td>1731</td>
-          <td>1781</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/livina-haverbeke-1692"
-            >
-              Livina Haverbeke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/pieter-de-decker-1705">Pieter de Decker</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/jacobus-bernardus-van-brussel-1736">
-              Jacobus Bernardus van Brussel
-            </a>
-          </td>
-          <td>m</td>
-          <td>1736</td>
-          <td>1809</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/elisabeth-haverbeke-1711"
-            >
-              Elisabeth Haverbeke
-            </a>
-          </td>
-          <td>
-            <a href="#/people/jan-van-brussel-1714">Jan van Brussel</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/pieter-antone-haverbeke-1753">
-              Pieter Antone Haverbeke
-            </a>
-          </td>
-          <td>m</td>
-          <td>1753</td>
-          <td>1798</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/petronella-de-decker-1731"
-            >
-              Petronella de Decker
-            </a>
-          </td>
-          <td>
-            <a href="#/people/jan-francies-haverbeke-1725">
-              Jan Francies Haverbeke
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/jan-frans-van-brussel-1761">
-              Jan Frans van Brussel
-            </a>
-          </td>
-          <td>m</td>
-          <td>1761</td>
-          <td>1833</td>
-          <td>-</td>
-          <td>
-            <a href="#/people/jacobus-bernardus-van-brussel-1736">
-              Jacobus Bernardus van Brussel
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a className="has-text-danger" href="#/people/livina-sierens-1761">
-              Livina Sierens
-            </a>
-          </td>
-          <td>f</td>
-          <td>1761</td>
-          <td>1826</td>
-          <td>Maria van Waes</td>
-          <td>Jan Sierens</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/joanna-de-causmaecker-1762"
-            >
-              Joanna de Causmaecker
-            </a>
-          </td>
-          <td>f</td>
-          <td>1762</td>
-          <td>1807</td>
-          <td>-</td>
-          <td>
-            <a href="#/people/bernardus-de-causmaecker-1721">
-              Bernardus de Causmaecker
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/carel-haverbeke-1796">Carel Haverbeke</a>
-          </td>
-          <td>m</td>
-          <td>1796</td>
-          <td>1837</td>
-          <td>
-            <a className="has-text-danger" href="#/people/livina-sierens-1761">
-              Livina Sierens
-            </a>
-          </td>
-          <td>
-            <a href="#/people/pieter-antone-haverbeke-1753">
-              Pieter Antone Haverbeke
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/maria-van-brussel-1801"
-            >
-              Maria van Brussel
-            </a>
-          </td>
-          <td>f</td>
-          <td>1801</td>
-          <td>1834</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/joanna-de-causmaecker-1762"
-            >
-              Joanna de Causmaecker
-            </a>
-          </td>
-          <td>
-            <a href="#/people/jan-frans-van-brussel-1761">
-              Jan Frans van Brussel
-            </a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/carolus-haverbeke-1832">Carolus Haverbeke</a>
-          </td>
-          <td>m</td>
-          <td>1832</td>
-          <td>1905</td>
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/maria-van-brussel-1801"
-            >
-              Maria van Brussel
-            </a>
-          </td>
-          <td>
-            <a href="#/people/carel-haverbeke-1796">Carel Haverbeke</a>
-          </td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a className="has-text-danger" href="#/people/maria-sturm-1835">
-              Maria Sturm
-            </a>
-          </td>
-          <td>f</td>
-          <td>1835</td>
-          <td>1917</td>
-          <td>Seraphina Spelier</td>
-          <td>Charles Sturm</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a
-              className="has-text-danger"
-              href="#/people/emma-de-milliano-1876"
-            >
-              Emma de Milliano
-            </a>
-          </td>
-          <td>f</td>
-          <td>1876</td>
-          <td>1956</td>
-          <td>Sophia van Damme</td>
-          <td>Petrus de Milliano</td>
-        </tr>
-
-        <tr data-cy="person">
-          <td>
-            <a href="#/people/emile-haverbeke-1877">Emile Haverbeke</a>
-          </td>
-          <td>m</td>
-          <td>1877</td>
-          <td>1968</td>
-          <td>
-            <a className="has-text-danger" href="#/people/maria-sturm-1835">
-              Maria Sturm
-            </a>
-          </td>
-          <td>
-            <a href="#/people/carolus-haverbeke-1832">Carolus Haverbeke</a>
-          </td>
-        </tr>
+        {people.map(person => (
+          <tr
+            key={person.slug}
+            data-cy="person"
+            className={classNames({
+              'has-background-warning': person.slug === slug,
+            })}
+          >
+            <td>
+              <PersonLink person={person} />
+            </td>
+            <td>{person.sex}</td>
+            <td>{person.born}</td>
+            <td>{person.died}</td>
+            <td>
+              {person.mother ? (
+                <PersonLink person={person.mother} />
+              ) : (
+                person.motherName || '-'
+              )}
+            </td>
+            <td>
+              {person.father ? (
+                <PersonLink person={person.father} />
+              ) : (
+                person.fatherName || '-'
+              )}
+            </td>
+          </tr>
+        ))}
       </tbody>
     </table>
   );
diff --git a/src/components/PersonLink.tsx b/src/components/PersonLink.tsx
new file mode 100644
index 000000000..e640f8a79
--- /dev/null
+++ b/src/components/PersonLink.tsx
@@ -0,0 +1,26 @@
+import classNames from 'classnames';
+import { FC } from 'react';
+import { Link, useLocation } from 'react-router-dom';
+import { Person } from '../types/Person';
+
+type Props = {
+  person: Person;
+};
+
+export const PersonLink: FC<Props> = ({ person }) => {
+  const { search } = useLocation();
+
+  return (
+    <Link
+      to={{
+        pathname: `/people/${person.slug}`,
+        search,
+      }}
+      className={classNames({
+        'has-text-danger': person.sex === 'f',
+      })}
+    >
+      {person.name}
+    </Link>
+  );
+};
diff --git a/src/components/SortLink.tsx b/src/components/SortLink.tsx
new file mode 100644
index 000000000..0cbb21605
--- /dev/null
+++ b/src/components/SortLink.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import classNames from 'classnames';
+import { useSearchParams } from 'react-router-dom';
+import { SearchLink } from './SearchLink';
+
+type SortLinkProps = {
+  field: string;
+};
+
+export const SortLink: React.FC<SortLinkProps> = ({ field }) => {
+  const [searchParams] = useSearchParams();
+  const sortField = searchParams.get('sort') || '';
+  const isReversed = searchParams.get('order') === 'desc';
+
+  const params = {
+    sort: field === sortField && isReversed ? null : field,
+    order: field === sortField && !isReversed ? 'desc' : null,
+  };
+
+  return (
+    <SearchLink params={params}>
+      <span className="icon">
+        <i
+          className={classNames('fas', {
+            'fa-sort': sortField !== field,
+            'fa-sort-up': sortField === field && !isReversed,
+            'fa-sort-down': sortField === field && isReversed,
+          })}
+        />
+      </span>
+    </SearchLink>
+  );
+};

From 5a1a368e89411b3a7433cfb0f5c8c4f2c2d8e658 Mon Sep 17 00:00:00 2001
From: Rupert Wisdom <rupert.wisdom@yahoo.com>
Date: Thu, 2 Jul 2026 08:13:58 -0400
Subject: [PATCH 2/2] Refactor component formatting for consistency and
 readability

---
 src/components/CenturyFilter.tsx | 70 ++++++++++++++++----------------
 src/components/NameFilter.tsx    | 12 +++---
 src/components/Navbar.tsx        |  1 -
 src/components/PeopleFilters.tsx |  4 +-
 4 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/src/components/CenturyFilter.tsx b/src/components/CenturyFilter.tsx
index 49face8e1..abdcfb99f 100644
--- a/src/components/CenturyFilter.tsx
+++ b/src/components/CenturyFilter.tsx
@@ -5,41 +5,41 @@ import { SearchLink } from './SearchLink';
 const AVAILABLE_CENTURIES = ['16', '17', '18', '19', '20'];
 
 export const CenturyFilter = () => {
-    const [searchParams] = useSearchParams();
-    const centuries = searchParams.getAll('centuries');
+  const [searchParams] = useSearchParams();
+  const centuries = searchParams.getAll('centuries');
 
-    return (
-        <div className="level is-flex-grow-1 is-mobile" data-cy="CenturyFilter">
-            <div className="level-left">
-            {AVAILABLE_CENTURIES.map(century => (
-                <SearchLink
-                data-cy="century"
-                key={century}
-                className={classNames('button', 'mr-1', {
-                'is-info': centuries.includes(century),
-                })}
-                params={{
-                centuries: centuries.includes(century) // if this century is already selected
-                    ? centuries.filter(c => c !== century) // we remove it from the selected
-                    : [...centuries, century], // otherwise we add it to the selected
-                }}
-                >
-                {century}
-                </SearchLink>
-            ))}
-        </div>
+  return (
+    <div className="level is-flex-grow-1 is-mobile" data-cy="CenturyFilter">
+      <div className="level-left">
+        {AVAILABLE_CENTURIES.map(century => (
+          <SearchLink
+            data-cy="century"
+            key={century}
+            className={classNames('button', 'mr-1', {
+              'is-info': centuries.includes(century),
+            })}
+            params={{
+              centuries: centuries.includes(century) // if this century is already selected
+                ? centuries.filter(c => c !== century) // we remove it from the selected
+                : [...centuries, century], // otherwise we add it to the selected
+            }}
+          >
+            {century}
+          </SearchLink>
+        ))}
+      </div>
 
-        <div className="level-right ml-4">
-            <SearchLink
-                data-cy="centuryALL"
-                params={{ centuries: null }}
-                className={classNames('button', 'is-success', {
-                'is-outlined': centuries.length > 0,
-                })}
-            >
-            All
-            </SearchLink>
-            </div>
-        </div>
-    );
+      <div className="level-right ml-4">
+        <SearchLink
+          data-cy="centuryALL"
+          params={{ centuries: null }}
+          className={classNames('button', 'is-success', {
+            'is-outlined': centuries.length > 0,
+          })}
+        >
+          All
+        </SearchLink>
+      </div>
+    </div>
+  );
 };
diff --git a/src/components/NameFilter.tsx b/src/components/NameFilter.tsx
index 97e559868..3c85d9086 100644
--- a/src/components/NameFilter.tsx
+++ b/src/components/NameFilter.tsx
@@ -10,11 +10,13 @@ export const NameFilter = () => {
       <input
         data-cy="NameFilter"
         value={query}
-        onChange={event => setSearchParams(
-          getSearchWith(searchParams, {
-            query: event.target.value || null,
-          }),
-        )}
+        onChange={event =>
+          setSearchParams(
+            getSearchWith(searchParams, {
+              query: event.target.value || null,
+            }),
+          )
+        }
         className="input"
         type="text"
         placeholder="Search"
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 3a590afce..bc8a1c362 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -13,7 +13,6 @@ const getNavLinkClassName = ({ isActive }: Status) => {
 
 export const Navbar = () => {
   const location = useLocation();
-  console.log('location', location.pathname);
 
   return (
     <nav
diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx
index de07da5f6..7a1c9129c 100644
--- a/src/components/PeopleFilters.tsx
+++ b/src/components/PeopleFilters.tsx
@@ -11,9 +11,7 @@ export const PeopleFilters = () => {
 
   return (
     <nav className="panel">
-      <p className="panel-heading">
-        Filters
-      </p>
+      <p className="panel-heading">Filters</p>
 
       <p className="panel-tabs" data-cy="SexFilter">
         <SearchLink