From 6171445450bf532419c7c072949924e38cadd202 Mon Sep 17 00:00:00 2001 From: nikhila Date: Thu, 23 Jan 2025 10:53:18 +0000 Subject: [PATCH 1/4] Resolved the unwanted hover effect and the text colour remains constant --- .../components/AppointmentSlotPicker.tsx | 16 +++++++++------- src/pages/PublicAppointments/Schedule.tsx | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/pages/Appointments/components/AppointmentSlotPicker.tsx b/src/pages/Appointments/components/AppointmentSlotPicker.tsx index b2c4c5bfbaf..a1abc0efb5e 100644 --- a/src/pages/Appointments/components/AppointmentSlotPicker.tsx +++ b/src/pages/Appointments/components/AppointmentSlotPicker.tsx @@ -212,13 +212,15 @@ export function AppointmentSlotPicker({ = 1 - ? "text-gray-400" - : percentage >= 0.8 - ? "text-red-600" - : percentage >= 0.6 - ? "text-yellow-600" - : "text-green-600", + selectedSlotId === slot.id + ? "text-white" + : percentage >= 1 + ? "text-gray-400" + : percentage >= 0.8 + ? "text-red-600" + : percentage >= 0.6 + ? "text-yellow-600" + : "text-green-600", )} > {availability.tokens_per_slot - slot.allocated}{" "} diff --git a/src/pages/PublicAppointments/Schedule.tsx b/src/pages/PublicAppointments/Schedule.tsx index f021baa0c3c..61dab8c7633 100644 --- a/src/pages/PublicAppointments/Schedule.tsx +++ b/src/pages/PublicAppointments/Schedule.tsx @@ -331,13 +331,15 @@ export function ScheduleAppointment(props: AppointmentsProps) { = 1 - ? "text-gray-400" - : percentage >= 0.8 - ? "text-red-600" - : percentage >= 0.6 - ? "text-yellow-600" - : "text-green-600", + selectedSlot?.id === slot.id + ? "text-white" + : percentage >= 1 + ? "text-gray-400" + : percentage >= 0.8 + ? "text-red-600" + : percentage >= 0.6 + ? "text-yellow-600" + : "text-green-600", )} > {availability.tokens_per_slot - From 1f3333584ec907d247bc86e7eb255eb02525ee69 Mon Sep 17 00:00:00 2001 From: nikhila Date: Thu, 23 Jan 2025 11:26:29 +0000 Subject: [PATCH 2/4] Changed the logic --- .../components/AppointmentSlotPicker.tsx | 17 ++++++++--------- src/pages/PublicAppointments/Schedule.tsx | 15 ++++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/Appointments/components/AppointmentSlotPicker.tsx b/src/pages/Appointments/components/AppointmentSlotPicker.tsx index a1abc0efb5e..1fef92362bb 100644 --- a/src/pages/Appointments/components/AppointmentSlotPicker.tsx +++ b/src/pages/Appointments/components/AppointmentSlotPicker.tsx @@ -212,15 +212,14 @@ export function AppointmentSlotPicker({ = 1 - ? "text-gray-400" - : percentage >= 0.8 - ? "text-red-600" - : percentage >= 0.6 - ? "text-yellow-600" - : "text-green-600", + percentage >= 1 + ? "text-gray-400" + : percentage >= 0.8 + ? "text-red-600" + : percentage >= 0.6 + ? "text-yellow-600" + : "text-green-600", + selectedSlotId === slot.id ? "text-white" : "", )} > {availability.tokens_per_slot - slot.allocated}{" "} diff --git a/src/pages/PublicAppointments/Schedule.tsx b/src/pages/PublicAppointments/Schedule.tsx index 61dab8c7633..f144852a240 100644 --- a/src/pages/PublicAppointments/Schedule.tsx +++ b/src/pages/PublicAppointments/Schedule.tsx @@ -331,15 +331,16 @@ export function ScheduleAppointment(props: AppointmentsProps) { = 1 + ? "text-gray-400" + : percentage >= 0.8 + ? "text-red-600" + : percentage >= 0.6 + ? "text-yellow-600" + : "text-green-600", selectedSlot?.id === slot.id ? "text-white" - : percentage >= 1 - ? "text-gray-400" - : percentage >= 0.8 - ? "text-red-600" - : percentage >= 0.6 - ? "text-yellow-600" - : "text-green-600", + : "", )} > {availability.tokens_per_slot - From 6c1e5065a15a76abc4fb53d62e6f0b8f2b638b5d Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Thu, 23 Jan 2025 16:59:38 +0530 Subject: [PATCH 3/4] Apply suggestions from code review --- src/pages/Appointments/components/AppointmentSlotPicker.tsx | 2 +- src/pages/PublicAppointments/Schedule.tsx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/Appointments/components/AppointmentSlotPicker.tsx b/src/pages/Appointments/components/AppointmentSlotPicker.tsx index 1fef92362bb..439c3f2e8c4 100644 --- a/src/pages/Appointments/components/AppointmentSlotPicker.tsx +++ b/src/pages/Appointments/components/AppointmentSlotPicker.tsx @@ -219,7 +219,7 @@ export function AppointmentSlotPicker({ : percentage >= 0.6 ? "text-yellow-600" : "text-green-600", - selectedSlotId === slot.id ? "text-white" : "", + selectedSlotId === slot.id && "text-white", )} > {availability.tokens_per_slot - slot.allocated}{" "} diff --git a/src/pages/PublicAppointments/Schedule.tsx b/src/pages/PublicAppointments/Schedule.tsx index f144852a240..56b0d620467 100644 --- a/src/pages/PublicAppointments/Schedule.tsx +++ b/src/pages/PublicAppointments/Schedule.tsx @@ -338,9 +338,7 @@ export function ScheduleAppointment(props: AppointmentsProps) { : percentage >= 0.6 ? "text-yellow-600" : "text-green-600", - selectedSlot?.id === slot.id - ? "text-white" - : "", + selectedSlotId === slot.id && "text-white", )} > {availability.tokens_per_slot - From c309bcb1190407b39f5d237d24c9c8a3f170dac0 Mon Sep 17 00:00:00 2001 From: rithviknishad Date: Thu, 23 Jan 2025 17:02:58 +0530 Subject: [PATCH 4/4] fix lint --- src/pages/PublicAppointments/Schedule.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/PublicAppointments/Schedule.tsx b/src/pages/PublicAppointments/Schedule.tsx index 56b0d620467..76bc3433e55 100644 --- a/src/pages/PublicAppointments/Schedule.tsx +++ b/src/pages/PublicAppointments/Schedule.tsx @@ -338,7 +338,8 @@ export function ScheduleAppointment(props: AppointmentsProps) { : percentage >= 0.6 ? "text-yellow-600" : "text-green-600", - selectedSlotId === slot.id && "text-white", + selectedSlot?.id === slot.id && + "text-white", )} > {availability.tokens_per_slot -