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 | 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/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/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; 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 { 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 ; 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; }