From 4be52d429c2bb2bbcbdd411bed86a147fe18eea0 Mon Sep 17 00:00:00 2001
From: MaxOvs19 <gshk3669@gmail.com>
Date: Thu, 19 Oct 2023 19:19:45 +0300
Subject: [PATCH] Fixed pages

---
 .../Common/AuthHeader/AuthHeader.jsx          |  9 ++++-
 .../Common/ModalLayout/modalLayout.scss       |  6 ++-
 src/components/ProjectTiket/ProjectTiket.jsx  | 39 +++++++++++--------
 src/components/ProjectTiket/projectTiket.scss | 14 +++----
 4 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/components/Common/AuthHeader/AuthHeader.jsx b/src/components/Common/AuthHeader/AuthHeader.jsx
index 57f4a333..b1e6c9bb 100644
--- a/src/components/Common/AuthHeader/AuthHeader.jsx
+++ b/src/components/Common/AuthHeader/AuthHeader.jsx
@@ -35,7 +35,14 @@ export const AuthHeader = () => {
                 </a>
               </li>
               <li>
-                <a href="#">Школа</a>
+                <a
+                  onClick={(e) => {
+                    e.preventDefault();
+                    scrollToForm();
+                  }}
+                >
+                  Трекер
+                </a>
               </li>
               <li>
                 <NavLink to={"/auth-candidate"} className="candidate">
diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss
index c2826682..c3be785b 100644
--- a/src/components/Common/ModalLayout/modalLayout.scss
+++ b/src/components/Common/ModalLayout/modalLayout.scss
@@ -118,7 +118,11 @@
   transform: scale(1);
 }
 
-.createProject {
+.createProject,
+.createColumn,
+.editProject,
+.addWorker,
+.editColumn {
   background: linear-gradient(180deg, #fff 0%, #ebebeb 37.29%);
   .title-project {
     margin-top: 20px;
diff --git a/src/components/ProjectTiket/ProjectTiket.jsx b/src/components/ProjectTiket/ProjectTiket.jsx
index 497677ef..34a3aae8 100644
--- a/src/components/ProjectTiket/ProjectTiket.jsx
+++ b/src/components/ProjectTiket/ProjectTiket.jsx
@@ -26,6 +26,7 @@ export const ProjectTiket = ({ project, index }) => {
   const [modalSelect, setModalSelect] = useState(false);
   const [modalAdd, setModalAdd] = useState(false);
   const [acceptModalOpen, setAcceptModalOpen] = useState(false);
+  const [path, setPath] = useState("");
   const dispatch = useDispatch();
   const { showNotification } = useNotification();
 
@@ -69,25 +70,29 @@ export const ProjectTiket = ({ project, index }) => {
     setAcceptModalOpen(false);
   }
 
+  function linkProject() {}
+
   return (
     <div className="project" key={index}>
-      <Link to={`/tracker/project/${project.id}`} className="project__link">
-        {project.name}
+      <Link to={`/tracker/project/${project.id}`}>
+        <p className="project__link">{project.name}</p>
+
+        <div className="project__info">
+          <p>Открытые задачи</p>
+          <span className="count">
+            {project.columns.reduce(
+              (accumulator, currentValue) =>
+                accumulator + currentValue.tasks.length,
+              0
+            )}
+          </span>
+          <img src={avatarProject} alt="#" className="project__avatar" />
+        </div>
       </Link>
-      <div className="project__info">
-        <p>Открытые задачи</p>
-        <span className="count">
-          {project.columns.reduce(
-            (accumulator, currentValue) =>
-              accumulator + currentValue.tasks.length,
-            0
-          )}
-        </span>
-        <img src={avatarProject} alt="#" className="project__avatar" />
-        <span className="menu-settings" onClick={() => setModalSelect(true)}>
-          ...
-        </span>
-      </div>
+
+      <span className="menu-settings" onClick={() => setModalSelect(true)}>
+        ...
+      </span>
       <Link
         to={`/profile/statistics/${project.id}`}
         className="project__statistics"
@@ -102,7 +107,7 @@ export const ProjectTiket = ({ project, index }) => {
         projectId={project.id}
       ></TrackerModal>
 
-      <ModalSelect active={modalSelect}>
+      <ModalSelect active={modalSelect} onClick={(e) => e.stopPropagation()}>
         <div className="project__settings-menu">
           <div
             onClick={() => {
diff --git a/src/components/ProjectTiket/projectTiket.scss b/src/components/ProjectTiket/projectTiket.scss
index bcb4e3d9..1c5b37fe 100644
--- a/src/components/ProjectTiket/projectTiket.scss
+++ b/src/components/ProjectTiket/projectTiket.scss
@@ -78,14 +78,14 @@
         display: none;
       }
     }
+  }
 
-    .menu-settings {
-      position: absolute;
-      font-size: 21px;
-      color: #6f6f6f;
-      right: 0;
-      top: -35%;
-    }
+  .menu-settings {
+    position: absolute;
+    font-size: 21px;
+    color: #6f6f6f;
+    right: 26px;
+    top: 59px;
   }
 
   &__avatar {