From eceade40a63b3165ccc3531512ad377f7b9f867f Mon Sep 17 00:00:00 2001 From: leejeongho Date: Thu, 12 Sep 2024 01:45:57 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20Home=20Layout=20padding=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/home/common/components/Layout/HomeLayout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web-domains/src/home/common/components/Layout/HomeLayout.tsx b/packages/web-domains/src/home/common/components/Layout/HomeLayout.tsx index f1e66d96..003547fc 100644 --- a/packages/web-domains/src/home/common/components/Layout/HomeLayout.tsx +++ b/packages/web-domains/src/home/common/components/Layout/HomeLayout.tsx @@ -3,5 +3,5 @@ import { PropsWithChildren } from 'react'; export const HomeLayout = ({ children }: PropsWithChildren) => { - return
{children}
; + return
{children}
; }; From 862dd5f4e5ac8f2f660ec8072cf22e65befe845c Mon Sep 17 00:00:00 2001 From: leejeongho Date: Thu, 12 Sep 2024 01:54:54 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=ED=99=88=20EMPTY=20VIEW=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EB=B0=8F=20=EB=B3=B8=EC=9D=B8=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=EB=82=98=EB=A1=9C=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apis/schema/useGetProgressingQuestionQuery.type.ts | 1 + .../components/GatherMemberProfile/GatherMemberProfile.tsx | 4 ++-- .../containers/GatherMemberProfileListContainer.tsx | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/web-domains/src/home/common/apis/schema/useGetProgressingQuestionQuery.type.ts b/packages/web-domains/src/home/common/apis/schema/useGetProgressingQuestionQuery.type.ts index 2d02a044..26a96a2e 100644 --- a/packages/web-domains/src/home/common/apis/schema/useGetProgressingQuestionQuery.type.ts +++ b/packages/web-domains/src/home/common/apis/schema/useGetProgressingQuestionQuery.type.ts @@ -19,4 +19,5 @@ export type MemberType = { profileImageFileUrl?: string; role: 'OWNER' | 'ADMIN' | 'MEMBER'; isHandWaved: boolean; + isMe: boolean; }; diff --git a/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx b/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx index 2ee49f41..6b1e135a 100644 --- a/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx +++ b/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx @@ -11,7 +11,7 @@ interface GatherMemberProfileProps { } export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfileProps) => { - const { name, role, profileImageFileUrl, meetingMemberId, isHandWaved } = member; + const { name, role, profileImageFileUrl, meetingMemberId, isHandWaved, isMe } = member; const isOwner = role === 'OWNER'; return ( @@ -29,7 +29,7 @@ export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfilePr
- {name} + {isMe ? '나' : name} {isOwner && ( 👑 diff --git a/packages/web-domains/src/home/features/gather-member/containers/GatherMemberProfileListContainer.tsx b/packages/web-domains/src/home/features/gather-member/containers/GatherMemberProfileListContainer.tsx index 40254309..e372a91c 100644 --- a/packages/web-domains/src/home/features/gather-member/containers/GatherMemberProfileListContainer.tsx +++ b/packages/web-domains/src/home/features/gather-member/containers/GatherMemberProfileListContainer.tsx @@ -3,7 +3,6 @@ import { Icon } from '@sds/components'; import { KakaoShareModal } from '@/common'; -import { EmptyView } from '@/common/components'; import { GatherMemberProfileList } from '../components/GatherMemberProfile/GatherMemberProfileList'; import { GatherMemberSearchInput } from '../components/GatherMemberSearch/GatherMemberSearchInput'; @@ -22,10 +21,6 @@ export const GatherMemberProfileListContainer = () => { inviteModalOpen, } = useGatherMemberProfileListService(); - if (!gatherMemberList.length) { - return ; - } - return (
From 1ed086f4066e561d0a83832ec7ffa7df80802e07 Mon Sep 17 00:00:00 2001 From: leejeongho Date: Thu, 12 Sep 2024 04:28:05 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=EB=AA=A8=EC=9E=84=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EC=99=95=EA=B4=80=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GatherMemberProfile.tsx | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx b/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx index 6b1e135a..4d9e3c1e 100644 --- a/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx +++ b/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx @@ -27,14 +27,9 @@ export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfilePr >
- + {isMe ? '나' : name} - {isOwner && ( - - 👑 - - )}
@@ -42,12 +37,27 @@ export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfilePr ); }; -const ProfileImage = ({ imageUrl, isConnection = false }: { imageUrl?: string; isConnection?: boolean }) => { - const borderStyles = isConnection ? { border: `3px solid ${colors.primary500}` } : {}; +const ProfileImage = ({ + imageUrl, + isConnection = false, + isOnwer = false, +}: { + imageUrl?: string; + isConnection?: boolean; + isOnwer?: boolean; +}) => { + const borderColorStyles = isConnection ? { borderColor: `${colors.primary500}` } : {}; return ( - + {isConnection && } + {isOnwer && ( + + )} ); From b291bc8c1c5a892cf333310d86d4b51b14be42b0 Mon Sep 17 00:00:00 2001 From: leejeongho Date: Fri, 13 Sep 2024 02:33:21 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20handWavingStatus=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EB=AA=A8=EC=9E=84=EC=9B=90=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=95=84=20=EB=94=94=EC=9E=90=EC=9D=B8=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 --- .../components/Icon/assets/ConnectStar.tsx | 4 +- .../useGetProgressingQuestionQuery.type.ts | 3 ++ .../GatherMemberProfile.tsx | 39 +++++++++++++------ 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/packages/core/sds/src/components/Icon/assets/ConnectStar.tsx b/packages/core/sds/src/components/Icon/assets/ConnectStar.tsx index e1bcaf15..d4272452 100644 --- a/packages/core/sds/src/components/Icon/assets/ConnectStar.tsx +++ b/packages/core/sds/src/components/Icon/assets/ConnectStar.tsx @@ -1,11 +1,11 @@ import { IconAssetProps } from '../types'; export const ConnectStar = (props: IconAssetProps) => { - const { size = 20 } = props; + const { size = 20, color } = props; return ( - + { - const { name, role, profileImageFileUrl, meetingMemberId, isHandWaved, isMe } = member; + const { name, role, profileImageFileUrl, meetingMemberId, isHandWaved, isMe, handWavingStatus } = member; const isOwner = role === 'OWNER'; return ( @@ -27,7 +27,12 @@ export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfilePr >
- + {isMe ? '나' : name} @@ -37,20 +42,30 @@ export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfilePr ); }; -const ProfileImage = ({ - imageUrl, - isConnection = false, - isOnwer = false, -}: { +interface ProfileImageProps { imageUrl?: string; isConnection?: boolean; isOnwer?: boolean; -}) => { - const borderColorStyles = isConnection ? { borderColor: `${colors.primary500}` } : {}; + handWavingStatus: HandWavingStatusType; +} + +const ProfileImage = ({ imageUrl, isConnection = false, isOnwer = false, handWavingStatus }: ProfileImageProps) => { + const isHandWaving = isConnection || handWavingStatus === 'REQUESTED' || handWavingStatus === 'ACCEPTED'; + + const color = handWavingStatus === 'ACCEPTED' ? colors.primary500 : colors.grey500; return ( - - {isConnection && } + + {isHandWaving && ( + + )} {isOnwer && ( Date: Fri, 13 Sep 2024 02:55:27 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=EB=B3=B8=EC=9D=B8=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=95=84=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/GatherMemberProfile/GatherMemberProfile.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx b/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx index ec859da9..77519323 100644 --- a/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx +++ b/packages/web-domains/src/home/features/gather-member/components/GatherMemberProfile/GatherMemberProfile.tsx @@ -25,7 +25,7 @@ export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfilePr padding: '12px 16px', }} > - +
Date: Sat, 14 Sep 2024 00:09:04 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=EB=AA=A8=EC=9E=84=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=B8=EC=9D=B8=20=EC=B6=94=EA=B0=80=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=EB=A6=B4=EB=A0=88=EC=9D=B4=20=EC=A7=88?= =?UTF-8?q?=EB=AC=B8=20=EC=8B=9C=EC=9E=91=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/home/common/constants/meetingActivatedLimit.ts | 1 + .../floating-button/services/useFloatingButtonService.ts | 3 ++- .../features/notification/services/useNotificationService.ts | 3 ++- .../services/useProgressingQuestionService.tsx | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 packages/web-domains/src/home/common/constants/meetingActivatedLimit.ts diff --git a/packages/web-domains/src/home/common/constants/meetingActivatedLimit.ts b/packages/web-domains/src/home/common/constants/meetingActivatedLimit.ts new file mode 100644 index 00000000..225b5cdd --- /dev/null +++ b/packages/web-domains/src/home/common/constants/meetingActivatedLimit.ts @@ -0,0 +1 @@ +export const MEETING_ACTIVATED_LIMIT = 2; diff --git a/packages/web-domains/src/home/features/floating-button/services/useFloatingButtonService.ts b/packages/web-domains/src/home/features/floating-button/services/useFloatingButtonService.ts index 7a7af519..6181e7bd 100644 --- a/packages/web-domains/src/home/features/floating-button/services/useFloatingButtonService.ts +++ b/packages/web-domains/src/home/features/floating-button/services/useFloatingButtonService.ts @@ -4,6 +4,7 @@ import { useEffect, useState } from 'react'; import { useDialogContext } from '@/common/contexts/DialogProvider'; import { useGetGatherMemberList } from '@/home/common/apis/queries/useGetGatherMemberList'; import { HomeAtoms } from '@/home/common/atoms/home.atom'; +import { MEETING_ACTIVATED_LIMIT } from '@/home/common/constants/meetingActivatedLimit'; export const useFloatingButtonService = () => { const currentMeeting = useAtomValue(HomeAtoms.currentMeeting); @@ -49,7 +50,7 @@ export const useFloatingButtonService = () => { close(); }; - const isOnlyOne = !!memberList && memberList.contents.length < 1; + const isOnlyOne = !!memberList && memberList.contents.length < MEETING_ACTIVATED_LIMIT; return { meetingId: currentMeeting?.meetingId, diff --git a/packages/web-domains/src/home/features/notification/services/useNotificationService.ts b/packages/web-domains/src/home/features/notification/services/useNotificationService.ts index 4c7c0f3e..4e90f7a6 100644 --- a/packages/web-domains/src/home/features/notification/services/useNotificationService.ts +++ b/packages/web-domains/src/home/features/notification/services/useNotificationService.ts @@ -11,6 +11,7 @@ import { useGetNotification } from '@/home/common/apis/queries/useGetNotificatio import { NotificationType } from '@/home/common/apis/schema/Notification.schema'; import { ProgressingQuestionType } from '@/home/common/apis/schema/useGetProgressingQuestionQuery.type'; import { HomeAtoms } from '@/home/common/atoms/home.atom'; +import { MEETING_ACTIVATED_LIMIT } from '@/home/common/constants/meetingActivatedLimit'; export const useNotificationService = () => { const queryClient = useQueryClient(); @@ -72,7 +73,7 @@ export const useNotificationService = () => { } }, [notfication, currentMeeting]); - const isOnlyOne = !!memberList && memberList.contents.length < 1; + const isOnlyOne = !!memberList && memberList.contents.length < MEETING_ACTIVATED_LIMIT; return { meetingId, diff --git a/packages/web-domains/src/home/features/progressing-question/services/useProgressingQuestionService.tsx b/packages/web-domains/src/home/features/progressing-question/services/useProgressingQuestionService.tsx index eb192f0a..0a0789c2 100644 --- a/packages/web-domains/src/home/features/progressing-question/services/useProgressingQuestionService.tsx +++ b/packages/web-domains/src/home/features/progressing-question/services/useProgressingQuestionService.tsx @@ -5,6 +5,7 @@ import { useEffect, useState } from 'react'; import { useGetGatherMemberList } from '@/home/common/apis/queries/useGetGatherMemberList'; import { useGetMyInfo } from '@/home/common/apis/queries/useGetMyInfo'; import { HomeAtoms } from '@/home/common/atoms/home.atom'; +import { MEETING_ACTIVATED_LIMIT } from '@/home/common/constants/meetingActivatedLimit'; import { useSetCurrentMeeting } from '@/home/common/hooks/useSetCurrentMeeting'; import { useGetProgressingQuestion } from '../../../common/apis/queries/useGetProgressingQuestion'; @@ -75,7 +76,7 @@ export const useProgressingQuestionService = () => { } }, [progressingQuestion, myInfo]); - const isOnlyOne = !!memberList && memberList.contents.length < 1; + const isOnlyOne = !!memberList && memberList.contents.length < MEETING_ACTIVATED_LIMIT; return { isOnlyOne,