fix

mate-academy · Dec 8, 2023 · b004cd8 · b004cd8
1 parent 1386636
commit b004cd8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 79 deletions.
diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx
@@ -3,14 +3,15 @@ import { ChangeEvent } from 'react';
 import cn from 'classnames';
 import { SearchLink } from './SearchLink';
 import { getSearchWith } from '../utils/searchHelper';
+import { searchENUM } from '../types/serchENUM';
 
 export const PeopleFilters = () => {
   const [searchParams, setSearchParams] = useSearchParams();
   const centuriesList = ['16', '17', '18', '19', '20'];
 
-  const sex = searchParams.get('sex');
-  const centuries = searchParams.getAll('centuries');
-  const query = searchParams.get('query') || '';
+  const sex = searchParams.get(searchENUM.Sex);
+  const centuries = searchParams.getAll(searchENUM.Centuries);
+  const query = searchParams.get(searchENUM.Query) || '';
 
   function handleQuery(event: ChangeEvent<HTMLInputElement>) {
     const params = (event.target.value === '')

diff --git a/src/components/PeopleTable.tsx b/src/components/PeopleTable.tsx
@@ -37,7 +37,10 @@ export const PeopleTable: React.FC<Props> = ({ people, Slug }) => {
 
     return (
       <Link
-        to={`/people/${slug}`}
+        to={{
+          pathname: `/people/${slug}`,
+          search: searchParams.toString(),
+        }}
         className={cn({ 'has-text-danger': sex === 'f' })}
       >
         {name}
@@ -59,7 +62,8 @@ export const PeopleTable: React.FC<Props> = ({ people, Slug }) => {
                 params={sortParams('name') as SearchParams}
               >
                 <span className="icon">
-                  <i className={cn('fas fa-sort', {
+                  <i className={cn('fas', {
+                    'fa-sort': sort !== 'name',
                     'fa-sort-up': sort === 'name' && !order,
                     'fa-sort-down': sort === 'name' && order,
                   })}
@@ -76,7 +80,8 @@ export const PeopleTable: React.FC<Props> = ({ people, Slug }) => {
                 params={sortParams('sex') as SearchParams}
               >
                 <span className="icon">
-                  <i className={cn('fas fa-sort', {
+                  <i className={cn('fas', {
+                    'fa-sort': sort !== 'sex',
                     'fa-sort-up': sort === 'sex' && !order,
                     'fa-sort-down': sort === 'sex' && order,
                   })}
@@ -93,7 +98,8 @@ export const PeopleTable: React.FC<Props> = ({ people, Slug }) => {
                 params={sortParams('born') as SearchParams}
               >
                 <span className="icon">
-                  <i className={cn('fas fa-sort', {
+                  <i className={cn('fas', {
+                    'fa-sort': sort !== 'born',
                     'fa-sort-up': sort === 'born' && !order,
                     'fa-sort-down': sort === 'born' && order,
                   })}
@@ -110,7 +116,8 @@ export const PeopleTable: React.FC<Props> = ({ people, Slug }) => {
                 params={sortParams('died') as SearchParams}
               >
                 <span className="icon">
-                  <i className={cn('fas fa-sort', {
+                  <i className={cn('fas', {
+                    'fa-sort': sort !== 'died',
                     'fa-sort-up': sort === 'died' && !order,
                     'fa-sort-down': sort === 'died' && order,
                   })}

diff --git a/src/components/Person.tsx b/src/components/Person.tsx
diff --git a/src/components/PersonLink.tsx b/src/components/PersonLink.tsx
diff --git a/src/types/serchENUM.ts b/src/types/serchENUM.ts
@@ -0,0 +1,5 @@
+export const searchENUM = {
+  Sex: 'sex',
+  Centuries: 'centuries',
+  Query: 'query',
+};