made people-table-advanced

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://sintax1s.github.io/react_people-table-advanced/) and add it to the PR description.

src/App.tsx

@@ -1,3 +1,4 @@
+import { Routes, Route, Navigate } from 'react-router-dom';
 import { PeoplePage } from './components/PeoplePage';
 import { Navbar } from './components/Navbar';
 
@@ -10,9 +11,17 @@ export const App = () => {
 
       <div className="section">
         <div className="container">
-          <h1 className="title">Home Page</h1>
-          <h1 className="title">Page not found</h1>
-          <PeoplePage />
+          <Routes>
+            <Route path="/" element={<h1 className="title">Home Page</h1>} />
+            <Route path="/home" element={<Navigate to="/" replace />} />
+            <Route path="people" element={<PeoplePage />}>
+              <Route path=":personSlug?" element={<PeoplePage />} />
+            </Route>
+            <Route
+              path="*"
+              element={<h1 className="title">Page not found</h1>}
+            />
+          </Routes>
         </div>
       </div>
     </div>

src/components/Navbar.tsx

@@ -1,4 +1,15 @@
+import { NavLink } from 'react-router-dom';
+import cn from 'classnames';
+
+interface NavLinkProps {
+  isActive?: boolean;
+}
+
 export const Navbar = () => {
+  const getClass = ({ isActive }: NavLinkProps) => {
+    return cn('navbar-item', { 'has-background-grey-lighter': isActive });
+  };
+
   return (
     <nav
       data-cy="nav"
@@ -8,15 +19,15 @@ export const Navbar = () => {
     >
       <div className="container">
         <div className="navbar-brand">
-          <a className="navbar-item" href="#/">Home</a>
+          <NavLink className={getClass} to="/">Home</NavLink>
 
-          <a
+          <NavLink
             aria-current="page"
-            className="navbar-item has-background-grey-lighter"
-            href="#/people"
+            className={getClass}
+            to="people"
           >
             People
-          </a>
+          </NavLink>
         </div>
       </div>
     </nav>

src/components/PeopleFilters.tsx

@@ -1,12 +1,74 @@
-export const PeopleFilters = () => {
+import { Link, useSearchParams } from 'react-router-dom';
+import cn from 'classnames';
+import { getSearchWith } from '../utils/searchHelper';
+
+const centuriesArray = [
+  '16', '17', '18', '19', '20',
+];
+
+export const PeopleFilters: React.FC = () => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const centuries = searchParams.getAll('centuries') || [];
+  const sex = searchParams.get('sex') || 'All';
+  const query = searchParams.get('query') || '';
+
+  const toggleCenturies = (century: string) => {
+    if (!century) {
+      return getSearchWith(searchParams, {
+        centuries: [],
+      });
+    }
+
+    return getSearchWith(searchParams, {
+      centuries: centuries.includes(century)
+        ? centuries.filter(ch => ch !== century)
+        : [...centuries, century],
+    });
+  };
+
+  const toggleSex = (newSex: string | null) => {
+    if (newSex === 'All') {
+      return getSearchWith(searchParams, { sex: null });
+    }
+
+    return getSearchWith(searchParams, { sex: newSex });
+  };
+
+  const toggleQuery = (newQuery: string) => {
+    const search = getSearchWith(searchParams, { query: newQuery });
+
+    setSearchParams(search);
+  };
+
+  const toggleAllReset = () => {
+    return getSearchWith(
+      searchParams, { query: null, centuries: [], sex: null },
+    );
+  };
+
   return (
     <nav className="panel">
       <p className="panel-heading">Filters</p>
 
       <p className="panel-tabs" data-cy="SexFilter">
-        <a className="is-active" href="#/people">All</a>
-        <a className="" href="#/people?sex=m">Male</a>
-        <a className="" href="#/people?sex=f">Female</a>
+        <Link
+          className={cn({ 'is-active': sex === 'All' })}
+          to={{ search: toggleSex('All') }}
+        >
+          All
+        </Link>
+        <Link
+          className={cn({ 'is-active': sex === 'm' })}
+          to={{ search: toggleSex('m') }}
+        >
+          Male
+        </Link>
+        <Link
+          className={cn({ 'is-active': sex === 'f' })}
+          to={{ search: toggleSex('f') }}
+        >
+          Female
+        </Link>
       </p>
 
       <div className="panel-block">
@@ -16,6 +78,8 @@ export const PeopleFilters = () => {
             type="search"
             className="input"
             placeholder="Search"
+            value={query}
+            onChange={(event) => toggleQuery(event.target.value)}
           />
 
           <span className="icon is-left">
@@ -27,66 +91,43 @@ export const PeopleFilters = () => {
       <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>
+            {centuriesArray.map((century) => (
+              <Link
+                data-cy="century"
+                className={cn('button mr-1', {
+                  'is-info': centuries.includes(century),
+                })}
+                to={{
+                  search: toggleCenturies(century),
+                }}
+              >
+                {century}
+              </Link>
+            ))}
           </div>
 
           <div className="level-right ml-4">
-            <a
+            <Link
               data-cy="centuryALL"
-              className="button is-success is-outlined"
-              href="#/people"
+              className={cn('button is-success', {
+                'is-outlined': centuries.length,
+              })}
+              to={{ search: toggleCenturies('') }}
+
             >
               All
-            </a>
+            </Link>
           </div>
         </div>
       </div>
 
       <div className="panel-block">
-        <a
+        <Link
           className="button is-link is-outlined is-fullwidth"
-          href="#/people"
+          to={{ search: toggleAllReset() }}
         >
           Reset all filters
-        </a>
+        </Link>
       </div>
     </nav>
   );

src/components/PeoplePage.tsx

@@ -1,31 +1,120 @@
+import { useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import { PeopleFilters } from './PeopleFilters';
 import { Loader } from './Loader';
 import { PeopleTable } from './PeopleTable';
+import { Person } from '../types';
+import { getPeople } from '../api';
 
 export const PeoplePage = () => {
+  const [people, setPeople] = useState<Person[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [isError, setIsError] = useState(false);
+
+  const [searchParams] = useSearchParams();
+  const centuries = searchParams.getAll('centuries') || [];
+  const sex = searchParams.get('sex') || 'All';
+  const query = searchParams.get('query') || '';
+  const sort = searchParams.get('sort') || '';
+  const order = searchParams.get('order') || '';
+
+  useEffect(() => {
+    setIsLoading(true);
+
+    getPeople()
+      .then((peopleFromServer) => setPeople(peopleFromServer))
+      .catch(() => setIsError(true))
+      .finally(() => setIsLoading(false));
+  }, []);
+
+  const getFilteredPeople = () => {
+    let filteredPeople = [...people];
+
+    if (centuries.length) {
+      filteredPeople = filteredPeople.filter(
+        person => centuries.includes(
+          Math.ceil(person.born / 100).toString(),
+        ),
+      );
+    }
+
+    if (sex !== 'All') {
+      filteredPeople = filteredPeople.filter(person => person.sex === sex);
+    }
+
+    if (query) {
+      const validQuery = query.toLocaleLowerCase().trim();
+
+      filteredPeople = filteredPeople.filter(
+        (person) => person.name.toLocaleLowerCase().includes(validQuery)
+      || person.fatherName?.toLocaleLowerCase().includes(validQuery)
+      || person.motherName?.toLocaleLowerCase().includes(validQuery),
+      );
+    }
+
+    if (sort) {
+      switch (sort) {
+        case 'name':
+        case 'sex':
+          filteredPeople = filteredPeople.sort((person1, person2) => {
+            return (order === 'desc')
+              ? person2[sort].localeCompare(person1[sort])
+              : person1[sort].localeCompare(person2[sort]);
+          });
+          break;
+        case 'born':
+        case 'died':
+          filteredPeople = filteredPeople.sort((person1, person2) => {
+            return (order === 'desc')
+              ? person2[sort] - person1[sort]
+              : person1[sort] - person2[sort];
+          });
+          break;
+        default:
+      }
+    }
+
+    return filteredPeople;
+  };
+
+  const visiblePeople = getFilteredPeople();
+
   return (
     <>
       <h1 className="title">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 />
+            {!isLoading && (
+              <PeopleFilters />
+            )}
           </div>
 
           <div className="column">
             <div className="box table-container">
-              <Loader />
-
-              <p data-cy="peopleLoadingError">Something went wrong</p>
-
-              <p data-cy="noPeopleMessage">
-                There are no people on the server
-              </p>
+              {isLoading && (
+                <Loader />
+              )}
 
-              <p>There are no people matching the current search criteria</p>
+              {isError && (
+                <p data-cy="peopleLoadingError">Something went wrong</p>
+              )}
+              {!isLoading && !isError && !people.length && (
+                <p data-cy="noPeopleMessage">
+                  There are no people on the server
+                </p>
+              )}
+              {!visiblePeople.length && !isLoading && (
+                <p>There are no people matching the current search criteria</p>
+              )}
+              {!isLoading && !isError && !!visiblePeople.length && (
+                <PeopleTable
+                  people={people}
+                  visiblePeople={visiblePeople}
+                />
+              )}
 
-              <PeopleTable />
             </div>
           </div>
         </div>