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

Reviewed-on: #13

src/App.js

@@ -10,7 +10,7 @@ import { getNotification } from "@redux/outstaffingSlice";
 
 import Auth from "./pages/Auth/Auth";
 import CatalogSpecialists from "@pages/CatalogSpecialists/CatalogSpecialists";
-import { TrackerIntro } from "./pages/TrackerIntro/TrackerIntro"
+import { TrackerIntro } from "@pages/TrackerIntro/TrackerIntro"
 import { CompanyInfo } from "@pages/CompanyInfo/CompanyInfo";
 import { TrackerAuth } from "@pages/TrackerAuth/TrackerAuth";
 import { TrackerRegistration } from "@pages/TrackerRegistration/TrackerRegistration";
@@ -19,35 +19,35 @@ import Candidate from "./components/Candidate/Candidate";
 import Calendar from "./components/Calendar/Calendar";
 import ReportForm from "./components/ReportForm/ReportForm";
 import FreeDevelopers from "./components/FreeDevelopers/FreeDevelopers";
-import { TicketFullScreen } from "./components/Modal/Tracker/TicketFullScreen/TicketFullScreen";
-import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar";
+import { TicketFullScreen } from "@components/Modal/Tracker/TicketFullScreen/TicketFullScreen";
+import { ProfileCalendar } from "@components/ProfileCalendar/ProfileCalendar";
 import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting";
 import Article from "./pages/Article/Article";
 import FormPage from "./pages/FormPage/FormPage";
 import SingleReportPage from "./pages/SingleReportPage/SingleReportPage";
-import { QuizPage } from "./pages/Quiz/QuizPage";
-import { QuizReportPage } from "./pages/Quiz/QuizReportPage";
-import { Profile } from "./pages/Profile/Profile.js";
-import { Summary } from "./pages/Summary/Summary";
-import { ViewReport } from "./pages/ViewReport/ViewReport";
-import { Tracker } from "./pages/Tracker/Tracker";
-import { Payouts } from "./pages/Payouts/Payouts";
-import { PartnerSettings } from "./pages/PartnerSettings/PartnerSettings";
-import { PartnerRequests } from "./pages/PartnerRequests/PartnerRequests";
-import { PartnerAddRequest } from "./pages/PartnerAddRequest/PartnerAddRequest";
-import { PartnerBid } from "./pages/PartnerBid/PartnerBid";
-import { PartnerCategories } from "./pages/PartnerСategories/PartnerСategories";
-import { PartnerTreaties } from "./pages/PartnerTreaties/PartnerTreaties";
-import { PartnerEmployees } from "./pages/PartnerEmployees/PartnerEmployees";
-import { AuthForCandidate } from "./pages/AuthForCandidate/AuthForCandidate";
-import { RegistrationForCandidate } from "./pages/RegistrationForCandidate/RegistrationForCandidate";
-import { ProfileCandidate } from "./pages/ProfileCandidate/ProfileCandidate";
-import { PassingTests } from "./pages/Quiz/PassingTests";
+import { QuizPage } from "@pages/Quiz/QuizPage";
+import { QuizReportPage } from "@pages/Quiz/QuizReportPage";
+import { Profile } from "@pages/Profile/Profile";
+import { Summary } from "@pages/Summary/Summary";
+import { ViewReport } from "@pages/ViewReport/ViewReport";
+import { Tracker } from "@pages/Tracker/Tracker";
+import { Payouts } from "@pages/Payouts/Payouts";
+import { PartnerSettings } from "@pages/PartnerSettings/PartnerSettings";
+import { PartnerRequests } from "@pages/PartnerRequests/PartnerRequests";
+import { PartnerAddRequest } from "@pages/PartnerAddRequest/PartnerAddRequest";
+import { PartnerBid } from "@pages/PartnerBid/PartnerBid";
+import { PartnerCategories } from "@pages/PartnerСategories/PartnerСategories";
+import { PartnerTreaties } from "@pages/PartnerTreaties/PartnerTreaties";
+import { PartnerEmployees } from "@pages/PartnerEmployees/PartnerEmployees";
+import { AuthForCandidate } from "@pages/AuthForCandidate/AuthForCandidate";
+import { RegistrationForCandidate } from "@pages/RegistrationForCandidate/RegistrationForCandidate";
+import { ProfileCandidate } from "@pages/ProfileCandidate/ProfileCandidate";
+import { PassingTests } from "@pages/Quiz/PassingTests";
 import Blog from "./pages/Blog/Blog";
 import Statistics from "@pages/Statistics/Statistics";
