Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …

…enhanced-resource-page
ohcnetwork · Jan 10, 2025 · 5ed698b · 5ed698b
2 parents 09429b2 + 35c89cb
commit 5ed698b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/components/Facility/EncounterCard.tsx b/src/components/Facility/EncounterCard.tsx
@@ -21,7 +21,7 @@ export const EncounterCard = (props: EncounterCardProps) => {
   const { encounter } = props;
   return (
     <>
-      <div className="pb-16 block relative cursor-pointer border-l-2 px-4 border-l-secondary-300 hover:border-primary-500 transition-all before:absolute before:-left-[7px] before:top-0 before:w-3 before:aspect-square before:bg-secondary-400 before:rounded-full hover:before:bg-primary-500 before:transition-all">
+      <div className="pb-16 block relative border-l-2 px-4 border-l-secondary-300 hover:border-primary-500 transition-all before:absolute before:-left-[7px] before:top-0 before:w-3 before:aspect-square before:bg-secondary-400 before:rounded-full hover:before:bg-primary-500 before:transition-all">
         <Badge
           variant={
             completedEncounterStatus.includes(encounter.status)

diff --git a/src/components/Patient/PatientDetailsTab/Appointments.tsx b/src/components/Patient/PatientDetailsTab/Appointments.tsx
@@ -38,13 +38,20 @@ export const Appointments = (props: PatientProps) => {
 
   const getStatusBadge = (status: string) => {
     const statusColors: Record<string, string> = {
-      booked: "bg-yellow-100 text-yellow-800",
-      checked_in: "bg-green-100 text-green-800",
-      cancelled: "bg-red-100 text-red-800",
+      booked:
+        "bg-yellow-100 text-yellow-800 hover:bg-yellow-200 hover:text-yellow-900",
+      checked_in:
+        "bg-green-100 text-green-800 hover:bg-green-200 hover:text-green-900",
+      cancelled: "bg-red-100 text-red-800 hover:bg-red-200 hover:text-red-900",
     };
 
     return (
-      <Badge className={statusColors[status] || "bg-gray-100 text-gray-800"}>
+      <Badge
+        className={
+          statusColors[status] ||
+          "bg-gray-100 text-gray-800 hover:bg-gray-200 hover:text-gray-900"
+        }
+      >
         {status.replace("_", " ").toUpperCase()}
       </Badge>
     );