From a1840cc2739e5a0461eaed1c29b9a82e93b4c586 Mon Sep 17 00:00:00 2001 From: Sumin Hwang <163857590+tnals0924@users.noreply.github.com> Date: Fri, 6 Nov 2026 17:08:17 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EB=B9=8C=EB=A6=B4=EA=B2=8C=20?= =?UTF-8?q?=EB=AC=BC=ED=92=88=20=EC=95=84=EC=9D=B4=EC=BD=98=EC=9D=84=20?= =?UTF-8?q?=ED=9A=8C=EC=83=89=20=EC=B9=B8=20=EA=B0=80=EC=9A=B4=EB=8D=B0?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EC=B6=B0=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../billilge/components/BillilgeItemCard.tsx | 9 +++------ .../billilge/components/BillilgeItemIcon.tsx | 19 +++++++++++++++++++ .../components/BillilgeRentalHistoryEntry.tsx | 9 +++------ 3 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 src/features/billilge/components/BillilgeItemIcon.tsx diff --git a/src/features/billilge/components/BillilgeItemCard.tsx b/src/features/billilge/components/BillilgeItemCard.tsx index 466e1e73..1867bc20 100644 --- a/src/features/billilge/components/BillilgeItemCard.tsx +++ b/src/features/billilge/components/BillilgeItemCard.tsx @@ -4,9 +4,10 @@ import type { ReactNode } from "react"; import circleMinusFill from "@/assets/icons/circle-minus-fill.svg"; import circlePlusFill from "@/assets/icons/circle-plus-fill.svg"; +import BillilgeItemIcon from "@/features/billilge/components/BillilgeItemIcon"; interface BillilgeItemCardProps { - // 서버 물품 아이콘 주소. 아이콘을 안 올렸거나 지워진 물품은 null이라 같은 크기의 빈 자리만 둔다 + // 서버 물품 아이콘 주소. 아이콘을 안 올렸거나 지워진 물품은 null이라 회색 칸만 둔다 icon: string | null; itemName: string; subtitle: string; @@ -67,11 +68,7 @@ function BillilgeItemCard({ >
- {icon ? ( - - ) : ( -
- )} +
+ {src && ( + + )} +
+ ); +} + +export default BillilgeItemIcon; diff --git a/src/features/billilge/components/BillilgeRentalHistoryEntry.tsx b/src/features/billilge/components/BillilgeRentalHistoryEntry.tsx index c754cfd5..0e984eef 100644 --- a/src/features/billilge/components/BillilgeRentalHistoryEntry.tsx +++ b/src/features/billilge/components/BillilgeRentalHistoryEntry.tsx @@ -1,10 +1,11 @@ import { Typography } from "@wanteddev/wds"; +import BillilgeItemIcon from "@/features/billilge/components/BillilgeItemIcon"; import BillilgeStatusBadge from "@/features/billilge/components/BillilgeStatusBadge"; import type { BillilgeRentalStatus } from "@/shared/entities/billilge/billilgeTypes"; interface BillilgeRentalHistoryEntryProps { - // 물품이 지워졌거나 아이콘이 없으면 null이라 같은 크기의 빈 자리만 둔다 + // 물품이 지워졌거나 아이콘이 없으면 null이라 회색 칸만 둔다 icon: string | null; itemName: string; rentedAt: string; @@ -25,11 +26,7 @@ function BillilgeRentalHistoryEntry({ return (
- {icon ? ( - - ) : ( -
- )} +
Date: Fri, 6 Nov 2026 17:09:45 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=EB=AC=BC=ED=92=88=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/features/billilge/components/BillilgeItemIcon.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/features/billilge/components/BillilgeItemIcon.tsx b/src/features/billilge/components/BillilgeItemIcon.tsx index de06ade2..3dcdce62 100644 --- a/src/features/billilge/components/BillilgeItemIcon.tsx +++ b/src/features/billilge/components/BillilgeItemIcon.tsx @@ -1,11 +1,8 @@ interface BillilgeItemIconProps { - // 서버 물품 아이콘 주소. 아이콘을 안 올렸거나 지워진 물품은 null이라 회색 칸만 둔다 + // 아이콘이 없는 물품은 null이라 빈 회색 칸만 둔다 src: string | null; } -// 서버 물품 아이콘(SVG)을 42px에 꽉 채우면 원본 여백 없이 커 보여서, 어드민(stream-admin-client -// RentalItemIcon)처럼 42px 회색 칸 가운데에 최대 28px로 비율을 지켜 넣는다. -// radius는 어드민과 같은 10px인데 Tailwind 단계엔 8px(lg)·12px(xl)뿐이라 임의값으로 둔다. function BillilgeItemIcon({ src }: BillilgeItemIconProps) { return (
From 0c86585d53e3b6e8341e60d71d7b28552aaabbef Mon Sep 17 00:00:00 2001 From: Sumin Hwang <163857590+tnals0924@users.noreply.github.com> Date: Tue, 10 Nov 2026 12:54:42 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=EB=AC=BC=ED=92=88=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=B5=9C=EB=8C=80=20=ED=81=AC=EA=B8=B0?= =?UTF-8?q?=EB=A5=BC=2032px=EB=A1=9C=20=ED=82=A4=EC=9B=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/features/billilge/components/BillilgeItemIcon.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/billilge/components/BillilgeItemIcon.tsx b/src/features/billilge/components/BillilgeItemIcon.tsx index 3dcdce62..5614673b 100644 --- a/src/features/billilge/components/BillilgeItemIcon.tsx +++ b/src/features/billilge/components/BillilgeItemIcon.tsx @@ -7,7 +7,7 @@ function BillilgeItemIcon({ src }: BillilgeItemIconProps) { return (
{src && ( - + )}
); From 749f5d563ab28d48af5a780a80ff7972c4b41f58 Mon Sep 17 00:00:00 2001 From: Sumin Hwang <163857590+tnals0924@users.noreply.github.com> Date: Tue, 10 Nov 2026 12:54:42 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=EB=AC=BC=ED=92=88=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=8A=A4=EC=BC=88=EB=A0=88=ED=86=A4=20?= =?UTF-8?q?=EB=AA=A8=EC=84=9C=EB=A6=AC=EB=A5=BC=2010px=EB=A1=9C=20?= =?UTF-8?q?=EB=A7=9E=EC=B6=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/features/billilge/components/BillilgeListSkeleton.tsx | 2 +- src/features/billilge/components/BillilgeReturnSkeleton.tsx | 4 ++-- src/features/home/components/HomeRentalSkeleton.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/features/billilge/components/BillilgeListSkeleton.tsx b/src/features/billilge/components/BillilgeListSkeleton.tsx index 77708b38..695b29d0 100644 --- a/src/features/billilge/components/BillilgeListSkeleton.tsx +++ b/src/features/billilge/components/BillilgeListSkeleton.tsx @@ -21,7 +21,7 @@ function BillilgeListSkeleton() { diff --git a/src/features/billilge/components/BillilgeReturnSkeleton.tsx b/src/features/billilge/components/BillilgeReturnSkeleton.tsx index 914936f5..5cef8f73 100644 --- a/src/features/billilge/components/BillilgeReturnSkeleton.tsx +++ b/src/features/billilge/components/BillilgeReturnSkeleton.tsx @@ -32,7 +32,7 @@ function BillilgeReturnSkeleton() { @@ -83,7 +83,7 @@ function BillilgeReturnSkeleton() { diff --git a/src/features/home/components/HomeRentalSkeleton.tsx b/src/features/home/components/HomeRentalSkeleton.tsx index f3594bd2..f611a677 100644 --- a/src/features/home/components/HomeRentalSkeleton.tsx +++ b/src/features/home/components/HomeRentalSkeleton.tsx @@ -24,7 +24,7 @@ function HomeRentalSkeleton() {