footer layout

src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { getCorrectDate } from "@components/Calendar/calendarHelper";
+import { getCorrectDate } from "@utils/calendarHelper";
 
 import "./archiveTasksItem.scss";
 

src/components/Calendar/Calendar.jsx

@@ -13,7 +13,7 @@ import rectangle from "assets/images/rectangle_secondPage.png";
 
 import CalendarComponent from "./CalendarComponent";
 import "./calendar.scss";
-import { currentMonth } from "./calendarHelper";
+import { currentMonth } from "../../utils/calendarHelper";
 
 const Calendar = () => {
   if (localStorage.getItem("role_status") !== "18") {

src/components/Calendar/CalendarComponent.jsx

@@ -7,7 +7,7 @@ import ellipse from "assets/icons/ellipse.png";
 import rectangle from "assets/images/rectangle__calendar.png";
 
 import "./calendarComponent.scss";
-import { calendarHelper, currentMonthAndDay } from "./calendarHelper";
+import { calendarHelper, currentMonthAndDay } from "../../utils/calendarHelper";
 
 const CalendarComponent = ({ onSelect }) => {
   const [value, setValue] = useState(moment());

src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx

@@ -43,7 +43,7 @@ import send from "assets/icons/send.svg";
 import watch from "assets/icons/watch.svg";
 import avatarMok from "assets/images/avatarMok.png";
 
-import { getCorrectDate } from "../../../Calendar/calendarHelper";
+import { getCorrectDate } from "../../../../utils/calendarHelper";
 import "./modalTicket.scss";
 
 registerLocale("ru", ru);

src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx

@@ -21,7 +21,7 @@ import { apiRequest } from "@api/request";
 
 import { useNotification } from "@hooks/useNotification";
 
-import { getCorrectDate } from "@components/Calendar/calendarHelper";
+import { getCorrectDate } from "@utils/calendarHelper";
 import { Footer } from "@components/Common/Footer/Footer";
 import { Loader } from "@components/Common/Loader/Loader";
 import FileTracker from "@components/FileTracker/FileTracker";

src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx

@@ -28,7 +28,7 @@ import { apiRequest } from "@api/request";
 
 import { useNotification } from "@hooks/useNotification";
 
-import { getCorrectDate } from "@components/Calendar/calendarHelper";
+import { getCorrectDate } from "@utils/calendarHelper";
 import BaseButton from "@components/Common/BaseButton/BaseButton";
 import { Loader } from "@components/Common/Loader/Loader";
 import ModalLayout from "@components/Common/ModalLayout/ModalLayout";

src/components/ProfileCalendar/ProfileCalendar.jsx

@@ -16,7 +16,7 @@ import { urlForLocal } from "@utils/helper";
 
 import { apiRequest } from "@api/request";
 
-import { getReports } from "@components/Calendar/calendarHelper";
+import { getReports } from "@utils/calendarHelper";
 import { Footer } from "@components/Common/Footer/Footer";
 import { Loader } from "@components/Common/Loader/Loader";
 import { Navigation } from "@components/Navigation/Navigation";

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -23,7 +23,7 @@ import {
   getCorrectDate,
   getReports,
   hourOfNum
-} from "@components/Calendar/calendarHelper";
+} from "@utils/calendarHelper";
 import BaseButton from "@components/Common/BaseButton/BaseButton";
 
 import arrow from "assets/icons/arrows/arrowCalendar.png";

src/components/ReportForm/ReportForm.jsx

@@ -26,7 +26,7 @@ import {
   getCorrectDate,
   getCreatedDate,
   hourOfNum
-} from "../Calendar/calendarHelper";
+} from "../../utils/calendarHelper";
 import "./reportForm.scss";
 
 registerLocale("ru", ru);

src/components/ReportForm/reportForm.scss

@@ -1,8 +1,13 @@
 .report-form {
   background: #f1f1f1;
   min-height: 100vh;
+  display: flex;
+  flex-direction: column;
 
   .container {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     max-width: 1160px;
     margin-top: 23px;
 

src/components/ShortReport/ShortReport.jsx

@@ -14,7 +14,7 @@ import {
   getCorrectDate,
   getCreatedDate,
   hourOfNum
-} from "@components/Calendar/calendarHelper";
+} from "@utils/calendarHelper";
 import { Loader } from "@components/Common/Loader/Loader";
 
 import "./shortReport.scss";

src/components/TrackerTaskComment/TrackerTaskComment.jsx

@@ -6,7 +6,7 @@ import { urlForLocal } from "@utils/helper";
 
 import { apiRequest } from "@api/request";
 
-import { getCorrectDate } from "@components/Calendar/calendarHelper";
+import { getCorrectDate } from "@utils/calendarHelper";
 import TrackerTaskSubComment from "@components/TrackerTaskComment/TrackerTaskComment";
 
 import del from "assets/icons/delete.svg";

src/pages/PartnerBid/PartnerBid.jsx

@@ -13,7 +13,7 @@ import { urlForLocal } from "@utils/helper";
 
 import { apiRequest } from "@api/request";
 
-import { getCorrectDate } from "@components/Calendar/calendarHelper";
+import { getCorrectDate } from "@utils/calendarHelper";
 import { Footer } from "@components/Common/Footer/Footer";
 import { Loader } from "@components/Common/Loader/Loader";
 import ModalLayout from "@components/Common/ModalLayout/ModalLayout";

src/pages/PartnerBid/partnerBid.scss

@@ -5,6 +5,7 @@
   min-height: 100vh;
 
   .container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     flex: 1;

src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx

@@ -7,7 +7,7 @@ import { getRequestDates, setRequestDate } from "@redux/reportSlice";
 
 import { apiRequest } from "@api/request";
 
-import { getReports } from "@components/Calendar/calendarHelper";
+import { getReports } from "@utils/calendarHelper";
 import { Footer } from "@components/Common/Footer/Footer";
 import { Loader } from "@components/Common/Loader/Loader";
 import { Navigation } from "@components/Navigation/Navigation";

src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss

@@ -5,6 +5,7 @@
   min-height: 100vh;
 
   .container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     flex: 1;

src/pages/PartnerEmployees/partnerEmployees.scss

@@ -167,6 +167,7 @@
   }
 
   .container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     flex: 1;

src/pages/PartnerRequests/partnerRequests.scss

@@ -5,6 +5,7 @@
   min-height: 100vh;
 
   .container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     flex: 1;

src/pages/PartnerTreaties/partnerTreaties.scss

@@ -378,6 +378,7 @@
   }
 
   .container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     flex: 1;

