requested changes done

ohcnetwork · Jan 16, 2025 · d8fec9c · d8fec9c
1 parent ffe1c8a
commit d8fec9c
Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/src/components/Common/Avatar.tsx b/src/components/Common/Avatar.tsx
@@ -57,7 +57,7 @@ const Avatar = React.forwardRef<
   return (
     <AvatarPrimitive.Root
       ref={ref}
-      className={cn("w-full h-full", className)}
+      className={cn(className, "flex items-center justify-center")}
       style={{
         background: bgColor,
       }}
@@ -66,15 +66,15 @@ const Avatar = React.forwardRef<
         <AvatarPrimitive.Image
           src={imageUrl}
           alt={name}
-          className="aspect-square h-full w-full object-cover"
+          className="aspect-square object-cover"
         />
       ) : (
         <AvatarPrimitive.Fallback className="flex h-full w-full select-none items-center justify-center text-center">
           <svg
             xmlns="http://www.w3.org/2000/svg"
             version="1.1"
             viewBox="0 0 100 100"
-            className="aspect-square h-full w-full object-cover"
+            className="aspect-square object-cover"
           >
             <text
               fill={textColor}

diff --git a/src/components/Facility/CreateFacilityForm.tsx b/src/components/Facility/CreateFacilityForm.tsx
@@ -218,7 +218,6 @@ export default function CreateFacilityForm({
                     {...field}
                     data-cy="facility-description"
                     placeholder="Describe your facility (Markdown supported)"
-                    className="h-24"
                   />
                 </FormControl>
                 <FormMessage />
@@ -305,7 +304,6 @@ export default function CreateFacilityForm({
                     {...field}
                     data-cy="facility-address"
                     placeholder="Enter complete address"
-                    className="h-20"
                   />
                 </FormControl>
                 <FormMessage />

diff --git a/src/components/ui/sidebar/facility-switcher.tsx b/src/components/ui/sidebar/facility-switcher.tsx
@@ -3,6 +3,8 @@ import { Hospital } from "lucide-react";
 import { navigate } from "raviger";
 import { useTranslation } from "react-i18next";
 
+import { cn } from "@/lib/utils";
+
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -72,11 +74,10 @@ export function FacilitySwitcher({
                     setOpenMobile(false);
                   }
                 }}
-                className={`gap-2 p-2 ${
-                  facility.name === selectedFacility?.name
-                    ? "bg-primary-500 text-white"
-                    : ""
-                }`}
+                className={cn("gap-2 p-2", {
+                  "bg-primary-500 text-white":
+                    facility.name === selectedFacility?.name,
+                })}
               >
                 <div className="flex size-6 items-center justify-center rounded-sm border">
                   <Hospital className="size-4 shrink-0" />

diff --git a/src/components/ui/sidebar/organization-switcher.tsx b/src/components/ui/sidebar/organization-switcher.tsx
@@ -3,6 +3,8 @@ import { Globe } from "lucide-react";
 import { navigate } from "raviger";
 import { useTranslation } from "react-i18next";
 
+import { cn } from "@/lib/utils";
+
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -77,11 +79,10 @@ export function OrganizationSwitcher({
                 setOpenMobile(false);
               }
             }}
-            className={`gap-2 p-2 ${
-              org?.name === selectedOrganization?.name
-                ? "bg-primary-500 text-white"
-                : ""
-            }`}
+            className={cn("gap-2 p-2", {
+              "bg-primary-500 text-white":
+                org?.name === selectedOrganization?.name,
+            })}
           >
             {org.name}
           </DropdownMenuItem>

diff --git a/src/pages/Encounters/tabs/EncounterNotesTab.tsx b/src/pages/Encounters/tabs/EncounterNotesTab.tsx
@@ -153,11 +153,11 @@ const MessageItem = ({ message }: { message: Message }) => {
         <TooltipProvider>
           <Tooltip>
             <TooltipTrigger asChild>
-              <div className="flex-shrink-0 w-8 h-8 bg-secondary-300 rounded-full">
+              <div className="flex-shrink-0">
                 <Avatar
                   name={message.created_by.username}
                   imageUrl={message.created_by.profile_picture_url}
-                  className="object-cover"
+                  className="w-8 h-8 rounded-full object-cover"
                 />
               </div>
             </TooltipTrigger>