Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Incorrect Icon in Patient nav bar | Facility switcher hovering and some minor fixes #10080

Merged
merged 10 commits into from
Jan 24, 2025
2 changes: 1 addition & 1 deletion src/components/ui/dropdown-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const DropdownMenuItem = React.forwardRef<
<DropdownMenuPrimitive.Item
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-gray-100 focus:text-gray-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0 dark:focus:bg-gray-800 dark:focus:text-gray-50",
"relative flex cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-gray-100 focus:text-gray-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0 dark:focus:bg-gray-800 dark:focus:text-gray-50",
inset && "pl-8",
className,
)}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/sidebar/facility-switcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export function FacilitySwitcher({
className={cn(
"gap-2 p-2",
facility.name === selectedFacility?.name &&
"bg-primary-500 text-white",
"bg-primary-500 text-white focus:bg-primary-600 focus:text-white",
)}
>
<div className="flex size-6 items-center justify-center rounded-sm border">
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/sidebar/organization-switcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function OrganizationSwitcher({
className={cn(
"gap-2 p-2",
org?.name === selectedOrganization?.name &&
"bg-primary-500 text-white",
"bg-primary-500 text-white focus:bg-primary-600 focus:text-white",
)}
>
{org.name}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ui/sidebar/patient-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ function generatePatientLinks(
}

return [
{ name: t("appointments"), url: "/patient/home", icon: "d-patient" },
{ name: t("appointments"), url: "/patient/home", icon: "d-calendar" },
{
name: t("nearby_facilities"),
url: `/nearby_facilities/?${queryParams.toString()}`,
icon: "d-patient",
icon: "d-hospital",
},
];
}
Expand Down
4 changes: 3 additions & 1 deletion src/pages/Patient/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ function PatientIndex() {
? "secondary"
: status === "booked"
? "primary"
: "default"
: status === "cancelled"
? "destructive"
: "default"
}
>
{t(status)}
Expand Down
Loading