src/pages/PartnerСategories/partnerСategories.scss

@@ -144,6 +144,7 @@
   }
 
   .container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     flex: 1;

src/pages/Payouts/Payouts.jsx

@@ -2,7 +2,9 @@ import React from "react";
 
 import { Navigation } from "@components/Navigation/Navigation";
 import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
-import { Footer } from "@components/common/Footer/Footer";
+import { Footer } from "@components/Common/Footer/Footer";
+
+import "./payouts.scss";
 
 export const Payouts = () => {
   return (

src/pages/Payouts/payouts.scss

@@ -0,0 +1,13 @@
+.payouts {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+  background: #f1f1f1;
+
+  .container {
+    max-width: 1160px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+  }
+}

src/pages/ProfileCandidate/ProfileCandidate.scss

@@ -4,6 +4,7 @@
   flex-direction: column;
   min-height: 100vh;
   &__container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     margin: 0 auto 42px auto;

src/pages/ProjectTracker/ProjectTracker.jsx

@@ -58,7 +58,7 @@ import accept from "assets/images/accept.png";
 import archive from "assets/images/archiveIcon.png";
 import avatarMok from "assets/images/avatarMok.png";
 
-import { getCorrectDate } from "../../components/Calendar/calendarHelper";
+import { getCorrectDate } from "../../utils/calendarHelper";
 
 export const ProjectTracker = () => {
   const dispatch = useDispatch();

src/pages/Quiz/quiz-page.scss

@@ -5,6 +5,7 @@
   flex-direction: column;
 
   &__container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     margin: 23px auto 42px auto;
@@ -76,6 +77,7 @@
   }
 
   &__container {
+    max-width: 1160px;
     display: flex;
     margin: 23px auto 42px auto;
     flex: 1 1 auto;
@@ -98,6 +100,8 @@
   flex-direction: column;
 
   &__container {
+    max-width: 1160px;
+    flex-direction: column;
     display: flex;
     margin: 23px auto 42px auto;
     flex: 1 1 auto;
@@ -136,6 +140,7 @@
   flex-direction: column;
 
   &__container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     margin: 23px auto 42px auto;

src/pages/Statistics/Statistics.jsx

@@ -9,6 +9,7 @@ import { copyProjectLink } from "@utils/helper";
 import { Navigation } from "@components/Navigation/Navigation";
 import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
 import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
+import { Footer } from "@components/Common/Footer/Footer";
 
 import arrow from "assets/icons/arrows/arrowCalendar.png";
 import emailImg from "assets/icons/emailStatistics.svg";
@@ -71,7 +72,6 @@ const Statistics = () => {
           />
           <h2 className="tracker__title">Управление проектами с трекером</h2>
         </div>
-      </div>
         <div className="tracker__tabs">
           <div className="tracker__tabs__head">
             <Link
@@ -202,6 +202,8 @@ const Statistics = () => {
           </div>
         </div>
       </div>
+      <Footer />
+    </div>
   );
 };
 

src/pages/Statistics/statistics.scss

@@ -4,6 +4,13 @@
   flex-direction: column;
   min-height: 100vh;
 
+  .container {
+    max-width: 1160px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+  }
+
   &-header {
     display: flex;
     justify-content: space-between;

src/pages/Summary/summary.scss

@@ -510,6 +510,7 @@
   }
 
   .container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     flex: 1;

src/pages/ViewReport/ViewReport.jsx

@@ -10,7 +10,7 @@ import {
   getCorrectDate,
   getCreatedDate,
   hourOfNum
-} from "@components/Calendar/calendarHelper";
+} from "@utils/calendarHelper";
 import { Footer } from "@components/Common/Footer/Footer";
 import { Loader } from "@components/Common/Loader/Loader";
 import { Navigation } from "@components/Navigation/Navigation";

src/pages/ViewReport/viewReport.scss

@@ -5,6 +5,7 @@
   min-height: 100vh;
 
   .container {
+    max-width: 1160px;
     display: flex;
     flex-direction: column;
     flex: 1;