From f76e44895136e9912ee550c5aae2defad6bf1058 Mon Sep 17 00:00:00 2001 From: kirill boyko Date: Tue, 19 Mar 2024 16:45:30 +0300 Subject: [PATCH 1/3] commuit --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 5818c71a..dfeb3e82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "guild_front", + "name": "itguild.info", "version": "0.1.0", "lockfileVersion": 3, "requires": true, From 140d4689feedb650c22cd1d3a3e5f063c4229bf5 Mon Sep 17 00:00:00 2001 From: Victor Batischev Date: Tue, 2 Apr 2024 18:29:03 +0300 Subject: [PATCH 2/3] fix project cards --- src/components/ProjectTicket/ProjectTicket.jsx | 11 +++-------- src/components/ProjectTicket/projectTicket.scss | 4 ++-- src/pages/Tracker/tracker.scss | 7 +++++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/components/ProjectTicket/ProjectTicket.jsx b/src/components/ProjectTicket/ProjectTicket.jsx index 1f12be5e..cbf05132 100644 --- a/src/components/ProjectTicket/ProjectTicket.jsx +++ b/src/components/ProjectTicket/ProjectTicket.jsx @@ -108,17 +108,12 @@ export const ProjectTicket = ({ project, index }) => { - {/* Посмотреть статистику - */} - - {}}> - Просмотреть
- статистику проекта -
+ Date: Tue, 2 Apr 2024 18:29:29 +0300 Subject: [PATCH 3/3] fix --- .../ProfileCalendar/ProfileCalendarComponent.jsx | 8 ++++---- src/components/ProjectTicket/ProjectTicket.jsx | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 0ccc2649..ed947e10 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo( ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : activePeriod - ? "Выберите диапазон на календаре" - : "Выбрать диапазон"} + ? "Выберите диапазон на календаре" + : "Выбрать диапазон"} {totalRangeHours ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` : endDate - ? "0 часов" - : ""} + ? "0 часов" + : ""} {endDate && ( { - + Посмотреть статистику