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

-
2024-02-15 13:30:13 +03:00
parent 181bbc834a 42cae241f2
commit 954f696044
79 changed files with 420 additions and 491 deletions
--- a/src/components/Calendar/Calendar.jsx
+++ b/src/components/Calendar/Calendar.jsx
@ -79,8 +79,8 @@ const Calendar = () => {
            </p>
          </div>
        </div>
-        <Footer />
      </section>
+      <Footer />
    </div>
  );
 };
--- a/src/components/Calendar/calendar.scss
+++ b/src/components/Calendar/calendar.scss
@ -1,6 +1,5 @@
 .calendar {
  margin-bottom: 40px;
-  font-family: "LabGrotesque", sans-serif;

  &__header {
    display: flex;
@ -136,10 +135,6 @@
      line-height: normal;
    }
  }
-
-  footer {
-    margin-top: 2rem !important;
-  }
 }

@media (max-width: 575.98px) {
--- a/src/components/Calendar/calendarComponent.scss
+++ b/src/components/Calendar/calendarComponent.scss
@ -3,7 +3,6 @@
  margin: 10px 0;
  background-color: #f9f9f9;
  padding: 20px 30px;
-  font-family: "LabGrotesque", sans-serif;

  &__header {
    display: flex;
--- a/src/components/Candidate/Candidate.jsx
+++ b/src/components/Candidate/Candidate.jsx
@ -233,8 +233,8 @@ const Candidate = () => {
            )}
          </div>
        </div>
-        <Footer />
      </div>
+      <Footer />
    </div>
  );
 };
--- a/src/components/Candidate/candidate.scss
+++ b/src/components/Candidate/candidate.scss
@ -148,12 +148,6 @@
      }
    }
  }
-
-  footer {
-    margin-top: 2.5rem !important;
-    position: relative;
-    z-index: -2;
-  }
 }

