- {user === "developer" ? (
-
- Добрый день,
- {profileInfo?.fio || profileInfo?.username}
-
- ) : (
-
- Добрый день,
- {profileInfo?.fio || profileInfo?.username}
-
- )}
+
+ Добрый день,
+ {profileInfo?.fio || profileInfo?.username}
+
@@ -122,14 +115,11 @@ export const Profile = () => {
alt="avatar"
/>
- {user === "developer" ? (
-
- {profileInfo?.fio || profileInfo?.username},{" "}
- {profileInfo?.specification} разработчик
-
- ) : (
- {profileInfo?.fio || profileInfo?.username}
- )}
+
+ {profileInfo?.fio || profileInfo?.username},
+ {user === "developer" &&
+ ` ${profileInfo?.specification} разработчик`}
+
diff --git a/src/pages/ProjectTracker/ProjectTracker.jsx b/src/pages/ProjectTracker/ProjectTracker.jsx
index 52b95c10..13ea7a6b 100644
--- a/src/pages/ProjectTracker/ProjectTracker.jsx
+++ b/src/pages/ProjectTracker/ProjectTracker.jsx
@@ -256,7 +256,11 @@ export const ProjectTracker = () => {
} else {
dispatch(setProjectBoardFetch(projectBoard.id));
}
- showNotification({ show: true, text: "Колонка удалена", type: "error" });
+ showNotification({
+ show: true,
+ text: "Колонка удалена",
+ type: "error"
+ });
});
}
@@ -319,6 +323,11 @@ export const ProjectTracker = () => {
...prevState,
add: false
}));
+ showNotification({
+ show: true,
+ text: "Тег успешно создан",
+ type: "success"
+ });
});
});
}
@@ -340,6 +349,11 @@ export const ProjectTracker = () => {
}));
setTagInfo({ description: "", name: "" });
setColor("#aabbcc");
+ showNotification({
+ show: true,
+ text: "Тег успешно изменён",
+ type: "success"
+ });
});
}
@@ -353,6 +367,11 @@ export const ProjectTracker = () => {
}
}).then(() => {
dispatch(deleteTagProject(tagId));
+ showNotification({
+ show: true,
+ text: "Тег удален",
+ type: "success"
+ });
});
}
diff --git a/src/pages/Quiz/QuizReportPage.jsx b/src/pages/Quiz/QuizReportPage.jsx
index 56c8e0aa..4e76aed5 100644
--- a/src/pages/Quiz/QuizReportPage.jsx
+++ b/src/pages/Quiz/QuizReportPage.jsx
@@ -11,7 +11,6 @@ import { Loader } from "@components/Common/Loader/Loader";
import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
-// import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
import { AlertResult } from "@components/features/quiz/AlertResult";
import { QuizReport } from "@components/features/quiz/QuizReport";
@@ -41,7 +40,6 @@ export const QuizReportPage = () => {
- {/*
*/}
{
- {/* форма регистрации */}
diff --git a/src/pages/TrackerRegistration/TrackerRegistration.jsx b/src/pages/TrackerRegistration/TrackerRegistration.jsx
deleted file mode 100644
index 5c8f4345..00000000
--- a/src/pages/TrackerRegistration/TrackerRegistration.jsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import React, { useState } from "react";
-import { Navigate } from "react-router-dom";
-
-import { useFormValidation } from "@hooks/useFormValidation";
-import { useNotification } from "@hooks/useNotification";
-
-import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader";
-import BaseButton from "@components/Common/BaseButton/BaseButton";
-import { Footer } from "@components/Common/Footer/Footer";
-import { Loader } from "@components/Common/Loader/Loader";
-import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
-import { ModalTrackerRegistration } from "@components/Modal/ModalTrackerRegistration/ModalTrackerRegistration";
-import SideBar from "@components/SideBar/SideBar";
-
-import arrowInfo from "assets/icons/trackerIntroInfo.svg";
-import authImg from "assets/images/partnerProfile/authCandidateFormImg.png";
-import registrationImg from "assets/images/trackerRegistrationImg.png";
-
-import "./trackerRegistration.scss";
-
-export const TrackerRegistration = () => {
- const [modalConfirmOpen, setModalConfirm] = useState(false);
- const [loader, setLoader] = useState(false);
- const [isPartner, setIsPartner] = useState(false);
- const fields = {
- username: "",
- email: "",
- password: "",
- secondPassword: ""
- };
-
- const apiEndpoint = "/register/sign-up";
-
- const { showNotification } = useNotification();
- const showNotificationError = (error) => {
- showNotification({
- show: true,
- text: error,
- type: "error"
- });
- };
- const showNotificationTrue = () => {
- showNotification({
- show: true,
- text: "Аккаунт успешно создан",
- type: "success"
- });
- };
-
- const { formData, validationErrors, handleChange, handleSubmit } =
- useFormValidation(
- apiEndpoint,
- fields,
- showNotificationError,
- showNotificationTrue,
- isPartner,
- setLoader
- );
- return (
-
-
-
-
-
-
- Создайте свое{" "}
-
- рабочее пространство
- 
-
-
-
-
-
- {loader ? (
-
- ) : (
-
{
- e.preventDefault();
- await handleSubmit(e);
- }}
- styles="button-box__submit"
- >
- Отправить
-
- )}
-
-
-
- Создавайте и редактируйте задачи и проекты вместе с другими
- участниками команды.
-
-
-
-
-
-
- {modalConfirmOpen && (
-
-
-
- )}
-
-
-
- );
-};
diff --git a/src/pages/TrackerRegistration/trackerRegistration.scss b/src/pages/TrackerRegistration/trackerRegistration.scss
deleted file mode 100644
index 090fe428..00000000
--- a/src/pages/TrackerRegistration/trackerRegistration.scss
+++ /dev/null
@@ -1,150 +0,0 @@
-.tracker-registration {
- display: flex;
- flex-direction: column;
- min-height: 100vh;
- background-color: #f1f1f1;
-
- &__content {
- display: flex;
- flex-direction: column;
- flex: 1;
- color: #000000;
- padding: 50px 0 0;
-
- @media (max-width: 1375px) {
- padding-top: 100px;
- }
-
- .container {
- padding-bottom: 30px;
- }
- }
-
- &__form {
- position: relative;
- border-radius: 12px;
- background: #fff;
- padding: 20px;
-
- @media (max-width: 1000px) {
- display: flex;
- flex-direction: column;
- padding: 0;
- }
-
- &__inputs {
- display: flex;
- flex-wrap: wrap;
- max-width: 650px;
- column-gap: 44px;
-
- @media (max-width: 1000px) {
- order: 2;
- }
- }
-
- &__submit {
- display: flex;
- align-items: center;
- margin-top: 5px;
-
- button {
- border-radius: 44px;
- padding: 9px 39px;
- background: #52b709;
- font-weight: 500;
- font-size: 18px;
- color: #fff;
- border: none;
- max-width: 170px;
- }
-
- @media (max-width: 1000px) {
- order: 3;
- }
-
- @media (max-width: 675px) {
- flex-direction: column;
- align-items: start;
- row-gap: 35px;
- }
-
- .loader {
- max-width: 170px;
- }
- }
-
- &__info {
- display: flex;
- margin-left: 165px;
- align-items: center;
- img {
- margin-right: 31px;
-
- @media (max-width: 675px) {
- margin-right: 27px;
- }
- }
-
- p {
- font-size: 16px;
- font-weight: 400;
- line-height: 22px;
- color: #000;
- max-width: 430px;
-
- @media (max-width: 675px) {
- font-size: 14px;
- }
- }
- }
-
- &__img {
- position: absolute;
- top: -100px;
- right: 58px;
-
- @media (max-width: 900px) {
- display: none;
- }
- }
- }
- &__input-container {
- display: flex;
- flex-direction: column;
- max-width: 300px;
- width: 100%;
- margin-bottom: 44px;
-
- h5 {
- font-size: 15px;
- }
-
- span {
- font-weight: 400;
- font-size: 12px;
- color: red;
- }
-
- input {
- outline: none;
- padding: 8px 12px 9px;
- background-color: #eff2f7;
- border-radius: 8px;
- margin: 10px 0;
- border: none;
- font-weight: 400;
- font-size: 15px;
- color: #000;
- }
-
- @media (max-width: 675px) {
- margin-bottom: 0;
- max-width: none;
- }
-
- .error {
- border: 1px solid red;
- }
- }
-}
diff --git a/src/pages/ViewReport/ViewReport.jsx b/src/pages/ViewReport/ViewReport.jsx
index ab210b1d..6169cf6f 100644
--- a/src/pages/ViewReport/ViewReport.jsx
+++ b/src/pages/ViewReport/ViewReport.jsx
@@ -12,6 +12,8 @@ import {
import { apiRequest } from "@api/request";
+import { useNotification } from "@hooks/useNotification";
+
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import { Navigation } from "@components/Navigation/Navigation";
@@ -38,6 +40,7 @@ export const ViewReport = () => {
const [loader, setLoader] = useState(false);
const [deleteLoader, setDeleteLoader] = useState(false);
const [reportInfo, setReportInfo] = useState({});
+ const { showNotification } = useNotification();
function getReportFromDate(day) {
setLoader(true);
@@ -84,6 +87,11 @@ export const ViewReport = () => {
if (res) {
window.location.replace("/profile/calendar");
}
+ showNotification({
+ show: true,
+ text: "Отчет удален",
+ type: "success"
+ });
});
}
diff --git a/src/pages/roles/DeveloperPage.jsx b/src/pages/roles/DeveloperPage.jsx
new file mode 100644
index 00000000..b083f7c0
--- /dev/null
+++ b/src/pages/roles/DeveloperPage.jsx
@@ -0,0 +1,51 @@
+import React from "react";
+import { Navigate, Route, Routes } from "react-router-dom";
+
+import { PartnerSettings } from "@pages/PartnerSettings/PartnerSettings";
+import { PartnerTreaties } from "@pages/PartnerTreaties/PartnerTreaties";
+import { Payouts } from "@pages/Payouts/Payouts";
+import { Profile } from "@pages/Profile/Profile";
+import { ProjectTracker } from "@pages/ProjectTracker/ProjectTracker";
+import { PassingTests } from "@pages/Quiz/PassingTests";
+import { QuizPage } from "@pages/Quiz/QuizPage";
+import { QuizReportPage } from "@pages/Quiz/QuizReportPage";
+import Statistics from "@pages/Statistics/Statistics";
+import { Summary } from "@pages/Summary/Summary";
+import { Tracker } from "@pages/Tracker/Tracker";
+import { ViewReport } from "@pages/ViewReport/ViewReport";
+
+import { TicketFullScreen } from "@components/Modal/Tracker/TicketFullScreen/TicketFullScreen";
+import { ProfileCalendar } from "@components/ProfileCalendar/ProfileCalendar";
+import { ReportForm } from "@components/ReportForm/ReportForm";
+
+export const DeveloperPage = () => {
+ return (
+
+ }
+ >
+ } />
+
+
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+
+ } />
+ } />
+ } />
+
+
+ } />
+
+ );
+};
diff --git a/src/pages/roles/GuestPage.jsx b/src/pages/roles/GuestPage.jsx
new file mode 100644
index 00000000..ee761bf1
--- /dev/null
+++ b/src/pages/roles/GuestPage.jsx
@@ -0,0 +1,66 @@
+import React from "react";
+import { Navigate, Route, Routes } from "react-router-dom";
+
+import { Article } from "@pages/Article/Article";
+import { Auth } from "@pages/Auth/Auth";
+import { AuthForCandidate } from "@pages/AuthForCandidate/AuthForCandidate";
+import { Blog } from "@pages/Blog/Blog";
+import CatalogSpecialists from "@pages/CatalogSpecialists/CatalogSpecialists";
+import { CompanyInfo } from "@pages/CompanyInfo/CompanyInfo";
+import { Forms } from "@pages/Forms/Forms";
+import { FrequentlyAskedQuestion } from "@pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion";
+import { FrequentlyAskedQuestions } from "@pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions";
+import { ProfileCandidate } from "@pages/ProfileCandidate/ProfileCandidate";
+import { RegistrationForCandidate } from "@pages/RegistrationForCandidate/RegistrationForCandidate";
+import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting";
+import { SingleReportPage } from "@pages/SingleReportPage/SingleReportPage";
+import { TrackerIntro } from "@pages/TrackerIntro/TrackerIntro";
+
+import { FreeDevelopers } from "@components/FreeDevelopers/FreeDevelopers";
+
+export const GuestPage = () => {
+ return (
+
+ } />
+ } />
+ } />
+ } />
+ } />
+ }
+ />
+ }
+ />
+ } />
+ } />
+ }
+ />
+
+ }>
+ }>
+ }
+ />
+ }
+ />
+
+ } />
+
+ } />
+
+
+ );
+};
diff --git a/src/pages/roles/PartnerPage.jsx b/src/pages/roles/PartnerPage.jsx
new file mode 100644
index 00000000..a94d9f5c
--- /dev/null
+++ b/src/pages/roles/PartnerPage.jsx
@@ -0,0 +1,65 @@
+import React from "react";
+import { Navigate, Route, Routes } from "react-router-dom";
+
+import { FormPage } from "@pages/FormPage/FormPage";
+import { Home } from "@pages/Home/Home";
+import { PartnerAddRequest } from "@pages/PartnerAddRequest/PartnerAddRequest";
+import { PartnerBid } from "@pages/PartnerBid/PartnerBid";
+import { PartnerEmployeeReport } from "@pages/PartnerEmployeeReport/PartnerEmployeeReport";
+import { PartnerEmployees } from "@pages/PartnerEmployees/PartnerEmployees";
+import { PartnerRequests } from "@pages/PartnerRequests/PartnerRequests";
+import { PartnerSettings } from "@pages/PartnerSettings/PartnerSettings";
+import { PartnerTreaties } from "@pages/PartnerTreaties/PartnerTreaties";
+import { PartnerCategories } from "@pages/PartnerСategories/PartnerСategories";
+import { Profile } from "@pages/Profile/Profile";
+import { ProjectTracker } from "@pages/ProjectTracker/ProjectTracker";
+import Statistics from "@pages/Statistics/Statistics";
+import { Tracker } from "@pages/Tracker/Tracker";
+import { ViewReport } from "@pages/ViewReport/ViewReport";
+
+import { Calendar } from "@components/Calendar/Calendar";
+import { Candidate } from "@components/Candidate/Candidate";
+import { TicketFullScreen } from "@components/Modal/Tracker/TicketFullScreen/TicketFullScreen";
+
+export const PartnerPage = () => {
+ return (
+
+ } />
+ } />
+ } />
+
+ }
+ >
+ } />
+
+
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ }
+ />
+ } />
+ }
+ />
+
+ } />
+
+ );
+};
diff --git a/src/redux/outstaffingSlice.js b/src/redux/outstaffingSlice.js
index be040a7b..c6becf0d 100644
--- a/src/redux/outstaffingSlice.js
+++ b/src/redux/outstaffingSlice.js
@@ -6,7 +6,7 @@ const initialState = {
filteredCandidates: null,
selectedItems: [],
currentCandidate: {},
- auth: false,
+ auth: null,
positionId: null,
profileInfo: {},
reportsDates: "",
-