fix errors, change logo

2023-12-04 18:01:04 +03:00
parent 887656da3b
commit 5bfc953ecc
33 changed files with 139 additions and 136 deletions
--- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
@ -70,7 +70,7 @@ export const ModalTiсket = ({
  const [deadLine, setDeadLine] = useState(task.dead_line);
  const [datePickerOpen, setDatePickerOpen] = useState(false);
  const [startDate, setStartDate] = useState(
-    task.dead_line ? new Date(task.dead_line) : new Date()
+    task.dead_line ? new Date(task.dead_line) : new Date(),
  );
  const [dropListOpen, setDropListOpen] = useState(false);
  const [dropListMembersOpen, setDropListMembersOpen] = useState(false);
@ -190,7 +190,7 @@ export const ModalTiсket = ({

  function commentDelete(comment) {
    setComments((prevValue) =>
-      prevValue.filter((item) => item.id !== comment.id)
+      prevValue.filter((item) => item.id !== comment.id),
    );
    if (comment.subComments.length) {
      // promiseAll
@ -221,7 +221,7 @@ export const ModalTiсket = ({
    deleteSubComment.forEach((comment, index) => {
      if (comment.id === subComment.parent_id) {
        deleteSubComment[index].subComments = comment.subComments.filter(
-          (item) => item.id !== subComment.id
+          (item) => item.id !== subComment.id,
        );
      }
    });
@ -328,7 +328,7 @@ export const ModalTiсket = ({
  useEffect(() => {
    initListeners();
    apiRequest(
-      `/comment/get-by-entity?entity_type=2&entity_id=${task.id}`
+      `/comment/get-by-entity?entity_type=2&entity_id=${task.id}`,
    ).then((res) => {
      const comments = res.reduce((acc, cur) => {
        if (!cur.parent_id) {
@ -362,7 +362,7 @@ export const ModalTiсket = ({
              setTimerInfo(time);
            }
          });
-      }
+      },
    );

    apiRequest(`/file/get-by-entity?entity_type=2&entity_id=${task.id}`).then(
@ -370,15 +370,15 @@ export const ModalTiсket = ({
        if (Array.isArray(res)) {
          setTaskFiles(res);
        }
-      }
+      },
    );

    if (
      localStorage.getItem("role_status") !== "18" &&
      Boolean(
        !correctProjectUsers.find(
-          (item) => item.user_id === profileInfo.id_user
-        )
+          (item) => item.user_id === profileInfo.id_user,
+        ),
      )
    ) {
      setCorrectProjectUsers((prevState) => [
@ -400,7 +400,7 @@ export const ModalTiсket = ({
      projectMarks.reduce((acc, cur) => {
        if (!tagIds.includes(cur.id)) acc.push(cur);
        return acc;
-      }, [])
+      }, []),
    );
  }, [taskTags]);

@ -440,7 +440,7 @@ export const ModalTiсket = ({

  function deleteFile(file) {
    setTaskFiles((prevValue) =>
-      prevValue.filter((item) => item.id !== file.id)
+      prevValue.filter((item) => item.id !== file.id),
    );
  }

@ -448,7 +448,7 @@ export const ModalTiсket = ({
    setTimerId(
      setInterval(() => {
        run();
-      }, 1000)
+      }, 1000),
    );
  }

@ -485,13 +485,13 @@ export const ModalTiсket = ({
      projectUsers.reduce((acc, cur) => {
        if (!ids.includes(cur.user_id)) acc.push(cur);
        return acc;
-      }, [])
+      }, []),
    );
  }, [members]);

  function copyTicketLink() {
    navigator.clipboard.writeText(
-      `https://itguild.info/tracker/task/${task.id}`
+      `https://itguild.info/tracker/task/${task.id}`,
    );
    showNotification({
      show: true,
@ -558,7 +558,7 @@ export const ModalTiсket = ({
        (div) =>
          div.classList &&
          (div.classList.contains("button-add-worker") ||
-            div.classList.contains("dropdownList"))
+            div.classList.contains("dropdownList")),
      )
    ) {
      setDropListOpen(false);
@ -571,7 +571,7 @@ export const ModalTiсket = ({
        (div) =>
          div.classList &&
          (div.classList.contains("deadLine") ||
-            div.classList.contains("react-datepicker-popper"))
+            div.classList.contains("react-datepicker-popper")),
      )
    ) {
      setDatePickerOpen(false);
@ -583,7 +583,7 @@ export const ModalTiсket = ({
        (div) =>
          div.classList &&
          (div.classList.contains("tags") ||
-            div.classList.contains("tags__dropDown"))
+            div.classList.contains("tags__dropDown")),
      )
    ) {
      setSelectTagsOpen(false);
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@ -128,7 +128,7 @@ export const TicketFullScreen = () => {
        setDeadLine(taskInfo.dead_line);
        setTaskPriority(taskInfo.execution_priority);
        setStartDate(
-          taskInfo.dead_line ? new Date(taskInfo.dead_line) : new Date()
+          taskInfo.dead_line ? new Date(taskInfo.dead_line) : new Date(),
        );
        setInputsValue({
          title: taskInfo.title,
@ -137,7 +137,7 @@ export const TicketFullScreen = () => {
        });
        setTaskTags(taskInfo.mark);
        apiRequest(
-          `/comment/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`
+          `/comment/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`,
        ).then((res) => {
          const comments = res.reduce((acc, cur) => {
            if (!cur.parent_id) {
@ -152,14 +152,14 @@ export const TicketFullScreen = () => {
          setComments(comments);
        });
        apiRequest(
-          `/file/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`
+          `/file/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`,
        ).then((res) => {
          if (Array.isArray(res)) {
            setTaskFiles(res);
          }
        });
        apiRequest(
-          `/timer/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`
+          `/timer/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`,
        ).then((res) => {
          let timerSeconds = 0;
          res.length &&
@ -181,13 +181,13 @@ export const TicketFullScreen = () => {
            });
        });
        apiRequest(
-          `/project/get-project?project_id=${taskInfo.project_id}&expand=columns,mark`
+          `/project/get-project?project_id=${taskInfo.project_id}&expand=columns,mark`,
        ).then((res) => {
          setProjectInfo(res);
          setCorrectProjectUsers(res.projectUsers);
        });
        setLoader(boardLoader);
-      }
+      },
    );
  }, []);

@ -198,7 +198,7 @@ export const TicketFullScreen = () => {
        projectInfo.mark.reduce((acc, cur) => {
          if (!tagIds.includes(cur.id)) acc.push(cur);
          return acc;
-        }, [])
+        }, []),
      );
    }
  }, [taskTags, projectInfo]);
@ -306,7 +306,7 @@ export const TicketFullScreen = () => {

  function commentDelete(comment) {
    setComments((prevValue) =>
-      prevValue.filter((item) => item.id !== comment.id)
+      prevValue.filter((item) => item.id !== comment.id),
    );
    if (comment.subComments.length) {
      comment.subComments.forEach((subComment) => {
@ -336,7 +336,7 @@ export const TicketFullScreen = () => {
    deleteSubComment.forEach((comment, index) => {
      if (comment.id === subComment.parent_id) {
        deleteSubComment[index].subComments = comment.subComments.filter(
-          (item) => item.id !== subComment.id
+          (item) => item.id !== subComment.id,
        );
      }
    });
@ -349,7 +349,7 @@ export const TicketFullScreen = () => {

  function copyTicketLink() {
    navigator.clipboard.writeText(
-      `https://itguild.info/tracker/task/${taskInfo.id}`
+      `https://itguild.info/tracker/task/${taskInfo.id}`,
    );
  }

@ -357,7 +357,7 @@ export const TicketFullScreen = () => {
    setTimerId(
      setInterval(() => {
        run();
-      }, 1000)
+      }, 1000),
    );
  }

@ -368,7 +368,7 @@ export const TicketFullScreen = () => {
        projectInfo.projectUsers.reduce((acc, cur) => {
          if (!ids.includes(cur.user_id)) acc.push(cur);
          return acc;
-        }, [])
+        }, []),
      );
    }
  }, [taskInfo.taskUsers, projectInfo]);
@ -444,7 +444,7 @@ export const TicketFullScreen = () => {
      setTaskInfo((prevState) => ({
        ...prevState,
        taskUsers: taskInfo.taskUsers.filter(
-          (item) => item.user_id !== person.user_id
+          (item) => item.user_id !== person.user_id,
        ),
      }));
    });
@ -538,7 +538,7 @@ export const TicketFullScreen = () => {

  function deleteFile(file) {
    setTaskFiles((prevValue) =>
-      prevValue.filter((item) => item.id !== file.id)
+      prevValue.filter((item) => item.id !== file.id),
    );
  }

@ -586,7 +586,7 @@ export const TicketFullScreen = () => {
        (div) =>
          div.classList &&
          (div.classList.contains("button-add-worker") ||
-            div.classList.contains("dropdownList"))
+            div.classList.contains("dropdownList")),
      )
    ) {
      setDropListOpen(false);
@ -599,7 +599,7 @@ export const TicketFullScreen = () => {
        (div) =>
          div.classList &&
          (div.classList.contains("deadLine") ||
-            div.classList.contains("react-datepicker-popper"))
+            div.classList.contains("react-datepicker-popper")),
      )
    ) {
      setDatePickerOpen(false);
@ -611,7 +611,7 @@ export const TicketFullScreen = () => {
        (div) =>
          div.classList &&
          (div.classList.contains("tags") ||
-            div.classList.contains("tags__dropDown"))
+            div.classList.contains("tags__dropDown")),
      )
    ) {
      setSelectTagsOpen(false);
@ -623,7 +623,7 @@ export const TicketFullScreen = () => {
        (div) =>
          div.classList &&
          (div.classList.contains("addPerson") ||
-            div.classList.contains("persons__list"))
+            div.classList.contains("persons__list")),
      )
    ) {
      setPersonListOpen(false);
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@ -71,10 +71,10 @@ export const TrackerModal = ({
  const [selectWorkersOpen, setSelectWorkersOpen] = useState(false);
  const [selectedWorker, setSelectedWorker] = useState(null);
  const [selectColumnPriority, setSelectColumnPriority] = useState(
-    "Выберите приоритет колонки"
+    "Выберите приоритет колонки",
  );
  const [selectedExecutorTask, setSelectedExecutorTask] = useState(
-    "Выберите исполнителя задачи"
+    "Выберите исполнителя задачи",
  );
  const [selectExecutorTaskOpen, setSelectExecutorTaskOpen] = useState(false);
  const [correctProjectUsers, setCorrectProjectUsers] = useState([]);
@ -316,7 +316,7 @@ export const TrackerModal = ({
            persons.reduce((acc, cur) => {
              if (!ids.includes(cur.user_id)) acc.push(cur);
              return acc;
-            }, [])
+            }, []),
          );
        })
      : "";
@ -324,7 +324,7 @@ export const TrackerModal = ({
      localStorage.getItem("role_status") !== "18" &&
      projectUsers &&
      Boolean(
-        !projectUsers.find((item) => item.user_id === profileInfo.id_user)
+        !projectUsers.find((item) => item.user_id === profileInfo.id_user),
      )
    ) {
      setCorrectProjectUsers([
@ -350,7 +350,7 @@ export const TrackerModal = ({
        projectMarks.reduce((acc, cur) => {
          if (!tagIds.includes(cur.id)) acc.push(cur);
          return acc;
-        }, [])
+        }, []),
      );
    }
  }, [taskTags, projectMarks]);
@ -368,7 +368,7 @@ export const TrackerModal = ({
        (div) =>
          div.classList &&
          (div.classList.contains("tags__selected__name") ||
-            div.classList.contains("tags__dropDown"))
+            div.classList.contains("tags__dropDown")),
      )
    ) {
      setSelectTagsOpen(false);
@ -380,7 +380,7 @@ export const TrackerModal = ({
        (div) =>
          div.classList &&
          (div.classList.contains("select__executor") ||
-            div.classList.contains("select__executor__dropDown"))
+            div.classList.contains("select__executor__dropDown")),
      )
    ) {
      setSelectExecutorTaskOpen(false);
@ -555,8 +555,8 @@ export const TrackerModal = ({
                              onClick={() =>
                                setTaskTags((prevState) =>
                                  prevState.filter(
-                                    (prevTag) => prevTag.id !== tag.id
-                                  )
+                                    (prevTag) => prevTag.id !== tag.id,
+                                  ),
                                )
                              }
                            />