From 228b9977178fe29c3d496042e359ee795e3f6470 Mon Sep 17 00:00:00 2001 From: yerimi00 Date: Thu, 12 Feb 2026 19:23:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=ED=8A=B9=EC=84=B1=20=EB=AA=A8?= =?UTF-8?q?=EB=8B=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/profileCard/TraitModal.tsx | 177 ++++++++++-------- 1 file changed, 96 insertions(+), 81 deletions(-) diff --git a/app/routes/mypage/components/profileCard/TraitModal.tsx b/app/routes/mypage/components/profileCard/TraitModal.tsx index 61a70ea..84d5382 100644 --- a/app/routes/mypage/components/profileCard/TraitModal.tsx +++ b/app/routes/mypage/components/profileCard/TraitModal.tsx @@ -1,3 +1,5 @@ +import { useHideBottomTab } from "../../../../hooks/useHideBottomTab"; + type Trait = { badge: string; icon: (className?: string) => React.ReactNode; @@ -12,106 +14,119 @@ export default function TraitModal({ trait: Trait; onClose: () => void; }) { + useHideBottomTab(true); + + const isContentTrait = trait.badge.includes("콘텐츠"); const cols = trait.topSummary.length; return (
-
e.stopPropagation()} - > - {/* close */} - + + + + + + + + + + + - {/* body */} -
-
-
-
-
{trait.icon("w-[46px] h-[47px]")}
+ {/* body */} +
+
+
+
+
{trait.icon("w-[46px] h-[47px]")}
+
+
+ {trait.badge} +
-
- {trait.badge} +
+ + {/* top summary bar */} +
+
+ {trait.topSummary.map((item, i) => ( +
+
+ {item.label} +
+
+ {isContentTrait + ? item.value.replace(/,\s*/g, "\n") + : item.value} +
+
+ ))}
-
- {/* top summary bar */} -
-
- {trait.topSummary.map((item, i) => ( -
-
- {item.label} + {/* sections */} +
+ {trait.sections.map((section, i) => ( +
+
+ {section.title}
-
- {item.value} +
+ {isContentTrait + ? section.items.map((item, idx) => ( + + {item} + + )) + : section.items.join(", ")}
))}
- - {/* sections */} -
- {trait.sections.map((section, i) => ( -
-
- {section.title} -
-
- {section.items.join(", ")} -
-
- ))} -
From 341e2be10b90d43d8de287bb50cdf4d0bccb97fd Mon Sep 17 00:00:00 2001 From: yerimi00 Date: Thu, 12 Feb 2026 19:29:22 +0900 Subject: [PATCH 2/3] fix: update header height to min-height for consistent layout --- app/routes/business/proposal/received-proposal-content.tsx | 2 +- app/routes/mypage/edit/edit-content.tsx | 2 +- app/routes/mypage/likes/likes-content.tsx | 2 +- .../mypage/notification/marketing/marketing-content.tsx | 2 +- app/routes/mypage/notification/notifications-content.tsx | 2 +- app/routes/mypage/privacy/privacy-content.tsx | 2 +- app/routes/mypage/profileCard/profileCard-content.tsx | 2 +- app/routes/mypage/terms/terms-content.tsx | 2 +- app/routes/mypage/traits/traits-content.tsx | 2 +- app/routes/notification/notification-content.tsx | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/routes/business/proposal/received-proposal-content.tsx b/app/routes/business/proposal/received-proposal-content.tsx index 312b93c..b637df6 100644 --- a/app/routes/business/proposal/received-proposal-content.tsx +++ b/app/routes/business/proposal/received-proposal-content.tsx @@ -118,7 +118,7 @@ export default function ReceivedProposalContent() { return (
-
+
navigate(-1)} />
diff --git a/app/routes/mypage/edit/edit-content.tsx b/app/routes/mypage/edit/edit-content.tsx index 193ed84..adad819 100644 --- a/app/routes/mypage/edit/edit-content.tsx +++ b/app/routes/mypage/edit/edit-content.tsx @@ -194,7 +194,7 @@ export default function MyPageEdit() { return (
-
+
navigate(-1)} diff --git a/app/routes/mypage/likes/likes-content.tsx b/app/routes/mypage/likes/likes-content.tsx index 7583a3e..b3a5f08 100644 --- a/app/routes/mypage/likes/likes-content.tsx +++ b/app/routes/mypage/likes/likes-content.tsx @@ -312,7 +312,7 @@ export default function MyPageLikes() { return (
-
+
-
+
navigate(-1)} diff --git a/app/routes/mypage/notification/notifications-content.tsx b/app/routes/mypage/notification/notifications-content.tsx index d59f9b4..d13868a 100644 --- a/app/routes/mypage/notification/notifications-content.tsx +++ b/app/routes/mypage/notification/notifications-content.tsx @@ -93,7 +93,7 @@ export default function MyPageNotifications() {
-
+
navigate(-1)} />
diff --git a/app/routes/mypage/privacy/privacy-content.tsx b/app/routes/mypage/privacy/privacy-content.tsx index 66282aa..240401f 100644 --- a/app/routes/mypage/privacy/privacy-content.tsx +++ b/app/routes/mypage/privacy/privacy-content.tsx @@ -68,7 +68,7 @@ export default function MyPagePrivacy() { return (
-
+
navigate(-1)} />
diff --git a/app/routes/mypage/profileCard/profileCard-content.tsx b/app/routes/mypage/profileCard/profileCard-content.tsx index 42bdcef..803c2f5 100644 --- a/app/routes/mypage/profileCard/profileCard-content.tsx +++ b/app/routes/mypage/profileCard/profileCard-content.tsx @@ -242,7 +242,7 @@ export default function ProfileCard() {
{/* header */} -
+
history.back()} diff --git a/app/routes/mypage/terms/terms-content.tsx b/app/routes/mypage/terms/terms-content.tsx index dfd011e..ad82985 100644 --- a/app/routes/mypage/terms/terms-content.tsx +++ b/app/routes/mypage/terms/terms-content.tsx @@ -53,7 +53,7 @@ export default function MyPageTerms() { return (
-
+
navigate(-1)} />
diff --git a/app/routes/mypage/traits/traits-content.tsx b/app/routes/mypage/traits/traits-content.tsx index f0966d4..35cfa09 100644 --- a/app/routes/mypage/traits/traits-content.tsx +++ b/app/routes/mypage/traits/traits-content.tsx @@ -559,7 +559,7 @@ export default function TraitsPage() { return (
-
+
navigate(-1)} />
diff --git a/app/routes/notification/notification-content.tsx b/app/routes/notification/notification-content.tsx index 4c014a1..05d6903 100644 --- a/app/routes/notification/notification-content.tsx +++ b/app/routes/notification/notification-content.tsx @@ -96,7 +96,7 @@ export default function NotificationContent() { }; return (
-
+
navigate(-1)} />
@@ -162,4 +162,4 @@ export default function NotificationContent() {
); -} \ No newline at end of file +} From 36cb22e856223e5bdaa45bd548e5288afe3b74d6 Mon Sep 17 00:00:00 2001 From: yerimi00 Date: Thu, 12 Feb 2026 19:30:23 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20PWA=20=EC=84=A4=EC=A0=95=EC=9D=84?= =?UTF-8?q?=20=EC=9C=84=ED=95=9C=20header=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/layout/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/layout/Header.tsx b/app/components/layout/Header.tsx index 8880859..70053f3 100644 --- a/app/components/layout/Header.tsx +++ b/app/components/layout/Header.tsx @@ -12,7 +12,7 @@ export default function Header({ rightElement, }: HeaderProps) { return ( -
+
{/* 왼쪽: 뒤로가기 버튼 */}
{showBack && (