src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx

@@ -44,11 +44,12 @@ const AllTaskTableItem = ({ task, projects }) => {
         </div>
       </td>
       <td>
-        {new Date(
+        {task.timers.map((item) => {
-          task.timers.reduce((acc, cur) => acc + cur.deltaSeconds, 0) * 1000
+          let time = new Date(item.deltaSeconds * 1000)
-        )
+            .toISOString()
-          .toISOString()
+            .slice(11, 19);
-          .slice(11, 19)}
+          return `${time}`;
+        })}
       </td>
       <td>{new Date(task.created_at).toLocaleDateString()}</td>
       <td>{new Date(task.dead_line).toLocaleDateString()}</td>

src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx

@@ -9,20 +9,23 @@ const ArchiveTasksItem = ({ task, index }) => {
     <tr key={index}>
       <td className="archive__completeTask__description">
         <p className="completeTask__title">{task.title}</p>
-        {/*<p*/}
+        <p
-        {/*  className="date"*/}
+          className="date"
-        {/*  dangerouslySetInnerHTML={{*/}
+          dangerouslySetInnerHTML={{
-        {/*    __html: task.description*/}
+            __html: task.description
-        {/*  }}*/}
+          }}
-        {/*/>*/}
+        />
       </td>
       <td className="archive__completeTask__time">
         <p>
-          {new Date(
+          {task.timers.length == 0
-            task.timers.reduce((acc, cur) => acc + cur.deltaSeconds, 0) * 1000
+            ? "-"
-          )
+            : task.timers.map((item) => {
-            .toISOString()
+                let time = new Date(item.deltaSeconds * 1000)
-            .slice(11, 19)}
+                  .toISOString()
+                  .slice(11, 19);
+                return `${time}`;
+              })}
         </p>
       </td>
       <td className="archive__completeTask__info">

src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss

@@ -1,10 +0,0 @@
-.completeTask__title {
-  white-space: nowrap;
-  max-width: 250px;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-
-.archive__completeTask__time {
-  text-align: center;
-}

src/components/ArchiveTableTracker/archiveTableTracker.scss

@@ -1,33 +1,20 @@
 .archive {
   &__table {
     margin: 29px 0 0 0;
-    display: flex;
+    height: 67px;
-    flex-direction: column;
     width: 100%;
     font-size: 14px;
     font-weight: 400;
 
     thead {
-      display: flex;
       background: #f1f1f1;
       color: #5b6871;
       border-radius: 12px;
+      height: 65px;
       background: #f1f1f1;
       color: #5b6871;
 
-      tr {
-        display: grid;
-        padding: 20px 10px 11px;
-        grid-template-columns: 40% 20% 40%;
-        width: 100%;
-      }
-
       th {
-        display: flex;
-        text-align: center;
-        color: #5B6871;
-        line-height: 32px;
-        font-size: 14px;
         &:first-child {
           padding-left: 10px;
           border-top-left-radius: 12px;
@@ -41,28 +28,9 @@
     }
 
     tbody {
-      display: grid;
-      max-height: 600px;
-      overflow-y: auto;
       color: #000;
-
-      &::-webkit-scrollbar {
-        width: 5px;
-        border-radius: 10px;
-      }
-
-      &::-webkit-scrollbar-thumb {
-        background: #cbd9f9;
-        border-radius: 5px;
-      }
-
       tr {
-        display: grid;
-        height: 65px;
-        align-items: center;
         background-color: white;
-        grid-template-columns: 40% 20% 40%;
-        border-bottom: 1px solid rgba(241, 241, 241, 1);
 
         &:nth-child(2n) {
           background-color: rgba(241, 241, 241, 0.23);
@@ -70,7 +38,8 @@
       }
 
       td {
-        display: flex;
+        height: 65px;
+        border-bottom: 1px solid rgba(241, 241, 241, 1);
 
         &:first-child {
           max-width: 275px;

src/components/Modal/ModalRegistration/modalRegistration.scss

@@ -22,6 +22,7 @@
     &__main {
       display: flex;
       flex-direction: column;
+      align-items: center;
       width: 65%;
 
       @media (max-width: 1106px) {
@@ -34,7 +35,7 @@
         font-size: 35px;
         line-height: 32px;
         display: flex;
-        justify-content: center;
+        justify-content: space-between;
         margin: 0;
 
         @media (max-width: 960px) {
@@ -161,7 +162,7 @@
 
     &__about {
       border-left: 1px solid #cdcdcd;
-      padding: 0 20px 0 25px;
+      padding: 0 20px 0 10px;
       margin: 0 0 0 10px;
       display: flex;
       flex-direction: column;

src/components/Modal/ModalTrackerRegistration/ModalTrackerRegistration.js

@@ -4,7 +4,7 @@ import close from "assets/icons/closeProjectPersons.svg";
 
 import "./modalTrackerRegistration.scss";
 
-export const ModalTrackerRegistration = ({ setModalReset, email }) => {
+export const ModalTrackerRegistration = ({ setModalReset }) => {
   return (
     <div className="modalConfirmTracker">
       <h3 className="modalConfirmTracker__title">
@@ -14,14 +14,9 @@ export const ModalTrackerRegistration = ({ setModalReset, email }) => {
         Мы отправили ссылку
         <br />
         для активации вашего аккаунта на почту
-        <br /> <span>{email}</span>
+        <br /> <span>nhw44308@mail.com</span>
       </p>
-      <button
+      <button className="modalConfirmTracker__btn">Перейти в почту</button>
-        onClick={() => setModalReset(false)}
-        className="modalConfirmTracker__btn"
-      >
-        Понятно
-      </button>
       <img
         onClick={() => setModalReset(false)}
         src={close}

src/pages/Tracker/tracker.scss

@@ -131,7 +131,6 @@
       width: 100%;
       background: #ffffff;
       padding: 27px 0 29px;
-      margin-bottom: 50px;
 
       &__wrapper {
         max-width: 1160px;

src/pages/TrackerRegistration/TrackerRegistration.js

@@ -14,9 +14,6 @@ import "./trackerRegistration.scss";
 
 export const TrackerRegistration = () => {
   const [modalConfirmOpen, setModalConfirm] = useState(false);
-  const [inputs, setInputs] = useState({
-    email: ""
-  });
 
   return (
     <div className="trackerRegistration">
@@ -39,16 +36,7 @@ export const TrackerRegistration = () => {
               </div>
               <div className="trackerRegistration__inputContainer">
                 <span>Ваш e-mail</span>
-                <input
+                <input placeholder="E-mail" type="email" />
-                  placeholder="E-mail"
-                  onChange={(e) =>
-                    setInputs((prevState) => ({
-                      ...prevState,
-                      email: e.target.value
-                    }))
-                  }
-                  type="email"
-                />
               </div>
               <div className="trackerRegistration__inputContainer">
                 <span>Придумайте пароль</span>
@@ -78,10 +66,7 @@ export const TrackerRegistration = () => {
         </div>
         {modalConfirmOpen && (
           <ModalLayout active={modalConfirmOpen} setActive={setModalConfirm}>
-            <ModalTrackerRegistration
+            <ModalTrackerRegistration setModalReset={setModalConfirm} />
-              setModalReset={setModalConfirm}
-              email={inputs.email}
-            />
           </ModalLayout>
         )}
         <Footer />