From fa6176bdaded4e38af091bfcc75be74c0a45acb2 Mon Sep 17 00:00:00 2001 From: goawmfhfl Date: Wed, 11 Jun 2025 15:50:14 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20username=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EB=B0=94=EC=9D=B8=EB=94=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/README.md | 2 +- .../detail/[channelId]/feedback/_components/Form.tsx | 4 ++-- .../src/app/(afterLogin)/detail/[channelId]/feedback/page.tsx | 2 +- .../detail/[channelId]/group/_components/Group.tsx | 2 +- frontend/packages/model/src/user/types.ts | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/README.md b/frontend/README.md index f4506c73..85504c26 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -8,7 +8,7 @@ - 소비자(유저) 사이트: [https://contents.moimjang.com](https://contents.moimjang.com/?host=tester) - 판매자(호스트) 사이트: [https://seller.moimjang.com](https://seller.moimjang.com/?host=tester) -- 콘텐츠 관리자(어드민) 사이트: [https://admin.moimjang.com](https://admin.moimjang.com/?host=tester) +- 콘텐츠 관리자(어드민) 사이트: [https://admin.moimjang.com](https://admin.moimjang.com) **테스트 계정** diff --git a/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/feedback/_components/Form.tsx b/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/feedback/_components/Form.tsx index 42eecebd..08fce72c 100644 --- a/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/feedback/_components/Form.tsx +++ b/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/feedback/_components/Form.tsx @@ -166,10 +166,10 @@ export default function Form() { }} > - {groupMembers.map(({ id, username, gender }) => ( + {groupMembers.map(({ id, user_name, gender }) => ( ))} diff --git a/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/feedback/page.tsx b/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/feedback/page.tsx index 3c49f2ea..d0d347d1 100644 --- a/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/feedback/page.tsx +++ b/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/feedback/page.tsx @@ -12,7 +12,7 @@ export default function page() { diff --git a/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/group/_components/Group.tsx b/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/group/_components/Group.tsx index 00fef391..d6c93fb1 100644 --- a/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/group/_components/Group.tsx +++ b/frontend/apps/contents/src/app/(afterLogin)/detail/[channelId]/group/_components/Group.tsx @@ -57,7 +57,7 @@ export default function Group() {
{getGenderEmoji(member.gender)}
- {member.username} + {member.user_name} ))} diff --git a/frontend/packages/model/src/user/types.ts b/frontend/packages/model/src/user/types.ts index 54b074c3..80fb69fa 100644 --- a/frontend/packages/model/src/user/types.ts +++ b/frontend/packages/model/src/user/types.ts @@ -1,5 +1,6 @@ export interface User { id: number; + user_name: string; username: string; gender: string; birth_year: number; From 57c00777da5769c0f19afb33a9a435d3f0a91df3 Mon Sep 17 00:00:00 2001 From: goawmfhfl Date: Wed, 11 Jun 2025 16:48:06 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20userInterface=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/(afterLogin)/profile/edit/_components/Form.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/apps/contents/src/app/(afterLogin)/profile/edit/_components/Form.tsx b/frontend/apps/contents/src/app/(afterLogin)/profile/edit/_components/Form.tsx index 4a7855cd..ebae3890 100644 --- a/frontend/apps/contents/src/app/(afterLogin)/profile/edit/_components/Form.tsx +++ b/frontend/apps/contents/src/app/(afterLogin)/profile/edit/_components/Form.tsx @@ -13,6 +13,7 @@ export default function Form() { const [user, setUser] = useState({ id: 0, username: "", + user_name: "", gender: "male", birth_year: 0, created_at: "", From ee1608f474076b80a0976525b9ad69dae993eb95 Mon Sep 17 00:00:00 2001 From: goawmfhfl Date: Wed, 11 Jun 2025 16:50:57 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20user=5Fname=20optional=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/(afterLogin)/profile/edit/_components/Form.tsx | 1 - frontend/packages/model/src/user/types.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/apps/contents/src/app/(afterLogin)/profile/edit/_components/Form.tsx b/frontend/apps/contents/src/app/(afterLogin)/profile/edit/_components/Form.tsx index ebae3890..4a7855cd 100644 --- a/frontend/apps/contents/src/app/(afterLogin)/profile/edit/_components/Form.tsx +++ b/frontend/apps/contents/src/app/(afterLogin)/profile/edit/_components/Form.tsx @@ -13,7 +13,6 @@ export default function Form() { const [user, setUser] = useState({ id: 0, username: "", - user_name: "", gender: "male", birth_year: 0, created_at: "", diff --git a/frontend/packages/model/src/user/types.ts b/frontend/packages/model/src/user/types.ts index 80fb69fa..093fc36c 100644 --- a/frontend/packages/model/src/user/types.ts +++ b/frontend/packages/model/src/user/types.ts @@ -1,6 +1,6 @@ export interface User { id: number; - user_name: string; + user_name?: string; username: string; gender: string; birth_year: number;