From ef9326f4718e5a8da376e3fcff0b1e95af423f5a Mon Sep 17 00:00:00 2001 From: hun Date: Wed, 4 Feb 2026 22:15:38 +0900 Subject: [PATCH 01/10] =?UTF-8?q?design:=20=EC=A1=B0=ED=95=A9=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EB=A7=88?= =?UTF-8?q?=EC=A7=84=20=EC=88=98=EC=A0=95,=20=EC=A1=B0=ED=95=A9=20?= =?UTF-8?q?=EA=B8=B0=EA=B8=B0=20=EC=A0=84=EC=B2=B4=20=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EA=B7=B8=EB=9D=BC=EB=8D=B0=EC=9D=B4=EC=85=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Combination/CombinationDeviceCard.tsx | 2 +- src/pages/devices/DeviceSearchPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Combination/CombinationDeviceCard.tsx b/src/components/Combination/CombinationDeviceCard.tsx index d387f608..7895d3a2 100644 --- a/src/components/Combination/CombinationDeviceCard.tsx +++ b/src/components/Combination/CombinationDeviceCard.tsx @@ -98,7 +98,7 @@ const CombinationDeviceCard = ({ {/* 그라데이션 */} {showGradient && shouldShowGradient && !showAllDevices && (
{ onClick={(e) => e.stopPropagation()} > {/* Combination List */} -
+
{combos.map((combo, index) => ( @@ -581,14 +581,14 @@ const DeviceSearchPage = () => { {combinationDevices.length > 9 && showAllDevices && ( )} - {/* 버튼 컨테이너 - 토글 버튼으로부터 72px 간격 유지 */} -
+ {/* 버튼 컨테이너 - 토글 버튼으로부터 72px 간격 유지하며 하단 고정 */} +
Date: Wed, 4 Feb 2026 22:59:32 +0900 Subject: [PATCH 06/10] =?UTF-8?q?design:=20=EC=A1=B0=ED=95=A9=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EB=B3=B4=EA=B8=B0,=20=EC=A0=9C=ED=92=88=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=202=EC=A4=84=EC=9D=B4=EC=83=81=20..=ED=91=9C=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Combination/CombinationDeviceCard.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Combination/CombinationDeviceCard.tsx b/src/components/Combination/CombinationDeviceCard.tsx index 83425e4a..b131d66f 100644 --- a/src/components/Combination/CombinationDeviceCard.tsx +++ b/src/components/Combination/CombinationDeviceCard.tsx @@ -93,8 +93,8 @@ const CombinationDeviceCard = ({ className={`bg-white rounded-card shadow-[0_0_4px_rgba(0,0,0,0.1)] p-12 ${deviceCardWidth} flex items-center gap-12`} >
-
-

{device.name}

+
+

{device.name}

{device.brandName}

{device.deviceType}

From 03448ae6cb0f8351995c7491a4a1298989c019e6 Mon Sep 17 00:00:00 2001 From: hun Date: Wed, 4 Feb 2026 23:04:18 +0900 Subject: [PATCH 07/10] =?UTF-8?q?design:=20=EA=B0=84=EB=9E=B5=ED=9E=88?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0,=EA=B8=B0=EA=B8=B0=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EB=8F=99=EC=9E=91=20=EB=B6=80=EB=93=9C?= =?UTF-8?q?=EB=9F=BD=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Combination/CombinationDeviceCard.tsx | 2 +- src/pages/devices/DeviceSearchPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Combination/CombinationDeviceCard.tsx b/src/components/Combination/CombinationDeviceCard.tsx index b131d66f..d42e9646 100644 --- a/src/components/Combination/CombinationDeviceCard.tsx +++ b/src/components/Combination/CombinationDeviceCard.tsx @@ -60,7 +60,7 @@ const CombinationDeviceCard = ({ return (
{/* 조합 정보 */} -
+
{/* 조합명 */}
{/* 조합 번호 */} diff --git a/src/pages/devices/DeviceSearchPage.tsx b/src/pages/devices/DeviceSearchPage.tsx index dbc74e90..c8a3c8e2 100644 --- a/src/pages/devices/DeviceSearchPage.tsx +++ b/src/pages/devices/DeviceSearchPage.tsx @@ -565,7 +565,7 @@ const DeviceSearchPage = () => { onExpand={(value) => setShowAllDevices(value)} showExpandButton={false} showGradient={true} - className="px-56 pt-40 pb-0" + className="px-56 pt-40 pb-0 flex-shrink-0" index={combos.findIndex(c => c.comboId === selectedCombinationId)} /> From c122e7f535492fe06e2a0fe31e786c86da21845f Mon Sep 17 00:00:00 2001 From: hun Date: Wed, 4 Feb 2026 23:30:59 +0900 Subject: [PATCH 08/10] =?UTF-8?q?design:=20=EB=B3=84=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20-mt-3=20=EC=9C=BC=EB=A1=9C=201=20=EC=9C=84=EB=A1=9C?= =?UTF-8?q?=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Combination/CombinationDeviceCard.tsx | 2 +- src/pages/devices/DeviceSearchPage.tsx | 2 +- src/pages/my/MyPage.tsx | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/Combination/CombinationDeviceCard.tsx b/src/components/Combination/CombinationDeviceCard.tsx index ea0194c5..94728999 100644 --- a/src/components/Combination/CombinationDeviceCard.tsx +++ b/src/components/Combination/CombinationDeviceCard.tsx @@ -70,7 +70,7 @@ const CombinationDeviceCard = ({ {/* 조합명 + 별 */}

{combination.comboName}

- {combination.isPinned && } + {combination.isPinned && }
{/* Tags */} diff --git a/src/pages/devices/DeviceSearchPage.tsx b/src/pages/devices/DeviceSearchPage.tsx index c5a9aa8c..6ee075ba 100644 --- a/src/pages/devices/DeviceSearchPage.tsx +++ b/src/pages/devices/DeviceSearchPage.tsx @@ -537,7 +537,7 @@ const DeviceSearchPage = () => { {/* 조합명 + 대표조합 star */}

{combo.comboName}

- {combo.isPinned && } + {combo.isPinned && }
{/* 기기 수 + 총 가격 */} diff --git a/src/pages/my/MyPage.tsx b/src/pages/my/MyPage.tsx index 80175712..5e1722e7 100644 --- a/src/pages/my/MyPage.tsx +++ b/src/pages/my/MyPage.tsx @@ -1034,7 +1034,7 @@ const MyPage = () => { {combination.isPinned ? ( handleTogglePin(e, combination.comboId)} - className={`!w-22 !h-22 -mt-2 cursor-pointer transition-opacity ${ + className={`!w-22 !h-22 -mt-3 cursor-pointer transition-opacity ${ hoveredStarComboId === combination.comboId ? 'opacity-80' : '' }`} onMouseEnter={() => setHoveredStarComboId(combination.comboId)} @@ -1045,14 +1045,14 @@ const MyPage = () => { {hoveredStarComboId === combination.comboId ? ( handleTogglePin(e, combination.comboId)} - className="!w-22 !h-22 -mt-2 cursor-pointer" + className="!w-22 !h-22 -mt-3 cursor-pointer" onMouseEnter={() => setHoveredStarComboId(combination.comboId)} onMouseLeave={() => setHoveredStarComboId(null)} /> ) : ( handleTogglePin(e, combination.comboId)} - className="!w-22 !h-22 -mt-2 cursor-pointer" + className="!w-22 !h-22 -mt-3 cursor-pointer" onMouseEnter={() => setHoveredStarComboId(combination.comboId)} onMouseLeave={() => setHoveredStarComboId(null)} /> @@ -1127,7 +1127,7 @@ const MyPage = () => { {combination.isPinned ? ( handleTogglePin(e, combination.comboId)} - className={`!w-22 !h-22 -mt-2 cursor-pointer transition-opacity ${ + className={`!w-22 !h-22 -mt-3 cursor-pointer transition-opacity ${ hoveredStarComboId === combination.comboId ? 'opacity-80' : '' }`} onMouseEnter={() => setHoveredStarComboId(combination.comboId)} @@ -1138,14 +1138,14 @@ const MyPage = () => { {hoveredStarComboId === combination.comboId ? ( handleTogglePin(e, combination.comboId)} - className="!w-22 !h-22 -mt-2 cursor-pointer" + className="!w-22 !h-22 -mt-3 cursor-pointer" onMouseEnter={() => setHoveredStarComboId(combination.comboId)} onMouseLeave={() => setHoveredStarComboId(null)} /> ) : ( handleTogglePin(e, combination.comboId)} - className="!w-22 !h-22 -mt-2 cursor-pointer" + className="!w-22 !h-22 -mt-3 cursor-pointer" onMouseEnter={() => setHoveredStarComboId(combination.comboId)} onMouseLeave={() => setHoveredStarComboId(null)} /> From 3d21114813efe8f86f2577c8d1d72367a5dd2590 Mon Sep 17 00:00:00 2001 From: hun Date: Wed, 4 Feb 2026 23:40:11 +0900 Subject: [PATCH 09/10] =?UTF-8?q?design:=20=EC=A1=B0=ED=95=A9=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EB=B3=B4=EA=B8=B0,=20=EA=B8=B0=EA=B8=B0=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EB=B3=B4=EA=B8=B0=EA=B0=80=20=EC=9E=88=EC=9D=84=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EB=B2=84=ED=8A=BC=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=98=EC=97=AC=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=20=EC=95=88=20=EB=9C=A8=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/devices/DeviceSearchPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/devices/DeviceSearchPage.tsx b/src/pages/devices/DeviceSearchPage.tsx index 6ee075ba..a84db1ee 100644 --- a/src/pages/devices/DeviceSearchPage.tsx +++ b/src/pages/devices/DeviceSearchPage.tsx @@ -589,7 +589,7 @@ const DeviceSearchPage = () => { className="bg-white rounded-card shadow-[0_0_10px_rgba(0,0,0,0.25)] mb-50 flex flex-col overflow-y-auto scrollbar-minimal" style={{ width: '907px', - height: '670px', + height:'670px', }} onClick={(e) => e.stopPropagation()} > @@ -626,7 +626,7 @@ const DeviceSearchPage = () => { )} {/* 버튼 컨테이너 - 토글 버튼으로부터 72px 간격 유지하며 하단 고정 */} -
+
Date: Wed, 4 Feb 2026 23:49:16 +0900 Subject: [PATCH 10/10] =?UTF-8?q?comment:=20=EC=A3=BC=EC=84=9D=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/devices/DeviceSearchPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/devices/DeviceSearchPage.tsx b/src/pages/devices/DeviceSearchPage.tsx index a84db1ee..f622bff0 100644 --- a/src/pages/devices/DeviceSearchPage.tsx +++ b/src/pages/devices/DeviceSearchPage.tsx @@ -625,7 +625,7 @@ const DeviceSearchPage = () => { )} - {/* 버튼 컨테이너 - 토글 버튼으로부터 72px 간격 유지하며 하단 고정 */} + {/* 버튼 컨테이너 - 토글 버튼으로부터 간격 유지하며 하단 고정 */}