Merge pull request 'trackerTask' (#16) from trackerTask into main

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/Navigation/Navigation.jsx

@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
+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/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/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/pages/Quiz/PassingTests.js

@@ -120,12 +120,12 @@ export const PassingTests = () => {
                 ))}
               </div>
             )}
-            {!startTest && (
+            {/*{!startTest && (*/}
-              <div className="passing-tests-page__block-text block-text">
+            {/*  <div className="passing-tests-page__block-text block-text">*/}
-                ИЛИ <Link to={""}>выполните тестовое задание</Link>, без
+            {/*    ИЛИ <Link to={""}>выполните тестовое задание</Link>, без*/}
-                прохождения тестов
+            {/*    прохождения тестов*/}
-              </div>
+            {/*  </div>*/}
-            )}
+            {/*)}*/}
           </>
         )}
         {completedTest && (

src/pages/Quiz/QuizPage.js

@@ -144,10 +144,10 @@ export const QuizPage = () => {
                 <h1>Анкет нет</h1>
               )}
             </div>
-            <div className="block-text">
+            {/*<div className="block-text">*/}
-              ИЛИ <Link to={""}>выполните тестовое задание</Link>, без
+            {/*  ИЛИ <Link to={""}>выполните тестовое задание</Link>, без*/}
-              прохождения тестов
+            {/*  прохождения тестов*/}
-            </div>
+            {/*</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: "/profile/quiz" },
-            { name: "Отчет по тестированию", link: "/Quiz/report" }
+            { name: "Отчет по тестированию", link: "/profile/quiz" }
           ]}
         />
         <div className="quiz-report-page__title main-title">

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">
+          {localStorage.getItem("role_status") !== "18" && (
-            <h3 className="viewReport__bar__date">
+            <div className="viewReport__bar">
-              {getCorrectDate(dateReport.id)}
+              <button className="viewReport__bar__edit">Редактировать</button>
-            </h3>
+              {deleteLoader ? (
-            <p className="viewReport__bar__hours">
+                <Loader style={"green"} />
-              Вами потрачено на работу:{" "}
+              ) : (
-              <span>
+                <button
-                {totalHours} {hourOfNum(totalHours)}
+                  onClick={deleteReport}
-              </span>
+                  className={
-            </p>
+                    taskText.length
-          </div> */}
+                      ? "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) {
+    button {
-      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;
       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;
+      padding: 8px 24px;
-
-      @media (max-width: 660px) {
-        font-size: 11px;
     }
 
-      span {
+    &__edit {
-        color: #52B709;
+      background: #E1FCCF;
-        font-weight: 700;
+      border-radius: 44px;
-      }
+      border: none;
     }
 
-    &__progressBar {
+    &__delete {
-      max-width: 390px;
+      background: white;
-      width: 100%;
-      background: #F1F1F1;
       border-radius: 12px;
-      height: 8px;
+      border: 1px dashed #8BCC60;
-      position: relative;
-
-      span {
-        position: absolute;
-        height: 100%;
-        left: 0;
-        width: 60%;
-        background: #52B709;
-        border-radius: 12px;
-      }
     }
 
-    &__total {
+    .disable {
-      font-weight: 400;
+      pointer-events: none;
-      font-size: 12px;
+      opacity: 0.5;
-      line-height: 32px;
     }
 
+    .loader {
+      max-width: 150px;
+    }
   }
 
   h3 {