@media (max-width: 375.98px) {
--- a/src/components/Common/BaseButton/basebutton.scss
+++ b/src/components/Common/BaseButton/basebutton.scss
@ -6,7 +6,6 @@
  border-radius: 44px;
  color: white;
  font-style: normal;
-  font-family: "LabGrotesque", sans-serif;
  border: none;
  transition: 0.5s;

--- a/src/components/Common/Loader/Loader.jsx
+++ b/src/components/Common/Loader/Loader.jsx
@ -8,7 +8,7 @@ export const Loader = ({ width = 50, height = 50, style }) => {
    <div className="loader">
      <SVGLoader
        type="Circles"
-        color={style ? style : `#fff`}
+        color={style ? style : `green`}
        height={height}
        width={width}
      />
--- a/src/components/Common/Loader/loader.scss
+++ b/src/components/Common/Loader/loader.scss
@ -5,7 +5,6 @@
  justify-content: center;
  align-items: center;
  position: relative;
-
  //&:hover {
  //  path {
  //    fill: #6aaf5c;
--- a/src/components/Description/description.scss
+++ b/src/components/Description/description.scss
@ -18,7 +18,6 @@
  }

  &__empty {
-    font-family: "LabGrotesque", sans-serif;
    font-style: normal;
    font-weight: 700;
    font-size: 16px;
--- a/src/components/FreeDevelopers/FreeDevelopers.jsx
+++ b/src/components/FreeDevelopers/FreeDevelopers.jsx
@ -92,8 +92,8 @@ export const FreeDevelopers = () => {
            </BaseButton>
          </div>
        </div>
-        <Footer />
      </div>
+      <Footer />
    </section>
  );
 };
--- a/src/components/FreeDevelopers/freeDevelopers.scss
+++ b/src/components/FreeDevelopers/freeDevelopers.scss
@ -1,5 +1,4 @@
 .free-dev {
-  font-family: "LabGrotesque", sans-serif;
  overflow: hidden;
  position: relative;
  background-color: #f1f1f1;
--- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
+++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
@ -77,7 +77,6 @@
        line-height: 32px;
        color: #1458dd;
        margin: 0;
-        font-family: "LabGrotesque", sans-serif;
      }

      h2 {
@ -780,7 +779,6 @@

      .react-datepicker__current-month {
        font-size: 18px;
-        font-family: "LabGrotesque", sans-serif;
        text-transform: capitalize;
      }

@ -823,7 +821,6 @@
      .react-datepicker__day {
        font-size: 16px;
        width: 35px;
-        font-family: "LabGrotesque", sans-serif;
        border-radius: 50px;
        padding: 7px;
      }
@ -832,7 +829,6 @@
        font-size: 18px;
        width: 35px;
        font-weight: 500;
-        font-family: "LabGrotesque", sans-serif;
      }

      .react-datepicker__triangle {
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@ -30,6 +30,7 @@ import { useNotification } from "@hooks/useNotification";

 import { getCorrectDate } from "@components/Calendar/calendarHelper";
 import BaseButton from "@components/Common/BaseButton/BaseButton";
+import { Loader } from "@components/Common/Loader/Loader";
 import ModalLayout from "@components/Common/ModalLayout/ModalLayout";

 import arrowRight from "assets/icons/arrows/arrowRightCreateTask.svg";
@ -90,6 +91,7 @@ export const TrackerModal = ({
  const [deadLineDate, setDeadLineDate] = useState("");
  const [datePickerOpen, setDatePickerOpen] = useState(false);
  const [startDate, setStartDate] = useState(new Date());
+  const [loader, setLoader] = useState(false);

  const priority = [
    {
@ -138,6 +140,8 @@ export const TrackerModal = ({
      return;
    }

+    setLoader(true);
+
    apiRequest("/task/create-task", {
      method: "POST",
      data: {
@ -158,6 +162,7 @@ export const TrackerModal = ({
          text: "Задача с таким именем уже существует",
          type: "error"
        });
+        setLoader(false);
      } else {
        for (let i = 0; i < taskTags.length; i++) {
          apiRequest("/mark/attach", {
@ -185,9 +190,11 @@ export const TrackerModal = ({
            setDescriptionTicket("");
            setSelectedExecutorTask("Выберите исполнителя");
            setSelectedPriority(null);
+            setLoader(false);
          });
        } else {
          setActive(false);
+          setLoader(false);
          setValueTicket("");
          setDescriptionTicket("");
          dispatch(setProjectBoardFetch(projectBoard.id));
@ -703,9 +710,13 @@ export const TrackerModal = ({
                </div>
              </div>
            </div>
-            <BaseButton styles={"button-add"} onClick={createTicket}>
-              Создать
-            </BaseButton>
+            {loader ? (
+              <Loader style={"green"} />
+            ) : (
+              <BaseButton styles={"button-add"} onClick={createTicket}>
+                Создать
+              </BaseButton>
+            )}
          </div>
        </>
      )}
--- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
+++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
@ -172,7 +172,8 @@

      .executor {
        display: flex;
-        justify-content: space-between;
+        column-gap: 5px;
+        align-items: center;
        &:hover {
          font-weight: 600;
        }
@ -650,7 +651,6 @@

        .react-datepicker__current-month {
          font-size: 18px;
-          font-family: "LabGrotesque", sans-serif;
          text-transform: capitalize;
          padding-bottom: 8px;
        }
@ -694,7 +694,6 @@
        .react-datepicker__day {
          font-size: 16px;
          width: 35px;
-          font-family: "LabGrotesque", sans-serif;
          border-radius: 50px;
          padding: 7px;
        }
@ -703,7 +702,6 @@
          font-size: 18px;
          width: 35px;
          font-weight: 500;
-          font-family: "LabGrotesque", sans-serif;
        }

        .react-datepicker__triangle {
--- a/src/components/Navigation/Navigation.jsx
+++ b/src/components/Navigation/Navigation.jsx
@ -45,6 +45,7 @@ export const Navigation = () => {
    partner: [
      {
        path: "/catalog",
+        active: "candidate",
        name: "Каталог"
      },
      {
@ -53,6 +54,7 @@ export const Navigation = () => {
      },
      {
        path: "/employees",
+        active: "calendar",
        name: "Персонал"
      },
      {
@ -80,7 +82,12 @@ export const Navigation = () => {
                key={index}
                end
                to={link.path === "/Quiz" ? link.path : `/profile${link.path}`}
-                className={currentPath.includes(link.path) ? "active" : ""}
+                className={
+                  currentPath.includes(link.path) ||
+                  currentPath.includes(link.active)
+                    ? "active"
+                    : ""
+                }
              >
                {link.name}
              </NavLink>
--- a/src/components/Notification/notification.scss
+++ b/src/components/Notification/notification.scss
@ -5,7 +5,7 @@
  position: fixed;
  bottom: 25px;
  right: 25px;
-  z-index: 20;
+  z-index: 10000;

  &__info {
    display: flex;
--- a/src/components/OutstaffingBlock/outstaffingBlock.scss
+++ b/src/components/OutstaffingBlock/outstaffingBlock.scss
@ -1,7 +1,3 @@
-body {
-  font-family: "LabGrotesque", sans-serif !important;
-}
-
 .container {
  max-width: 1160px !important;
 }
@ -9,7 +5,6 @@ body {
  background: #f1f1f1;
  height: 100%;
  min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;
  padding-top: 23px;

  &__title {
--- a/src/components/ProfileCalendar/profileCalendar.scss
+++ b/src/components/ProfileCalendar/profileCalendar.scss
@ -1,12 +1,15 @@
 .profile__calendar {
  background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
  min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;

  .container {
    max-width: 1160px;
    margin-top: 23px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;

    @media (max-width: 570px) {
      margin-top: 0;
--- a/src/components/ProfileHeader/profileHeader.scss
+++ b/src/components/ProfileHeader/profileHeader.scss
@ -3,6 +3,8 @@
  height: 80px;
  background: #e1fccf;
  padding: 20px;
+  display: flex;
+  flex-direction: column;

  &__head {
    background: #e1fccf;
--- a/src/components/ProjectTicket/ProjectTicket.jsx
+++ b/src/components/ProjectTicket/ProjectTicket.jsx
@ -135,7 +135,7 @@ export const ProjectTicket = ({ project, index }) => {
            <img src={edit}></img>
            <p>редактировать</p>
          </div>
-          <div onClick={copyProjectLink(project.id)}>
+          <div onClick={() => copyProjectLink(project.id)}>
            <img src={link}></img>
            <p>скопировать ссылку</p>
          </div>
--- a/src/components/ReportForm/reportForm.scss
+++ b/src/components/ReportForm/reportForm.scss
@ -1,8 +1,6 @@
 .report-form {
  background: #f1f1f1;
-  height: 100%;
  min-height: 100vh;
-  font-family: "LabGrotesque", sans-serif;

  .container {
    max-width: 1160px;
@ -430,7 +428,6 @@

  .react-datepicker__current-month {
    font-size: 14px;
-    font-family: "LabGrotesque", sans-serif;
    text-transform: capitalize;
  }

@ -442,13 +439,11 @@
  .react-datepicker__day {
    font-size: 14px;
    width: 35px;
-    font-family: "LabGrotesque", sans-serif;
  }

  .react-datepicker__day-name {
    font-size: 14px;
    width: 35px;
-    font-family: "LabGrotesque", sans-serif;
  }

  .react-datepicker__triangle {