Merge branch 'main' of https://git.itguild.info/apuc/guild_front

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,136 +72,137 @@ const Statistics = () => {
           />
           <h2 className="tracker__title">Управление проектами с трекером</h2>
         </div>
-      </div>
+        <div className="tracker__tabs">
-      <div className="tracker__tabs">
+          <div className="tracker__tabs__head">
-        <div className="tracker__tabs__head">
+            <Link
-          <Link
+              to="/profile/tracker"
-            to="/profile/tracker"
+              className="tab active-tab"
-            className="tab active-tab"
+              onClick={() => toggleTabs(1)}
-            onClick={() => toggleTabs(1)}
+            >
-          >
+              <img src={project} alt="img" />
-            <img src={project} alt="img" />
+              <p>Проекты </p>
-            <p>Проекты </p>
+            </Link>
-          </Link>
+            <Link
-          <Link
+              to="/profile/tracker"
-            to="/profile/tracker"
+              className="tab"
-            className="tab"
+              onClick={() => toggleTabs(2)}
-            onClick={() => toggleTabs(2)}
+            >
-          >
+              <img src={tasks} alt="img" />
-            <img src={tasks} alt="img" />
+              <p>Все мои задачи</p>
-            <p>Все мои задачи</p>
+            </Link>
-          </Link>
+            <Link
-          <Link
+              to="/profile/tracker"
-            to="/profile/tracker"
+              className="tab"
-            className="tab"
+              onClick={() => toggleTabs(3)}
-            onClick={() => toggleTabs(3)}
+            >
-          >
+              <img src={archive} alt="img" />
-            <img src={archive} alt="img" />
+              <p>Архив</p>
-            <p>Архив</p>
+            </Link>
-          </Link>
+          </div>
-        </div>
+          <div className="tracker__tabs__content">
-        <div className="tracker__tabs__content">
+            <div className="tracker__tabs__content__wrapper statistics-body">
-          <div className="tracker__tabs__content__wrapper statistics-body">
+              <div className="statistics-header">
-            <div className="statistics-header">
+                <div className="statistics-header__menu">
-              <div className="statistics-header__menu">
+                  <h1>Статистика проекта</h1>
-                <h1>Статистика проекта</h1>
+                  <img src={link} alt="#" />
-                <img src={link} alt="#" />
+                  <span
-                <span
+                    className="return-text"
-                  className="return-text"
+                    onClick={() => copyProjectLink("62")}
-                  onClick={() => copyProjectLink("62")}
+                  >
-                >
+                    ссылка на проект
-                  ссылка на проект
+                  </span>
-                </span>
-              </div>
-
-              <div className="statistics-header__return">
-                <img src={arrow} alt="#" />
-
-                <Link to={`/profile/tracker`} className="return-text">
-                  К списку проектов
-                </Link>
-              </div>
-            </div>
-            <div className="statistics-info">
-              <div className="statistics-info__head">
-                <p>Проект: </p>
-                <h1>{"Разработка трекера"}</h1>
-              </div>
-              <div className="statistics-info__team">
-                <div className="project-info">
-                  <div className="project-info__creator">
-                    <span className="return-text">Создатель проекта:</span>
-                    <div>
-                      <p>{"Василий Тарасов"}</p>{" "}
-                      <img src={mockAvatar} alt="#" />
-                    </div>
-                  </div>
-                  <div className="project-info__tasks">
-                    <div className="task-quantity">
-                      <p>Открытые задачи</p>
-                      <span className="task-quantity_open">{4}</span>
-                    </div>
-                    <div className="task-quantity">
-                      <p>Задач в работе</p>
-                      <span className="task-quantity_work">{5}</span>
-                    </div>
-                    <div className="task-quantity">
-                      <p>Закрыто задач</p>
-                      <span className="task-quantity_closed">{434}</span>
-                    </div>
-                  </div>
                 </div>
-                <div className="list-team">
-                  <div className="list-team__title">
-                    <span className="return-text">Участники проекта:</span>
-                  </div>
-                  <div className="list-team__head">
-                    <p>Имя</p>
-                    <p>Почта</p>
-                    <p>Роль</p>
-                    <p>Статус</p>
-                  </div>
-                  <div className="list-team__body">
-                    {teams.map((item) => {
-                      return (
-                        <>
-                          <div className="list-team__item">
-                            <div className="person-name">
-                              <img src={item.avatar} alt="#" />
-                              <p>{item.name}</p>
-                            </div>
-                            <div className="person-email">
-                              <img src={emailImg} alt="#" />
-                              <p>{item.email}</p>
-                            </div>
 
-                            <p className="person-type">{item.role}</p>
+                <div className="statistics-header__return">
-                            {/* <span className="status status-active"> */}
+                  <img src={arrow} alt="#" />
 
-                            <span
+                  <Link to={`/profile/tracker`} className="return-text">
-                              className={
+                    К списку проектов
-                                item.status
+                  </Link>
-                                  ? "status status-active"
-                                  : "status status-none"
-                              }
-                            >
-                              {item.status ? "Активно" : "Не активно"}
-                            </span>
-                          </div>
-                        </>
-                      );
-                    })}
-                  </div>
                 </div>
-                <div className="add-person">
+              </div>
-                  <span className="add-person__button">+</span>
+              <div className="statistics-info">
-                  <p>Добавить участника</p>
+                <div className="statistics-info__head">
+                  <p>Проект: </p>
+                  <h1>{"Разработка трекера"}</h1>
+                </div>
+                <div className="statistics-info__team">
+                  <div className="project-info">
+                    <div className="project-info__creator">
+                      <span className="return-text">Создатель проекта:</span>
+                      <div>
+                        <p>{"Василий Тарасов"}</p>{" "}
+                        <img src={mockAvatar} alt="#" />
+                      </div>
+                    </div>
+                    <div className="project-info__tasks">
+                      <div className="task-quantity">
+                        <p>Открытые задачи</p>
+                        <span className="task-quantity_open">{4}</span>
+                      </div>
+                      <div className="task-quantity">
+                        <p>Задач в работе</p>
+                        <span className="task-quantity_work">{5}</span>
+                      </div>
+                      <div className="task-quantity">
+                        <p>Закрыто задач</p>
+                        <span className="task-quantity_closed">{434}</span>
+                      </div>
+                    </div>
+                  </div>
+                  <div className="list-team">
+                    <div className="list-team__title">
+                      <span className="return-text">Участники проекта:</span>
+                    </div>
+                    <div className="list-team__head">
+                      <p>Имя</p>
+                      <p>Почта</p>
+                      <p>Роль</p>
+                      <p>Статус</p>
+                    </div>
+                    <div className="list-team__body">
+                      {teams.map((item) => {
+                        return (
+                          <>
+                            <div className="list-team__item">
+                              <div className="person-name">
+                                <img src={item.avatar} alt="#" />
+                                <p>{item.name}</p>
+                              </div>
+                              <div className="person-email">
+                                <img src={emailImg} alt="#" />
+                                <p>{item.email}</p>
+                              </div>
+
+                              <p className="person-type">{item.role}</p>
+                              {/* <span className="status status-active"> */}
+
+                              <span
+                                className={
+                                  item.status
+                                    ? "status status-active"
+                                    : "status status-none"
+                                }
+                              >
+                                {item.status ? "Активно" : "Не активно"}
+                              </span>
+                            </div>
+                          </>
+                        );
+                      })}
+                    </div>
+                  </div>
+                  <div className="add-person">
+                    <span className="add-person__button">+</span>
+                    <p>Добавить участника</p>
+                  </div>
                 </div>
               </div>
             </div>
           </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;