Develop

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

package.json

@@ -11,7 +11,7 @@
     "classnames": "^2.3.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.15.0",
+    "react-router-dom": "^6.16.0",
     "react-scripts": "4.0.3"
   },
   "devDependencies": {

src/App.tsx

@@ -1,20 +1,18 @@
-import { PeoplePage } from './components/PeoplePage';
-import { Navbar } from './components/Navbar';
-
 import './App.scss';
+import { Outlet } from 'react-router-dom';
+import { Navbar } from './components/Navbar';
+import { PeopleProvider } from './store/PeopleContext';
 
-export const App = () => {
-  return (
+export const App = () => (
+  <PeopleProvider>
     <div data-cy="app">
       <Navbar />
 
-      <div className="section">
+      <main className="section">
         <div className="container">
-          <h1 className="title">Home Page</h1>
-          <h1 className="title">Page not found</h1>
-          <PeoplePage />
+          <Outlet />
         </div>
-      </div>
+      </main>
     </div>
-  );
-};
+  </PeopleProvider>
+);

src/Root.tsx

@@ -0,0 +1,27 @@
+import {
+  HashRouter as Router,
+  Routes,
+  Route,
+  Navigate,
+} from 'react-router-dom';
+
+import { App } from './App';
+
+import { HomePage } from './pages/HomePage';
+import { PeoplePage } from './pages/PeoplePage';
+import { NotFoundPage } from './pages/NotFoundPage';
+
+export const Root = () => (
+  <Router>
+    <Routes>
+      <Route path="/" element={<App />}>
+        <Route path="*" element={<NotFoundPage />} />
+        <Route index element={<HomePage />} />
+        <Route path="home" element={<Navigate to="/" replace />} />
+        <Route path="people" element={<PeoplePage />}>
+          <Route path=":personId?" />
+        </Route>
+      </Route>
+    </Routes>
+  </Router>
+);

src/components/HomePage.tsx

@@ -0,0 +1,10 @@
+import { Navigate } from 'react-router-dom';
+
+export const HomePage = () => {
+  return (
+    <>
+      <h1 className="title">Home Page</h1>
+      <Navigate to="/" replace />
+    </>
+  );
+};

src/components/Navbar.tsx

@@ -1,24 +1,34 @@
-export const Navbar = () => {
-  return (
-    <nav
-      data-cy="nav"
-      className="navbar is-fixed-top has-shadow"
-      role="navigation"
-      aria-label="main navigation"
-    >
-      <div className="container">
-        <div className="navbar-brand">
-          <a className="navbar-item" href="#/">Home</a>
+import cn from 'classnames';
+import { NavLink } from 'react-router-dom';
 
-          <a
-            aria-current="page"
-            className="navbar-item has-background-grey-lighter"
-            href="#/people"
-          >
-            People
-          </a>
-        </div>
+const getLinkClass = ({ isActive }: { isActive: boolean }) => cn(
+  'navbar-item',
+  { 'has-background-grey-lighter': isActive },
+);
+
+export const Navbar = () => (
+  <nav
+    data-cy="nav"
+    className="navbar is-fixed-top has-shadow"
+    role="navigation"
+    aria-label="main navigation"
+  >
+    <div className="container">
+      <div className="navbar-brand">
+        <NavLink
+          className={getLinkClass}
+          to="/"
+        >
+          Home
+        </NavLink>
+
+        <NavLink
+          className={getLinkClass}
+          to="/people"
+        >
+          People
+        </NavLink>
       </div>
-    </nav>
-  );
-};
+    </div>
+  </nav>
+);

src/components/PeopleFilters.tsx

@@ -1,12 +1,56 @@
+import cn from 'classnames';
+import { useSearchParams } from 'react-router-dom';
+import { getSearchWith } from '../utils/searchHelper';
+import { SearchLink } from './SearchLink';
+import {
+  CENTURIES,
+  EMPTY_STRING,
+  SEX_FEMALE,
+  SEX_MALE,
+} from '../utils/constants';
+
 export const PeopleFilters = () => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const query = searchParams.get('query')?.trim() || '';
+  const centuries = searchParams.getAll('centuries') || [];
+
+  function handleQueryChange(event: React.ChangeEvent<HTMLInputElement>) {
+    setSearchParams(getSearchWith(searchParams, {
+      query: event.target.value || 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>
+        <SearchLink
+          className={cn({
+            'is-active': searchParams.get('sex') === EMPTY_STRING,
+          })}
+          params={{ sex: EMPTY_STRING }}
+        >
+          All
+        </SearchLink>
+
+        <SearchLink
+          className={cn({
+            'is-active': searchParams.get('sex') === SEX_MALE,
+          })}
+          params={{ sex: SEX_MALE }}
+        >
+          Male
+        </SearchLink>
+
+        <SearchLink
+          className={cn({
+            'is-active': searchParams.get('sex') === SEX_FEMALE,
+          })}
+          params={{ sex: SEX_FEMALE }}
+        >
+          Female
+        </SearchLink>
       </p>
 
       <div className="panel-block">
@@ -16,6 +60,8 @@ export const PeopleFilters = () => {
             type="search"
             className="input"
             placeholder="Search"
+            value={query}
+            onChange={handleQueryChange}
           />
 
           <span className="icon is-left">
@@ -27,66 +73,49 @@ 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>
+            {CENTURIES.map((century) => {
+              const newCenturies = centuries.includes(century)
+                ? centuries.filter(epoch => epoch !== century)
+                : [...centuries, century];
 
-            <a
-              data-cy="century"
-              className="button mr-1"
-              href="#/people?centuries=20"
-            >
-              20
-            </a>
+              return (
+                <SearchLink
+                  key={century}
+                  data-cy="century"
+                  className={cn('button', 'mr-1', {
+                    'is-info': centuries.includes(century),
+                  })}
+                  params={{ centuries: newCenturies }}
+                >
+                  {century}
+                </SearchLink>
+              );
+            })}
           </div>
 
           <div className="level-right ml-4">
-            <a
+            <SearchLink
               data-cy="centuryALL"
-              className="button is-success is-outlined"
-              href="#/people"
+              className={cn(
+                'button',
+                'is-success',
+                { 'is-outlined': centuries.length },
+              )}
+              params={{ centuries: [] }}
             >
               All
-            </a>
+            </SearchLink>
           </div>
         </div>
       </div>
 
       <div className="panel-block">
-        <a
+        <SearchLink
           className="button is-link is-outlined is-fullwidth"
-          href="#/people"
+          params={{ sex: null, centuries: [], query: null }}
         >
           Reset all filters
-        </a>
+        </SearchLink>
       </div>
     </nav>
   );