diff --git a/src/App.js b/src/App.js index 49a266eb..d6aa71f0 100644 --- a/src/App.js +++ b/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"; diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx index a9a21b46..c6148493 100644 --- a/src/components/Navigation/Navigation.jsx +++ b/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 = () => { {link.name} diff --git a/src/components/ProfileCalendar/ProfileCalendar.jsx b/src/components/ProfileCalendar/ProfileCalendar.jsx index ace451fe..600da14f 100644 --- a/src/components/ProfileCalendar/ProfileCalendar.jsx +++ b/src/components/ProfileCalendar/ProfileCalendar.jsx @@ -50,8 +50,7 @@ export const ProfileCalendar = () => { if (!requestDates) { return; } - apiRequest( - `/reports/index?${requestDates}&user_id =${localStorage.getItem("id")}` + apiRequest(`/reports/index?${requestDates}&user_id=${localStorage.getItem("id")}` ).then((reports) => { let spendTime = 0; diff --git a/src/components/SideBar/SideBar.jsx b/src/components/SideBar/SideBar.jsx index a31cf365..dd9626ac 100644 --- a/src/components/SideBar/SideBar.jsx +++ b/src/components/SideBar/SideBar.jsx @@ -56,7 +56,7 @@ export const SideBar = () => { Трекер
  • - Тесты + Тесты
  • Школа diff --git a/src/components/features/quiz/HeaderPageTests.jsx b/src/components/features/quiz/HeaderPageTests.jsx index 0d8d9f7c..571c7499 100644 --- a/src/components/features/quiz/HeaderPageTests.jsx +++ b/src/components/features/quiz/HeaderPageTests.jsx @@ -32,7 +32,7 @@ export const HeaderPageTestsQuiz = ({ isVisibilityButton }) => { {isVisibilityButton && ( Пройти diff --git a/src/components/features/quiz/MyTestsQuiz.jsx b/src/components/features/quiz/MyTestsQuiz.jsx index c204f9a6..4bed6f8f 100644 --- a/src/components/features/quiz/MyTestsQuiz.jsx +++ b/src/components/features/quiz/MyTestsQuiz.jsx @@ -44,7 +44,7 @@ export const MyTestsQuiz = ({ listTests }) => {
    recordSelectedTest(item)} > diff --git a/src/components/features/quiz/Task.js b/src/components/features/quiz/Task.js index 0910c9b4..dba65056 100644 --- a/src/components/features/quiz/Task.js +++ b/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, diff --git a/src/pages/quiz/PassingTests.js b/src/pages/Quiz/PassingTests.js similarity index 98% rename from src/pages/quiz/PassingTests.js rename to src/pages/Quiz/PassingTests.js index 9f7668c3..7eeb83bb 100644 --- a/src/pages/quiz/PassingTests.js +++ b/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 = () => {
    diff --git a/src/pages/quiz/QuizPage.js b/src/pages/Quiz/QuizPage.js similarity index 96% rename from src/pages/quiz/QuizPage.js rename to src/pages/Quiz/QuizPage.js index ea1315dc..56778627 100644 --- a/src/pages/quiz/QuizPage.js +++ b/src/pages/Quiz/QuizPage.js @@ -116,7 +116,7 @@ export const QuizPage = () => {
    @@ -124,9 +124,9 @@ export const QuizPage = () => {
    {!selectedCategory && ( <> -
    - -
    + {/*
    */} + {/* */} + {/*
    */}
    Доступные тесты
    {questionnaires.length ? ( diff --git a/src/pages/quiz/QuizReportPage.js b/src/pages/Quiz/QuizReportPage.js similarity index 94% rename from src/pages/quiz/QuizReportPage.js rename to src/pages/Quiz/QuizReportPage.js index 8ee5ea61..accf14be 100644 --- a/src/pages/quiz/QuizReportPage.js +++ b/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 = () => {
    diff --git a/src/pages/quiz/quiz-page.scss b/src/pages/Quiz/quiz-page.scss similarity index 100% rename from src/pages/quiz/quiz-page.scss rename to src/pages/Quiz/quiz-page.scss