Connect, collaborate, and grow with a community of TypeScript developers
Updated the deisgn of comments (#584)
Shrikrishna Joisa3dac41572c14
diff --git a/apps/web/src/app/challenge/_components/comments/comment.tsx b/apps/web/src/app/challenge/_components/comments/comment.tsxindex 46b000ee..f841e110 100644--- a/apps/web/src/app/challenge/_components/comments/comment.tsx+++ b/apps/web/src/app/challenge/_components/comments/comment.tsx@@ -234,7 +234,7 @@ function SingleComment({return (<div className="relative p-2 pl-3"><div className="flex items-start justify-between gap-4 pr-[0.4rem]">- <div className="flex items-center gap-1">+ <div className="flex w-full items-center justify-between gap-1"><UserBadge username={comment.user.name ?? ''} linkComponent={Link} /><Tooltip delayDuration={0.05}><TooltipTrigger asChild>@@ -247,70 +247,6 @@ function SingleComment({</TooltipContent></Tooltip></div>- <div className="my-auto flex items-center gap-4">- {!readonly && (- <>- <Vote- voteCount={comment._count.vote}- initialHasVoted={comment.vote.length > 0}- disabled={!session?.data?.user?.id || comment.userId === session?.data?.user?.id}- rootType="COMMENT"- rootId={comment.id}- onVote={(didUpvote: boolean) => {- comment.vote = didUpvote- ? [- {- userId: session?.data?.user?.id ?? '',- },- ]- : [];- comment._count.vote += didUpvote ? 1 : -1;- }}- />- <div- className="flex cursor-pointer items-center gap-1 text-neutral-500 duration-200 hover:text-neutral-400 dark:text-neutral-400 dark:hover:text-neutral-300"- onClick={() => {- copyPathNotifyUser();- }}- >- <Share className="h-3 w-3" />- <div className="hidden text-[0.8rem] sm:block">Share</div>- </div>- {!isReply && (- <button- className="flex cursor-pointer items-center gap-1 text-neutral-500 duration-200 disabled:text-neutral-700 dark:text-neutral-400 dark:hover:text-neutral-300"- onClick={onClickReply}- >- <Reply className="h-4 w-4" />- <div className="hidden text-[0.8rem] sm:block">Reply</div>- </button>- )}- {isAuthor ? (- <button- className="flex cursor-pointer items-center gap-1 text-neutral-500 duration-200 hover:text-neutral-400 dark:text-neutral-400 dark:hover:text-neutral-300"- onClick={() => setIsEditing(!isEditing)}- >- <Pencil className="h-3 w-3" />- <div className="hidden text-[0.8rem] sm:block">Edit</div>- </button>- ) : null}- {isAuthor ? (- <CommentDeleteDialog asChild comment={comment}>- <button className="flex cursor-pointer items-center gap-1 text-neutral-500 duration-200 hover:text-neutral-400 dark:text-neutral-400 dark:hover:text-neutral-300">- <Trash2 className="h-3 w-3" />- <div className="hidden text-[0.8rem] sm:block">Delete</div>- </button>- </CommentDeleteDialog>- ) : (- <ReportDialog commentId={comment.id} reportType="COMMENT">- <div className="flex cursor-pointer items-center text-[0.8rem] text-neutral-500 duration-200 hover:text-neutral-400 dark:text-neutral-400 dark:hover:text-neutral-300">- Report- </div>- </ReportDialog>- )}- </>- )}- </div></div>{!isEditing && (<div className="-mb-1">@@ -318,7 +254,7 @@ function SingleComment({</div>)}{isEditing ? (- <div className="-mx-2 -mb-2">+ <div className=" mb-2"><CommentInputmode="edit"onCancel={() => {@@ -333,6 +269,70 @@ function SingleComment({/></div>) : null}+ <div className="my-auto flex items-center gap-4">+ {!readonly && (+ <>+ <Vote+ voteCount={comment._count.vote}+ initialHasVoted={comment.vote.length > 0}+ disabled={!session?.data?.user?.id || comment.userId === session?.data?.user?.id}+ rootType="COMMENT"+ rootId={comment.id}+ onVote={(didUpvote: boolean) => {+ comment.vote = didUpvote+ ? [+ {+ userId: session?.data?.user?.id ?? '',+ },+ ]+ : [];+ comment._count.vote += didUpvote ? 1 : -1;+ }}+ />+ <div+ className="flex cursor-pointer items-center gap-1 text-neutral-500 duration-200 hover:text-neutral-400 dark:text-neutral-400 dark:hover:text-neutral-300"+ onClick={() => {+ copyPathNotifyUser();+ }}+ >+ <Share className="h-3 w-3" />+ <div className="hidden text-[0.8rem] sm:block">Share</div>+ </div>+ {!isReply && (+ <button+ className="flex cursor-pointer items-center gap-1 text-neutral-500 duration-200 disabled:text-neutral-700 dark:text-neutral-400 dark:hover:text-neutral-300"+ onClick={onClickReply}+ >+ <Reply className="h-4 w-4" />+ <div className="hidden text-[0.8rem] sm:block">Reply</div>+ </button>+ )}+ {isAuthor ? (+ <button+ className="flex cursor-pointer items-center gap-1 text-neutral-500 duration-200 hover:text-neutral-400 dark:text-neutral-400 dark:hover:text-neutral-300"+ onClick={() => setIsEditing(!isEditing)}+ >+ <Pencil className="h-3 w-3" />+ <div className="hidden text-[0.8rem] sm:block">Edit</div>+ </button>+ ) : null}+ {isAuthor ? (+ <CommentDeleteDialog asChild comment={comment}>+ <button className="flex cursor-pointer items-center gap-1 text-neutral-500 duration-200 hover:text-neutral-400 dark:text-neutral-400 dark:hover:text-neutral-300">+ <Trash2 className="h-3 w-3" />+ <div className="hidden text-[0.8rem] sm:block">Delete</div>+ </button>+ </CommentDeleteDialog>+ ) : (+ <ReportDialog commentId={comment.id} reportType="COMMENT">+ <div className="flex cursor-pointer items-center text-[0.8rem] text-neutral-500 duration-200 hover:text-neutral-400 dark:text-neutral-400 dark:hover:text-neutral-300">+ Report+ </div>+ </ReportDialog>+ )}+ </>+ )}+ </div></div>);}