Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

fix: add delay for AvatarFallback (#1631)

rozhko_ya678070202c6
diff --git a/apps/aot/src/app/events/[year]/[day]/_components/comments/comment.tsx b/apps/aot/src/app/events/[year]/[day]/_components/comments/comment.tsx
index 47878a39..096c437d 100644
--- a/apps/aot/src/app/events/[year]/[day]/_components/comments/comment.tsx
+++ b/apps/aot/src/app/events/[year]/[day]/_components/comments/comment.tsx
@@ -2,11 +2,11 @@
import { useSession } from '@repo/auth/react';
import { type CommentRoot } from '@repo/db/types';
-import { Avatar, AvatarFallback, AvatarImage } from '@repo/ui/components/avatar';
import { Button } from '@repo/ui/components/button';
import { Markdown } from '@repo/ui/components/markdown';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import { toast } from '@repo/ui/components/use-toast';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
import {
Calendar,
ChevronDown,
@@ -24,7 +24,6 @@ import { useEffect, useRef, useState } from 'react';
import { z } from 'zod';
import { ReportDialog } from '~/components/report-dialog';
import { isAdminOrModerator } from '~/utils/auth-guards';
-import { DefaultAvatar } from '~/utils/default-avatar';
import { getRelativeTimeStrict } from '~/utils/relativeTime';
import type { SolutionRouteData } from '../../solutions/[solutionId]/getSolutionIdRouteData';
import type { Challenge } from '../types';
@@ -272,12 +271,7 @@ function SingleComment({
<div className="flex items-start justify-between gap-4 pr-[0.4rem]">
<div className="mb-2 flex w-full items-center justify-between gap-1">
<div className="flex items-center gap-2">
- <Avatar className="h-7 w-7">
- <AvatarImage alt="github profile picture" src={comment.user?.image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar src={comment.user?.image ?? ''} />
<UserBadge
user={{
name: comment.user?.name ?? '',
diff --git a/apps/aot/src/app/events/[year]/[day]/_components/comments/enhanced-user-badge.tsx b/apps/aot/src/app/events/[year]/[day]/_components/comments/enhanced-user-badge.tsx
index bd92f6dd..ae2698ad 100644
--- a/apps/aot/src/app/events/[year]/[day]/_components/comments/enhanced-user-badge.tsx
+++ b/apps/aot/src/app/events/[year]/[day]/_components/comments/enhanced-user-badge.tsx
@@ -1,22 +1,21 @@
'use client';
-import { Avatar, AvatarFallback, AvatarImage } from '@repo/ui/components/avatar';
-import Link from 'next/link';
-import { Badge } from '@repo/ui/components/badge';
-import { Shield, Sword, Wand2, type LucideIcon } from '@repo/ui/icons';
-import { useQuery } from '@tanstack/react-query';
-import { getProfileData } from './enhanced-user-badge.getProfileData';
-import { useState } from 'react';
-import { cn } from '@repo/ui/cn';
import { type Role } from '@repo/db/types';
+import { cn } from '@repo/ui/cn';
+import { Badge } from '@repo/ui/components/badge';
import { Button } from '@repo/ui/components/button';
import { HoverCard, HoverCardContent, HoverCardTrigger } from '@repo/ui/components/hover-card';
-import { getTitles, type TitleInfo } from './enhanced-user-badge.getTitles';
import { Skeleton } from '@repo/ui/components/skeleton';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
-import { DefaultAvatar } from '~/utils/default-avatar';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
+import { Shield, Sword, Wand2, type LucideIcon } from '@repo/ui/icons';
+import { useQuery } from '@tanstack/react-query';
+import Link from 'next/link';
+import { useState } from 'react';
import type { BadgeInfo } from '~/components/_actions';
import { SlugToBadgeIcon } from '~/components/badges';
+import { getProfileData } from './enhanced-user-badge.getProfileData';
+import { getTitles, type TitleInfo } from './enhanced-user-badge.getTitles';
interface UserBadgeProps {
user: {
@@ -74,12 +73,7 @@ export function UserBadge(props: UserBadgeProps) {
<div className="flex flex-row space-x-2">
<div className="flex min-w-20 flex-col items-center justify-center space-y-2">
<div className={cn('w-min rounded-full bg-gradient-to-r p-0.5', gradient)}>
- <Avatar className="h-14 w-14">
- <AvatarImage src={query.data.image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar className="h-14 w-14" src={query.data.image ?? ''} />
</div>
{query.isRefetching ? (
@@ -134,12 +128,7 @@ export function UserBadge(props: UserBadgeProps) {
<div className="flex flex-row space-x-2">
<div className="flex min-w-20 flex-col items-center justify-center space-y-2">
<div className={cn('w-min rounded-full bg-gradient-to-r p-0.5', gradient)}>
- <Avatar className="h-14 w-14">
- <AvatarImage src={query.data.image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar className="h-14 w-14" src={query.data.image ?? ''} />
</div>
{query.isRefetching ? (
diff --git a/apps/aot/src/app/events/[year]/[day]/solutions/_components/solution-detail.tsx b/apps/aot/src/app/events/[year]/[day]/solutions/_components/solution-detail.tsx
index fde7ddeb..dc09d26d 100644
--- a/apps/aot/src/app/events/[year]/[day]/solutions/_components/solution-detail.tsx
+++ b/apps/aot/src/app/events/[year]/[day]/solutions/_components/solution-detail.tsx
@@ -2,30 +2,29 @@
import { useSession } from '@repo/auth/react';
import { ActionMenu } from '@repo/ui/components/action-menu';
-import { Avatar, AvatarFallback, AvatarImage } from '@repo/ui/components/avatar';
import { Button } from '@repo/ui/components/button';
import { Markdown } from '@repo/ui/components/markdown';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import { TypographyLarge } from '@repo/ui/components/typography/large';
import { toast } from '@repo/ui/components/use-toast';
-import { Calendar, Flag, Pin, Share, Trash, ArrowLeft, Pencil } from '@repo/ui/icons';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
+import { ArrowLeft, Calendar, Flag, Pencil, Pin, Share, Trash } from '@repo/ui/icons';
+import { useQueryClient } from '@tanstack/react-query';
import clsx from 'clsx';
import Link from 'next/link';
-import { getRelativeTimeStrict } from '~/utils/relativeTime';
-import { pinOrUnpinSolution } from './_actions';
-import { isAdminOrModerator, isAuthor } from '~/utils/auth-guards';
-import { SolutionDeleteDialog } from './delete';
import { useParams } from 'next/navigation';
import { useState } from 'react';
-import { EditSolution } from './edit-solution';
-import { useGetQueryString } from './useGetQueryString';
-import { useQueryClient } from '@tanstack/react-query';
-import type { ChallengeSolution } from '../[solutionId]/page';
-import { DefaultAvatar } from '~/utils/default-avatar';
import { ReportDialog } from '~/components/report-dialog';
+import { isAdminOrModerator, isAuthor } from '~/utils/auth-guards';
+import { getAotSlug } from '~/utils/getAotSlug';
+import { getRelativeTimeStrict } from '~/utils/relativeTime';
import { UserBadge } from '../../_components/comments/enhanced-user-badge';
import { Vote } from '../../_components/vote';
-import { getAotSlug } from '~/utils/getAotSlug';
+import type { ChallengeSolution } from '../[solutionId]/page';
+import { pinOrUnpinSolution } from './_actions';
+import { SolutionDeleteDialog } from './delete';
+import { EditSolution } from './edit-solution';
+import { useGetQueryString } from './useGetQueryString';
interface Props {
solution: ChallengeSolution;
@@ -68,12 +67,7 @@ export function SolutionDetails({ solution }: Props) {
</div>
</Link>
<div className="flex items-center gap-2">
- <Avatar className="h-7 w-7">
- <AvatarImage alt="github profile picture" src={solution.user?.image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar src={solution.user?.image ?? ''} />
<TypographyLarge>{solution.title}</TypographyLarge>
</div>
<div className="flex items-center gap-2">
diff --git a/apps/aot/src/app/events/[year]/leaderboard/_components/columns.tsx b/apps/aot/src/app/events/[year]/leaderboard/_components/columns.tsx
index 16b6a2fc..31c49238 100644
--- a/apps/aot/src/app/events/[year]/leaderboard/_components/columns.tsx
+++ b/apps/aot/src/app/events/[year]/leaderboard/_components/columns.tsx
@@ -1,7 +1,7 @@
'use client';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
import { createColumnHelper } from '@tanstack/react-table';
-import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from '@repo/ui/components/avatar';
/*
* Overall Leaderboard Table Columns
@@ -25,12 +25,7 @@ export const overallLeaderboardColumns = [
header: 'User',
cell: (info) => (
<div className="flex flex-wrap items-center justify-start gap-2 sm:gap-4">
- <Avatar className="h-8 w-8 md:h-12 md:w-12">
- <AvatarImage alt="github profile picture" src={info.row.original.image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar className="h-8 w-8 md:h-12 md:w-12" src={info.row.original.image ?? ''} />
<span>@{info.getValue()}</span>
</div>
),
@@ -62,12 +57,7 @@ export const dailyLeaderboardColumns = [
header: 'User',
cell: (info) => (
<div className="flex flex-wrap items-center justify-start gap-2 sm:gap-4">
- <Avatar className="h-8 w-8 md:h-12 md:w-12">
- <AvatarImage alt="github profile picture" src={info.getValue().image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar className="h-8 w-8 md:h-12 md:w-12" src={info.getValue().image ?? ''} />
<span>@{info.getValue().name}</span>
</div>
),
diff --git a/apps/aot/src/components/mention/user-results.tsx b/apps/aot/src/components/mention/user-results.tsx
index 634370e4..36608ec9 100644
--- a/apps/aot/src/components/mention/user-results.tsx
+++ b/apps/aot/src/components/mention/user-results.tsx
@@ -1,14 +1,13 @@
'use client';
import { cn } from '@repo/ui/cn';
-import { Avatar, AvatarFallback, AvatarImage } from '@repo/ui/components/avatar';
import { Popover, PopoverAnchor, PopoverContent } from '@repo/ui/components/popover';
+import { useToast } from '@repo/ui/components/use-toast';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
import { useQuery } from '@tanstack/react-query';
import { useEffect, useRef, useState } from 'react';
-import { searchUsers } from './actions';
-import { useToast } from '@repo/ui/components/use-toast';
import { Loader } from '../loader';
-import { DefaultAvatar } from '~/utils/default-avatar';
+import { searchUsers } from './actions';
interface Props {
isOpen: boolean;
@@ -134,12 +133,10 @@ export function UserResults({ isOpen, onFocusOutside, onSelectedUser, query }: P
'flex w-full cursor-pointer justify-start gap-3 rounded-none px-4 py-3 hover:bg-zinc-400/50 dark:hover:bg-zinc-600/50',
)}
>
- <Avatar className="h-10 w-10 border border-gray-500 dark:border-gray-700">
- <AvatarImage src={user.image ?? ''} alt="user avatar" />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar
+ className="h-10 w-10 border border-gray-500 dark:border-gray-700"
+ src={user.image ?? ''}
+ />
<div className="flex flex-col">
<span className="text-sm font-bold text-gray-900 dark:text-white">
{user.name}
diff --git a/apps/aot/src/components/navigation/index.tsx b/apps/aot/src/components/navigation/index.tsx
index b9494e5a..587228c9 100644
--- a/apps/aot/src/components/navigation/index.tsx
+++ b/apps/aot/src/components/navigation/index.tsx
@@ -1,11 +1,11 @@
import type { Session } from '@repo/auth/server';
-import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from '@repo/ui/components/avatar';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@repo/ui/components/dropdown-menu';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
import { Palette } from '@repo/ui/icons';
import Link from 'next/link';
import { auth } from '~/server/auth';
@@ -93,12 +93,7 @@ async function LoginButton({ session }: { session: Session | null }) {
aria-label="profile button"
className="hidden rounded-lg p-2 duration-300 focus:outline-none focus-visible:ring-2 md:block"
>
- <Avatar className="h-7 w-7">
- <AvatarImage src={session.user.image ?? ''} alt="user avatar" />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar src={session.user.image ?? ''} />
</button>
</DropdownMenuTrigger>
<DropdownMenuContent
diff --git a/apps/web/src/app/(profile)/[username]/page.tsx b/apps/web/src/app/(profile)/[username]/page.tsx
index 4070352a..1edb8b8c 100644
--- a/apps/web/src/app/(profile)/[username]/page.tsx
+++ b/apps/web/src/app/(profile)/[username]/page.tsx
@@ -1,26 +1,26 @@
import { prisma } from '@repo/db';
-import { notFound } from 'next/navigation';
-import { ProgressChart } from './_components/progress-chart';
-import { SharedSolutionCard } from './_components/shared-solution-card';
+import { cn } from '@repo/ui/cn';
import { Button } from '@repo/ui/components/button';
+import { CardContent, CardHeader } from '@repo/ui/components/card';
+import { MagicIcon } from '@repo/ui/components/magic-icon';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
import { ArrowUpRight, UserPen } from '@repo/ui/icons';
import Link from 'next/link';
-import { ActivityChart } from './_components/activity-chart';
-import { cn } from '@repo/ui/cn';
-import { Avatar, AvatarImage, AvatarFallback } from '@repo/ui/components/avatar';
+import { notFound } from 'next/navigation';
import { Titles } from '~/app/challenge/_components/comments/enhanced-user-badge';
import {
- getTitles,
getGradient,
+ getTitles,
} from '~/app/challenge/_components/comments/enhanced-user-badge.getTitles';
+import { auth } from '~/server/auth';
import { getRelativeTime } from '~/utils/relativeTime';
-import { CardContent, CardHeader } from '@repo/ui/components/card';
+import { ActivityChart } from './_components/activity-chart';
import { Badges, EmptyBadge } from './_components/badges';
import { CardWithRadialBg } from './_components/card-radial-bg';
import { MovingGrid } from './_components/moving-grid';
+import { ProgressChart } from './_components/progress-chart';
+import { SharedSolutionCard } from './_components/shared-solution-card';
import { getBadges, getProgressData, getUserActivity } from './user-info';
-import { auth } from '~/server/auth';
-import { MagicIcon } from '@repo/ui/components/magic-icon';
/* const sampleBadgeData = [
{ slug: 'aot-2023-bronze', name: 'Advent of TypeScript 2023 Bronze' },
@@ -86,12 +86,10 @@ export default async function ProfilePage(props: { params: { username: string }
{/* MobileView */}
<div className="flex flex-col space-y-6 lg:hidden">
<div className="flex flex-col items-center space-y-2">
- <Avatar className="h-56 w-56 rounded-lg transition group-hover:-translate-x-1 group-hover:-translate-y-1 group-hover:-rotate-1">
- <AvatarImage src={user.image ?? ''} alt={`${user.name} profile picture`} />
- <AvatarFallback className="rounded-lg capitalize">
- {user.name.slice(0, 1)}
- </AvatarFallback>
- </Avatar>
+ <UserAvatar
+ className="h-56 w-56 rounded-lg transition group-hover:-translate-x-1 group-hover:-translate-y-1 group-hover:-rotate-1"
+ src={user.image ?? ''}
+ />
<div className="flex flex-col items-center space-y-1">
<h1
className={cn(
@@ -154,12 +152,10 @@ export default async function ProfilePage(props: { params: { username: string }
<div className="relative flex flex-row flex-wrap items-start justify-between">
<div className="flex h-full max-w-full flex-col justify-center space-y-3 lg:max-w-[50%]">
<div className="flex flex-row items-end space-x-4">
- <Avatar className="z-10 h-56 w-56 rounded-lg transition group-hover:-translate-x-1 group-hover:-translate-y-1 group-hover:-rotate-1">
- <AvatarImage src={user.image ?? ''} alt={`${user.name} profile picture`} />
- <AvatarFallback className="rounded-lg capitalize">
- {user.name.slice(0, 1)}
- </AvatarFallback>
- </Avatar>
+ <UserAvatar
+ className="z-10 h-56 w-56 rounded-lg transition group-hover:-translate-x-1 group-hover:-translate-y-1 group-hover:-rotate-1"
+ src={user.image ?? ''}
+ />
<div className="ml-56 flex flex-col space-y-2">
<div className="flex flex-row items-baseline space-x-2">
<h1
diff --git a/apps/web/src/app/challenge/[slug]/solutions/_components/solution-detail.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/solution-detail.tsx
index 5c1ba025..5b93858a 100644
--- a/apps/web/src/app/challenge/[slug]/solutions/_components/solution-detail.tsx
+++ b/apps/web/src/app/challenge/[slug]/solutions/_components/solution-detail.tsx
@@ -2,28 +2,28 @@
import { useSession } from '@repo/auth/react';
import { ActionMenu } from '@repo/ui/components/action-menu';
-import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from '@repo/ui/components/avatar';
import { Button } from '@repo/ui/components/button';
import { Markdown } from '@repo/ui/components/markdown';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import { TypographyLarge } from '@repo/ui/components/typography/large';
import { toast } from '@repo/ui/components/use-toast';
-import { Calendar, Flag, Pin, Share, Trash, ArrowLeft, Pencil } from '@repo/ui/icons';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
+import { ArrowLeft, Calendar, Flag, Pencil, Pin, Share, Trash } from '@repo/ui/icons';
+import { useQueryClient } from '@tanstack/react-query';
import clsx from 'clsx';
import Link from 'next/link';
+import { useParams } from 'next/navigation';
+import { useState } from 'react';
import type { ChallengeSolution } from '~/app/challenge/[slug]/solutions/[solutionId]/page';
+import { UserBadge } from '~/app/challenge/_components/comments/enhanced-user-badge';
import { ReportDialog } from '~/components/ReportDialog';
+import { isAdminOrModerator, isAuthor } from '~/utils/auth-guards';
import { getRelativeTimeStrict } from '~/utils/relativeTime';
import { Vote } from '../../../_components/vote';
import { pinOrUnpinSolution } from './_actions';
-import { isAdminOrModerator, isAuthor } from '~/utils/auth-guards';
import { SolutionDeleteDialog } from './delete';
-import { useParams } from 'next/navigation';
-import { useState } from 'react';
import { EditSolution } from './edit-solution';
import { useGetQueryString } from './useGetQueryString';
-import { UserBadge } from '~/app/challenge/_components/comments/enhanced-user-badge';
-import { useQueryClient } from '@tanstack/react-query';
interface Props {
solution: ChallengeSolution;
@@ -65,12 +65,7 @@ export function SolutionDetails({ solution }: Props) {
</div>
</Link>
<div className="flex items-center gap-2">
- <Avatar className="h-7 w-7">
- <AvatarImage alt="github profile picture" src={solution.user?.image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar src={solution.user?.image ?? ''} />
<TypographyLarge>{solution.title}</TypographyLarge>
</div>
<div className="flex items-center gap-2">
diff --git a/apps/web/src/app/challenge/_components/comments/comment.tsx b/apps/web/src/app/challenge/_components/comments/comment.tsx
index f7acf2a3..009a09b6 100644
--- a/apps/web/src/app/challenge/_components/comments/comment.tsx
+++ b/apps/web/src/app/challenge/_components/comments/comment.tsx
@@ -2,38 +2,38 @@
import { useSession } from '@repo/auth/react';
import { type CommentRoot } from '@repo/db/types';
+import { Button } from '@repo/ui/components/button';
import { Markdown } from '@repo/ui/components/markdown';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import { toast } from '@repo/ui/components/use-toast';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
import {
+ Calendar,
ChevronDown,
ChevronUp,
- Calendar,
Flag,
+ MoreHorizontal,
Pencil,
Reply,
Share,
Trash2,
- MoreHorizontal,
} from '@repo/ui/icons';
import clsx from 'clsx';
import { useParams, useSearchParams } from 'next/navigation';
import { useEffect, useRef, useState } from 'react';
import { z } from 'zod';
import { ReportDialog } from '~/components/ReportDialog';
+import { isAdminOrModerator } from '~/utils/auth-guards';
import { getRelativeTimeStrict } from '~/utils/relativeTime';
+import type { ChallengeRouteData } from '../../[slug]/getChallengeRouteData';
+import type { SolutionRouteData } from '../../[slug]/solutions/[solutionId]/getSolutionIdRouteData';
import { Vote } from '../vote';
import { CommentInput } from './comment-input';
-import { CommentDeleteDialog } from './delete';
-import { type PaginatedComments, type PreselectedCommentMetadata } from './getCommentRouteData';
-import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from '@repo/ui/components/avatar';
-import { Button } from '@repo/ui/components/button';
import { CommentSkeleton } from './comment-skeleton';
-import { isAdminOrModerator } from '~/utils/auth-guards';
import { useCommentsReplies } from './comments.hooks';
+import { CommentDeleteDialog } from './delete';
import { UserBadge } from './enhanced-user-badge';
-import type { ChallengeRouteData } from '../../[slug]/getChallengeRouteData';
-import type { SolutionRouteData } from '../../[slug]/solutions/[solutionId]/getSolutionIdRouteData';
+import { type PaginatedComments, type PreselectedCommentMetadata } from './getCommentRouteData';
interface SingleCommentProps {
comment: PaginatedComments['comments'][number];
@@ -271,12 +271,7 @@ function SingleComment({
<div className="flex items-start justify-between gap-4 pr-[0.4rem]">
<div className="mb-2 flex w-full items-center justify-between gap-1">
<div className="flex items-center gap-2">
- <Avatar className="h-7 w-7">
- <AvatarImage alt="github profile picture" src={comment.user?.image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar src={comment.user?.image ?? ''} />
<UserBadge
user={{
name: comment.user?.name ?? '',
diff --git a/apps/web/src/app/challenge/_components/comments/enhanced-user-badge.tsx b/apps/web/src/app/challenge/_components/comments/enhanced-user-badge.tsx
index 318c3190..6efee7d7 100644
--- a/apps/web/src/app/challenge/_components/comments/enhanced-user-badge.tsx
+++ b/apps/web/src/app/challenge/_components/comments/enhanced-user-badge.tsx
@@ -1,21 +1,21 @@
'use client';
-import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from '@repo/ui/components/avatar';
-import Link from 'next/link';
-import { Badge } from '@repo/ui/components/badge';
-import { Shield, Sword, Wand2, type LucideIcon } from '@repo/ui/icons';
-import { useQuery } from '@tanstack/react-query';
-import { getProfileData } from './enhanced-user-badge.getProfileData';
-import { useState } from 'react';
-import { cn } from '@repo/ui/cn';
import { type Role } from '@repo/db/types';
+import { cn } from '@repo/ui/cn';
+import { Badge } from '@repo/ui/components/badge';
import { Button } from '@repo/ui/components/button';
import { HoverCard, HoverCardContent, HoverCardTrigger } from '@repo/ui/components/hover-card';
-import { getGradient, getTitles, type TitleInfo } from './enhanced-user-badge.getTitles';
import { Skeleton } from '@repo/ui/components/skeleton';
-import type { BadgeInfo } from '~/app/(profile)/[username]/user-info';
-import { SlugToBadgeIcon } from '~/app/(profile)/[username]/_components/badges';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
+import { Shield, Sword, Wand2, type LucideIcon } from '@repo/ui/icons';
+import { useQuery } from '@tanstack/react-query';
+import Link from 'next/link';
+import { useState } from 'react';
+import { SlugToBadgeIcon } from '~/app/(profile)/[username]/_components/badges';
+import type { BadgeInfo } from '~/app/(profile)/[username]/user-info';
+import { getProfileData } from './enhanced-user-badge.getProfileData';
+import { getGradient, getTitles, type TitleInfo } from './enhanced-user-badge.getTitles';
interface UserBadgeProps {
user: {
@@ -74,12 +74,7 @@ export function UserBadge(props: UserBadgeProps) {
<div className="flex flex-row space-x-2">
<div className="flex min-w-20 flex-col items-center justify-center space-y-2">
<div className={cn('w-min rounded-full bg-gradient-to-r p-0.5', gradient)}>
- <Avatar className="h-14 w-14">
- <AvatarImage src={query.data.image ?? ''} />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar className="h-14 w-14" src={query.data.image ?? ''} />
</div>
{query.isRefetching ? (
diff --git a/apps/web/src/app/notifications/notfication-item.tsx b/apps/web/src/app/notifications/notfication-item.tsx
index 5c830c45..8753e839 100644
--- a/apps/web/src/app/notifications/notfication-item.tsx
+++ b/apps/web/src/app/notifications/notfication-item.tsx
@@ -1,15 +1,15 @@
'use client';
import type { NotificationType } from '@repo/db/types';
-import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from '@repo/ui/components/avatar';
+import { cn } from '@repo/ui/cn';
import { Markdown } from '@repo/ui/components/markdown';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
import { AlertCircle, AtSign, Heart, MessageCircle, ShieldAlert } from '@repo/ui/icons';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import { useInView } from 'react-intersection-observer';
import { getRelativeTime } from '~/utils/relativeTime';
import type { Notification } from './notification.actions';
-import { cn } from '@repo/ui/cn';
const BLURBS = {
MENTION: 'mentioned you in a comment',
@@ -57,18 +57,7 @@ export function NotificationItem({
)}
>
<div className="flex items-start space-x-4">
- <Avatar className="h-10 w-10">
- {notification.fromUser.image ? (
- <AvatarImage
- src={notification.fromUser.image}
- alt={`${notification.fromUser.name} profile photo`}
- />
- ) : (
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- )}
- </Avatar>
+ <UserAvatar className="h-10 w-10" src={notification.fromUser.image ?? ''} />
<div className="flex-grow">
<div className="flex items-center space-x-2">
<Link
diff --git a/apps/web/src/components/Navigation/index.tsx b/apps/web/src/components/Navigation/index.tsx
index a37bacfa..7401973f 100644
--- a/apps/web/src/components/Navigation/index.tsx
+++ b/apps/web/src/components/Navigation/index.tsx
@@ -6,9 +6,11 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@repo/ui/components/dropdown-menu';
-import { ExternalLink, Play, Settings, Settings2, User, Palette } from '@repo/ui/icons';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
+import { ExternalLink, Palette, Play, Settings, Settings2, User } from '@repo/ui/icons';
import Link from 'next/link';
import { Suspense } from 'react';
+import { auth } from '~/server/auth';
import { isAdmin, isAdminOrModerator } from '~/utils/auth-guards';
import { getAllFlags } from '~/utils/feature-flags';
import { Search } from '../search/search';
@@ -16,12 +18,10 @@ import { LoginLink } from './login-link';
import { MobileNav } from './mobile-nav';
import { NavLink } from './nav-link';
import { NavWrapper } from './nav-wrapper';
+import { getNotificationCount } from './navigation.actions';
+import { NotificationLink } from './notification-link';
import { SignOutLink } from './signout-link';
import { SkipToCodeEditor } from './skip-to-code-editor';
-import { auth } from '~/server/auth';
-import { NotificationLink } from './notification-link';
-import { getNotificationCount } from './navigation.actions';
-import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from '@repo/ui/components/avatar';
import { ThemeButton } from './theme-button';
export function getAdminUrl() {
@@ -165,12 +165,7 @@ async function LoginButton({
aria-label="profile button"
className="hidden rounded-lg p-2 duration-300 focus:outline-none focus-visible:ring-2 md:block"
>
- <Avatar className="h-7 w-7">
- <AvatarImage src={session.user.image ?? ''} alt="user avatar" />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar src={session.user.image ?? ''} />
</button>
</DropdownMenuTrigger>
<DropdownMenuContent
diff --git a/apps/web/src/components/mention/user-results.tsx b/apps/web/src/components/mention/user-results.tsx
index cf2672fc..36608ec9 100644
--- a/apps/web/src/components/mention/user-results.tsx
+++ b/apps/web/src/components/mention/user-results.tsx
@@ -1,13 +1,13 @@
'use client';
import { cn } from '@repo/ui/cn';
-import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from '@repo/ui/components/avatar';
import { Popover, PopoverAnchor, PopoverContent } from '@repo/ui/components/popover';
+import { useToast } from '@repo/ui/components/use-toast';
+import { UserAvatar } from '@repo/ui/components/user-avatar';
import { useQuery } from '@tanstack/react-query';
import { useEffect, useRef, useState } from 'react';
-import { searchUsers } from './actions';
-import { useToast } from '@repo/ui/components/use-toast';
import { Loader } from '../loader';
+import { searchUsers } from './actions';
interface Props {
isOpen: boolean;
@@ -133,12 +133,10 @@ export function UserResults({ isOpen, onFocusOutside, onSelectedUser, query }: P
'flex w-full cursor-pointer justify-start gap-3 rounded-none px-4 py-3 hover:bg-zinc-400/50 dark:hover:bg-zinc-600/50',
)}
>
- <Avatar className="h-10 w-10 border border-gray-500 dark:border-gray-700">
- <AvatarImage src={user.image ?? ''} alt="user avatar" />
- <AvatarFallback>
- <DefaultAvatar />
- </AvatarFallback>
- </Avatar>
+ <UserAvatar
+ className="h-10 w-10 border border-gray-500 dark:border-gray-700"
+ src={user.image ?? ''}
+ />
<div className="flex flex-col">
<span className="text-sm font-bold text-gray-900 dark:text-white">
{user.name}
diff --git a/packages/ui/src/components/user-avatar.tsx b/packages/ui/src/components/user-avatar.tsx
new file mode 100644
index 00000000..5ddd6e8d
--- /dev/null
+++ b/packages/ui/src/components/user-avatar.tsx
@@ -0,0 +1,17 @@
+import { cn } from '../cn';
+import { Avatar, AvatarFallback, AvatarImage, DefaultAvatar } from './avatar';
+
+interface Props {
+ src: string;
+ className?: string;
+}
+export function UserAvatar(props: Props) {
+ return (
+ <Avatar className={cn('h-7 w-7', props.className)}>
+ <AvatarImage src={props.src} alt="user avatar" />
+ <AvatarFallback delayMs={5000}>
+ <DefaultAvatar />
+ </AvatarFallback>
+ </Avatar>
+ );
+}