Merge pull request #138 from apuc/fixed-pages

fixed calendar periods

src/components/Calendar/calendarComponent.scss

@@ -287,7 +287,7 @@
 .selectDateRange {
   display: flex;
   align-items: center;
-  column-gap: 8px;
+  column-gap: 16px;
   font-size: 16px;
   font-weight: 500;
   position: relative;

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -22,11 +22,12 @@ import {
   getReports,
   hourOfNum,
 } from "@components/Calendar/calendarHelper";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
 import ShortReport from "@components/ShortReport/ShortReport";
 
 import arrow from "assets/icons/arrows/arrowCalendar.png";
 import calendarIcon from "assets/icons/calendar.svg";
-import close from "assets/icons/closeProjectPersons.svg";
+// import close from "assets/icons/closeProjectPersons.svg";
 import rectangle from "assets/images/rectangle__calendar.png";
 
 // eslint-disable-next-line react/display-name
@@ -50,6 +51,7 @@ export const ProfileCalendarComponent = React.memo(
     const [endDate, setEndDate] = useState(null);
     const [totalRangeHours, setTotalRangeHours] = useState(0);
     const [selectedRangeDays, setSelectedRangeDays] = useState({});
+    const [activePeriod, setActivePeriod] = useState(false);
 
     useEffect(() => {
       setCalendar(calendarHelper(value));
@@ -142,6 +144,14 @@ export const ProfileCalendarComponent = React.memo(
       });
     }
 
+    function toggleActivePeriod() {
+      if (!activePeriod) {
+        setActivePeriod(true);
+      } else {
+        setActivePeriod(false);
+      }
+    }
+
     function rangeDays(day) {
       if (!startDate) {
         setStartDateRange(day);
@@ -298,12 +308,15 @@ export const ProfileCalendarComponent = React.memo(
             onClick={() => {
               if (startRangeDays) resetRangeDays();
               toggleRangeDays();
+              toggleActivePeriod();
             }}
           >
             {endDate
               ? startDate < endDate
                 ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
                 : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
+              : activePeriod
+              ? "Выберите начало диапазона"
               : "Выбрать диапазон"}
           </span>
           <span>
@@ -312,14 +325,14 @@ export const ProfileCalendarComponent = React.memo(
               : "0 часов"}
           </span>
           {endDate && (
-            <img
+            <BaseButton
-              className="close"
+              styles={"clear-days"}
-              src={close}
-              alt="close"
               onClick={() => {
                 resetRangeDays();
               }}
-            />
+            >
+              Сбросить
+            </BaseButton>
           )}
         </div>
         {shortReport && <ShortReport />}

src/components/ProfileCalendar/profileCalendar.scss

@@ -90,3 +90,12 @@
     }
   }
 }
+.clear-days {
+  background: red;
+  padding: 5px 20px;
+  font-size: 14px;
+
+  &:hover {
+    background: rgba(255, 0, 0, 0.637);
+  }
+}