Merge pull request 'trackerTask' (#19) from trackerTask into main

Reviewed-on: #19

src/App.js

@@ -120,9 +120,9 @@ const App = () => {
             <Route exact path="payouts" element={<Payouts />} />
             <Route exact path="settings" element={<PartnerSettings />} />
             <Route exact path="requests" element={<PartnerRequests />} />
-            <Route exact path="add-request" element={<PartnerAddRequest />} />
+            <Route exact path="requests-add" element={<PartnerAddRequest />} />
-            <Route exact path="edit-request" element={<PartnerAddRequest />} />
+            <Route exact path="requests-edit" element={<PartnerAddRequest />} />
-            <Route exact path="bid" element={<PartnerBid />} />
+            <Route exact path="requests-bid" element={<PartnerBid />} />
             <Route exact path="employees" element={<PartnerCategories />} />
             <Route exact path="employees/report/:uuid" element={<PartnerEmployeeReport />} />
             <Route exact path="treaties" element={<PartnerTreaties />} />

src/components/Navigation/Navigation.jsx

@@ -45,6 +45,7 @@ export const Navigation = () => {
     partner: [
       {
         path: "/catalog",
+        active: "candidate",
         name: "Каталог"
       },
       {
@@ -53,6 +54,7 @@ export const Navigation = () => {
       },
       {
         path: "/employees",
+        active: "calendar",
         name: "Персонал"
       },
       {
@@ -80,7 +82,12 @@ export const Navigation = () => {
                 key={index}
                 end
                 to={link.path === "/Quiz" ? link.path : `/profile${link.path}`}
-                className={currentPath.includes(link.path) ? "active" : ""}
+                className={
+                  currentPath.includes(link.path) ||
+                  currentPath.includes(link.active)
+                    ? "active"
+                    : ""
+                }
               >
                 {link.name}
               </NavLink>

src/pages/PartnerAddRequest/PartnerAddRequest.js

@@ -49,7 +49,7 @@ export const PartnerAddRequest = () => {
   const [inputs, setInputs] = useState({ title: "", description: "" });
 
   if (
-    currentUrl[0] === "/profile/edit-request" &&
+    currentUrl[0] === "/profile/requests-edit" &&
     !Object.keys(partnerRequestInfo).length
   ) {
     return <Navigate to="/profile/requests" replace />;
@@ -69,7 +69,7 @@ export const PartnerAddRequest = () => {
 
   useEffect(() => {
     if (
-      currentUrl[0] === "/profile/edit-request" &&
+      currentUrl[0] === "/profile/requests-edit" &&
       Object.keys(partnerRequestInfo).length
     ) {
       setInputs({
@@ -102,7 +102,7 @@ export const PartnerAddRequest = () => {
   };
 
   const handler = () => {
-    if (currentUrl[0] === "/profile/edit-request") {
+    if (currentUrl[0] === "/profile/requests-edit") {
       apiRequest("/request/update-request", {
         method: "PUT",
         data: {
@@ -180,7 +180,7 @@ export const PartnerAddRequest = () => {
               name: `${
                 editRequest ? "Редактирование заявки" : "Создание новой заявки"
               }`,
-              link: "/profile/add-request"
+              link: "/profile/requests-add"
             }
           ]}
         />

src/pages/PartnerBid/PartnerBid.jsx

@@ -107,7 +107,10 @@ export const PartnerBid = () => {
           links={[
             { name: "Главная", link: "/profile" },
             { name: "Запросы и открытые позиции", link: "/profile/requests" },
-            { name: "Просмотр заявки - PHP разработчик", link: "/profile/bid" }
+            {
+              name: "Просмотр заявки - PHP разработчик",
+              link: "/profile/requests-bid"
+            }
           ]}
         />
         <h2 className="partner-bid__title">Страница заявки </h2>
@@ -117,7 +120,7 @@ export const PartnerBid = () => {
             <div className="partner-bid__qualification">
               <h3>{requestInfo.title}</h3>
               <div className="partner-bid__qualification__buttons">
-                <Link to="/profile/edit-request">Редактировать</Link>
+                <Link to="/profile/requests-edit">Редактировать</Link>
                 <img
                   src={deleteBtn}
                   alt="delete"

src/pages/PartnerRequests/PartnerRequests.jsx

@@ -60,7 +60,7 @@ export const PartnerRequests = () => {
                 return (
                   <Link
                     key={index}
-                    to={"/profile/bid"}
+                    to={"/profile/requests-bid"}
                     className="partner-requests__section__item"
                     onClick={() => {
                       dispatch(setPartnerRequestId(item.id));
@@ -85,7 +85,7 @@ export const PartnerRequests = () => {
                 параметры: количество сотрудников, стек, уровень специалиста
               </p>
               <BaseButton>
-                <Link to={"/profile/add-request"}>
+                <Link to={"/profile/requests-add"}>
                   <span>+</span>
                   Создать запрос
                 </Link>
@@ -100,7 +100,7 @@ export const PartnerRequests = () => {
                 <img src={cursorImg} alt="cursor" />
                 <p>У вас ещё нет запросов на сотрудников</p>
                 <BaseButton>
-                  <Link to={"/profile/add-request"}>
+                  <Link to={"/profile/requests-add"}>
                     <span>+</span>
                     Создать запрос
                   </Link>