From 15fd06464d73d9c82fdbe56ba063a07b3ee08310 Mon Sep 17 00:00:00 2001 From: Hee Su Date: Wed, 3 Apr 2024 17:41:40 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20.client,=20.server=20name=20?= =?UTF-8?q?=EC=BB=A8=EB=B2=A4=EC=85=98=20=EC=A0=9C=EA=B1=B0=20(#673)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/web/src/apis/groups/mutations.tsx | 2 +- packages/web/src/app/[lng]/(main)/chat/page.tsx | 3 +++ .../{ApplyModal.client.tsx => ApplyModal.tsx} | 0 .../{InputForm.client.tsx => InputForm.tsx} | 2 +- .../(main)/grouping/[groupId]/apply/page.tsx | 2 +- ...rticleDetail.client.tsx => ArticleDetail.tsx} | 4 ++-- ...rticleHeader.client.tsx => ArticleHeader.tsx} | 0 .../{CommentList.client.tsx => CommentList.tsx} | 0 .../[groupId]/articles/[articleId]/page.tsx | 4 ++-- .../{GroupDetail.client.tsx => GroupDetail.tsx} | 6 +++--- ...ilHeader.client.tsx => GroupDetailHeader.tsx} | 8 ++++---- .../{TopSection.client.tsx => TopSection.tsx} | 0 ...icleSection.client.tsx => ArticleSection.tsx} | 2 +- ...lesContent.client.tsx => ArticlesContent.tsx} | 4 ++-- .../{NoticeItem.client.tsx => NoticeItem.tsx} | 3 ++- ...oticeSection.client.tsx => NoticeSection.tsx} | 2 +- ...etailContent.client.tsx => DetailContent.tsx} | 6 +++--- ...ionSection.client.tsx => LocationSection.tsx} | 0 ...emberSection.client.tsx => MemberSection.tsx} | 0 .../{TimeSection.client.tsx => TimeSection.tsx} | 0 .../{ApplyCard.client.tsx => ApplyCard.tsx} | 0 ...{ManageDetail.client.tsx => ManageDetail.tsx} | 2 +- ...{ManageHeader.client.tsx => ManageHeader.tsx} | 0 .../(main)/grouping/[groupId]/manage/page.tsx | 4 ++-- .../{MemberList.client.tsx => MemberList.tsx} | 0 ...embersHeader.client.tsx => MembersHeader.tsx} | 0 .../(main)/grouping/[groupId]/members/page.tsx | 5 +++-- .../app/[lng]/(main)/grouping/[groupId]/page.tsx | 4 ++-- ...{ImageSection.client.tsx => ImageSection.tsx} | 0 .../{InputForm.client.tsx => InputForm.tsx} | 4 ++-- .../{WriteHeader.client.tsx => WriteHeader.tsx} | 0 .../(main)/grouping/[groupId]/write/page.tsx | 5 +++-- .../{ArticleItem.client.tsx => ArticleItem.tsx} | 0 ...ckDoneModal.client.tsx => BlockDoneModal.tsx} | 0 ...upButton.client.tsx => CreateGroupButton.tsx} | 0 ...gCardList.client.tsx => GroupingCardList.tsx} | 0 ...tDoneModal.client.tsx => ReportDoneModal.tsx} | 0 ...{WarningModal.client.tsx => WarningModal.tsx} | 0 ...{CreateHeader.client.tsx => CreateHeader.tsx} | 0 .../{CreateModal.client.tsx => CreateModal.tsx} | 0 ...mSheet.client.tsx => LocationBottomSheet.tsx} | 2 +- ...{LocationItem.client.tsx => LocationItem.tsx} | 0 ...upFunnel.client.tsx => CreateGroupFunnel.tsx} | 4 ++-- ...{InputSection.client.tsx => InputSection.tsx} | 0 .../create/funnels/main/MainStep.client.tsx | 8 ++++---- ...tingSection.client.tsx => SettingSection.tsx} | 2 +- ...ploadSection.client.tsx => UploadSection.tsx} | 0 ...darSection.client.tsx => CalendarSection.tsx} | 0 ...{MeetDateStep.client.tsx => MeetDateStep.tsx} | 5 +++-- .../{TimeSection.client.tsx => TimeSection.tsx} | 0 .../app/[lng]/(main)/grouping/create/page.tsx | 2 +- .../[lng]/(main)/grouping/hooks/useMoreSheet.tsx | 8 ++++---- .../web/src/app/[lng]/(main)/grouping/page.tsx | 4 ++-- ...tentSection.client.tsx => ContentSection.tsx} | 6 +++--- ...ackContent.client.tsx => FeedbackContent.tsx} | 2 +- ...eedbackModal.client.tsx => FeedbackModal.tsx} | 0 ...ntent.client.tsx => ParticipatingContent.tsx} | 0 ...tingContent.client.tsx => WaitingContent.tsx} | 0 ...dbackFunnel.client.tsx => FeedbackFunnel.tsx} | 0 .../[groupId]/components/FeedbackHeader.tsx | 3 ++- ...kProvider.client.tsx => FeedbackProvider.tsx} | 0 .../{Membercard.client.tsx => Membercard.tsx} | 0 ...kOutModal.client.tsx => FeedbackOutModal.tsx} | 0 .../{NoShowModal.client.tsx => NoShowModal.tsx} | 0 .../feedback/[groupId]/funnels/step1/Step1.tsx | 11 ++++++----- .../feedback/[groupId]/funnels/step2/Step2.tsx | 4 ++-- ...odal.client.tsx => FeedbackCompleteModal.tsx} | 0 .../feedback/[groupId]/funnels/step3/Step3.tsx | 5 +++-- .../participate/feedback/[groupId]/page.tsx | 5 +++-- .../[lng]/(main)/meeting/participate/page.tsx | 2 +- ...IdDetail.client.tsx => ProfileByIdDetail.tsx} | 2 +- .../app/[lng]/(main)/profile/[userId]/page.tsx | 2 +- ...rofileDetail.client.tsx => ProfileDetail.tsx} | 3 +-- ...ction.client.tsx => ProfileDetailSection.tsx} | 0 ...rofileHeader.client.tsx => ProfileHeader.tsx} | 0 ...leteModal.client.tsx => MatesDeleteModal.tsx} | 0 .../{MatesDetail.client.tsx => MatesDetail.tsx} | 3 ++- .../{MatesHeader.client.tsx => MatesHeader.tsx} | 0 ...ottomSheet.client.tsx => MoreBottomSheet.tsx} | 2 +- .../src/app/[lng]/(main)/profile/mates/page.tsx | 5 +++-- .../web/src/app/[lng]/(main)/profile/page.tsx | 4 ++-- ...{PraiseHeader.client.tsx => PraiseHeader.tsx} | 0 ...Detail.client.tsx => ProfilePraiseDetail.tsx} | 0 .../src/app/[lng]/(main)/profile/praise/page.tsx | 5 +++-- .../{LinkSection.server.tsx => LinkSection.tsx} | 0 ...fileSection.client.tsx => ProfileSection.tsx} | 1 - ...ettingHeader.client.tsx => SettingHeader.tsx} | 1 + ...eModal.client.tsx => DeleteCompleteModal.tsx} | 0 .../{DeleteModal.client.tsx => DeleteModal.tsx} | 3 ++- ...eteProvider.client.tsx => DeleteProvider.tsx} | 0 .../setting/delete/components/DeleteSection.tsx | 2 +- .../profile/setting/delete/components/Step1.tsx | 2 +- .../profile/setting/delete/components/Step2.tsx | 4 ++-- ...{EditProvider.client.tsx => EditProvider.tsx} | 0 .../{ProfileEdit.client.tsx => ProfileEdit.tsx} | 10 ++++++---- .../step1/{Step1.client.tsx => Step1.tsx} | 5 +++-- .../{Step1Header.client.tsx => Step1Header.tsx} | 0 ...p1InputForm.client.tsx => Step1InputForm.tsx} | 4 ++-- .../step2/{Step2.client.tsx => Step2.tsx} | 2 +- ...p2InputForm.client.tsx => Step2InputForm.tsx} | 6 ++++-- .../step3/{Step3.client.tsx => Step3.tsx} | 0 .../[lng]/(main)/profile/setting/edit/page.tsx | 3 ++- .../app/[lng]/(main)/profile/setting/page.tsx | 7 ++++--- ...Modal.client.tsx => CertificateSkipModal.tsx} | 0 .../{EmailForm.client.tsx => EmailForm.tsx} | 12 +++++++----- ...oticeSection.client.tsx => NoticeSection.tsx} | 0 ...tomSheet.client.tsx => VerifyBottomSheet.tsx} | 0 ...{VerifyHeader.client.tsx => VerifyHeader.tsx} | 0 .../src/app/[lng]/(main)/profile/verify/page.tsx | 7 ++++--- ...age.client.tsx => JoinContentTextMessage.tsx} | 0 .../{JoinContext.client.tsx => JoinContext.tsx} | 0 .../{JoinHeader.client.tsx => JoinHeader.tsx} | 0 ...ssage.client.tsx => JoinTitleTextMessage.tsx} | 0 .../app/[lng]/(sub)/join/funnels/JoinFunnel.tsx | 12 ++++++------ ...p1Component.client.tsx => Step1Component.tsx} | 7 ++++--- .../{FormSection.client.tsx => FormSection.tsx} | 8 +++++--- ...oticeSection.client.tsx => NoticeSection.tsx} | 0 .../{NumberForm.client.tsx => NumberForm.tsx} | 2 +- ...erifyForm.client.tsx => NumberVerifyForm.tsx} | 2 +- ...p2Component.client.tsx => Step2Component.tsx} | 5 +++-- ...ttomSheet.client.tsx => AgreeBottomSheet.tsx} | 0 .../funnels/step2/components/SchoolInput.tsx | 2 +- .../funnels/step2/components/SchoolResult.tsx | 2 +- ...ection.client.tsx => SearchResultSection.tsx} | 0 ...p3Component.client.tsx => Step3Component.tsx} | 7 ++++--- ...Modal.client.tsx => CertificateSkipModal.tsx} | 0 .../{EmailForm.client.tsx => EmailForm.tsx} | 14 ++++++++------ ...oticeSection.client.tsx => NoticeSection.tsx} | 0 ...tomSheet.client.tsx => VerifyBottomSheet.tsx} | 2 +- ...p4Component.client.tsx => Step4Component.tsx} | 2 +- .../{InputForm.client.tsx => InputForm.tsx} | 2 +- ...p5Component.client.tsx => Step5Component.tsx} | 7 ++++--- .../{InputForm.client.tsx => InputForm.tsx} | 2 +- ...nalityItem.client.tsx => PersonalityItem.tsx} | 2 +- packages/web/src/app/[lng]/(sub)/join/page.tsx | 2 +- .../{NotiCard.client.tsx => NotiCard.tsx} | 0 .../components/NotificationSection.tsx | 3 ++- packages/web/src/app/i18n/client.ts | 1 - ...eAnalytics.client.tsx => GoogleAnalytics.tsx} | 0 packages/web/src/components/Analytics/index.ts | 2 +- .../{Calendar.client.tsx => Calendar.tsx} | 0 packages/web/src/components/Calendar/index.ts | 2 +- .../{CardHeader.client.tsx => CardHeader.tsx} | 0 ...{GroupingCard.client.tsx => GroupingCard.tsx} | 0 packages/web/src/components/Card/NoMeeting.tsx | 16 ++++++++++++++++ packages/web/src/components/Card/index.ts | 4 ++-- ...{LayerLoading.client.tsx => LayerLoading.tsx} | 0 packages/web/src/components/Loading/index.ts | 2 +- .../{BottomSheet.client.tsx => BottomSheet.tsx} | 0 .../{ImageModal.client.tsx => ImageModal.tsx} | 2 +- .../Modal/{Modal.client.tsx => Modal.tsx} | 2 +- ...{ModalWrapper.client.tsx => ModalWrapper.tsx} | 0 ...ottomSheet.client.tsx => MoreBottomSheet.tsx} | 2 +- .../Modal/{Toast.client.tsx => Toast.tsx} | 0 packages/web/src/components/Modal/index.ts | 10 +++++----- ...ueryProvider.client.tsx => QueryProvider.tsx} | 0 ...imerProvider.client.tsx => TimerProvider.tsx} | 0 packages/web/src/components/Provider/index.ts | 4 ++-- ...{SegmentGroup.client.tsx => SegmentGroup.tsx} | 0 .../web/src/components/SegmentGroup/index.ts | 4 ++-- packages/web/src/components/Tabs/Tabs.tsx | 2 +- .../{TextField.client.tsx => TextField.tsx} | 0 ...roller.client.tsx => TextFieldController.tsx} | 2 +- packages/web/src/components/TextField/index.ts | 4 ++-- packages/web/src/hooks/useDebounceCallback.ts | 1 + 165 files changed, 216 insertions(+), 167 deletions(-) create mode 100644 packages/web/src/app/[lng]/(main)/chat/page.tsx rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/{ApplyModal.client.tsx => ApplyModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/{InputForm.client.tsx => InputForm.tsx} (98%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/{ArticleDetail.client.tsx => ArticleDetail.tsx} (94%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/{ArticleHeader.client.tsx => ArticleHeader.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/{CommentList.client.tsx => CommentList.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/{GroupDetail.client.tsx => GroupDetail.tsx} (94%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/{GroupDetailHeader.client.tsx => GroupDetailHeader.tsx} (94%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/{TopSection.client.tsx => TopSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/{ArticleSection.client.tsx => ArticleSection.tsx} (97%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/{ArticlesContent.client.tsx => ArticlesContent.tsx} (87%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/{NoticeItem.client.tsx => NoticeItem.tsx} (96%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/{NoticeSection.client.tsx => NoticeSection.tsx} (97%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/{DetailContent.client.tsx => DetailContent.tsx} (87%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/{LocationSection.client.tsx => LocationSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/{MemberSection.client.tsx => MemberSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/{TimeSection.client.tsx => TimeSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/{ApplyCard.client.tsx => ApplyCard.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/{ManageDetail.client.tsx => ManageDetail.tsx} (97%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/{ManageHeader.client.tsx => ManageHeader.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/{MemberList.client.tsx => MemberList.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/{MembersHeader.client.tsx => MembersHeader.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/{ImageSection.client.tsx => ImageSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/{InputForm.client.tsx => InputForm.tsx} (95%) rename packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/{WriteHeader.client.tsx => WriteHeader.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/components/{ArticleItem.client.tsx => ArticleItem.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/components/{BlockDoneModal.client.tsx => BlockDoneModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/components/{CreateGroupButton.client.tsx => CreateGroupButton.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/components/{GroupingCardList.client.tsx => GroupingCardList.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/components/{ReportDoneModal.client.tsx => ReportDoneModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/components/{WarningModal.client.tsx => WarningModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/create/components/{CreateHeader.client.tsx => CreateHeader.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/create/components/{CreateModal.client.tsx => CreateModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/create/components/{LocationBottomSheet.client.tsx => LocationBottomSheet.tsx} (98%) rename packages/web/src/app/[lng]/(main)/grouping/create/components/{LocationItem.client.tsx => LocationItem.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/create/funnels/{CreateGroupFunnel.client.tsx => CreateGroupFunnel.tsx} (98%) rename packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/{InputSection.client.tsx => InputSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/{SettingSection.client.tsx => SettingSection.tsx} (99%) rename packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/{UploadSection.client.tsx => UploadSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/{CalendarSection.client.tsx => CalendarSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/{MeetDateStep.client.tsx => MeetDateStep.tsx} (88%) rename packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/{TimeSection.client.tsx => TimeSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/components/{ContentSection.client.tsx => ContentSection.tsx} (87%) rename packages/web/src/app/[lng]/(main)/meeting/participate/components/{FeedbackContent.client.tsx => FeedbackContent.tsx} (96%) rename packages/web/src/app/[lng]/(main)/meeting/participate/components/{FeedbackModal.client.tsx => FeedbackModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/components/{ParticipatingContent.client.tsx => ParticipatingContent.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/components/{WaitingContent.client.tsx => WaitingContent.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/{FeedbackFunnel.client.tsx => FeedbackFunnel.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/{FeedbackProvider.client.tsx => FeedbackProvider.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/{Membercard.client.tsx => Membercard.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/{FeedbackOutModal.client.tsx => FeedbackOutModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/{NoShowModal.client.tsx => NoShowModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/{FeedbackCompleteModal.client.tsx => FeedbackCompleteModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/[userId]/components/{ProfileByIdDetail.client.tsx => ProfileByIdDetail.tsx} (97%) rename packages/web/src/app/[lng]/(main)/profile/components/{ProfileDetail.client.tsx => ProfileDetail.tsx} (76%) rename packages/web/src/app/[lng]/(main)/profile/components/{ProfileDetailSection.client.tsx => ProfileDetailSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/components/{ProfileHeader.client.tsx => ProfileHeader.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/mates/components/{MatesDeleteModal.client.tsx => MatesDeleteModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/mates/components/{MatesDetail.client.tsx => MatesDetail.tsx} (97%) rename packages/web/src/app/[lng]/(main)/profile/mates/components/{MatesHeader.client.tsx => MatesHeader.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/mates/components/{MoreBottomSheet.client.tsx => MoreBottomSheet.tsx} (94%) rename packages/web/src/app/[lng]/(main)/profile/praise/components/{PraiseHeader.client.tsx => PraiseHeader.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/praise/components/{ProfilePraiseDetail.client.tsx => ProfilePraiseDetail.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/setting/components/{LinkSection.server.tsx => LinkSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/setting/components/{ProfileSection.client.tsx => ProfileSection.tsx} (99%) rename packages/web/src/app/[lng]/(main)/profile/setting/components/{SettingHeader.client.tsx => SettingHeader.tsx} (99%) rename packages/web/src/app/[lng]/(main)/profile/setting/delete/components/{DeleteCompleteModal.client.tsx => DeleteCompleteModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/setting/delete/components/{DeleteModal.client.tsx => DeleteModal.tsx} (94%) rename packages/web/src/app/[lng]/(main)/profile/setting/delete/components/{DeleteProvider.client.tsx => DeleteProvider.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/setting/edit/components/{EditProvider.client.tsx => EditProvider.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/setting/edit/components/{ProfileEdit.client.tsx => ProfileEdit.tsx} (83%) rename packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/{Step1.client.tsx => Step1.tsx} (73%) rename packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/{Step1Header.client.tsx => Step1Header.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/{Step1InputForm.client.tsx => Step1InputForm.tsx} (97%) rename packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/{Step2.client.tsx => Step2.tsx} (92%) rename packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/{Step2InputForm.client.tsx => Step2InputForm.tsx} (96%) rename packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step3/{Step3.client.tsx => Step3.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/verify/components/{CertificateSkipModal.client.tsx => CertificateSkipModal.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/verify/components/{EmailForm.client.tsx => EmailForm.tsx} (96%) rename packages/web/src/app/[lng]/(main)/profile/verify/components/{NoticeSection.client.tsx => NoticeSection.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/verify/components/{VerifyBottomSheet.client.tsx => VerifyBottomSheet.tsx} (100%) rename packages/web/src/app/[lng]/(main)/profile/verify/components/{VerifyHeader.client.tsx => VerifyHeader.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/components/{JoinContentTextMessage.client.tsx => JoinContentTextMessage.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/components/{JoinContext.client.tsx => JoinContext.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/components/{JoinHeader.client.tsx => JoinHeader.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/components/{JoinTitleTextMessage.client.tsx => JoinTitleTextMessage.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step1/{Step1Component.client.tsx => Step1Component.tsx} (76%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/{FormSection.client.tsx => FormSection.tsx} (71%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/{NoticeSection.client.tsx => NoticeSection.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/{NumberForm.client.tsx => NumberForm.tsx} (97%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/{NumberVerifyForm.client.tsx => NumberVerifyForm.tsx} (98%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step2/{Step2Component.client.tsx => Step2Component.tsx} (91%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/{AgreeBottomSheet.client.tsx => AgreeBottomSheet.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/{SearchResultSection.client.tsx => SearchResultSection.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step3/{Step3Component.client.tsx => Step3Component.tsx} (73%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/{CertificateSkipModal.client.tsx => CertificateSkipModal.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/{EmailForm.client.tsx => EmailForm.tsx} (91%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/{NoticeSection.client.tsx => NoticeSection.tsx} (100%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/{VerifyBottomSheet.client.tsx => VerifyBottomSheet.tsx} (97%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step4/{Step4Component.client.tsx => Step4Component.tsx} (60%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step4/components/{InputForm.client.tsx => InputForm.tsx} (98%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step5/{Step5Component.client.tsx => Step5Component.tsx} (87%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/{InputForm.client.tsx => InputForm.tsx} (97%) rename packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/{PersonalityItem.client.tsx => PersonalityItem.tsx} (93%) rename packages/web/src/app/[lng]/(sub)/notification/components/{NotiCard.client.tsx => NotiCard.tsx} (100%) rename packages/web/src/components/Analytics/{GoogleAnalytics.client.tsx => GoogleAnalytics.tsx} (100%) rename packages/web/src/components/Calendar/{Calendar.client.tsx => Calendar.tsx} (100%) rename packages/web/src/components/Card/{CardHeader.client.tsx => CardHeader.tsx} (100%) rename packages/web/src/components/Card/{GroupingCard.client.tsx => GroupingCard.tsx} (100%) create mode 100644 packages/web/src/components/Card/NoMeeting.tsx rename packages/web/src/components/Loading/{LayerLoading.client.tsx => LayerLoading.tsx} (100%) rename packages/web/src/components/Modal/{BottomSheet.client.tsx => BottomSheet.tsx} (100%) rename packages/web/src/components/Modal/{ImageModal.client.tsx => ImageModal.tsx} (96%) rename packages/web/src/components/Modal/{Modal.client.tsx => Modal.tsx} (97%) rename packages/web/src/components/Modal/{ModalWrapper.client.tsx => ModalWrapper.tsx} (100%) rename packages/web/src/components/Modal/{MoreBottomSheet.client.tsx => MoreBottomSheet.tsx} (95%) rename packages/web/src/components/Modal/{Toast.client.tsx => Toast.tsx} (100%) rename packages/web/src/components/Provider/{QueryProvider.client.tsx => QueryProvider.tsx} (100%) rename packages/web/src/components/Provider/{TimerProvider.client.tsx => TimerProvider.tsx} (100%) rename packages/web/src/components/SegmentGroup/{SegmentGroup.client.tsx => SegmentGroup.tsx} (100%) rename packages/web/src/components/TextField/{TextField.client.tsx => TextField.tsx} (100%) rename packages/web/src/components/TextField/{TextFieldController.client.tsx => TextFieldController.tsx} (97%) diff --git a/packages/web/src/apis/groups/mutations.tsx b/packages/web/src/apis/groups/mutations.tsx index eae56200d..97b5d4545 100644 --- a/packages/web/src/apis/groups/mutations.tsx +++ b/packages/web/src/apis/groups/mutations.tsx @@ -18,7 +18,7 @@ import { GroupDetailResponse } from './type'; import { MeetingScrapResponse } from '../meeting'; import { Keys as MeetingKeys } from '../meeting/keys'; -import FeedbackCompleteModal from '@/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/FeedbackCompleteModal.client'; +import FeedbackCompleteModal from '@/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/FeedbackCompleteModal'; import useAppRouter from '@/hooks/useAppRouter'; import { useModal } from '@/hooks/useModal'; diff --git a/packages/web/src/app/[lng]/(main)/chat/page.tsx b/packages/web/src/app/[lng]/(main)/chat/page.tsx new file mode 100644 index 000000000..42a9856b6 --- /dev/null +++ b/packages/web/src/app/[lng]/(main)/chat/page.tsx @@ -0,0 +1,3 @@ +export default function ChatPage() { + return
; +} diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/ApplyModal.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/ApplyModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/ApplyModal.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/ApplyModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/InputForm.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/InputForm.tsx similarity index 98% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/InputForm.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/InputForm.tsx index 78a9ec9d8..9d30345b8 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/InputForm.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/components/InputForm.tsx @@ -2,7 +2,7 @@ import { SubmitHandler, useForm } from 'react-hook-form'; -import ApplyModal from './ApplyModal.client'; +import ApplyModal from './ApplyModal'; import { usePostApply } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/page.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/page.tsx index d3556eb6d..198a2fd33 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/page.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/apply/page.tsx @@ -1,5 +1,5 @@ import ApplyHeader from './components/ApplyHeader'; -import InputForm from './components/InputForm.client'; +import InputForm from './components/InputForm'; import { serverTranslation } from '@/app/i18n'; import { Spacing } from '@/components/Spacing'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleDetail.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleDetail.tsx similarity index 94% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleDetail.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleDetail.tsx index bf491040a..b8557b1bc 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleDetail.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleDetail.tsx @@ -1,9 +1,9 @@ 'use client'; -import CommentList from './CommentList.client'; +import CommentList from './CommentList'; import { useGetArticle, useGetGroupDetail } from '@/apis/groups'; -import ArticleItem from '@/app/[lng]/(main)/grouping/components/ArticleItem.client'; +import ArticleItem from '@/app/[lng]/(main)/grouping/components/ArticleItem'; import { useTranslation } from '@/app/i18n/client'; import { Divider } from '@/components/Divider'; import { Spacing } from '@/components/Spacing'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleHeader.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/ArticleHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/CommentList.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/CommentList.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/CommentList.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/components/CommentList.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/page.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/page.tsx index 5f0852046..9c758af10 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/page.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/articles/[articleId]/page.tsx @@ -1,5 +1,5 @@ -import ArticleDetail from './components/ArticleDetail.client'; -import ArticleHeader from './components/ArticleHeader.client'; +import ArticleDetail from './components/ArticleDetail'; +import ArticleHeader from './components/ArticleHeader'; import CommentForm from './components/CommentForm'; import { Keys, getArticle } from '@/apis/groups'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetail.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetail.tsx similarity index 94% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetail.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetail.tsx index 41655b122..e4a42bdf8 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetail.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetail.tsx @@ -3,7 +3,7 @@ import dynamic from 'next/dynamic'; import { Suspense } from 'react'; -import TopSection from './TopSection.client'; +import TopSection from './TopSection'; import { useGetGroupDetail } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; @@ -12,8 +12,8 @@ import { Spacing } from '@/components/Spacing'; import { Tabs } from '@/components/Tabs'; import { useNumberParams } from '@/hooks/useNumberParams'; -const DetailContent = dynamic(() => import('./detail/DetailContent.client')); -const ArticlesContent = dynamic(() => import('./articles/ArticlesContent.client')); +const DetailContent = dynamic(() => import('./detail/DetailContent')); +const ArticlesContent = dynamic(() => import('./articles/ArticlesContent')); export default function GroupDetailPage() { const { t } = useTranslation('groupDetail'); diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetailHeader.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetailHeader.tsx similarity index 94% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetailHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetailHeader.tsx index df3b396b6..990108434 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetailHeader.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/GroupDetailHeader.tsx @@ -2,16 +2,16 @@ import { Suspense } from 'react'; -import BlockDoneModal from '../../components/BlockDoneModal.client'; -import ReportDoneModal from '../../components/ReportDoneModal.client'; -import WarningModal from '../../components/WarningModal.client'; +import BlockDoneModal from '../../components/BlockDoneModal'; +import ReportDoneModal from '../../components/ReportDoneModal'; +import WarningModal from '../../components/WarningModal'; import { useDeleteGroupMember, useGetGroupDetail } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; import { IconButton } from '@/components/Button'; import { Header } from '@/components/Header'; import { Icon } from '@/components/Icon'; -import MoreBottomSheet from '@/components/Modal/MoreBottomSheet.client'; +import MoreBottomSheet from '@/components/Modal/MoreBottomSheet'; import useAppRouter from '@/hooks/useAppRouter'; import { useModal } from '@/hooks/useModal'; import { useNumberParams } from '@/hooks/useNumberParams'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/TopSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/TopSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/TopSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/TopSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticleSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticleSection.tsx similarity index 97% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticleSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticleSection.tsx index 3fdc7d076..845b0e161 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticleSection.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticleSection.tsx @@ -2,7 +2,7 @@ import { GroupDetailResponse } from '@/apis/groups'; import { useGetArticles } from '@/apis/groups/queries'; -import ArticleItem from '@/app/[lng]/(main)/grouping/components/ArticleItem.client'; +import ArticleItem from '@/app/[lng]/(main)/grouping/components/ArticleItem'; import { ItemList } from '@/components/List'; import { useNumberParams } from '@/hooks/useNumberParams'; import { useBlockStore } from '@/store/useBlockStore'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticlesContent.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticlesContent.tsx similarity index 87% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticlesContent.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticlesContent.tsx index 7bc4b058c..864a4cdd9 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticlesContent.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/ArticlesContent.tsx @@ -1,7 +1,7 @@ import { usePathname } from 'next/navigation'; -import ArticleSection from './ArticleSection.client'; -import NoticeSection from './NoticeSection.client'; +import ArticleSection from './ArticleSection'; +import NoticeSection from './NoticeSection'; import { useGetGroupDetail } from '@/apis/groups'; import { FloatAddButton } from '@/components/Button'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeItem.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeItem.tsx similarity index 96% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeItem.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeItem.tsx index 8da21a64b..7550b3ffe 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeItem.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeItem.tsx @@ -1,4 +1,5 @@ -import WarningModal from '../../../components/WarningModal.client'; +import WarningModal from '../../../components/WarningModal'; + import { type Notice, useDeleteArticle } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; import { Icon } from '@/components/Icon'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeSection.tsx similarity index 97% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeSection.tsx index 4cfc78689..088d0899c 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeSection.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/articles/NoticeSection.tsx @@ -1,6 +1,6 @@ 'use client'; -import NoticeItem from './NoticeItem.client'; +import NoticeItem from './NoticeItem'; import { GroupDetailResponse, useGetNotices } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/DetailContent.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/DetailContent.tsx similarity index 87% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/DetailContent.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/DetailContent.tsx index ba90ae475..d6a50de75 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/DetailContent.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/DetailContent.tsx @@ -1,9 +1,9 @@ 'use client'; import { usePathname } from 'next/navigation'; -import LocationSection from './LocationSection.client'; -import MemberSection from './MemberSection.client'; -import TimeSection from './TimeSection.client'; +import LocationSection from './LocationSection'; +import MemberSection from './MemberSection'; +import TimeSection from './TimeSection'; import { useGetGroupDetail } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/LocationSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/LocationSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/LocationSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/LocationSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/MemberSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/MemberSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/MemberSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/MemberSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/TimeSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/TimeSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/TimeSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/components/detail/TimeSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ApplyCard.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ApplyCard.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ApplyCard.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ApplyCard.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageDetail.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageDetail.tsx similarity index 97% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageDetail.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageDetail.tsx index c46b0bf83..eb05c9a12 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageDetail.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageDetail.tsx @@ -3,7 +3,7 @@ import { useState } from 'react'; import Glider from 'react-glider'; -import ApplyCard from './ApplyCard.client'; +import ApplyCard from './ApplyCard'; import { useGetApplies } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageHeader.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/components/ManageHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/page.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/page.tsx index a5f31d05c..9972e4eb8 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/page.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/manage/page.tsx @@ -1,5 +1,5 @@ -import ManageDetail from './components/ManageDetail.client'; -import ManageHeader from './components/ManageHeader.client'; +import ManageDetail from './components/ManageDetail'; +import ManageHeader from './components/ManageHeader'; import { Keys, getApplies } from '@/apis/groups'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/MemberList.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/MemberList.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/MemberList.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/MemberList.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/MembersHeader.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/MembersHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/MembersHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/components/MembersHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/page.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/page.tsx index 2cae274c6..a38351e84 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/page.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/members/page.tsx @@ -1,5 +1,6 @@ -import MemeberList from './components/MemberList.client'; -import MembersHeader from './components/MembersHeader.client'; +import MemeberList from './components/MemberList'; +import MembersHeader from './components/MembersHeader'; + import { Keys, getGroupMembers } from '@/apis/groups'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; import { HydrationProvider } from '@/components/Provider'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/page.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/page.tsx index 511cf8a50..96c869e1b 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/page.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/page.tsx @@ -1,5 +1,5 @@ -import GroupDetailPage from './components/GroupDetail.client'; -import GroupDetailHeader from './components/GroupDetailHeader.client'; +import GroupDetailPage from './components/GroupDetail'; +import GroupDetailHeader from './components/GroupDetailHeader'; import { Keys, getGroupDetail, getGroupMembers, getNotices } from '@/apis/groups'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/ImageSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/ImageSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/ImageSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/ImageSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/InputForm.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/InputForm.tsx similarity index 95% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/InputForm.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/InputForm.tsx index 9a7b9dcaa..26fbccbcc 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/InputForm.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/InputForm.tsx @@ -2,7 +2,7 @@ import { useForm } from 'react-hook-form'; -import ImageSection from './ImageSection.client'; +import ImageSection from './ImageSection'; import WriteModal from './WriteModal'; import type { WriteFormValues } from '../type'; @@ -12,7 +12,7 @@ import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; import { CircleCheckbox } from '@/components/Checkbox'; import { Flex } from '@/components/Layout'; -import LayerLoading from '@/components/Loading/LayerLoading.client'; +import LayerLoading from '@/components/Loading/LayerLoading'; import { Spacing } from '@/components/Spacing'; import { TextFieldController } from '@/components/TextField'; import { useModal } from '@/hooks/useModal'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/WriteHeader.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/WriteHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/WriteHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/components/WriteHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/page.tsx b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/page.tsx index 6d266e78e..55507a079 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/page.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/[groupId]/write/page.tsx @@ -1,5 +1,6 @@ -import InputForm from './components/InputForm.client'; -import WriteHeader from './components/WriteHeader.client'; +import InputForm from './components/InputForm'; +import WriteHeader from './components/WriteHeader'; + import { Keys, getGroupDetail } from '@/apis/groups'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; import { HydrationProvider } from '@/components/Provider'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/components/ArticleItem.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/components/ArticleItem.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/components/ArticleItem.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/components/ArticleItem.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/components/BlockDoneModal.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/components/BlockDoneModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/components/BlockDoneModal.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/components/BlockDoneModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/components/CreateGroupButton.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/components/CreateGroupButton.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/components/CreateGroupButton.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/components/CreateGroupButton.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/components/GroupingCardList.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/components/GroupingCardList.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/components/GroupingCardList.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/components/GroupingCardList.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/components/ReportDoneModal.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/components/ReportDoneModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/components/ReportDoneModal.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/components/ReportDoneModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/components/WarningModal.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/components/WarningModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/components/WarningModal.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/components/WarningModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/components/CreateHeader.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/components/CreateHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/create/components/CreateHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/components/CreateHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/components/CreateModal.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/components/CreateModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/create/components/CreateModal.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/components/CreateModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/components/LocationBottomSheet.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/components/LocationBottomSheet.tsx similarity index 98% rename from packages/web/src/app/[lng]/(main)/grouping/create/components/LocationBottomSheet.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/components/LocationBottomSheet.tsx index 611548b4f..f08435084 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/create/components/LocationBottomSheet.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/create/components/LocationBottomSheet.tsx @@ -4,7 +4,7 @@ import { useState } from 'react'; import usePlacesService from 'react-google-autocomplete/lib/usePlacesAutocompleteService'; import { Control, useController } from 'react-hook-form'; -import LocationItem from './LocationItem.client'; +import LocationItem from './LocationItem'; import { CreateGroupContextValue } from '../type'; import { useTranslation } from '@/app/i18n/client'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/components/LocationItem.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/components/LocationItem.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/create/components/LocationItem.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/components/LocationItem.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/CreateGroupFunnel.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/CreateGroupFunnel.tsx similarity index 98% rename from packages/web/src/app/[lng]/(main)/grouping/create/funnels/CreateGroupFunnel.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/funnels/CreateGroupFunnel.tsx index f0798a0af..29abdf6b1 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/CreateGroupFunnel.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/CreateGroupFunnel.tsx @@ -12,8 +12,8 @@ import { LayerLoading } from '@/components/Loading'; import { useFunnel } from '@/hooks/useFunnel'; const MainStep = dynamic(() => import('./main/MainStep.client')); -const MeetDateStep = dynamic(() => import('./meetDate/MeetDateStep.client')); -const CreateHeader = dynamic(() => import('../components/CreateHeader.client')); +const MeetDateStep = dynamic(() => import('./meetDate/MeetDateStep')); +const CreateHeader = dynamic(() => import('../components/CreateHeader')); function formatTime(time: TimeType) { time.fromHour = diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/InputSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/InputSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/InputSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/InputSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/MainStep.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/MainStep.client.tsx index 020a8a438..8cf14c8d1 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/MainStep.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/MainStep.client.tsx @@ -1,10 +1,10 @@ import { format } from 'date-fns'; -import InputSection from './InputSection.client'; -import SettingSection from './SettingSection.client'; -import UploadSection from './UploadSection.client'; +import InputSection from './InputSection'; +import SettingSection from './SettingSection'; +import UploadSection from './UploadSection'; import { useCreateGroupContext } from '../../components/CreateGroupContext'; -import CreateModal from '../../components/CreateModal.client'; +import CreateModal from '../../components/CreateModal'; import type { CreateGroupContextValue } from '../../type'; import type { TimeType } from '@/types'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/SettingSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/SettingSection.tsx similarity index 99% rename from packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/SettingSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/SettingSection.tsx index ee64652f1..b33a62a77 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/SettingSection.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/SettingSection.tsx @@ -1,7 +1,7 @@ import { useController } from 'react-hook-form'; import { useCreateGroupContext } from '../../components/CreateGroupContext'; -import LocationBottomSheet from '../../components/LocationBottomSheet.client'; +import LocationBottomSheet from '../../components/LocationBottomSheet'; import { displayDate } from '../../util'; import { useTranslation } from '@/app/i18n/client'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/UploadSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/UploadSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/UploadSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/funnels/main/UploadSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/CalendarSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/CalendarSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/CalendarSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/CalendarSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/MeetDateStep.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/MeetDateStep.tsx similarity index 88% rename from packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/MeetDateStep.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/MeetDateStep.tsx index 24491daf9..282a3b91e 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/MeetDateStep.client.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/MeetDateStep.tsx @@ -1,6 +1,7 @@ -import CalendarSection from './CalendarSection.client'; -import TimeSection from './TimeSection.client'; +import CalendarSection from './CalendarSection'; +import TimeSection from './TimeSection'; import { useCreateGroupContext } from '../../components/CreateGroupContext'; + import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; import { Divider } from '@/components/Divider'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/TimeSection.client.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/TimeSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/TimeSection.client.tsx rename to packages/web/src/app/[lng]/(main)/grouping/create/funnels/meetDate/TimeSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/grouping/create/page.tsx b/packages/web/src/app/[lng]/(main)/grouping/create/page.tsx index 20d5aeea9..3516bb013 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/create/page.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/create/page.tsx @@ -1,7 +1,7 @@ import { Suspense } from 'react'; import CreateGroupContextProvider from './components/CreateGroupContext'; -import CreateGroupFunnel from './funnels/CreateGroupFunnel.client'; +import CreateGroupFunnel from './funnels/CreateGroupFunnel'; export default function CreateGroupPage() { return ( diff --git a/packages/web/src/app/[lng]/(main)/grouping/hooks/useMoreSheet.tsx b/packages/web/src/app/[lng]/(main)/grouping/hooks/useMoreSheet.tsx index 87c8fcd90..6b7362a85 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/hooks/useMoreSheet.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/hooks/useMoreSheet.tsx @@ -1,10 +1,10 @@ 'use client'; -import BlockDoneModal from '../components/BlockDoneModal.client'; -import ReportDoneModal from '../components/ReportDoneModal.client'; -import WarningModal from '../components/WarningModal.client'; +import BlockDoneModal from '../components/BlockDoneModal'; +import ReportDoneModal from '../components/ReportDoneModal'; +import WarningModal from '../components/WarningModal'; import { useDeleteArticle, useDeleteComment } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; -import MoreBottomSheet from '@/components/Modal/MoreBottomSheet.client'; +import MoreBottomSheet from '@/components/Modal/MoreBottomSheet'; import useAppRouter from '@/hooks/useAppRouter'; import { useModal } from '@/hooks/useModal'; import { useBlockStore } from '@/store/useBlockStore'; diff --git a/packages/web/src/app/[lng]/(main)/grouping/page.tsx b/packages/web/src/app/[lng]/(main)/grouping/page.tsx index fe00ca22c..c5ef1edfd 100644 --- a/packages/web/src/app/[lng]/(main)/grouping/page.tsx +++ b/packages/web/src/app/[lng]/(main)/grouping/page.tsx @@ -1,5 +1,5 @@ -import CreateGroupButton from './components/CreateGroupButton.client'; -import GroupingCardList from './components/GroupingCardList.client'; +import CreateGroupButton from './components/CreateGroupButton'; +import GroupingCardList from './components/GroupingCardList'; import GroupingHeader from './components/GroupingHeader'; import { Keys, getGroups } from '@/apis/groups'; diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/components/ContentSection.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/components/ContentSection.tsx similarity index 87% rename from packages/web/src/app/[lng]/(main)/meeting/participate/components/ContentSection.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/components/ContentSection.tsx index b5db0ce04..4aab2eaed 100644 --- a/packages/web/src/app/[lng]/(main)/meeting/participate/components/ContentSection.client.tsx +++ b/packages/web/src/app/[lng]/(main)/meeting/participate/components/ContentSection.tsx @@ -7,9 +7,9 @@ import { useTranslation } from '@/app/i18n/client'; import { Loading } from '@/components/Loading'; import { Tabs } from '@/components/Tabs'; -const ParticipatingContent = dynamic(() => import('./ParticipatingContent.client')); -const WaitingContent = dynamic(() => import('./WaitingContent.client')); -const FeedbackContent = dynamic(() => import('./FeedbackContent.client')); +const ParticipatingContent = dynamic(() => import('./ParticipatingContent')); +const WaitingContent = dynamic(() => import('./WaitingContent')); +const FeedbackContent = dynamic(() => import('./FeedbackContent')); export default function ContentSection() { const { t } = useTranslation('meeting'); diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackContent.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackContent.tsx similarity index 96% rename from packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackContent.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackContent.tsx index 85c570b62..bd8e7aaf5 100644 --- a/packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackContent.client.tsx +++ b/packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackContent.tsx @@ -1,6 +1,6 @@ 'use client'; -import FeedbackModal from './FeedbackModal.client'; +import FeedbackModal from './FeedbackModal'; import SubtitleSection from './SubtitleSection'; import NoMeeting from '../../components/NoMeeting'; diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackModal.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackModal.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/components/FeedbackModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/components/ParticipatingContent.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/components/ParticipatingContent.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/components/ParticipatingContent.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/components/ParticipatingContent.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/components/WaitingContent.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/components/WaitingContent.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/components/WaitingContent.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/components/WaitingContent.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackFunnel.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackFunnel.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackFunnel.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackFunnel.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackHeader.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackHeader.tsx index 2444dfd8e..84d669bb2 100644 --- a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackHeader.tsx +++ b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackHeader.tsx @@ -1,5 +1,6 @@ 'use client'; -import FeedbackOutModal from '../funnels/step1/FeedbackOutModal.client'; +import FeedbackOutModal from '../funnels/step1/FeedbackOutModal'; + import { IconButton } from '@/components/Button'; import { Header } from '@/components/Header'; import { Icon } from '@/components/Icon'; diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackProvider.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackProvider.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackProvider.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/FeedbackProvider.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/Membercard.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/Membercard.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/Membercard.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/components/Membercard.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/FeedbackOutModal.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/FeedbackOutModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/FeedbackOutModal.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/FeedbackOutModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/NoShowModal.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/NoShowModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/NoShowModal.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/NoShowModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/Step1.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/Step1.tsx index 51cde3185..483a614dc 100644 --- a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/Step1.tsx +++ b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step1/Step1.tsx @@ -1,8 +1,11 @@ -import NoShowModal from './NoShowModal.client'; +import NoShowModal from './NoShowModal'; import { convertShowMember } from '../../../util'; -import { useFeedbackContext } from '../../components/FeedbackProvider.client'; -import Membercard from '../../components/Membercard.client'; +import { useFeedbackContext } from '../../components/FeedbackProvider'; +import Membercard from '../../components/Membercard'; import TitleSection from '../../components/TitleSection'; + +import type { EstimateResponse } from '@/apis/groups'; + import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; import { Divider } from '@/components/Divider'; @@ -12,8 +15,6 @@ import { Spacing } from '@/components/Spacing'; import { Tag } from '@/components/Tag'; import { useModal } from '@/hooks/useModal'; -import type { EstimateResponse } from '@/apis/groups'; - interface Step1Props { onNextClick: () => void; groupMemberList: EstimateResponse['groupMemberList']; diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step2/Step2.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step2/Step2.tsx index 4fa0b98d1..d58b7f2d4 100644 --- a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step2/Step2.tsx +++ b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step2/Step2.tsx @@ -1,6 +1,6 @@ import { convertShowMember } from '../../../util'; -import { useFeedbackContext } from '../../components/FeedbackProvider.client'; -import Membercard from '../../components/Membercard.client'; +import { useFeedbackContext } from '../../components/FeedbackProvider'; +import Membercard from '../../components/Membercard'; import TitleSection from '../../components/TitleSection'; import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/FeedbackCompleteModal.client.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/FeedbackCompleteModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/FeedbackCompleteModal.client.tsx rename to packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/FeedbackCompleteModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/Step3.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/Step3.tsx index 3f90369f6..0ec03689e 100644 --- a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/Step3.tsx +++ b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/Step3.tsx @@ -1,7 +1,8 @@ import { PRAISE_VALUE_MAP } from '../../../constants'; -import { FeedbackRequestType, useFeedbackContext } from '../../components/FeedbackProvider.client'; -import Membercard from '../../components/Membercard.client'; +import { FeedbackRequestType, useFeedbackContext } from '../../components/FeedbackProvider'; +import Membercard from '../../components/Membercard'; import TitleSection from '../../components/TitleSection'; + import { type EstimateResponse, usePostEstimate } from '@/apis/groups'; import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/page.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/page.tsx index f25a6f200..c402c67b7 100644 --- a/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/page.tsx +++ b/packages/web/src/app/[lng]/(main)/meeting/participate/feedback/[groupId]/page.tsx @@ -1,5 +1,6 @@ -import FeedbackFunnel from './components/FeedbackFunnel.client'; -import FeedbackProvider from './components/FeedbackProvider.client'; +import FeedbackFunnel from './components/FeedbackFunnel'; +import FeedbackProvider from './components/FeedbackProvider'; + import { Keys, getEstimate } from '@/apis/groups'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; import { HydrationProvider } from '@/components/Provider'; diff --git a/packages/web/src/app/[lng]/(main)/meeting/participate/page.tsx b/packages/web/src/app/[lng]/(main)/meeting/participate/page.tsx index 7bdf94c88..c9ab21164 100644 --- a/packages/web/src/app/[lng]/(main)/meeting/participate/page.tsx +++ b/packages/web/src/app/[lng]/(main)/meeting/participate/page.tsx @@ -1,4 +1,4 @@ -import ContentSection from './components/ContentSection.client'; +import ContentSection from './components/ContentSection'; import MeetingParticipateHeader from './components/MeetingParticipateHeader'; import { diff --git a/packages/web/src/app/[lng]/(main)/profile/[userId]/components/ProfileByIdDetail.client.tsx b/packages/web/src/app/[lng]/(main)/profile/[userId]/components/ProfileByIdDetail.tsx similarity index 97% rename from packages/web/src/app/[lng]/(main)/profile/[userId]/components/ProfileByIdDetail.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/[userId]/components/ProfileByIdDetail.tsx index b27fea253..c7e6e4a32 100644 --- a/packages/web/src/app/[lng]/(main)/profile/[userId]/components/ProfileByIdDetail.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/[userId]/components/ProfileByIdDetail.tsx @@ -1,5 +1,5 @@ 'use client'; -import ProfileDetail from '../../components/ProfileDetailSection.client'; +import ProfileDetail from '../../components/ProfileDetailSection'; import { useGetProfileById } from '@/apis/profile'; import { useNumberParams } from '@/hooks/useNumberParams'; diff --git a/packages/web/src/app/[lng]/(main)/profile/[userId]/page.tsx b/packages/web/src/app/[lng]/(main)/profile/[userId]/page.tsx index 6eedaa32c..e12a2ddff 100644 --- a/packages/web/src/app/[lng]/(main)/profile/[userId]/page.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/[userId]/page.tsx @@ -1,4 +1,4 @@ -import ProfileByIdDetail from './components/ProfileByIdDetail.client'; +import ProfileByIdDetail from './components/ProfileByIdDetail'; import ProfileByIdHeader from './components/ProfileByIdHeader'; import { Keys, getProfileById } from '@/apis/profile'; diff --git a/packages/web/src/app/[lng]/(main)/profile/components/ProfileDetail.client.tsx b/packages/web/src/app/[lng]/(main)/profile/components/ProfileDetail.tsx similarity index 76% rename from packages/web/src/app/[lng]/(main)/profile/components/ProfileDetail.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/components/ProfileDetail.tsx index 6f6622b26..44de1c61c 100644 --- a/packages/web/src/app/[lng]/(main)/profile/components/ProfileDetail.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/components/ProfileDetail.tsx @@ -1,6 +1,5 @@ 'use client'; - -import ProfileDetailSection from './ProfileDetailSection.client'; +import ProfileDetailSection from './ProfileDetailSection'; import { useGetProfile } from '@/apis/profile'; diff --git a/packages/web/src/app/[lng]/(main)/profile/components/ProfileDetailSection.client.tsx b/packages/web/src/app/[lng]/(main)/profile/components/ProfileDetailSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/components/ProfileDetailSection.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/components/ProfileDetailSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/components/ProfileHeader.client.tsx b/packages/web/src/app/[lng]/(main)/profile/components/ProfileHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/components/ProfileHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/components/ProfileHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDeleteModal.client.tsx b/packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDeleteModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDeleteModal.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDeleteModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDetail.client.tsx b/packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDetail.tsx similarity index 97% rename from packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDetail.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDetail.tsx index 062120138..6d03ba1ee 100644 --- a/packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDetail.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/mates/components/MatesDetail.tsx @@ -1,7 +1,8 @@ 'use client'; -import MoreBottomSheet from './MoreBottomSheet.client'; +import MoreBottomSheet from './MoreBottomSheet'; import { formatRelativeDate } from '../util'; + import { type Mate, useGetMates } from '@/apis/profile'; import NoMeeting from '@/app/[lng]/(main)/meeting/components/NoMeeting'; import { useTranslation } from '@/app/i18n/client'; diff --git a/packages/web/src/app/[lng]/(main)/profile/mates/components/MatesHeader.client.tsx b/packages/web/src/app/[lng]/(main)/profile/mates/components/MatesHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/mates/components/MatesHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/mates/components/MatesHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/mates/components/MoreBottomSheet.client.tsx b/packages/web/src/app/[lng]/(main)/profile/mates/components/MoreBottomSheet.tsx similarity index 94% rename from packages/web/src/app/[lng]/(main)/profile/mates/components/MoreBottomSheet.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/mates/components/MoreBottomSheet.tsx index 328f3e43f..e3adc5a72 100644 --- a/packages/web/src/app/[lng]/(main)/profile/mates/components/MoreBottomSheet.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/mates/components/MoreBottomSheet.tsx @@ -1,4 +1,4 @@ -import MatesDeleteModal from './MatesDeleteModal.client'; +import MatesDeleteModal from './MatesDeleteModal'; import { Mate } from '@/apis/profile'; import { BottomSheet } from '@/components/Modal'; diff --git a/packages/web/src/app/[lng]/(main)/profile/mates/page.tsx b/packages/web/src/app/[lng]/(main)/profile/mates/page.tsx index caa50b044..789c8704a 100644 --- a/packages/web/src/app/[lng]/(main)/profile/mates/page.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/mates/page.tsx @@ -1,5 +1,6 @@ -import ProfileMatesDetail from './components/MatesDetail.client'; -import MatesHeader from './components/MatesHeader.client'; +import ProfileMatesDetail from './components/MatesDetail'; +import MatesHeader from './components/MatesHeader'; + import { Keys, getMates } from '@/apis/profile'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; import { HydrationProvider } from '@/components/Provider'; diff --git a/packages/web/src/app/[lng]/(main)/profile/page.tsx b/packages/web/src/app/[lng]/(main)/profile/page.tsx index 7544f0d7e..76b769aca 100644 --- a/packages/web/src/app/[lng]/(main)/profile/page.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/page.tsx @@ -1,5 +1,5 @@ -import ProfileDetail from './components/ProfileDetail.client'; -import ProfileHeader from './components/ProfileHeader.client'; +import ProfileDetail from './components/ProfileDetail'; +import ProfileHeader from './components/ProfileHeader'; import { Keys, getProfile } from '@/apis/profile'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; diff --git a/packages/web/src/app/[lng]/(main)/profile/praise/components/PraiseHeader.client.tsx b/packages/web/src/app/[lng]/(main)/profile/praise/components/PraiseHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/praise/components/PraiseHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/praise/components/PraiseHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/praise/components/ProfilePraiseDetail.client.tsx b/packages/web/src/app/[lng]/(main)/profile/praise/components/ProfilePraiseDetail.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/praise/components/ProfilePraiseDetail.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/praise/components/ProfilePraiseDetail.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/praise/page.tsx b/packages/web/src/app/[lng]/(main)/profile/praise/page.tsx index 516071b1e..238d5038f 100644 --- a/packages/web/src/app/[lng]/(main)/profile/praise/page.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/praise/page.tsx @@ -1,5 +1,6 @@ -import PraiseHeader from './components/PraiseHeader.client'; -import ProfilePraiseDetail from './components/ProfilePraiseDetail.client'; +import PraiseHeader from './components/PraiseHeader'; +import ProfilePraiseDetail from './components/ProfilePraiseDetail'; + import { Keys, getPraises } from '@/apis/profile'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; import { HydrationProvider } from '@/components/Provider'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/components/LinkSection.server.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/components/LinkSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/setting/components/LinkSection.server.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/components/LinkSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/components/ProfileSection.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/components/ProfileSection.tsx similarity index 99% rename from packages/web/src/app/[lng]/(main)/profile/setting/components/ProfileSection.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/components/ProfileSection.tsx index e75c999b9..d398da8c2 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/components/ProfileSection.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/components/ProfileSection.tsx @@ -1,5 +1,4 @@ 'use client'; - import { useGetProfile } from '@/apis/profile'; import { Avatar } from '@/components/Avatar'; import { Icon } from '@/components/Icon'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/components/SettingHeader.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/components/SettingHeader.tsx similarity index 99% rename from packages/web/src/app/[lng]/(main)/profile/setting/components/SettingHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/components/SettingHeader.tsx index 7c98f9eae..53577d876 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/components/SettingHeader.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/components/SettingHeader.tsx @@ -1,4 +1,5 @@ 'use client'; + import { useTranslation } from '@/app/i18n/client'; import { IconButton } from '@/components/Button'; import { Header } from '@/components/Header'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteCompleteModal.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteCompleteModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteCompleteModal.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteCompleteModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteModal.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteModal.tsx similarity index 94% rename from packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteModal.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteModal.tsx index 889ccc0a4..1f3dda74f 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteModal.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteModal.tsx @@ -1,4 +1,5 @@ -import DeleteCompleteModal from './DeleteCompleteModal.client'; +import DeleteCompleteModal from './DeleteCompleteModal'; + import { usePatchSignOut } from '@/apis/profile'; import { useTranslation } from '@/app/i18n/client'; import { Icon } from '@/components/Icon'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteProvider.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteProvider.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteProvider.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteProvider.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteSection.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteSection.tsx index bf56fc8e6..9011dedb4 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteSection.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/DeleteSection.tsx @@ -1,6 +1,6 @@ 'use client'; import DeleteHeader from './DeleteHeader'; -import DeleteProvider from './DeleteProvider.client'; +import DeleteProvider from './DeleteProvider'; import Step1 from './Step1'; import Step2 from './Step2'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/Step1.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/Step1.tsx index 83a7c0ccd..657bda57c 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/Step1.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/Step1.tsx @@ -1,4 +1,4 @@ -import { useDeleteContext } from './DeleteProvider.client'; +import { useDeleteContext } from './DeleteProvider'; import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/Step2.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/Step2.tsx index e458a09d3..0c37cd1f8 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/Step2.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/delete/components/Step2.tsx @@ -1,5 +1,5 @@ -import DeleteModal from './DeleteModal.client'; -import { useDeleteContext } from './DeleteProvider.client'; +import DeleteModal from './DeleteModal'; +import { useDeleteContext } from './DeleteProvider'; import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/EditProvider.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/EditProvider.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/setting/edit/components/EditProvider.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/edit/components/EditProvider.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/ProfileEdit.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/ProfileEdit.tsx similarity index 83% rename from packages/web/src/app/[lng]/(main)/profile/setting/edit/components/ProfileEdit.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/edit/components/ProfileEdit.tsx index 6f1ace816..41886a6d3 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/ProfileEdit.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/ProfileEdit.tsx @@ -1,10 +1,12 @@ 'use client'; -import EditProvider from './EditProvider.client'; -import Step1 from './step1/Step1.client'; -import Step2 from './step2/Step2.client'; +import { useState } from 'react'; + +import EditProvider from './EditProvider'; +import Step1 from './step1/Step1'; +import Step2 from './step2/Step2'; + import { useGetProfile } from '@/apis/profile'; import { ModalProvider } from '@/hooks/useModal'; -import { useState } from 'react'; export default function ProfileEdit() { const [step, setStep] = useState(1); diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1.tsx similarity index 73% rename from packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1.tsx index f9ec39a6c..aaf8c3cf2 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1.tsx @@ -1,5 +1,6 @@ -import Step1Header from './Step1Header.client'; -import Step1InputForm from './Step1InputForm.client'; +import Step1Header from './Step1Header'; +import Step1InputForm from './Step1InputForm'; + import { Spacing } from '@/components/Spacing'; export interface Step1Props { diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1Header.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1Header.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1Header.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1Header.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1InputForm.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1InputForm.tsx similarity index 97% rename from packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1InputForm.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1InputForm.tsx index 101352752..eaa543c8e 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1InputForm.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step1/Step1InputForm.tsx @@ -1,9 +1,9 @@ import { useController } from 'react-hook-form'; import CountryBotoomSheet from './CountryBotoomSheet'; -import { Step1Props } from './Step1.client'; +import { Step1Props } from './Step1'; import { formatBirthDTO } from '../../util'; -import { useEditContext } from '../EditProvider.client'; +import { useEditContext } from '../EditProvider'; import { ProfileRequest, usePatchProfile } from '@/apis/profile'; import { useTranslation } from '@/app/i18n/client'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2.tsx similarity index 92% rename from packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2.tsx index 4df424d62..7f39d6d9f 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2.tsx @@ -1,5 +1,5 @@ import Step2Header from './Step2Header'; -import Step2InputForm from './Step2InputForm.client'; +import Step2InputForm from './Step2InputForm'; import { useTranslation } from '@/app/i18n/client'; import { Spacing } from '@/components/Spacing'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2InputForm.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2InputForm.tsx similarity index 96% rename from packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2InputForm.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2InputForm.tsx index e01ae4d17..3aa625380 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2InputForm.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step2/Step2InputForm.tsx @@ -1,10 +1,12 @@ -import { useEditContext } from '../EditProvider.client'; +import { useCallback } from 'react'; + +import { useEditContext } from '../EditProvider'; + import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; import { Tag } from '@/components/Tag'; import { personalityList } from '@/constants/personalityList'; import { PersonalityType } from '@/types'; -import { useCallback } from 'react'; interface InputFormProps { onPrevClick: () => void; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step3/Step3.client.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step3/Step3.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step3/Step3.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/setting/edit/components/step3/Step3.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/edit/page.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/edit/page.tsx index c5269a5cd..fd63b0a9b 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/edit/page.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/edit/page.tsx @@ -1,4 +1,5 @@ -import ProfileEdit from './components/ProfileEdit.client'; +import ProfileEdit from './components/ProfileEdit'; + import { Keys, getProfile } from '@/apis/profile'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; import { HydrationProvider } from '@/components/Provider'; diff --git a/packages/web/src/app/[lng]/(main)/profile/setting/page.tsx b/packages/web/src/app/[lng]/(main)/profile/setting/page.tsx index 3c22507c8..a6d821c1d 100644 --- a/packages/web/src/app/[lng]/(main)/profile/setting/page.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/setting/page.tsx @@ -1,6 +1,7 @@ -import LinkSection from './components/LinkSection.server'; -import ProfileSection from './components/ProfileSection.client'; -import SettingHeader from './components/SettingHeader.client'; +import LinkSection from './components/LinkSection'; +import ProfileSection from './components/ProfileSection'; +import SettingHeader from './components/SettingHeader'; + import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; interface PageParams { diff --git a/packages/web/src/app/[lng]/(main)/profile/verify/components/CertificateSkipModal.client.tsx b/packages/web/src/app/[lng]/(main)/profile/verify/components/CertificateSkipModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/verify/components/CertificateSkipModal.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/verify/components/CertificateSkipModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/verify/components/EmailForm.client.tsx b/packages/web/src/app/[lng]/(main)/profile/verify/components/EmailForm.tsx similarity index 96% rename from packages/web/src/app/[lng]/(main)/profile/verify/components/EmailForm.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/verify/components/EmailForm.tsx index 404d9a1ef..35d7fb72c 100644 --- a/packages/web/src/app/[lng]/(main)/profile/verify/components/EmailForm.client.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/verify/components/EmailForm.tsx @@ -1,15 +1,17 @@ 'use client'; -import VerifyBottomSheet from './VerifyBottomSheet.client'; +import { memo } from 'react'; +import { useForm } from 'react-hook-form'; + +import VerifyBottomSheet from './VerifyBottomSheet'; + +import type { VerifyType } from '../type'; + import { useEmailMutation } from '@/apis/auth'; import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; import { TextFieldController } from '@/components/TextField'; import { regexr } from '@/constants/regexr'; import { useModal } from '@/hooks/useModal'; -import { memo } from 'react'; -import { useForm } from 'react-hook-form'; - -import type { VerifyType } from '../type'; const defaultValues = { email: '', diff --git a/packages/web/src/app/[lng]/(main)/profile/verify/components/NoticeSection.client.tsx b/packages/web/src/app/[lng]/(main)/profile/verify/components/NoticeSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/verify/components/NoticeSection.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/verify/components/NoticeSection.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/verify/components/VerifyBottomSheet.client.tsx b/packages/web/src/app/[lng]/(main)/profile/verify/components/VerifyBottomSheet.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/verify/components/VerifyBottomSheet.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/verify/components/VerifyBottomSheet.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/verify/components/VerifyHeader.client.tsx b/packages/web/src/app/[lng]/(main)/profile/verify/components/VerifyHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/profile/verify/components/VerifyHeader.client.tsx rename to packages/web/src/app/[lng]/(main)/profile/verify/components/VerifyHeader.tsx diff --git a/packages/web/src/app/[lng]/(main)/profile/verify/page.tsx b/packages/web/src/app/[lng]/(main)/profile/verify/page.tsx index 18a5dabe8..1faafcb80 100644 --- a/packages/web/src/app/[lng]/(main)/profile/verify/page.tsx +++ b/packages/web/src/app/[lng]/(main)/profile/verify/page.tsx @@ -1,7 +1,8 @@ -import EmailForm from './components/EmailForm.client'; -import NoticeSection from './components/NoticeSection.client'; +import EmailForm from './components/EmailForm'; +import NoticeSection from './components/NoticeSection'; import TitleTextMessage from './components/TitleTextMessage'; -import VerifyHeader from './components/VerifyHeader.client'; +import VerifyHeader from './components/VerifyHeader'; + import { serverTranslation } from '@/app/i18n'; interface PageProps { diff --git a/packages/web/src/app/[lng]/(sub)/join/components/JoinContentTextMessage.client.tsx b/packages/web/src/app/[lng]/(sub)/join/components/JoinContentTextMessage.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/components/JoinContentTextMessage.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/components/JoinContentTextMessage.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/components/JoinContext.client.tsx b/packages/web/src/app/[lng]/(sub)/join/components/JoinContext.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/components/JoinContext.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/components/JoinContext.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/components/JoinHeader.client.tsx b/packages/web/src/app/[lng]/(sub)/join/components/JoinHeader.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/components/JoinHeader.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/components/JoinHeader.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/components/JoinTitleTextMessage.client.tsx b/packages/web/src/app/[lng]/(sub)/join/components/JoinTitleTextMessage.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/components/JoinTitleTextMessage.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/components/JoinTitleTextMessage.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/JoinFunnel.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/JoinFunnel.tsx index c2940e4c5..8dfe4a757 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/JoinFunnel.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/JoinFunnel.tsx @@ -2,12 +2,12 @@ import { createContext, useContext } from 'react'; -import Step1Component from './step1/Step1Component.client'; -import Step2Component from './step2/Step2Component.client'; -import Step3Component from './step3/Step3Component.client'; -import Step4Component from './step4/Step4Component.client'; -import Step5Component from './step5/Step5Component.client'; -import JoinHeader from '../components/JoinHeader.client'; +import Step1Component from './step1/Step1Component'; +import Step2Component from './step2/Step2Component'; +import Step3Component from './step3/Step3Component'; +import Step4Component from './step4/Step4Component'; +import Step5Component from './step5/Step5Component'; +import JoinHeader from '../components/JoinHeader'; import { useFunnel } from '@/hooks/useFunnel'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/Step1Component.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/Step1Component.tsx similarity index 76% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step1/Step1Component.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step1/Step1Component.tsx index daa4d318e..2c65c199f 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/Step1Component.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/Step1Component.tsx @@ -1,8 +1,9 @@ 'use client'; -import FormSection from './components/FormSection.client'; -import NoticeSection from './components/NoticeSection.client'; -import JoinTitleTextMessage from '../../components/JoinTitleTextMessage.client'; +import FormSection from './components/FormSection'; +import NoticeSection from './components/NoticeSection'; +import JoinTitleTextMessage from '../../components/JoinTitleTextMessage'; + import { useTranslation } from '@/app/i18n/client'; import { Spacing } from '@/components/Spacing'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/FormSection.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/FormSection.tsx similarity index 71% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/FormSection.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/FormSection.tsx index fbcf93ac2..f1b13dbe4 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/FormSection.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/FormSection.tsx @@ -1,12 +1,14 @@ 'use client'; -import NumberForm from './NumberForm.client'; -import NumberVerifyForm from './NumberVerifyForm.client'; -import TimerProvider from '@/components/Provider/TimerProvider.client'; import { useState } from 'react'; +import NumberForm from './NumberForm'; +import NumberVerifyForm from './NumberVerifyForm'; + import type { StatusType } from '../type'; +import TimerProvider from '@/components/Provider/TimerProvider'; + export default function InputForm() { const [inputStatus, setInputStatus] = useState('beforeSend'); diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NoticeSection.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NoticeSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NoticeSection.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NoticeSection.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberForm.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberForm.tsx similarity index 97% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberForm.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberForm.tsx index 6ba5cb665..5de70fab3 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberForm.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberForm.tsx @@ -1,6 +1,6 @@ import { ElementType, KeyboardEventHandler } from 'react'; -import { useJoinContext } from '../../../components/JoinContext.client'; +import { useJoinContext } from '../../../components/JoinContext'; import { formatNumber, formatNumberBackSpace } from '../util'; import type { SignUpState } from '../../../type'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberVerifyForm.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberVerifyForm.tsx similarity index 98% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberVerifyForm.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberVerifyForm.tsx index 70f825d72..25850dba4 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberVerifyForm.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberVerifyForm.tsx @@ -1,4 +1,4 @@ -import { useJoinContext } from '../../../components/JoinContext.client'; +import { useJoinContext } from '../../../components/JoinContext'; import { useFunnelContext } from '../../JoinFunnel'; import { formatWithoutHyphen } from '../util'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step2/Step2Component.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step2/Step2Component.tsx similarity index 91% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step2/Step2Component.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step2/Step2Component.tsx index 5278a9db1..9bd0f9976 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step2/Step2Component.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step2/Step2Component.tsx @@ -1,9 +1,10 @@ 'use client'; -import AgreeBottomSheet from './components/AgreeBottomSheet.client'; +import AgreeBottomSheet from './components/AgreeBottomSheet'; import SchoolInput from './components/SchoolInput'; import SchoolResultList from './components/SchoolResult'; -import JoinTitleTextMessage from '../../components/JoinTitleTextMessage.client'; +import JoinTitleTextMessage from '../../components/JoinTitleTextMessage'; + import { useTranslation } from '@/app/i18n/client'; import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; import { useDidMount } from '@/hooks/common/useDidMount'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/AgreeBottomSheet.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/AgreeBottomSheet.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/AgreeBottomSheet.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/AgreeBottomSheet.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SchoolInput.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SchoolInput.tsx index ce0a53f51..1eb1fb225 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SchoolInput.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SchoolInput.tsx @@ -1,6 +1,6 @@ 'use client'; -import { useJoinContext } from '../../../components/JoinContext.client'; +import { useJoinContext } from '../../../components/JoinContext'; import { useFunnelContext } from '../../JoinFunnel'; import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SchoolResult.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SchoolResult.tsx index 9b6be25b3..f893bc7f4 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SchoolResult.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SchoolResult.tsx @@ -1,5 +1,5 @@ 'use client'; -import { useJoinContext } from '../../../components/JoinContext.client'; +import { useJoinContext } from '../../../components/JoinContext'; import { formatAddress } from '../utils'; import { SchoolSearchResponse, useGetSearchSchool } from '@/apis/auth'; import { Icon } from '@/components/Icon'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SearchResultSection.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SearchResultSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SearchResultSection.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step2/components/SearchResultSection.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step3/Step3Component.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step3/Step3Component.tsx similarity index 73% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step3/Step3Component.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step3/Step3Component.tsx index 4ecf4ff45..7e4c7f8a3 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step3/Step3Component.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step3/Step3Component.tsx @@ -1,8 +1,9 @@ 'use client'; -import EmailForm from './components/EmailForm.client'; -import NoticeSection from './components/NoticeSection.client'; -import JoinTitleTextMessage from '../../components/JoinTitleTextMessage.client'; +import EmailForm from './components/EmailForm'; +import NoticeSection from './components/NoticeSection'; +import JoinTitleTextMessage from '../../components/JoinTitleTextMessage'; + import { useTranslation } from '@/app/i18n/client'; export default function Step3Component() { diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/CertificateSkipModal.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/CertificateSkipModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/CertificateSkipModal.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/CertificateSkipModal.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/EmailForm.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/EmailForm.tsx similarity index 91% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/EmailForm.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/EmailForm.tsx index 0f78c0371..0e5fdd5b6 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/EmailForm.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/EmailForm.tsx @@ -1,17 +1,19 @@ 'use client'; -import CertificateSkipModal from './CertificateSkipModal.client'; -import VerifyBottomSheet from './VerifyBottomSheet.client'; -import { useJoinContext } from '../../../components/JoinContext.client'; +import { memo } from 'react'; + +import CertificateSkipModal from './CertificateSkipModal'; +import VerifyBottomSheet from './VerifyBottomSheet'; +import { useJoinContext } from '../../../components/JoinContext'; import { useFunnelContext } from '../../JoinFunnel'; + +import type { SignUpState } from '../../../type'; + import { useEmailMutation } from '@/apis/auth'; import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; import { TextFieldController } from '@/components/TextField'; import { regexr } from '@/constants/regexr'; import { useModal } from '@/hooks/useModal'; -import { memo } from 'react'; - -import type { SignUpState } from '../../../type'; export default memo(function EmailForm() { const { t } = useTranslation('join'); diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/NoticeSection.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/NoticeSection.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/NoticeSection.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/NoticeSection.tsx diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/VerifyBottomSheet.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/VerifyBottomSheet.tsx similarity index 97% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/VerifyBottomSheet.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/VerifyBottomSheet.tsx index 1e8e6654f..b3a96d60d 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/VerifyBottomSheet.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step3/components/VerifyBottomSheet.tsx @@ -1,4 +1,4 @@ -import { useJoinContext } from '../../../components/JoinContext.client'; +import { useJoinContext } from '../../../components/JoinContext'; import { useEmailVerifyMutation } from '@/apis/auth'; import { useTranslation } from '@/app/i18n/client'; import { Button, ButtonGroup } from '@/components/Button'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step4/Step4Component.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step4/Step4Component.tsx similarity index 60% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step4/Step4Component.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step4/Step4Component.tsx index daf905b91..7509e460d 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step4/Step4Component.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step4/Step4Component.tsx @@ -1,6 +1,6 @@ 'use client'; -import InputForm from './components/InputForm.client'; +import InputForm from './components/InputForm'; export default function Step4Component() { return ; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step4/components/InputForm.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step4/components/InputForm.tsx similarity index 98% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step4/components/InputForm.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step4/components/InputForm.tsx index 9dfeca8c0..10c6f3b2f 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step4/components/InputForm.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step4/components/InputForm.tsx @@ -2,7 +2,7 @@ import Image from 'next/image'; import { type ElementType, type KeyboardEventHandler, useState } from 'react'; -import { useJoinContext } from '../../../components/JoinContext.client'; +import { useJoinContext } from '../../../components/JoinContext'; import { useFunnelContext } from '../../JoinFunnel'; import { formatBirthBackspace, formatBirthTyping } from '../util'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step5/Step5Component.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step5/Step5Component.tsx similarity index 87% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step5/Step5Component.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step5/Step5Component.tsx index b4145d5cc..f0eb1c779 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step5/Step5Component.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step5/Step5Component.tsx @@ -1,8 +1,9 @@ 'use client'; -import InputForm from './components/InputForm.client'; -import JoinContentTextMessage from '../../components/JoinContentTextMessage.client'; -import JoinTitleTextMessage from '../../components/JoinTitleTextMessage.client'; +import InputForm from './components/InputForm'; +import JoinContentTextMessage from '../../components/JoinContentTextMessage'; +import JoinTitleTextMessage from '../../components/JoinTitleTextMessage'; + import { useTranslation } from '@/app/i18n/client'; import { Spacing } from '@/components/Spacing'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/InputForm.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/InputForm.tsx similarity index 97% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/InputForm.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/InputForm.tsx index a3076e79d..26746f06b 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/InputForm.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/InputForm.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react'; -import { useJoinContext } from '../../../components/JoinContext.client'; +import { useJoinContext } from '../../../components/JoinContext'; import type { SignUpState } from '../../../type'; diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/PersonalityItem.client.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/PersonalityItem.tsx similarity index 93% rename from packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/PersonalityItem.client.tsx rename to packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/PersonalityItem.tsx index ea2c9a184..3e0fba11a 100644 --- a/packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/PersonalityItem.client.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/funnels/step5/components/PersonalityItem.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import { memo } from 'react'; -import { useJoinContext } from '../../../components/JoinContext.client'; +import { useJoinContext } from '../../../components/JoinContext'; import type { PersonalityType } from '@/types'; diff --git a/packages/web/src/app/[lng]/(sub)/join/page.tsx b/packages/web/src/app/[lng]/(sub)/join/page.tsx index c66870667..f9e7f5ce0 100644 --- a/packages/web/src/app/[lng]/(sub)/join/page.tsx +++ b/packages/web/src/app/[lng]/(sub)/join/page.tsx @@ -1,6 +1,6 @@ import { Suspense } from 'react'; -import JoinContextProvider from './components/JoinContext.client'; +import JoinContextProvider from './components/JoinContext'; import JoinFunnel from './funnels/JoinFunnel'; import { Loading } from '@/components/Loading'; diff --git a/packages/web/src/app/[lng]/(sub)/notification/components/NotiCard.client.tsx b/packages/web/src/app/[lng]/(sub)/notification/components/NotiCard.tsx similarity index 100% rename from packages/web/src/app/[lng]/(sub)/notification/components/NotiCard.client.tsx rename to packages/web/src/app/[lng]/(sub)/notification/components/NotiCard.tsx diff --git a/packages/web/src/app/[lng]/(sub)/notification/components/NotificationSection.tsx b/packages/web/src/app/[lng]/(sub)/notification/components/NotificationSection.tsx index ba735cd21..14e3ca504 100644 --- a/packages/web/src/app/[lng]/(sub)/notification/components/NotificationSection.tsx +++ b/packages/web/src/app/[lng]/(sub)/notification/components/NotificationSection.tsx @@ -1,5 +1,6 @@ 'use client'; -import NotiCard from './NotiCard.client'; +import NotiCard from './NotiCard'; + import { useGetNotifications } from '@/apis/notifications'; import { useTranslation } from '@/app/i18n/client'; import { Icon } from '@/components/Icon'; diff --git a/packages/web/src/app/i18n/client.ts b/packages/web/src/app/i18n/client.ts index 93a4727c0..bfa881f3f 100644 --- a/packages/web/src/app/i18n/client.ts +++ b/packages/web/src/app/i18n/client.ts @@ -1,4 +1,3 @@ -/* eslint-disable react-hooks/rules-of-hooks */ 'use client'; import i18next from 'i18next'; diff --git a/packages/web/src/components/Analytics/GoogleAnalytics.client.tsx b/packages/web/src/components/Analytics/GoogleAnalytics.tsx similarity index 100% rename from packages/web/src/components/Analytics/GoogleAnalytics.client.tsx rename to packages/web/src/components/Analytics/GoogleAnalytics.tsx diff --git a/packages/web/src/components/Analytics/index.ts b/packages/web/src/components/Analytics/index.ts index 661d69c5d..32cd711b0 100644 --- a/packages/web/src/components/Analytics/index.ts +++ b/packages/web/src/components/Analytics/index.ts @@ -1 +1 @@ -export { default as GoogleAnalytics } from './GoogleAnalytics.client'; +export { default as GoogleAnalytics } from './GoogleAnalytics'; diff --git a/packages/web/src/components/Calendar/Calendar.client.tsx b/packages/web/src/components/Calendar/Calendar.tsx similarity index 100% rename from packages/web/src/components/Calendar/Calendar.client.tsx rename to packages/web/src/components/Calendar/Calendar.tsx diff --git a/packages/web/src/components/Calendar/index.ts b/packages/web/src/components/Calendar/index.ts index a09b5d924..711315c08 100644 --- a/packages/web/src/components/Calendar/index.ts +++ b/packages/web/src/components/Calendar/index.ts @@ -1 +1 @@ -export { default as Calendar } from './Calendar.client'; +export { default as Calendar } from './Calendar'; diff --git a/packages/web/src/components/Card/CardHeader.client.tsx b/packages/web/src/components/Card/CardHeader.tsx similarity index 100% rename from packages/web/src/components/Card/CardHeader.client.tsx rename to packages/web/src/components/Card/CardHeader.tsx diff --git a/packages/web/src/components/Card/GroupingCard.client.tsx b/packages/web/src/components/Card/GroupingCard.tsx similarity index 100% rename from packages/web/src/components/Card/GroupingCard.client.tsx rename to packages/web/src/components/Card/GroupingCard.tsx diff --git a/packages/web/src/components/Card/NoMeeting.tsx b/packages/web/src/components/Card/NoMeeting.tsx new file mode 100644 index 000000000..832cbed8a --- /dev/null +++ b/packages/web/src/components/Card/NoMeeting.tsx @@ -0,0 +1,16 @@ +import Icon from '@/components/Icon/Icon'; +import Flex from '@/components/Layout/Flex'; +import Spacing from '@/components/Spacing/Spacing'; + +interface NoMeetingProps { + message: string; +} +export default function NoMeeting({ message }: NoMeetingProps) { + return ( + + + +

{message}

+ + ); +} diff --git a/packages/web/src/components/Card/index.ts b/packages/web/src/components/Card/index.ts index 597cf7edb..7f9d4389a 100644 --- a/packages/web/src/components/Card/index.ts +++ b/packages/web/src/components/Card/index.ts @@ -1,2 +1,2 @@ -export { default as GroupingCard } from './GroupingCard.client'; -export { default as CardHeader } from './CardHeader.client'; +export { default as GroupingCard } from './GroupingCard'; +export { default as CardHeader } from './CardHeader'; diff --git a/packages/web/src/components/Loading/LayerLoading.client.tsx b/packages/web/src/components/Loading/LayerLoading.tsx similarity index 100% rename from packages/web/src/components/Loading/LayerLoading.client.tsx rename to packages/web/src/components/Loading/LayerLoading.tsx diff --git a/packages/web/src/components/Loading/index.ts b/packages/web/src/components/Loading/index.ts index eb6ec74f1..797943832 100644 --- a/packages/web/src/components/Loading/index.ts +++ b/packages/web/src/components/Loading/index.ts @@ -1,2 +1,2 @@ export { default as Loading } from './Loading'; -export { default as LayerLoading } from './LayerLoading.client'; +export { default as LayerLoading } from './LayerLoading'; diff --git a/packages/web/src/components/Modal/BottomSheet.client.tsx b/packages/web/src/components/Modal/BottomSheet.tsx similarity index 100% rename from packages/web/src/components/Modal/BottomSheet.client.tsx rename to packages/web/src/components/Modal/BottomSheet.tsx diff --git a/packages/web/src/components/Modal/ImageModal.client.tsx b/packages/web/src/components/Modal/ImageModal.tsx similarity index 96% rename from packages/web/src/components/Modal/ImageModal.client.tsx rename to packages/web/src/components/Modal/ImageModal.tsx index 92020b067..649d6991b 100644 --- a/packages/web/src/components/Modal/ImageModal.client.tsx +++ b/packages/web/src/components/Modal/ImageModal.tsx @@ -3,7 +3,7 @@ import Image from 'next/image'; import React, { useEffect, useState } from 'react'; import Glider from 'react-glider'; -import ModalWrapper from './ModalWrapper.client'; +import ModalWrapper from './ModalWrapper'; import { Flex } from '../Layout'; import { Spacing } from '../Spacing'; diff --git a/packages/web/src/components/Modal/Modal.client.tsx b/packages/web/src/components/Modal/Modal.tsx similarity index 97% rename from packages/web/src/components/Modal/Modal.client.tsx rename to packages/web/src/components/Modal/Modal.tsx index f6c8f84ea..5c175ce18 100644 --- a/packages/web/src/components/Modal/Modal.client.tsx +++ b/packages/web/src/components/Modal/Modal.tsx @@ -1,7 +1,7 @@ 'use client'; import { useState } from 'react'; -import ModalWrapper from './ModalWrapper.client'; +import ModalWrapper from './ModalWrapper'; import { Button } from '../Button'; import { Spacing } from '../Spacing'; diff --git a/packages/web/src/components/Modal/ModalWrapper.client.tsx b/packages/web/src/components/Modal/ModalWrapper.tsx similarity index 100% rename from packages/web/src/components/Modal/ModalWrapper.client.tsx rename to packages/web/src/components/Modal/ModalWrapper.tsx diff --git a/packages/web/src/components/Modal/MoreBottomSheet.client.tsx b/packages/web/src/components/Modal/MoreBottomSheet.tsx similarity index 95% rename from packages/web/src/components/Modal/MoreBottomSheet.client.tsx rename to packages/web/src/components/Modal/MoreBottomSheet.tsx index cca49374c..74d2ae9fb 100644 --- a/packages/web/src/components/Modal/MoreBottomSheet.client.tsx +++ b/packages/web/src/components/Modal/MoreBottomSheet.tsx @@ -1,6 +1,6 @@ import { Children, isValidElement } from 'react'; -import BottomSheet from './BottomSheet.client'; +import BottomSheet from './BottomSheet'; import { Flex } from '../Layout'; import type { StrictPropsWithChildren } from '@/types'; diff --git a/packages/web/src/components/Modal/Toast.client.tsx b/packages/web/src/components/Modal/Toast.tsx similarity index 100% rename from packages/web/src/components/Modal/Toast.client.tsx rename to packages/web/src/components/Modal/Toast.tsx diff --git a/packages/web/src/components/Modal/index.ts b/packages/web/src/components/Modal/index.ts index 234554f5d..e9755f7c5 100644 --- a/packages/web/src/components/Modal/index.ts +++ b/packages/web/src/components/Modal/index.ts @@ -1,5 +1,5 @@ -export { default as ModalWrapper } from './ModalWrapper.client'; -export { default as Toast } from './Toast.client'; -export { default as BottomSheet } from './BottomSheet.client'; -export { default as ImageModal } from './ImageModal.client'; -export * from './Modal.client'; +export { default as ModalWrapper } from './ModalWrapper'; +export { default as Toast } from './Toast'; +export { default as BottomSheet } from './BottomSheet'; +export { default as ImageModal } from './ImageModal'; +export * from './Modal'; diff --git a/packages/web/src/components/Provider/QueryProvider.client.tsx b/packages/web/src/components/Provider/QueryProvider.tsx similarity index 100% rename from packages/web/src/components/Provider/QueryProvider.client.tsx rename to packages/web/src/components/Provider/QueryProvider.tsx diff --git a/packages/web/src/components/Provider/TimerProvider.client.tsx b/packages/web/src/components/Provider/TimerProvider.tsx similarity index 100% rename from packages/web/src/components/Provider/TimerProvider.client.tsx rename to packages/web/src/components/Provider/TimerProvider.tsx diff --git a/packages/web/src/components/Provider/index.ts b/packages/web/src/components/Provider/index.ts index 03cbde8b8..15a836946 100644 --- a/packages/web/src/components/Provider/index.ts +++ b/packages/web/src/components/Provider/index.ts @@ -1,3 +1,3 @@ export { default as HydrationProvider } from './HydrationProvider'; -export { default as QueryProvider } from './QueryProvider.client'; -export * from './TimerProvider.client'; +export { default as QueryProvider } from './QueryProvider'; +export * from './TimerProvider'; diff --git a/packages/web/src/components/SegmentGroup/SegmentGroup.client.tsx b/packages/web/src/components/SegmentGroup/SegmentGroup.tsx similarity index 100% rename from packages/web/src/components/SegmentGroup/SegmentGroup.client.tsx rename to packages/web/src/components/SegmentGroup/SegmentGroup.tsx diff --git a/packages/web/src/components/SegmentGroup/index.ts b/packages/web/src/components/SegmentGroup/index.ts index 64ac89e8c..9b3a268ea 100644 --- a/packages/web/src/components/SegmentGroup/index.ts +++ b/packages/web/src/components/SegmentGroup/index.ts @@ -1,2 +1,2 @@ -export { default as SegmentGroup } from './SegmentGroup.client'; -export { default as Segment } from './SegmentGroup.client'; +export { default as SegmentGroup } from './SegmentGroup'; +export { default as Segment } from './SegmentGroup'; diff --git a/packages/web/src/components/Tabs/Tabs.tsx b/packages/web/src/components/Tabs/Tabs.tsx index e82542a2b..eb8057ec9 100644 --- a/packages/web/src/components/Tabs/Tabs.tsx +++ b/packages/web/src/components/Tabs/Tabs.tsx @@ -115,7 +115,7 @@ function Panel({ value, children }: PropsWithChildren>) const searchParams = useSearchParams(); const isActive = searchParams.get('tab') === value; - return isActive && <>{children}; + return <> {isActive && children}; } Tabs.List = List; diff --git a/packages/web/src/components/TextField/TextField.client.tsx b/packages/web/src/components/TextField/TextField.tsx similarity index 100% rename from packages/web/src/components/TextField/TextField.client.tsx rename to packages/web/src/components/TextField/TextField.tsx diff --git a/packages/web/src/components/TextField/TextFieldController.client.tsx b/packages/web/src/components/TextField/TextFieldController.tsx similarity index 97% rename from packages/web/src/components/TextField/TextFieldController.client.tsx rename to packages/web/src/components/TextField/TextFieldController.tsx index 5d1219715..0e0565b62 100644 --- a/packages/web/src/components/TextField/TextFieldController.client.tsx +++ b/packages/web/src/components/TextField/TextFieldController.tsx @@ -1,7 +1,7 @@ 'use client'; import { forwardRef } from 'react'; -import TextField, { type TextFieldProps } from './TextField.client'; +import TextField, { type TextFieldProps } from './TextField'; import { Icon } from '../Icon'; import type { UseFormRegisterReturn, UseFormReturn } from 'react-hook-form'; diff --git a/packages/web/src/components/TextField/index.ts b/packages/web/src/components/TextField/index.ts index 79eab4974..9716507ef 100644 --- a/packages/web/src/components/TextField/index.ts +++ b/packages/web/src/components/TextField/index.ts @@ -1,2 +1,2 @@ -export { default as TextField } from './TextField.client'; -export { default as TextFieldController } from './TextFieldController.client'; +export { default as TextField } from './TextField'; +export { default as TextFieldController } from './TextFieldController'; diff --git a/packages/web/src/hooks/useDebounceCallback.ts b/packages/web/src/hooks/useDebounceCallback.ts index b18dbdb28..052a3ebc9 100644 --- a/packages/web/src/hooks/useDebounceCallback.ts +++ b/packages/web/src/hooks/useDebounceCallback.ts @@ -1,3 +1,4 @@ +'use client'; import { useCallback, useState } from 'react'; type CallbackFunction = (...params: unknown[]) => void; From 6cd9b106cda129a8bda5b7970b66c7bc50c0787c Mon Sep 17 00:00:00 2001 From: Hee Su Date: Thu, 4 Apr 2024 15:32:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Refactor:=20=EB=9D=BC=EC=9A=B0=ED=8C=85=20?= =?UTF-8?q?=EC=8B=9C=20=EC=A6=89=EA=B0=81=EC=A0=81=EC=9D=B8=20loading=20?= =?UTF-8?q?=ED=94=BC=EB=93=9C=EB=B0=B1,=20lint=20=EC=88=98=EC=A0=95,=20Foo?= =?UTF-8?q?ter=EB=A5=BC=20layout=EC=9C=BC=EB=A1=9C=20(#675)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 코드스플리팅 제거 * refactor: Modal 관련 hook import error 임시조치 * refactor: community article list 통합 * refactor: Footer -> layout으로 이동 * refactor: 폴더 구조 변경 * refactor: lint 수정 --- packages/web/src/apis/auth/queries.ts | 3 +- packages/web/src/apis/common/mutations.ts | 3 +- packages/web/src/apis/config/privateApi.ts | 4 +- packages/web/src/apis/groups/mutations.tsx | 4 +- packages/web/src/apis/meeting/mutations.ts | 3 +- packages/web/src/apis/meeting/queries.ts | 3 +- .../web/src/apis/notifications/mutations.ts | 3 +- .../web/src/apis/notifications/queries.ts | 3 +- packages/web/src/apis/profile/mutations.ts | 4 +- packages/web/src/apis/profile/queries.ts | 3 +- .../community/components/AllContent.tsx | 37 ------------------ .../community/components/ArticleItem.tsx | 20 +++------- ...stionContent.tsx => CommunityArticles.tsx} | 9 +++-- .../community/components/ContentSection.tsx | 16 +++----- .../community/components/KpopContent.tsx | 38 ------------------- .../community/components/LanguageContent.tsx | 38 ------------------- .../[articleId]/components/ArticleDetail.tsx | 0 .../components/ArticleDetailHeader.tsx | 2 +- .../[articleId]/components/ArticleItem.tsx | 2 +- .../[articleId]/components/CommentForm.tsx | 0 .../[articleId]/components/CommentItem.tsx | 2 +- .../[articleId]/components/CommentList.tsx | 0 .../components/CommentProvider.tsx | 0 .../[articleId]/components/CommunityModal.tsx | 0 .../[articleId]/components/ReplyItem.tsx | 2 +- .../[articleId]/components/ReplyList.tsx | 2 +- .../{ => detail}/[articleId]/page.tsx | 13 ++++--- .../app/[lng]/(main)/community/loading.tsx | 19 ++++++++++ .../src/app/[lng]/(main)/community/page.tsx | 24 ++++-------- .../write/components/InputSection.tsx | 2 +- .../write/components/WriteHeader.tsx | 2 +- .../grouping/components/ArticleItem.tsx | 2 +- .../grouping/components/GroupingCardList.tsx | 5 +-- .../create/funnels/main/MainStep.client.tsx | 3 +- .../create/funnels/main/SettingSection.tsx | 2 +- .../funnels/meetDate/CalendarSection.tsx | 3 +- .../app/[lng]/(main)/grouping/create/page.tsx | 8 ++-- .../apply/components/ApplyHeader.tsx | 0 .../[groupId]/apply/components/ApplyModal.tsx | 0 .../[groupId]/apply/components/InputForm.tsx | 2 +- .../{ => detail}/[groupId]/apply/page.tsx | 0 .../[articleId]/components/ArticleDetail.tsx | 0 .../[articleId]/components/ArticleHeader.tsx | 0 .../[articleId]/components/CommentForm.tsx | 0 .../[articleId]/components/CommentList.tsx | 0 .../[groupId]/articles/[articleId]/page.tsx | 8 ++-- .../[groupId]/components/GroupDetail.tsx | 0 .../components/GroupDetailHeader.tsx | 10 ++--- .../[groupId]/components/TopSection.tsx | 2 +- .../components/articles/ArticleSection.tsx | 0 .../components/articles/ArticlesContent.tsx | 0 .../components/articles/NoticeItem.tsx | 4 +- .../components/articles/NoticeSection.tsx | 0 .../components/detail/DetailContent.tsx | 0 .../components/detail/LocationSection.tsx | 0 .../components/detail/MemberSection.tsx | 0 .../components/detail/TimeSection.tsx | 0 .../[groupId]/manage/components/ApplyCard.tsx | 2 +- .../manage/components/ManageDetail.tsx | 11 +++++- .../manage/components/ManageHeader.tsx | 0 .../manage/components/ManageModal.tsx | 0 .../{ => detail}/[groupId]/manage/page.tsx | 8 ++-- .../members/components/MemberList.tsx | 0 .../members/components/MembersHeader.tsx | 0 .../{ => detail}/[groupId]/members/page.tsx | 8 ++-- .../grouping/{ => detail}/[groupId]/page.tsx | 8 ++-- .../write/components/ImageSection.tsx | 0 .../[groupId]/write/components/InputForm.tsx | 2 +- .../write/components/WriteHeader.tsx | 3 +- .../[groupId]/write/components/WriteModal.tsx | 0 .../{ => detail}/[groupId]/write/page.tsx | 8 ++-- .../{ => detail}/[groupId]/write/type.ts | 0 .../(main)/grouping/hooks/useMoreSheet.tsx | 3 +- .../src/app/[lng]/(main)/grouping/loading.tsx | 19 ++++++++++ .../src/app/[lng]/(main)/grouping/page.tsx | 10 ++--- packages/web/src/app/[lng]/(main)/layout.tsx | 11 ++++++ packages/web/src/app/[lng]/(main)/loading.tsx | 19 ++++++++++ .../(main)/meeting/components/NoMeeting.tsx | 16 -------- .../src/app/[lng]/(main)/meeting/loading.tsx | 19 ++++++++++ .../participate/components/ContentSection.tsx | 9 ++--- .../components/FeedbackContent.tsx | 6 +-- .../components/ParticipatingContent.tsx | 8 ++-- .../participate/components/WaitingContent.tsx | 8 ++-- .../[groupId]/components/FeedbackHeader.tsx | 2 +- .../[groupId]/funnels/step1/Step1.tsx | 2 +- .../[lng]/(main)/meeting/participate/page.tsx | 10 ++--- .../scrap/components/ContentSection.tsx | 10 ++--- .../app/[lng]/(main)/meeting/scrap/page.tsx | 12 +++--- .../[lng]/(main)/profile/[userId]/page.tsx | 8 ++-- .../src/app/[lng]/(main)/profile/loading.tsx | 19 ++++++++++ .../profile/mates/components/MatesDetail.tsx | 6 +-- .../mates/components/MoreBottomSheet.tsx | 2 +- .../app/[lng]/(main)/profile/mates/page.tsx | 8 ++-- .../web/src/app/[lng]/(main)/profile/page.tsx | 10 ++--- .../app/[lng]/(main)/profile/praise/page.tsx | 8 ++-- .../setting/delete/components/DeleteModal.tsx | 2 +- .../setting/delete/components/Step2.tsx | 2 +- .../setting/edit/components/ProfileEdit.tsx | 2 +- .../edit/components/step1/Step1InputForm.tsx | 2 +- .../app/[lng]/(main)/profile/setting/page.tsx | 8 ++-- .../profile/verify/components/EmailForm.tsx | 2 +- .../funnels/step1/components/NumberForm.tsx | 2 +- .../join/funnels/step2/Step2Component.tsx | 2 +- .../funnels/step3/components/EmailForm.tsx | 2 +- .../funnels/step4/components/InputForm.tsx | 2 +- .../funnels/step5/components/InputForm.tsx | 2 +- .../web/src/app/[lng]/(sub)/join/page.tsx | 2 +- packages/web/src/app/[lng]/not-found.tsx | 7 ++-- packages/web/src/components/Avatar/Avatar.tsx | 26 +++++++++++-- .../web/src/components/Calendar/Calendar.tsx | 11 ++++-- .../web/src/components/Card/GroupingCard.tsx | 2 +- .../web/src/components/Card/NoMeeting.tsx | 16 -------- packages/web/src/components/Empty/Empty.tsx | 11 ++---- .../ErrorBoundary/ErrorFallback.tsx | 16 ++++++++ .../LocalSuspenseErrorBoundary.tsx | 21 +++------- .../web/src/components/ErrorBoundary/index.ts | 1 + packages/web/src/components/Footer/Footer.tsx | 28 +++++++------- packages/web/src/components/Layout/Flex.tsx | 3 +- .../web/src/components/Modal/ImageModal.tsx | 11 +++++- .../components/Provider/HydrationProvider.tsx | 9 ++++- .../src/components/Provider/QueryProvider.tsx | 3 +- .../src/components/Provider/ToastProvider.tsx | 2 +- packages/web/src/hooks/useModal/index.ts | 3 -- packages/web/src/hooks/useModal/useToast.tsx | 1 + packages/web/src/middleware.ts | 2 +- 125 files changed, 400 insertions(+), 388 deletions(-) delete mode 100644 packages/web/src/app/[lng]/(main)/community/components/AllContent.tsx rename packages/web/src/app/[lng]/(main)/community/components/{QuestionContent.tsx => CommunityArticles.tsx} (85%) delete mode 100644 packages/web/src/app/[lng]/(main)/community/components/KpopContent.tsx delete mode 100644 packages/web/src/app/[lng]/(main)/community/components/LanguageContent.tsx rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/ArticleDetail.tsx (100%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/ArticleDetailHeader.tsx (98%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/ArticleItem.tsx (98%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/CommentForm.tsx (100%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/CommentItem.tsx (99%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/CommentList.tsx (100%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/CommentProvider.tsx (100%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/CommunityModal.tsx (100%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/ReplyItem.tsx (98%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/components/ReplyList.tsx (88%) rename packages/web/src/app/[lng]/(main)/community/{ => detail}/[articleId]/page.tsx (67%) create mode 100644 packages/web/src/app/[lng]/(main)/community/loading.tsx rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/apply/components/ApplyHeader.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/apply/components/ApplyModal.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/apply/components/InputForm.tsx (97%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/apply/page.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/articles/[articleId]/components/ArticleDetail.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/articles/[articleId]/components/ArticleHeader.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/articles/[articleId]/components/CommentForm.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/articles/[articleId]/components/CommentList.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/articles/[articleId]/page.tsx (82%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/GroupDetail.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/GroupDetailHeader.tsx (93%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/TopSection.tsx (98%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/articles/ArticleSection.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/articles/ArticlesContent.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/articles/NoticeItem.tsx (93%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/articles/NoticeSection.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/detail/DetailContent.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/detail/LocationSection.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/detail/MemberSection.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/components/detail/TimeSection.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/manage/components/ApplyCard.tsx (98%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/manage/components/ManageDetail.tsx (90%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/manage/components/ManageHeader.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/manage/components/ManageModal.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/manage/page.tsx (76%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/members/components/MemberList.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/members/components/MembersHeader.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/members/page.tsx (78%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/page.tsx (83%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/write/components/ImageSection.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/write/components/InputForm.tsx (98%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/write/components/WriteHeader.tsx (95%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/write/components/WriteModal.tsx (100%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/write/page.tsx (77%) rename packages/web/src/app/[lng]/(main)/grouping/{ => detail}/[groupId]/write/type.ts (100%) create mode 100644 packages/web/src/app/[lng]/(main)/grouping/loading.tsx create mode 100644 packages/web/src/app/[lng]/(main)/layout.tsx create mode 100644 packages/web/src/app/[lng]/(main)/loading.tsx delete mode 100644 packages/web/src/app/[lng]/(main)/meeting/components/NoMeeting.tsx create mode 100644 packages/web/src/app/[lng]/(main)/meeting/loading.tsx create mode 100644 packages/web/src/app/[lng]/(main)/profile/loading.tsx delete mode 100644 packages/web/src/components/Card/NoMeeting.tsx create mode 100644 packages/web/src/components/ErrorBoundary/ErrorFallback.tsx delete mode 100644 packages/web/src/hooks/useModal/index.ts diff --git a/packages/web/src/apis/auth/queries.ts b/packages/web/src/apis/auth/queries.ts index f43265052..5164d07be 100644 --- a/packages/web/src/apis/auth/queries.ts +++ b/packages/web/src/apis/auth/queries.ts @@ -1,6 +1,7 @@ -import { Keys, NicknameDuplicateResponse, getNicknameDuplicate, getSchoolSearch } from '.'; import { useQuery, useSuspenseQuery } from '@tanstack/react-query'; +import { Keys, NicknameDuplicateResponse, getNicknameDuplicate, getSchoolSearch } from '.'; + export const useGetSearchSchool = (searchWord: string) => useSuspenseQuery({ queryKey: Keys.getSchoolSearch(searchWord), diff --git a/packages/web/src/apis/common/mutations.ts b/packages/web/src/apis/common/mutations.ts index c4ccbe4af..3b623bbf0 100644 --- a/packages/web/src/apis/common/mutations.ts +++ b/packages/web/src/apis/common/mutations.ts @@ -1,6 +1,7 @@ -import { postFiles } from './apis'; import { useMutation } from '@tanstack/react-query'; +import { postFiles } from './apis'; + export const usePostFiles = () => { return useMutation({ mutationFn: postFiles }); }; diff --git a/packages/web/src/apis/config/privateApi.ts b/packages/web/src/apis/config/privateApi.ts index 657d6bafa..42468826b 100644 --- a/packages/web/src/apis/config/privateApi.ts +++ b/packages/web/src/apis/config/privateApi.ts @@ -1,7 +1,5 @@ import axios, { AxiosError, AxiosResponse, type InternalAxiosRequestConfig } from 'axios'; -import { postReissue } from '../auth'; - import type { CustomInstance, ErrorType } from './type'; import { BASE_API_URL } from '@/constants'; @@ -19,7 +17,7 @@ privateApi.defaults.timeout = 2500; privateApi.interceptors.request.use( async (config: InternalAxiosRequestConfig) => { try { - const { accessToken, refreshToken } = await getTokenFromCookie(); + const { accessToken } = await getTokenFromCookie(); config.headers['X-AUTH-TOKEN'] = accessToken; return config; } catch (error) { diff --git a/packages/web/src/apis/groups/mutations.tsx b/packages/web/src/apis/groups/mutations.tsx index 97b5d4545..fb808a41e 100644 --- a/packages/web/src/apis/groups/mutations.tsx +++ b/packages/web/src/apis/groups/mutations.tsx @@ -20,7 +20,7 @@ import { Keys as MeetingKeys } from '../meeting/keys'; import FeedbackCompleteModal from '@/app/[lng]/(main)/meeting/participate/feedback/[groupId]/funnels/step3/FeedbackCompleteModal'; import useAppRouter from '@/hooks/useAppRouter'; -import { useModal } from '@/hooks/useModal'; +import useModal from '@/hooks/useModal/useModal'; export const usePostCreateGroup = () => { const { replace } = useAppRouter(); @@ -30,7 +30,7 @@ export const usePostCreateGroup = () => { mutationFn: postCreateGroup, onSuccess: (data) => { queryClient.resetQueries({ queryKey: GroupsKeys.getGroups() }); - replace(`/grouping/${data.groupId}?tab=detail`); + replace(`/grouping/detail/${data.groupId}?tab=detail`); }, }); }; diff --git a/packages/web/src/apis/meeting/mutations.ts b/packages/web/src/apis/meeting/mutations.ts index a3a8768be..da14c267e 100644 --- a/packages/web/src/apis/meeting/mutations.ts +++ b/packages/web/src/apis/meeting/mutations.ts @@ -1,4 +1,5 @@ -import { postMeetingRejected } from '.'; import { useMutation } from '@tanstack/react-query'; +import { postMeetingRejected } from '.'; + export const usePostApply = () => useMutation({ mutationFn: postMeetingRejected }); diff --git a/packages/web/src/apis/meeting/queries.ts b/packages/web/src/apis/meeting/queries.ts index b170847b4..e7822c986 100644 --- a/packages/web/src/apis/meeting/queries.ts +++ b/packages/web/src/apis/meeting/queries.ts @@ -1,3 +1,5 @@ +import { useSuspenseQuery } from '@tanstack/react-query'; + import { getMeetingHosting, getMeetingNotEstimated, @@ -7,7 +9,6 @@ import { getMeetingWaiting, } from '.'; import { Keys } from './keys'; -import { useSuspenseQuery } from '@tanstack/react-query'; export const useGetExample = () => {}; diff --git a/packages/web/src/apis/notifications/mutations.ts b/packages/web/src/apis/notifications/mutations.ts index ed4b7eb9c..901cc6f92 100644 --- a/packages/web/src/apis/notifications/mutations.ts +++ b/packages/web/src/apis/notifications/mutations.ts @@ -1,6 +1,7 @@ -import { postFCMToken } from './apis'; import { useMutation } from '@tanstack/react-query'; +import { postFCMToken } from './apis'; + export const usePostFCMToken = () => { return useMutation({ mutationFn: postFCMToken }); }; diff --git a/packages/web/src/apis/notifications/queries.ts b/packages/web/src/apis/notifications/queries.ts index a29540092..0828f78c3 100644 --- a/packages/web/src/apis/notifications/queries.ts +++ b/packages/web/src/apis/notifications/queries.ts @@ -1,5 +1,6 @@ -import { Keys, getNotification } from '.'; import { useSuspenseQuery } from '@tanstack/react-query'; +import { Keys, getNotification } from '.'; + export const useGetNotifications = () => useSuspenseQuery({ queryKey: Keys.getNotifications(), queryFn: getNotification }); diff --git a/packages/web/src/apis/profile/mutations.ts b/packages/web/src/apis/profile/mutations.ts index a07ea9bb4..6f5b88945 100644 --- a/packages/web/src/apis/profile/mutations.ts +++ b/packages/web/src/apis/profile/mutations.ts @@ -1,6 +1,8 @@ +import { useMutation, useQueryClient } from '@tanstack/react-query'; + import { Keys, deleteMate, patchProfile, patchSignOut, postEmailVerify } from '.'; + import useAppRouter from '@/hooks/useAppRouter'; -import { useMutation, useQueryClient } from '@tanstack/react-query'; export const usePatchProfile = () => { const queryClient = useQueryClient(); diff --git a/packages/web/src/apis/profile/queries.ts b/packages/web/src/apis/profile/queries.ts index d998312f4..3501ec6aa 100644 --- a/packages/web/src/apis/profile/queries.ts +++ b/packages/web/src/apis/profile/queries.ts @@ -1,6 +1,7 @@ -import { Keys, getMates, getPraises, getProfile, getProfileById } from '.'; import { useSuspenseQuery } from '@tanstack/react-query'; +import { Keys, getMates, getPraises, getProfile, getProfileById } from '.'; + export const useGetProfile = () => useSuspenseQuery({ queryKey: Keys.getProfile(), diff --git a/packages/web/src/app/[lng]/(main)/community/components/AllContent.tsx b/packages/web/src/app/[lng]/(main)/community/components/AllContent.tsx deleted file mode 100644 index 97478a977..000000000 --- a/packages/web/src/app/[lng]/(main)/community/components/AllContent.tsx +++ /dev/null @@ -1,37 +0,0 @@ -'use client'; - -import { useEffect } from 'react'; -import { useInView } from 'react-intersection-observer'; - -import { useGetCommunityArticles } from '@/apis/community/queries'; -import ArticleItem from '@/app/[lng]/(main)/community/components/ArticleItem'; -import Empty from '@/app/[lng]/(main)/community/components/Empty'; -import { ItemList } from '@/components/List'; -import { useBlockStore } from '@/store/useBlockStore'; - -export default function AllContent() { - const { ref, inView } = useInView(); - const { blockCommunityArticleIds } = useBlockStore(); - const { data: articleList, fetchNextPage, hasNextPage } = useGetCommunityArticles(0); - - useEffect(() => { - if (inView && hasNextPage) fetchNextPage(); - }, [inView, fetchNextPage]); - - return ( - <> - { - return ( - !blockCommunityArticleIds.includes(articleData.article.id) && ( - - ) - ); - }} - renderEmpty={() => } - /> -
- - ); -} diff --git a/packages/web/src/app/[lng]/(main)/community/components/ArticleItem.tsx b/packages/web/src/app/[lng]/(main)/community/components/ArticleItem.tsx index 635f8eed8..e8eaae9d0 100644 --- a/packages/web/src/app/[lng]/(main)/community/components/ArticleItem.tsx +++ b/packages/web/src/app/[lng]/(main)/community/components/ArticleItem.tsx @@ -47,26 +47,18 @@ export default function ArticleItem({ articleData, onClick }: ArticleItemProps) likeCount, isLiked, createdAt, - isWriter, - userId, - thumbnail, category, } = article; - const { - id: writerId, - isCertifiedStudent, - reliabilityLevel, - nickName, - countryName, - countryImage, - profileImage, - } = writer; + const { isCertifiedStudent, reliabilityLevel, nickName, countryImage, profileImage } = writer; const locale = i18n.language === 'ko' ? ko : enUS; return ( -
push(`/community/${articleId}`, false))}> +
push(`/community/detail/${articleId}`, false))} + > {t(`category.${category.name}`)}

{formatDate(createdAt, locale)}

@@ -80,7 +72,7 @@ export default function ArticleItem({ articleData, onClick }: ArticleItemProps)
{!!images?.length && (
- 이미지 + 이미지
)} diff --git a/packages/web/src/app/[lng]/(main)/community/components/QuestionContent.tsx b/packages/web/src/app/[lng]/(main)/community/components/CommunityArticles.tsx similarity index 85% rename from packages/web/src/app/[lng]/(main)/community/components/QuestionContent.tsx rename to packages/web/src/app/[lng]/(main)/community/components/CommunityArticles.tsx index 7076a67d8..a4882d363 100644 --- a/packages/web/src/app/[lng]/(main)/community/components/QuestionContent.tsx +++ b/packages/web/src/app/[lng]/(main)/community/components/CommunityArticles.tsx @@ -8,13 +8,16 @@ import Empty from './Empty'; import { useGetCommunityArticles } from '@/apis/community/queries'; import { ItemList } from '@/components/List'; -import { Loading } from '@/components/Loading'; import { useBlockStore } from '@/store/useBlockStore'; -export default function QuestionContent() { +interface CommunityArticle { + categoryId: number; +} + +export default function CommunityArticles({ categoryId }: CommunityArticle) { const { ref, inView } = useInView(); const { blockCommunityArticleIds } = useBlockStore(); - const { data: articleList, fetchNextPage, hasNextPage } = useGetCommunityArticles(2); + const { data: articleList, fetchNextPage, hasNextPage } = useGetCommunityArticles(categoryId); useEffect(() => { if (inView && hasNextPage) fetchNextPage(); diff --git a/packages/web/src/app/[lng]/(main)/community/components/ContentSection.tsx b/packages/web/src/app/[lng]/(main)/community/components/ContentSection.tsx index 7bb7a006f..b563f6a30 100644 --- a/packages/web/src/app/[lng]/(main)/community/components/ContentSection.tsx +++ b/packages/web/src/app/[lng]/(main)/community/components/ContentSection.tsx @@ -1,16 +1,12 @@ 'use client'; -import dynamic from 'next/dynamic'; import { Suspense } from 'react'; +import CommunityArticles from './CommunityArticles'; + import { useTranslation } from '@/app/i18n/client'; import { Loading } from '@/components/Loading'; import { Tabs } from '@/components/Tabs'; -const AllContent = dynamic(() => import('./AllContent')); -const KpopContent = dynamic(() => import('./KpopContent')); -const LanguageContent = dynamic(() => import('./LanguageContent')); -const QuestionContent = dynamic(() => import('./QuestionContent')); - export default function ContentSection() { const { t } = useTranslation('community'); @@ -24,22 +20,22 @@ export default function ContentSection() { }> - + }> - + }> - + }> - + diff --git a/packages/web/src/app/[lng]/(main)/community/components/KpopContent.tsx b/packages/web/src/app/[lng]/(main)/community/components/KpopContent.tsx deleted file mode 100644 index 7f012d8a3..000000000 --- a/packages/web/src/app/[lng]/(main)/community/components/KpopContent.tsx +++ /dev/null @@ -1,38 +0,0 @@ -'use client'; - -import { useEffect } from 'react'; -import { useInView } from 'react-intersection-observer'; - -import ArticleItem from './ArticleItem'; -import Empty from './Empty'; - -import { useGetCommunityArticles } from '@/apis/community/queries'; -import { ItemList } from '@/components/List'; -import { useBlockStore } from '@/store/useBlockStore'; - -export default function KpopContent() { - const { ref, inView } = useInView(); - const { blockCommunityArticleIds } = useBlockStore(); - const { data: articleList, fetchNextPage, hasNextPage } = useGetCommunityArticles(1); - - useEffect(() => { - if (inView && hasNextPage) fetchNextPage(); - }, [inView, fetchNextPage]); - - return ( - <> - { - return ( - !blockCommunityArticleIds.includes(articleData.article.id) && ( - - ) - ); - }} - renderEmpty={() => } - /> -
- - ); -} diff --git a/packages/web/src/app/[lng]/(main)/community/components/LanguageContent.tsx b/packages/web/src/app/[lng]/(main)/community/components/LanguageContent.tsx deleted file mode 100644 index 983c7f264..000000000 --- a/packages/web/src/app/[lng]/(main)/community/components/LanguageContent.tsx +++ /dev/null @@ -1,38 +0,0 @@ -'use client'; - -import { useEffect } from 'react'; -import { useInView } from 'react-intersection-observer'; - -import ArticleItem from './ArticleItem'; -import Empty from './Empty'; - -import { useGetCommunityArticles } from '@/apis/community/queries'; -import { ItemList } from '@/components/List'; -import { useBlockStore } from '@/store/useBlockStore'; - -export default function LanguageContent() { - const { ref, inView } = useInView(); - const { blockCommunityArticleIds } = useBlockStore(); - const { data: articleList, fetchNextPage, hasNextPage } = useGetCommunityArticles(3); - - useEffect(() => { - if (inView && hasNextPage) fetchNextPage(); - }, [inView, fetchNextPage]); - - return ( - <> - { - return ( - !blockCommunityArticleIds.includes(articleData.article.id) && ( - - ) - ); - }} - renderEmpty={() => } - /> -
- - ); -} diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ArticleDetail.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ArticleDetail.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/ArticleDetail.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ArticleDetail.tsx diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ArticleDetailHeader.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ArticleDetailHeader.tsx similarity index 98% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/ArticleDetailHeader.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ArticleDetailHeader.tsx index f53ff98e4..49d0ccd6c 100644 --- a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ArticleDetailHeader.tsx +++ b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ArticleDetailHeader.tsx @@ -12,7 +12,7 @@ import { DropDownOptionType } from '@/components/DropDown/DropDown'; import { Header } from '@/components/Header'; import { Icon } from '@/components/Icon'; import useAppRouter from '@/hooks/useAppRouter'; -import { useModal } from '@/hooks/useModal'; +import useModal from '@/hooks/useModal/useModal'; import { useNumberParams } from '@/hooks/useNumberParams'; import { useBlockStore } from '@/store/useBlockStore'; diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ArticleItem.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ArticleItem.tsx similarity index 98% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/ArticleItem.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ArticleItem.tsx index 7b63947c1..903103d84 100644 --- a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ArticleItem.tsx +++ b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ArticleItem.tsx @@ -12,7 +12,7 @@ import { Flex } from '@/components/Layout'; import { Loading } from '@/components/Loading'; import { ImageModal } from '@/components/Modal'; import { Spacing } from '@/components/Spacing'; -import { useModal } from '@/hooks/useModal'; +import useModal from '@/hooks/useModal/useModal'; import cn from '@/utils/cn'; import { getLocalCookie } from '@/utils/cookieController'; diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentForm.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentForm.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentForm.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentForm.tsx diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentItem.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentItem.tsx similarity index 99% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentItem.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentItem.tsx index 5f5fb08a1..6d8403f8d 100644 --- a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentItem.tsx +++ b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentItem.tsx @@ -23,7 +23,7 @@ import { Icon } from '@/components/Icon'; import { Flex } from '@/components/Layout'; import { Loading } from '@/components/Loading'; import { Spacing } from '@/components/Spacing'; -import { useModal } from '@/hooks/useModal'; +import useModal from '@/hooks/useModal/useModal'; import { useBlockStore } from '@/store/useBlockStore'; import cn from '@/utils/cn'; import { getLocalCookie } from '@/utils/cookieController'; diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentList.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentList.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentList.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentList.tsx diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentProvider.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentProvider.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommentProvider.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommentProvider.tsx diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommunityModal.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommunityModal.tsx similarity index 100% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/CommunityModal.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/CommunityModal.tsx diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ReplyItem.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ReplyItem.tsx similarity index 98% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/ReplyItem.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ReplyItem.tsx index de127edb0..e66bf1011 100644 --- a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ReplyItem.tsx +++ b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ReplyItem.tsx @@ -15,7 +15,7 @@ import { Icon } from '@/components/Icon'; import { Flex } from '@/components/Layout'; import { Loading } from '@/components/Loading'; import { Spacing } from '@/components/Spacing'; -import { useModal } from '@/hooks/useModal'; +import useModal from '@/hooks/useModal/useModal'; import { useBlockStore } from '@/store/useBlockStore'; import cn from '@/utils/cn'; import { getLocalCookie } from '@/utils/cookieController'; diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ReplyList.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ReplyList.tsx similarity index 88% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/components/ReplyList.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ReplyList.tsx index eabdb1989..bfb8e7f97 100644 --- a/packages/web/src/app/[lng]/(main)/community/[articleId]/components/ReplyList.tsx +++ b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/components/ReplyList.tsx @@ -1,5 +1,5 @@ import { Reply } from '@/apis/community'; -import ReplyItem from '@/app/[lng]/(main)/community/[articleId]/components/ReplyItem'; +import ReplyItem from '@/app/[lng]/(main)/community/detail/[articleId]/components/ReplyItem'; import { ItemList } from '@/components/List'; import { useBlockStore } from '@/store/useBlockStore'; diff --git a/packages/web/src/app/[lng]/(main)/community/[articleId]/page.tsx b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/page.tsx similarity index 67% rename from packages/web/src/app/[lng]/(main)/community/[articleId]/page.tsx rename to packages/web/src/app/[lng]/(main)/community/detail/[articleId]/page.tsx index e6b11bea7..4069e7b4d 100644 --- a/packages/web/src/app/[lng]/(main)/community/[articleId]/page.tsx +++ b/packages/web/src/app/[lng]/(main)/community/detail/[articleId]/page.tsx @@ -1,7 +1,10 @@ +import { ErrorBoundary } from 'react-error-boundary'; + +import ArticleDetail from './components/ArticleDetail'; +import ArticleDetailHeader from './components/ArticleDetailHeader'; + import { Keys, getCommunityArticleDetail } from '@/apis/community'; -import ArticleDetail from '@/app/[lng]/(main)/community/[articleId]/components/ArticleDetail'; -import ArticleDetailHeader from '@/app/[lng]/(main)/community/[articleId]/components/ArticleDetailHeader'; -import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; +import { ErrorFallback } from '@/components/ErrorBoundary'; import { HydrationProvider } from '@/components/Provider'; import { Spacing } from '@/components/Spacing'; @@ -16,7 +19,7 @@ export default function CommunityArticlePage({ params }: CommunityArticlePagePro return ( <> - + getCommunityArticleDetail(articleId)} queryKey={Keys.getCommunityArticleDetail(articleId)} @@ -24,7 +27,7 @@ export default function CommunityArticlePage({ params }: CommunityArticlePagePro - + ); diff --git a/packages/web/src/app/[lng]/(main)/community/loading.tsx b/packages/web/src/app/[lng]/(main)/community/loading.tsx new file mode 100644 index 000000000..eab0965c3 --- /dev/null +++ b/packages/web/src/app/[lng]/(main)/community/loading.tsx @@ -0,0 +1,19 @@ +import { Flex } from '@/components/Layout'; +import cn from '@/utils/cn'; + +interface LoadingProps { + className?: string; +} + +const loadingIconStyle = 'h-10 w-10 rounded-full bg-primary'; + +export default function Loading({ className }: LoadingProps) { + return ( + +
+
+
+
+ + ); +} diff --git a/packages/web/src/app/[lng]/(main)/community/page.tsx b/packages/web/src/app/[lng]/(main)/community/page.tsx index 7ff2802d0..54a4c316e 100644 --- a/packages/web/src/app/[lng]/(main)/community/page.tsx +++ b/packages/web/src/app/[lng]/(main)/community/page.tsx @@ -1,10 +1,11 @@ +import { ErrorBoundary } from 'react-error-boundary'; + import CommunityHeader from './components/CommunityHeader'; import ContentSection from './components/ContentSection'; import CreateArticleButton from './components/CreateArticleButton'; import { Keys, getCommunityArticles } from '@/apis/community'; -import { LocalSuspenseErrorBoundary } from '@/components/ErrorBoundary'; -import { Footer } from '@/components/Footer'; +import { ErrorFallback } from '@/components/ErrorBoundary'; import { HydrationProvider } from '@/components/Provider'; import { Spacing } from '@/components/Spacing'; @@ -18,28 +19,17 @@ export default function CommunityPage({ params: { lng } }: CommunityPageProps) { return ( <> - + getCommunityArticles({ categoryId: 0, pageParam: 0 }), - () => getCommunityArticles({ categoryId: 1, pageParam: 0 }), - () => getCommunityArticles({ categoryId: 2, pageParam: 0 }), - () => getCommunityArticles({ categoryId: 3, pageParam: 0 }), - ]} - queryMultipleKey={[ - Keys.getCommunityArticles(0), - Keys.getCommunityArticles(1), - Keys.getCommunityArticles(2), - Keys.getCommunityArticles(3), - ]} + queryFn={() => getCommunityArticles({ categoryId: 0, pageParam: 0 })} + queryKey={Keys.getCommunityArticles(0)} isInfiniteQuery > - + -