diff --git a/src/App.js b/src/App.js index ebacc0f0..3eadea5c 100644 --- a/src/App.js +++ b/src/App.js @@ -120,9 +120,9 @@ const App = () => { } /> } /> } /> - } /> - } /> - } /> + } /> + } /> + } /> } /> } /> } /> diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx index 2940067a..a0c0c07d 100644 --- a/src/components/Navigation/Navigation.jsx +++ b/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,7 @@ 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} diff --git a/src/pages/PartnerAddRequest/PartnerAddRequest.js b/src/pages/PartnerAddRequest/PartnerAddRequest.js index 6837d5f5..c0aad27d 100644 --- a/src/pages/PartnerAddRequest/PartnerAddRequest.js +++ b/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 ; @@ -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" } ]} /> diff --git a/src/pages/PartnerBid/PartnerBid.jsx b/src/pages/PartnerBid/PartnerBid.jsx index 3199b13e..64cadabb 100644 --- a/src/pages/PartnerBid/PartnerBid.jsx +++ b/src/pages/PartnerBid/PartnerBid.jsx @@ -107,7 +107,7 @@ export const PartnerBid = () => { links={[ { name: "Главная", link: "/profile" }, { name: "Запросы и открытые позиции", link: "/profile/requests" }, - { name: "Просмотр заявки - PHP разработчик", link: "/profile/bid" } + { name: "Просмотр заявки - PHP разработчик", link: "/profile/requests-bid" } ]} />

Страница заявки

@@ -117,7 +117,7 @@ export const PartnerBid = () => {

{requestInfo.title}

- Редактировать + Редактировать delete { return ( { dispatch(setPartnerRequestId(item.id)); @@ -85,7 +85,7 @@ export const PartnerRequests = () => { параметры: количество сотрудников, стек, уровень специалиста

- + + Создать запрос @@ -100,7 +100,7 @@ export const PartnerRequests = () => { cursor

У вас ещё нет запросов на сотрудников

- + + Создать запрос