fixes styles and routes

src/App.js

@@ -54,7 +54,6 @@ const App = () => {
               <Route index element={<Profile/>}/>
               <Route exact path='calendar' element={<ProfileCalendarPage/>}/>
               <Route exact path='summary' element={<Summary/>}/>
-              <Route exact path='calendar' element={ProfileCalendarPage} />
             </Route>
 
             <Route path="*" element={<Navigate to="/" replace/>}/>

src/components/ProfileCalendar/ProfileCalendar.js

@@ -57,7 +57,7 @@ export const ProfileCalendar = () => {
                         <img src={profileInfo.photo} className='summary__avatar'  alt='avatar'/>
                         <p className='summary__name'>{profileInfo.fio} {profileInfo.specification}</p>
                     </div>
-                    <Link to='/profile/report'>
+                    <Link to='/report'>
                         <button className="calendar__btn">Заполнить отчет за день</button>
                     </Link>
                 </div>

src/components/ProfileCalendar/ProfileCalendarComponent.js

@@ -49,10 +49,10 @@ export const ProfileCalendarComponent = ({reportsDates}) => {
     function correctRoute(day) {
         for (const date of reportsDates) {
             if (`${new Date(day).getFullYear()}-${correctDay(new Date(day).getMonth() + 1)}-${correctDay(new Date(day).getDate())}` === date.date) {
-                return `/view/report`
+                return `../../view/report`
             }
         }
-        return '/profile/report'
+        return '../../report'
     }
 
     // function prevMonth() {
@@ -104,7 +104,7 @@ export const ProfileCalendarComponent = ({reportsDates}) => {
                                     name={day.format('dddd')}
                                     id='btn'
                                 >
-                                    <Link to={() => correctRoute(day)}>
+                                    <Link to={correctRoute(day)}>
                                         <img className={'calendar__icon'} src={calendarIcon} alt='' />
                                         {currentMonthAndDay(day)}
                                     </Link>

src/components/ProfileHeader/ProfileHeader.js

@@ -53,11 +53,11 @@ export const ProfileHeader = () => {
         <div className='profileHeader__info'>
           <div className='profileHeader__container'>
             <nav className='profileHeader__nav'>
-              <NavLink to={'/summary'}>Резюме</NavLink>
+              <NavLink end to={'/profile/summary'}>Резюме</NavLink>
-              <NavLink to={'/profile'}>Отчетность</NavLink>
+              <NavLink end to={'/profile'}>Отчетность</NavLink>
-              <NavLink to={'/profile'}>Трекер</NavLink>
+              <NavLink end to={'/'}>Трекер</NavLink>
-              <NavLink to={'/profile'}>Выплаты</NavLink>
+              <NavLink end to={'/'}>Выплаты</NavLink>
-              <NavLink to={'/profile'}>Настройки</NavLink>
+              <NavLink end to={'/'}>Настройки</NavLink>
             </nav>
 
             <div className='profileHeader__personalInfo'>

src/components/ProfileHeader/profileHeader.scss

@@ -51,7 +51,7 @@
     }
 
     a {
-      text-decoration: none;
+      text-decoration: none !important;
       cursor: pointer;
       font-weight: 700;
       font-size: 18px;

src/components/ReportForm/ReportForm.js

@@ -79,7 +79,7 @@ const ReportForm = () => {
           <h2 className='summary__title'>Ваши отчеты - <span>добавить отчет</span></h2>
           <div>
             <div className='report__head'>
-              <Link className='calendar__back' to={`/profile/profilecalendar`}>
+              <Link className='calendar__back' to={`/profile/calendar`}>
                 <img src={arrow} alt=''/><p>Вернуться</p>
               </Link>
             </div>

src/pages/Profile.js

@@ -1,96 +0,0 @@
-import React from 'react';
-import {useSelector} from "react-redux";
-import {getProfileInfo} from "../redux/outstaffingSlice";
-import {ProfileHeader} from "../components/Profile/ProfileHeader";
-import {Link} from "react-router-dom";
-import {Footer} from "../components/Footer/Footer";
-
-import reportsIcon from "../images/reports.png"
-import summaryIcon from "../images/summaryIcon.png"
-import timerIcon from "../images/timerIcon.png"
-import paymentIcon from "../images/paymentIcon.png"
-import settingIcon from "../images/settingIcon.png"
-import rightArrow from "../images/arrowRight.png"
-
-import '../components/Profile/profile.scss'
-
-export const Profile = () => {
-    const profileInfo = useSelector(getProfileInfo);
-    return(
-        <div className='profile'>
-            <ProfileHeader/>
-            <div className='container'>
-                <h2 className='profile__title'>Добрый день, <span>{profileInfo.fio}</span></h2>
-                <div className='summary__info'>
-                    <div className='summary__person'>
-                        <img src={profileInfo.photo} className='summary__avatar'  alt='avatar'/>
-                        <p className='summary__name'>{profileInfo.fio} {profileInfo.specification}</p>
-                    </div>
-                </div>
-                <div className='profile__items'>
-                    <Link to={'/profile/profilecalendar'} className='item'>
-                        <div className='item__about'>
-                            <img src={reportsIcon}  alt='report'/>
-                            <h3>Ваша отчетность</h3>
-                        </div>
-                        <div className='item__info'>
-                            <p><span></span>Отработанных в этом месяце часов</p>
-                            <div className='item__infoLink'>
-                                <img src={rightArrow}  alt='arrow'/>
-                            </div>
-                        </div>
-                    </Link>
-                    <Link to={'/summary'} className='item'>
-                        <div className='item__about'>
-                            <img src={summaryIcon}  alt='summary'/>
-                            <h3>Данные и резюме</h3>
-                        </div>
-                        <div className='item__info'>
-                            <p>Ваше резюме<br/><span>заполнено</span></p>
-                            <div className='item__infoLink'>
-                                <img src={rightArrow}  alt='arrow'/>
-                            </div>
-                        </div>
-                    </Link>
-                    <Link to={'/profile'} className='item'>
-                        <div className='item__about'>
-                            <img src={timerIcon} alt='timer'/>
-                            <h3>Трекер времени</h3>
-                        </div>
-                        <div className='item__info'>
-                            <p>Сколько времени занимает<br/> выполнение задач</p>
-                            <div className='item__infoLink'>
-                                <img src={rightArrow} alt='arrow'/>
-                            </div>
-                        </div>
-                    </Link>
-                    <Link to={'/profile'} className='item'>
-                        <div className='item__about'>
-                            <img src={paymentIcon} alt='payment'/>
-                            <h3>Выплаты</h3>
-                        </div>
-                        <div className='item__info'>
-                            <p>У вас <span>подтвержден</span><br/> статус самозанятого</p>
-                            <div className='item__infoLink'>
-                                <img src={rightArrow} alt='arrow'/>
-                            </div>
-                        </div>
-                    </Link>
-                    <Link to={'/profile'} className='item'>
-                        <div className='item__about'>
-                            <img src={settingIcon} alt='settings'/>
-                            <h3>Настройки аккаунта</h3>
-                        </div>
-                        <div className='item__info'>
-                            <p>Перейдите чтобы начать<br/> редактирование</p>
-                            <div className='item__infoLink'>
-                                <img src={rightArrow} alt='arrow'/>
-                            </div>
-                        </div>
-                    </Link>
-                </div>
-            </div>
-            <Footer/>
-        </div>
-    )
-};

src/pages/Profile/Profile.js

@@ -38,7 +38,7 @@ export const Profile = () => {
                 <h3>Ваша отчетность</h3>
               </div>
               <div className='item__info'>
-                <p><span>У вас 122 часа</span><br/> отработанных в этом месяце</p>
+                <p><span></span>Отработанных в этом месяце часов</p>
                 <div className='item__infoLink'>
                   <img src={rightArrow} alt='arrow'/>
                 </div>