diff --git a/src/assets/icons/financeIcon.png b/src/assets/icons/financeIcon.png new file mode 100644 index 00000000..170cf7fa Binary files /dev/null and b/src/assets/icons/financeIcon.png differ diff --git a/src/components/CardControl/CardControl.jsx b/src/components/CardControl/CardControl.jsx index 69c4e084..da8b6c13 100644 --- a/src/components/CardControl/CardControl.jsx +++ b/src/components/CardControl/CardControl.jsx @@ -10,7 +10,7 @@ export const CardControl = ({ title, path, description, img }) => {
itemImg -

{title}

+

diff --git a/src/components/CardControl/CardControl.scss b/src/components/CardControl/CardControl.scss index 647d35dd..daf46a3e 100644 --- a/src/components/CardControl/CardControl.scss +++ b/src/components/CardControl/CardControl.scss @@ -38,7 +38,7 @@ font-weight: 500; font-size: 18px; line-height: 22px; - max-width: 125px; + max-width: 165px; margin-bottom: 0; } } diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 8e24284c..d46225a0 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -46,6 +46,7 @@ export const ProfileCalendarComponent = React.memo( }) => { const dispatch = useDispatch(); + // const [l, setL] = useState(1); const [calendar, setCalendar] = useState([]); const [month, setMonth] = useState(""); const [endDate, setEndDate] = useState(null); @@ -174,9 +175,27 @@ export const ProfileCalendarComponent = React.memo( }); } - // function errorr(TotalRangeHours) { - // console.error(TotalRangeHours); + // function dddd(day) { + // let index = day.format("D") - l; + // console.log(`d ${day.format("d")}`); + // if (day.format("d") != 0 && day.format("d") != 6) { + // let elementAtIndex1 = reports[index]; + // if (elementAtIndex1 && elementAtIndex1.task) { + // let totalHoursSpent = elementAtIndex1.task.reduce( + // (total, task) => total + task.hours_spent, + // 0 + // ); + // console.log(`index ${index}`); + // console.log(elementAtIndex1); + // console.log(`h ${totalHoursSpent}`); + // return totalHoursSpent; + // } + // } else { + // setL(l + 1); + // console.log(`l ${l}`); + // } // } + return (
@@ -265,7 +284,7 @@ export const ProfileCalendarComponent = React.memo(
{day.format("D")}
- 7/Час + 7/
{/* {currentMonthAndDay(day)} */} diff --git a/src/pages/Profile/Profile.jsx b/src/pages/Profile/Profile.jsx index b8f5f7df..964806f0 100644 --- a/src/pages/Profile/Profile.jsx +++ b/src/pages/Profile/Profile.jsx @@ -11,7 +11,8 @@ import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; -// import paymentIcon from "assets/icons/paymentIcon.png"; +import financeIcon from "assets/icons/financeIcon.png"; +import paymentIcon from "assets/icons/paymentIcon.png"; import settingIcon from "assets/icons/settingIcon.png"; import summaryIcon from "assets/icons/summaryIcon.png"; import timerIcon from "assets/icons/timerIcon.png"; @@ -28,10 +29,10 @@ export const Profile = () => { const [profileItemsInfo] = useState({ developer: [ { - path: "profile/calendar", - img: reportsIcon, - title: "Ваша отчетность", - description: "Отработанных в этом месяце часов" + path: "profile", + img: paymentIcon, + title: "Работа в IT
открытые запросы", + description: "Перейдите чтобы посмотреть
открытые позиции" }, { path: "profile/summary", @@ -42,20 +43,26 @@ export const Profile = () => { { path: "profile/tracker", img: timerIcon, - title: "Трекер времени", + title: "Трекер
времени", description: "Сколько времени занимает
выполнение задач" }, - // { - // path: "profile/payouts", - // img: paymentIcon, - // title: "Выплаты", - // description: "У вас подтвержден
статус самозанятого" - // }, + { + path: "profile/payouts", + img: financeIcon, + title: "Выплаты и
финансы", + description: "У вас подтвержден
статус самозанятого" + }, { path: "profile/settings", img: settingIcon, - title: "Настройки профиля", + title: "Настройки
профиля", description: "Перейдите чтобы начать
редактирование" + }, + { + path: "profile/calendar", + img: reportsIcon, + title: "Ваша
отчетность", + description: "Отработанных в этом месяце часов" } ], partner: [