diff --git a/client/src/components/Button.tsx b/client/src/components/Button.tsx index ea1de92..5329fa8 100644 --- a/client/src/components/Button.tsx +++ b/client/src/components/Button.tsx @@ -2,7 +2,7 @@ import SpinnerIcon from "./icons/SpinnerIcon"; interface ButtonProps { type?: "button" | "reset" | "submit"; - color?: "primary" | "secondary"; + color?: "primary" | "secondary" | "tertiary"; size?: "small" | "medium"; disabled?: boolean; loading?: boolean; @@ -33,7 +33,9 @@ function Button({ className={`relative outline-none rounded-lg transition-colors font-semibold flex justify-center items-center gap-1 active:bg-[#49A1F5] disabled:bg-[#F2F2F2] disabled:text-[#CCCCCC] ${ (color === "primary" && "bg-[#49A1F5] text-white hover:bg-[#4190DB]") || (color === "secondary" && - "bg-[#F0F1F2] text-[#77828C] active:text-white") + "bg-[#F0F1F2] text-[#77828C] hover:bg-[#E6ECF2] active:text-white") || + (color === "tertiary" && + "text-[#77828C] hover:bg-[#E6ECF2] active:text-white") } ${ (size === "small" && `h-8 ${ diff --git a/client/src/components/SelectUser.tsx b/client/src/components/SelectUser.tsx index 264df01..b1bac67 100644 --- a/client/src/components/SelectUser.tsx +++ b/client/src/components/SelectUser.tsx @@ -26,8 +26,7 @@ function SelectUser({ {(state) => (
Предварительный просмотр
- {format(scheduleStartDate, "dd.MM.yyyy")} + {format(startDate, "dd.MM.yyyy")} - - {format(scheduleEndDate, "dd.MM.yyyy")} + {format(endDate, "dd.MM.yyyy")}
)}- Количество сеансов + Общее кол-во сеансов
-{sessionsCount}
+{sessionCount}
Длительность сеанса
-{selectedSessionDuration} мин.
+{sessionDuration} мин.
Между сеансами
-{selectedSessionsBreak} мин.
+{sessionBreak} мин.
Время работы
- {selectedWorkTimeStart} - {selectedWorkTimeEnd} + {startTime} - {endTime}
Расписание
- + {schedules?.map((schedule) => ( ++ + {format(parseISO(schedule.startDate), "dd.MM.yyyy")} + + - + + {format(parseISO(schedule.endDate), "dd.MM.yyyy")} + +
+ ++ Общее кол-во сеансов +
+{schedule.sessionCount}
++ Длительность сеанса +
+{schedule.sessionDuration} мин.
+Между сеансами
+{schedule.sessionBreak} мин.
+Время работы
++ {schedule.startTime} - {schedule.endTime} +
+Менеджеры
+ +{manager.name}
+