From 134d55bcdf8b8c25d1ea5f4d6e383ab0cc1aedff Mon Sep 17 00:00:00 2001 From: aajy Date: Wed, 28 Aug 2024 14:02:34 +0900 Subject: [PATCH 1/8] =?UTF-8?q?Feat:=20=EA=B7=B8=EB=A3=B9=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=EB=B0=98=EC=9D=91=ED=98=95=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related to:#127 --- apps/admin/src/app/style/globals.css | 14 ++++++++++++-- apps/user/src/app/style/globals.css | 14 ++++++++++++-- packages/config-tailwind/tailwind.config.ts | 1 + packages/ui/src/entities/group/ui/profile.tsx | 4 ++-- packages/ui/src/features/group/ui/member-list.tsx | 2 +- packages/ui/src/shared/ui/button.tsx | 4 ++-- packages/ui/src/widgets/group/ui/members-board.tsx | 8 +++++--- 7 files changed, 35 insertions(+), 12 deletions(-) diff --git a/apps/admin/src/app/style/globals.css b/apps/admin/src/app/style/globals.css index fbb7aede..4059f434 100644 --- a/apps/admin/src/app/style/globals.css +++ b/apps/admin/src/app/style/globals.css @@ -48,12 +48,14 @@ .swiper-button-next { position: absolute; top: 50%; - width: 40px !important; - height: 40px; + width: 50px !important; + height: 50px; display: flex; align-items: center; justify-content: center; z-index: 50; + font-weight: bold !important; + color: #1e293b !important; } .swiper-button-prev { @@ -71,3 +73,11 @@ .swiper-button-next::after { font-size: 24px !important; } + +.swiper-pagination { + bottom: -20% !important; +} + +.swiper-pagination-bullet.swiper-pagination-bullet-active { + background-color: #1e293b !important; +} diff --git a/apps/user/src/app/style/globals.css b/apps/user/src/app/style/globals.css index d1458ae2..50941e71 100644 --- a/apps/user/src/app/style/globals.css +++ b/apps/user/src/app/style/globals.css @@ -47,12 +47,14 @@ .swiper-button-next { position: absolute; top: 50%; - width: 40px !important; - height: 40px; + width: 50px !important; + height: 50px; display: flex; align-items: center; justify-content: center; z-index: 50; + font-weight: bold !important; + color: #1e293b !important; } .swiper-button-prev { @@ -70,3 +72,11 @@ .swiper-button-next::after { font-size: 24px !important; } + +.swiper-pagination { + bottom: -20% !important; +} + +.swiper-pagination-bullet.swiper-pagination-bullet-active { + background-color: #1e293b !important; +} diff --git a/packages/config-tailwind/tailwind.config.ts b/packages/config-tailwind/tailwind.config.ts index 5310c0cd..ee0e7261 100644 --- a/packages/config-tailwind/tailwind.config.ts +++ b/packages/config-tailwind/tailwind.config.ts @@ -12,6 +12,7 @@ const config: Omit = { modal_sm: '640px', desktop: '1024px', 'max-tablet': { max: '480px' }, + 'desktop-2xl': '1220px', }, extend: { diff --git a/packages/ui/src/entities/group/ui/profile.tsx b/packages/ui/src/entities/group/ui/profile.tsx index fe711527..742b9a71 100644 --- a/packages/ui/src/entities/group/ui/profile.tsx +++ b/packages/ui/src/entities/group/ui/profile.tsx @@ -26,7 +26,7 @@ export const Profile = ({ onClickRemove, }: ProfileProps) => { return ( -
+
{isLeader === true && mode !== 'change-leader' && ( 그룹장 @@ -71,7 +71,7 @@ export const Profile = ({ /> )}
- + {nickname}
diff --git a/packages/ui/src/features/group/ui/member-list.tsx b/packages/ui/src/features/group/ui/member-list.tsx index 7e27873f..b1e6ae0d 100644 --- a/packages/ui/src/features/group/ui/member-list.tsx +++ b/packages/ui/src/features/group/ui/member-list.tsx @@ -36,7 +36,7 @@ export const MemberList = ({ modules={[Navigation, Pagination]} slidesPerView={slidesCount < 2 ? 1 : 2} slidesPerGroup={slidesCount < 2 ? 1 : 2} - spaceBetween={24} + spaceBetween={8} scrollbar={{ draggable: true }} navigation pagination={{ clickable: true }} diff --git a/packages/ui/src/shared/ui/button.tsx b/packages/ui/src/shared/ui/button.tsx index 5f5252d1..50eaad0b 100644 --- a/packages/ui/src/shared/ui/button.tsx +++ b/packages/ui/src/shared/ui/button.tsx @@ -101,7 +101,7 @@ export function Button({ 'bg-transparent text-blue-500 border border-blue-500 rounded-xl hover:bg-blue-500 hover:text-white', }; const buttonClasses = ` - items-center justify-center + items-center justify-center text-nowrap ${baseClasses} ${variantClasses[variant]} ${isDisabled && variant !== 'outline' && variant !== 'rounded-outline-blue' ? 'disabled:bg-slate-400 cursor' : ''} @@ -129,5 +129,5 @@ export function Button({ export const ButtonGroup = ({ children, gap = 2 }: ButtonGroupProps) => { const gapClass = `gap-${gap}`; - return
{children}
; + return
{children}
; }; diff --git a/packages/ui/src/widgets/group/ui/members-board.tsx b/packages/ui/src/widgets/group/ui/members-board.tsx index 8f0fed5e..278988f0 100644 --- a/packages/ui/src/widgets/group/ui/members-board.tsx +++ b/packages/ui/src/widgets/group/ui/members-board.tsx @@ -64,11 +64,13 @@ export const MembersBoard = ({ className={`relative px-6 py-4 rounded-lg ${isAdmin ? 'w-[504px] bg-blue-500' : 'w-full bg-orange-500'} overflow-hidden`} >
-
+
-
+
- 구성원 + + 구성원 +
{group.members.length} From 84e205b1e2195379e7d57e1ee1826481d53eea6c Mon Sep 17 00:00:00 2001 From: aajy Date: Wed, 28 Aug 2024 17:44:13 +0900 Subject: [PATCH 2/8] =?UTF-8?q?Fix:=20=EA=B7=B8=EB=A3=B9=20=EA=B5=AC?= =?UTF-8?q?=EC=84=B1=EC=9B=90=20=EB=B3=B4=EB=93=9C=20=EB=B0=98=EC=9D=91?= =?UTF-8?q?=ED=98=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/(dashboard)/group/[id]/page.tsx | 2 +- .../group/ui/group-overview-board.tsx | 2 +- .../ui/src/features/group/ui/member-list.tsx | 35 ++++++++++--------- .../group/ui/members-manage-buttons.tsx | 4 +-- .../ui/src/widgets/group/ui/members-board.tsx | 7 ++-- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/apps/admin/src/app/(dashboard)/group/[id]/page.tsx b/apps/admin/src/app/(dashboard)/group/[id]/page.tsx index ab9a7049..28af5a37 100644 --- a/apps/admin/src/app/(dashboard)/group/[id]/page.tsx +++ b/apps/admin/src/app/(dashboard)/group/[id]/page.tsx @@ -4,7 +4,7 @@ import { TableProvider } from '../../../../shared'; export default function Page() { return ( - ; + ); } diff --git a/packages/ui/src/entities/group/ui/group-overview-board.tsx b/packages/ui/src/entities/group/ui/group-overview-board.tsx index 91cf38c3..cd9d2029 100644 --- a/packages/ui/src/entities/group/ui/group-overview-board.tsx +++ b/packages/ui/src/entities/group/ui/group-overview-board.tsx @@ -64,7 +64,7 @@ export const GroupOverviewBoard = ({ return (
member.isLeader === true); + const groupMembers = members.filter((member) => member.isLeader !== true); + const handleChangeLeader = (id: number) => { onChangeLeader(id); }; @@ -108,22 +111,22 @@ export const MemberList = ({ }, }} > - {members.map((member) => - member.isLeader ? ( - - - - ) : ( - - - - ) - )} + {groupLeader.map((member) => ( + + + + ))} + {groupMembers.map((member) => ( + + + + ))}
); diff --git a/packages/ui/src/features/group/ui/members-manage-buttons.tsx b/packages/ui/src/features/group/ui/members-manage-buttons.tsx index b460c71a..4aec60dd 100644 --- a/packages/ui/src/features/group/ui/members-manage-buttons.tsx +++ b/packages/ui/src/features/group/ui/members-manage-buttons.tsx @@ -29,7 +29,7 @@ export const MembersManageButtons = ({ onSave, isAdmin = false }: Props) => { {mode === 'default' && (