diff --git a/src/App.jsx b/src/App.jsx index e1fcc7eb..a5549529 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -24,6 +24,7 @@ import { PartnerSettings } from "@pages/PartnerSettings/PartnerSettings"; import { PartnerTreaties } from "@pages/PartnerTreaties/PartnerTreaties"; import { PartnerCategories } from "@pages/PartnerСategories/PartnerСategories"; import { Payouts } from "@pages/Payouts/Payouts"; +import { Forms } from "@pages/Forms/Forms"; import { Profile } from "@pages/Profile/Profile"; import { ProfileCandidate } from "@pages/ProfileCandidate/ProfileCandidate"; import { ProjectTracker } from "@pages/ProjectTracker/ProjectTracker"; @@ -39,23 +40,23 @@ import { TrackerAuth } from "@pages/TrackerAuth/TrackerAuth"; import { TrackerIntro } from "@pages/TrackerIntro/TrackerIntro"; import { TrackerRegistration } from "@pages/TrackerRegistration/TrackerRegistration"; import { ViewReport } from "@pages/ViewReport/ViewReport"; +import { Article } from "@pages/Article/Article"; +import { Auth } from "@pages/Auth/Auth"; +import { Blog } from "@pages/Blog/Blog"; +import { FormPage } from "@pages/FormPage/FormPage"; +import { Home } from "@pages/Home/Home"; +import { SingleReportPage } from "@pages/SingleReportPage/SingleReportPage"; import { TicketFullScreen } from "@components/Modal/Tracker/TicketFullScreen/TicketFullScreen"; -import Notification from "@components/Notification/Notification"; +import { Notification } from "@components/Notification/Notification"; import { ProfileCalendar } from "@components/ProfileCalendar/ProfileCalendar"; +import { Calendar } from "@components/Calendar/Calendar"; +import { Candidate } from "@components/Candidate/Candidate"; +import { FreeDevelopers } from "@components/FreeDevelopers/FreeDevelopers"; +import { ReportForm } from "@components/ReportForm/ReportForm"; -import "./assets/fonts/stylesheet.css"; -import "./assets/global.scss"; -import Calendar from "./components/Calendar/Calendar"; -import Candidate from "./components/Candidate/Candidate"; -import FreeDevelopers from "./components/FreeDevelopers/FreeDevelopers"; -import ReportForm from "./components/ReportForm/ReportForm"; -import Article from "./pages/Article/Article"; -import Auth from "./pages/Auth/Auth"; -import Blog from "./pages/Blog/Blog"; -import FormPage from "./pages/FormPage/FormPage"; -import Home from "./pages/Home/Home"; -import SingleReportPage from "./pages/SingleReportPage/SingleReportPage"; +import "assets/fonts/stylesheet.css"; +import "assets/global.scss"; const App = () => { const notification = useSelector(getNotification); @@ -66,6 +67,7 @@ const App = () => { } /> } /> } /> + } /> { +export const Calendar = () => { if (localStorage.getItem("role_status") !== "18") { return ; } @@ -84,5 +84,3 @@ const Calendar = () => { ); }; - -export default Calendar; diff --git a/src/components/Candidate/Candidate.jsx b/src/components/Candidate/Candidate.jsx index 85348f2f..ea60aa86 100644 --- a/src/components/Candidate/Candidate.jsx +++ b/src/components/Candidate/Candidate.jsx @@ -28,7 +28,7 @@ import rectangle from "assets/images/rectangle_secondPage.png"; import "./candidate.scss"; -const Candidate = () => { +export const Candidate = () => { if (localStorage.getItem("role_status") !== "18") { return ; } @@ -238,5 +238,3 @@ const Candidate = () => { ); }; - -export default Candidate; diff --git a/src/components/Common/AuthHeader/AuthHeader.jsx b/src/components/Common/AuthHeader/AuthHeader.jsx index fff8d958..c39b072d 100644 --- a/src/components/Common/AuthHeader/AuthHeader.jsx +++ b/src/components/Common/AuthHeader/AuthHeader.jsx @@ -51,5 +51,3 @@ export const AuthHeader = () => { ); }; - -export default AuthHeader; diff --git a/src/components/FreeDevelopers/FreeDevelopers.jsx b/src/components/FreeDevelopers/FreeDevelopers.jsx index b3fc3ac0..c63e93f8 100644 --- a/src/components/FreeDevelopers/FreeDevelopers.jsx +++ b/src/components/FreeDevelopers/FreeDevelopers.jsx @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; import { scrollToForm } from "@utils/helper"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import BaseButton from "@components/Common/BaseButton/BaseButton"; import { Footer } from "@components/Common/Footer/Footer"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx index ffb050f7..64238709 100644 --- a/src/components/Navigation/Navigation.jsx +++ b/src/components/Navigation/Navigation.jsx @@ -81,7 +81,7 @@ export const Navigation = () => { {totalRangeHours ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` : endDate - ? "0 часов" - : ""} + ? "0 часов" + : ""} {endDate && ( { {link.name} diff --git a/src/components/ReportForm/ReportForm.jsx b/src/components/ReportForm/ReportForm.jsx index 577766a4..8f9d6466 100644 --- a/src/components/ReportForm/ReportForm.jsx +++ b/src/components/ReportForm/ReportForm.jsx @@ -32,7 +32,7 @@ import "./reportForm.scss"; registerLocale("ru", ru); -const ReportForm = () => { +export const ReportForm = () => { if (localStorage.getItem("role_status") === "18") { return ; } @@ -456,5 +456,3 @@ const ReportForm = () => { ); }; - -export default ReportForm; diff --git a/src/components/SideBar/SideBar.jsx b/src/components/SideBar/SideBar.jsx index 607fb68a..a96e8c0a 100644 --- a/src/components/SideBar/SideBar.jsx +++ b/src/components/SideBar/SideBar.jsx @@ -47,23 +47,23 @@ export const SideBar = () => {
  • - Вход для партнеров + Вход
  • - Кабинет разработчика + Личный кабинет
  • Трекер
  • - Тесты + Тесты +
    • +
  • + Формы
  • Школа
    • -
  • - Отрасли -
  • Контакты
    • diff --git a/src/components/features/Candidate-lk/HeadBottom.js b/src/components/features/Candidate-lk/HeadBottom.jsx similarity index 100% rename from src/components/features/Candidate-lk/HeadBottom.js rename to src/components/features/Candidate-lk/HeadBottom.jsx diff --git a/src/components/features/quiz/HeaderPageTests.jsx b/src/components/features/quiz/HeaderPageTests.jsx index 571c7499..0d8d9f7c 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 4bed6f8f..c204f9a6 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.jsx similarity index 99% rename from src/components/features/quiz/Task.js rename to src/components/features/quiz/Task.jsx index dba65056..0910c9b4 100644 --- a/src/components/features/quiz/Task.js +++ b/src/components/features/quiz/Task.jsx @@ -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/Article/Article.jsx b/src/pages/Article/Article.jsx index d74843aa..0e4a0c2e 100644 --- a/src/pages/Article/Article.jsx +++ b/src/pages/Article/Article.jsx @@ -2,7 +2,7 @@ import React, { useState } from "react"; import { Link } from "react-router-dom"; import CardArticle from "@components/CardArticle/CardArticle"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import SideBar from "@components/SideBar/SideBar"; diff --git a/src/pages/Auth/Auth.jsx b/src/pages/Auth/Auth.jsx index ddda0032..663be1c3 100644 --- a/src/pages/Auth/Auth.jsx +++ b/src/pages/Auth/Auth.jsx @@ -5,7 +5,7 @@ import { useNavigate } from "react-router-dom"; import { selectAuth } from "@redux/outstaffingSlice"; import { AuthBox } from "@components/AuthBox/AuthBox"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import SideBar from "@components/SideBar/SideBar"; @@ -18,7 +18,7 @@ import cross from "assets/images/cross.png"; import "./auth.scss"; -const Auth = () => { +export const Auth = () => { const isAuth = useSelector(selectAuth); let navigate = useNavigate(); @@ -92,5 +92,3 @@ const Auth = () => { ); }; - -export default Auth; diff --git a/src/pages/AuthForCandidate/AuthForCandidate.jsx b/src/pages/AuthForCandidate/AuthForCandidate.jsx index 4957bca6..651b8d0d 100644 --- a/src/pages/AuthForCandidate/AuthForCandidate.jsx +++ b/src/pages/AuthForCandidate/AuthForCandidate.jsx @@ -6,7 +6,7 @@ import { selectAuth } from "@redux/outstaffingSlice"; import AuthBlock from "@components/AuthBlock/AuthBlock"; import CategoriesItem from "@components/CategoriesItem/CategoriesItem"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import ModalResetPassword from "@components/Modal/ModalResetPassword/ModalResetPassword"; import SideBar from "@components/SideBar/SideBar"; @@ -109,7 +109,7 @@ export const AuthForCandidate = () => { return (
    - +
    { +export const FormPage = () => { if (localStorage.getItem("role_status") !== "18") { return ; } @@ -101,5 +101,3 @@ const FormPage = () => {
    ); }; - -export default FormPage; diff --git a/src/pages/Forms/Forms.jsx b/src/pages/Forms/Forms.jsx new file mode 100644 index 00000000..050c3d89 --- /dev/null +++ b/src/pages/Forms/Forms.jsx @@ -0,0 +1,21 @@ +import React from "react"; + +import { Footer } from "@components/Common/Footer/Footer"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; +import SideBar from "@components/SideBar/SideBar"; + +import "./forms.scss"; + +export const Forms = () => { + return ( +
    + + +
    +
    +

    Здесь будут формы

    +
    +
    +
    + ); +}; diff --git a/src/pages/Forms/Forms.scss b/src/pages/Forms/Forms.scss new file mode 100644 index 00000000..18d58008 --- /dev/null +++ b/src/pages/Forms/Forms.scss @@ -0,0 +1,13 @@ +.forms { + display: flex; + flex-direction: column; + min-height: 100vh; + background: #f1f1f1; + + .container { + max-width: 1160px; + display: flex; + flex-direction: column; + flex: 1; + } +} diff --git a/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx b/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx index b84db7ba..d8f95b91 100644 --- a/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx +++ b/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.jsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import { useNavigate, useParams } from "react-router"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import SideBar from "@components/SideBar/SideBar"; diff --git a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx index f6f3a74e..b08e2b58 100644 --- a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx +++ b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.jsx @@ -1,6 +1,6 @@ import React from "react"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import { FrequentlyAskedQuestionsItem } from "@components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; diff --git a/src/pages/Home/Home.jsx b/src/pages/Home/Home.jsx index 9670dfb2..851c68a1 100644 --- a/src/pages/Home/Home.jsx +++ b/src/pages/Home/Home.jsx @@ -13,7 +13,7 @@ import Outstaffing from "@components/Outstaffing/Outstaffing"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; -const Home = () => { +export const Home = () => { if (localStorage.getItem("role_status") !== "18") { return ; } @@ -75,5 +75,3 @@ const Home = () => { ); }; - -export default Home; diff --git a/src/pages/PartnerSettings/PartnerSettings.jsx b/src/pages/PartnerSettings/PartnerSettings.jsx index ebd2a262..1ece3338 100644 --- a/src/pages/PartnerSettings/PartnerSettings.jsx +++ b/src/pages/PartnerSettings/PartnerSettings.jsx @@ -183,7 +183,7 @@ export const PartnerSettings = () => { использования персональных данных
    -
    + {/*

    Документы и отчеты

    Изменить провадера ЭДО

    @@ -221,7 +221,7 @@ export const PartnerSettings = () => { Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и использования персональных данных -
    +
    */}
    diff --git a/src/pages/Quiz/PassingTests.jsx b/src/pages/Quiz/PassingTests.jsx index 2745638b..0f2abc73 100644 --- a/src/pages/Quiz/PassingTests.jsx +++ b/src/pages/Quiz/PassingTests.jsx @@ -25,7 +25,7 @@ export const PassingTests = () => { expiryTimestamp: moment(), autoStart: false, onExpire: () => { - navigate("/Quiz"); + navigate("/quiz"); } }); @@ -84,8 +84,8 @@ export const PassingTests = () => {
    diff --git a/src/pages/Quiz/QuizPage.jsx b/src/pages/Quiz/QuizPage.jsx index 0479ae75..4aa4c913 100644 --- a/src/pages/Quiz/QuizPage.jsx +++ b/src/pages/Quiz/QuizPage.jsx @@ -122,7 +122,7 @@ export const QuizPage = () => {
    diff --git a/src/pages/Quiz/QuizReportPage.jsx b/src/pages/Quiz/QuizReportPage.jsx index 79c7a6c8..56c8e0aa 100644 --- a/src/pages/Quiz/QuizReportPage.jsx +++ b/src/pages/Quiz/QuizReportPage.jsx @@ -21,7 +21,7 @@ export const QuizReportPage = () => { let navigate = useNavigate(); if (!test) { - navigate("/Quiz"); + navigate("/quiz"); } const [testInfo, setTestInfo] = useState({}); diff --git a/src/pages/RegistrationForCandidate/RegistrationForCandidate.jsx b/src/pages/RegistrationForCandidate/RegistrationForCandidate.jsx index 10ef7523..cf82e764 100644 --- a/src/pages/RegistrationForCandidate/RegistrationForCandidate.jsx +++ b/src/pages/RegistrationForCandidate/RegistrationForCandidate.jsx @@ -4,7 +4,7 @@ import { Link } from "react-router-dom"; import { useFormValidation } from "@hooks/useFormValidation"; import { useNotification } from "@hooks/useNotification"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import SideBar from "@components/SideBar/SideBar"; import StepsForCandidate from "@components/StepsForCandidate/StepsForCandidate"; diff --git a/src/pages/RegistrationSetting/RegistrationSetting.jsx b/src/pages/RegistrationSetting/RegistrationSetting.jsx index d6e69cf8..f57bf48c 100644 --- a/src/pages/RegistrationSetting/RegistrationSetting.jsx +++ b/src/pages/RegistrationSetting/RegistrationSetting.jsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import SideBar from "@components/SideBar/SideBar"; diff --git a/src/pages/SingleReportPage/SingleReportPage.jsx b/src/pages/SingleReportPage/SingleReportPage.jsx index c94c98aa..925fa984 100644 --- a/src/pages/SingleReportPage/SingleReportPage.jsx +++ b/src/pages/SingleReportPage/SingleReportPage.jsx @@ -24,7 +24,7 @@ const tasks = [ } ]; -const SingleReportPage = () => { +export const SingleReportPage = () => { const navigate = useNavigate(); return ( @@ -108,5 +108,3 @@ const SingleReportPage = () => {
    ); }; - -export default SingleReportPage; diff --git a/src/pages/TrackerAuth/TrackerAuth.jsx b/src/pages/TrackerAuth/TrackerAuth.jsx index bc53030e..d75f32c0 100644 --- a/src/pages/TrackerAuth/TrackerAuth.jsx +++ b/src/pages/TrackerAuth/TrackerAuth.jsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import AuthBlock from "@components/AuthBlock/AuthBlock"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import ModalLayout from "@components/Common/ModalLayout/ModalLayout"; import { ModalReset } from "@components/Modal/ModalReset/ModalReset"; diff --git a/src/pages/TrackerIntro/TrackerIntro.jsx b/src/pages/TrackerIntro/TrackerIntro.jsx index 3e49a15d..59d0571e 100644 --- a/src/pages/TrackerIntro/TrackerIntro.jsx +++ b/src/pages/TrackerIntro/TrackerIntro.jsx @@ -1,7 +1,7 @@ import React from "react"; import { NavLink } from "react-router-dom"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import SideBar from "@components/SideBar/SideBar"; diff --git a/src/pages/TrackerRegistration/TrackerRegistration.jsx b/src/pages/TrackerRegistration/TrackerRegistration.jsx index d5e1624c..868a01a6 100644 --- a/src/pages/TrackerRegistration/TrackerRegistration.jsx +++ b/src/pages/TrackerRegistration/TrackerRegistration.jsx @@ -4,7 +4,7 @@ import { Navigate } from "react-router-dom"; import { useFormValidation } from "@hooks/useFormValidation"; import { useNotification } from "@hooks/useNotification"; -import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; +import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader"; import { Footer } from "@components/Common/Footer/Footer"; import ModalLayout from "@components/Common/ModalLayout/ModalLayout"; import { ModalTrackerRegistration } from "@components/Modal/ModalTrackerRegistration/ModalTrackerRegistration";