pull

src/App.jsx

@@ -10,11 +10,17 @@ import {
 
 import { getNotification } from "@redux/outstaffingSlice";
 
+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 { FormPage } from "@pages/FormPage/FormPage";
+import { Forms } from "@pages/Forms/Forms";
 import { FrequentlyAskedQuestion } from "@pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion";
 import { FrequentlyAskedQuestions } from "@pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions";
+import { Home } from "@pages/Home/Home";
 import { PartnerAddRequest } from "@pages/PartnerAddRequest/PartnerAddRequest";
 import { PartnerBid } from "@pages/PartnerBid/PartnerBid";
 import { PartnerEmployeeReport } from "@pages/PartnerEmployeeReport/PartnerEmployeeReport";
@@ -24,7 +30,6 @@ 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";
@@ -33,6 +38,7 @@ import { QuizPage } from "@pages/Quiz/QuizPage";
 import { QuizReportPage } from "@pages/Quiz/QuizReportPage";
 import { RegistrationForCandidate } from "@pages/RegistrationForCandidate/RegistrationForCandidate";
 import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting";
+import { SingleReportPage } from "@pages/SingleReportPage/SingleReportPage";
 import Statistics from "@pages/Statistics/Statistics";
 import { Summary } from "@pages/Summary/Summary";
 import { Tracker } from "@pages/Tracker/Tracker";
@@ -40,19 +46,13 @@ 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 { ProfileCalendar } from "@components/ProfileCalendar/ProfileCalendar";
 import { Calendar } from "@components/Calendar/Calendar";
 import { Candidate } from "@components/Candidate/Candidate";
 import { FreeDevelopers } from "@components/FreeDevelopers/FreeDevelopers";
+import { TicketFullScreen } from "@components/Modal/Tracker/TicketFullScreen/TicketFullScreen";
+import { Notification } from "@components/Notification/Notification";
+import { ProfileCalendar } from "@components/ProfileCalendar/ProfileCalendar";
 import { ReportForm } from "@components/ReportForm/ReportForm";
 
 import "assets/fonts/stylesheet.css";

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo(
                 ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
                 : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
               : activePeriod
-                ? "Выберите диапазон на календаре"
+              ? "Выберите диапазон на календаре"
-                : "Выбрать диапазон"}
+              : "Выбрать диапазон"}
           </span>
           <span>
             {totalRangeHours
               ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
               : endDate
-                ? "0 часов"
+              ? "0 часов"
-                : ""}
+              : ""}
           </span>
           {endDate && (
             <BaseButton

src/pages/Forms/Forms.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 
-import { Footer } from "@components/Common/Footer/Footer";
 import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader";
+import { Footer } from "@components/Common/Footer/Footer";
 import SideBar from "@components/SideBar/SideBar";
 
 import "./forms.scss";