From 907f3e830dc437c53136d515dae104f4b4096bf9 Mon Sep 17 00:00:00 2001 From: Z1chi Date: Mon, 16 Jan 2023 20:42:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D1=8E=20=D1=81=D0=BF=D0=BE=D1=80=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 1 - .../ProfileCalendar/ProfileCalendar.js | 2 ++ src/components/ReportForm/ReportForm.js | 16 +++++++++++----- src/pages/ProfileCalendarPage.js | 1 - 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/App.js b/src/App.js index bcec15ba..42599d00 100644 --- a/src/App.js +++ b/src/App.js @@ -54,7 +54,6 @@ const App = () => { }/> }/> }/> - }/> diff --git a/src/components/ProfileCalendar/ProfileCalendar.js b/src/components/ProfileCalendar/ProfileCalendar.js index 5a66c9ec..c2e5af7c 100644 --- a/src/components/ProfileCalendar/ProfileCalendar.js +++ b/src/components/ProfileCalendar/ProfileCalendar.js @@ -13,6 +13,8 @@ import {useRequest} from "../../hooks/useRequest"; import { getProfileInfo } from '../../redux/outstaffingSlice' import './profileCalendar.scss' + + export const ProfileCalendar = () => { const profileInfo = useSelector(getProfileInfo); const [month, setMonth] = useState(''); diff --git a/src/components/ReportForm/ReportForm.js b/src/components/ReportForm/ReportForm.js index cb136026..1986ed01 100644 --- a/src/components/ReportForm/ReportForm.js +++ b/src/components/ReportForm/ReportForm.js @@ -1,18 +1,24 @@ import React, {useState} from 'react' import {useSelector} from 'react-redux' import {Link} from 'react-router-dom' + import {Loader} from '../Loader/Loader' +import {currentMonthAndDay} from '../Calendar/calendarHelper' +import {Footer} from "../Footer/Footer"; +import {ProfileHeader} from "../ProfileHeader/ProfileHeader"; + +import {useRequest} from "../../hooks/useRequest"; + import {getReportDate} from '../../redux/reportSlice' + import calendarIcon from '../../images/calendar_icon.png' import ellipse from '../../images/ellipse.png' import remove from '../../images/remove.png' import addIcon from '../../images/addIcon.png' -import {currentMonthAndDay} from '../Calendar/calendarHelper' -import {Footer} from "../Footer/Footer"; -import './reportForm.scss' import arrow from "../../images/right-arrow.png"; -import {useRequest} from "../../hooks/useRequest"; -import {ProfileHeader} from "../ProfileHeader/ProfileHeader"; + +import './reportForm.scss' + const getCreatedDate = (day) => { if (day) { diff --git a/src/pages/ProfileCalendarPage.js b/src/pages/ProfileCalendarPage.js index c0c298b6..ea095ea2 100644 --- a/src/pages/ProfileCalendarPage.js +++ b/src/pages/ProfileCalendarPage.js @@ -1,5 +1,4 @@ import React from 'react'; -import { WithLogout } from '../hoc/withLogout'; import { ProfileCalendar } from '../../src/components/ProfileCalendar/ProfileCalendar'; const ProfileCalendarPage = () => {