From e07fa0f4573f24a17b041fecfd82977f9f80ae50 Mon Sep 17 00:00:00 2001
From: Sasha Yatsykovych <olexandr.y@mate.academy>
Date: Mon, 28 Nov 2022 07:39:38 +0200
Subject: [PATCH 1/7] version 1

---
 src/App.tsx                                 | 43 +++++------
 src/components/PeopleTable/PeopleTable.scss |  3 +
 src/components/PeopleTable/PeopleTable.tsx  | 81 +++++++++++++++++++++
 3 files changed, 106 insertions(+), 21 deletions(-)
 create mode 100644 src/components/PeopleTable/PeopleTable.scss
 create mode 100644 src/components/PeopleTable/PeopleTable.tsx

diff --git a/src/App.tsx b/src/App.tsx
index f6361547..1c3ce1fa 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -5,34 +5,35 @@ import 'bulma/css/bulma.css';
 import './App.scss';
 
 import peopleFromServer from './people.json';
+import { Person } from './types/Person';
+import { PeopleTable } from './components/PeopleTable/PeopleTable';
+import { Loader } from './components/Loader';
 
-export class App extends React.Component {
-  state = {};
+interface State {
+  people: Person[],
+}
+
+export class App extends React.Component<{}, State> {
+  state: Readonly<State> = {
+    people: [],
+  };
+
+  componentDidMount() {
+    setTimeout(() => {
+      this.setState({ people: peopleFromServer });
+    }, 1000);
+  }
 
   render() {
+    const { people } = this.state;
+
     return (
       <div className="box">
         <h1 className="title">People table</h1>
 
-        <table className="table is-striped is-narrow">
-          <thead>
-            <tr>
-              <th>name</th>
-              <th>sex</th>
-              <th>born</th>
-            </tr>
-          </thead>
-
-          <tbody>
-            {peopleFromServer.map(person => (
-              <tr key={person.slug}>
-                <td>{person.name}</td>
-                <td>{person.sex}</td>
-                <td>{person.born}</td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
+        {people.length > 0
+          ? <PeopleTable people={people} />
+          : <Loader />}
       </div>
     );
   }
diff --git a/src/components/PeopleTable/PeopleTable.scss b/src/components/PeopleTable/PeopleTable.scss
new file mode 100644
index 00000000..6cb93e78
--- /dev/null
+++ b/src/components/PeopleTable/PeopleTable.scss
@@ -0,0 +1,3 @@
+.isSelected {
+  background-color: yellowgreen;
+}
diff --git a/src/components/PeopleTable/PeopleTable.tsx b/src/components/PeopleTable/PeopleTable.tsx
new file mode 100644
index 00000000..4f8bd7d7
--- /dev/null
+++ b/src/components/PeopleTable/PeopleTable.tsx
@@ -0,0 +1,81 @@
+import { Component } from 'react';
+import classNames from 'classnames';
+
+import { Person } from '../../types/Person';
+import './PeopleTable.scss';
+
+interface Props {
+  people: Person[]
+}
+
+interface State {
+  selectedPerson: Person | null;
+}
+
+export class PeopleTable extends Component<Props, State> {
+  state: Readonly<State> = {
+    selectedPerson: null,
+  };
+
+  handlePersonSelection = (person: Person | null) => {
+    this.setState({ selectedPerson: person });
+  }
+
+  isSelected = (person: Person) => {
+    return person.slug === this.state.selectedPerson?.slug;
+  }
+
+  render() {
+    const { isSelected } = this;
+    const { people } = this.props;
+    const { selectedPerson } = this.state;
+
+    return (
+      <table className="table is-striped is-narrow">
+        <caption>{selectedPerson?.name || 'Nobody selected'}</caption>
+        <thead>
+          <tr>
+            <th>-</th>
+            <th>name</th>
+            <th>sex</th>
+            <th>born</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          {people.map(person => (
+            <tr
+              key={person.slug}
+              className={classNames('Person', {
+                isSelected: isSelected(person),
+              })}
+            >
+              <td>
+                {isSelected(person)
+                  ? (
+                    <button
+                      type="button"
+                      onClick={() => this.handlePersonSelection(null)}
+                    >
+                      -
+                    </button>
+                  )
+                  : (
+                    <button
+                      type="button"
+                      onClick={() => this.handlePersonSelection(person)}
+                    >
+                      +
+                    </button>
+                  )}
+              </td>
+              <td>{person.name}</td>
+              <td>{person.sex}</td>
+              <td>{person.born}</td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    );
+  }
+}

From b01b9d7d127108b1acf167c586c8b732449540dc Mon Sep 17 00:00:00 2001
From: Sasha Yatsykovych <olexandr.y@mate.academy>
Date: Wed, 30 Nov 2022 08:40:59 +0200
Subject: [PATCH 2/7] versino 2

---
 src/App.tsx                                |  40 ++--
 src/components/PeopleTable/PeopleTable.tsx | 218 ++++++++++++++-------
 2 files changed, 162 insertions(+), 96 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 1c3ce1fa..33474132 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,40 +1,28 @@
-import React from 'react';
+import { FC, useEffect, useState } from 'react';
 
 import '@fortawesome/fontawesome-free/css/all.css';
 import 'bulma/css/bulma.css';
 import './App.scss';
 
-import peopleFromServer from './people.json';
-import { Person } from './types/Person';
 import { PeopleTable } from './components/PeopleTable/PeopleTable';
 import { Loader } from './components/Loader';
 
-interface State {
-  people: Person[],
-}
+export const App: FC = () => {
+  const [isLoaded, setIsLoaded] = useState(false);
 
-export class App extends React.Component<{}, State> {
-  state: Readonly<State> = {
-    people: [],
-  };
-
-  componentDidMount() {
+  useEffect(() => {
     setTimeout(() => {
-      this.setState({ people: peopleFromServer });
+      setIsLoaded(true);
     }, 1000);
-  }
+  }, []);
 
-  render() {
-    const { people } = this.state;
+  return (
+    <div className="box">
+      <h1 className="title">People table</h1>
 
-    return (
-      <div className="box">
-        <h1 className="title">People table</h1>
+      {!isLoaded && <Loader />}
 
-        {people.length > 0
-          ? <PeopleTable people={people} />
-          : <Loader />}
-      </div>
-    );
-  }
-}
+      {isLoaded && <PeopleTable />}
+    </div>
+  );
+};
diff --git a/src/components/PeopleTable/PeopleTable.tsx b/src/components/PeopleTable/PeopleTable.tsx
index 4f8bd7d7..4b3300c2 100644
--- a/src/components/PeopleTable/PeopleTable.tsx
+++ b/src/components/PeopleTable/PeopleTable.tsx
@@ -1,81 +1,159 @@
-import { Component } from 'react';
+import { useState } from 'react';
 import classNames from 'classnames';
 
+import peopleFromServer from '../../people.json';
 import { Person } from '../../types/Person';
 import './PeopleTable.scss';
 
-interface Props {
-  people: Person[]
-}
+export const PeopleTable = () => {
+  const [people, setPeople] = useState<Person[]>(peopleFromServer);
+  const [selectedPeople, setSelectedPeople] = useState<Person[]>([]);
 
-interface State {
-  selectedPerson: Person | null;
-}
+  const handlePersonSelection = (personToAdd: Person) => {
+    setSelectedPeople((prevSelectedPeople) => ([
+      ...prevSelectedPeople,
+      personToAdd,
+    ]));
+  };
 
-export class PeopleTable extends Component<Props, State> {
-  state: Readonly<State> = {
-    selectedPerson: null,
+  const handlePersonUnselection = (personToRemove: Person) => {
+    setSelectedPeople((prevSelectedPeople) => prevSelectedPeople
+      .filter(
+        person => person.slug !== personToRemove.slug,
+      ));
   };
 
-  handlePersonSelection = (person: Person | null) => {
-    this.setState({ selectedPerson: person });
-  }
-
-  isSelected = (person: Person) => {
-    return person.slug === this.state.selectedPerson?.slug;
-  }
-
-  render() {
-    const { isSelected } = this;
-    const { people } = this.props;
-    const { selectedPerson } = this.state;
-
-    return (
-      <table className="table is-striped is-narrow">
-        <caption>{selectedPerson?.name || 'Nobody selected'}</caption>
-        <thead>
-          <tr>
-            <th>-</th>
-            <th>name</th>
-            <th>sex</th>
-            <th>born</th>
-          </tr>
-        </thead>
-
-        <tbody>
-          {people.map(person => (
-            <tr
-              key={person.slug}
-              className={classNames('Person', {
-                isSelected: isSelected(person),
-              })}
-            >
-              <td>
-                {isSelected(person)
-                  ? (
-                    <button
-                      type="button"
-                      onClick={() => this.handlePersonSelection(null)}
-                    >
-                      -
-                    </button>
-                  )
-                  : (
-                    <button
-                      type="button"
-                      onClick={() => this.handlePersonSelection(person)}
-                    >
-                      +
-                    </button>
-                  )}
-              </td>
-              <td>{person.name}</td>
-              <td>{person.sex}</td>
-              <td>{person.born}</td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
+  const handleMoveDown = (personToMoveDown: Person) => {
+    const peopleCopy = [...people];
+
+    const personIndex = peopleCopy.findIndex(
+      person => person.slug === personToMoveDown.slug,
+    );
+
+    if (personIndex === peopleCopy.length - 1) {
+      return;
+    }
+
+    setPeople((prevPeople) => ([
+      ...prevPeople.slice(0, personIndex),
+      prevPeople[personIndex + 1],
+      prevPeople[personIndex],
+      ...prevPeople.slice(personIndex + 2),
+    ]));
+  };
+
+  const handleMoveUp = (personToMoveDown: Person) => {
+    const peopleCopy = [...people];
+
+    const personIndex = peopleCopy.findIndex(
+      person => person.slug === personToMoveDown.slug,
+    );
+
+    if (personIndex === 0) {
+      return;
+    }
+
+    const swap = peopleCopy[personIndex];
+
+    peopleCopy[personIndex] = peopleCopy[personIndex - 1];
+    peopleCopy[personIndex - 1] = swap;
+
+    setPeople(peopleCopy);
+  };
+
+  const isSelected = (personToCheck: Person) => {
+    return selectedPeople.some(
+      person => person.slug === personToCheck.slug,
     );
-  }
+  };
+
+  const clearSelectedPeople = () => {
+    setSelectedPeople([]);
+  };
+
+  return (
+    <table className="table is-striped is-narrow">
+      <caption
+        className="title is-5 has-text-info"
+      >
+        <button
+          type="button"
+          className="delete"
+          onClick={clearSelectedPeople}
+        >
+          Clear all
+        </button>
+        {selectedPeople.map(person => person.name).join(', ')}
+      </caption>
+      <thead>
+        <tr>
+          <th>-</th>
+          <th>name</th>
+          <th>sex</th>
+          <th>born</th>
+          <th>reorder</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        {people.map(person => (
+          <tr
+            key={person.slug}
+            className={classNames('Person', {
+              'has-background-warning': isSelected(person),
+            })}
+          >
+            <td>
+              {isSelected(person)
+                ? (
+                  <button
+                    type="button"
+                    onClick={() => handlePersonUnselection(person)}
+                  >
+                    <span className="icon is-small">
+                      <i className="fas fa-minus" />
+                    </span>
+                  </button>
+                )
+                : (
+                  <button
+                    type="button"
+                    onClick={() => handlePersonSelection(person)}
+                  >
+                    <span className="icon is-small">
+                      <i className="fas fa-plus" />
+                    </span>
+                  </button>
+                )}
+            </td>
+            <td className={classNames({
+              'has-text-link': person.sex === 'm',
+              'has-text-danger': person.sex === 'f',
+            })}
+            >
+              {person.name}
+            </td>
+
+            <td>{person.sex}</td>
+            <td>{person.born}</td>
+            <td>
+              <button
+                type="button"
+                onClick={() => handleMoveDown(person)}
+              >
+                &darr;
+              </button>
+
+              <button
+                type="button"
+                onClick={() => handleMoveUp(person)}
+              >
+                &uarr;
+              </button>
+            </td>
+          </tr>
+        ))}
+      </tbody>
+    </table>
+  );
 }

From f555d4f21e50101cbfd08d00fb66f02aed3dccb0 Mon Sep 17 00:00:00 2001
From: Sasha Yatsykovych <olexandr.y@mate.academy>
Date: Wed, 30 Nov 2022 08:42:19 +0200
Subject: [PATCH 3/7] small improvements

---
 src/components/PeopleTable/PeopleTable.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PeopleTable/PeopleTable.tsx b/src/components/PeopleTable/PeopleTable.tsx
index 4b3300c2..756f180f 100644
--- a/src/components/PeopleTable/PeopleTable.tsx
+++ b/src/components/PeopleTable/PeopleTable.tsx
@@ -156,4 +156,4 @@ export const PeopleTable = () => {
       </tbody>
     </table>
   );
-}
+};

From e4f4a41b78c22d75b2ddf674232baf732270f151 Mon Sep 17 00:00:00 2001
From: Sasha Yatsykovych <olexandr.y@mate.academy>
Date: Wed, 30 Nov 2022 09:04:51 +0200
Subject: [PATCH 4/7] improvements

---
 src/components/PeopleTable/PeopleTable.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/PeopleTable/PeopleTable.tsx b/src/components/PeopleTable/PeopleTable.tsx
index 756f180f..667224b2 100644
--- a/src/components/PeopleTable/PeopleTable.tsx
+++ b/src/components/PeopleTable/PeopleTable.tsx
@@ -109,6 +109,7 @@ export const PeopleTable = () => {
                   <button
                     type="button"
                     onClick={() => handlePersonUnselection(person)}
+                    className="is-small is-rounded is-danger"
                   >
                     <span className="icon is-small">
                       <i className="fas fa-minus" />
@@ -119,6 +120,7 @@ export const PeopleTable = () => {
                   <button
                     type="button"
                     onClick={() => handlePersonSelection(person)}
+                    className="is-small is-rounded is-success"
                   >
                     <span className="icon is-small">
                       <i className="fas fa-plus" />
@@ -136,10 +138,11 @@ export const PeopleTable = () => {
 
             <td>{person.sex}</td>
             <td>{person.born}</td>
-            <td>
+            <td className="is-flex is-flex-wrap-nowrap">
               <button
                 type="button"
                 onClick={() => handleMoveDown(person)}
+                className="mr-2"
               >
                 &darr;
               </button>

From 9c69ecabfb7aaa21c1cd94ee9a22f1c5884e5b04 Mon Sep 17 00:00:00 2001
From: Sasha Yatsykovych <olexandr.y@mate.academy>
Date: Wed, 30 Nov 2022 09:09:13 +0200
Subject: [PATCH 5/7] add buttons

---
 src/components/PeopleTable/PeopleTable.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/PeopleTable/PeopleTable.tsx b/src/components/PeopleTable/PeopleTable.tsx
index 667224b2..ebfcb2e3 100644
--- a/src/components/PeopleTable/PeopleTable.tsx
+++ b/src/components/PeopleTable/PeopleTable.tsx
@@ -109,7 +109,7 @@ export const PeopleTable = () => {
                   <button
                     type="button"
                     onClick={() => handlePersonUnselection(person)}
-                    className="is-small is-rounded is-danger"
+                    className="button is-small is-rounded is-danger"
                   >
                     <span className="icon is-small">
                       <i className="fas fa-minus" />
@@ -120,7 +120,7 @@ export const PeopleTable = () => {
                   <button
                     type="button"
                     onClick={() => handlePersonSelection(person)}
-                    className="is-small is-rounded is-success"
+                    className="button is-small is-rounded is-success"
                   >
                     <span className="icon is-small">
                       <i className="fas fa-plus" />
@@ -142,13 +142,14 @@ export const PeopleTable = () => {
               <button
                 type="button"
                 onClick={() => handleMoveDown(person)}
-                className="mr-2"
+                className="button mr-2"
               >
                 &darr;
               </button>
 
               <button
                 type="button"
+                className="button mr-2"
                 onClick={() => handleMoveUp(person)}
               >
                 &uarr;

From abd68d6e2dee6225457e03c66454e89cdd4ca2a8 Mon Sep 17 00:00:00 2001
From: Sasha Yatsykovych <olexandr.y@mate.academy>
Date: Fri, 2 Dec 2022 18:25:52 +0200
Subject: [PATCH 6/7] filtering by user

---
 src/components/PeopleTable/PeopleTable.tsx | 90 +++++++++++++++++++---
 1 file changed, 79 insertions(+), 11 deletions(-)

diff --git a/src/components/PeopleTable/PeopleTable.tsx b/src/components/PeopleTable/PeopleTable.tsx
index ebfcb2e3..ba0a9e49 100644
--- a/src/components/PeopleTable/PeopleTable.tsx
+++ b/src/components/PeopleTable/PeopleTable.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { ChangeEvent, useState } from 'react';
 import classNames from 'classnames';
 
 import peopleFromServer from '../../people.json';
@@ -8,7 +8,10 @@ import './PeopleTable.scss';
 export const PeopleTable = () => {
   const [people, setPeople] = useState<Person[]>(peopleFromServer);
   const [selectedPeople, setSelectedPeople] = useState<Person[]>([]);
+  const [query, setQuery] = useState('');
+  const [sex, setSex] = useState('');
 
+  // region Methods
   const handlePersonSelection = (personToAdd: Person) => {
     setSelectedPeople((prevSelectedPeople) => ([
       ...prevSelectedPeople,
@@ -70,25 +73,88 @@ export const PeopleTable = () => {
   const clearSelectedPeople = () => {
     setSelectedPeople([]);
   };
+  // endregion
+
+  const handleInputChange = (event: ChangeEvent<HTMLInputElement>) => {
+    setQuery(event.target.value);
+  };
+
+  let visiblePeople = [...people];
+
+  if (sex !== '') {
+    visiblePeople = visiblePeople.filter(person => person.sex === sex);
+  }
+
+  if (query !== '') {
+    const normalizedQuery = query.toLocaleLowerCase();
+
+    visiblePeople = visiblePeople.filter(person => {
+      person.motherName?.toLocaleLowerCase(); // === null
+
+      if (person.motherName) {
+        person.motherName.toLocaleLowerCase();
+      } else {
+        return person.motherName;
+      }
+
+
+      const stringToCheck = `
+        ${person.name}
+        ${person.motherName || ''}
+        ${person?.fatherName || ''}
+      `;
+
+      return stringToCheck.toLocaleLowerCase().includes(normalizedQuery);
+    });
+  }
 
   return (
     <table className="table is-striped is-narrow">
       <caption
         className="title is-5 has-text-info"
       >
-        <button
-          type="button"
-          className="delete"
-          onClick={clearSelectedPeople}
-        >
-          Clear all
-        </button>
-        {selectedPeople.map(person => person.name).join(', ')}
+        <p className="block">
+          <button
+            type="button"
+            className="delete"
+            onClick={clearSelectedPeople}
+          >
+            Clear all
+          </button>
+          {selectedPeople.map(person => person.name).join(', ')}
+        </p>
+
+        <div className="field has-addons">
+          <div className="control has-icons-left is-expanded">
+            <input
+              type="search"
+              className="input"
+              placeholder="Search by name"
+              onChange={handleInputChange}
+            />
+
+            <span className="icon is-small is-left">
+              <i className="fas fa-search" />
+            </span>
+          </div>
+
+          <div className="control">
+            <div className="select">
+              <select onChange={(event) => setSex(event.target.value)}>
+                <option value="">All</option>
+                <option value="m">Men</option>
+                <option value="f">Women</option>
+              </select>
+            </div>
+          </div>
+        </div>
       </caption>
       <thead>
         <tr>
           <th>-</th>
           <th>name</th>
+          <th>Mother name</th>
+          <th>Father name</th>
           <th>sex</th>
           <th>born</th>
           <th>reorder</th>
@@ -96,7 +162,7 @@ export const PeopleTable = () => {
       </thead>
 
       <tbody>
-        {people.map(person => (
+        {visiblePeople.map(person => (
           <tr
             key={person.slug}
             className={classNames('Person', {
@@ -136,6 +202,8 @@ export const PeopleTable = () => {
               {person.name}
             </td>
 
+            <td>{person.motherName || '-'}</td>
+            <td>{person.fatherName || '-'}</td>
             <td>{person.sex}</td>
             <td>{person.born}</td>
             <td className="is-flex is-flex-wrap-nowrap">
@@ -149,7 +217,7 @@ export const PeopleTable = () => {
 
               <button
                 type="button"
-                className="button mr-2"
+                className="button"
                 onClick={() => handleMoveUp(person)}
               >
                 &uarr;

From 22d1be708299029f93b8fc993c8b10aa7b5fb033 Mon Sep 17 00:00:00 2001
From: Sasha Yatsykovych <olexandr.y@mate.academy>
Date: Wed, 19 Apr 2023 08:46:08 +0300
Subject: [PATCH 7/7] add starter code

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2b097dc1..1cc7b2bd 100755
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@cypress/webpack-dev-server": "^1.8.4",
     "@mate-academy/cypress-tools": "^1.0.4",
     "@mate-academy/eslint-config-react-typescript": "^1.0.11",
-    "@mate-academy/scripts": "^1.2.3",
+    "@mate-academy/scripts": "^1.2.8",
     "@mate-academy/students-ts-config": "*",
     "@mate-academy/stylelint-config": "*",
     "@types/node": "^17.0.45",