Merge pull request #157 from apuc/fixed-pages

Fixed pages(Bugs in tracker page)
2023-11-29 22:21:46 +03:00 · 2023-11-29 22:21:46 +03:00 · 690daba9d5
commit 690daba9d5
parent 28a282c586 8338414b1b
11 changed files with 76 additions and 33 deletions
--- a/src/App.js
+++ b/src/App.js
@ -55,6 +55,7 @@ import "./assets/fonts/stylesheet.css";
 import "bootstrap/dist/css/bootstrap.min.css";


+
 const App = () => {
  const notification = useSelector(getNotification)
  return (
@ -79,6 +80,7 @@ const App = () => {
            path="/tracker/project/:id"
            element={<ProjectTracker />}
          />
+
          <Route exact path="/auth-candidate" element={<AuthForCandidate />} />
          <Route
            exact
@ -135,6 +137,8 @@ const App = () => {
              element={<PartnerEmployees />}
            />
          </Route>
+          
+
          <Route exact path="profile-candidate/:id">
            <Route index element={<ProfileCandidate />} />
          </Route>
--- a/src/components/AuthBox/authBox.scss
+++ b/src/components/AuthBox/authBox.scss
@ -55,7 +55,7 @@
    margin-bottom: 54px;

    span {
-      color: #8DC63F;
+      color: #8dc63f;
      font-size: 50px;
      font-weight: 700;
      font-style: normal;
@ -193,7 +193,7 @@

  &__reset {
    color: #000000;
-    font-size: 13px;
+    font-size: 15px;
    line-height: 16px;
    cursor: pointer;
    text-decoration: underline;
@ -208,7 +208,7 @@

    span {
      cursor: pointer;
-      color: #52B709;
+      color: #52b709;
      font-weight: 700;
    }
  }
--- a/src/components/Common/AuthHeader/AuthHeader.jsx
+++ b/src/components/Common/AuthHeader/AuthHeader.jsx
@ -25,24 +25,10 @@ export const AuthHeader = () => {
                </NavLink>
              </li>
              <li>
-                <a
-                  onClick={(e) => {
-                    e.preventDefault();
-                    scrollToForm();
-                  }}
-                >
-                  Кабинет разработчика
-                </a>
+                <NavLink to={"/auth"}>Кабинет разработчика</NavLink>
              </li>
              <li>
-                <a
-                  onClick={(e) => {
-                    e.preventDefault();
-                    scrollToForm();
-                  }}
-                >
-                  Трекер
-                </a>
+                <NavLink to={"/tracker-intro"}>Трекер</NavLink>
              </li>
              <li>
                <NavLink to={"/auth-candidate"} className="candidate">
--- a/src/components/Modal/AcceptModal/acceptModal.scss
+++ b/src/components/Modal/AcceptModal/acceptModal.scss
@ -12,7 +12,7 @@

  .acceptModal {
    border-radius: 20px;
-    background: linear-gradient(180deg, #FFF 0%, #EBEBEB 100%);
+    background: linear-gradient(180deg, #fff 0%, #ebebeb 100%);
    padding: 50px 34px 25px;
    display: flex;
    flex-direction: column;
@ -43,16 +43,18 @@
      }

      .agree {
-        background: #52B709;
+        background: #52b709;
      }

      .cancel {
-        background: #B0BABF;
+        background: #b0babf;
      }
    }

    &__close {
      position: absolute;
+      width: 14px;
+      height: 14px;
      top: 15px;
      right: 22px;
      cursor: pointer;
--- a/src/components/Modal/ModalRegistration/modalRegistration.scss
+++ b/src/components/Modal/ModalRegistration/modalRegistration.scss
@ -7,11 +7,11 @@
  border: 1px solid #dde2e4;
  border-radius: 8px;
  width: 1088px;
-  height: 529px;
+  height: 515px;

  &-body {
    &__left {
-      padding: 60px 0 30px 77px;
+      padding: 33px 0 30px 77px;

      h2 {
        font-weight: 500;
@ -114,12 +114,13 @@

    &__right {
      border-left: 1px solid #f1f1f1;
-      padding: 80px 32px 46px 25px;
+      padding: 30px 32px 46px 25px;
      display: flex;
      flex-direction: column;
      justify-content: space-between;

      h4 {
+        margin: 22px 0 22px 0;
        font-weight: 900;
        font-size: 14px;
        line-height: 24px;
@ -140,7 +141,7 @@
        }

        img {
-          margin: 0 18px 20px 0;
+          margin: 0 18px 0 0;
        }
      }
    }
--- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
+++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
@ -1060,7 +1060,7 @@
              height: 42px;
              cursor: pointer;
              column-gap: 8px;
-              padding: 5px;
+              padding: 5px 5px 5px 14px;
              border-radius: 8px;
              background: #fff;

@ -1138,9 +1138,13 @@
            z-index: 10;

            &__item {
+              width: 66px;
+              font-size: 15px;
+              transition: 0.4s;
              cursor: pointer;

              &:hover {
+                transition: 0.4s;
                font-weight: 700;
              }
            }
--- a/src/components/ProjectTiket/ProjectTiket.jsx
+++ b/src/components/ProjectTiket/ProjectTiket.jsx
@ -25,6 +25,7 @@ import "./projectTiket.scss";
 export const ProjectTiket = ({ project, index }) => {
  const [modalSelect, setModalSelect] = useState(false);
  const [modalAdd, setModalAdd] = useState(false);
+  const [modalDelete, setModalDelete] = useState(false);
  const [acceptModalOpen, setAcceptModalOpen] = useState(false);
  const [path, setPath] = useState("");
  const dispatch = useDispatch();
@ -71,6 +72,7 @@ export const ProjectTiket = ({ project, index }) => {

  function closeAcceptModal() {
    setAcceptModalOpen(false);
+    setModalDelete(false);
  }

  function linkProject() {}
@ -144,7 +146,13 @@ export const ProjectTiket = ({ project, index }) => {
            <img src={archiveSet}></img>
            <p>в архив</p>
          </div>
-          <div onClick={removeProject}>
+
+          <div
+            onClick={() => {
+              setModalDelete(true);
+              setModalSelect(false);
+            }}
+          >
            <img src={del}></img>
            <p>удалить</p>
          </div>
@ -152,6 +160,15 @@ export const ProjectTiket = ({ project, index }) => {
      </ModalSelect>
      {acceptModalOpen && (
        <AcceptModal
+          title={"Вы точно хотите переместить проект в архив?"}
+          closeModal={closeAcceptModal}
+          agreeHandler={removeProject}
+        />
+      )}
+
+      {modalDelete && (
+        <AcceptModal
+          title={"Вы точно хотите удалить?"}
          closeModal={closeAcceptModal}
          agreeHandler={removeProject}
        />
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@ -531,7 +531,13 @@ export const ProjectTracker = () => {
                    }
                  >
                    {Boolean(projectBoard.projectUsers?.length) && (
-                      <div className="projectPersons">
+                      <div
+                        className={
+                          projectBoard.projectUsers?.length == 1
+                            ? "onePerson"
+                            : "projectPersons"
+                        }
+                      >
                        {projectBoard.projectUsers.slice(0, 3).map((person) => {
                          return (
                            <img
--- a/src/pages/Tracker/Tracker.jsx
+++ b/src/pages/Tracker/Tracker.jsx
@ -317,7 +317,8 @@ export const Tracker = () => {
                          <tr key={task.id}>
                            <td>
                              <div className="taskList__table__title-task">
-                                {task.title}
+                                <p>{task.title}</p>
+
                                <div
                                  onClick={(e) => {
                                    toggleDescTask(e);
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@ -322,6 +322,7 @@
              display: flex;
              position: relative;
              left: 5px;
+
              img {
                position: relative;
                display: flex;
@ -341,6 +342,19 @@
              }
            }

+            .onePerson {
+              display: flex;
+              position: relative;
+              left: -15px;
+
+              img {
+                position: relative;
+                display: flex;
+                width: 32px;
+                height: 32px;
+              }
+            }
+
            span {
              width: 32px;
              height: 32px;
@ -1597,12 +1611,20 @@
              gap: 10px;
              align-items: center;
              transition: 0.4s;
+              max-width: 350px;
+
+              p {
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                overflow: hidden;
+              }

              div {
                cursor: pointer;

                width: 15px;
-                height: 15px;
+                min-width: 15px;
+                min-height: 15px;
                display: flex;
                background-color: #000;
                align-items: center;
--- a/src/pages/TrackerIntro/TrackerIntro.js
+++ b/src/pages/TrackerIntro/TrackerIntro.js
@ -36,7 +36,7 @@ export const TrackerIntro = () => {
                компании в одном месте: проекты, задачи, цели, сотрудники,
                документы, переписки, отчеты
              </p>
-              <NavLink to="/auth" className="trackerIntro__btn">
+              <NavLink to="/tracker-registration" className="trackerIntro__btn">
                Начать работу
              </NavLink>
            </div>
@ -57,7 +57,7 @@ export const TrackerIntro = () => {
              Управление большим количеством проектов и гибкая настройка
              структуры под любые процессы
            </p>
-            <NavLink to="/auth" className="trackerIntro__btn">
+            <NavLink to="/tracker-registration" className="trackerIntro__btn">
              Начать работу
            </NavLink>
          </div>