From 9881ac2717b6112622de58b2b970862eb4e7caa0 Mon Sep 17 00:00:00 2001 From: Jong Date: Sat, 14 Sep 2024 02:55:37 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=EC=95=8C=EB=A6=BC=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EC=B6=94=EA=B0=80=20(#216)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/home/common/apis/schema/Notification.schema.ts | 7 ++++++- .../notification/containers/AlarmListContainer.tsx | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/web-domains/src/home/common/apis/schema/Notification.schema.ts b/packages/web-domains/src/home/common/apis/schema/Notification.schema.ts index 4e1147bb..7e3b86c4 100644 --- a/packages/web-domains/src/home/common/apis/schema/Notification.schema.ts +++ b/packages/web-domains/src/home/common/apis/schema/Notification.schema.ts @@ -3,7 +3,12 @@ export type NotificationType = { eventType: NotificationEventType; }; -export type NotificationEventType = 'QUESTION_REGISTERED' | 'TARGET_MEMBER' | 'HAND_WAVING_REQUESTED'; +export type NotificationEventType = + | 'QUESTION_REGISTERED' + | 'TARGET_MEMBER' + | 'HAND_WAVING_REQUESTED' + | 'HAND_WAVING_REJECTED' + | 'HAND_WAVING_ACCEPTED'; export type NotificationResponseType = | { diff --git a/packages/web-domains/src/home/features/notification/containers/AlarmListContainer.tsx b/packages/web-domains/src/home/features/notification/containers/AlarmListContainer.tsx index 26b2a7c3..7f7f0ddd 100644 --- a/packages/web-domains/src/home/features/notification/containers/AlarmListContainer.tsx +++ b/packages/web-domains/src/home/features/notification/containers/AlarmListContainer.tsx @@ -64,7 +64,8 @@ export const AlarmListContainer = () => { /> ); } - + case 'HAND_WAVING_ACCEPTED': + case 'HAND_WAVING_REJECTED': case 'QUESTION_REGISTERED': case 'TARGET_MEMBER': return ; From e58087931b8f14ca18f3ab8526ec41e713eeb5eb Mon Sep 17 00:00:00 2001 From: Doeun Kim Date: Sat, 14 Sep 2024 02:57:02 +0900 Subject: [PATCH 2/5] =?UTF-8?q?chore(*):=20README=EC=97=90=20Tech=20Stack?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20(#217)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 3c2c2d22..27849187 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,15 @@

+## ๐Ÿ› ๏ธ Tech Stack + +tech stack + +
+
+
+ + ## ๐Ÿ›‹๏ธ Members | FE | FE | FE | FE | From a9e9d9472d91d9a317b841a62336bd19a88673c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=84=B8=EB=AF=BC?= <89172499+semnil5202@users.noreply.github.com> Date: Sat, 14 Sep 2024 03:33:57 +0900 Subject: [PATCH 3/5] =?UTF-8?q?refactor(*):=20=08=EC=BD=94=EB=A9=98?= =?UTF-8?q?=ED=8A=B8=20input=20padding=20=EB=B3=B4=EC=A0=95=20=EB=B0=8F=20?= =?UTF-8?q?=EC=A7=88=EB=AC=B8=20=EC=83=9D=EC=84=B1=20=ED=9B=84=20=EB=B0=94?= =?UTF-8?q?=EB=A1=9C=20=EB=8B=B5=EB=B3=80=ED=95=98=EA=B8=B0=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20Skeleton=20(?= =?UTF-8?q?#218)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: ์ฝ”๋ฉ˜ํŠธ input ์ฐฝ padding ์ถ”๊ฐ€ * refactor: ์งˆ๋ฌธ ์ƒ์„ฑ ์งํ›„ ๋‹ต๋ณ€ํ•˜๊ธฐ EmptyView๊ฐ€ ์ž˜๋ชปํ‘œ์‹œ๋˜๋˜ ์˜ค๋ฅ˜ ์ˆ˜์ • * refactor: ๋ถˆํ•„์š”ํ•œ console.log ์ œ๊ฑฐ --- .../features/comment/components/CommentInput.tsx | 4 ++-- .../containers/ProgressingQuestionContainer.tsx | 4 ++-- .../services/useProgressingQuestionService.tsx | 16 ++++++++-------- .../common/api/mutations/useModifyUserInfo.ts | 1 - 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/packages/web-domains/src/answer/features/comment/components/CommentInput.tsx b/packages/web-domains/src/answer/features/comment/components/CommentInput.tsx index d00f4322..1cebd331 100644 --- a/packages/web-domains/src/answer/features/comment/components/CommentInput.tsx +++ b/packages/web-domains/src/answer/features/comment/components/CommentInput.tsx @@ -1,5 +1,5 @@ import { Icon, Txt, fontWeightVariants } from '@sambad/sds/components'; -import { colors, borderRadiusVariants } from '@sambad/sds/theme'; +import { borderRadiusVariants, colors } from '@sambad/sds/theme'; import { HTMLAttributes, forwardRef, useState } from 'react'; interface CommentInputProps extends Omit, 'onChange'> { @@ -32,7 +32,7 @@ export const CommentInput = forwardRef( width: '100%', height: '48px', borderRadius: borderRadiusVariants.medium, - padding: '12px 16px', + padding: '12px 40px 12px 16px', '::placeholder': { fontSize: '16px', fontWeight: fontWeightVariants.regular, diff --git a/packages/web-domains/src/answer/features/progressing-question/containers/ProgressingQuestionContainer.tsx b/packages/web-domains/src/answer/features/progressing-question/containers/ProgressingQuestionContainer.tsx index d0ecace0..4056e606 100644 --- a/packages/web-domains/src/answer/features/progressing-question/containers/ProgressingQuestionContainer.tsx +++ b/packages/web-domains/src/answer/features/progressing-question/containers/ProgressingQuestionContainer.tsx @@ -14,11 +14,11 @@ import { ProgressingQuestionContainerSkeleton } from '../components/Skeleton/Pro import { useProgressingQuestionService } from '../services/useProgressingQuestionService'; export const ProgressingQuestionContainer = () => { - const { progressingQuestion, meetingId, isLoading } = useProgressingQuestionService(); + const { progressingQuestion, meetingId, isFetching } = useProgressingQuestionService(); const isNowAnswered = !progressingQuestion?.isAnswered; - if (isLoading) return ; + if (isFetching) return ; if (!progressingQuestion) { return null; diff --git a/packages/web-domains/src/answer/features/progressing-question/services/useProgressingQuestionService.tsx b/packages/web-domains/src/answer/features/progressing-question/services/useProgressingQuestionService.tsx index da9369af..12ae9b9b 100644 --- a/packages/web-domains/src/answer/features/progressing-question/services/useProgressingQuestionService.tsx +++ b/packages/web-domains/src/answer/features/progressing-question/services/useProgressingQuestionService.tsx @@ -27,26 +27,26 @@ export const useProgressingQuestionService = () => { }, }); - const { data: progressingQuestion, isLoading } = useGetProgressingQuestion({ + const { data: progressingQuestion, isFetching } = useGetProgressingQuestion({ params: { meetingId: parseInt(meetingId) }, options: { - select: (data) => { - if (data?.startTime) { - setAnswerGlobalTime(dayjs(data.startTime).valueOf()); - } - return data; - }, enabled: !!meetingId, }, }); + useEffect(() => { + if (progressingQuestion?.startTime) { + setAnswerGlobalTime(dayjs(progressingQuestion.startTime).valueOf()); + } + }, [progressingQuestion]); + useEffect(() => { mutateAsync({ meetingId: parseInt(meetingId) }); }, []); return { meetingId, - isLoading, + isFetching, gatherName: '์‚ผ๋ดค๋“œ์˜ ๋ชจํ—˜', progressingQuestion, }; diff --git a/packages/web-domains/src/user/common/api/mutations/useModifyUserInfo.ts b/packages/web-domains/src/user/common/api/mutations/useModifyUserInfo.ts index 02a5ebea..cf967dd2 100644 --- a/packages/web-domains/src/user/common/api/mutations/useModifyUserInfo.ts +++ b/packages/web-domains/src/user/common/api/mutations/useModifyUserInfo.ts @@ -40,7 +40,6 @@ export const useModifyUserInfo = ({ options }: Args) => { async function modifyUserInfo(params: Params): Promise { const { meetingId, ...restParams } = params; - console.log(restParams); const data = await Http.PATCH(`/v1/meetings/${meetingId}/members/me`, restParams); return data; } From 73c7384303c078f504d03ce1392d93742215ca77 Mon Sep 17 00:00:00 2001 From: Jong Date: Sat, 14 Sep 2024 12:57:40 +0900 Subject: [PATCH 4/5] fix: hotfix (#219) --- .../services/useGatherMemberProfileListService.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/web-domains/src/home/features/gather-member/services/useGatherMemberProfileListService.tsx b/packages/web-domains/src/home/features/gather-member/services/useGatherMemberProfileListService.tsx index ffe1d5a9..d230ceae 100644 --- a/packages/web-domains/src/home/features/gather-member/services/useGatherMemberProfileListService.tsx +++ b/packages/web-domains/src/home/features/gather-member/services/useGatherMemberProfileListService.tsx @@ -1,5 +1,4 @@ import { useAtomValue } from 'jotai'; -import { debounce } from 'lodash-es'; import { useEffect, useState } from 'react'; import { getWebDomain } from '@/common'; @@ -64,13 +63,7 @@ export const useGatherMemberProfileListService = () => { }, [data]); useEffect(() => { - let filter; - filter = debounce(handleChangeGatherMemberList, 300); - filter(searchInput); - - return () => { - filter = null; - }; + handleChangeGatherMemberList(searchInput); }, [searchInput]); return { From c6157634c2a9df31fa5239fa043a2b70fc9513c5 Mon Sep 17 00:00:00 2001 From: leejeongho Date: Fri, 20 Sep 2024 16:20:33 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20handWavingStatus=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?props=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schema/useGetProgressingQuestionQuery.type.ts | 1 - .../GatherMemberProfile/GatherMemberProfile.tsx | 14 ++++---------- 2 files changed, 4 insertions(+), 11 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 8a9f452e..beb698c5 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 @@ -18,7 +18,6 @@ export type MemberType = { name: string; profileImageFileUrl?: string; role: 'OWNER' | 'ADMIN' | 'MEMBER'; - isHandWaved: boolean; isMe: boolean; handWavingStatus: HandWavingStatusType; }; 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 77519323..f4c40403 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, isMe, handWavingStatus } = member; + const { name, role, profileImageFileUrl, meetingMemberId, isMe, handWavingStatus } = member; const isOwner = role === 'OWNER'; return ( @@ -27,12 +27,7 @@ export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfilePr >
- + {isMe ? '๋‚˜' : name} @@ -44,13 +39,12 @@ export const GatherMemberProfile = ({ meetingId, member }: GatherMemberProfilePr interface ProfileImageProps { imageUrl?: string; - isConnection?: boolean; isOnwer?: boolean; handWavingStatus: HandWavingStatusType; } -const ProfileImage = ({ imageUrl, isConnection = false, isOnwer = false, handWavingStatus }: ProfileImageProps) => { - const isHandWaving = isConnection || handWavingStatus === 'REQUESTED' || handWavingStatus === 'ACCEPTED'; +const ProfileImage = ({ imageUrl, isOnwer = false, handWavingStatus }: ProfileImageProps) => { + const isHandWaving = handWavingStatus === 'REQUESTED' || handWavingStatus === 'ACCEPTED'; const color = handWavingStatus === 'ACCEPTED' ? colors.primary500 : colors.grey500;