Merge branch 'main' of https://git.itguild.info/apuc/guild_front into feature/refactor-tracker

Reviewed-on: #16

src/App.js

@@ -106,22 +106,15 @@ const App = () => {
           <Route exact path="/candidate/:id/form" element={<FormPage />} />
           <Route path="/:userId/calendar" element={<Calendar />} />
 
-          <Route exact path="/report" element={<ReportForm />} />
           <Route path="/report/:id" element={<SingleReportPage />} />
 
-          <Route exact path="quiz">
-            <Route index element={<QuizPage />} />
-            <Route exact path="test/:uuid" element={<PassingTests />} />
-            <Route exact path="report/:uuid" element={<QuizReportPage />} />
-          </Route>
-
           <Route exact path="profile">
             <Route index element={<Profile />} />
             <Route exact path="catalog" element={<Home />} />
             <Route exact path="calendar" element={<ProfileCalendar />} />
-            <Route exact path="calendar/view/" element={<ProfileCalendar />} />
+            <Route exact path="calendar/report" element={<ReportForm />} />
+            <Route exact path="calendar/view/:date/:id" element={<ViewReport />} />
             <Route exact path="summary" element={<Summary />} />
-            <Route exact path="view/:date/:id" element={<ViewReport />} />
             <Route exact path="tracker" element={<Tracker />} />
             <Route exact path="statistics/:id" element={<Statistics/>}/>
             <Route exact path="payouts" element={<Payouts />} />
@@ -133,6 +126,11 @@ const App = () => {
             <Route exact path="employees" element={<PartnerCategories />} />
             <Route exact path="employees/report/:uuid" element={<PartnerEmployeeReport />} />
             <Route exact path="treaties" element={<PartnerTreaties />} />
+            <Route exact path="quiz">
+              <Route index element={<QuizPage />} />
+              <Route exact path="test/:uuid" element={<PassingTests />} />
+              <Route exact path="report/:uuid" element={<QuizReportPage />} />
+            </Route>
 
             <Route
               exact

src/components/Calendar/Calendar.jsx

@@ -60,7 +60,7 @@ const Calendar = () => {
               <img className="calendar__title-img" src={rectangle} alt="img" />
             </div>
             <div>
-              <Link to="/report">
+              <Link to="/profile/calendar/report">
                 <button className="calendar__btn">Заполнить отчет</button>
               </Link>
             </div>

src/components/Modal/ModalSelect/ModalSelect.jsx

@@ -5,7 +5,6 @@ import "./modalSelect.scss";
 export const ModalSelect = ({ active, children }) => {
   return (
     <div className={active ? "project__settings active" : "project__settings "}>
-      <span className="project__settings-ellipsis">...</span>
       {children}
     </div>
   );

src/components/Modal/ModalSelect/modalSelect.scss

@@ -1,29 +1,30 @@
 .project {
   &__settings {
     position: absolute;
-    padding: 32px 23px 10px 11px;
+    padding: 0 10px;
     background: #e1fccf;
     border-radius: 12px;
     transform: scale(0);
-    bottom: -40px;
-    right: -120px;
+    bottom: -30px;
+    right: -130px;
 
     @media (max-width: 1050px) {
-      right: 10px;
-      padding-top: 10px;
-      bottom: -75px;
+      right: 5px;
+      bottom: -30px;
     }
 
     &-menu {
       font-size: 14px;
-      line-height: 38px;
+      padding: 5px 0;
 
       div {
         display: flex;
         align-items: center;
+        padding: 2px 0;
 
         img {
-          margin-right: 12px;
+          width: 12px;
+          margin-right: 5px;
         }
 
         p:hover {

src/components/Navigation/Navigation.jsx

@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
+import React, { useState } from "react";
+import { useSelector } from "react-redux";
 import { NavLink } from "react-router-dom";
 
 import { getProfileInfo } from "@redux/outstaffingSlice";
@@ -9,9 +9,8 @@ import { urlForLocal } from "@utils/helper";
 import avatarMok from "assets/images/avatarMok.png";
 
 export const Navigation = () => {
-  const dispatch = useDispatch();
-
   const profileInfo = useSelector(getProfileInfo);
+  const currentPath = window.location.pathname;
   const [user] = useState(
     localStorage.getItem("role_status") === "18" ? "partner" : "developer"
   );
@@ -35,7 +34,7 @@ export const Navigation = () => {
         name: "Выплаты"
       },
       {
-        path: "/Quiz",
+        path: "/quiz",
         name: "Тесты"
       },
       {
@@ -81,6 +80,7 @@ export const Navigation = () => {
                 key={index}
                 end
                 to={link.path === "/Quiz" ? link.path : `/profile${link.path}`}
+                className={currentPath.includes(link.path) ? "active" : ""}
               >
                 {link.name}
               </NavLink>

src/components/ProfileCalendar/ProfileCalendar.jsx

@@ -98,7 +98,7 @@ export const ProfileCalendar = () => {
               {profileInfo.specification} разработчик
             </p>
           </div>
-          <Link to="/report">
+          <Link to="/profile/calendar/report">
             <button
               className="calendar__btn"
               onClick={() => dispatch(setReportDate(""))}

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -96,9 +96,11 @@ export const ProfileCalendarComponent = React.memo(
           )}-${correctDay(new Date(day).getDate())}` === date.created_at
         ) {
           if (userId) {
-            return `../view/${date.created_at}/${userId}`;
+            return `/profile/calendar/view/${date.created_at}/${userId}`;
           }
-          return `../view/${date.created_at}/${localStorage.getItem("id")}`;
+          return `/profile/calendar/view/${
+            date.created_at
+          }/${localStorage.getItem("id")}`;
         }
       }
 
@@ -106,7 +108,7 @@ export const ProfileCalendarComponent = React.memo(
         return "#";
       }
 
-      return "../../report";
+      return "/profile/calendar/report";
     }
 
     const prevMonth = () => value.clone().subtract(1, "month");

src/components/ProjectTicket/ProjectTicket.jsx

@@ -109,7 +109,7 @@ export const ProjectTicket = ({ project, index }) => {
         to={`/profile/statistics/${project.id}`}
         className="project__statistics"
       >
-        Просмотреть статистику
+        Посмотреть статистику
       </Link>
 
       <TrackerModal
@@ -133,7 +133,7 @@ export const ProjectTicket = ({ project, index }) => {
           </div>
           <div>
             <img src={link}></img>
-            <p onClick={copyProjectLink(project.id)}>ссылка на проект</p>
+            <p onClick={copyProjectLink(project.id)}>скопировать ссылку</p>
           </div>
           <div
             onClick={() => {

src/components/ProjectTicket/projectTicket.scss

@@ -80,8 +80,8 @@
     position: absolute;
     font-size: 21px;
     color: #6f6f6f;
-    right: 26px;
-    top: 10px;
+    right: 15px;
+    top: 0px;
   }
 
   &__avatar {

src/components/ReportForm/ReportForm.jsx

@@ -87,10 +87,12 @@ const ReportForm = () => {
   };
 
   const handler = () => {
+    setIsFetching(true);
     for (let input of inputs) {
       if (!input.task || !input.hours_spent) {
         setReportSuccess("Заполните задачи");
         setTimeout(() => setReportSuccess(""), 2000);
+        setIsFetching(false);
         return;
       }
     }
@@ -292,12 +294,16 @@ const ReportForm = () => {
           <div className="row">
             <div className="col-12">
               <div className="report-form__footer">
+                {isFetching ? (
+                  <Loader style={"green"} />
+                ) : (
                   <button
                     className="report-form__footer-btn"
                     onClick={() => handler()}
                   >
-                  {isFetching ? <Loader /> : "Отправить"}
+                    Отправить
                   </button>
+                )}
                 <p className="report-form__footer-text">
                   Всего за день:{" "}
                   <span>

src/components/ShortReport/ShortReport.jsx

@@ -80,7 +80,9 @@ export const ShortReport = () => {
           <h2 className="viewReport__title">
             Ваши отчеты - <span>просмотр отчета за день</span>
           </h2>
-          <Link to={`../view/${dateCreate}`}>Посмотреть подробный отчет</Link>
+          <Link to={`/profile/calendar/view/${dateCreate}`}>
+            Посмотреть подробный отчет
+          </Link>
         </div>
 
         <div className="viewReport__bar">

src/components/StarRating/StarRating.js

@@ -6,7 +6,7 @@ const StarRating = ({
   countStars = 1,
   countActiveStars = 1,
   color = "#52B709",
-  size = 61
+  size = 40
 }) => {
   const [shadedStars, setShadedStars] = useState([]);
   const [noShadedStars, setNoShadedStars] = useState([]);

src/components/features/quiz/AlertResult.jsx

@@ -17,14 +17,14 @@ export const AlertResult = ({ info }) => {
           className="alert-result__text"
           style={{ color: successTest ? "#52B709" : "#5B6871" }}
         >
-          Благодарим Вас за прохождение теста "{info.questionnaire_title}". Ваши
-          результаты проверены, готовы пригласить Вас в команду
+          Благодарим Вас за прохождение теста "{info.questionnaire_title}".
+          Ваши результаты проверены, готовы пригласить Вас в команду
         </div>
       </div>
       {!successTest && (
         <div className="alert-result__column">
           <button className="alert-result__button quiz-btn">
-            Запросить еще попытку
+            Запросить пересдачу
           </button>
         </div>
       )}

src/components/features/quiz/CardAviableTest.jsx

@@ -9,7 +9,11 @@ export const CardAvailableTest = ({ title, description, path, status }) => {
   return (
     <div className="card-available-test">
       <Link
-        to={status === 2 ? `/quiz/report/${path}` : `/quiz/test/${path}`}
+        to={
+          status === 2
+            ? `/profile/quiz/report/${path}`
+            : `/profile/quiz/test/${path}`
+        }
         aria-disabled={true}
         className="card-available-test__container"
         style={
@@ -33,7 +37,7 @@ export const CardAvailableTest = ({ title, description, path, status }) => {
       {status === 2 && (
         <div className="card-available-test__finished">
           <p>Получить отчет по тестированию</p>
-          <Link to={`/quiz/report/${path}`}>Отчет по тесту</Link>
+          <Link to={`/profile/quiz/report/${path}`}>Отчет по тесту</Link>
         </div>
       )}
     </div>

src/components/features/quiz/QuizReport.jsx

@@ -35,7 +35,7 @@ export const QuizReport = ({ info }) => {
         </div>
         <div className="report__column">
           <div className="report__status-text">Статус:</div>
-          <div className="report__status">Пройдено!</div>
+          <div className="report__status">Пройден!</div>
         </div>
       </div>
     </div>

src/components/features/quiz/quiz.scss

@@ -31,16 +31,14 @@ $maxWidthContainer: 1123;
 }
 .quiz-btn {
   display: flex;
-  font-family: "Lab Grotesque";
   align-items: center;
   justify-content: center;
-  // box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21);
+  box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21);
   white-space: nowrap;
   background: #406128;
   border-radius: 44px;
   color: #fff;
   outline: none;
-  //border: 2px solid #52b709;
   border: none;
   transition: 0 all ease 0.8s;
   padding: 7px 51px;
@@ -48,11 +46,6 @@ $maxWidthContainer: 1123;
   font-size: 14px;
   text-decoration: none;
   line-height: 200%;
-  // &:hover{
-  //     text-decoration: none;
-  //     color: #52b709;
-  //     background: #fff;
-  // }
   &_back {
     background: #dddddd;
     color: #000;
@@ -68,13 +61,11 @@ $maxWidthContainer: 1123;
   }
 }
 .quiz-title_h3 {
-  font-family: "Lab Grotesque";
   font-weight: 700;
   font-size: 18px;
   line-height: 156%;
   color: #52b709;
 }
-//=============================================
 
 .error-msg {
   text-align: center;
@@ -140,7 +131,6 @@ $maxWidthContainer: 1123;
 .form-task__group {
   display: block;
   margin-bottom: 13px;
-  font-family: "Lab Grotesque";
   label {
     font-weight: 400;
     font-size: 15px;
@@ -312,9 +302,9 @@ $maxWidthContainer: 1123;
 }
 
 .card-introduction {
-  padding: 0px 25px;
+  padding: 0px 20px;
   margin: 0px 0px 50px 0px;
-  flex: 0 1 33.333%;
+  flex: 0 1 33%;
   @media (max-width: 850px) {
     flex: 0 1 50%;
   }
@@ -324,14 +314,13 @@ $maxWidthContainer: 1123;
 
   &__body {
     display: flex;
-    gap: 20px;
+    gap: 10px;
   }
   &__title {
     font-weight: 900;
-    font-size: 14px;
-    line-height: 171%;
+    font-size: 18px;
     color: #52b709;
-    margin: 0 0 30px 0;
+    margin-bottom: 10px;
   }
   &__icon {
     flex: 0 0 25px;
@@ -343,8 +332,8 @@ $maxWidthContainer: 1123;
   }
   &__text {
     font-weight: 400;
-    font-size: 12px;
-    line-height: 200%;
+    font-size: 15px;
+    line-height: 20px;
     color: #000000;
   }
 }
@@ -352,20 +341,8 @@ $maxWidthContainer: 1123;
 .quiz-passing-information {
   background: #fff;
   border-radius: 12px;
-  &__container {
-    // @media (max-width: 600px) {
-    //   display: block;
-    // }
-    // @media (max-width: 600px) {
-    //   display: block;
-    // }
-    // @media (max-width: 600px) {
-    //   display: block;
-    // }
-  }
   &__main {
-    //flex: 1 1 auto;
-    padding: 35px 45px;
+    padding: 30px;
     height: 100%;
     display: grid;
     grid-template-columns: 1fr 1.2fr 1.2fr 0.6fr;
@@ -388,7 +365,7 @@ $maxWidthContainer: 1123;
   }
   &__text {
     font-weight: 400;
-    font-size: 12px;
+    font-size: 14px;
     line-height: 167%;
     color: #6f6f6f;
     span {
@@ -399,7 +376,7 @@ $maxWidthContainer: 1123;
   &__timer,
   &__attempt {
     display: flex;
-    gap: 23px;
+    gap: 10px;
     align-items: center;
   }
 
@@ -448,10 +425,10 @@ $maxWidthContainer: 1123;
 
   &__container {
     display: block;
-    @include adaptiv-value("padding-top", 30, 20, 1);
-    @include adaptiv-value("padding-bottom", 30, 20, 1);
-    @include adaptiv-value("padding-right", 28, 18, 1);
-    @include adaptiv-value("padding-left", 28, 18, 1);
+    @include adaptiv-value("padding-top", 15, 15, 1);
+    @include adaptiv-value("padding-bottom", 15, 15, 1);
+    @include adaptiv-value("padding-right", 15, 15, 1);
+    @include adaptiv-value("padding-left", 15, 15, 1);
   }
 
   &:hover {
@@ -463,8 +440,8 @@ $maxWidthContainer: 1123;
   &__top-head {
     display: flex;
     align-items: center;
-    gap: 19px;
-    margin: 0 0 24px 0;
+    gap: 10px;
+    margin-bottom: 15px;
   }
   &__title {
     font-weight: 500;
@@ -482,9 +459,8 @@ $maxWidthContainer: 1123;
 
     p {
       flex: 0 1 66%;
-      font-weight: 700;
-      font-size: 12px;
-      line-height: 20px;
+      font-weight: 500;
+      font-size: 13px;
       color: #000000;
       margin-bottom: 0;
 
@@ -508,7 +484,7 @@ $maxWidthContainer: 1123;
     border-radius: 12px;
     padding: 13px 16px;
     position: absolute;
-    bottom: 20px;
+    bottom: 0px;
     left: 0;
     display: flex;
     align-items: center;
@@ -517,8 +493,7 @@ $maxWidthContainer: 1123;
     gap: 10px;
     p {
       font-weight: 500;
-      font-size: 14px;
-      line-height: 129%;
+      font-size: 13px;
       color: #000000;
     }
     a {
@@ -577,27 +552,20 @@ $maxWidthContainer: 1123;
     color: #52b709;
   }
 
-  // .block-completed-test__text
-
   &__text {
     max-width: 386px;
     margin: 0 26px 0 0;
-    font-weight: 400;
-    font-size: 12px;
-    line-height: 200%;
+    font-weight: 500;
+    font-size: 13px;
     color: #000000;
   }
 
-  // .block-completed-test__button
-
   &__button {
     display: block;
   }
 }
 
 .report {
-  // .report__row
-
   &__row {
     display: flex;
     align-items: center;
@@ -609,35 +577,36 @@ $maxWidthContainer: 1123;
     }
   }
 
-  // .report__column
-
   &__column {
     &:first-child {
       background: #ffffff;
       flex: 0 1 22%;
-      border-radius: 12px;
+      border-radius: 12px 0 0 12px;
       @media (max-width: 1000px) {
         flex: 0 1 50%;
       }
+      @media (max-width: 600px) {
+        border-radius: 12px 12px 0 0;
       }
-    height: 128px;
-    border-radius: 0px 12px 0px 0px;
+    }
+    height: 90px;
     flex: 0 1 26%;
     display: flex;
     justify-content: center;
     align-items: center;
     background: #e1fccf;
-    gap: 21px;
+    gap: 10px;
     &:last-child {
-      flex-direction: column;
-      gap: 0;
-    }
+      border-radius: 0 12px 12px 0;
+      gap: 10px;
       @media (max-width: 1000px) {
         flex: 0 1 50%;
       }
+      @media (max-width: 600px) {
+        border-radius: 0 0 12px 12px;
+      }
+    }
   }
-
-  // .report__job-title
 
   &__job-title {
     font-weight: 500;
@@ -646,22 +615,17 @@ $maxWidthContainer: 1123;
     color: #000000;
   }
 
-  // .report__value
-
   &__value {
     font-weight: 700;
     font-size: 52px;
     line-height: 56%;
     color: #52b709;
-    // .report__value_false
 
     &_false {
       color: #5b6871;
     }
   }
 
-  // .report__text
-
   &__text {
     font-weight: 400;
     font-size: 16px;
@@ -669,26 +633,20 @@ $maxWidthContainer: 1123;
     color: #000000;
   }
 
-  // .report__status-text
-
   &__status-text {
-    font-weight: 400;
-    font-size: 12px;
-    line-height: 200%;
+    font-weight: 500;
+    font-size: 15px;
     color: #000000;
-    width: 50%;
   }
 
-  // .report__status
-
   &__status {
     background: #1458dd;
-    border-radius: 44px;
+    border-radius: 5px;
     font-weight: 500;
     font-size: 16px;
     line-height: 200%;
     color: #ffffff;
-    padding: 7px 34px;
+    padding: 7px 14px;
     max-width: 154px;
   }
 }
@@ -696,19 +654,19 @@ $maxWidthContainer: 1123;
 .alert-result {
   display: flex;
   align-items: center;
-  @include adaptiv-value("padding-top", 39, 20, 1);
-  @include adaptiv-value("padding-bottom", 39, 20, 1);
-  @include adaptiv-value("padding-right", 61, 20, 1);
-  @include adaptiv-value("padding-left", 61, 20, 1);
+  @include adaptiv-value("padding-top", 20, 20, 1);
+  @include adaptiv-value("padding-bottom", 20, 20, 1);
+  @include adaptiv-value("padding-right", 20, 20, 1);
+  @include adaptiv-value("padding-left", 20, 20, 1);
   background: #fff;
-  gap: 30px;
+  gap: 10px;
   border-radius: 10px;
   @media (max-width: 900px) {
     flex-wrap: wrap;
   }
   &__column {
     display: flex;
-    @include adaptiv-value("gap", 44, 14, 1);
+    @include adaptiv-value("gap", 20, 20, 1);
     align-items: center;
     @media (max-width: 900px) {
       flex: 1 1 auto;

src/pages/ProfileCandidate/ProfileCandidate.js

@@ -70,7 +70,7 @@ export const ProfileCandidate = () => {
           <div className="profile-candidate__instructions instructions-candidate">
             <div className="instructions-candidate__container">
               <div className="instructions-candidate___row">
-                <div className="instructions-candidate__title">Интсрукция:</div>
+                <div className="instructions-candidate__title">Инструкция:</div>
                 <div className="instructions-candidate__note">
                   <img
                     className="instructions-candidate__icon"
@@ -93,7 +93,7 @@ export const ProfileCandidate = () => {
                     alt=""
                   />
                   <div className="instructions-candidate__text">
-                    Тесты itguild предназначены для того, чтобы подтверждать
+                    Тесты ITguild предназначены для того, чтобы подтверждать
                     навыки, которые вы указали у себя.
                   </div>
                 </div>

src/pages/Quiz/PassingTests.js

@@ -10,7 +10,6 @@ import { Footer } from "@components/Common/Footer/Footer";
 import { Navigation } from "@components/Navigation/Navigation";
 import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
 import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
-// import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
 import { BlockCompletedTest } from "@components/features/quiz/BlockCompletedTest";
 import { CardIntroduction } from "@components/features/quiz/Card-introduction";
 import { QuizPassingInformation } from "@components/features/quiz/Quiz-passing-information";
@@ -43,12 +42,12 @@ export const PassingTests = () => {
     {
       title: "Зачем?",
       description:
-        "Тесты itguild  предназначены для того, чтобы подтверждать навыки, которые вы указали у себя."
+        "Тесты ITguild  предназначены для того, чтобы подтверждать навыки, которые вы указали у себя."
     },
     {
       title: "Почему именно тестирование?",
       description:
-        "Тесты itguild  заменяют первое техническое собеседование по любой вакансии."
+        "Тесты ITguild  заменяют первое техническое собеседование по любой вакансии."
     },
     {
       title: "Какие тесты нужно проходить?",
@@ -120,12 +119,12 @@ export const PassingTests = () => {
                 ))}
               </div>
             )}
-            {!startTest && (
-              <div className="passing-tests-page__block-text block-text">
-                ИЛИ <Link to={""}>выполните тестовое задание</Link>, без
-                прохождения тестов
-              </div>
-            )}
+            {/*{!startTest && (*/}
+            {/*  <div className="passing-tests-page__block-text block-text">*/}
+            {/*    ИЛИ <Link to={""}>выполните тестовое задание</Link>, без*/}
+            {/*    прохождения тестов*/}
+            {/*  </div>*/}
+            {/*)}*/}
           </>
         )}
         {completedTest && (
@@ -138,11 +137,6 @@ export const PassingTests = () => {
         )}
       </div>
       <Footer />
-      {/*<Prompt*/}
-      {/*  when={showPrompt}*/}
-      {/*  message="Unsaved changes detected, continue?"*/}
-      {/*  beforeUnload={true}*/}
-      {/*/>*/}
     </div>
   );
 };

src/pages/Quiz/QuizPage.js

@@ -144,10 +144,10 @@ export const QuizPage = () => {
                 <h1>Анкет нет</h1>
               )}
             </div>
-            <div className="block-text">
-              ИЛИ <Link to={""}>выполните тестовое задание</Link>, без
-              прохождения тестов
-            </div>
+            {/*<div className="block-text">*/}
+            {/*  ИЛИ <Link to={""}>выполните тестовое задание</Link>, без*/}
+            {/*  прохождения тестов*/}
+            {/*</div>*/}
           </>
         )}
         {selectedCategory && (

src/pages/Quiz/QuizReportPage.js

@@ -42,8 +42,8 @@ export const QuizReportPage = () => {
         <ProfileBreadcrumbs
           links={[
             { name: "Главная", link: "/profile-candidate" },
-            { name: "Тестирование", link: "/Quiz" },
-            { name: "Отчет по тестированию", link: "/Quiz/report" }
+            { name: "Тестирование", link: "/profile/quiz" },
+            { name: "Отчет по тестированию", link: "/profile/quiz" }
           ]}
         />
         <div className="quiz-report-page__title main-title">

src/pages/Quiz/quiz-page.scss

@@ -17,12 +17,12 @@
   }
   &__block {
     background: #e1fccf;
-    border-radius: 12px 12px 0px 0px;
+    border-radius: 12px;
     font-weight: 400;
-    font-size: 18px;
+    font-size: 23px;
     line-height: 178%;
     color: #000000;
-    padding: 20px 51px;
+    padding: 20px;
     margin: 0 0 16px 0;
   }
   &__cards-test {

src/pages/Tracker/Tracker.jsx

@@ -33,7 +33,7 @@ import project from "assets/icons/trackerProject.svg";
 import tasks from "assets/icons/trackerTasks.svg";
 import archive from "assets/images/archiveIcon.png";
 import mockAvatar from "assets/images/avatarMok.png";
-import downloadExel from "assets/images/downloadExel.svg";
+import downloadExcel from "assets/images/downloadExcel.svg";
 import noProjects from "assets/images/noProjects.png";
 import statusTimeTask from "assets/images/statusTimeTask.svg";
 
@@ -305,8 +305,8 @@ export const Tracker = () => {
                   <p>Сверка пройдена</p>
                 </div>
                 <div>
-                  <img src={downloadExel} alt="#" />
-                  <p>Скачать Exel отчет</p>
+                  <img src={downloadExcel} alt="#" />
+                  <p>Скачать Excel-отчет</p>
                 </div>
               </div>
             </div>

src/pages/ViewReport/ViewReport.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { Link, Navigate, useParams } from "react-router-dom";
+import { Link, useParams } from "react-router-dom";
 
 import { apiRequest } from "@api/request";
 
@@ -27,9 +27,11 @@ export const ViewReport = () => {
   const [taskText, setTaskText] = useState([]);
   const [difficulties, setDifficulties] = useState([]);
   const [tomorrowTask, setTomorrowTask] = useState([]);
+  const [taskId, setTaskId] = useState("");
   const [totalHours, setTotalHours] = useState(0);
   const [currentDay] = useState(new Date());
   const [loader, setLoader] = useState(false);
+  const [deleteLoader, setDeleteLoader] = useState(false);
 
   function getReportFromDate(day) {
     setLoader(true);
@@ -39,6 +41,7 @@ export const ViewReport = () => {
     apiRequest(`reports/find-by-date?user_id=${params.id}&date=${day}`).then(
       (res) => {
         let spendTime = 0;
+        setTaskId(res[0]?.id);
         for (const item of res) {
           if (item.difficulties) {
             setDifficulties((prevArray) => [...prevArray, item.difficulties]);
@@ -65,6 +68,18 @@ export const ViewReport = () => {
     nextReportDay.setDate(nextReportDay.getDate() + 1);
   }
 
+  function deleteReport() {
+    setDeleteLoader(true);
+    apiRequest(`reports/delete?id=${taskId}`, {
+      method: "DELETE"
+    }).then((res) => {
+      setDeleteLoader(false);
+      if (res) {
+        window.location.replace("/profile/calendar");
+      }
+    });
+  }
+
   function nextDay() {
     getReportFromDate(getCreatedDate(nextReportDay));
     previousReportDay.setDate(previousReportDay.getDate() + 2);
@@ -110,22 +125,32 @@ export const ViewReport = () => {
             <img src={arrow} alt="#" />
             <p>Вернуться</p>
           </Link>
-          {/* <div className="viewReport__bar">
-            <h3 className="viewReport__bar__date">
-              {getCorrectDate(dateReport.id)}
-            </h3>
-            <p className="viewReport__bar__hours">
-              Вами потрачено на работу:{" "}
-              <span>
-                {totalHours} {hourOfNum(totalHours)}
-              </span>
-            </p>
-          </div> */}
+          {localStorage.getItem("role_status") !== "18" && (
+            <div className="viewReport__bar">
+              <button className="viewReport__bar__edit">Редактировать</button>
+              {deleteLoader ? (
+                <Loader style={"green"} />
+              ) : (
+                <button
+                  onClick={deleteReport}
+                  className={
+                    taskText.length
+                      ? "viewReport__bar__delete"
+                      : "viewReport__bar__delete disable"
+                  }
+                >
+                  Удалить отчет
+                </button>
+              )}
+            </div>
+          )}
         </div>
         <div className="viewReport__switch-date">
           <div onClick={() => previousDay()}>
             <Link
-              to={`../view/${getCreatedDate(previousReportDay)}/${params.id}`}
+              to={`/profile/calendar/view/${getCreatedDate(
+                previousReportDay
+              )}/${params.id}`}
             >
               <div className="viewReport__switch-date__prev switch-date">
                 <img src={arrowSwitchDate} alt="arrow" />
@@ -141,7 +166,11 @@ export const ViewReport = () => {
               getCreatedDate(currentDay) === params.date ? "disable" : ""
             }`}
           >
-            <Link to={`../view/${getCreatedDate(nextReportDay)}/${params.id}`}>
+            <Link
+              to={`/profile/calendar/view/${getCreatedDate(nextReportDay)}/${
+                params.id
+              }`}
+            >
               <div className={`viewReport__switch-date__next switch-date`}>
                 <img src={arrowSwitchDate} alt="arrow" />
               </div>

src/pages/ViewReport/viewReport.scss

@@ -64,71 +64,34 @@
     height: 72px;
     justify-content: space-between;
 
-    @media (max-width: 540px) {
-      padding: 10px 15px;
-      height: 60px;
-    }
-
-    @media (max-width: 500px) {
-      column-gap: 0;
-      justify-content: space-between;
-    }
-
-    &__date {
-      font-weight: 500;
-      font-size: 22px;
-      line-height: 32px;
+    button {
       color: #000000;
-
-      @media (max-width: 660px) {
-        font-size: 16px;
-      }
-
-      @media (max-width: 490px) {
-        font-size: 12px;
-      }
-    }
-
-    &__hours {
-      font-weight: 400;
       font-size: 15px;
+      font-weight: 500;
       line-height: 32px;
-      color: #000000;
-
-      @media (max-width: 660px) {
-        font-size: 11px;
+      padding: 8px 24px;
     }
 
-      span {
-        color: #52B709;
-        font-weight: 700;
-      }
+    &__edit {
+      background: #E1FCCF;
+      border-radius: 44px;
+      border: none;
     }
 
-    &__progressBar {
-      max-width: 390px;
-      width: 100%;
-      background: #F1F1F1;
+    &__delete {
+      background: white;
       border-radius: 12px;
-      height: 8px;
-      position: relative;
-
-      span {
-        position: absolute;
-        height: 100%;
-        left: 0;
-        width: 60%;
-        background: #52B709;
-        border-radius: 12px;
-      }
+      border: 1px dashed #8BCC60;
     }
 
-    &__total {
-      font-weight: 400;
-      font-size: 12px;
-      line-height: 32px;
+    .disable {
+      pointer-events: none;
+      opacity: 0.5;
     }
 
+    .loader {
+      max-width: 150px;
+    }
   }
 
   h3 {