From 7f07f2284465ef14abc500872d05d2556d90d9c1 Mon Sep 17 00:00:00 2001 From: Sejin Cha <62418379+chasj0326@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:42:18 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B0=A9=20=EC=83=81=EC=84=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#498)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 디렉토리 구조 정리 (#495) * refactor: domain 디렉토리 정리 * refactor: MSW 관련 디렉토리 이동 * refactor: eslint import rule 수정 * fix: 방 상세페이지 날짜 오류 수정 (#497) --------- Co-authored-by: SangHoon Lee <50488780+bbearcookie@users.noreply.github.com> --- .eslintrc.json | 14 +++----------- src/App.tsx | 4 ++-- src/RoomSearch/index.ts | 8 -------- src/core/{ => api}/mocks/baseURL.ts | 0 src/core/{ => api}/mocks/browser.ts | 0 src/core/{ => api}/mocks/datas/bugHistory.ts | 0 src/core/{ => api}/mocks/datas/coupons.ts | 0 src/core/{ => api}/mocks/datas/item.ts | 0 src/core/{ => api}/mocks/datas/member.ts | 0 src/core/{ => api}/mocks/datas/myBug.ts | 0 src/core/{ => api}/mocks/datas/myCoupon.ts | 0 src/core/{ => api}/mocks/datas/myJoinRoom.ts | 0 .../{ => api}/mocks/datas/participateHistory.ts | 0 src/core/{ => api}/mocks/datas/productBugs.ts | 0 src/core/{ => api}/mocks/datas/rank.ts | 0 src/core/{ => api}/mocks/datas/room.ts | 0 src/core/{ => api}/mocks/datas/searchRooms.ts | 0 src/core/{ => api}/mocks/datas/totalRooms.ts | 0 src/core/{ => api}/mocks/handlers/bugs.ts | 0 src/core/{ => api}/mocks/handlers/coupons.ts | 0 src/core/{ => api}/mocks/handlers/index.ts | 0 src/core/{ => api}/mocks/handlers/item.ts | 0 src/core/{ => api}/mocks/handlers/members.ts | 0 .../{ => api}/mocks/handlers/notifications.ts | 0 src/core/{ => api}/mocks/handlers/payment.ts | 0 src/core/{ => api}/mocks/handlers/rank.ts | 0 src/core/{ => api}/mocks/handlers/reports.ts | 0 src/core/{ => api}/mocks/handlers/rooms.ts | 0 src/core/{ => api}/mocks/handlers/time.ts | 0 .../AboutMoabam/components/AboutMoabam.tsx | 0 .../AboutMoabam/components/BirdButton.tsx | 0 .../AboutMoabam/components/IntroText.tsx | 0 .../AboutMoabam/components/Mark.tsx | 0 src/{ => domain}/AboutMoabam/index.ts | 0 .../Guide/components/GuideContent.tsx | 0 .../Guide/constants/guideContents.ts | 0 src/{ => domain}/Guide/index.ts | 0 src/{ => domain}/Guide/styles/swiperBullets.css | 0 src/{ => domain}/LogList/components/LogList.tsx | 0 .../LogList/components/LogListFallback.tsx | 0 src/{ => domain}/LogList/mocks/roomHistory.ts | 0 src/{ => domain}/Meta/components/CommonMeta.tsx | 0 .../Meta/components/RoomDetailMeta.tsx | 0 src/{ => domain}/Meta/index.ts | 0 src/{ => domain}/MyBird/components/BirdItem.tsx | 0 .../MyBird/components/BirdItems.tsx | 0 .../MyBird/components/HeaderWallet.tsx | 0 .../MyBird/components/ItemLoader.tsx | 0 .../MyBird/components/MyBirdProvider.tsx | 0 .../MyBird/components/MyBirdThumbnail.tsx | 0 .../MyBird/components/ProductSheet.tsx | 0 .../MyCoupon/components/MyCouponList.tsx | 0 .../components/MyCouponListFallback.tsx | 0 .../OrderLogList/components/OrderLogList.tsx | 0 .../components/OrderLogListFallback.tsx | 0 src/{ => domain}/OrderLogList/mocks/Bugs.ts | 0 .../OrderLogList/mocks/bugsHistory.ts | 0 .../OrderLogList/mocks/types/bugs.ts | 0 .../components/PWAInstallBanner.tsx | 0 .../hooks/usePWAInstallBanner.tsx | 0 src/{ => domain}/PWAInstallBanner/index.ts | 0 .../Promotion/components/CouponButton.tsx | 0 .../Promotion/components/DisabledCover.tsx | 0 .../Promotion/components/EventBanner.tsx | 0 .../Promotion/components/EventCard.tsx | 0 .../Promotion/components/EventCardFallback.tsx | 0 .../Promotion/components/EventList.tsx | 0 .../Promotion/components/EventListFallback.tsx | 0 .../Promotion/coustants/couponInfo.ts | 0 .../Promotion/coustants/couponToast.ts | 0 src/{ => domain}/Promotion/index.ts | 0 src/{ => domain}/Promotion/utils/getDateDiff.ts | 0 .../RankList/components/RankLIst.tsx | 0 .../RankList/components/RankListFallback.tsx | 0 .../RankList/components/RankThumbnailItem.tsx | 0 .../components/CertificationBottomSheet.tsx | 0 .../components/CertificationProgress.tsx | 0 .../RoomDetail/components/ReportBottomSheet.tsx | 0 .../RoomDetail/components/RoomCalendar.tsx | 0 .../RoomDetail/components/RoomCalendarDate.tsx | 0 .../RoomDetail/components/RoomDetail.tsx | 17 +++++++++-------- .../components/RoomDetailContainer.tsx | 8 +++++--- .../components/RoomDetailFallback.tsx | 0 .../components/RoomDetailImageInput.tsx | 0 .../components/RoomDetailProvider.tsx | 0 .../RoomDetail/components/RoomHeader.tsx | 0 .../RoomDetail/components/RoomInfo.tsx | 0 .../RoomDetail/components/RoomMember.tsx | 0 .../RoomDetail/components/RoomMemberRank.tsx | 0 .../RoomDetail/components/RoomMembers.tsx | 0 .../RoomDetail/components/RoomNotice.tsx | 0 .../RoomDetail/components/RoomPreview.tsx | 0 .../components/RoomPreviewRoutine.tsx | 0 .../RoomDetail/components/RoomRoutine.tsx | 0 .../RoomDetail/components/RoomSemi.tsx | 2 +- .../RoomDetail/components/RoomWorkspace.tsx | 4 ++-- .../RoomDetail/constants/constant.ts | 0 src/{ => domain}/RoomDetail/index.ts | 0 src/{ => domain}/RoomDetail/types/type.ts | 0 .../RoomDetail/utils/checkCertifyTime.ts | 0 src/{ => domain}/RoomDetail/utils/isMorning.ts | 0 .../RoomDetail/utils/makeWeekCalendar.ts | 0 .../RoomForm/components/Password.tsx | 2 +- .../RoomForm/components/Routines.tsx | 0 .../RoomForm/components/UserCount.tsx | 0 src/{ => domain}/RoomForm/constants/literals.ts | 0 src/{ => domain}/RoomForm/constants/styles.ts | 0 src/{ => domain}/RoomForm/index.ts | 0 .../RoomList/components/BugInfo.tsx | 0 .../RoomList/components/CertifyButton.tsx | 0 .../RoomList/components/RoomAccordion.tsx | 8 ++++---- .../RoomList/components/RoomCard.tsx | 2 +- src/{ => domain}/RoomList/index.ts | 0 src/{ => domain}/RoomList/styles/roomList.css | 0 .../RoomList/styles/roomListStyle.ts | 0 .../RoomLog/components/RoomLogItem.tsx | 0 .../RoomNavigate/components/NoRoom.tsx | 0 .../RoomNavigate/components/RoomNavigate.tsx | 0 .../components/RoomNavigateFallback.tsx | 0 src/{ => domain}/RoomNavigate/utils/pickRoom.ts | 0 .../RoomNew/components/BirdCard.tsx | 2 +- .../RoomNew/components/BirdCardFallback.tsx | 0 .../RoomNew/components/BirdCardSection.tsx | 2 +- src/{ => domain}/RoomNew/components/Navbar.tsx | 0 src/{ => domain}/RoomNew/constants/styles.ts | 0 src/{ => domain}/RoomNew/hooks/useRoomForm.ts | 2 +- src/{ => domain}/RoomNew/index.ts | 0 src/{ => domain}/RoomNew/steps/BirdStep.tsx | 0 src/{ => domain}/RoomNew/steps/PasswordStep.tsx | 4 ++-- src/{ => domain}/RoomNew/steps/RoutineStep.tsx | 4 ++-- src/{ => domain}/RoomNew/steps/SummaryStep.tsx | 4 ++-- src/{ => domain}/RoomNew/steps/TimeStep.tsx | 6 +++--- .../RoomSearch/components/AllResultList.tsx | 0 .../RoomSearch/components/KeywordText.tsx | 0 .../RoomSearch/components/ResultList.tsx | 2 +- .../components/ResultListFallback.tsx | 0 .../RoomSearch/components/SearchBar.tsx | 0 .../RoomSearch/components/SearchResultList.tsx | 0 .../RoomSearch/components/Selection.tsx | 0 .../RoomSearch/hooks/useIntersectionObserver.ts | 0 src/{ => domain}/RoomSearch/hooks/useKeyword.ts | 0 src/domain/RoomSearch/index.ts | 8 ++++++++ .../RoomSetting/components/LoadingFallback.tsx | 0 .../RoomSetting/hooks/useRoomForm.ts | 2 +- src/{ => domain}/RoomSetting/index.ts | 0 .../tabs/MemberTab/DelegationButton.tsx | 0 .../RoomSetting/tabs/MemberTab/KickButton.tsx | 0 .../RoomSetting/tabs/MemberTab/index.tsx | 0 .../RoomSetting/tabs/MemberTab/styles.ts | 0 .../RoomSetting/tabs/RemoveTab.stories.tsx | 4 ++-- src/{ => domain}/RoomSetting/tabs/RemoveTab.tsx | 0 src/{ => domain}/RoomSetting/tabs/RoomTab.tsx | 8 ++++---- .../RoomSlide/components/DayInfo.tsx | 0 .../RoomSlide/components/NewRoomCard.tsx | 2 +- .../RoomSlide/components/RoomData.tsx | 4 ++-- .../RoomSlide/components/RoomDataFallback.tsx | 0 .../RoomSlide/components/RoomSlide.tsx | 0 .../RoomSlide/components/SlideController.tsx | 0 src/{ => domain}/RoomSlide/constants/dayType.ts | 0 src/{ => domain}/RoomSlide/hooks/useDayTypes.ts | 0 src/{ => domain}/RoomSlide/index.ts | 0 .../RoomSummary/components/IconText.tsx | 0 .../RoomSummary/components/RoomSummary.tsx | 4 ++-- src/{ => domain}/RoomSummary/index.ts | 0 .../StartSlide/components/Background.tsx | 0 .../StartSlide/components/FakeRoutinesPage.tsx | 2 +- .../StartSlide/components/FakeStartPage.tsx | 0 .../StartSlide/components/SlideDown.tsx | 0 src/{ => domain}/StartSlide/components/Star.tsx | 2 +- .../StartSlide/components/SwipeArrow.tsx | 2 +- .../StartSlide/components/UserBird.tsx | 2 +- .../StartSlide/components/UserInfo.tsx | 0 .../StartSlide/components/UserInfoFallback.tsx | 0 .../StartSlide/constants/contents.ts | 0 .../StartSlide/hooks/useRandomMessage.ts | 4 ++-- src/{ => domain}/StartSlide/index.ts | 0 src/{ => domain}/StartSlide/mocks/userData.ts | 0 src/{ => domain}/StartSlide/styles/star.css | 0 .../StartSlide/styles/swipeArrow.css | 0 .../StartSlide/utils/getRandomValue.ts | 0 .../StoreList/components/StoreList.tsx | 0 .../StoreList/components/StoreListFallback.tsx | 0 src/{ => domain}/StoreList/mocks/products.ts | 0 .../StoreList/mocks/types/product.ts | 0 .../components/TimePicker.stories.tsx | 0 .../TimePicker/components/TimePicker.tsx | 0 src/{ => domain}/TimePicker/index.ts | 0 .../TimePicker/styles/TimePicker.css | 0 src/{ => domain}/TimePicker/utils/hour.ts | 0 .../UserBugs/components/UserBugs.tsx | 0 src/{ => domain}/UserBugs/mocks/bugs.ts | 0 src/{ => domain}/UserEtc/components/Logout.tsx | 0 src/{ => domain}/UserEtc/components/UserEtc.tsx | 0 .../UserEtc/components/WithDrawal.tsx | 0 .../UserProfile/components/UserMain.tsx | 0 .../UserProfile/components/UserMainFallback.tsx | 0 .../UserProfile/components/UserProfile.tsx | 0 src/main.tsx | 2 +- src/pages/CouponPage.tsx | 4 ++-- src/pages/EventPage.tsx | 2 +- src/pages/GuidePage.tsx | 4 ++-- src/pages/MyBirdPage.tsx | 8 ++++---- src/pages/OrderLogPage.tsx | 4 ++-- src/pages/ParticipateLogPage.tsx | 4 ++-- src/pages/RankPage.tsx | 4 ++-- src/pages/Room.tsx | 4 ++-- src/pages/RoomDetailPage.tsx | 6 +++--- src/pages/RoomLogPage.tsx | 2 +- src/pages/RoomNewPage.tsx | 2 +- src/pages/RoomSettingPage.tsx | 2 +- src/pages/RoutinesPage.tsx | 15 ++++++++++----- src/pages/SearchPage.tsx | 6 +++--- src/pages/StartPage.tsx | 4 ++-- src/pages/StorePage.tsx | 4 ++-- src/pages/UserPage.tsx | 6 +++--- src/setupWorker.ts | 2 +- 216 files changed, 112 insertions(+), 112 deletions(-) delete mode 100644 src/RoomSearch/index.ts rename src/core/{ => api}/mocks/baseURL.ts (100%) rename src/core/{ => api}/mocks/browser.ts (100%) rename src/core/{ => api}/mocks/datas/bugHistory.ts (100%) rename src/core/{ => api}/mocks/datas/coupons.ts (100%) rename src/core/{ => api}/mocks/datas/item.ts (100%) rename src/core/{ => api}/mocks/datas/member.ts (100%) rename src/core/{ => api}/mocks/datas/myBug.ts (100%) rename src/core/{ => api}/mocks/datas/myCoupon.ts (100%) rename src/core/{ => api}/mocks/datas/myJoinRoom.ts (100%) rename src/core/{ => api}/mocks/datas/participateHistory.ts (100%) rename src/core/{ => api}/mocks/datas/productBugs.ts (100%) rename src/core/{ => api}/mocks/datas/rank.ts (100%) rename src/core/{ => api}/mocks/datas/room.ts (100%) rename src/core/{ => api}/mocks/datas/searchRooms.ts (100%) rename src/core/{ => api}/mocks/datas/totalRooms.ts (100%) rename src/core/{ => api}/mocks/handlers/bugs.ts (100%) rename src/core/{ => api}/mocks/handlers/coupons.ts (100%) rename src/core/{ => api}/mocks/handlers/index.ts (100%) rename src/core/{ => api}/mocks/handlers/item.ts (100%) rename src/core/{ => api}/mocks/handlers/members.ts (100%) rename src/core/{ => api}/mocks/handlers/notifications.ts (100%) rename src/core/{ => api}/mocks/handlers/payment.ts (100%) rename src/core/{ => api}/mocks/handlers/rank.ts (100%) rename src/core/{ => api}/mocks/handlers/reports.ts (100%) rename src/core/{ => api}/mocks/handlers/rooms.ts (100%) rename src/core/{ => api}/mocks/handlers/time.ts (100%) rename src/{ => domain}/AboutMoabam/components/AboutMoabam.tsx (100%) rename src/{ => domain}/AboutMoabam/components/BirdButton.tsx (100%) rename src/{ => domain}/AboutMoabam/components/IntroText.tsx (100%) rename src/{ => domain}/AboutMoabam/components/Mark.tsx (100%) rename src/{ => domain}/AboutMoabam/index.ts (100%) rename src/{ => domain}/Guide/components/GuideContent.tsx (100%) rename src/{ => domain}/Guide/constants/guideContents.ts (100%) rename src/{ => domain}/Guide/index.ts (100%) rename src/{ => domain}/Guide/styles/swiperBullets.css (100%) rename src/{ => domain}/LogList/components/LogList.tsx (100%) rename src/{ => domain}/LogList/components/LogListFallback.tsx (100%) rename src/{ => domain}/LogList/mocks/roomHistory.ts (100%) rename src/{ => domain}/Meta/components/CommonMeta.tsx (100%) rename src/{ => domain}/Meta/components/RoomDetailMeta.tsx (100%) rename src/{ => domain}/Meta/index.ts (100%) rename src/{ => domain}/MyBird/components/BirdItem.tsx (100%) rename src/{ => domain}/MyBird/components/BirdItems.tsx (100%) rename src/{ => domain}/MyBird/components/HeaderWallet.tsx (100%) rename src/{ => domain}/MyBird/components/ItemLoader.tsx (100%) rename src/{ => domain}/MyBird/components/MyBirdProvider.tsx (100%) rename src/{ => domain}/MyBird/components/MyBirdThumbnail.tsx (100%) rename src/{ => domain}/MyBird/components/ProductSheet.tsx (100%) rename src/{ => domain}/MyCoupon/components/MyCouponList.tsx (100%) rename src/{ => domain}/MyCoupon/components/MyCouponListFallback.tsx (100%) rename src/{ => domain}/OrderLogList/components/OrderLogList.tsx (100%) rename src/{ => domain}/OrderLogList/components/OrderLogListFallback.tsx (100%) rename src/{ => domain}/OrderLogList/mocks/Bugs.ts (100%) rename src/{ => domain}/OrderLogList/mocks/bugsHistory.ts (100%) rename src/{ => domain}/OrderLogList/mocks/types/bugs.ts (100%) rename src/{ => domain}/PWAInstallBanner/components/PWAInstallBanner.tsx (100%) rename src/{ => domain}/PWAInstallBanner/hooks/usePWAInstallBanner.tsx (100%) rename src/{ => domain}/PWAInstallBanner/index.ts (100%) rename src/{ => domain}/Promotion/components/CouponButton.tsx (100%) rename src/{ => domain}/Promotion/components/DisabledCover.tsx (100%) rename src/{ => domain}/Promotion/components/EventBanner.tsx (100%) rename src/{ => domain}/Promotion/components/EventCard.tsx (100%) rename src/{ => domain}/Promotion/components/EventCardFallback.tsx (100%) rename src/{ => domain}/Promotion/components/EventList.tsx (100%) rename src/{ => domain}/Promotion/components/EventListFallback.tsx (100%) rename src/{ => domain}/Promotion/coustants/couponInfo.ts (100%) rename src/{ => domain}/Promotion/coustants/couponToast.ts (100%) rename src/{ => domain}/Promotion/index.ts (100%) rename src/{ => domain}/Promotion/utils/getDateDiff.ts (100%) rename src/{ => domain}/RankList/components/RankLIst.tsx (100%) rename src/{ => domain}/RankList/components/RankListFallback.tsx (100%) rename src/{ => domain}/RankList/components/RankThumbnailItem.tsx (100%) rename src/{ => domain}/RoomDetail/components/CertificationBottomSheet.tsx (100%) rename src/{ => domain}/RoomDetail/components/CertificationProgress.tsx (100%) rename src/{ => domain}/RoomDetail/components/ReportBottomSheet.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomCalendar.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomCalendarDate.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomDetail.tsx (75%) rename src/{ => domain}/RoomDetail/components/RoomDetailContainer.tsx (86%) rename src/{ => domain}/RoomDetail/components/RoomDetailFallback.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomDetailImageInput.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomDetailProvider.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomHeader.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomInfo.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomMember.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomMemberRank.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomMembers.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomNotice.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomPreview.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomPreviewRoutine.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomRoutine.tsx (100%) rename src/{ => domain}/RoomDetail/components/RoomSemi.tsx (98%) rename src/{ => domain}/RoomDetail/components/RoomWorkspace.tsx (99%) rename src/{ => domain}/RoomDetail/constants/constant.ts (100%) rename src/{ => domain}/RoomDetail/index.ts (100%) rename src/{ => domain}/RoomDetail/types/type.ts (100%) rename src/{ => domain}/RoomDetail/utils/checkCertifyTime.ts (100%) rename src/{ => domain}/RoomDetail/utils/isMorning.ts (100%) rename src/{ => domain}/RoomDetail/utils/makeWeekCalendar.ts (100%) rename src/{ => domain}/RoomForm/components/Password.tsx (93%) rename src/{ => domain}/RoomForm/components/Routines.tsx (100%) rename src/{ => domain}/RoomForm/components/UserCount.tsx (100%) rename src/{ => domain}/RoomForm/constants/literals.ts (100%) rename src/{ => domain}/RoomForm/constants/styles.ts (100%) rename src/{ => domain}/RoomForm/index.ts (100%) rename src/{ => domain}/RoomList/components/BugInfo.tsx (100%) rename src/{ => domain}/RoomList/components/CertifyButton.tsx (100%) rename src/{ => domain}/RoomList/components/RoomAccordion.tsx (90%) rename src/{ => domain}/RoomList/components/RoomCard.tsx (95%) rename src/{ => domain}/RoomList/index.ts (100%) rename src/{ => domain}/RoomList/styles/roomList.css (100%) rename src/{ => domain}/RoomList/styles/roomListStyle.ts (100%) rename src/{ => domain}/RoomLog/components/RoomLogItem.tsx (100%) rename src/{ => domain}/RoomNavigate/components/NoRoom.tsx (100%) rename src/{ => domain}/RoomNavigate/components/RoomNavigate.tsx (100%) rename src/{ => domain}/RoomNavigate/components/RoomNavigateFallback.tsx (100%) rename src/{ => domain}/RoomNavigate/utils/pickRoom.ts (100%) rename src/{ => domain}/RoomNew/components/BirdCard.tsx (94%) rename src/{ => domain}/RoomNew/components/BirdCardFallback.tsx (100%) rename src/{ => domain}/RoomNew/components/BirdCardSection.tsx (97%) rename src/{ => domain}/RoomNew/components/Navbar.tsx (100%) rename src/{ => domain}/RoomNew/constants/styles.ts (100%) rename src/{ => domain}/RoomNew/hooks/useRoomForm.ts (98%) rename src/{ => domain}/RoomNew/index.ts (100%) rename src/{ => domain}/RoomNew/steps/BirdStep.tsx (100%) rename src/{ => domain}/RoomNew/steps/PasswordStep.tsx (84%) rename src/{ => domain}/RoomNew/steps/RoutineStep.tsx (92%) rename src/{ => domain}/RoomNew/steps/SummaryStep.tsx (93%) rename src/{ => domain}/RoomNew/steps/TimeStep.tsx (86%) rename src/{ => domain}/RoomSearch/components/AllResultList.tsx (100%) rename src/{ => domain}/RoomSearch/components/KeywordText.tsx (100%) rename src/{ => domain}/RoomSearch/components/ResultList.tsx (96%) rename src/{ => domain}/RoomSearch/components/ResultListFallback.tsx (100%) rename src/{ => domain}/RoomSearch/components/SearchBar.tsx (100%) rename src/{ => domain}/RoomSearch/components/SearchResultList.tsx (100%) rename src/{ => domain}/RoomSearch/components/Selection.tsx (100%) rename src/{ => domain}/RoomSearch/hooks/useIntersectionObserver.ts (100%) rename src/{ => domain}/RoomSearch/hooks/useKeyword.ts (100%) create mode 100644 src/domain/RoomSearch/index.ts rename src/{ => domain}/RoomSetting/components/LoadingFallback.tsx (100%) rename src/{ => domain}/RoomSetting/hooks/useRoomForm.ts (98%) rename src/{ => domain}/RoomSetting/index.ts (100%) rename src/{ => domain}/RoomSetting/tabs/MemberTab/DelegationButton.tsx (100%) rename src/{ => domain}/RoomSetting/tabs/MemberTab/KickButton.tsx (100%) rename src/{ => domain}/RoomSetting/tabs/MemberTab/index.tsx (100%) rename src/{ => domain}/RoomSetting/tabs/MemberTab/styles.ts (100%) rename src/{ => domain}/RoomSetting/tabs/RemoveTab.stories.tsx (93%) rename src/{ => domain}/RoomSetting/tabs/RemoveTab.tsx (100%) rename src/{ => domain}/RoomSetting/tabs/RoomTab.tsx (95%) rename src/{ => domain}/RoomSlide/components/DayInfo.tsx (100%) rename src/{ => domain}/RoomSlide/components/NewRoomCard.tsx (93%) rename src/{ => domain}/RoomSlide/components/RoomData.tsx (92%) rename src/{ => domain}/RoomSlide/components/RoomDataFallback.tsx (100%) rename src/{ => domain}/RoomSlide/components/RoomSlide.tsx (100%) rename src/{ => domain}/RoomSlide/components/SlideController.tsx (100%) rename src/{ => domain}/RoomSlide/constants/dayType.ts (100%) rename src/{ => domain}/RoomSlide/hooks/useDayTypes.ts (100%) rename src/{ => domain}/RoomSlide/index.ts (100%) rename src/{ => domain}/RoomSummary/components/IconText.tsx (100%) rename src/{ => domain}/RoomSummary/components/RoomSummary.tsx (96%) rename src/{ => domain}/RoomSummary/index.ts (100%) rename src/{ => domain}/StartSlide/components/Background.tsx (100%) rename src/{ => domain}/StartSlide/components/FakeRoutinesPage.tsx (90%) rename src/{ => domain}/StartSlide/components/FakeStartPage.tsx (100%) rename src/{ => domain}/StartSlide/components/SlideDown.tsx (100%) rename src/{ => domain}/StartSlide/components/Star.tsx (94%) rename src/{ => domain}/StartSlide/components/SwipeArrow.tsx (90%) rename src/{ => domain}/StartSlide/components/UserBird.tsx (91%) rename src/{ => domain}/StartSlide/components/UserInfo.tsx (100%) rename src/{ => domain}/StartSlide/components/UserInfoFallback.tsx (100%) rename src/{ => domain}/StartSlide/constants/contents.ts (100%) rename src/{ => domain}/StartSlide/hooks/useRandomMessage.ts (85%) rename src/{ => domain}/StartSlide/index.ts (100%) rename src/{ => domain}/StartSlide/mocks/userData.ts (100%) rename src/{ => domain}/StartSlide/styles/star.css (100%) rename src/{ => domain}/StartSlide/styles/swipeArrow.css (100%) rename src/{ => domain}/StartSlide/utils/getRandomValue.ts (100%) rename src/{ => domain}/StoreList/components/StoreList.tsx (100%) rename src/{ => domain}/StoreList/components/StoreListFallback.tsx (100%) rename src/{ => domain}/StoreList/mocks/products.ts (100%) rename src/{ => domain}/StoreList/mocks/types/product.ts (100%) rename src/{ => domain}/TimePicker/components/TimePicker.stories.tsx (100%) rename src/{ => domain}/TimePicker/components/TimePicker.tsx (100%) rename src/{ => domain}/TimePicker/index.ts (100%) rename src/{ => domain}/TimePicker/styles/TimePicker.css (100%) rename src/{ => domain}/TimePicker/utils/hour.ts (100%) rename src/{ => domain}/UserBugs/components/UserBugs.tsx (100%) rename src/{ => domain}/UserBugs/mocks/bugs.ts (100%) rename src/{ => domain}/UserEtc/components/Logout.tsx (100%) rename src/{ => domain}/UserEtc/components/UserEtc.tsx (100%) rename src/{ => domain}/UserEtc/components/WithDrawal.tsx (100%) rename src/{ => domain}/UserProfile/components/UserMain.tsx (100%) rename src/{ => domain}/UserProfile/components/UserMainFallback.tsx (100%) rename src/{ => domain}/UserProfile/components/UserProfile.tsx (100%) diff --git a/.eslintrc.json b/.eslintrc.json index cabb2ed0..dabbf17a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -48,7 +48,7 @@ "internal", // 리액트 내부와 밀접한 연관이 있는 패키지 "external", // 네트워크와 연관이 있는 패키지 "unknown", // 그 외의 경로 미지정된 서드파티 패키지 - "object", // core or shared 디렉토리의 소스코드 + "object", // core, shared, domain 디렉토리의 소스코드 "parent", // 부모 (../) "sibling", // 형제 (./) "index", // 현재 디렉토리 @@ -91,7 +91,7 @@ "group": "external" }, /** - core or shared 디렉토리의 소스코드 + core, shared, domain 디렉토리의 소스코드 */ { "pattern": "{@,.,..}/core/**", @@ -102,16 +102,8 @@ "pattern": "{@,.,..}/shared/**", "group": "object" }, - /** - 도메인(domain) 디렉토리 - */ - { - "pattern": "@/*/**", // 도메인 디렉토리에 들어 있는 각종 파일 - "group": "object", - "position": "after" - }, { - "pattern": "@/*", // [domain] 디렉토리의 index.tsx 파일 + "pattern": "{@,.,..}/domain/**", "group": "object", "position": "after" }, diff --git a/src/App.tsx b/src/App.tsx index 97a7ec9f..37729d69 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -8,8 +8,8 @@ import timeOption from '@/core/api/options/time'; import getTimeRange from '@/core/utils/getTimeRange'; import { Navbar } from '@/shared/Navbar'; import { UnknownFallback } from '@/shared/ErrorBoundary'; -import { AboutMoabam } from '@/AboutMoabam'; -import { CommonMeta } from '@/Meta'; +import { AboutMoabam } from '@/domain/AboutMoabam'; +import { CommonMeta } from '@/domain/Meta'; import 'swiper/css'; import 'swiper/css/bundle'; diff --git a/src/RoomSearch/index.ts b/src/RoomSearch/index.ts deleted file mode 100644 index b4d4796a..00000000 --- a/src/RoomSearch/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { default as SearchBar } from '@/RoomSearch/components/SearchBar'; -export { default as SearchResultList } from '@/RoomSearch/components/SearchResultList'; -export { default as AllResultList } from '@/RoomSearch/components/AllResultList'; -export { default as Selection } from '@/RoomSearch/components/Selection'; -export { - default as useKeyword, - KeywordContext -} from '@/RoomSearch/hooks/useKeyword'; diff --git a/src/core/mocks/baseURL.ts b/src/core/api/mocks/baseURL.ts similarity index 100% rename from src/core/mocks/baseURL.ts rename to src/core/api/mocks/baseURL.ts diff --git a/src/core/mocks/browser.ts b/src/core/api/mocks/browser.ts similarity index 100% rename from src/core/mocks/browser.ts rename to src/core/api/mocks/browser.ts diff --git a/src/core/mocks/datas/bugHistory.ts b/src/core/api/mocks/datas/bugHistory.ts similarity index 100% rename from src/core/mocks/datas/bugHistory.ts rename to src/core/api/mocks/datas/bugHistory.ts diff --git a/src/core/mocks/datas/coupons.ts b/src/core/api/mocks/datas/coupons.ts similarity index 100% rename from src/core/mocks/datas/coupons.ts rename to src/core/api/mocks/datas/coupons.ts diff --git a/src/core/mocks/datas/item.ts b/src/core/api/mocks/datas/item.ts similarity index 100% rename from src/core/mocks/datas/item.ts rename to src/core/api/mocks/datas/item.ts diff --git a/src/core/mocks/datas/member.ts b/src/core/api/mocks/datas/member.ts similarity index 100% rename from src/core/mocks/datas/member.ts rename to src/core/api/mocks/datas/member.ts diff --git a/src/core/mocks/datas/myBug.ts b/src/core/api/mocks/datas/myBug.ts similarity index 100% rename from src/core/mocks/datas/myBug.ts rename to src/core/api/mocks/datas/myBug.ts diff --git a/src/core/mocks/datas/myCoupon.ts b/src/core/api/mocks/datas/myCoupon.ts similarity index 100% rename from src/core/mocks/datas/myCoupon.ts rename to src/core/api/mocks/datas/myCoupon.ts diff --git a/src/core/mocks/datas/myJoinRoom.ts b/src/core/api/mocks/datas/myJoinRoom.ts similarity index 100% rename from src/core/mocks/datas/myJoinRoom.ts rename to src/core/api/mocks/datas/myJoinRoom.ts diff --git a/src/core/mocks/datas/participateHistory.ts b/src/core/api/mocks/datas/participateHistory.ts similarity index 100% rename from src/core/mocks/datas/participateHistory.ts rename to src/core/api/mocks/datas/participateHistory.ts diff --git a/src/core/mocks/datas/productBugs.ts b/src/core/api/mocks/datas/productBugs.ts similarity index 100% rename from src/core/mocks/datas/productBugs.ts rename to src/core/api/mocks/datas/productBugs.ts diff --git a/src/core/mocks/datas/rank.ts b/src/core/api/mocks/datas/rank.ts similarity index 100% rename from src/core/mocks/datas/rank.ts rename to src/core/api/mocks/datas/rank.ts diff --git a/src/core/mocks/datas/room.ts b/src/core/api/mocks/datas/room.ts similarity index 100% rename from src/core/mocks/datas/room.ts rename to src/core/api/mocks/datas/room.ts diff --git a/src/core/mocks/datas/searchRooms.ts b/src/core/api/mocks/datas/searchRooms.ts similarity index 100% rename from src/core/mocks/datas/searchRooms.ts rename to src/core/api/mocks/datas/searchRooms.ts diff --git a/src/core/mocks/datas/totalRooms.ts b/src/core/api/mocks/datas/totalRooms.ts similarity index 100% rename from src/core/mocks/datas/totalRooms.ts rename to src/core/api/mocks/datas/totalRooms.ts diff --git a/src/core/mocks/handlers/bugs.ts b/src/core/api/mocks/handlers/bugs.ts similarity index 100% rename from src/core/mocks/handlers/bugs.ts rename to src/core/api/mocks/handlers/bugs.ts diff --git a/src/core/mocks/handlers/coupons.ts b/src/core/api/mocks/handlers/coupons.ts similarity index 100% rename from src/core/mocks/handlers/coupons.ts rename to src/core/api/mocks/handlers/coupons.ts diff --git a/src/core/mocks/handlers/index.ts b/src/core/api/mocks/handlers/index.ts similarity index 100% rename from src/core/mocks/handlers/index.ts rename to src/core/api/mocks/handlers/index.ts diff --git a/src/core/mocks/handlers/item.ts b/src/core/api/mocks/handlers/item.ts similarity index 100% rename from src/core/mocks/handlers/item.ts rename to src/core/api/mocks/handlers/item.ts diff --git a/src/core/mocks/handlers/members.ts b/src/core/api/mocks/handlers/members.ts similarity index 100% rename from src/core/mocks/handlers/members.ts rename to src/core/api/mocks/handlers/members.ts diff --git a/src/core/mocks/handlers/notifications.ts b/src/core/api/mocks/handlers/notifications.ts similarity index 100% rename from src/core/mocks/handlers/notifications.ts rename to src/core/api/mocks/handlers/notifications.ts diff --git a/src/core/mocks/handlers/payment.ts b/src/core/api/mocks/handlers/payment.ts similarity index 100% rename from src/core/mocks/handlers/payment.ts rename to src/core/api/mocks/handlers/payment.ts diff --git a/src/core/mocks/handlers/rank.ts b/src/core/api/mocks/handlers/rank.ts similarity index 100% rename from src/core/mocks/handlers/rank.ts rename to src/core/api/mocks/handlers/rank.ts diff --git a/src/core/mocks/handlers/reports.ts b/src/core/api/mocks/handlers/reports.ts similarity index 100% rename from src/core/mocks/handlers/reports.ts rename to src/core/api/mocks/handlers/reports.ts diff --git a/src/core/mocks/handlers/rooms.ts b/src/core/api/mocks/handlers/rooms.ts similarity index 100% rename from src/core/mocks/handlers/rooms.ts rename to src/core/api/mocks/handlers/rooms.ts diff --git a/src/core/mocks/handlers/time.ts b/src/core/api/mocks/handlers/time.ts similarity index 100% rename from src/core/mocks/handlers/time.ts rename to src/core/api/mocks/handlers/time.ts diff --git a/src/AboutMoabam/components/AboutMoabam.tsx b/src/domain/AboutMoabam/components/AboutMoabam.tsx similarity index 100% rename from src/AboutMoabam/components/AboutMoabam.tsx rename to src/domain/AboutMoabam/components/AboutMoabam.tsx diff --git a/src/AboutMoabam/components/BirdButton.tsx b/src/domain/AboutMoabam/components/BirdButton.tsx similarity index 100% rename from src/AboutMoabam/components/BirdButton.tsx rename to src/domain/AboutMoabam/components/BirdButton.tsx diff --git a/src/AboutMoabam/components/IntroText.tsx b/src/domain/AboutMoabam/components/IntroText.tsx similarity index 100% rename from src/AboutMoabam/components/IntroText.tsx rename to src/domain/AboutMoabam/components/IntroText.tsx diff --git a/src/AboutMoabam/components/Mark.tsx b/src/domain/AboutMoabam/components/Mark.tsx similarity index 100% rename from src/AboutMoabam/components/Mark.tsx rename to src/domain/AboutMoabam/components/Mark.tsx diff --git a/src/AboutMoabam/index.ts b/src/domain/AboutMoabam/index.ts similarity index 100% rename from src/AboutMoabam/index.ts rename to src/domain/AboutMoabam/index.ts diff --git a/src/Guide/components/GuideContent.tsx b/src/domain/Guide/components/GuideContent.tsx similarity index 100% rename from src/Guide/components/GuideContent.tsx rename to src/domain/Guide/components/GuideContent.tsx diff --git a/src/Guide/constants/guideContents.ts b/src/domain/Guide/constants/guideContents.ts similarity index 100% rename from src/Guide/constants/guideContents.ts rename to src/domain/Guide/constants/guideContents.ts diff --git a/src/Guide/index.ts b/src/domain/Guide/index.ts similarity index 100% rename from src/Guide/index.ts rename to src/domain/Guide/index.ts diff --git a/src/Guide/styles/swiperBullets.css b/src/domain/Guide/styles/swiperBullets.css similarity index 100% rename from src/Guide/styles/swiperBullets.css rename to src/domain/Guide/styles/swiperBullets.css diff --git a/src/LogList/components/LogList.tsx b/src/domain/LogList/components/LogList.tsx similarity index 100% rename from src/LogList/components/LogList.tsx rename to src/domain/LogList/components/LogList.tsx diff --git a/src/LogList/components/LogListFallback.tsx b/src/domain/LogList/components/LogListFallback.tsx similarity index 100% rename from src/LogList/components/LogListFallback.tsx rename to src/domain/LogList/components/LogListFallback.tsx diff --git a/src/LogList/mocks/roomHistory.ts b/src/domain/LogList/mocks/roomHistory.ts similarity index 100% rename from src/LogList/mocks/roomHistory.ts rename to src/domain/LogList/mocks/roomHistory.ts diff --git a/src/Meta/components/CommonMeta.tsx b/src/domain/Meta/components/CommonMeta.tsx similarity index 100% rename from src/Meta/components/CommonMeta.tsx rename to src/domain/Meta/components/CommonMeta.tsx diff --git a/src/Meta/components/RoomDetailMeta.tsx b/src/domain/Meta/components/RoomDetailMeta.tsx similarity index 100% rename from src/Meta/components/RoomDetailMeta.tsx rename to src/domain/Meta/components/RoomDetailMeta.tsx diff --git a/src/Meta/index.ts b/src/domain/Meta/index.ts similarity index 100% rename from src/Meta/index.ts rename to src/domain/Meta/index.ts diff --git a/src/MyBird/components/BirdItem.tsx b/src/domain/MyBird/components/BirdItem.tsx similarity index 100% rename from src/MyBird/components/BirdItem.tsx rename to src/domain/MyBird/components/BirdItem.tsx diff --git a/src/MyBird/components/BirdItems.tsx b/src/domain/MyBird/components/BirdItems.tsx similarity index 100% rename from src/MyBird/components/BirdItems.tsx rename to src/domain/MyBird/components/BirdItems.tsx diff --git a/src/MyBird/components/HeaderWallet.tsx b/src/domain/MyBird/components/HeaderWallet.tsx similarity index 100% rename from src/MyBird/components/HeaderWallet.tsx rename to src/domain/MyBird/components/HeaderWallet.tsx diff --git a/src/MyBird/components/ItemLoader.tsx b/src/domain/MyBird/components/ItemLoader.tsx similarity index 100% rename from src/MyBird/components/ItemLoader.tsx rename to src/domain/MyBird/components/ItemLoader.tsx diff --git a/src/MyBird/components/MyBirdProvider.tsx b/src/domain/MyBird/components/MyBirdProvider.tsx similarity index 100% rename from src/MyBird/components/MyBirdProvider.tsx rename to src/domain/MyBird/components/MyBirdProvider.tsx diff --git a/src/MyBird/components/MyBirdThumbnail.tsx b/src/domain/MyBird/components/MyBirdThumbnail.tsx similarity index 100% rename from src/MyBird/components/MyBirdThumbnail.tsx rename to src/domain/MyBird/components/MyBirdThumbnail.tsx diff --git a/src/MyBird/components/ProductSheet.tsx b/src/domain/MyBird/components/ProductSheet.tsx similarity index 100% rename from src/MyBird/components/ProductSheet.tsx rename to src/domain/MyBird/components/ProductSheet.tsx diff --git a/src/MyCoupon/components/MyCouponList.tsx b/src/domain/MyCoupon/components/MyCouponList.tsx similarity index 100% rename from src/MyCoupon/components/MyCouponList.tsx rename to src/domain/MyCoupon/components/MyCouponList.tsx diff --git a/src/MyCoupon/components/MyCouponListFallback.tsx b/src/domain/MyCoupon/components/MyCouponListFallback.tsx similarity index 100% rename from src/MyCoupon/components/MyCouponListFallback.tsx rename to src/domain/MyCoupon/components/MyCouponListFallback.tsx diff --git a/src/OrderLogList/components/OrderLogList.tsx b/src/domain/OrderLogList/components/OrderLogList.tsx similarity index 100% rename from src/OrderLogList/components/OrderLogList.tsx rename to src/domain/OrderLogList/components/OrderLogList.tsx diff --git a/src/OrderLogList/components/OrderLogListFallback.tsx b/src/domain/OrderLogList/components/OrderLogListFallback.tsx similarity index 100% rename from src/OrderLogList/components/OrderLogListFallback.tsx rename to src/domain/OrderLogList/components/OrderLogListFallback.tsx diff --git a/src/OrderLogList/mocks/Bugs.ts b/src/domain/OrderLogList/mocks/Bugs.ts similarity index 100% rename from src/OrderLogList/mocks/Bugs.ts rename to src/domain/OrderLogList/mocks/Bugs.ts diff --git a/src/OrderLogList/mocks/bugsHistory.ts b/src/domain/OrderLogList/mocks/bugsHistory.ts similarity index 100% rename from src/OrderLogList/mocks/bugsHistory.ts rename to src/domain/OrderLogList/mocks/bugsHistory.ts diff --git a/src/OrderLogList/mocks/types/bugs.ts b/src/domain/OrderLogList/mocks/types/bugs.ts similarity index 100% rename from src/OrderLogList/mocks/types/bugs.ts rename to src/domain/OrderLogList/mocks/types/bugs.ts diff --git a/src/PWAInstallBanner/components/PWAInstallBanner.tsx b/src/domain/PWAInstallBanner/components/PWAInstallBanner.tsx similarity index 100% rename from src/PWAInstallBanner/components/PWAInstallBanner.tsx rename to src/domain/PWAInstallBanner/components/PWAInstallBanner.tsx diff --git a/src/PWAInstallBanner/hooks/usePWAInstallBanner.tsx b/src/domain/PWAInstallBanner/hooks/usePWAInstallBanner.tsx similarity index 100% rename from src/PWAInstallBanner/hooks/usePWAInstallBanner.tsx rename to src/domain/PWAInstallBanner/hooks/usePWAInstallBanner.tsx diff --git a/src/PWAInstallBanner/index.ts b/src/domain/PWAInstallBanner/index.ts similarity index 100% rename from src/PWAInstallBanner/index.ts rename to src/domain/PWAInstallBanner/index.ts diff --git a/src/Promotion/components/CouponButton.tsx b/src/domain/Promotion/components/CouponButton.tsx similarity index 100% rename from src/Promotion/components/CouponButton.tsx rename to src/domain/Promotion/components/CouponButton.tsx diff --git a/src/Promotion/components/DisabledCover.tsx b/src/domain/Promotion/components/DisabledCover.tsx similarity index 100% rename from src/Promotion/components/DisabledCover.tsx rename to src/domain/Promotion/components/DisabledCover.tsx diff --git a/src/Promotion/components/EventBanner.tsx b/src/domain/Promotion/components/EventBanner.tsx similarity index 100% rename from src/Promotion/components/EventBanner.tsx rename to src/domain/Promotion/components/EventBanner.tsx diff --git a/src/Promotion/components/EventCard.tsx b/src/domain/Promotion/components/EventCard.tsx similarity index 100% rename from src/Promotion/components/EventCard.tsx rename to src/domain/Promotion/components/EventCard.tsx diff --git a/src/Promotion/components/EventCardFallback.tsx b/src/domain/Promotion/components/EventCardFallback.tsx similarity index 100% rename from src/Promotion/components/EventCardFallback.tsx rename to src/domain/Promotion/components/EventCardFallback.tsx diff --git a/src/Promotion/components/EventList.tsx b/src/domain/Promotion/components/EventList.tsx similarity index 100% rename from src/Promotion/components/EventList.tsx rename to src/domain/Promotion/components/EventList.tsx diff --git a/src/Promotion/components/EventListFallback.tsx b/src/domain/Promotion/components/EventListFallback.tsx similarity index 100% rename from src/Promotion/components/EventListFallback.tsx rename to src/domain/Promotion/components/EventListFallback.tsx diff --git a/src/Promotion/coustants/couponInfo.ts b/src/domain/Promotion/coustants/couponInfo.ts similarity index 100% rename from src/Promotion/coustants/couponInfo.ts rename to src/domain/Promotion/coustants/couponInfo.ts diff --git a/src/Promotion/coustants/couponToast.ts b/src/domain/Promotion/coustants/couponToast.ts similarity index 100% rename from src/Promotion/coustants/couponToast.ts rename to src/domain/Promotion/coustants/couponToast.ts diff --git a/src/Promotion/index.ts b/src/domain/Promotion/index.ts similarity index 100% rename from src/Promotion/index.ts rename to src/domain/Promotion/index.ts diff --git a/src/Promotion/utils/getDateDiff.ts b/src/domain/Promotion/utils/getDateDiff.ts similarity index 100% rename from src/Promotion/utils/getDateDiff.ts rename to src/domain/Promotion/utils/getDateDiff.ts diff --git a/src/RankList/components/RankLIst.tsx b/src/domain/RankList/components/RankLIst.tsx similarity index 100% rename from src/RankList/components/RankLIst.tsx rename to src/domain/RankList/components/RankLIst.tsx diff --git a/src/RankList/components/RankListFallback.tsx b/src/domain/RankList/components/RankListFallback.tsx similarity index 100% rename from src/RankList/components/RankListFallback.tsx rename to src/domain/RankList/components/RankListFallback.tsx diff --git a/src/RankList/components/RankThumbnailItem.tsx b/src/domain/RankList/components/RankThumbnailItem.tsx similarity index 100% rename from src/RankList/components/RankThumbnailItem.tsx rename to src/domain/RankList/components/RankThumbnailItem.tsx diff --git a/src/RoomDetail/components/CertificationBottomSheet.tsx b/src/domain/RoomDetail/components/CertificationBottomSheet.tsx similarity index 100% rename from src/RoomDetail/components/CertificationBottomSheet.tsx rename to src/domain/RoomDetail/components/CertificationBottomSheet.tsx diff --git a/src/RoomDetail/components/CertificationProgress.tsx b/src/domain/RoomDetail/components/CertificationProgress.tsx similarity index 100% rename from src/RoomDetail/components/CertificationProgress.tsx rename to src/domain/RoomDetail/components/CertificationProgress.tsx diff --git a/src/RoomDetail/components/ReportBottomSheet.tsx b/src/domain/RoomDetail/components/ReportBottomSheet.tsx similarity index 100% rename from src/RoomDetail/components/ReportBottomSheet.tsx rename to src/domain/RoomDetail/components/ReportBottomSheet.tsx diff --git a/src/RoomDetail/components/RoomCalendar.tsx b/src/domain/RoomDetail/components/RoomCalendar.tsx similarity index 100% rename from src/RoomDetail/components/RoomCalendar.tsx rename to src/domain/RoomDetail/components/RoomCalendar.tsx diff --git a/src/RoomDetail/components/RoomCalendarDate.tsx b/src/domain/RoomDetail/components/RoomCalendarDate.tsx similarity index 100% rename from src/RoomDetail/components/RoomCalendarDate.tsx rename to src/domain/RoomDetail/components/RoomCalendarDate.tsx diff --git a/src/RoomDetail/components/RoomDetail.tsx b/src/domain/RoomDetail/components/RoomDetail.tsx similarity index 75% rename from src/RoomDetail/components/RoomDetail.tsx rename to src/domain/RoomDetail/components/RoomDetail.tsx index a6566c9f..26f2de50 100644 --- a/src/RoomDetail/components/RoomDetail.tsx +++ b/src/domain/RoomDetail/components/RoomDetail.tsx @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; import { roomOptions } from '@/core/api/options'; -import RoomDetailContainer from '@/RoomDetail/components/RoomDetailContainer'; -import { RoomNotice } from '@/RoomDetail'; -import { RoomDetailMeta } from '@/Meta'; +import RoomDetailContainer from '@/domain/RoomDetail/components/RoomDetailContainer'; +import { RoomNotice } from '@/domain/RoomDetail'; +import { RoomDetailMeta } from '@/domain/Meta'; import RoomHeader from './RoomHeader'; import RoomDetailProvider from './RoomDetailProvider'; import RoomDetailFallback from './RoomDetailFallback'; @@ -18,11 +18,12 @@ const RoomDetail = ({ checkedRoomJoin, serverTime }: RoomDetailProps) => { - const todayDateString = `${(serverTime || new Date()).getFullYear()}-${ - (serverTime || new Date()).getMonth() + 1 - }-${(serverTime || new Date()).getDate() < 10 ? 0 : ''}${( - serverTime || new Date() - ).getDate()}`; + const todayDate = serverTime || new Date(); + const todayDateString = `${todayDate.getFullYear()}-${String( + todayDate.getMonth() + 1 + ).padStart(2, '0')}-${ + todayDate.getDate() < 10 ? 0 : '' + }${todayDate.getDate()}`; const { data: roomDetailData, status } = useQuery({ ...roomOptions.detailByDate(roomId, todayDateString), diff --git a/src/RoomDetail/components/RoomDetailContainer.tsx b/src/domain/RoomDetail/components/RoomDetailContainer.tsx similarity index 86% rename from src/RoomDetail/components/RoomDetailContainer.tsx rename to src/domain/RoomDetail/components/RoomDetailContainer.tsx index b8662c12..4bd493fd 100644 --- a/src/RoomDetail/components/RoomDetailContainer.tsx +++ b/src/domain/RoomDetail/components/RoomDetailContainer.tsx @@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'; import { roomOptions } from '@/core/api/options'; import { useRouteData } from '@/core/hooks'; import { RoomInfo as RoomInfoType } from '@/core/types/Room'; -import { RoomInfo, RoomWorkspace } from '@/RoomDetail'; +import { RoomInfo, RoomWorkspace } from '@/domain/RoomDetail'; import { DateRoomDetailContext } from './RoomDetailProvider'; interface RoomDetailContainerProps { @@ -16,9 +16,11 @@ const RoomDetailContainer = ({ roomDetailData }: RoomDetailContainerProps) => { const { params: { roomId } } = useRouteData(); - const chooseDateString = `${chooseDate.getFullYear()}-${ + const chooseDateString = `${chooseDate.getFullYear()}-${String( chooseDate.getMonth() + 1 - }-${chooseDate.getDate() < 10 ? 0 : ''}${chooseDate.getDate()}`; + ).padStart(2, '0')}-${ + chooseDate.getDate() < 10 ? 0 : '' + }${chooseDate.getDate()}`; const { data: roomDetailDataByDate, status } = useQuery({ ...roomOptions.detailByDate(roomId, chooseDateString) diff --git a/src/RoomDetail/components/RoomDetailFallback.tsx b/src/domain/RoomDetail/components/RoomDetailFallback.tsx similarity index 100% rename from src/RoomDetail/components/RoomDetailFallback.tsx rename to src/domain/RoomDetail/components/RoomDetailFallback.tsx diff --git a/src/RoomDetail/components/RoomDetailImageInput.tsx b/src/domain/RoomDetail/components/RoomDetailImageInput.tsx similarity index 100% rename from src/RoomDetail/components/RoomDetailImageInput.tsx rename to src/domain/RoomDetail/components/RoomDetailImageInput.tsx diff --git a/src/RoomDetail/components/RoomDetailProvider.tsx b/src/domain/RoomDetail/components/RoomDetailProvider.tsx similarity index 100% rename from src/RoomDetail/components/RoomDetailProvider.tsx rename to src/domain/RoomDetail/components/RoomDetailProvider.tsx diff --git a/src/RoomDetail/components/RoomHeader.tsx b/src/domain/RoomDetail/components/RoomHeader.tsx similarity index 100% rename from src/RoomDetail/components/RoomHeader.tsx rename to src/domain/RoomDetail/components/RoomHeader.tsx diff --git a/src/RoomDetail/components/RoomInfo.tsx b/src/domain/RoomDetail/components/RoomInfo.tsx similarity index 100% rename from src/RoomDetail/components/RoomInfo.tsx rename to src/domain/RoomDetail/components/RoomInfo.tsx diff --git a/src/RoomDetail/components/RoomMember.tsx b/src/domain/RoomDetail/components/RoomMember.tsx similarity index 100% rename from src/RoomDetail/components/RoomMember.tsx rename to src/domain/RoomDetail/components/RoomMember.tsx diff --git a/src/RoomDetail/components/RoomMemberRank.tsx b/src/domain/RoomDetail/components/RoomMemberRank.tsx similarity index 100% rename from src/RoomDetail/components/RoomMemberRank.tsx rename to src/domain/RoomDetail/components/RoomMemberRank.tsx diff --git a/src/RoomDetail/components/RoomMembers.tsx b/src/domain/RoomDetail/components/RoomMembers.tsx similarity index 100% rename from src/RoomDetail/components/RoomMembers.tsx rename to src/domain/RoomDetail/components/RoomMembers.tsx diff --git a/src/RoomDetail/components/RoomNotice.tsx b/src/domain/RoomDetail/components/RoomNotice.tsx similarity index 100% rename from src/RoomDetail/components/RoomNotice.tsx rename to src/domain/RoomDetail/components/RoomNotice.tsx diff --git a/src/RoomDetail/components/RoomPreview.tsx b/src/domain/RoomDetail/components/RoomPreview.tsx similarity index 100% rename from src/RoomDetail/components/RoomPreview.tsx rename to src/domain/RoomDetail/components/RoomPreview.tsx diff --git a/src/RoomDetail/components/RoomPreviewRoutine.tsx b/src/domain/RoomDetail/components/RoomPreviewRoutine.tsx similarity index 100% rename from src/RoomDetail/components/RoomPreviewRoutine.tsx rename to src/domain/RoomDetail/components/RoomPreviewRoutine.tsx diff --git a/src/RoomDetail/components/RoomRoutine.tsx b/src/domain/RoomDetail/components/RoomRoutine.tsx similarity index 100% rename from src/RoomDetail/components/RoomRoutine.tsx rename to src/domain/RoomDetail/components/RoomRoutine.tsx diff --git a/src/RoomDetail/components/RoomSemi.tsx b/src/domain/RoomDetail/components/RoomSemi.tsx similarity index 98% rename from src/RoomDetail/components/RoomSemi.tsx rename to src/domain/RoomDetail/components/RoomSemi.tsx index 550c2f60..48063039 100644 --- a/src/RoomDetail/components/RoomSemi.tsx +++ b/src/domain/RoomDetail/components/RoomSemi.tsx @@ -4,7 +4,7 @@ import clsx from 'clsx'; import { roomOptions } from '@/core/api/options'; import getTimeRange from '@/core/utils/getTimeRange'; import { ProgressBar } from '@/shared/ProgressBar'; -import { RoomDetailMeta } from '@/Meta'; +import { RoomDetailMeta } from '@/domain/Meta'; import { RoomNotice } from '..'; import RoomHeader from './RoomHeader'; import RoomPreview from './RoomPreview'; diff --git a/src/RoomDetail/components/RoomWorkspace.tsx b/src/domain/RoomDetail/components/RoomWorkspace.tsx similarity index 99% rename from src/RoomDetail/components/RoomWorkspace.tsx rename to src/domain/RoomDetail/components/RoomWorkspace.tsx index b62136a9..630d6ef1 100644 --- a/src/RoomDetail/components/RoomWorkspace.tsx +++ b/src/domain/RoomDetail/components/RoomWorkspace.tsx @@ -155,10 +155,10 @@ const RoomWorkspace = ({ > ) : ( -