Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ function DepositCountdown({ deadline, showLabel = true }: DepositCountdownProps)
const { remaining } = useCountdown(deadline);

return (
<div className="flex items-center justify-center gap-1.5 rounded-lg bg-sky-blue-50 py-1 pr-3 pl-2 text-text-accent">
<TimerIconFill className="size-5" />
<div className="flex items-center justify-center gap-1 rounded-lg bg-sky-blue-50 py-1 pr-3 pl-2.5 text-text-accent/88">
<TimerIconFill className="size-5 text-sky-blue-400" />
<p className="body-2-semibold">
{remaining ?? '--:--:--'}
{showLabel && ' 후 담기 종료'}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import UserProfile from '@/components/user-profile-group/UserProfile';
import type { UserT } from '@/components/user-profile-group/userProfile.const';
import { useGetMe } from '@/hooks/useGetMe';

type ParticipantChipProps = {
user: UserT;
itemCount: number;
};

function ParticipantChip({ user, itemCount }: ParticipantChipProps) {
const { userData } = useGetMe();
const isMe = user.id === userData.id;

return (
<span className="inline-flex items-center gap-1.5 rounded-full border border-border-neutral-muted bg-bg-layer-default py-1 pr-3 pl-1 body-2-medium text-text-neutral-primary">
<UserProfile user={user} className="border-0" />
<span>{user.name ?? '익명'}</span>
<span>{isMe ? '나' : user.name}</span>
<span className="body-2-semibold text-text-neutral-secondary">{itemCount}개</span>
</span>
);
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/assets/icons/fill/timer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/web/src/components/user-profile-group/UserProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function UserProfile({ user, className }: UserProfileProps) {
>
<Image
src={user.imageUrl}
alt={user.name ?? '사용자 프로필'}
alt={`${user.name} 프로필 이미지`}
fill
sizes="27px"
className="object-cover"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export type ProfileTypeT = 'blue' | 'yellow';

export type UserT = {
id: string | number;
name?: string;
name: string;
/** imageUrl 없을 때 기본 SVG 프로필 색상 */
profileType?: ProfileTypeT;
imageUrl?: string;
Expand Down
Loading