Переписываю спорные решения
This commit is contained in:
parent
f75510b20c
commit
907f3e830d
@ -54,7 +54,6 @@ const App = () => {
|
|||||||
<Route index element={<Profile/>}/>
|
<Route index element={<Profile/>}/>
|
||||||
<Route exact path='calendar' element={<ProfileCalendarPage/>}/>
|
<Route exact path='calendar' element={<ProfileCalendarPage/>}/>
|
||||||
<Route exact path='summary' element={<Summary/>}/>
|
<Route exact path='summary' element={<Summary/>}/>
|
||||||
<Route exact path='calendar' element={ProfileCalendarPage} />
|
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
<Route path="*" element={<Navigate to="/" replace/>}/>
|
<Route path="*" element={<Navigate to="/" replace/>}/>
|
||||||
|
@ -13,6 +13,8 @@ import {useRequest} from "../../hooks/useRequest";
|
|||||||
import { getProfileInfo } from '../../redux/outstaffingSlice'
|
import { getProfileInfo } from '../../redux/outstaffingSlice'
|
||||||
|
|
||||||
import './profileCalendar.scss'
|
import './profileCalendar.scss'
|
||||||
|
|
||||||
|
|
||||||
export const ProfileCalendar = () => {
|
export const ProfileCalendar = () => {
|
||||||
const profileInfo = useSelector(getProfileInfo);
|
const profileInfo = useSelector(getProfileInfo);
|
||||||
const [month, setMonth] = useState('');
|
const [month, setMonth] = useState('');
|
||||||
|
@ -1,18 +1,24 @@
|
|||||||
import React, {useState} from 'react'
|
import React, {useState} from 'react'
|
||||||
import {useSelector} from 'react-redux'
|
import {useSelector} from 'react-redux'
|
||||||
import {Link} from 'react-router-dom'
|
import {Link} from 'react-router-dom'
|
||||||
|
|
||||||
import {Loader} from '../Loader/Loader'
|
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 {getReportDate} from '../../redux/reportSlice'
|
||||||
|
|
||||||
import calendarIcon from '../../images/calendar_icon.png'
|
import calendarIcon from '../../images/calendar_icon.png'
|
||||||
import ellipse from '../../images/ellipse.png'
|
import ellipse from '../../images/ellipse.png'
|
||||||
import remove from '../../images/remove.png'
|
import remove from '../../images/remove.png'
|
||||||
import addIcon from '../../images/addIcon.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 arrow from "../../images/right-arrow.png";
|
||||||
import {useRequest} from "../../hooks/useRequest";
|
|
||||||
import {ProfileHeader} from "../ProfileHeader/ProfileHeader";
|
import './reportForm.scss'
|
||||||
|
|
||||||
|
|
||||||
const getCreatedDate = (day) => {
|
const getCreatedDate = (day) => {
|
||||||
if (day) {
|
if (day) {
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { WithLogout } from '../hoc/withLogout';
|
|
||||||
import { ProfileCalendar } from '../../src/components/ProfileCalendar/ProfileCalendar';
|
import { ProfileCalendar } from '../../src/components/ProfileCalendar/ProfileCalendar';
|
||||||
|
|
||||||
const ProfileCalendarPage = () => {
|
const ProfileCalendarPage = () => {
|
||||||
|
Loading…
Reference in New Issue
Block a user