Переписываю спорные решения

src/pages/FormPage.js

@@ -4,13 +4,11 @@ import {useParams, useNavigate} from 'react-router-dom'
 import {
   currentCandidate,
   selectCurrentCandidate,
-  auth
 } from '../redux/outstaffingSlice'
 import SVG from 'react-inlinesvg'
 import {WithLogout} from '../hoc/withLogout'
 import Form from '../components/Form/Form'
 import {LEVELS, SKILLS} from '../components/constants/constants'
-import {fetchGet} from '../server/server'
 import {Footer} from '../components/Footer/Footer'
 
 import arrow from '../images/right-arrow.png'
@@ -18,7 +16,7 @@ import rectangle from '../images/rectangle_secondPage.png'
 import telegramIcon from '../images/telegram-icon.svg'
 
 import './formPage.scss'
-import {getRole} from '../redux/roleSlice'
+import {useRequest} from "../hooks/useRequest";
 
 
 const FormPage = () => {
@@ -26,20 +24,19 @@ const FormPage = () => {
   const navigate = useNavigate();
   const dispatch = useDispatch();
   const candidate = useSelector(selectCurrentCandidate);
-  const role = useSelector(getRole);
+
+
+  const {apiRequest} = useRequest();
 
   const goBack = () => {
     navigate(-1)
   };
 
   if (!candidate.id) {
-    fetchGet({
-      link: `${process.env.REACT_APP_API_URL}/api/profile/`,
-      params: Number(params.id),
-      navigate,
-      role,
-      logout: () => dispatch(auth(false))
-    }).then((el) => dispatch(currentCandidate(el)))
+    apiRequest('/api/profile', {
+      params: Number(params.id)
+    })
+        .then((el) => dispatch(currentCandidate(el)))
   }
 
   return (

src/pages/Summary/Summary.js

@@ -1,104 +1,101 @@
 import React, {useEffect, useState} from 'react';
+import {useSelector} from "react-redux";
 import {ProfileHeader} from "../../components/ProfileHeader/ProfileHeader";
 import {getProfileInfo} from "../../redux/outstaffingSlice";
-import {useSelector} from "react-redux";
-import {transformHtml} from "../../helper";
 import {Footer} from '../../components/Footer/Footer'
+import {transformHtml} from "../../helper";
+
+import {useRequest} from "../../hooks/useRequest";
 
 import arrow from "../../images/right-arrow.png";
 import rightArrow from "../../images/arrowRight.png"
 import gitImgItem from "../../images/gitItemImg.png"
 
-import {fetchGet} from "../../server/server";
-
 import './summary.scss'
 
-
-
 export const Summary = () => {
-    const profileInfo = useSelector(getProfileInfo);
-    const [openGit, setOpenGit] = useState(false);
-    const [gitInfo, setGitInfo] = useState([]);
-    useEffect(() => {
-        fetchGet({
-            link: `${process.env.REACT_APP_API_URL}/api/profile/portfolio-projects?card_id=${localStorage.getItem('cardId')}`,
-        }).then((responseGit) => {
-            setGitInfo(responseGit)
-        })
-    }, []);
-    return(
-        <div className='summary'>
-            <ProfileHeader/>
-            <div className='container'>
-                <div className='summary__content'>
-                    <h2 className='summary__title'>Ваше резюме {openGit &&  <span>- Git</span>}</h2>
-                    {openGit && <div className='summary__back' onClick={() => setOpenGit(false)}>
-                        <img src={arrow} alt='arrow'/>
-                        <p>Вернуться</p>
-                    </div>}
-                    <div className='summary__info'>
-                        <div className='summary__person'>
-                            <img src={profileInfo.photo} className='summary__avatar' alt='avatar'/>
-                            <p className='summary__name'>{profileInfo.fio} {profileInfo.specification}</p>
-                        </div>
-                        {!openGit &&
-                        <button className='summary__git' onClick={()=> setOpenGit(true)}>Git</button>
-                        }
-                    </div>
-                </div>
-                {!openGit &&
-                    <div className='summary__skills skills__section'>
-                        <div className='summary__sections__head'>
-                            <h3>Основной стек</h3>
-                            <button>Редактировать раздел</button>
-                        </div>
-                        <div className='skills__section__items'>
-                            <div className='skills__section__items__wrapper'>
-                                {profileInfo.skillValues && profileInfo.skillValues.map((skill) => {
-                                    return <span key={skill.id} className='skill_item'>{skill.skill.name}</span>
-                                })}
-                            </div>
-                        </div>
-                    </div>
-                }
-                {profileInfo.vc_text && !openGit &&
-                    <div className='summary__experience' dangerouslySetInnerHTML={transformHtml(profileInfo.vc_text)}>
-                    </div>
-                }
-                {openGit &&
-                    <div className='summary__sectionGit'>
-                        <div className='summary__sections__head'>
-                            <h3>Страница портфолио кода разработчика</h3>
-                            <button>Редактировать раздел</button>
-                        </div>
-                        <div className='summary__sectionGitItems'>
-                            {gitInfo.length && gitInfo.map((itemGit) => {
-                                return <div key={itemGit.id} className='summary__sectionGitItem gitItem'>
-                                            <div className='gitItem__info'>
-                                                <div className='gitItem__info__about'>
-                                                    <img src={gitImgItem} alt='gitImg' />
-                                                    <div className='gitItem__info__name'>
-                                                        <h4>{itemGit.title}</h4>
-                                                        <p>{itemGit.description}</p>
-                                                    </div>
-                                                </div>
-                                                <div className='gitItem__info__specification'>
-                                                    <span className='gitItem__lineSkill'/>
-                                                    <p>{itemGit.main_stack}</p>
-                                                </div>
-                                            </div>
-                                            <a className='gitItem__link' href={itemGit.link} target="_blank" rel="noreferrer">
-                                                <img src={rightArrow} alt='arrowRight' />
-                                            </a>
-                                        </div>
-                                })
-                            }
-                        </div>
-                    </div>
-                }
+  const profileInfo = useSelector(getProfileInfo);
+  const [openGit, setOpenGit] = useState(false);
+  const [gitInfo, setGitInfo] = useState([]);
+
+  const {apiRequest} = useRequest();
+  useEffect(() => {
+    apiRequest(`/profile/portfolio-projects?card_id=${localStorage.getItem('cardId')}`)
+        .then(responseGit => setGitInfo(responseGit))
+  }, [apiRequest]);
+  return (
+      <div className='summary'>
+        <ProfileHeader/>
+        <div className='container'>
+          <div className='summary__content'>
+            <h2 className='summary__title'>Ваше резюме {openGit && <span>- Git</span>}</h2>
+            {openGit && <div className='summary__back' onClick={() => setOpenGit(false)}>
+              <img src={arrow} alt='arrow'/>
+              <p>Вернуться</p>
+            </div>}
+            <div className='summary__info'>
+              <div className='summary__person'>
+                <img src={profileInfo.photo} className='summary__avatar' alt='avatar'/>
+                <p className='summary__name'>{profileInfo.fio} {profileInfo.specification}</p>
+              </div>
+              {!openGit &&
+              <button className='summary__git' onClick={() => setOpenGit(true)}>Git</button>
+              }
             </div>
-            <Footer/>
+          </div>
+          {!openGit &&
+          <div className='summary__skills skills__section'>
+            <div className='summary__sections__head'>
+              <h3>Основной стек</h3>
+              <button>Редактировать раздел</button>
+            </div>
+            <div className='skills__section__items'>
+              <div className='skills__section__items__wrapper'>
+                {profileInfo.skillValues && profileInfo.skillValues.map((skill) =>
+                    <span key={skill.id} className='skill_item'>{skill.skill.name}</span>
+                )}
+              </div>
+            </div>
+          </div>
+          }
+          {profileInfo.vc_text && !openGit &&
+          <div className='summary__experience' dangerouslySetInnerHTML={transformHtml(profileInfo.vc_text)}>
+          </div>
+          }
+          {openGit &&
+          <div className='summary__sectionGit'>
+            <div className='summary__sections__head'>
+              <h3>Страница портфолио кода разработчика</h3>
+              <button>Редактировать раздел</button>
+            </div>
+            <div className='summary__sectionGitItems'>
+              {gitInfo.length && gitInfo.map((itemGit) => {
+                return <div key={itemGit.id} className='summary__sectionGitItem gitItem'>
+                  <div className='gitItem__info'>
+                    <div className='gitItem__info__about'>
+                      <img src={gitImgItem} alt='gitImg'/>
+                      <div className='gitItem__info__name'>
+                        <h4>{itemGit.title}</h4>
+                        <p>{itemGit.description}</p>
+                      </div>
+                    </div>
+                    <div className='gitItem__info__specification'>
+                      <span className='gitItem__lineSkill'/>
+                      <p>{itemGit.main_stack}</p>
+                    </div>
+                  </div>
+                  <a className='gitItem__link' href={itemGit.link} target="_blank" rel="noreferrer">
+                    <img src={rightArrow} alt='arrowRight'/>
+                  </a>
+                </div>
+              })
+              }
+            </div>
+          </div>
+          }
         </div>
-    )
+        <Footer/>
+      </div>
+  )
 };