Connect, collaborate, and grow with a community of TypeScript developers
fix: reply section on comments
bautistaaac3683f954813
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsxindex 3d7f741e..e9637e3e 100644--- a/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx+++ b/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx@@ -24,6 +24,7 @@ import {type PaginatedComments,type PreselectedCommentMetadata,} from './getCommentRouteData';+import { Avatar, AvatarFallback, AvatarImage } from '@repo/ui/components/avatar';interface SingleCommentProps {comment: PaginatedComments['comments'][number];@@ -193,6 +194,7 @@ export function Comment({const SELECTED_CLASSES = 'rounded-md bg-sky-300/20';+// million-ignorefunction SingleComment({comment,isReply,@@ -297,8 +299,16 @@ function SingleComment({ref={elRef}><div className="flex items-start justify-between gap-4 pr-[0.4rem]">- <div className="flex w-full items-center justify-between gap-1">- <UserBadge username={comment.user.name ?? ''} linkComponent={Link} />+ <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 className="border border-zinc-300 dark:border-zinc-600">+ {comment.user?.name.substring(0, 1)}+ </AvatarFallback>+ </Avatar>+ <UserBadge username={comment.user.name ?? ''} linkComponent={Link} />+ </div><Tooltip delayDuration={0.05}><TooltipTrigger asChild><span className="whitespace-nowrap text-[0.8rem] text-neutral-500 dark:text-neutral-400">@@ -332,7 +342,7 @@ function SingleComment({/></div>) : null}- <div className="my-auto mt-1 flex items-center gap-4">+ <div className="my-auto mt-3 flex items-center gap-4">{!readonly && (<><Votediff --git a/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsxindex fb977009..ff18024d 100644--- a/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx+++ b/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx@@ -1,20 +1,16 @@-import {- Dialog,- DialogContent,- DialogTrigger,- type DialogTriggerProps,-} from '@radix-ui/react-dialog';+import type { DialogTriggerProps } from '@radix-ui/react-dialog';+import { Button } from '@repo/ui/components/button';+import { Dialog, DialogContent, DialogTrigger } from '@repo/ui/components/dialog';+import { Markdown } from '@repo/ui/components/markdown';+import { TypographyP } from '@repo/ui/components/paragraph';+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 { useQueryClient } from '@tanstack/react-query';import { useState } from 'react';import { getRelativeTime } from '~/utils/relativeTime';import { deleteComment } from '../comment.action';import { type PaginatedComments } from '../getCommentRouteData';-import { Button } from '@repo/ui/components/button';-import { TypographyLarge } from '@repo/ui/components/typography/large';-import { TypographyP } from '@repo/ui/components/paragraph';-import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';-import { Markdown } from '@repo/ui/components/markdown';-import { toast } from '@repo/ui/components/use-toast';interface CommentDeleteDialogProps extends DialogTriggerProps {comment: PaginatedComments['comments'][number];diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/getCommentRouteData.ts b/apps/web/src/app/[locale]/challenge/_components/comments/getCommentRouteData.tsindex 82fee018..b39907ad 100644--- a/apps/web/src/app/[locale]/challenge/_components/comments/getCommentRouteData.ts+++ b/apps/web/src/app/[locale]/challenge/_components/comments/getCommentRouteData.ts@@ -117,6 +117,7 @@ export async function getPaginatedComments({select: {id: true,name: true,+ image: true,},},_count: {diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/index.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/index.tsxindex 2a153e23..f3e49676 100644--- a/apps/web/src/app/[locale]/challenge/_components/comments/index.tsx+++ b/apps/web/src/app/[locale]/challenge/_components/comments/index.tsx@@ -167,7 +167,7 @@ export function Comments({ preselectedCommentMetadata, rootId, type, expanded =setPage(1);}}>- <SelectTrigger className="w-[180px]">+ <SelectTrigger className="w-[150px]"><SelectValue placeholder="Sort Key" /></SelectTrigger><SelectContent>