Merge commit '90d13fe3422986427b6727428e7401e8880c25a0'

This commit is contained in:
Ardeman 2025-03-04 07:06:45 +08:00
commit c20022f58c

View File

@ -2,6 +2,7 @@ import { Button, Popover, PopoverButton, PopoverPanel } from '@headlessui/react'
import { Link, useFetcher, useRouteLoaderData } from 'react-router' import { Link, useFetcher, useRouteLoaderData } from 'react-router'
import { ChevronIcon } from '~/components/icons/chevron' import { ChevronIcon } from '~/components/icons/chevron'
import { ProfileIcon } from '~/components/icons/profile'
import { APP } from '~/configs/meta' import { APP } from '~/configs/meta'
import type { loader } from '~/routes/_admin.lg-admin' import type { loader } from '~/routes/_admin.lg-admin'
@ -26,11 +27,16 @@ export const Navbar = () => {
<Popover className="relative"> <Popover className="relative">
<PopoverButton className="flex w-3xs cursor-pointer items-center justify-between focus:outline-none"> <PopoverButton className="flex w-3xs cursor-pointer items-center justify-between focus:outline-none">
<div className="flex items-center"> <div className="flex items-center">
<img {staffData?.profile_picture === '' ? (
src={staffData?.profile_picture} <ProfileIcon className="mr-3 h-8 w-8 rounded-full bg-[#C4C4C4]" />
alt={staffData?.name} ) : (
className="mr-3 h-8 w-8 rounded-full bg-[#C4C4C4] object-cover" <img
/> src={staffData?.profile_picture}
alt={staffData?.name}
className="mr-3 h-8 w-8 rounded-full bg-[#C4C4C4] object-cover"
/>
)}
<span className="text-xs">{staffData?.name}</span> <span className="text-xs">{staffData?.name}</span>
</div> </div>
<ChevronIcon className="opacity-50" /> <ChevronIcon className="opacity-50" />