From fdaaf00f9541a17887999a705315304259f56b1a Mon Sep 17 00:00:00 2001
From: DyCTaTOR <125912249+DyCTaTOR@users.noreply.github.com>
Date: Sun, 24 Dec 2023 13:19:50 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B0?=
 =?UTF-8?q?=D0=90=D0=B1=D0=B8=D1=82=D1=83=D1=80=D0=B8=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2.=20=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lab5/data.json                                | 58 ++++++++++++++++++-
 .../Directions/direct/Directions.jsx          | 31 +++++-----
 .../Directions/direct/TableDirect.jsx         |  6 +-
 3 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/Lab5/data.json b/Lab5/data.json
index cc8155e..b4f8594 100644
--- a/Lab5/data.json
+++ b/Lab5/data.json
@@ -3,7 +3,7 @@
     {
       "id": 0,
       "code": "01.03.04",
-      "name": "Мат. Моделирование",
+      "name": "Математическое Моделирование",
       "department": "Прикладная математика",
       "things": "Иностранный язык, информатика, физика, химия"
     },
@@ -20,6 +20,62 @@
       "name": "Информационные системы и технологии",
       "department": "Измерительно-вычислительные комплексы",
       "things": "Информатика, физика"
+    },
+    {
+      "id": 3,
+      "code": "09.03.03",
+      "name": "Прикладная информатика",
+      "department": "Информационные системы",
+      "things": "Иностранный язык, информатика, физика, химия"
+    },
+    {
+      "id": 4,
+      "code": "07.03.03",
+      "name": "Дизайн архитектурной среды",
+      "department": "Архитектурно-строительное проектирование",
+      "things": "НЕТ"
+    },
+    {
+      "id": 5,
+      "code": "38.03.04",
+      "name": "Государственное и муниципальное управление",
+      "department": "Экономика и менеджмент",
+      "things": "География, иностранный язык, информатика, история, обществознание"
+    },
+    {
+      "id": 6,
+      "code": "38.03.01",
+      "name": "Экономика",
+      "department": "Экономическая теория",
+      "things": "География, иностранный язык, информатика, история, обществознание"
+    },
+    {
+      "id": 7,
+      "code": "12.03.01",
+      "name": "Приборостроение",
+      "department": "Измерительно-вычислительные комплексы",
+      "things": "Иностранный язык, информатика, физика"
+    },
+    {
+      "id": 8,
+      "code": "27.03.02",
+      "name": "Управление качеством",
+      "department": "Управление в технических системах",
+      "things": "Информатика, физика"
+    },
+    {
+      "id": 9,
+      "code": "22.03.01",
+      "name": "Материаловедение и технологии материалов",
+      "department": "Химия и технологии композиционных материалов",
+      "things": "Иностранный язык, информатика, физика, химия"
+    },
+    {
+      "id": 10,
+      "code": "24.03.04",
+      "name": "Авиастроение",
+      "department": "Самолетостроение",
+      "things": "Иностранный язык, информатика, физика, химия"
     }
   ],
   "lines": [
diff --git a/Lab5/src/components/Directions/direct/Directions.jsx b/Lab5/src/components/Directions/direct/Directions.jsx
index 9998721..7c39536 100644
--- a/Lab5/src/components/Directions/direct/Directions.jsx
+++ b/Lab5/src/components/Directions/direct/Directions.jsx
@@ -1,31 +1,36 @@
 import { Search } from 'react-bootstrap-icons';
+import { useState } from 'react';
 import { Button } from 'react-bootstrap';
 import TableDirect from './TableDirect.jsx';
 import Direction from './Direction.jsx';
 import useDirections from '../hooks/DirectionHooks';
+import Input from '../../input/Input.jsx';
 
 const Directions = () => {
     const { directions } = useDirections();
+    const [searchValue, setSearchValue] = useState('');
 
     return (
         <>
             <div className = 'd-flex justify-content-center mb-4'>
-                <input className = "d-flex justify-content-center w-50"
-                    type="search"
-                    id="search1"
-                    name="search"
-                    required>
-                </input>
-                <Button style = {{ marginLeft: '5' }} ><Search /></Button>
+                <Input className = 'd-flex justify-content-center w-50' name='search' value = {searchValue} onChange={(e) => setSearchValue(e.target.value)}
+                type='text' required />
+                <Button style = {{ marginLeft: '5' }} onClick={() => console.log(searchValue)} ><Search /></Button>
             </div>
             <div className = 'd-flex justify-content-center'>
                 <TableDirect>
-                    {
-                        directions.map((item) =>
-                            <Direction key={item.id}
-                                item = {item}
-                            />)
-                    }
+                {
+                    directions.map((item) => {
+                        if (searchValue === ''
+                            || item.name.toLowerCase().includes(searchValue.toLowerCase())
+                            || item.department.toLowerCase().includes(searchValue.toLowerCase())
+                            || item.things.toLowerCase().includes(searchValue.toLowerCase())
+                            || item.code.toLowerCase().includes(searchValue.toLowerCase())) {
+                            return <Direction key={item.id} item={item} />;
+            }
+            return null;
+        })
+    }
                 </TableDirect>
             </div>
         </>
diff --git a/Lab5/src/components/Directions/direct/TableDirect.jsx b/Lab5/src/components/Directions/direct/TableDirect.jsx
index db0c845..e268488 100644
--- a/Lab5/src/components/Directions/direct/TableDirect.jsx
+++ b/Lab5/src/components/Directions/direct/TableDirect.jsx
@@ -7,8 +7,8 @@ const TableDirect = ({ children }) => {
             <thead>
                 <tr>
                     <th style = {{ textAlign: 'center' }} scope = 'col'>№</th>
-                    <th style = {{ textAlign: 'center' }} scope='col' className = "w-25">Код</th>
-                    <th style = {{ textAlign: 'center' }} scope='col' className ="w-50">Направление</th>
+                    <th style = {{ textAlign: 'center' }} scope='col'>Код</th>
+                    <th style = {{ textAlign: 'center' }} scope='col' className ="w-25">Направление</th>
                     <th style = {{ textAlign: 'center' }} scope='col' className ="w-25">Кафедра</th>
                     <th style = {{ textAlign: 'center' }} scope='col' className = "w-75">Предметы(ЕГЭ) по выбору</th>
                 </tr>
@@ -17,7 +17,7 @@ const TableDirect = ({ children }) => {
                 {children}
             </tbody >
         </Table >
-    );
+);
 };
 
 TableDirect.propTypes = {