From 5bc35a3ced5cc42630e69fecdcac8007534bfa28 Mon Sep 17 00:00:00 2001
From: Nickolai <lindeman072@mail.ru>
Date: Mon, 19 Aug 2024 04:35:46 +0400
Subject: [PATCH] fix/before deploy

---
 README.md                               |  4 ++--
 src/components/App/App.tsx              | 11 ++++-----
 src/components/Filter/Filter.tsx        |  1 -
 src/components/SideBar/SideBar.tsx      |  8 +++----
 src/pages/Employees/Employees.tsx       |  2 +-
 src/pages/Main/Main.tsx                 |  2 +-
 src/pages/Registration/Registration.tsx | 12 +++++-----
 src/store/features/slice/userSlice.ts   | 30 +++++++++++++++++++++++--
 src/ui/FilterList/FilterList.tsx        | 22 ++++--------------
 src/ui/Modal/Modal.tsx                  |  5 ++---
 10 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 7ed8cba..52d7b8d 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@
 # Проект "Gazprom"
 
 Задача: создание MVP Системы управления организационной структурой. Целью проведения Конкурса является:
-● Поддержка и развитие IT-сообщества,
-● Разработка сервиса Соорганизатора
+- Поддержка и развитие IT-сообщества,
+- Разработка сервиса Соорганизатора
 
 [**Ссылка на сайт**](https://gazprom.hopto.org)
 
diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx
index 69d6d8b..d5b5648 100644
--- a/src/components/App/App.tsx
+++ b/src/components/App/App.tsx
@@ -5,22 +5,23 @@ import { Outlet, useNavigate } from 'react-router-dom';
 import { useEffect, useState } from 'react';
 import { useAppDispatch, useAppSelector } from 'src/store/hooks';
 import Registration from 'src/pages/Registration/Registration';
+import Preloader from 'src/ui/Preloader/Preloader';
+import { fetchGetTeamsId } from 'src/store/features/slice/teamsSlice';
+import { id } from 'src/services/const';
+import { selectMembers } from 'src/store/features/slice/membersSlice';
+import { membersProps, RegisterDataProps } from 'src/services/types';
 import {
   allowDrop,
   handleDragStart,
   handleDrop,
 } from 'src/services/dragAndDrop';
-import { selectMembers } from 'src/store/features/slice/membersSlice';
-import { membersProps, RegisterDataProps } from 'src/services/types';
 import {
   fetchRegisterUser,
   selectUsers,
   setLoading,
   setLoggedIn,
 } from 'src/store/features/slice/userSlice';
-import Preloader from 'src/ui/Preloader/Preloader';
-import { fetchGetTeamsId } from 'src/store/features/slice/teamsSlice';
-import { id } from 'src/services/const';
+
 
 export default function App() {
   const { loggedIn, loading } = useAppSelector(selectUsers);
diff --git a/src/components/Filter/Filter.tsx b/src/components/Filter/Filter.tsx
index fbe26c6..ccd28ac 100644
--- a/src/components/Filter/Filter.tsx
+++ b/src/components/Filter/Filter.tsx
@@ -20,7 +20,6 @@ interface FilterProps {
 
 export default function Filter({ droppedCards }: FilterProps) {
   const { isFilterOpen } = useAppSelector(selectMembers);
-
   const { members, currentPage } = useAppSelector(selectMembers);
   const dispatch = useAppDispatch();
 
diff --git a/src/components/SideBar/SideBar.tsx b/src/components/SideBar/SideBar.tsx
index ae3d81d..baa866e 100644
--- a/src/components/SideBar/SideBar.tsx
+++ b/src/components/SideBar/SideBar.tsx
@@ -1,5 +1,4 @@
 import { Button } from 'antd';
-import { useState } from 'react';
 import styles from 'src/components/SideBar/SideBar.module.scss';
 import cn from 'classnames/bind';
 import { motion } from 'framer-motion';
@@ -24,13 +23,14 @@ import {
   setIsFilterOpen,
   setShortWindow,
 } from 'src/store/features/slice/membersSlice';
+import { selectUsers, setShorMore } from 'src/store/features/slice/userSlice';
 
 const cx = cn.bind(styles);
 
 export default function SideBar() {
   const { shortWindow } = useAppSelector(selectMembers);
+  const { showMore } = useAppSelector(selectUsers);
   const dispatch = useAppDispatch();
-  const [showMore, setShorMore] = useState(true);
   const location = useLocation();
   const navigate = useNavigate();
   const newTeamRout = location.pathname === '/new-team';
@@ -70,7 +70,7 @@ export default function SideBar() {
                 </span>
               ),
               text: 'Справочник',
-              onClick: () => setShorMore(!showMore),
+              onClick: () => dispatch(setShorMore(!showMore)),
             },
           ].map((item, index) =>
             item.link ? (
@@ -103,7 +103,7 @@ export default function SideBar() {
               <li
                 key={index}
                 className={cx(styles.item)}
-                onClick={() => setShorMore(!showMore)}
+                onClick={() => dispatch(setShorMore(!showMore))}
               >
                 {item.icon}
                 <motion.p
diff --git a/src/pages/Employees/Employees.tsx b/src/pages/Employees/Employees.tsx
index ddb6648..0e4634b 100644
--- a/src/pages/Employees/Employees.tsx
+++ b/src/pages/Employees/Employees.tsx
@@ -22,7 +22,7 @@ export default function Employees() {
   const dispatch = useAppDispatch();
   const { members, membersAmount, currentPage } = useAppSelector(selectMembers);
   const { isProfileOpen } = useAppSelector(selectUsers);
-
+  
   const startIndex = (currentPage - 1) * itemsPerPage + 1;
   const endIndex = Math.min(startIndex + itemsPerPage - 1, membersAmount);
   const maxPages = Math.ceil(membersAmount / itemsPerPage);
diff --git a/src/pages/Main/Main.tsx b/src/pages/Main/Main.tsx
index 957fc31..7471cb2 100644
--- a/src/pages/Main/Main.tsx
+++ b/src/pages/Main/Main.tsx
@@ -28,7 +28,7 @@ export default function Main() {
     }
   };
 
-  // Рекурсивная функция для добавления cellId
+  // Рекурсивная функция для добавления ячеек cellId
   const updateSubordinates = (
     card: membersProps,
     parentColom: number,
diff --git a/src/pages/Registration/Registration.tsx b/src/pages/Registration/Registration.tsx
index 8ac1094..b888147 100644
--- a/src/pages/Registration/Registration.tsx
+++ b/src/pages/Registration/Registration.tsx
@@ -1,15 +1,15 @@
 import { Button, Input } from 'antd';
-import { useState } from 'react';
 import styles from 'src/pages/Registration/Registration.module.scss';
+import { selectUsers, setEmail, setPassword } from 'src/store/features/slice/userSlice';
+import { useAppDispatch, useAppSelector } from 'src/store/hooks';
 
 interface RegistrationProps {
   handleRegister: (data: { email: string; password: string }) => void;
 }
 
 export default function Registration({ handleRegister }: RegistrationProps) {
-
-  const [email, setEmail] = useState<string>('');
-  const [password, setPassword] = useState<string>('');
+  const { email, password } = useAppSelector(selectUsers);
+  const dispatch = useAppDispatch();
 
   const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
@@ -26,14 +26,14 @@ export default function Registration({ handleRegister }: RegistrationProps) {
         <Input
           className={styles.input}
           value={email}
-          onChange={(e) => setEmail(e.target.value)}
+          onChange={(e) => dispatch(setEmail(e.target.value))}
           placeholder='Логин'
         ></Input>
         <Input
           className={styles.input}
           type='current-password'
           value={password}
-          onChange={(e) => setPassword(e.target.value)}
+          onChange={(e) => dispatch(setPassword(e.target.value))}
           placeholder='Введите пароль'
         ></Input>
         <Button htmlType='submit' className={styles.button}>
diff --git a/src/store/features/slice/userSlice.ts b/src/store/features/slice/userSlice.ts
index 0a0752b..577ae9a 100644
--- a/src/store/features/slice/userSlice.ts
+++ b/src/store/features/slice/userSlice.ts
@@ -1,5 +1,9 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { membersProps, ProfileProps, RegisterDataProps } from 'src/services/types';
+import {
+  membersProps,
+  ProfileProps,
+  RegisterDataProps,
+} from 'src/services/types';
 import { getMemberId, getProfile, registration } from 'src/store/api';
 import { RootStore } from 'src/store/store';
 
@@ -12,6 +16,9 @@ export interface StateType {
   loading: boolean;
   isProfileOpen: boolean;
   selectedMember: membersProps | null;
+  showMore: boolean;
+  email: string;
+  password: string;
 }
 
 const initialState: StateType = {
@@ -23,6 +30,9 @@ const initialState: StateType = {
   loading: false,
   isProfileOpen: false,
   selectedMember: null,
+  showMore: true,
+  email: '',
+  password: '',
 };
 
 export const fetchRegisterUser = createAsyncThunk(
@@ -59,6 +69,15 @@ const userSlice = createSlice({
     setIsProfileOpen(state, action) {
       state.isProfileOpen = action.payload;
     },
+    setShorMore(state, action) {
+      state.showMore = action.payload;
+    },
+    setEmail(state, action) {
+      state.email = action.payload;
+    },
+    setPassword(state, action) {
+      state.password = action.payload;
+    },
   },
   extraReducers: (builder) => {
     builder
@@ -101,6 +120,13 @@ const userSlice = createSlice({
   },
 });
 
-export const { setLoggedIn, setLoading, setIsProfileOpen } = userSlice.actions;
+export const {
+  setLoggedIn,
+  setLoading,
+  setIsProfileOpen,
+  setShorMore,
+  setEmail,
+  setPassword,
+} = userSlice.actions;
 export const userReducer = userSlice.reducer;
 export const selectUsers = (state: RootStore) => state.user;
diff --git a/src/ui/FilterList/FilterList.tsx b/src/ui/FilterList/FilterList.tsx
index 2afccd7..3730756 100644
--- a/src/ui/FilterList/FilterList.tsx
+++ b/src/ui/FilterList/FilterList.tsx
@@ -16,31 +16,17 @@ export default function FilterList({
   city,
 }: FilterListProps) {
   return (
-    <ul
-      className={styles.list}
-    >
+    <ul className={styles.list}>
       <li className={styles.containerItem}>
-        <p
-          className={cx(styles.item)}
-        >
-          {teams}
-        </p>
+        <p className={cx(styles.item)}>{teams}</p>
         <DownOutlined className={styles.arrow} />
       </li>
       <li className={styles.containerItem}>
-        <p
-          className={cx(styles.item)}
-        >
-          {positions}
-        </p>
+        <p className={cx(styles.item)}>{positions}</p>
         <DownOutlined className={styles.arrow} />
       </li>
       <li className={styles.containerItem}>
-        <p
-          className={cx(styles.item)}
-        >
-          {city}
-        </p>
+        <p className={cx(styles.item)}>{city}</p>
         <DownOutlined className={styles.arrow} />
       </li>
     </ul>
diff --git a/src/ui/Modal/Modal.tsx b/src/ui/Modal/Modal.tsx
index 11ecd1e..00304a6 100644
--- a/src/ui/Modal/Modal.tsx
+++ b/src/ui/Modal/Modal.tsx
@@ -1,12 +1,12 @@
 import { Button, Input } from 'antd';
 import { useNavigate } from 'react-router-dom';
+import { useAppDispatch, useAppSelector } from 'src/store/hooks';
+import styles from 'src/ui/Modal/Modal.module.scss';
 import {
   selectTeams,
   setAddTeam,
   setNameTeam,
 } from 'src/store/features/slice/teamsSlice';
-import { useAppDispatch, useAppSelector } from 'src/store/hooks';
-import styles from 'src/ui/Modal/Modal.module.scss';
 
 export default function Modal() {
   const dispatch = useAppDispatch();
@@ -18,7 +18,6 @@ export default function Modal() {
       id: (addTeam.length + 777).toString(),
       name: nameTeam,
     };
-
     dispatch(setAddTeam([...addTeam, newTeam]));
     dispatch(setNameTeam(''));
     navigate('/teams');