From 1576b2321501d8c406ab2b8193eca628ed2fa265 Mon Sep 17 00:00:00 2001 From: Mikola Date: Thu, 15 Feb 2024 15:37:15 +0300 Subject: [PATCH] choose project --- src/components/Calendar/Calendar.jsx | 2 +- src/components/Calendar/CalendarComponent.jsx | 2 +- .../Tracker/TicketFullScreen/TicketFullScreen.jsx | 2 +- .../Modal/Tracker/TrackerModal/TrackerModal.jsx | 2 +- src/components/ProfileCalendar/ProfileCalendar.jsx | 2 +- .../ProfileCalendar/ProfileCalendarComponent.jsx | 10 +++++----- src/components/ShortReport/ShortReport.jsx | 5 +++-- .../TrackerTaskComment/TrackerTaskComment.jsx | 2 +- src/pages/PartnerBid/PartnerBid.jsx | 2 +- .../PartnerEmployeeReport/PartnerEmployeeReport.jsx | 3 ++- src/pages/Payouts/Payouts.jsx | 2 +- src/pages/Statistics/Statistics.jsx | 2 +- src/pages/ViewReport/ViewReport.jsx | 5 +++-- 13 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/components/Calendar/Calendar.jsx b/src/components/Calendar/Calendar.jsx index 6dbc1ef9..64e7f95f 100644 --- a/src/components/Calendar/Calendar.jsx +++ b/src/components/Calendar/Calendar.jsx @@ -11,9 +11,9 @@ import { LogoutButton } from "@components/LogoutButton/LogoutButton"; import rectangle from "assets/images/rectangle_secondPage.png"; +import { currentMonth } from "../../utils/calendarHelper"; import CalendarComponent from "./CalendarComponent"; import "./calendar.scss"; -import { currentMonth } from "../../utils/calendarHelper"; const Calendar = () => { if (localStorage.getItem("role_status") !== "18") { diff --git a/src/components/Calendar/CalendarComponent.jsx b/src/components/Calendar/CalendarComponent.jsx index 0faececd..58b41207 100644 --- a/src/components/Calendar/CalendarComponent.jsx +++ b/src/components/Calendar/CalendarComponent.jsx @@ -6,8 +6,8 @@ import calendarIcon from "assets/icons/calendar.svg"; import ellipse from "assets/icons/ellipse.png"; import rectangle from "assets/images/rectangle__calendar.png"; -import "./calendarComponent.scss"; import { calendarHelper, currentMonthAndDay } from "../../utils/calendarHelper"; +import "./calendarComponent.scss"; const CalendarComponent = ({ onSelect }) => { const [value, setValue] = useState(moment()); diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 9699a3b2..3aa9dfba 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -9,6 +9,7 @@ import { Link, useNavigate, useParams } from "react-router-dom"; import { getProfileInfo } from "@redux/outstaffingSlice"; import { getBoarderLoader, setToggleTab } from "@redux/projectsTrackerSlice"; +import { getCorrectDate } from "@utils/calendarHelper"; import { backendImg, caseOfNum, @@ -21,7 +22,6 @@ import { apiRequest } from "@api/request"; import { useNotification } from "@hooks/useNotification"; -import { getCorrectDate } from "@utils/calendarHelper"; import { Footer } from "@components/Common/Footer/Footer"; import { Loader } from "@components/Common/Loader/Loader"; import FileTracker from "@components/FileTracker/FileTracker"; diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index c37ea942..305d3e63 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -22,13 +22,13 @@ import { setProjectBoardFetch } from "@redux/projectsTrackerSlice"; +import { getCorrectDate } from "@utils/calendarHelper"; import { getCorrectRequestDate, urlForLocal } from "@utils/helper"; import { apiRequest } from "@api/request"; import { useNotification } from "@hooks/useNotification"; -import { getCorrectDate } from "@utils/calendarHelper"; import BaseButton from "@components/Common/BaseButton/BaseButton"; import { Loader } from "@components/Common/Loader/Loader"; import ModalLayout from "@components/Common/ModalLayout/ModalLayout"; diff --git a/src/components/ProfileCalendar/ProfileCalendar.jsx b/src/components/ProfileCalendar/ProfileCalendar.jsx index 172d10bd..e5442270 100644 --- a/src/components/ProfileCalendar/ProfileCalendar.jsx +++ b/src/components/ProfileCalendar/ProfileCalendar.jsx @@ -12,11 +12,11 @@ import { setRequestDate } from "@redux/reportSlice"; +import { getReports } from "@utils/calendarHelper"; import { urlForLocal } from "@utils/helper"; import { apiRequest } from "@api/request"; -import { getReports } from "@utils/calendarHelper"; import { Footer } from "@components/Common/Footer/Footer"; import { Loader } from "@components/Common/Loader/Loader"; import { Navigation } from "@components/Navigation/Navigation"; diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 89f08740..0ccc2649 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -11,11 +11,6 @@ import { setSendRequest } from "@redux/reportSlice"; -import { getCorrectYYMMDD } from "@utils/helper"; - -import { apiRequest } from "@api/request"; - -import "@components/Calendar/calendarComponent.scss"; import { calendarHelper, correctDay, @@ -24,6 +19,11 @@ import { getReports, hourOfNum } from "@utils/calendarHelper"; +import { getCorrectYYMMDD } from "@utils/helper"; + +import { apiRequest } from "@api/request"; + +import "@components/Calendar/calendarComponent.scss"; import BaseButton from "@components/Common/BaseButton/BaseButton"; import arrow from "assets/icons/arrows/arrowCalendar.png"; diff --git a/src/components/ShortReport/ShortReport.jsx b/src/components/ShortReport/ShortReport.jsx index bce9a0d5..1a7f407f 100644 --- a/src/components/ShortReport/ShortReport.jsx +++ b/src/components/ShortReport/ShortReport.jsx @@ -8,13 +8,14 @@ import { setSendRequest } from "@redux/reportSlice"; -import { apiRequest } from "@api/request"; - import { getCorrectDate, getCreatedDate, hourOfNum } from "@utils/calendarHelper"; + +import { apiRequest } from "@api/request"; + import { Loader } from "@components/Common/Loader/Loader"; import "./shortReport.scss"; diff --git a/src/components/TrackerTaskComment/TrackerTaskComment.jsx b/src/components/TrackerTaskComment/TrackerTaskComment.jsx index 99f48b79..2dad8171 100644 --- a/src/components/TrackerTaskComment/TrackerTaskComment.jsx +++ b/src/components/TrackerTaskComment/TrackerTaskComment.jsx @@ -2,11 +2,11 @@ import ClassicEditor from "@ckeditor/ckeditor5-build-classic"; import { CKEditor } from "@ckeditor/ckeditor5-react"; import React, { useState } from "react"; +import { getCorrectDate } from "@utils/calendarHelper"; import { urlForLocal } from "@utils/helper"; import { apiRequest } from "@api/request"; -import { getCorrectDate } from "@utils/calendarHelper"; import TrackerTaskSubComment from "@components/TrackerTaskComment/TrackerTaskComment"; import del from "assets/icons/delete.svg"; diff --git a/src/pages/PartnerBid/PartnerBid.jsx b/src/pages/PartnerBid/PartnerBid.jsx index 5bde37ac..903e13ed 100644 --- a/src/pages/PartnerBid/PartnerBid.jsx +++ b/src/pages/PartnerBid/PartnerBid.jsx @@ -9,11 +9,11 @@ import { setPartnerRequestInfo } from "@redux/outstaffingSlice"; +import { getCorrectDate } from "@utils/calendarHelper"; import { urlForLocal } from "@utils/helper"; import { apiRequest } from "@api/request"; -import { getCorrectDate } from "@utils/calendarHelper"; import { Footer } from "@components/Common/Footer/Footer"; import { Loader } from "@components/Common/Loader/Loader"; import ModalLayout from "@components/Common/ModalLayout/ModalLayout"; diff --git a/src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx b/src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx index cabf90e4..aafbb36b 100644 --- a/src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx +++ b/src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx @@ -5,9 +5,10 @@ import { Navigate, useParams } from "react-router-dom"; import { getRequestDates, setRequestDate } from "@redux/reportSlice"; +import { getReports } from "@utils/calendarHelper"; + import { apiRequest } from "@api/request"; -import { getReports } from "@utils/calendarHelper"; import { Footer } from "@components/Common/Footer/Footer"; import { Loader } from "@components/Common/Loader/Loader"; import { Navigation } from "@components/Navigation/Navigation"; diff --git a/src/pages/Payouts/Payouts.jsx b/src/pages/Payouts/Payouts.jsx index 035d35d8..46d76507 100644 --- a/src/pages/Payouts/Payouts.jsx +++ b/src/pages/Payouts/Payouts.jsx @@ -1,8 +1,8 @@ import React from "react"; +import { Footer } from "@components/Common/Footer/Footer"; import { Navigation } from "@components/Navigation/Navigation"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; -import { Footer } from "@components/Common/Footer/Footer"; import "./payouts.scss"; diff --git a/src/pages/Statistics/Statistics.jsx b/src/pages/Statistics/Statistics.jsx index e3a9e22d..fce85360 100644 --- a/src/pages/Statistics/Statistics.jsx +++ b/src/pages/Statistics/Statistics.jsx @@ -6,10 +6,10 @@ import { setToggleTab } from "@redux/projectsTrackerSlice"; import { copyProjectLink } from "@utils/helper"; +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 { Footer } from "@components/Common/Footer/Footer"; import arrow from "assets/icons/arrows/arrowCalendar.png"; import emailImg from "assets/icons/emailStatistics.svg"; diff --git a/src/pages/ViewReport/ViewReport.jsx b/src/pages/ViewReport/ViewReport.jsx index 3c57a4ae..ab210b1d 100644 --- a/src/pages/ViewReport/ViewReport.jsx +++ b/src/pages/ViewReport/ViewReport.jsx @@ -4,13 +4,14 @@ import { Link, useParams } from "react-router-dom"; import { setEditReport } from "@redux/reportSlice"; -import { apiRequest } from "@api/request"; - import { getCorrectDate, getCreatedDate, hourOfNum } from "@utils/calendarHelper"; + +import { apiRequest } from "@api/request"; + import { Footer } from "@components/Common/Footer/Footer"; import { Loader } from "@components/Common/Loader/Loader"; import { Navigation } from "@components/Navigation/Navigation";