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

src/App.tsx

@@ -1,20 +1,23 @@
 import { PeoplePage } from './components/PeoplePage';
-import { Navbar } from './components/Navbar';
 
 import './App.scss';
+import React from 'react';
+import { Navigate, Route, Routes } from 'react-router-dom';
+import { Layout } from './components/Layout';
+import { HomePageComponent } from './components/HomePageComponent';
+import { NotFoundPage } from './components/NotFoundPage';
 
 export const App = () => {
   return (
-    <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>
-    </div>
+    <Layout>
+      <Routes>
+        <Route path="/" element={<HomePageComponent />} />
+        <Route path="/home" element={<Navigate to={'/'} />} />
+        <Route path="/people" element={<PeoplePage />}>
+          <Route path="/people/:slug" element={<PeoplePage />} />
+        </Route>
+        <Route path="*" element={<NotFoundPage />} />
+      </Routes>
+    </Layout>
   );
 };

src/components/ErrorComponent.tsx

@@ -0,0 +1,25 @@
+/* eslint-disable max-len */
+import React from 'react';
+import { ErrorMessages } from './PeoplePage';
+
+interface ErrorComponentProps {
+  message: ErrorMessages;
+}
+
+export function ErrorComponent({ message }: ErrorComponentProps) {
+  return (
+    <>
+      {message === ErrorMessages.SOMETHING_WENT_WRONG && (
+        <p data-cy="peopleLoadingError">{ErrorMessages.SOMETHING_WENT_WRONG}</p>
+      )}
+      {message === ErrorMessages.NO_PEOPLE && (
+        <p data-cy="noPeopleMessage">{ErrorMessages.NO_PEOPLE}</p>
+      )}
+      {message === ErrorMessages.NO_PEOPLE_MATCHING_CRITERIA && (
+        <p data-cy="noPeopleMessage">
+          {ErrorMessages.NO_PEOPLE_MATCHING_CRITERIA}
+        </p>
+      )}
+    </>
+  );
+}

src/components/HomePageComponent.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+export function HomePageComponent() {
+  return <h1 className="title">Home Page</h1>;
+}

src/components/Layout.tsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import { Navbar } from './Navbar';
+
+export function Layout({ children }: { children: React.ReactNode }) {
+  return (
+    <div data-cy="app">
+      <Navbar />
+
+      <div className="section">
+        <div className="container">{children}</div>
+      </div>
+    </div>
+  );
+}

src/components/Navbar.tsx

@@ -1,4 +1,9 @@
+import React from 'react';
+import { useLocation } from 'react-router-dom';
+
 export const Navbar = () => {
+  const path = useLocation().pathname;
+
   return (
     <nav
       data-cy="nav"
@@ -8,13 +13,16 @@ export const Navbar = () => {
     >
       <div className="container">
         <div className="navbar-brand">
-          <a className="navbar-item" href="#/">
+          <a
+            className={`navbar-item ${path.includes('home') || path === '/' ? 'has-background-grey-lighter' : ''}`}
+            href="#/"
+          >
             Home
           </a>
 
           <a
             aria-current="page"
-            className="navbar-item has-background-grey-lighter"
+            className={`navbar-item ${path.includes('people') ? 'has-background-grey-lighter' : ''}`}
             href="#/people"
           >
             People

src/components/NotFoundPage.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+export function NotFoundPage() {
+  return <h1 className="title">Page not found</h1>;
+}

src/components/PeopleFilters.tsx

@@ -1,18 +1,72 @@
+import React from 'react';
+import { Link, useLocation, useSearchParams } from 'react-router-dom';
+import { getSearchWith, SearchParams } from '../utils/searchHelper';
+
 export const PeopleFilters = () => {
+  const availableCenturies = [16, 17, 18, 19, 20];
+
+  const pathName = useLocation().pathname;
+  const [searchParams, setSearchParams] = useSearchParams();
+  const sex = searchParams.get('sex');
+  const searchInputValue = searchParams.get('query');
+  const centuries = searchParams.getAll('centuries');
+
+  function setParamsWith(params: SearchParams) {
+    const search = getSearchWith(searchParams, params);
+
+    setSearchParams(search);
+
+    return search;
+  }
+
+  function handleSearchInputChange(event: React.ChangeEvent<HTMLInputElement>) {
+    const query = event.target.value === '' ? null : event.target.value;
+
+    const search = setParamsWith({ query });
+
+    setSearchParams(search);
+  }
+
+  function handleAddNewCentury(century: number) {
+    const newCenturies = centuries.includes(century.toString())
+      ? centuries.filter(c => c !== century.toString())
+      : [...centuries, century.toString()];
+
+    return newCenturies;
+  }
+
   return (
     <nav className="panel">
       <p className="panel-heading">Filters</p>
 
       <p className="panel-tabs" data-cy="SexFilter">
-        <a className="is-active" href="#/people">
+        <Link
+          className={`${sex ? '' : 'is-active'}`}
+          to={{
+            pathname: pathName,
+            search: `${getSearchWith(searchParams, { sex: null })}`,
+          }}
+        >
           All
-        </a>
-        <a className="" href="#/people?sex=m">
+        </Link>
+        <Link
+          className={`${sex === 'm' ? 'is-active' : ''}`}
+          to={{
+            pathname: pathName,
+            search: `${getSearchWith(searchParams, { sex: 'm' })}`,
+          }}
+        >
           Male
-        </a>
-        <a className="" href="#/people?sex=f">
+        </Link>
+        <Link
+          className={`${sex === 'f' ? 'is-active' : ''}`}
+          to={{
+            pathname: pathName,
+            search: `${getSearchWith(searchParams, { sex: 'f' })}`,
+          }}
+        >
           Female
-        </a>
+        </Link>
       </p>
 
       <div className="panel-block">
@@ -22,6 +76,8 @@ export const PeopleFilters = () => {
             type="search"
             className="input"
             placeholder="Search"
+            value={searchInputValue || ''}
+            onChange={handleSearchInputChange}
           />
 
           <span className="icon is-left">
@@ -33,63 +89,48 @@ 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>
+            {availableCenturies.map(century => (
+              <Link
+                key={`century-${century}`}
+                className={`button mr-1 ${centuries.includes(century.toString()) ? 'is-info' : ''}`}
+                to={{
+                  pathname: pathName,
+                  search: `${getSearchWith(searchParams, { centuries: handleAddNewCentury(century) })}`,
+                }}
+              >
+                {century}
+              </Link>
+            ))}
           </div>
-
           <div className="level-right ml-4">
-            <a
+            <Link
               data-cy="centuryALL"
-              className="button is-success is-outlined"
-              href="#/people"
+              className={`button is-success ${centuries.length !== 0 ? 'is-outlined' : ''}`}
+              to={{
+                pathname: pathName,
+                search: `${getSearchWith(searchParams, { centuries: [] })}`,
+              }}
             >
               All
-            </a>
+            </Link>
           </div>
         </div>
       </div>
 
       <div className="panel-block">
-        <a className="button is-link is-outlined is-fullwidth" href="#/people">
+        <Link
+          className="button is-link is-outlined is-fullwidth"
+          to={{
+            pathname: pathName,
+            search: getSearchWith(searchParams, {
+              centuries: [],
+              sex: null,
+              query: null,
+            }),
+          }}
+        >
           Reset all filters
-        </a>
+        </Link>
       </div>
     </nav>
   );