Merge pull request 'page_under_construction' (#40) from page_under_construction into main

Reviewed-on: #40

src/components/Common/Footer/Footer.jsx

@@ -24,19 +24,35 @@ export const Footer = () => {
           <div className="footer__bottom">
             <div className="footer__social">
               <div className="footer__social__icons">
-                <a href="https://www.vk.com/">
+                <a
+                  href="https://www.vk.com/"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
                   <img src={vk} alt="vk" width={24} />
                 </a>
-                <a href="https://www.telegram.org/">
+                <a
+                  href="https://www.telegram.org/"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
                   <img src={tg} alt="tg" width={24} />
                 </a>
               </div>
-              <a href="mailto:office@itguild.info">office@itguild.info</a>
+              <a
+                href="mailto:office@itguild.info"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                office@itguild.info
+              </a>
             </div>
             <div className="footer__info">
               <div className="footer__mail">
                 {/* <img src={email} alt="email" /> */}
-                <a href="#">Присоединиться к команде</a>
+                <a href="#" target="_blank" rel="noopener noreferrer">
+                  Присоединиться к команде
+                </a>
               </div>
               <p>
                 © {new Date().getFullYear()} - Outstaffing. Все права защищены

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

@@ -122,15 +122,6 @@ export const ModalTiсket = ({
     setShowModalToReport(!showModalToReport);
   };
 
-  const closeModal = () => {
-    setActive(false);
-    const currentUrl = window.location.pathname;
-    const newUrl = currentUrl.replace(/\/task\/\d+$/, "");
-    window.history.replaceState({}, "", newUrl);
-    document.body.style.overflow = "auto";
-    console.log(task);
-  };
-
   const [isExpanded, setIsExpanded] = useState(false);
 
   const toggleModalSize = () => {
@@ -310,6 +301,17 @@ export const ModalTiсket = ({
     });
   }
 
+  const closeModal = () => {
+    if (timerStart) {
+      stopTaskTimer();
+    }
+    setActive(false);
+    const currentUrl = window.location.pathname;
+    const newUrl = currentUrl.replace(/\/task\/\d+$/, "");
+    window.history.replaceState({}, "", newUrl);
+    document.body.style.overflow = "auto";
+  };
+
   function taskExecutor(person) {
     apiRequest("/task/update-task", {
       method: "PUT",
@@ -380,7 +382,22 @@ export const ModalTiсket = ({
   }
 
   useEffect(() => {
+    if (active) {
+      setStartDate(task.dead_line ? new Date(task.dead_line) : new Date());
+      setTaskPriority(task.execution_priority);
+      setMembers(task.taskUsers);
+      setTaskTags(task.mark);
+      setExecutorId(task.executor_id);
+      setDeadLine(task.dead_line);
+      setExecutor(task.executor);
+      setInputsValue({
+        title: task.title,
+        description: task.description,
+        comment: ""
+      });
+
       initListeners();
+
       apiRequest(
         `/comment/get-by-entity?entity_type=2&entity_id=${task.id}`
       ).then((res) => {
@@ -396,8 +413,11 @@ export const ModalTiсket = ({
         }, []);
         setComments(comments);
       });
-    apiRequest(`/timer/get-by-entity?entity_type=2&entity_id=${task.id}`).then(
+
-      (res) => {
+      apiRequest(
+        `/timer/get-by-entity?entity_type=2&entity_id=${task.id}`
+      ).then((res) => {
+        if (Array.isArray(res)) {
           let timerSeconds = 0;
           res.length &&
             res.forEach((time) => {
@@ -410,30 +430,38 @@ export const ModalTiсket = ({
               updateTimerHours = Math.floor(timerSeconds / 60 / 60);
               updateTimerMinute = Math.floor((timerSeconds / 60) % 60);
               updateTimerSec = timerSeconds % 60;
+
               if (!time.stopped_at) {
                 setTimerStart(true);
                 startTimer();
                 setTimerInfo(time);
               }
             });
+        } else {
+          setCurrentTimerCount({
+            hours: 0,
+            minute: 0,
+            seconds: 0
+          });
         }
-    );
+      });
 
       apiRequest(`/file/get-by-entity?entity_type=2&entity_id=${task.id}`).then(
         (res) => {
           if (Array.isArray(res)) {
             setTaskFiles(res);
+          } else {
+            setTaskFiles([]);
           }
         }
       );
 
       if (
         localStorage.getItem("role_status") !== "18" &&
-      Boolean(
+        Array.isArray(correctProjectUsers) &&
         !correctProjectUsers.find(
           (item) => item.user_id === profileInfo.id_user
         )
-      )
       ) {
         setCorrectProjectUsers((prevState) => [
           ...prevState,
@@ -446,16 +474,19 @@ export const ModalTiсket = ({
           }
         ]);
       }
-  }, []);
+    }
+  }, [active]);
 
   useEffect(() => {
-    let tagIds = taskTags.map((tag) => tag.id);
+    if (Array.isArray(taskTags)) {
+      const tagIds = taskTags.map((tag) => tag.id);
       setCorrectProjectTags(
         projectMarks.reduce((acc, cur) => {
           if (!tagIds.includes(cur.id)) acc.push(cur);
           return acc;
         }, [])
       );
+    }
   }, [taskTags]);
 
   async function handleUpload(event) {
@@ -534,13 +565,15 @@ export const ModalTiсket = ({
   }
 
   useEffect(() => {
-    let ids = members.map((user) => user.user_id);
+    if (Array.isArray(members)) {
+      const ids = members.map((user) => user.user_id);
       setUsers(
         projectUsers.reduce((acc, cur) => {
           if (!ids.includes(cur.user_id)) acc.push(cur);
           return acc;
         }, [])
       );
+    }
   }, [members]);
 
   function copyTicketLink() {
@@ -684,6 +717,7 @@ export const ModalTiсket = ({
                   editor={ClassicEditor}
                   data={inputsValue.description}
                   config={{
+                    toolbar: ["link"],
                     removePlugins: [
                       "CKFinderUploadAdapter",
                       "CKFinder",
@@ -695,7 +729,10 @@ export const ModalTiсket = ({
                       "ImageUpload",
                       "MediaEmbed",
                       "BlockQuote"
-                    ]
+                    ],
+                    link: {
+                      addTargetToExternalLinks: true
+                    }
                   }}
                   onChange={(event, editor) => {
                     const data = editor.getData();
@@ -713,7 +750,7 @@ export const ModalTiсket = ({
               )}
               {/*<img src={taskImg} className="image-task"></img>*/}
             </div>
-            {Boolean(taskFiles.length) && (
+            {Boolean(taskFiles?.length) && (
               <div className="task__files">
                 {taskFiles.map((file) => {
                   return (
@@ -873,7 +910,7 @@ export const ModalTiсket = ({
                 )}
               </div>
             )}
-            {Boolean(members.length) && (
+            {Boolean(members?.length) && (
               <div className="members">
                 <h5>Участники:</h5>
                 <div className="members__list">
@@ -1005,7 +1042,8 @@ export const ModalTiсket = ({
           <div className="workers_box-tag">
             <div className="tags">
               <div className="tags__selected">
-                {taskTags.map((tag) => {
+                {Array.isArray(taskTags) &&
+                  taskTags.map((tag) => {
                     return (
                       <div
                         className="tags__selected__item"

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

@@ -625,7 +625,10 @@ export const TrackerModal = ({
                       "numberedList"
                     ],
                     removePlugins: ["BlockQuote"],
-                    placeholder: "Описание задачи"
+                    placeholder: "Описание задачи",
+                    link: {
+                      addTargetToExternalLinks: true
+                    }
                   }}
                   onChange={(event, editor) => {
                     const data = editor.getData();

src/components/SideBar/SideBar.jsx

@@ -62,10 +62,14 @@ export const SideBar = () => {
             <Link to={"/forms"}>Формы</Link>
           </li>
           <li>
-            <a href="#">Школа</a>
+            <a href="#" target="_blank" rel="noopener noreferrer">
+              Школа
+            </a>
           </li>
           <li>
-            <a href="#">Контакты</a>
+            <a href="#" target="_blank" rel="noopener noreferrer">
+              Контакты
+            </a>
           </li>
           <li>
             <Link to={"/blog"}>Блог</Link>

src/components/TrackerCardTask/TrackerCardTask.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { forwardRef, useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
 
 import { movePositionProjectTask } from "@redux/projectsTrackerSlice";
@@ -14,7 +14,9 @@ import avatarMok from "assets/images/avatarMok.webp";
 
 import "./trackerCardTask.scss";
 
-const TrackerCardTask = ({
+const TrackerCardTask = forwardRef(
+  (
+    {
       task,
       projectBoard,
       titleColor,
@@ -22,7 +24,9 @@ const TrackerCardTask = ({
       openTicket,
       startWrapperIndexTest,
       setWrapperHover
-}) => {
+    },
+    ref
+  ) => {
     const dispatch = useDispatch();
     const [taskHover, setTaskHover] = useState({});
 
@@ -94,6 +98,7 @@ const TrackerCardTask = ({
 
     return (
       <div
+        ref={ref}
         key={task.id}
         className={`tasks__board__item ${
           taskHover[task.id] ? "task__hover" : ""
@@ -104,7 +109,7 @@ const TrackerCardTask = ({
         onDragLeave={(e) => dragLeaveTaskHandler(e)}
         onDragEnd={() => dragEndTaskHandler()}
         onDrop={(e) => dragDropTaskHandler(e, task, column)}
-      onClick={(e) => openTicket(e, task)}
+        onClick={() => openTicket(task)}
       >
         <div className="tasks__board__item__title">
           <p className="task__board__item__title">{task.title}</p>
@@ -181,6 +186,9 @@ const TrackerCardTask = ({
         />
       </div>
     );
-};
+  }
+);
+
+TrackerCardTask.displayName = "TrackerCardTask";
 
 export default TrackerCardTask;

src/components/TrackerTaskComment/TrackerTaskComment.jsx

@@ -121,6 +121,7 @@ export const TrackerTaskComment = ({
           editor={ClassicEditor}
           data={commentsEditText}
           config={{
+            toolbar: ["link"],
             removePlugins: [
               "CKFinderUploadAdapter",
               "CKFinder",
@@ -132,7 +133,10 @@ export const TrackerTaskComment = ({
               "ImageUpload",
               "MediaEmbed",
               "BlockQuote"
-            ]
+            ],
+            link: {
+              addTargetToExternalLinks: true
+            }
           }}
           onChange={(event, editor) => {
             const data = editor.getData();

src/pages/FormPage/FormPage.jsx

@@ -90,7 +90,11 @@ export const FormPage = () => {
               Заявка на собеседование через телеграм
             </div>
             <div className="form-page__telegram-icon">
-              <a href="https://t.me/st0kir" target="_blank" rel="noreferrer">
+              <a
+                href="https://t.me/st0kir"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
                 <SVG src={telegramIcon} />
               </a>
             </div>

src/pages/Landing/Landing.jsx

@@ -13,6 +13,10 @@ import clue from "assets/icons/landingClue.svg";
 import tracker from "assets/icons/landingTracker.svg";
 import codeBg from "assets/images/landing/backgroundCode.webp";
 import cat from "assets/images/landing/landingCat.webp";
+import reportingSystem from "assets/images/landing/reportingSystem.webp";
+import searchIT from "assets/images/landing/searchIT.webp";
+import systemControlGit from "assets/images/landing/systemControlGit.webp";
+import taskManagement from "assets/images/landing/taskManagement.webp";
 
 import "./landing.scss";
 
@@ -29,22 +33,22 @@ export const Landing = () => {
     {
       name: "<span>Найти</span> работу <br/> в IT",
       path: "/stack",
-      img: cat
+      img: searchIT
     },
     {
       name: "<span>Система</span> контроля версий GIT",
       path: "/stack",
-      img: cat
+      img: systemControlGit
     },
     {
       name: "<span>Управление</span> задачами",
       path: "/landing-tracker",
-      img: cat
+      img: taskManagement
     },
     {
       name: "<span>Система</span> для отчётности",
       path: "/stack",
-      img: cat
+      img: reportingSystem
     },
     {
       name: "Все наши предложения",

src/pages/LandingTracker/LandingTracker.jsx

@@ -12,6 +12,7 @@ import ellipseGreen from "assets/images/landingTracker/ellipseGreen.svg";
 import cat from "assets/images/landingTracker/landingCat.webp";
 import flag from "assets/images/landingTracker/projectsFlag.webp";
 import questionMark from "assets/images/landingTracker/questionMark.svg";
+import target from "assets/images/landingTracker/target.webp";
 import trackerCup from "assets/images/landingTracker/trackerCup.webp";
 import trackerPreview from "assets/images/landingTracker/trackerPreview.webp";
 import trackerSign from "assets/images/landingTracker/trackerSign.webp";
@@ -173,9 +174,9 @@ export const LandingTracker = () => {
               );
             })}
           </div>
-          {/* <div className="steps__portfolio">
+          <div className="goals__target">
-            <img src={portfolio} alt="portfolio" />
+            <img src={target} alt="target" />
-          </div> */}
+          </div>
         </div>
       </section>
 

src/pages/LandingTracker/LandingTracker.scss

@@ -446,6 +446,11 @@
           }
         }
       }
+
+      &__target {
+        position: absolute;
+        bottom: 0;
+      }
     }
   }
 

src/pages/ProjectTracker/ProjectTracker.jsx

@@ -1,7 +1,7 @@
 import moment from "moment";
 import React, { useEffect, useRef, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { Link, useParams } from "react-router-dom";
+import { Link, useLocation, useParams } from "react-router-dom";
 
 import {
   activeLoader,
@@ -51,6 +51,9 @@ import avatarMok from "assets/images/avatarMok.webp";
 export const ProjectTracker = () => {
   const dispatch = useDispatch();
   const projectId = useParams();
+  const taskParams = useParams();
+  const taskRefs = useRef([]);
+  const hasRunEffect = useRef(false);
 
   const [openColumnSelect, setOpenColumnSelect] = useState({});
   const [selectedTab, setSelectedTab] = useState(0);
@@ -78,6 +81,19 @@ export const ProjectTracker = () => {
     initListeners();
   }, []);
 
+  useEffect(() => {
+    if (projectBoard.columns && taskParams.taskId && !hasRunEffect.current) {
+      for (const column of projectBoard.columns) {
+        const task = column.tasks.find((task) => task.id == taskParams.taskId);
+        if (task) {
+          openTicket(task);
+          hasRunEffect.current = true;
+          return;
+        }
+      }
+    }
+  }, [projectBoard]);
+
   useEffect(() => {
     let columnsTasksEmpty = true;
     if (Object.keys(projectBoard).length) {
@@ -145,21 +161,32 @@ export const ProjectTracker = () => {
     setPriorityTask(length);
   }
 
-  function openTicket(e, task) {
+  const updateUrlWithTaskId = (taskId) => {
+    const currentUrl = window.location.pathname;
+    const taskUrlSegment = `/task/`;
+
+    if (currentUrl.includes(taskUrlSegment)) {
+      // Если URL содержит '/task/', заменяем старый ID на новый
+      const baseUrl = currentUrl.substring(
+        0,
+        currentUrl.indexOf(taskUrlSegment) + taskUrlSegment.length
+      );
+      const newUrl = `${baseUrl}${taskId}`;
+      window.history.pushState({}, "", newUrl);
+    } else {
+      // Если URL не содержит '/task/', добавляем '/task/${taskId}'
+      const newUrl = `${currentUrl}${taskUrlSegment}${taskId}`;
+      window.history.pushState({}, "", newUrl);
+    }
+  };
+
+  function openTicket(task) {
     setSelectedTicket(task);
     setModalActiveTicket(true);
-    const currentUrl = window.location.pathname;
+    updateUrlWithTaskId(task.id);
-    const newUrl = `${currentUrl}/task/${task.id}`;
-    window.history.pushState({}, "", newUrl);
     document.body.style.overflow = "hidden";
   }
 
-  useEffect(() => {
-    const currentUrl = window.location.pathname;
-    const newUrl = currentUrl.replace(/\/task\/\d+$/, "");
-    window.history.replaceState({}, "", newUrl);
-  }, []);
-
   function deleteColumn(column) {
     const priorityColumns = [];
     apiRequest("/project-column/update-column", {
@@ -421,8 +448,6 @@ export const ProjectTracker = () => {
                   </Link>
                 </div>
               </div>
-
-              {Boolean(modalActiveTicket) && (
               <ModalTicket
                 active={modalActiveTicket}
                 setActive={setModalActiveTicket}
@@ -433,7 +458,6 @@ export const ProjectTracker = () => {
                 projectOwnerId={projectBoard.owner_id}
                 projectMarks={projectBoard.mark}
               />
-              )}
 
               <div className="tasks__container">
                 {Boolean(projectBoard?.columns) &&
@@ -535,6 +559,9 @@ export const ProjectTracker = () => {
                                 startWrapperIndexTest={startWrapperIndexTest}
                                 task={task}
                                 titleColor={titleColor}
+                                ref={(el) => {
+                                  taskRefs.current[task.id] = el;
+                                }}
                               />
                             );
                           })}

src/pages/Stack/Stack.jsx

@@ -648,9 +648,15 @@ export const Stack = () => {
                       onChange={handleChange}
                     />
                     <p>
-                      Соглашаюсь с <a href="">Пользовательским соглашением</a> и
+                      Соглашаюсь с{" "}
+                      <a href="" target="_blank" rel="noopener noreferrer">
+                        Пользовательским соглашением
+                      </a>{" "}
+                      и
                       <br />
-                      <a href="">Политикой обработки данных</a>
+                      <a href="" target="_blank" rel="noopener noreferrer">
+                        Политикой обработки данных
+                      </a>
                     </p>
                   </div>
 

src/pages/Summary/Summary.jsx

@@ -58,6 +58,25 @@ export const Summary = () => {
     });
   }, []);
 
+  const addSkill = (skill) => {
+    const isSkillFound = selectedSkills.some(
+      (item) => item.skill_id == skill.id
+    );
+
+    if (!isSkillFound) {
+      setSelectedSkills((prevValue) => [
+        ...prevValue,
+        { skill: skill, skill_id: skill.id }
+      ]);
+    }
+  };
+
+  const deleteSkill = (skill) => {
+    setSelectedSkills((prevValue) =>
+      prevValue.filter((item) => item.skill_id !== skill.skill_id)
+    );
+  };
+
   function setSkills() {
     apiRequest("/resume/edit-skills", {
       method: "PUT",
@@ -157,13 +176,7 @@ export const Summary = () => {
                           <img
                             src={deleteIcon}
                             alt="deleteIcon"
-                            onClick={() =>
+                            onClick={() => deleteSkill(skill)}
-                              setSelectedSkills((prevValue) =>
-                                prevValue.filter(
-                                  (item) => item.skill_id !== skill.skill_id
-                                )
-                              )
-                            }
                           />
                         </span>
                       );
@@ -184,12 +197,7 @@ export const Summary = () => {
                         {skillsList.map((skill) => {
                           return (
                             <p
-                              onClick={() =>
+                              onClick={() => addSkill(skill)}
-                                setSelectedSkills((prevValue) => [
-                                  ...prevValue,
-                                  { skill: skill, skill_id: skill.id }
-                                ])
-                              }
                               key={skill.id}
                               className="select-skills__item"
                             >
@@ -205,7 +213,7 @@ export const Summary = () => {
                 <div className="skills__section__items__wrapper">
                   {selectedSkills &&
                     selectedSkills.map((skill, index) => (
-                      <span key={skill.id} className="skill_item">
+                      <span key={skill.skill_id} className="skill_item">
                         {skill.skill.name}
                         {selectedSkills.length > index + 1 && ","}
                       </span>
@@ -284,7 +292,7 @@ export const Summary = () => {
                     <a
                       href={itemGit.link}
                       target="_blank"
-                      rel="noreferrer"
+                      rel="noopener noreferrer"
                       key={itemGit.id}
                       className="summary__section-git-item git-item"
                     >
@@ -305,7 +313,7 @@ export const Summary = () => {
                         className="git-item__link"
                         href={itemGit.link}
                         target="_blank"
-                        rel="noreferrer"
+                        rel="noopener noreferrer"
                       >
                         <img src={rightArrow} alt="arrowRight" />
                       </a>

src/pages/roles/DeveloperPage.jsx

@@ -24,6 +24,7 @@ export const DeveloperPage = () => {
   return (
     <Routes>
       <Route exact path="/tracker/task/:id" element={<TicketFullScreen />} />
+
       <Route
         exact
         path="/tracker/project/:id/task/:taskId"