employees table

src/components/Common/Footer/Footer.jsx

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

src/components/EmptyBlock/EmptyBlock.jsx

@@ -6,7 +6,6 @@ import empty from "assets/images/emptyPage.svg";
 import "./emptyBlock.scss";
 
 export const EmptyBlock = () => {
-
   return (
     <>
       <div className="empty-block">
@@ -21,4 +20,3 @@ export const EmptyBlock = () => {
     </>
   );
 };
-

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

@@ -122,6 +122,15 @@ 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 = () => {
@@ -301,17 +310,6 @@ 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",
@@ -382,22 +380,7 @@ 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) => {
@@ -413,11 +396,8 @@ export const ModalTiсket = ({
       }, []);
       setComments(comments);
     });
-
-      apiRequest(
-        `/timer/get-by-entity?entity_type=2&entity_id=${task.id}`
-      ).then((res) => {
-        if (Array.isArray(res)) {
+    apiRequest(`/timer/get-by-entity?entity_type=2&entity_id=${task.id}`).then(
+      (res) => {
         let timerSeconds = 0;
         res.length &&
           res.forEach((time) => {
@@ -430,38 +410,30 @@ 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" &&
-        Array.isArray(correctProjectUsers) &&
+      Boolean(
         !correctProjectUsers.find(
           (item) => item.user_id === profileInfo.id_user
         )
+      )
     ) {
       setCorrectProjectUsers((prevState) => [
         ...prevState,
@@ -474,19 +446,16 @@ export const ModalTiсket = ({
         }
       ]);
     }
-    }
-  }, [active]);
+  }, []);
 
   useEffect(() => {
-    if (Array.isArray(taskTags)) {
-      const tagIds = taskTags.map((tag) => tag.id);
+    let 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) {
@@ -565,15 +534,13 @@ export const ModalTiсket = ({
   }
 
   useEffect(() => {
-    if (Array.isArray(members)) {
-      const ids = members.map((user) => user.user_id);
+    let 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() {
@@ -717,7 +684,6 @@ export const ModalTiсket = ({
                   editor={ClassicEditor}
                   data={inputsValue.description}
                   config={{
-                    toolbar: ["link"],
                     removePlugins: [
                       "CKFinderUploadAdapter",
                       "CKFinder",
@@ -729,10 +695,7 @@ export const ModalTiсket = ({
                       "ImageUpload",
                       "MediaEmbed",
                       "BlockQuote"
-                    ],
-                    link: {
-                      addTargetToExternalLinks: true
-                    }
+                    ]
                   }}
                   onChange={(event, editor) => {
                     const data = editor.getData();
@@ -750,7 +713,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 (
@@ -910,7 +873,7 @@ export const ModalTiсket = ({
                 )}
               </div>
             )}
-            {Boolean(members?.length) && (
+            {Boolean(members.length) && (
               <div className="members">
                 <h5>Участники:</h5>
                 <div className="members__list">
@@ -1042,8 +1005,7 @@ export const ModalTiсket = ({
           <div className="workers_box-tag">
             <div className="tags">
               <div className="tags__selected">
-                {Array.isArray(taskTags) &&
-                  taskTags.map((tag) => {
+                {taskTags.map((tag) => {
                   return (
                     <div
                       className="tags__selected__item"

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

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

src/components/SideBar/SideBar.jsx

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

src/components/TrackerCardTask/TrackerCardTask.jsx

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

src/components/TrackerTaskComment/TrackerTaskComment.jsx

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

src/pages/FormPage/FormPage.jsx

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

src/pages/Landing/Landing.jsx

@@ -13,10 +13,6 @@ 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";
 
@@ -33,22 +29,22 @@ export const Landing = () => {
     {
       name: "<span>Найти</span> работу <br/> в IT",
       path: "/stack",
-      img: searchIT
+      img: cat
     },
     {
       name: "<span>Система</span> контроля версий GIT",
       path: "/stack",
-      img: systemControlGit
+      img: cat
     },
     {
       name: "<span>Управление</span> задачами",
       path: "/landing-tracker",
-      img: taskManagement
+      img: cat
     },
     {
       name: "<span>Система</span> для отчётности",
       path: "/stack",
-      img: reportingSystem
+      img: cat
     },
     {
       name: "Все наши предложения",

src/pages/LandingTracker/LandingTracker.jsx

@@ -12,7 +12,6 @@ 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";
@@ -174,9 +173,9 @@ export const LandingTracker = () => {
               );
             })}
           </div>
-          <div className="goals__target">
-            <img src={target} alt="target" />
-          </div>
+          {/* <div className="steps__portfolio">
+            <img src={portfolio} alt="portfolio" />
+          </div> */}
         </div>
       </section>
 

src/pages/LandingTracker/LandingTracker.scss

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

src/pages/PartnerСategories/PartnerСategories.jsx

@@ -46,6 +46,7 @@ export const PartnerCategories = () => {
   const theme = useTheme(getTheme());
   const [nodes, setNodes] = useState([]);
   const [initialNodes, setInitialNodes] = useState([]);
+  const [activeTab, setActiveTab] = useState("Все");
 
   const [search, setSearch] = useState("");
 
@@ -308,10 +309,38 @@ export const PartnerCategories = () => {
                   />
                 </label>
                 <div className="table__tabs">
-                  <div className="table__tab">Все</div>
+                  <div
+                    onClick={() => {
+                      setActiveTab("Все");
+                      setNodes(initialNodes);
+                    }}
+                    className={
+                      activeTab === "Все"
+                        ? "table__tab table__tab--active"
+                        : "table__tab"
+                    }
+                  >
+                    Все
+                  </div>
                   {tabs.map((tab) => {
                     return (
-                      <div className="table__tab" key={tab.value}>
+                      <div
+                        onClick={() => {
+                          setActiveTab(tab.name);
+                          setNodes(
+                            initialNodes.filter(
+                              (item) =>
+                                item.resume.userCard.position_id === tab.value
+                            )
+                          );
+                        }}
+                        className={
+                          activeTab === tab.name
+                            ? "table__tab table__tab--active"
+                            : "table__tab"
+                        }
+                        key={tab.value}
+                      >
                         {tab.name}
                       </div>
                     );

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

@@ -189,6 +189,25 @@
       border-radius: 5px;
     }
 
+    &__tab {
+      padding: 8px 12px;
+      cursor: pointer;
+      color: rgba(46, 58, 89, 1);
+      font-size: 15px;
+
+      &--active {
+        background: rgba(255, 255, 255, 1);
+        font-size: 16px;
+        border-radius: 5px;
+        border: 0;
+      }
+
+      &:nth-child(2) {
+        border-right: 1px solid rgba(224, 226, 229, 1);
+        border-left: 1px solid rgba(224, 226, 229, 1);
+      }
+    }
+
      &__avatar {
        width: 40px;
        height: 40px;

src/pages/Payouts/Payouts.jsx

@@ -1,10 +1,10 @@
 import React from "react";
 
 import { Footer } from "@components/Common/Footer/Footer";
-import { Navigation } from "@components/Navigation/Navigation";
-import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
-import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
 import { EmptyBlock } from "@components/EmptyBlock/EmptyBlock";
+import { Navigation } from "@components/Navigation/Navigation";
+import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
+import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
 
 import "./payouts.scss";
 
@@ -17,7 +17,7 @@ export const Payouts = () => {
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/profile" },
-            { name: "Выплаты и финансы ", link: "/profile/payouts" },
+            { name: "Выплаты и финансы ", link: "/profile/payouts" }
           ]}
         />
         <h3 className="payouts__title">Выплаты и финансы </h3>

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, useLocation, useParams } from "react-router-dom";
+import { Link, useParams } from "react-router-dom";
 
 import {
   activeLoader,
@@ -51,9 +51,6 @@ 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);
@@ -81,19 +78,6 @@ 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) {
@@ -161,32 +145,21 @@ export const ProjectTracker = () => {
     setPriorityTask(length);
   }
 
-  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) {
+  function openTicket(e, task) {
     setSelectedTicket(task);
     setModalActiveTicket(true);
-    updateUrlWithTaskId(task.id);
+    const currentUrl = window.location.pathname;
+    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", {
@@ -448,6 +421,8 @@ export const ProjectTracker = () => {
                   </Link>
                 </div>
               </div>
+
+              {Boolean(modalActiveTicket) && (
                 <ModalTicket
                   active={modalActiveTicket}
                   setActive={setModalActiveTicket}
@@ -458,6 +433,7 @@ export const ProjectTracker = () => {
                   projectOwnerId={projectBoard.owner_id}
                   projectMarks={projectBoard.mark}
                 />
+              )}
 
               <div className="tasks__container">
                 {Boolean(projectBoard?.columns) &&
@@ -559,9 +535,6 @@ export const ProjectTracker = () => {
                                 startWrapperIndexTest={startWrapperIndexTest}
                                 task={task}
                                 titleColor={titleColor}
-                                ref={(el) => {
-                                  taskRefs.current[task.id] = el;
-                                }}
                               />
                             );
                           })}

src/pages/Stack/Stack.jsx

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

src/pages/Summary/Summary.jsx

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

src/pages/roles/DeveloperPage.jsx

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