Skip to content

Commit e8a0bd5

Browse files
committed
feat(dashboard): add clock icon to status badge for improved visual indication of user status
1 parent 7b530ab commit e8a0bd5

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

dashboard/src/components/users/data-table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const ExpandedRowContent = memo(({ row }: { row: { original: UserResponse } }) =
3131
</div>
3232
</div>
3333
<div className="flex flex-col gap-1.5">
34-
<StatusBadge showOnlyExpiry expiryDate={row.original.expire} status={row.original.status} showExpiry />
34+
{row.original.expire && <StatusBadge showOnlyExpiry expiryDate={row.original.expire} status={row.original.status} showExpiry />}
3535
<div className="flex items-center gap-x-1">
3636
<span className="flex items-center gap-x-0.5">
3737
<Rss className="h-3 w-3 text-muted-foreground" />

dashboard/src/components/users/status-badge.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import useDirDetection from '@/hooks/use-dir-detection'
44
import { cn } from '@/lib/utils'
55
import { UserStatus } from '@/service/api'
66
import { useRelativeExpiryDate } from '@/utils/dateFormatter'
7+
import { Clock } from 'lucide-react'
78
import { FC } from 'react'
89
import { useTranslation } from 'react-i18next'
910

@@ -40,9 +41,13 @@ export const StatusBadge: FC<UserStatusProps> = ({ expiryDate = null, status: us
4041
<div className={cn('flex flex-wrap justify-start gap-x-2')}>
4142
<div className={cn(!dateInfo.time && !dateInfo.status && 'hidden', showExpiry ? 'block' : 'hidden md:block')}>
4243
<div>
43-
<span className={cn('inline-block text-xs font-medium', dir === 'rtl' ? 'mr-0.5 md:mr-2' : 'ml-0.5 md:ml-2', 'text-gray-600 dark:text-gray-400')}>
44-
{t(dateInfo.status, { time: dateInfo.time })}
45-
</span>
44+
<div className="flex items-center gap-x-1 text-muted-foreground">
45+
<Clock className="h-3 w-3" />
46+
<span className="text-sm">:</span>
47+
<span className={cn('text-xs font-medium', dir === 'rtl' ? 'mr-0.5 md:mr-2' : 'ml-0.5 md:ml-2', 'text-gray-600 dark:text-gray-400')}>
48+
{t(dateInfo.status, { time: dateInfo.time })}
49+
</span>
50+
</div>
4651
</div>
4752
</div>
4853
</div>

0 commit comments

Comments
 (0)