-import { ProjectTracker } from "./pages/ProjectTracker/ProjectTracker";
-import { FrequentlyAskedQuestions } from "./pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions";
-import { FrequentlyAskedQuestion } from "./pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion";
+import { ProjectTracker } from "@pages/ProjectTracker/ProjectTracker";
+import { FrequentlyAskedQuestions } from "@pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions";
+import { FrequentlyAskedQuestion } from "@pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion";
 import Notification from "@components/Notification/Notification";
 import { useSelector } from "react-redux";
 

src/components/Navigation/Navigation.jsx

@@ -35,7 +35,7 @@ export const Navigation = () => {
         name: "Выплаты"
       },
       {
-        path: "/quiz",
+        path: "/Quiz",
         name: "Тесты"
       },
       {
@@ -96,7 +96,7 @@ export const Navigation = () => {
               <NavLink
                 key={index}
                 end
-                to={link.path === "/quiz" ? link.path : `/profile${link.path}`}
+                to={link.path === "/Quiz" ? link.path : `/profile${link.path}`}
               >
                 {link.name}
               </NavLink>

src/components/SideBar/SideBar.jsx

@@ -56,7 +56,7 @@ export const SideBar = () => {
             <Link to={"/tracker-intro"}>Трекер</Link>
           </li>
           <li>
-            <Link to={"/quiz"}>Тесты</Link>
+            <Link to={"/Quiz"}>Тесты</Link>
           </li>
           <li>
             <a href="#">Школа</a>

src/components/features/quiz/HeaderPageTests.jsx

@@ -32,7 +32,7 @@ export const HeaderPageTestsQuiz = ({ isVisibilityButton }) => {
         </div>
         {isVisibilityButton && (
           <Link
-            to={"/quiz/instruction"}
+            to={"/Quiz/instruction"}
             className="quiz-btn quiz-btn_restriction"
           >
             Пройти

src/components/features/quiz/MyTestsQuiz.jsx

@@ -44,7 +44,7 @@ export const MyTestsQuiz = ({ listTests }) => {
                     </h3>
                     <div className="item-test__body test-data">
                       <Link
-                        to={"/quiz/interjacent"}
+                        to={"/Quiz/interjacent"}
                         className="quiz-btn"
                         onClick={() => recordSelectedTest(item)}
                       >

src/components/features/quiz/Task.js

@@ -58,7 +58,7 @@ export const TaskQuiz = ({ timer }) => {
           text: "Тест успешно пройден",
           type: "success"
         });
-        navigate("/quiz");
+        navigate("/Quiz");
         // if (String(res?.status)[0] !== "2") {
         //   showNotification({
         //     show: true,

src/pages/Quiz/PassingTests.js

@@ -26,7 +26,7 @@ export const PassingTests = () => {
     expiryTimestamp: moment(),
     autoStart: false,
     onExpire: () => {
-      navigate("/quiz");
+      navigate("/Quiz");
     }
   });
 
@@ -85,8 +85,8 @@ export const PassingTests = () => {
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/profile-candidate" },
-            { name: "Тестирование", link: "/quiz" },
-            { name: "Прохождение тестов", link: "/quiz/test" }
+            { name: "Тестирование", link: "/Quiz" },
+            { name: "Прохождение тестов", link: "/Quiz/test" }
           ]}
         />
         <div className="passing-tests-page__title main-title">

src/pages/Quiz/QuizPage.js

@@ -116,7 +116,7 @@ export const QuizPage = () => {
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/profile-candidate" },
-            { name: "Тестирование", link: "/quiz" }
+            { name: "Тестирование", link: "/Quiz" }
           ]}
         />
         <div className="quiz-page__title main-title">
@@ -124,9 +124,9 @@ export const QuizPage = () => {
         </div>
         {!selectedCategory && (
           <>
-            <div className="quiz-page__specialization">
-              <SelectedCategory setSelectedCategory={setSetSelectedCategory} />
-            </div>
+            {/*<div className="quiz-page__specialization">*/}
+            {/*  <SelectedCategory setSelectedCategory={setSetSelectedCategory} />*/}
+            {/*</div>*/}
             <div className="quiz-page__block">Доступные тесты</div>
             <div className="quiz-page__cards-test">
               {questionnaires.length ? (

src/pages/Quiz/QuizReportPage.js

@@ -20,7 +20,7 @@ export const QuizReportPage = () => {
 
   let navigate = useNavigate();
   if (!test) {
-    navigate("/quiz");
+    navigate("/Quiz");
   }
 
   useEffect(() => {
@@ -42,8 +42,8 @@ export const QuizReportPage = () => {
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/profile-candidate" },
-            { name: "Тестирование", link: "/quiz" },
-            { name: "Отчет по тестированию", link: "/quiz/report" }
+            { name: "Тестирование", link: "/Quiz" },
+            { name: "Отчет по тестированию", link: "/Quiz/report" }
           ]}
         />
         <div className="quiz-report-page__title main-title">