From 6e308e0bd3e74503f2d06843743213b7743e83ac Mon Sep 17 00:00:00 2001 From: kyuran kim <57716832+gxxrxn@users.noreply.github.com> Date: Mon, 17 Jun 2024 00:31:22 +0900 Subject: [PATCH] =?UTF-8?q?[#634]=20v1=20=EB=94=94=EB=A0=89=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#635)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: components 디렉토리 내부 파일 v1 > base로 이동 * fix: icon url 경로 절대경로로 수정 * refactor: v1/base > components/common 으로 수정 * refactor: api 폴더 구조 수정 - index 파일 제거 * refactor: 의미없는index 파일 사용하는 디렉토리 수정 * chore: recommend query ts 확장자로 수정 * chore: legacy icon 제거 --- .storybook/preview.tsx | 2 +- public/icons/legacy/back.svg | 3 - public/icons/legacy/book.svg | 1 - public/icons/legacy/bookIcon.svg | 3 - public/icons/legacy/bookmark-legacy.svg | 3 - public/icons/legacy/bookshelf.svg | 1 - public/icons/legacy/close-legacy.svg | 3 - public/icons/legacy/commentIcon.svg | 3 - public/icons/legacy/hashtag.svg | 1 - public/icons/legacy/job-card.svg | 5 -- public/icons/legacy/kakao-legacy.svg | 3 - public/icons/legacy/left-arrow.svg | 3 - public/icons/legacy/like.svg | 3 - public/icons/legacy/lock.svg | 3 - public/icons/legacy/logo-large.svg | 21 ----- public/icons/legacy/logo-small.svg | 6 -- public/icons/legacy/more-circle.svg | 3 - public/icons/legacy/more.svg | 3 - public/icons/legacy/peopleIcon.svg | 3 - public/icons/legacy/plus-circle.svg | 4 - public/icons/legacy/search-legacy.svg | 3 - public/icons/legacy/unlock.svg | 3 - public/icons/legacy/user.svg | 1 - public/icons/legacy/write.svg | 3 - src/apis/{book/index.ts => book.ts} | 4 +- src/apis/{bookshelf/index.ts => bookshelf.ts} | 2 +- src/apis/{group/index.ts => group.ts} | 2 +- src/apis/{job/index.ts => job.ts} | 2 +- src/apis/{recommend/index.ts => recommend.ts} | 6 +- src/apis/{user.tsx => user.ts} | 0 src/app/book/[bookId]/page.tsx | 20 ++--- src/app/book/search/page.tsx | 16 ++-- src/app/bookarchive/page.tsx | 8 +- src/app/bookshelf/[bookshelfId]/page.tsx | 14 ++-- src/app/global-error.tsx | 2 +- src/app/group/[groupId]/edit/page.tsx | 10 +-- src/app/group/[groupId]/join/page.tsx | 14 ++-- src/app/group/[groupId]/not-found.tsx | 2 +- src/app/group/[groupId]/page.tsx | 12 +-- src/app/group/create/page.tsx | 2 +- src/app/group/page.tsx | 16 ++-- src/app/layout.tsx | 10 +-- src/app/loading.tsx | 2 +- src/app/login/page.tsx | 2 +- src/app/login/redirect/page.tsx | 2 +- src/app/not-found.tsx | 2 +- src/app/profile/[userId]/page.tsx | 10 +-- src/app/profile/me/add/page.tsx | 4 +- src/app/profile/me/edit/page.tsx | 6 +- src/app/profile/me/group/page.tsx | 8 +- src/app/profile/me/page.tsx | 20 ++--- src/{v1 => components}/book/BookCover.tsx | 0 .../book/detail/BookInfo.tsx | 8 +- .../bookArchive/BookArchiveForAuth.tsx | 2 +- .../bookArchive/BookArchiveForUnAuth.tsx | 0 .../bookGroup/BookGroupNavigation.tsx | 14 ++-- .../bookGroup/BookGroupStatus.tsx | 2 +- .../bookGroup/BookInfoCard.tsx | 2 +- .../bookGroup/DetailBookGroupCard.tsx | 8 +- .../bookGroup/SearchGroup.tsx | 0 .../bookGroup/SimpleBookGroupCard.tsx | 0 .../create/CreateBookGroupFunnel.tsx | 10 +-- .../steps/EnterTitleStep/EnterTitleStep.tsx | 8 +- .../EnterTitleStep/fields/TitleField.tsx | 6 +- .../steps/EnterTitleStep/fields/index.ts | 0 .../steps/SelectBookStep/SelectBookStep.tsx | 8 +- .../SelectJoinTypeStep/SelectJoinTypeStep.tsx | 8 +- .../fields/JoinPasswordFieldset.tsx | 6 +- .../fields/JoinTypeFieldset.tsx | 6 +- .../fields/JoinTypeRadioCard.tsx | 0 .../steps/SelectJoinTypeStep/fields/index.ts | 0 .../steps/SetUpDetailStep/SetUpDetailStep.tsx | 20 ++--- .../bookGroup/create/steps/index.ts | 0 .../bookGroup/create/types.ts | 0 .../bookGroup/detail/BookGroupInfo.tsx | 8 +- .../bookGroup/detail/JoinBookGroupButton.tsx | 2 +- .../bookGroup/detail/MemberItem.tsx | 2 +- .../bookGroup/detail/ShortMemberInfo.tsx | 4 +- .../bookGroup/edit/BookGroupEditDateForm.tsx | 4 +- .../edit/BookGroupEditIntroduceForm.tsx | 4 +- .../bookGroup/edit/BookGroupEditTitleForm.tsx | 6 +- .../edit/BookGroupEditTopNavigation.tsx | 4 +- .../bookSearch/BestSellers.tsx | 6 +- .../bookSearch/BookSearchList.tsx | 4 +- .../bookSearch/RecentSearchList.tsx | 4 +- .../bookShelf/BookShelf.tsx | 0 .../bookShelf/BookShelfCard.tsx | 2 +- .../bookShelf/BookShelfRow.tsx | 2 +- .../comment/BookCommentList.tsx | 4 +- .../comment/BookGroupCommentList.tsx | 4 +- .../comment/CommentDrawer.tsx | 4 +- .../comment/CommentList.tsx | 10 +-- .../{ => common}/AuthFailedErrorBoundary.tsx | 4 +- src/{v1/base => components/common}/Avatar.tsx | 0 .../base => components/common}/BackButton.tsx | 0 src/{v1/base => components/common}/Badge.tsx | 0 .../common}/BottomActionButton.tsx | 2 +- .../common}/BottomNavigation.tsx | 0 .../common}/BottomSheet.tsx | 0 src/{v1/base => components/common}/Button.tsx | 0 .../{ => common}/ContextProvider.tsx | 6 +- .../base => components/common}/DatePicker.tsx | 0 src/{v1/base => components/common}/Drawer.tsx | 2 +- .../common}/ErrorMessage.tsx | 0 .../common}/FloatingButton.tsx | 2 +- src/{v1/base => components/common}/Funnel.tsx | 0 src/{v1/base => components/common}/Input.tsx | 0 .../common}/InputLength.tsx | 0 .../base => components/common}/LikeButton.tsx | 0 .../base => components/common}/Loading.tsx | 0 .../common}/LoginBottomActionButton.tsx | 2 +- src/{v1/base => components/common}/Menu.tsx | 2 +- src/{v1/base => components/common}/Modal.tsx | 0 .../{ => common}/PWAServiceWorkerProvider.tsx | 0 src/{v1/base => components/common}/Portal.tsx | 0 .../common}/ProgressBar.tsx | 0 .../common}/QueryErrorBoundaryFallback.tsx | 2 +- .../common}/RadioButton.tsx | 0 .../{ => common}/ReactQueryProvider.tsx | 0 .../{ => common}/SSRSafeSuspense.tsx | 0 src/{v1/base => components/common}/Select.tsx | 0 .../common}/ShareButton.tsx | 2 +- .../base => components/common}/Skeleton.tsx | 0 .../base => components/common}/Stepper.tsx | 2 +- src/{v1/base => components/common}/Switch.tsx | 0 .../base => components/common}/TextArea.tsx | 4 +- .../common}/Toast/ToastItem.tsx | 2 +- .../common}/Toast/ToastProvider.tsx | 9 ++- .../base => components/common}/Toast/types.ts | 0 .../common}/Toast/useToast.ts | 4 +- .../base => components/common}/TopHeader.tsx | 0 .../common}/TopNavigation.tsx | 0 src/{v1 => components}/layout/Layout.tsx | 2 +- .../profile/AddJobProfile.tsx | 12 +-- .../profile/EditProfile.tsx | 12 +-- .../profile/LoginBottomSheet.tsx | 4 +- .../bookShelf/MyProfileBookshelfContainer.tsx | 2 +- .../profile/bookShelf/ProfileBookShelf.tsx | 4 +- .../bookShelf/ProfileBookshelfPresenter.tsx | 2 +- .../UserProfileBookshelfContainer.tsx | 2 +- .../profile/group/ProfileGroup.tsx | 6 +- .../profile/group/ProfileGroupContainer.tsx | 2 +- .../profile/group/ProfileGroupPresenter.tsx | 2 +- .../profile/info/MyProfileInfoContainer.tsx | 2 +- .../profile/info/ProfileInfo.tsx | 8 +- .../profile/info/ProfileInfoPresenter.tsx | 4 +- .../profile/info/UserProfileInfoContainer.tsx | 2 +- src/constants/metadata/appleSplashScreens.ts | 76 +++++++++---------- src/hooks/group/useJoinBookGroup.ts | 2 +- src/hooks/useFunnel.tsx | 4 +- .../index.tsx => useEntireGroupsQuery.ts} | 0 .../index.ts => useAllJobQuery.ts} | 0 .../index.tsx => useAuthRecommendedBooks.ts} | 11 +-- ...dex.tsx => useAuthRecommendedBookshelf.ts} | 11 +-- ... => useUnAuthRecommendedBookshelfQuery.ts} | 5 +- .../index.ts => useMyProfileMutation.ts} | 1 + src/stories/book/detail/BookInfo.stories.tsx | 2 +- .../bookGroup/BookGroupStatus.stories.tsx | 2 +- .../bookGroup/BookInfoCard.stories.tsx | 2 +- .../bookGroup/DetailBookGroupCard.stories.tsx | 2 +- src/stories/bookGroup/SearchGroup.stories.tsx | 4 +- .../bookGroup/SimpleBookGroupCard.stories.tsx | 2 +- .../create/steps/EnterTitleStep.stories.tsx | 4 +- .../create/steps/SelectBookStep.stories.tsx | 4 +- .../steps/SelectJoinTypeStep.stories.tsx | 4 +- .../create/steps/SetUpDetailStep.stories.tsx | 4 +- .../bookGroup/detail/MemberItem.stories.tsx | 2 +- .../detail/ShortMemberInfo.stories.tsx | 2 +- .../bookSearch/BestSellers.stories.tsx | 2 +- .../bookSearch/RecentSearch.stories.tsx | 2 +- .../bookSearch/SearchResult.stories.tsx | 2 +- .../bookShelf/BookShelfCard.stories.tsx | 2 +- src/stories/comment/CommentList.stories.tsx | 2 +- .../{base => common}/Avatar.stories.tsx | 4 +- .../{base => common}/Badge.stories.tsx | 4 +- .../BottomActionButton.stories.tsx | 4 +- .../BottomNavigation.stories.tsx | 4 +- .../{base => common}/BottomSheet.stories.tsx | 6 +- .../{base => common}/Button.stories.tsx | 4 +- .../{base => common}/DatePicker.stories.tsx | 8 +- .../{base => common}/Drawer.stories.tsx | 6 +- .../FloatingButton.stories.tsx | 4 +- .../{base => common}/Input.stories.tsx | 8 +- .../{base => common}/InputLength.stories.tsx | 10 +-- .../{base => common}/LikeButton.stories.tsx | 4 +- .../{base => common}/Loading.stories.tsx | 4 +- src/stories/{base => common}/Menu.stories.tsx | 4 +- .../{base => common}/Modal.stories.tsx | 6 +- .../{base => common}/ProgressBar.stories.tsx | 4 +- .../{base => common}/RadioButton.stories.tsx | 6 +- .../{base => common}/Select.stories.tsx | 8 +- .../{base => common}/Skeleton.stories.tsx | 4 +- .../{base => common}/Stepper.stories.tsx | 4 +- .../{base => common}/Switch.stories.tsx | 6 +- .../{base => common}/TextArea.stories.tsx | 6 +- .../{base => common}/Toast.stories.tsx | 8 +- .../{base => common}/TopHeader.stories.tsx | 4 +- .../TopNavigation.stories.tsx | 4 +- src/stories/layout/Layout.stories.tsx | 2 +- src/stories/meta.tsx | 2 +- 200 files changed, 397 insertions(+), 473 deletions(-) delete mode 100644 public/icons/legacy/back.svg delete mode 100644 public/icons/legacy/book.svg delete mode 100644 public/icons/legacy/bookIcon.svg delete mode 100644 public/icons/legacy/bookmark-legacy.svg delete mode 100644 public/icons/legacy/bookshelf.svg delete mode 100644 public/icons/legacy/close-legacy.svg delete mode 100644 public/icons/legacy/commentIcon.svg delete mode 100644 public/icons/legacy/hashtag.svg delete mode 100644 public/icons/legacy/job-card.svg delete mode 100644 public/icons/legacy/kakao-legacy.svg delete mode 100644 public/icons/legacy/left-arrow.svg delete mode 100644 public/icons/legacy/like.svg delete mode 100644 public/icons/legacy/lock.svg delete mode 100644 public/icons/legacy/logo-large.svg delete mode 100644 public/icons/legacy/logo-small.svg delete mode 100644 public/icons/legacy/more-circle.svg delete mode 100644 public/icons/legacy/more.svg delete mode 100644 public/icons/legacy/peopleIcon.svg delete mode 100644 public/icons/legacy/plus-circle.svg delete mode 100644 public/icons/legacy/search-legacy.svg delete mode 100644 public/icons/legacy/unlock.svg delete mode 100644 public/icons/legacy/user.svg delete mode 100644 public/icons/legacy/write.svg rename src/apis/{book/index.ts => book.ts} (97%) rename src/apis/{bookshelf/index.ts => bookshelf.ts} (96%) rename src/apis/{group/index.ts => group.ts} (98%) rename src/apis/{job/index.ts => job.ts} (78%) rename src/apis/{recommend/index.ts => recommend.ts} (87%) rename src/apis/{user.tsx => user.ts} (100%) rename src/{v1 => components}/book/BookCover.tsx (100%) rename src/{v1 => components}/book/detail/BookInfo.tsx (95%) rename src/{v1 => components}/bookArchive/BookArchiveForAuth.tsx (97%) rename src/{v1 => components}/bookArchive/BookArchiveForUnAuth.tsx (100%) rename src/{v1 => components}/bookGroup/BookGroupNavigation.tsx (94%) rename src/{v1 => components}/bookGroup/BookGroupStatus.tsx (96%) rename src/{v1 => components}/bookGroup/BookInfoCard.tsx (98%) rename src/{v1 => components}/bookGroup/DetailBookGroupCard.tsx (95%) rename src/{v1 => components}/bookGroup/SearchGroup.tsx (100%) rename src/{v1 => components}/bookGroup/SimpleBookGroupCard.tsx (100%) rename src/{v1 => components}/bookGroup/create/CreateBookGroupFunnel.tsx (93%) rename src/{v1 => components}/bookGroup/create/steps/EnterTitleStep/EnterTitleStep.tsx (72%) rename src/{v1 => components}/bookGroup/create/steps/EnterTitleStep/fields/TitleField.tsx (88%) rename src/{v1 => components}/bookGroup/create/steps/EnterTitleStep/fields/index.ts (100%) rename src/{v1 => components}/bookGroup/create/steps/SelectBookStep/SelectBookStep.tsx (93%) rename src/{v1 => components}/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep.tsx (80%) rename src/{v1 => components}/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinPasswordFieldset.tsx (95%) rename src/{v1 => components}/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeFieldset.tsx (71%) rename src/{v1 => components}/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeRadioCard.tsx (100%) rename src/{v1 => components}/bookGroup/create/steps/SelectJoinTypeStep/fields/index.ts (100%) rename src/{v1 => components}/bookGroup/create/steps/SetUpDetailStep/SetUpDetailStep.tsx (93%) rename src/{v1 => components}/bookGroup/create/steps/index.ts (100%) rename src/{v1 => components}/bookGroup/create/types.ts (100%) rename src/{v1 => components}/bookGroup/detail/BookGroupInfo.tsx (92%) rename src/{v1 => components}/bookGroup/detail/JoinBookGroupButton.tsx (92%) rename src/{v1 => components}/bookGroup/detail/MemberItem.tsx (94%) rename src/{v1 => components}/bookGroup/detail/ShortMemberInfo.tsx (92%) rename src/{v1 => components}/bookGroup/edit/BookGroupEditDateForm.tsx (92%) rename src/{v1 => components}/bookGroup/edit/BookGroupEditIntroduceForm.tsx (90%) rename src/{v1 => components}/bookGroup/edit/BookGroupEditTitleForm.tsx (87%) rename src/{v1 => components}/bookGroup/edit/BookGroupEditTopNavigation.tsx (88%) rename src/{v1 => components}/bookSearch/BestSellers.tsx (97%) rename src/{v1 => components}/bookSearch/BookSearchList.tsx (94%) rename src/{v1 => components}/bookSearch/RecentSearchList.tsx (94%) rename src/{v1 => components}/bookShelf/BookShelf.tsx (100%) rename src/{v1 => components}/bookShelf/BookShelfCard.tsx (91%) rename src/{v1 => components}/bookShelf/BookShelfRow.tsx (87%) rename src/{v1 => components}/comment/BookCommentList.tsx (93%) rename src/{v1 => components}/comment/BookGroupCommentList.tsx (94%) rename src/{v1 => components}/comment/CommentDrawer.tsx (94%) rename src/{v1 => components}/comment/CommentList.tsx (95%) rename src/components/{ => common}/AuthFailedErrorBoundary.tsx (90%) rename src/{v1/base => components/common}/Avatar.tsx (100%) rename src/{v1/base => components/common}/BackButton.tsx (100%) rename src/{v1/base => components/common}/Badge.tsx (100%) rename src/{v1/base => components/common}/BottomActionButton.tsx (91%) rename src/{v1/base => components/common}/BottomNavigation.tsx (100%) rename src/{v1/base => components/common}/BottomSheet.tsx (100%) rename src/{v1/base => components/common}/Button.tsx (100%) rename src/components/{ => common}/ContextProvider.tsx (60%) rename src/{v1/base => components/common}/DatePicker.tsx (100%) rename src/{v1/base => components/common}/Drawer.tsx (98%) rename src/{v1/base => components/common}/ErrorMessage.tsx (100%) rename src/{v1/base => components/common}/FloatingButton.tsx (93%) rename src/{v1/base => components/common}/Funnel.tsx (100%) rename src/{v1/base => components/common}/Input.tsx (100%) rename src/{v1/base => components/common}/InputLength.tsx (100%) rename src/{v1/base => components/common}/LikeButton.tsx (100%) rename src/{v1/base => components/common}/Loading.tsx (100%) rename src/{v1/base => components/common}/LoginBottomActionButton.tsx (79%) rename src/{v1/base => components/common}/Menu.tsx (97%) rename src/{v1/base => components/common}/Modal.tsx (100%) rename src/components/{ => common}/PWAServiceWorkerProvider.tsx (100%) rename src/{v1/base => components/common}/Portal.tsx (100%) rename src/{v1/base => components/common}/ProgressBar.tsx (100%) rename src/{v1/base => components/common}/QueryErrorBoundaryFallback.tsx (91%) rename src/{v1/base => components/common}/RadioButton.tsx (100%) rename src/components/{ => common}/ReactQueryProvider.tsx (100%) rename src/components/{ => common}/SSRSafeSuspense.tsx (100%) rename src/{v1/base => components/common}/Select.tsx (100%) rename src/{v1/base => components/common}/ShareButton.tsx (91%) rename src/{v1/base => components/common}/Skeleton.tsx (100%) rename src/{v1/base => components/common}/Stepper.tsx (98%) rename src/{v1/base => components/common}/Switch.tsx (100%) rename src/{v1/base => components/common}/TextArea.tsx (95%) rename src/{v1/base => components/common}/Toast/ToastItem.tsx (90%) rename src/{v1/base => components/common}/Toast/ToastProvider.tsx (87%) rename src/{v1/base => components/common}/Toast/types.ts (100%) rename src/{v1/base => components/common}/Toast/useToast.ts (63%) rename src/{v1/base => components/common}/TopHeader.tsx (100%) rename src/{v1/base => components/common}/TopNavigation.tsx (100%) rename src/{v1 => components}/layout/Layout.tsx (92%) rename src/{v1 => components}/profile/AddJobProfile.tsx (94%) rename src/{v1 => components}/profile/EditProfile.tsx (93%) rename src/{v1 => components}/profile/LoginBottomSheet.tsx (93%) rename src/{v1 => components}/profile/bookShelf/MyProfileBookshelfContainer.tsx (74%) rename src/{v1 => components}/profile/bookShelf/ProfileBookShelf.tsx (58%) rename src/{v1 => components}/profile/bookShelf/ProfileBookshelfPresenter.tsx (95%) rename src/{v1 => components}/profile/bookShelf/UserProfileBookshelfContainer.tsx (79%) rename src/{v1 => components}/profile/group/ProfileGroup.tsx (87%) rename src/{v1 => components}/profile/group/ProfileGroupContainer.tsx (89%) rename src/{v1 => components}/profile/group/ProfileGroupPresenter.tsx (94%) rename src/{v1 => components}/profile/info/MyProfileInfoContainer.tsx (88%) rename src/{v1 => components}/profile/info/ProfileInfo.tsx (77%) rename src/{v1 => components}/profile/info/ProfileInfoPresenter.tsx (91%) rename src/{v1 => components}/profile/info/UserProfileInfoContainer.tsx (80%) rename src/queries/group/{useEntireGroupsQuery/index.tsx => useEntireGroupsQuery.ts} (100%) rename src/queries/job/{useAllJobQuery/index.ts => useAllJobQuery.ts} (100%) rename src/queries/recommend/{useAuthRecommendedBooks/index.tsx => useAuthRecommendedBooks.ts} (64%) rename src/queries/recommend/{useAuthRecommendedBookshelf/index.tsx => useAuthRecommendedBookshelf.ts} (64%) rename src/queries/recommend/{useUnAuthRecommendedBookshelfQuery/index.tsx => useUnAuthRecommendedBookshelfQuery.ts} (66%) rename src/queries/user/{useMyProfileMutation/index.ts => useMyProfileMutation.ts} (99%) rename src/stories/{base => common}/Avatar.stories.tsx (82%) rename src/stories/{base => common}/Badge.stories.tsx (93%) rename src/stories/{base => common}/BottomActionButton.stories.tsx (81%) rename src/stories/{base => common}/BottomNavigation.stories.tsx (88%) rename src/stories/{base => common}/BottomSheet.stories.tsx (94%) rename src/stories/{base => common}/Button.stories.tsx (95%) rename src/stories/{base => common}/DatePicker.stories.tsx (92%) rename src/stories/{base => common}/Drawer.stories.tsx (93%) rename src/stories/{base => common}/FloatingButton.stories.tsx (77%) rename src/stories/{base => common}/Input.stories.tsx (95%) rename src/stories/{base => common}/InputLength.stories.tsx (87%) rename src/stories/{base => common}/LikeButton.stories.tsx (81%) rename src/stories/{base => common}/Loading.stories.tsx (82%) rename src/stories/{base => common}/Menu.stories.tsx (92%) rename src/stories/{base => common}/Modal.stories.tsx (93%) rename src/stories/{base => common}/ProgressBar.stories.tsx (74%) rename src/stories/{base => common}/RadioButton.stories.tsx (90%) rename src/stories/{base => common}/Select.stories.tsx (93%) rename src/stories/{base => common}/Skeleton.stories.tsx (93%) rename src/stories/{base => common}/Stepper.stories.tsx (83%) rename src/stories/{base => common}/Switch.stories.tsx (90%) rename src/stories/{base => common}/TextArea.stories.tsx (89%) rename src/stories/{base => common}/Toast.stories.tsx (88%) rename src/stories/{base => common}/TopHeader.stories.tsx (89%) rename src/stories/{base => common}/TopNavigation.stories.tsx (96%) diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 1ee64805..7da5b862 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -4,7 +4,7 @@ import { initialize, mswLoader } from 'msw-storybook-addon'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import type { Preview } from '@storybook/react'; -import ToastProvider from '../src/v1/base/Toast/ToastProvider'; +import ToastProvider from '../src/components/common/Toast/ToastProvider'; import '@/styles/global.css'; diff --git a/public/icons/legacy/back.svg b/public/icons/legacy/back.svg deleted file mode 100644 index eea075a2..00000000 --- a/public/icons/legacy/back.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/book.svg b/public/icons/legacy/book.svg deleted file mode 100644 index ee85332a..00000000 --- a/public/icons/legacy/book.svg +++ /dev/null @@ -1 +0,0 @@ -book-open-page-variant \ No newline at end of file diff --git a/public/icons/legacy/bookIcon.svg b/public/icons/legacy/bookIcon.svg deleted file mode 100644 index 398093b9..00000000 --- a/public/icons/legacy/bookIcon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/bookmark-legacy.svg b/public/icons/legacy/bookmark-legacy.svg deleted file mode 100644 index 0b796102..00000000 --- a/public/icons/legacy/bookmark-legacy.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/bookshelf.svg b/public/icons/legacy/bookshelf.svg deleted file mode 100644 index e60c4748..00000000 --- a/public/icons/legacy/bookshelf.svg +++ /dev/null @@ -1 +0,0 @@ -bookshelf \ No newline at end of file diff --git a/public/icons/legacy/close-legacy.svg b/public/icons/legacy/close-legacy.svg deleted file mode 100644 index afa26652..00000000 --- a/public/icons/legacy/close-legacy.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/commentIcon.svg b/public/icons/legacy/commentIcon.svg deleted file mode 100644 index afee45bc..00000000 --- a/public/icons/legacy/commentIcon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/hashtag.svg b/public/icons/legacy/hashtag.svg deleted file mode 100644 index 57e6d43b..00000000 --- a/public/icons/legacy/hashtag.svg +++ /dev/null @@ -1 +0,0 @@ -pound \ No newline at end of file diff --git a/public/icons/legacy/job-card.svg b/public/icons/legacy/job-card.svg deleted file mode 100644 index 8a0815c3..00000000 --- a/public/icons/legacy/job-card.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/public/icons/legacy/kakao-legacy.svg b/public/icons/legacy/kakao-legacy.svg deleted file mode 100644 index 286ff5fd..00000000 --- a/public/icons/legacy/kakao-legacy.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/left-arrow.svg b/public/icons/legacy/left-arrow.svg deleted file mode 100644 index efff2071..00000000 --- a/public/icons/legacy/left-arrow.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/like.svg b/public/icons/legacy/like.svg deleted file mode 100644 index 9ed3e5fa..00000000 --- a/public/icons/legacy/like.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/lock.svg b/public/icons/legacy/lock.svg deleted file mode 100644 index 34c335c6..00000000 --- a/public/icons/legacy/lock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/logo-large.svg b/public/icons/legacy/logo-large.svg deleted file mode 100644 index 3864345a..00000000 --- a/public/icons/legacy/logo-large.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/icons/legacy/logo-small.svg b/public/icons/legacy/logo-small.svg deleted file mode 100644 index 33a28963..00000000 --- a/public/icons/legacy/logo-small.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/public/icons/legacy/more-circle.svg b/public/icons/legacy/more-circle.svg deleted file mode 100644 index 472129c5..00000000 --- a/public/icons/legacy/more-circle.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/more.svg b/public/icons/legacy/more.svg deleted file mode 100644 index 7badbc42..00000000 --- a/public/icons/legacy/more.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/peopleIcon.svg b/public/icons/legacy/peopleIcon.svg deleted file mode 100644 index c9d6c9a6..00000000 --- a/public/icons/legacy/peopleIcon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/plus-circle.svg b/public/icons/legacy/plus-circle.svg deleted file mode 100644 index ba4b72e3..00000000 --- a/public/icons/legacy/plus-circle.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/public/icons/legacy/search-legacy.svg b/public/icons/legacy/search-legacy.svg deleted file mode 100644 index 744bed40..00000000 --- a/public/icons/legacy/search-legacy.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/unlock.svg b/public/icons/legacy/unlock.svg deleted file mode 100644 index 7869e098..00000000 --- a/public/icons/legacy/unlock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/icons/legacy/user.svg b/public/icons/legacy/user.svg deleted file mode 100644 index b5f1fbea..00000000 --- a/public/icons/legacy/user.svg +++ /dev/null @@ -1 +0,0 @@ -account-circle \ No newline at end of file diff --git a/public/icons/legacy/write.svg b/public/icons/legacy/write.svg deleted file mode 100644 index 708c8b07..00000000 --- a/public/icons/legacy/write.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/apis/book/index.ts b/src/apis/book.ts similarity index 97% rename from src/apis/book/index.ts rename to src/apis/book.ts index fe798350..423878ed 100644 --- a/src/apis/book/index.ts +++ b/src/apis/book.ts @@ -11,8 +11,8 @@ import type { APIRecentSearches, APIBestSellerRes, } from '@/types/book'; -import bookshelfAPI from '../bookshelf'; -import { publicApi } from '../core/axios'; +import bookshelfAPI from './bookshelf'; +import { publicApi } from './core/axios'; const bookAPI = { searchBooks: ({ diff --git a/src/apis/bookshelf/index.ts b/src/apis/bookshelf.ts similarity index 96% rename from src/apis/bookshelf/index.ts rename to src/apis/bookshelf.ts index e326b7b4..93dc151f 100644 --- a/src/apis/bookshelf/index.ts +++ b/src/apis/bookshelf.ts @@ -4,7 +4,7 @@ import { APIBookshelfPagination, } from '@/types/bookshelf'; import { APIUser } from '@/types/user'; -import { publicApi } from '../core/axios'; +import { publicApi } from './core/axios'; const bookshelfAPI = { getUserSummaryBookshelf: ({ userId }: { userId: APIUser['userId'] }) => diff --git a/src/apis/group/index.ts b/src/apis/group.ts similarity index 98% rename from src/apis/group/index.ts rename to src/apis/group.ts index 8b7a4c5b..f122f405 100644 --- a/src/apis/group/index.ts +++ b/src/apis/group.ts @@ -6,7 +6,7 @@ import { APIGroupComment, APIGroupCommentPagination, } from '@/types/group'; -import { publicApi } from '../core/axios'; +import { publicApi } from './core/axios'; const groupAPI = { getEntireGroups: (pageParam: string) => diff --git a/src/apis/job/index.ts b/src/apis/job.ts similarity index 78% rename from src/apis/job/index.ts rename to src/apis/job.ts index f48d25c2..7a61e4fa 100644 --- a/src/apis/job/index.ts +++ b/src/apis/job.ts @@ -1,5 +1,5 @@ import { APIAllJob } from '@/types/job'; -import { publicApi } from '../core/axios'; +import { publicApi } from './core/axios'; const jobAPI = { getAllJobs: () => publicApi.get(`/service-api/jobs`), diff --git a/src/apis/recommend/index.ts b/src/apis/recommend.ts similarity index 87% rename from src/apis/recommend/index.ts rename to src/apis/recommend.ts index e863575f..16133d2b 100644 --- a/src/apis/recommend/index.ts +++ b/src/apis/recommend.ts @@ -4,9 +4,9 @@ import { APIRecommendedBooksPagination, } from '@/types/bookshelf'; import { APIJobGroup } from '@/types/job'; -import { publicApi } from '../core/axios'; +import { publicApi } from '@/apis/core/axios'; -const RecommendAPI = { +const recommendAPI = { getUnAuthRecommendedBookshelf: () => publicApi.get( `/service-api/suggestions/bookshelves/default` @@ -23,4 +23,4 @@ const RecommendAPI = { ), }; -export default RecommendAPI; +export default recommendAPI; diff --git a/src/apis/user.tsx b/src/apis/user.ts similarity index 100% rename from src/apis/user.tsx rename to src/apis/user.ts diff --git a/src/app/book/[bookId]/page.tsx b/src/app/book/[bookId]/page.tsx index 303707d2..57f4d2ed 100644 --- a/src/app/book/[bookId]/page.tsx +++ b/src/app/book/[bookId]/page.tsx @@ -5,7 +5,7 @@ import { APIBook } from '@/types/book'; import { useBookTitle } from '@/queries/book/useBookInfoQuery'; import { useHasBookComment } from '@/queries/book/useBookCommentsQuery'; import useCreateBookCommentMutation from '@/queries/book/useCreateBookCommentMutation'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import useDisclosure from '@/hooks/useDisclosure'; import { checkAuthentication, @@ -13,15 +13,15 @@ import { } from '@/utils/helpers'; import { SERVICE_ERROR_MESSAGE } from '@/constants'; -import Skeleton from '@/v1/base/Skeleton'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; -import TopNavigation from '@/v1/base/TopNavigation'; -import BottomActionButton from '@/v1/base/BottomActionButton'; -import LoginBottomActionButton from '@/v1/base/LoginBottomActionButton'; -import CommentDrawer from '@/v1/comment/CommentDrawer'; -import BackButton from '@/v1/base/BackButton'; -import BookInfo, { BookInfoSkeleton } from '@/v1/book/detail/BookInfo'; -import BookCommentList from '@/v1/comment/BookCommentList'; +import Skeleton from '@/components/common/Skeleton'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; +import TopNavigation from '@/components/common/TopNavigation'; +import BottomActionButton from '@/components/common/BottomActionButton'; +import LoginBottomActionButton from '@/components/common/LoginBottomActionButton'; +import CommentDrawer from '@/components/comment/CommentDrawer'; +import BackButton from '@/components/common/BackButton'; +import BookInfo, { BookInfoSkeleton } from '@/components/book/detail/BookInfo'; +import BookCommentList from '@/components/comment/BookCommentList'; const BookDetailPage = ({ params: { bookId }, diff --git a/src/app/book/search/page.tsx b/src/app/book/search/page.tsx index 49b73e1a..e5983ec7 100644 --- a/src/app/book/search/page.tsx +++ b/src/app/book/search/page.tsx @@ -11,19 +11,21 @@ import useBookSearchQuery from '@/queries/book/useBookSearchQuery'; import { useRecentSearchListQuery } from '@/queries/book/useRecentSearchesQuery'; import bookAPI from '@/apis/book'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; import useDebounceValue from '@/hooks/useDebounce'; import useQueryParams from '@/hooks/useQueryParams'; import { checkAuthentication } from '@/utils/helpers'; -import Loading from '@/v1/base/Loading'; -import Input from '@/v1/base/Input'; -import TopHeader from '@/v1/base/TopHeader'; -import BestSellers, { BestSellersSkeleton } from '@/v1/bookSearch/BestSellers'; +import Loading from '@/components/common/Loading'; +import Input from '@/components/common/Input'; +import TopHeader from '@/components/common/TopHeader'; +import BestSellers, { + BestSellersSkeleton, +} from '@/components/bookSearch/BestSellers'; import RecentSearchList, { RecentSearchListSkeleton, -} from '@/v1/bookSearch/RecentSearchList'; -import BookSearchList from '@/v1/bookSearch/BookSearchList'; +} from '@/components/bookSearch/RecentSearchList'; +import BookSearchList from '@/components/bookSearch/BookSearchList'; type FormValues = { searchValue: string; diff --git a/src/app/bookarchive/page.tsx b/src/app/bookarchive/page.tsx index 0393cdde..302ef0e9 100644 --- a/src/app/bookarchive/page.tsx +++ b/src/app/bookarchive/page.tsx @@ -4,10 +4,10 @@ import useMyProfileQuery from '@/queries/user/useMyProfileQuery'; import { checkAuthentication } from '@/utils/helpers'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; -import BookArchiveForAuth from '@/v1/bookArchive/BookArchiveForAuth'; -import BookArchiveForUnAuth from '@/v1/bookArchive/BookArchiveForUnAuth'; -import TopHeader from '@/v1/base/TopHeader'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; +import BookArchiveForAuth from '@/components/bookArchive/BookArchiveForAuth'; +import BookArchiveForUnAuth from '@/components/bookArchive/BookArchiveForUnAuth'; +import TopHeader from '@/components/common/TopHeader'; export default function BookArchivePage() { return ( diff --git a/src/app/bookshelf/[bookshelfId]/page.tsx b/src/app/bookshelf/[bookshelfId]/page.tsx index cfea954b..78fbbf8c 100644 --- a/src/app/bookshelf/[bookshelfId]/page.tsx +++ b/src/app/bookshelf/[bookshelfId]/page.tsx @@ -14,13 +14,13 @@ import { checkAuthentication } from '@/utils/helpers'; import { IconKakao } from '@public/icons'; import { KAKAO_LOGIN_URL } from '@/constants'; -import useToast from '@/v1/base/Toast/useToast'; -import TopNavigation from '@/v1/base/TopNavigation'; -import BookShelfRow from '@/v1/bookShelf/BookShelfRow'; -import Button from '@/v1/base/Button'; -import LikeButton from '@/v1/base/LikeButton'; -import BackButton from '@/v1/base/BackButton'; -import ShareButton from '@/v1/base/ShareButton'; +import useToast from '@/components/common/Toast/useToast'; +import TopNavigation from '@/components/common/TopNavigation'; +import BookShelfRow from '@/components/bookShelf/BookShelfRow'; +import Button from '@/components/common/Button'; +import LikeButton from '@/components/common/LikeButton'; +import BackButton from '@/components/common/BackButton'; +import ShareButton from '@/components/common/ShareButton'; export default function UserBookShelfPage({ params: { bookshelfId }, diff --git a/src/app/global-error.tsx b/src/app/global-error.tsx index 1fbaf594..c6d9ab5d 100644 --- a/src/app/global-error.tsx +++ b/src/app/global-error.tsx @@ -1,6 +1,6 @@ 'use client'; -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; import Image from 'next/image'; import { useRouter } from 'next/navigation'; diff --git a/src/app/group/[groupId]/edit/page.tsx b/src/app/group/[groupId]/edit/page.tsx index 607b6ac4..b857e56b 100644 --- a/src/app/group/[groupId]/edit/page.tsx +++ b/src/app/group/[groupId]/edit/page.tsx @@ -11,13 +11,13 @@ import type { APIGroupDetail, APIEditBookGroup } from '@/types/group'; import { SERVICE_ERROR_MESSAGE } from '@/constants'; import { isAxiosErrorWithCustomCode } from '@/utils/helpers'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import withAuthRequired from '@/hocs/withAuthRequired'; -import BookGroupEditDateForm from '@/v1/bookGroup/edit/BookGroupEditDateForm'; -import BookGroupEditIntroduceForm from '@/v1/bookGroup/edit/BookGroupEditIntroduceForm'; -import BookGroupEditTitleForm from '@/v1/bookGroup/edit/BookGroupEditTitleForm'; -import BookGroupEditTopNavigation from '@/v1/bookGroup/edit/BookGroupEditTopNavigation'; +import BookGroupEditDateForm from '@/components/bookGroup/edit/BookGroupEditDateForm'; +import BookGroupEditIntroduceForm from '@/components/bookGroup/edit/BookGroupEditIntroduceForm'; +import BookGroupEditTitleForm from '@/components/bookGroup/edit/BookGroupEditTitleForm'; +import BookGroupEditTopNavigation from '@/components/bookGroup/edit/BookGroupEditTopNavigation'; const BookGroupEditPage = ({ params: { groupId }, diff --git a/src/app/group/[groupId]/join/page.tsx b/src/app/group/[groupId]/join/page.tsx index 08de9554..38a1a27e 100644 --- a/src/app/group/[groupId]/join/page.tsx +++ b/src/app/group/[groupId]/join/page.tsx @@ -5,15 +5,15 @@ import { SubmitHandler, useForm } from 'react-hook-form'; import useJoinBookGroup from '@/hooks/group/useJoinBookGroup'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; import withAuthRequired from '@/hocs/withAuthRequired'; -import Loading from '@/v1/base/Loading'; -import Input from '@/v1/base/Input'; -import InputLength from '@/v1/base/InputLength'; -import ErrorMessage from '@/v1/base/ErrorMessage'; -import BottomActionButton from '@/v1/base/BottomActionButton'; -import BookGroupNavigation from '@/v1/bookGroup/BookGroupNavigation'; +import Loading from '@/components/common/Loading'; +import Input from '@/components/common/Input'; +import InputLength from '@/components/common/InputLength'; +import ErrorMessage from '@/components/common/ErrorMessage'; +import BottomActionButton from '@/components/common/BottomActionButton'; +import BookGroupNavigation from '@/components/bookGroup/BookGroupNavigation'; type JoinFormValues = { answer: string; diff --git a/src/app/group/[groupId]/not-found.tsx b/src/app/group/[groupId]/not-found.tsx index d71c424f..a5f20577 100644 --- a/src/app/group/[groupId]/not-found.tsx +++ b/src/app/group/[groupId]/not-found.tsx @@ -1,4 +1,4 @@ -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; import Image from 'next/image'; import Link from 'next/link'; diff --git a/src/app/group/[groupId]/page.tsx b/src/app/group/[groupId]/page.tsx index 72e2a797..0e2d434d 100644 --- a/src/app/group/[groupId]/page.tsx +++ b/src/app/group/[groupId]/page.tsx @@ -5,12 +5,12 @@ import { ErrorBoundary } from 'react-error-boundary'; import { checkAuthentication } from '@/utils/helpers'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; -import LoginBottomActionButton from '@/v1/base/LoginBottomActionButton'; -import BookGroupNavigation from '@/v1/bookGroup/BookGroupNavigation'; -import BookGroupInfo from '@/v1/bookGroup/detail/BookGroupInfo'; -import JoinBookGroupButton from '@/v1/bookGroup/detail/JoinBookGroupButton'; -import BookGroupCommentList from '@/v1/comment/BookGroupCommentList'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; +import LoginBottomActionButton from '@/components/common/LoginBottomActionButton'; +import BookGroupNavigation from '@/components/bookGroup/BookGroupNavigation'; +import BookGroupInfo from '@/components/bookGroup/detail/BookGroupInfo'; +import JoinBookGroupButton from '@/components/bookGroup/detail/JoinBookGroupButton'; +import BookGroupCommentList from '@/components/comment/BookGroupCommentList'; const DetailBookGroupPage = ({ params: { groupId }, diff --git a/src/app/group/create/page.tsx b/src/app/group/create/page.tsx index da9a1401..124bbfde 100644 --- a/src/app/group/create/page.tsx +++ b/src/app/group/create/page.tsx @@ -2,7 +2,7 @@ import withAuthRequired from '@/hocs/withAuthRequired'; -import CreateBookGroupFunnel from '@/v1/bookGroup/create/CreateBookGroupFunnel'; +import CreateBookGroupFunnel from '@/components/bookGroup/create/CreateBookGroupFunnel'; const GroupCreateFunnelPage = () => { return ; diff --git a/src/app/group/page.tsx b/src/app/group/page.tsx index 4b8dfc0e..24b67dcb 100644 --- a/src/app/group/page.tsx +++ b/src/app/group/page.tsx @@ -4,25 +4,25 @@ import { useRouter } from 'next/navigation'; import { useEffect } from 'react'; import { useInView } from 'react-intersection-observer'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; import useEntireGroupsQuery from '@/queries/group/useEntireGroupsQuery'; import useMyGroupsQuery from '@/queries/group/useMyGroupQuery'; import { useMyProfileId } from '@/queries/user/useMyProfileQuery'; import useMounted from '@/hooks/useMounted'; import { checkAuthentication } from '@/utils/helpers'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; -import FloatingButton from '@/v1/base/FloatingButton'; -import Loading from '@/v1/base/Loading'; -import TopHeader from '@/v1/base/TopHeader'; +import FloatingButton from '@/components/common/FloatingButton'; +import Loading from '@/components/common/Loading'; +import TopHeader from '@/components/common/TopHeader'; import DetailBookGroupCard, { DetailBookGroupCardSkeleton, -} from '@/v1/bookGroup/DetailBookGroupCard'; -import SearchGroupInput from '@/v1/bookGroup/SearchGroup'; +} from '@/components/bookGroup/DetailBookGroupCard'; +import SearchGroupInput from '@/components/bookGroup/SearchGroup'; import SimpleBookGroupCard, { SimpleBookGroupCardSkeleton, -} from '@/v1/bookGroup/SimpleBookGroupCard'; +} from '@/components/bookGroup/SimpleBookGroupCard'; const GroupPage = () => { const router = useRouter(); diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 384b699f..460cd202 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,9 +2,9 @@ import type { Metadata } from 'next'; import { appleSplashScreens } from '@/constants/metadata'; -import ContextProvider from '@/components/ContextProvider'; -import AuthFailedErrorBoundary from '@/components/AuthFailedErrorBoundary'; -import Layout from '@/v1/layout/Layout'; +import ContextProvider from '@/components/common/ContextProvider'; +import AuthFailedErrorBoundary from '@/components/common/AuthFailedErrorBoundary'; +import Layout from '@/components/layout/Layout'; import { LineSeedKR } from '@/styles/font'; import '@/styles/global.css'; @@ -37,8 +37,8 @@ export const metadata: Metadata = { }, }, icons: [ - { rel: 'apple-touch-icon', url: 'images/icon-192x192.png' }, - { rel: 'icon', url: 'favicon.ico' }, + { rel: 'apple-touch-icon', url: '/images/icon-192x192.png' }, + { rel: 'icon', url: '/favicon.ico' }, ], appleWebApp: { title: '다독다독', diff --git a/src/app/loading.tsx b/src/app/loading.tsx index 95a9eab2..71586d44 100644 --- a/src/app/loading.tsx +++ b/src/app/loading.tsx @@ -1,4 +1,4 @@ -import Loading from '@/v1/base/Loading'; +import Loading from '@/components/common/Loading'; export default function RootLoading() { return ; diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 23566dbe..8c02ff3d 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -6,7 +6,7 @@ import Link from 'next/link'; import { IconKakao } from '@public/icons'; import { KAKAO_LOGIN_URL } from '@/constants'; -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; const LoginPage = () => { return ( diff --git a/src/app/login/redirect/page.tsx b/src/app/login/redirect/page.tsx index c722e3b0..3432803d 100644 --- a/src/app/login/redirect/page.tsx +++ b/src/app/login/redirect/page.tsx @@ -6,7 +6,7 @@ import { useCallback, useEffect } from 'react'; import { setAuth } from '@/utils/helpers'; import userAPI from '@/apis/user'; -import Loading from '@/v1/base/Loading'; +import Loading from '@/components/common/Loading'; const RedirectPage = () => { const router = useRouter(); diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx index 745cc15b..c7581591 100644 --- a/src/app/not-found.tsx +++ b/src/app/not-found.tsx @@ -1,6 +1,6 @@ 'use client'; -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; import Image from 'next/image'; import { useRouter } from 'next/navigation'; diff --git a/src/app/profile/[userId]/page.tsx b/src/app/profile/[userId]/page.tsx index 5ba75f9e..b167df80 100644 --- a/src/app/profile/[userId]/page.tsx +++ b/src/app/profile/[userId]/page.tsx @@ -1,11 +1,11 @@ 'use client'; import { APIUser } from '@/types/user'; -import BackButton from '@/v1/base/BackButton'; -import ShareButton from '@/v1/base/ShareButton'; -import TopNavigation from '@/v1/base/TopNavigation'; -import ProfileBookShelf from '@/v1/profile/bookShelf/ProfileBookShelf'; -import ProfileInfo from '@/v1/profile/info/ProfileInfo'; +import BackButton from '@/components/common/BackButton'; +import ShareButton from '@/components/common/ShareButton'; +import TopNavigation from '@/components/common/TopNavigation'; +import ProfileBookShelf from '@/components/profile/bookShelf/ProfileBookShelf'; +import ProfileInfo from '@/components/profile/info/ProfileInfo'; const UserProfilePage = ({ params: { userId }, diff --git a/src/app/profile/me/add/page.tsx b/src/app/profile/me/add/page.tsx index ad62e746..8d6b0e4f 100644 --- a/src/app/profile/me/add/page.tsx +++ b/src/app/profile/me/add/page.tsx @@ -4,10 +4,10 @@ import useAllJobQuery from '@/queries/job/useAllJobQuery'; import { checkAuthentication } from '@/utils/helpers'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; import withAuthRequired from '@/hocs/withAuthRequired'; -import AddJobProfile from '@/v1/profile/AddJobProfile'; +import AddJobProfile from '@/components/profile/AddJobProfile'; const AddJobProfilePage = () => { return ( diff --git a/src/app/profile/me/edit/page.tsx b/src/app/profile/me/edit/page.tsx index 970f2f7f..eb416b59 100644 --- a/src/app/profile/me/edit/page.tsx +++ b/src/app/profile/me/edit/page.tsx @@ -5,11 +5,11 @@ import useMyProfileQuery from '@/queries/user/useMyProfileQuery'; import { checkAuthentication } from '@/utils/helpers'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; import withAuthRequired from '@/hocs/withAuthRequired'; -import EditProfile from '@/v1/profile/EditProfile'; -import Loading from '@/v1/base/Loading'; +import EditProfile from '@/components/profile/EditProfile'; +import Loading from '@/components/common/Loading'; const EditProfilePage = () => { return ( diff --git a/src/app/profile/me/group/page.tsx b/src/app/profile/me/group/page.tsx index 71358673..667ef546 100644 --- a/src/app/profile/me/group/page.tsx +++ b/src/app/profile/me/group/page.tsx @@ -3,12 +3,12 @@ import useMyGroupsQuery from '@/queries/group/useMyGroupQuery'; import { checkAuthentication } from '@/utils/helpers'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; import withAuthRequired from '@/hocs/withAuthRequired'; -import BackButton from '@/v1/base/BackButton'; -import TopNavigation from '@/v1/base/TopNavigation'; -import DetailBookGroupCard from '@/v1/bookGroup/DetailBookGroupCard'; +import BackButton from '@/components/common/BackButton'; +import TopNavigation from '@/components/common/TopNavigation'; +import DetailBookGroupCard from '@/components/bookGroup/DetailBookGroupCard'; const UserGroupPage = () => { return ( diff --git a/src/app/profile/me/page.tsx b/src/app/profile/me/page.tsx index ac94e0b6..879cd380 100644 --- a/src/app/profile/me/page.tsx +++ b/src/app/profile/me/page.tsx @@ -11,17 +11,17 @@ import { checkAuthentication, removeAuth } from '@/utils/helpers'; import { KAKAO_LOGIN_URL } from '@/constants'; import { IconArrowRight } from '@public/icons'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; -import Avatar from '@/v1/base/Avatar'; -import Button from '@/v1/base/Button'; -import Loading from '@/v1/base/Loading'; -import Menu from '@/v1/base/Menu'; -import TopHeader from '@/v1/base/TopHeader'; -import BookShelf from '@/v1/bookShelf/BookShelf'; -import ProfileBookShelf from '@/v1/profile/bookShelf/ProfileBookShelf'; -import ProfileGroup from '@/v1/profile/group/ProfileGroup'; -import ProfileInfo from '@/v1/profile/info/ProfileInfo'; +import Avatar from '@/components/common/Avatar'; +import Button from '@/components/common/Button'; +import Loading from '@/components/common/Loading'; +import Menu from '@/components/common/Menu'; +import TopHeader from '@/components/common/TopHeader'; +import BookShelf from '@/components/bookShelf/BookShelf'; +import ProfileBookShelf from '@/components/profile/bookShelf/ProfileBookShelf'; +import ProfileGroup from '@/components/profile/group/ProfileGroup'; +import ProfileInfo from '@/components/profile/info/ProfileInfo'; const USER_ID = 'me'; diff --git a/src/v1/book/BookCover.tsx b/src/components/book/BookCover.tsx similarity index 100% rename from src/v1/book/BookCover.tsx rename to src/components/book/BookCover.tsx diff --git a/src/v1/book/detail/BookInfo.tsx b/src/components/book/detail/BookInfo.tsx similarity index 95% rename from src/v1/book/detail/BookInfo.tsx rename to src/components/book/detail/BookInfo.tsx index 865c519a..d106f0a5 100644 --- a/src/v1/book/detail/BookInfo.tsx +++ b/src/components/book/detail/BookInfo.tsx @@ -3,12 +3,12 @@ import { IconBookmark } from '@public/icons'; import { useBookInfo } from '@/queries/book/useBookInfoQuery'; import useBookmarkUserQuery from '@/queries/book/useBookmarkUserQuery'; import useUpdateBookmarkMutation from '@/queries/book/useUpdateBookmarkMutation'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import { checkAuthentication } from '@/utils/helpers'; -import Avatar, { AvatarGroup } from '@/v1/base/Avatar'; -import Skeleton from '@/v1/base/Skeleton'; -import BookCover from '@/v1/book/BookCover'; +import Avatar, { AvatarGroup } from '@/components/common/Avatar'; +import Skeleton from '@/components/common/Skeleton'; +import BookCover from '@/components/book/BookCover'; const BookInfo = ({ bookId }: { bookId: APIBook['bookId'] }) => { const { data } = useBookInfo(bookId); diff --git a/src/v1/bookArchive/BookArchiveForAuth.tsx b/src/components/bookArchive/BookArchiveForAuth.tsx similarity index 97% rename from src/v1/bookArchive/BookArchiveForAuth.tsx rename to src/components/bookArchive/BookArchiveForAuth.tsx index ca04fed3..43362443 100644 --- a/src/v1/bookArchive/BookArchiveForAuth.tsx +++ b/src/components/bookArchive/BookArchiveForAuth.tsx @@ -3,7 +3,7 @@ import useAuthRecommendedBooks from '@/queries/recommend/useAuthRecommendedBooks'; import useAuthRecommendedBookshelf from '@/queries/recommend/useAuthRecommendedBookshelf'; import { APIJobGroup } from '@/types/job'; -import BookCover from '@/v1/book/BookCover'; +import BookCover from '@/components/book/BookCover'; import Link from 'next/link'; import BookShelfCard from '../bookShelf/BookShelfCard'; diff --git a/src/v1/bookArchive/BookArchiveForUnAuth.tsx b/src/components/bookArchive/BookArchiveForUnAuth.tsx similarity index 100% rename from src/v1/bookArchive/BookArchiveForUnAuth.tsx rename to src/components/bookArchive/BookArchiveForUnAuth.tsx diff --git a/src/v1/bookGroup/BookGroupNavigation.tsx b/src/components/bookGroup/BookGroupNavigation.tsx similarity index 94% rename from src/v1/bookGroup/BookGroupNavigation.tsx rename to src/components/bookGroup/BookGroupNavigation.tsx index 9a21892b..ff8ebd2b 100644 --- a/src/v1/bookGroup/BookGroupNavigation.tsx +++ b/src/components/bookGroup/BookGroupNavigation.tsx @@ -21,13 +21,13 @@ import { import useCreateBookGroupCommentMutation from '@/queries/group/useCreateBookGroupCommentMutation'; import useDeleteBookGroupMutation from '@/queries/group/useDeleteBookGroupMutation'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; -import Button from '@/v1/base/Button'; -import Menu from '@/v1/base/Menu'; -import Modal from '@/v1/base/Modal'; -import useToast from '@/v1/base/Toast/useToast'; -import TopNavigation from '@/v1/base/TopNavigation'; -import CommentDrawer from '@/v1/comment/CommentDrawer'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; +import Button from '@/components/common/Button'; +import Menu from '@/components/common/Menu'; +import Modal from '@/components/common/Modal'; +import useToast from '@/components/common/Toast/useToast'; +import TopNavigation from '@/components/common/TopNavigation'; +import CommentDrawer from '@/components/comment/CommentDrawer'; const NavigationContext = createContext({} as { groupId: number }); diff --git a/src/v1/bookGroup/BookGroupStatus.tsx b/src/components/bookGroup/BookGroupStatus.tsx similarity index 96% rename from src/v1/bookGroup/BookGroupStatus.tsx rename to src/components/bookGroup/BookGroupStatus.tsx index a087de64..b181d714 100644 --- a/src/v1/bookGroup/BookGroupStatus.tsx +++ b/src/components/bookGroup/BookGroupStatus.tsx @@ -1,6 +1,6 @@ import { DdayStatus } from '@/types/dday'; -import Badge from '@/v1/base/Badge'; +import Badge from '@/components/common/Badge'; import { getDdayCount } from '@/utils/date'; const getDdayStatus = (ddayByStart: number, ddayByEnd: number) => { diff --git a/src/v1/bookGroup/BookInfoCard.tsx b/src/components/bookGroup/BookInfoCard.tsx similarity index 98% rename from src/v1/bookGroup/BookInfoCard.tsx rename to src/components/bookGroup/BookInfoCard.tsx index c4d3f714..826b184e 100644 --- a/src/v1/bookGroup/BookInfoCard.tsx +++ b/src/components/bookGroup/BookInfoCard.tsx @@ -7,7 +7,7 @@ import type { APIBook } from '@/types/book'; import useBookInfoQuery from '@/queries/book/useBookInfoQuery'; import { IconArrowLeft, IconDelete } from '@public/icons'; -import BookCover from '@/v1/book/BookCover'; +import BookCover from '@/components/book/BookCover'; const BookInfoCard = ({ bookId, diff --git a/src/v1/bookGroup/DetailBookGroupCard.tsx b/src/components/bookGroup/DetailBookGroupCard.tsx similarity index 95% rename from src/v1/bookGroup/DetailBookGroupCard.tsx rename to src/components/bookGroup/DetailBookGroupCard.tsx index 799c7a91..4c11a973 100644 --- a/src/v1/bookGroup/DetailBookGroupCard.tsx +++ b/src/components/bookGroup/DetailBookGroupCard.tsx @@ -1,10 +1,10 @@ import Link from 'next/link'; import { IconCalendar, IconMembers, IconComments } from '@public/icons'; -import BookGroupStatus from '@/v1/bookGroup/BookGroupStatus'; -import Badge from '@/v1/base/Badge'; -import Avatar from '@/v1/base/Avatar'; -import BookCover from '@/v1/book/BookCover'; +import BookGroupStatus from '@/components/bookGroup/BookGroupStatus'; +import Badge from '@/components/common/Badge'; +import Avatar from '@/components/common/Avatar'; +import BookCover from '@/components/book/BookCover'; interface DetailBookGroupCardProps { title: string; diff --git a/src/v1/bookGroup/SearchGroup.tsx b/src/components/bookGroup/SearchGroup.tsx similarity index 100% rename from src/v1/bookGroup/SearchGroup.tsx rename to src/components/bookGroup/SearchGroup.tsx diff --git a/src/v1/bookGroup/SimpleBookGroupCard.tsx b/src/components/bookGroup/SimpleBookGroupCard.tsx similarity index 100% rename from src/v1/bookGroup/SimpleBookGroupCard.tsx rename to src/components/bookGroup/SimpleBookGroupCard.tsx diff --git a/src/v1/bookGroup/create/CreateBookGroupFunnel.tsx b/src/components/bookGroup/create/CreateBookGroupFunnel.tsx similarity index 93% rename from src/v1/bookGroup/create/CreateBookGroupFunnel.tsx rename to src/components/bookGroup/create/CreateBookGroupFunnel.tsx index 3080b394..fa14f2e5 100644 --- a/src/v1/bookGroup/create/CreateBookGroupFunnel.tsx +++ b/src/components/bookGroup/create/CreateBookGroupFunnel.tsx @@ -3,24 +3,24 @@ import { useRouter } from 'next/navigation'; import { FormProvider, SubmitHandler, useForm } from 'react-hook-form'; -import type { CreateBookGroupFormValues } from '@/v1/bookGroup/create/types'; +import type { CreateBookGroupFormValues } from '@/components/bookGroup/create/types'; import useCreateBookGroupMutation from '@/queries/group/useCreateBookGroupMutation'; import { useFunnel } from '@/hooks/useFunnel'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import { getTodayDate } from '@/utils/date'; import { isAxiosErrorWithCustomCode } from '@/utils/helpers'; import { SERVICE_ERROR_MESSAGE } from '@/constants'; import { IconArrowLeft } from '@public/icons'; -import TopNavigation from '@/v1/base/TopNavigation'; -import Stepper from '@/v1/base/Stepper'; +import TopNavigation from '@/components/common/TopNavigation'; +import Stepper from '@/components/common/Stepper'; import { EnterTitleStep, SelectBookStep, SelectJoinTypeStep, SetUpDetailStep, -} from '@/v1/bookGroup/create/steps'; +} from '@/components/bookGroup/create/steps'; const FUNNEL_STEPS = [ 'SelectBook', diff --git a/src/v1/bookGroup/create/steps/EnterTitleStep/EnterTitleStep.tsx b/src/components/bookGroup/create/steps/EnterTitleStep/EnterTitleStep.tsx similarity index 72% rename from src/v1/bookGroup/create/steps/EnterTitleStep/EnterTitleStep.tsx rename to src/components/bookGroup/create/steps/EnterTitleStep/EnterTitleStep.tsx index 25a11026..532808b5 100644 --- a/src/v1/bookGroup/create/steps/EnterTitleStep/EnterTitleStep.tsx +++ b/src/components/bookGroup/create/steps/EnterTitleStep/EnterTitleStep.tsx @@ -1,12 +1,12 @@ import { useFormContext } from 'react-hook-form'; -import type { MoveFunnelStepProps } from '@/v1/base/Funnel'; -import type { EnterTitleStepFormValues } from '@/v1/bookGroup/create/types'; +import type { MoveFunnelStepProps } from '@/components/common/Funnel'; +import type { EnterTitleStepFormValues } from '@/components/bookGroup/create/types'; import useRemoveVerticalScroll from '@/hooks/useRemoveVerticalScroll'; -import { TitleField } from '@/v1/bookGroup/create/steps/EnterTitleStep/fields'; -import BottomActionButton from '@/v1/base/BottomActionButton'; +import { TitleField } from '@/components/bookGroup/create/steps/EnterTitleStep/fields'; +import BottomActionButton from '@/components/common/BottomActionButton'; const EnterTitleStep = ({ onNextStep }: MoveFunnelStepProps) => { const { diff --git a/src/v1/bookGroup/create/steps/EnterTitleStep/fields/TitleField.tsx b/src/components/bookGroup/create/steps/EnterTitleStep/fields/TitleField.tsx similarity index 88% rename from src/v1/bookGroup/create/steps/EnterTitleStep/fields/TitleField.tsx rename to src/components/bookGroup/create/steps/EnterTitleStep/fields/TitleField.tsx index 9bdada48..1aa594f7 100644 --- a/src/v1/bookGroup/create/steps/EnterTitleStep/fields/TitleField.tsx +++ b/src/components/bookGroup/create/steps/EnterTitleStep/fields/TitleField.tsx @@ -2,9 +2,9 @@ import { useFormContext, useWatch } from 'react-hook-form'; import type { EnterTitleStepFormValues } from '../../../types'; -import ErrorMessage from '@/v1/base/ErrorMessage'; -import Input from '@/v1/base/Input'; -import InputLength from '@/v1/base/InputLength'; +import ErrorMessage from '@/components/common/ErrorMessage'; +import Input from '@/components/common/Input'; +import InputLength from '@/components/common/InputLength'; type DefaultFieldNameProps = { name: keyof EnterTitleStepFormValues; diff --git a/src/v1/bookGroup/create/steps/EnterTitleStep/fields/index.ts b/src/components/bookGroup/create/steps/EnterTitleStep/fields/index.ts similarity index 100% rename from src/v1/bookGroup/create/steps/EnterTitleStep/fields/index.ts rename to src/components/bookGroup/create/steps/EnterTitleStep/fields/index.ts diff --git a/src/v1/bookGroup/create/steps/SelectBookStep/SelectBookStep.tsx b/src/components/bookGroup/create/steps/SelectBookStep/SelectBookStep.tsx similarity index 93% rename from src/v1/bookGroup/create/steps/SelectBookStep/SelectBookStep.tsx rename to src/components/bookGroup/create/steps/SelectBookStep/SelectBookStep.tsx index 67a8d959..1181e516 100644 --- a/src/v1/bookGroup/create/steps/SelectBookStep/SelectBookStep.tsx +++ b/src/components/bookGroup/create/steps/SelectBookStep/SelectBookStep.tsx @@ -2,15 +2,15 @@ import { ComponentPropsWithoutRef, Suspense, useEffect, useState } from 'react'; import { Controller, useFormContext } from 'react-hook-form'; import { useInView } from 'react-intersection-observer'; -import type { MoveFunnelStepProps } from '@/v1/base/Funnel'; +import type { MoveFunnelStepProps } from '@/components/common/Funnel'; import type { SelectBookStepFormValues } from '../../types'; import useBookSearchQuery from '@/queries/book/useBookSearchQuery'; import debounce from '@/utils/debounce'; -import Input from '@/v1/base/Input'; -import Loading from '@/v1/base/Loading'; -import BookSearchList from '@/v1/bookSearch/BookSearchList'; +import Input from '@/components/common/Input'; +import Loading from '@/components/common/Loading'; +import BookSearchList from '@/components/bookSearch/BookSearchList'; const SelectBookStep = ({ onNextStep }: MoveFunnelStepProps) => { const { control, getValues, setValue } = diff --git a/src/v1/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep.tsx b/src/components/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep.tsx similarity index 80% rename from src/v1/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep.tsx rename to src/components/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep.tsx index b98c8926..4ef50567 100644 --- a/src/v1/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep.tsx +++ b/src/components/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep.tsx @@ -1,13 +1,13 @@ import { useFormContext } from 'react-hook-form'; -import type { MoveFunnelStepProps } from '@/v1/base/Funnel'; -import type { SelectJoinTypeStepFormValues } from '@/v1/bookGroup/create/types'; +import type { MoveFunnelStepProps } from '@/components/common/Funnel'; +import type { SelectJoinTypeStepFormValues } from '@/components/bookGroup/create/types'; import { JoinPasswordFieldset, JoinTypeFieldset, -} from '@/v1/bookGroup/create/steps/SelectJoinTypeStep/fields'; -import BottomActionButton from '@/v1/base/BottomActionButton'; +} from '@/components/bookGroup/create/steps/SelectJoinTypeStep/fields'; +import BottomActionButton from '@/components/common/BottomActionButton'; export type JoinTypeStepFieldName = keyof SelectJoinTypeStepFormValues; export type JoinTypeStepFieldProp = { name: JoinTypeStepFieldName }; diff --git a/src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinPasswordFieldset.tsx b/src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinPasswordFieldset.tsx similarity index 95% rename from src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinPasswordFieldset.tsx rename to src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinPasswordFieldset.tsx index 9fb7c409..224965cd 100644 --- a/src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinPasswordFieldset.tsx +++ b/src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinPasswordFieldset.tsx @@ -7,9 +7,9 @@ import type { JoinTypeStepFieldProp, } from '../SelectJoinTypeStep'; -import ErrorMessage from '@/v1/base/ErrorMessage'; -import Input from '@/v1/base/Input'; -import InputLength from '@/v1/base/InputLength'; +import ErrorMessage from '@/components/common/ErrorMessage'; +import Input from '@/components/common/Input'; +import InputLength from '@/components/common/InputLength'; import withScrollLockOnFocus from '@/hocs/withScrollLockOnFocus'; type JoinPasswordFieldsetProps = { diff --git a/src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeFieldset.tsx b/src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeFieldset.tsx similarity index 71% rename from src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeFieldset.tsx rename to src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeFieldset.tsx index 10691ff5..10f18950 100644 --- a/src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeFieldset.tsx +++ b/src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeFieldset.tsx @@ -1,9 +1,9 @@ import { useFormContext } from 'react-hook-form'; -import type { SelectJoinTypeStepFormValues } from '@/v1/bookGroup/create/types'; -import type { JoinTypeStepFieldProp } from '@/v1/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep'; +import type { SelectJoinTypeStepFormValues } from '@/components/bookGroup/create/types'; +import type { JoinTypeStepFieldProp } from '@/components/bookGroup/create/steps/SelectJoinTypeStep/SelectJoinTypeStep'; -import JoinTypeRadioCard from '@/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeRadioCard'; +import JoinTypeRadioCard from '@/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeRadioCard'; const JoinTypeFieldset = ({ children }: { children?: React.ReactNode }) => { return
{children}
; diff --git a/src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeRadioCard.tsx b/src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeRadioCard.tsx similarity index 100% rename from src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeRadioCard.tsx rename to src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/JoinTypeRadioCard.tsx diff --git a/src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/index.ts b/src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/index.ts similarity index 100% rename from src/v1/bookGroup/create/steps/SelectJoinTypeStep/fields/index.ts rename to src/components/bookGroup/create/steps/SelectJoinTypeStep/fields/index.ts diff --git a/src/v1/bookGroup/create/steps/SetUpDetailStep/SetUpDetailStep.tsx b/src/components/bookGroup/create/steps/SetUpDetailStep/SetUpDetailStep.tsx similarity index 93% rename from src/v1/bookGroup/create/steps/SetUpDetailStep/SetUpDetailStep.tsx rename to src/components/bookGroup/create/steps/SetUpDetailStep/SetUpDetailStep.tsx index effc7699..d0f08a6e 100644 --- a/src/v1/bookGroup/create/steps/SetUpDetailStep/SetUpDetailStep.tsx +++ b/src/components/bookGroup/create/steps/SetUpDetailStep/SetUpDetailStep.tsx @@ -1,21 +1,21 @@ import { useFormContext, useWatch } from 'react-hook-form'; -import type { MoveFunnelStepProps } from '@/v1/base/Funnel'; +import type { MoveFunnelStepProps } from '@/components/common/Funnel'; import type { SetUpDetailStepFormValues } from '../../types'; import { MAX_MEMBER_COUNT_OPTIONS } from '@/constants'; import { getTodayDate } from '@/utils/date'; import withScrollLockOnFocus from '@/hocs/withScrollLockOnFocus'; -import BottomActionButton from '@/v1/base/BottomActionButton'; -import DatePicker from '@/v1/base/DatePicker'; -import ErrorMessage from '@/v1/base/ErrorMessage'; -import Input from '@/v1/base/Input'; -import InputLength from '@/v1/base/InputLength'; -import RadioButton from '@/v1/base/RadioButton'; -import Switch from '@/v1/base/Switch'; -import TextArea from '@/v1/base/TextArea'; -import BookInfoCard from '@/v1/bookGroup/BookInfoCard'; +import BottomActionButton from '@/components/common/BottomActionButton'; +import DatePicker from '@/components/common/DatePicker'; +import ErrorMessage from '@/components/common/ErrorMessage'; +import Input from '@/components/common/Input'; +import InputLength from '@/components/common/InputLength'; +import RadioButton from '@/components/common/RadioButton'; +import Switch from '@/components/common/Switch'; +import TextArea from '@/components/common/TextArea'; +import BookInfoCard from '@/components/bookGroup/BookInfoCard'; interface SetUpDetailStepProps extends MoveFunnelStepProps { goToSelectBookStep?: () => void; diff --git a/src/v1/bookGroup/create/steps/index.ts b/src/components/bookGroup/create/steps/index.ts similarity index 100% rename from src/v1/bookGroup/create/steps/index.ts rename to src/components/bookGroup/create/steps/index.ts diff --git a/src/v1/bookGroup/create/types.ts b/src/components/bookGroup/create/types.ts similarity index 100% rename from src/v1/bookGroup/create/types.ts rename to src/components/bookGroup/create/types.ts diff --git a/src/v1/bookGroup/detail/BookGroupInfo.tsx b/src/components/bookGroup/detail/BookGroupInfo.tsx similarity index 92% rename from src/v1/bookGroup/detail/BookGroupInfo.tsx rename to src/components/bookGroup/detail/BookGroupInfo.tsx index c49e6792..30ffe46c 100644 --- a/src/v1/bookGroup/detail/BookGroupInfo.tsx +++ b/src/components/bookGroup/detail/BookGroupInfo.tsx @@ -1,8 +1,8 @@ import { IconCalendar, IconMembers } from '@public/icons'; -import Badge from '@/v1/base/Badge'; -import Avatar from '@/v1/base/Avatar'; -import BookGroupStatus from '@/v1/bookGroup/BookGroupStatus'; -import BookInfoCard from '@/v1/bookGroup/BookInfoCard'; +import Badge from '@/components/common/Badge'; +import Avatar from '@/components/common/Avatar'; +import BookGroupStatus from '@/components/bookGroup/BookGroupStatus'; +import BookInfoCard from '@/components/bookGroup/BookInfoCard'; import { useBookGroup } from '@/queries/group/useBookGroupQuery'; import useUserProfileQuery from '@/queries/user/useUserProfileQuery'; diff --git a/src/v1/bookGroup/detail/JoinBookGroupButton.tsx b/src/components/bookGroup/detail/JoinBookGroupButton.tsx similarity index 92% rename from src/v1/bookGroup/detail/JoinBookGroupButton.tsx rename to src/components/bookGroup/detail/JoinBookGroupButton.tsx index d1eb1dd7..95457fe6 100644 --- a/src/v1/bookGroup/detail/JoinBookGroupButton.tsx +++ b/src/components/bookGroup/detail/JoinBookGroupButton.tsx @@ -1,7 +1,7 @@ import { usePathname, useRouter } from 'next/navigation'; import useJoinBookGroup from '@/hooks/group/useJoinBookGroup'; -import BottomActionButton from '@/v1/base/BottomActionButton'; +import BottomActionButton from '@/components/common/BottomActionButton'; const JoinBookGroupButton = ({ groupId }: { groupId: number }) => { const router = useRouter(); diff --git a/src/v1/bookGroup/detail/MemberItem.tsx b/src/components/bookGroup/detail/MemberItem.tsx similarity index 94% rename from src/v1/bookGroup/detail/MemberItem.tsx rename to src/components/bookGroup/detail/MemberItem.tsx index 820ba75c..fb809bb5 100644 --- a/src/v1/bookGroup/detail/MemberItem.tsx +++ b/src/components/bookGroup/detail/MemberItem.tsx @@ -1,4 +1,4 @@ -import Avatar from '@/v1/base/Avatar'; +import Avatar from '@/components/common/Avatar'; interface MemberItemProps { profileImageSrc: string; diff --git a/src/v1/bookGroup/detail/ShortMemberInfo.tsx b/src/components/bookGroup/detail/ShortMemberInfo.tsx similarity index 92% rename from src/v1/bookGroup/detail/ShortMemberInfo.tsx rename to src/components/bookGroup/detail/ShortMemberInfo.tsx index a7c4e9c7..82f53afc 100644 --- a/src/v1/bookGroup/detail/ShortMemberInfo.tsx +++ b/src/components/bookGroup/detail/ShortMemberInfo.tsx @@ -2,8 +2,8 @@ import Link from 'next/link'; import { usePathname } from 'next/navigation'; import { IconArrowLeft } from '@public/icons'; -import MemberItem from '@/v1/bookGroup/detail/MemberItem'; -import Button from '@/v1/base/Button'; +import MemberItem from '@/components/bookGroup/detail/MemberItem'; +import Button from '@/components/common/Button'; type Member = { id: number; diff --git a/src/v1/bookGroup/edit/BookGroupEditDateForm.tsx b/src/components/bookGroup/edit/BookGroupEditDateForm.tsx similarity index 92% rename from src/v1/bookGroup/edit/BookGroupEditDateForm.tsx rename to src/components/bookGroup/edit/BookGroupEditDateForm.tsx index 2a7aeab4..b707a058 100644 --- a/src/v1/bookGroup/edit/BookGroupEditDateForm.tsx +++ b/src/components/bookGroup/edit/BookGroupEditDateForm.tsx @@ -2,8 +2,8 @@ import { useFormContext } from 'react-hook-form'; import type { APIEditBookGroup } from '@/types/group'; -import DatePicker from '@/v1/base/DatePicker'; -import ErrorMessage from '@/v1/base/ErrorMessage'; +import DatePicker from '@/components/common/DatePicker'; +import ErrorMessage from '@/components/common/ErrorMessage'; type EditDateFormTypes = Pick; diff --git a/src/v1/bookGroup/edit/BookGroupEditIntroduceForm.tsx b/src/components/bookGroup/edit/BookGroupEditIntroduceForm.tsx similarity index 90% rename from src/v1/bookGroup/edit/BookGroupEditIntroduceForm.tsx rename to src/components/bookGroup/edit/BookGroupEditIntroduceForm.tsx index 4a0ea01b..fa0f7651 100644 --- a/src/v1/bookGroup/edit/BookGroupEditIntroduceForm.tsx +++ b/src/components/bookGroup/edit/BookGroupEditIntroduceForm.tsx @@ -1,7 +1,7 @@ import { useFormContext } from 'react-hook-form'; -import ErrorMessage from '@/v1/base/ErrorMessage'; -import TextArea from '@/v1/base/TextArea'; +import ErrorMessage from '@/components/common/ErrorMessage'; +import TextArea from '@/components/common/TextArea'; import { APIEditBookGroup } from '@/types/group'; type EditIntroduceFormTypes = Pick; diff --git a/src/v1/bookGroup/edit/BookGroupEditTitleForm.tsx b/src/components/bookGroup/edit/BookGroupEditTitleForm.tsx similarity index 87% rename from src/v1/bookGroup/edit/BookGroupEditTitleForm.tsx rename to src/components/bookGroup/edit/BookGroupEditTitleForm.tsx index 457793c0..71a2b92f 100644 --- a/src/v1/bookGroup/edit/BookGroupEditTitleForm.tsx +++ b/src/components/bookGroup/edit/BookGroupEditTitleForm.tsx @@ -2,9 +2,9 @@ import { useFormContext } from 'react-hook-form'; import type { APIEditBookGroup } from '@/types/group'; -import Input from '@/v1/base/Input'; -import InputLength from '@/v1/base/InputLength'; -import ErrorMessage from '@/v1/base/ErrorMessage'; +import Input from '@/components/common/Input'; +import InputLength from '@/components/common/InputLength'; +import ErrorMessage from '@/components/common/ErrorMessage'; type EditTitleFormTypes = Pick; diff --git a/src/v1/bookGroup/edit/BookGroupEditTopNavigation.tsx b/src/components/bookGroup/edit/BookGroupEditTopNavigation.tsx similarity index 88% rename from src/v1/bookGroup/edit/BookGroupEditTopNavigation.tsx rename to src/components/bookGroup/edit/BookGroupEditTopNavigation.tsx index 2023958c..01a94fa3 100644 --- a/src/v1/bookGroup/edit/BookGroupEditTopNavigation.tsx +++ b/src/components/bookGroup/edit/BookGroupEditTopNavigation.tsx @@ -4,8 +4,8 @@ import { SubmitHandler, useFormContext } from 'react-hook-form'; import type { APIEditBookGroup } from '@/types/group'; -import TopNavigation from '@/v1/base/TopNavigation'; -import BackButton from '@/v1/base/BackButton'; +import TopNavigation from '@/components/common/TopNavigation'; +import BackButton from '@/components/common/BackButton'; const BookGroupEditTopNavigation = ({ onSubmit, diff --git a/src/v1/bookSearch/BestSellers.tsx b/src/components/bookSearch/BestSellers.tsx similarity index 97% rename from src/v1/bookSearch/BestSellers.tsx rename to src/components/bookSearch/BestSellers.tsx index 8e6bfe9d..1e7f4f9b 100644 --- a/src/v1/bookSearch/BestSellers.tsx +++ b/src/components/bookSearch/BestSellers.tsx @@ -5,10 +5,10 @@ import type { APIBestSellerSearchRange, APISearchedBook } from '@/types/book'; import useBestSellersQuery from '@/queries/book/useBestSellersQuery'; import bookAPI from '@/apis/book'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; -import BookCover from '@/v1/book/BookCover'; -import Skeleton from '@/v1/base/Skeleton'; +import BookCover from '@/components/book/BookCover'; +import Skeleton from '@/components/common/Skeleton'; const SEARCH_RANGES = { 주간: 'WEEKLY', diff --git a/src/v1/bookSearch/BookSearchList.tsx b/src/components/bookSearch/BookSearchList.tsx similarity index 94% rename from src/v1/bookSearch/BookSearchList.tsx rename to src/components/bookSearch/BookSearchList.tsx index a315455b..5744ee9e 100644 --- a/src/v1/bookSearch/BookSearchList.tsx +++ b/src/components/bookSearch/BookSearchList.tsx @@ -1,9 +1,9 @@ import type { APISearchedBook, SearchedBookWithId } from '@/types/book'; import bookAPI from '@/apis/book'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; -import BookCover from '@/v1/book/BookCover'; +import BookCover from '@/components/book/BookCover'; type BookSearchListProps = { books: APISearchedBook[]; diff --git a/src/v1/bookSearch/RecentSearchList.tsx b/src/components/bookSearch/RecentSearchList.tsx similarity index 94% rename from src/v1/bookSearch/RecentSearchList.tsx rename to src/components/bookSearch/RecentSearchList.tsx index 7f713803..1e9a20ed 100644 --- a/src/v1/bookSearch/RecentSearchList.tsx +++ b/src/components/bookSearch/RecentSearchList.tsx @@ -1,7 +1,7 @@ import type { APIBookRecentSearchResponse } from '@/types/book'; -import Button from '@/v1/base/Button'; -import Skeleton from '@/v1/base/Skeleton'; +import Button from '@/components/common/Button'; +import Skeleton from '@/components/common/Skeleton'; type RecentSearchListProps = { keywords?: APIBookRecentSearchResponse[]; diff --git a/src/v1/bookShelf/BookShelf.tsx b/src/components/bookShelf/BookShelf.tsx similarity index 100% rename from src/v1/bookShelf/BookShelf.tsx rename to src/components/bookShelf/BookShelf.tsx diff --git a/src/v1/bookShelf/BookShelfCard.tsx b/src/components/bookShelf/BookShelfCard.tsx similarity index 91% rename from src/v1/bookShelf/BookShelfCard.tsx rename to src/components/bookShelf/BookShelfCard.tsx index 04683ea7..28ab7d10 100644 --- a/src/v1/bookShelf/BookShelfCard.tsx +++ b/src/components/bookShelf/BookShelfCard.tsx @@ -1,6 +1,6 @@ import type { APIBookshelf } from '@/types/bookshelf'; -import BookShelf from '@/v1/bookShelf/BookShelf'; +import BookShelf from '@/components/bookShelf/BookShelf'; const BookShelfCard = ({ bookshelfName, diff --git a/src/v1/bookShelf/BookShelfRow.tsx b/src/components/bookShelf/BookShelfRow.tsx similarity index 87% rename from src/v1/bookShelf/BookShelfRow.tsx rename to src/components/bookShelf/BookShelfRow.tsx index 7a5903ae..cb35cf14 100644 --- a/src/v1/bookShelf/BookShelfRow.tsx +++ b/src/components/bookShelf/BookShelfRow.tsx @@ -1,6 +1,6 @@ import type { APIBookshelf } from '@/types/bookshelf'; -import BookShelf from '@/v1/bookShelf/BookShelf'; +import BookShelf from '@/components/bookShelf/BookShelf'; const BookShelfRow = ({ books }: Pick) => { return ( diff --git a/src/v1/comment/BookCommentList.tsx b/src/components/comment/BookCommentList.tsx similarity index 93% rename from src/v1/comment/BookCommentList.tsx rename to src/components/comment/BookCommentList.tsx index 25f5f4eb..7c1eae37 100644 --- a/src/v1/comment/BookCommentList.tsx +++ b/src/components/comment/BookCommentList.tsx @@ -4,10 +4,10 @@ import { useBookComments } from '@/queries/book/useBookCommentsQuery'; import usePatchBookCommentMutation from '@/queries/book/usePatchBookCommentMutation'; import useDeleteBookCommentMutation from '@/queries/book/useDeleteBookCommentMutation'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import { checkAuthentication } from '@/utils/helpers'; -import CommentList from '@/v1/comment/CommentList'; +import CommentList from '@/components/comment/CommentList'; const BookCommentList = ({ bookId }: { bookId: number }) => { const isAuthenticated = checkAuthentication(); diff --git a/src/v1/comment/BookGroupCommentList.tsx b/src/components/comment/BookGroupCommentList.tsx similarity index 94% rename from src/v1/comment/BookGroupCommentList.tsx rename to src/components/comment/BookGroupCommentList.tsx index 6f8b011f..71b60541 100644 --- a/src/v1/comment/BookGroupCommentList.tsx +++ b/src/components/comment/BookGroupCommentList.tsx @@ -5,10 +5,10 @@ import { useBookGroup } from '@/queries/group/useBookGroupQuery'; import usePatchBookGroupCommentMutation from '@/queries/group/usePatchBookGroupCommentMutation'; import useDeleteBookGroupCommentMutation from '@/queries/group/useDeleteBookGroupCommentMutation'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import { checkAuthentication } from '@/utils/helpers'; -import CommentList from '@/v1/comment/CommentList'; +import CommentList from '@/components/comment/CommentList'; const BookGroupCommentList = ({ groupId }: { groupId: number }) => { const isAuthenticated = checkAuthentication(); diff --git a/src/v1/comment/CommentDrawer.tsx b/src/components/comment/CommentDrawer.tsx similarity index 94% rename from src/v1/comment/CommentDrawer.tsx rename to src/components/comment/CommentDrawer.tsx index e0410e4c..b0f46435 100644 --- a/src/v1/comment/CommentDrawer.tsx +++ b/src/components/comment/CommentDrawer.tsx @@ -2,8 +2,8 @@ import { forwardRef, useEffect } from 'react'; -import Button from '@/v1/base/Button'; -import Drawer from '@/v1/base/Drawer'; +import Button from '@/components/common/Button'; +import Drawer from '@/components/common/Drawer'; interface CommentDrawerProps { isOpen: boolean; diff --git a/src/v1/comment/CommentList.tsx b/src/components/comment/CommentList.tsx similarity index 95% rename from src/v1/comment/CommentList.tsx rename to src/components/comment/CommentList.tsx index f1f09b87..2fb4327e 100644 --- a/src/v1/comment/CommentList.tsx +++ b/src/components/comment/CommentList.tsx @@ -4,11 +4,11 @@ import type { Writer } from '@/types/user'; import useDisclosure from '@/hooks/useDisclosure'; -import EditCommentDrawer from '@/v1/comment/CommentDrawer'; -import Avatar from '@/v1/base/Avatar'; -import Menu from '@/v1/base/Menu'; -import Button from '@/v1/base/Button'; -import Modal from '@/v1/base/Modal'; +import EditCommentDrawer from '@/components/comment/CommentDrawer'; +import Avatar from '@/components/common/Avatar'; +import Menu from '@/components/common/Menu'; +import Button from '@/components/common/Button'; +import Modal from '@/components/common/Modal'; type Comment = { id: number; diff --git a/src/components/AuthFailedErrorBoundary.tsx b/src/components/common/AuthFailedErrorBoundary.tsx similarity index 90% rename from src/components/AuthFailedErrorBoundary.tsx rename to src/components/common/AuthFailedErrorBoundary.tsx index 3274a7c2..efd5ce15 100644 --- a/src/components/AuthFailedErrorBoundary.tsx +++ b/src/components/common/AuthFailedErrorBoundary.tsx @@ -4,9 +4,9 @@ import { useEffect } from 'react'; import { QueryErrorResetBoundary } from '@tanstack/react-query'; import { ErrorBoundary, FallbackProps } from 'react-error-boundary'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import { isAuthFailedError, isAxiosErrorWithCustomCode } from '@/utils/helpers'; -import Loading from '@/v1/base/Loading'; +import Loading from '@/components/common/Loading'; const AuthFailedErrorBoundary = ({ children, diff --git a/src/v1/base/Avatar.tsx b/src/components/common/Avatar.tsx similarity index 100% rename from src/v1/base/Avatar.tsx rename to src/components/common/Avatar.tsx diff --git a/src/v1/base/BackButton.tsx b/src/components/common/BackButton.tsx similarity index 100% rename from src/v1/base/BackButton.tsx rename to src/components/common/BackButton.tsx diff --git a/src/v1/base/Badge.tsx b/src/components/common/Badge.tsx similarity index 100% rename from src/v1/base/Badge.tsx rename to src/components/common/Badge.tsx diff --git a/src/v1/base/BottomActionButton.tsx b/src/components/common/BottomActionButton.tsx similarity index 91% rename from src/v1/base/BottomActionButton.tsx rename to src/components/common/BottomActionButton.tsx index 89ada09a..1e5b3e5e 100644 --- a/src/v1/base/BottomActionButton.tsx +++ b/src/components/common/BottomActionButton.tsx @@ -1,6 +1,6 @@ import { ComponentPropsWithoutRef } from 'react'; -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; type BottomActionButtonProps = Omit< ComponentPropsWithoutRef, diff --git a/src/v1/base/BottomNavigation.tsx b/src/components/common/BottomNavigation.tsx similarity index 100% rename from src/v1/base/BottomNavigation.tsx rename to src/components/common/BottomNavigation.tsx diff --git a/src/v1/base/BottomSheet.tsx b/src/components/common/BottomSheet.tsx similarity index 100% rename from src/v1/base/BottomSheet.tsx rename to src/components/common/BottomSheet.tsx diff --git a/src/v1/base/Button.tsx b/src/components/common/Button.tsx similarity index 100% rename from src/v1/base/Button.tsx rename to src/components/common/Button.tsx diff --git a/src/components/ContextProvider.tsx b/src/components/common/ContextProvider.tsx similarity index 60% rename from src/components/ContextProvider.tsx rename to src/components/common/ContextProvider.tsx index 2527082b..f9dce64e 100644 --- a/src/components/ContextProvider.tsx +++ b/src/components/common/ContextProvider.tsx @@ -2,10 +2,10 @@ import { ReactNode } from 'react'; -import PWAServiceWorkerProvider from '@/components/PWAServiceWorkerProvider'; -import ReactQueryProvider from '@/components/ReactQueryProvider'; +import PWAServiceWorkerProvider from '@/components/common/PWAServiceWorkerProvider'; +import ReactQueryProvider from '@/components/common/ReactQueryProvider'; -import ToastProvider from '@/v1/base/Toast/ToastProvider'; +import ToastProvider from '@/components/common/Toast/ToastProvider'; const ContextProvider = ({ children }: { children: ReactNode }) => { return ( diff --git a/src/v1/base/DatePicker.tsx b/src/components/common/DatePicker.tsx similarity index 100% rename from src/v1/base/DatePicker.tsx rename to src/components/common/DatePicker.tsx diff --git a/src/v1/base/Drawer.tsx b/src/components/common/Drawer.tsx similarity index 98% rename from src/v1/base/Drawer.tsx rename to src/components/common/Drawer.tsx index 6953142d..6e1b3470 100644 --- a/src/v1/base/Drawer.tsx +++ b/src/components/common/Drawer.tsx @@ -10,7 +10,7 @@ import { Dialog, Transition } from '@headlessui/react'; import useRemoveVerticalScroll from '@/hooks/useRemoveVerticalScroll'; import { IconClose } from '@public/icons'; -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; interface DrawerProps { isOpen: boolean; diff --git a/src/v1/base/ErrorMessage.tsx b/src/components/common/ErrorMessage.tsx similarity index 100% rename from src/v1/base/ErrorMessage.tsx rename to src/components/common/ErrorMessage.tsx diff --git a/src/v1/base/FloatingButton.tsx b/src/components/common/FloatingButton.tsx similarity index 93% rename from src/v1/base/FloatingButton.tsx rename to src/components/common/FloatingButton.tsx index d753f7b5..2b63ef77 100644 --- a/src/v1/base/FloatingButton.tsx +++ b/src/components/common/FloatingButton.tsx @@ -2,7 +2,7 @@ import { ComponentPropsWithoutRef } from 'react'; import { IconPlus } from '@public/icons'; -import Portal from '@/v1/base/Portal'; +import Portal from '@/components/common/Portal'; interface FloatingButtonProps extends ComponentPropsWithoutRef<'button'> { position?: string; diff --git a/src/v1/base/Funnel.tsx b/src/components/common/Funnel.tsx similarity index 100% rename from src/v1/base/Funnel.tsx rename to src/components/common/Funnel.tsx diff --git a/src/v1/base/Input.tsx b/src/components/common/Input.tsx similarity index 100% rename from src/v1/base/Input.tsx rename to src/components/common/Input.tsx diff --git a/src/v1/base/InputLength.tsx b/src/components/common/InputLength.tsx similarity index 100% rename from src/v1/base/InputLength.tsx rename to src/components/common/InputLength.tsx diff --git a/src/v1/base/LikeButton.tsx b/src/components/common/LikeButton.tsx similarity index 100% rename from src/v1/base/LikeButton.tsx rename to src/components/common/LikeButton.tsx diff --git a/src/v1/base/Loading.tsx b/src/components/common/Loading.tsx similarity index 100% rename from src/v1/base/Loading.tsx rename to src/components/common/Loading.tsx diff --git a/src/v1/base/LoginBottomActionButton.tsx b/src/components/common/LoginBottomActionButton.tsx similarity index 79% rename from src/v1/base/LoginBottomActionButton.tsx rename to src/components/common/LoginBottomActionButton.tsx index 2bb560c7..991e1101 100644 --- a/src/v1/base/LoginBottomActionButton.tsx +++ b/src/components/common/LoginBottomActionButton.tsx @@ -2,7 +2,7 @@ import Link from 'next/link'; import { KAKAO_LOGIN_URL } from '@/constants'; -import BottomActionButton from '@/v1/base/BottomActionButton'; +import BottomActionButton from '@/components/common/BottomActionButton'; const LoginBottomActionButton = () => ( diff --git a/src/v1/base/Menu.tsx b/src/components/common/Menu.tsx similarity index 97% rename from src/v1/base/Menu.tsx rename to src/components/common/Menu.tsx index 98c17099..92c029d6 100644 --- a/src/v1/base/Menu.tsx +++ b/src/components/common/Menu.tsx @@ -12,7 +12,7 @@ import { import { IconHamburger } from '@public/icons'; import useOutsideClickRef from '@/hooks/useOutsideClickRef'; -import BottomSheet from '@/v1/base/BottomSheet'; +import BottomSheet from '@/components/common/BottomSheet'; type MenuContextValue = { isOpen: boolean; diff --git a/src/v1/base/Modal.tsx b/src/components/common/Modal.tsx similarity index 100% rename from src/v1/base/Modal.tsx rename to src/components/common/Modal.tsx diff --git a/src/components/PWAServiceWorkerProvider.tsx b/src/components/common/PWAServiceWorkerProvider.tsx similarity index 100% rename from src/components/PWAServiceWorkerProvider.tsx rename to src/components/common/PWAServiceWorkerProvider.tsx diff --git a/src/v1/base/Portal.tsx b/src/components/common/Portal.tsx similarity index 100% rename from src/v1/base/Portal.tsx rename to src/components/common/Portal.tsx diff --git a/src/v1/base/ProgressBar.tsx b/src/components/common/ProgressBar.tsx similarity index 100% rename from src/v1/base/ProgressBar.tsx rename to src/components/common/ProgressBar.tsx diff --git a/src/v1/base/QueryErrorBoundaryFallback.tsx b/src/components/common/QueryErrorBoundaryFallback.tsx similarity index 91% rename from src/v1/base/QueryErrorBoundaryFallback.tsx rename to src/components/common/QueryErrorBoundaryFallback.tsx index 6cdfb1be..5146aece 100644 --- a/src/v1/base/QueryErrorBoundaryFallback.tsx +++ b/src/components/common/QueryErrorBoundaryFallback.tsx @@ -1,4 +1,4 @@ -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; const QueryErrorBoundaryFallback = ({ resetErrorBoundary, diff --git a/src/v1/base/RadioButton.tsx b/src/components/common/RadioButton.tsx similarity index 100% rename from src/v1/base/RadioButton.tsx rename to src/components/common/RadioButton.tsx diff --git a/src/components/ReactQueryProvider.tsx b/src/components/common/ReactQueryProvider.tsx similarity index 100% rename from src/components/ReactQueryProvider.tsx rename to src/components/common/ReactQueryProvider.tsx diff --git a/src/components/SSRSafeSuspense.tsx b/src/components/common/SSRSafeSuspense.tsx similarity index 100% rename from src/components/SSRSafeSuspense.tsx rename to src/components/common/SSRSafeSuspense.tsx diff --git a/src/v1/base/Select.tsx b/src/components/common/Select.tsx similarity index 100% rename from src/v1/base/Select.tsx rename to src/components/common/Select.tsx diff --git a/src/v1/base/ShareButton.tsx b/src/components/common/ShareButton.tsx similarity index 91% rename from src/v1/base/ShareButton.tsx rename to src/components/common/ShareButton.tsx index b06cd875..8b6c057c 100644 --- a/src/v1/base/ShareButton.tsx +++ b/src/components/common/ShareButton.tsx @@ -1,4 +1,4 @@ -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import { IconShare } from '@public/icons'; diff --git a/src/v1/base/Skeleton.tsx b/src/components/common/Skeleton.tsx similarity index 100% rename from src/v1/base/Skeleton.tsx rename to src/components/common/Skeleton.tsx diff --git a/src/v1/base/Stepper.tsx b/src/components/common/Stepper.tsx similarity index 98% rename from src/v1/base/Stepper.tsx rename to src/components/common/Stepper.tsx index 59c83c30..4ee73d84 100644 --- a/src/v1/base/Stepper.tsx +++ b/src/components/common/Stepper.tsx @@ -7,7 +7,7 @@ import { } from 'react'; import { IconCheckStroke } from '@public/icons'; -import ProgressBar from '@/v1/base/ProgressBar'; +import ProgressBar from '@/components/common/ProgressBar'; type StepStatus = 'complete' | 'incomplete' | 'active'; diff --git a/src/v1/base/Switch.tsx b/src/components/common/Switch.tsx similarity index 100% rename from src/v1/base/Switch.tsx rename to src/components/common/Switch.tsx diff --git a/src/v1/base/TextArea.tsx b/src/components/common/TextArea.tsx similarity index 95% rename from src/v1/base/TextArea.tsx rename to src/components/common/TextArea.tsx index 617b10e0..35fc9bb1 100644 --- a/src/v1/base/TextArea.tsx +++ b/src/components/common/TextArea.tsx @@ -12,8 +12,8 @@ import { Children, } from 'react'; -import ErrorMessage from '@/v1/base/ErrorMessage'; -import InputLength from '@/v1/base/InputLength'; +import ErrorMessage from '@/components/common/ErrorMessage'; +import InputLength from '@/components/common/InputLength'; interface BaseTextAreaProps extends TextareaHTMLAttributes { diff --git a/src/v1/base/Toast/ToastItem.tsx b/src/components/common/Toast/ToastItem.tsx similarity index 90% rename from src/v1/base/Toast/ToastItem.tsx rename to src/components/common/Toast/ToastItem.tsx index 439569e0..0a26d078 100644 --- a/src/v1/base/Toast/ToastItem.tsx +++ b/src/components/common/Toast/ToastItem.tsx @@ -1,4 +1,4 @@ -import type { ToastOption } from '@/v1/base/Toast/types'; +import type { ToastOption } from '@/components/common/Toast/types'; import { IconSuccess, IconWarning, IconError } from '@public/icons'; diff --git a/src/v1/base/Toast/ToastProvider.tsx b/src/components/common/Toast/ToastProvider.tsx similarity index 87% rename from src/v1/base/Toast/ToastProvider.tsx rename to src/components/common/Toast/ToastProvider.tsx index 887385c4..ba6205ef 100644 --- a/src/v1/base/Toast/ToastProvider.tsx +++ b/src/components/common/Toast/ToastProvider.tsx @@ -1,9 +1,12 @@ import { createContext, ReactNode, useMemo, useState } from 'react'; -import type { ToastController, ToastOption } from '@/v1/base/Toast/types'; +import type { + ToastController, + ToastOption, +} from '@/components/common/Toast/types'; -import ToastItem from '@/v1/base/Toast/ToastItem'; -import Portal from '@/v1/base/Portal'; +import ToastItem from '@/components/common/Toast/ToastItem'; +import Portal from '@/components/common/Portal'; export const ToastContext = createContext({} as ToastController); diff --git a/src/v1/base/Toast/types.ts b/src/components/common/Toast/types.ts similarity index 100% rename from src/v1/base/Toast/types.ts rename to src/components/common/Toast/types.ts diff --git a/src/v1/base/Toast/useToast.ts b/src/components/common/Toast/useToast.ts similarity index 63% rename from src/v1/base/Toast/useToast.ts rename to src/components/common/Toast/useToast.ts index 75589c77..ee2a900b 100644 --- a/src/v1/base/Toast/useToast.ts +++ b/src/components/common/Toast/useToast.ts @@ -1,8 +1,8 @@ import { useContext } from 'react'; -import type { ToastOption } from '@/v1/base/Toast/types'; +import type { ToastOption } from '@/components/common/Toast/types'; -import { ToastContext } from '@/v1/base/Toast/ToastProvider'; +import { ToastContext } from '@/components/common/Toast/ToastProvider'; const useToast = () => { const toastController = useContext(ToastContext); diff --git a/src/v1/base/TopHeader.tsx b/src/components/common/TopHeader.tsx similarity index 100% rename from src/v1/base/TopHeader.tsx rename to src/components/common/TopHeader.tsx diff --git a/src/v1/base/TopNavigation.tsx b/src/components/common/TopNavigation.tsx similarity index 100% rename from src/v1/base/TopNavigation.tsx rename to src/components/common/TopNavigation.tsx diff --git a/src/v1/layout/Layout.tsx b/src/components/layout/Layout.tsx similarity index 92% rename from src/v1/layout/Layout.tsx rename to src/components/layout/Layout.tsx index cc5461dc..fc279e3b 100644 --- a/src/v1/layout/Layout.tsx +++ b/src/components/layout/Layout.tsx @@ -2,7 +2,7 @@ import { usePathname } from 'next/navigation'; -import BottomNavigation from '@/v1/base/BottomNavigation'; +import BottomNavigation from '@/components/common/BottomNavigation'; type LayoutProps = { children?: React.ReactNode; diff --git a/src/v1/profile/AddJobProfile.tsx b/src/components/profile/AddJobProfile.tsx similarity index 94% rename from src/v1/profile/AddJobProfile.tsx rename to src/components/profile/AddJobProfile.tsx index 4461d139..cae37eb3 100644 --- a/src/v1/profile/AddJobProfile.tsx +++ b/src/components/profile/AddJobProfile.tsx @@ -8,12 +8,12 @@ import type { APIJobGroup } from '@/types/job'; import { isAxiosError } from 'axios'; import useMyProfileMutation from '@/queries/user/useMyProfileMutation'; -import TopNavigation from '@/v1/base/TopNavigation'; -import Input from '@/v1/base/Input'; -import InputLength from '@/v1/base/InputLength'; -import Select from '@/v1/base/Select'; -import ErrorMessage from '@/v1/base/ErrorMessage'; -import useToast from '@/v1/base/Toast/useToast'; +import TopNavigation from '@/components/common/TopNavigation'; +import Input from '@/components/common/Input'; +import InputLength from '@/components/common/InputLength'; +import Select from '@/components/common/Select'; +import ErrorMessage from '@/components/common/ErrorMessage'; +import useToast from '@/components/common/Toast/useToast'; type AddJobProfileProps = { jobCategories: APIJobGroup[]; diff --git a/src/v1/profile/EditProfile.tsx b/src/components/profile/EditProfile.tsx similarity index 93% rename from src/v1/profile/EditProfile.tsx rename to src/components/profile/EditProfile.tsx index 075004b4..91bf593d 100644 --- a/src/v1/profile/EditProfile.tsx +++ b/src/components/profile/EditProfile.tsx @@ -12,12 +12,12 @@ import useMyProfileMutation from '@/queries/user/useMyProfileMutation'; import { IconClose } from '@public/icons'; -import TopNavigation from '@/v1/base/TopNavigation'; -import Input from '@/v1/base/Input'; -import InputLength from '@/v1/base/InputLength'; -import Select from '@/v1/base/Select'; -import ErrorMessage from '@/v1/base/ErrorMessage'; -import useToast from '@/v1/base/Toast/useToast'; +import TopNavigation from '@/components/common/TopNavigation'; +import Input from '@/components/common/Input'; +import InputLength from '@/components/common/InputLength'; +import Select from '@/components/common/Select'; +import ErrorMessage from '@/components/common/ErrorMessage'; +import useToast from '@/components/common/Toast/useToast'; type UserProfileProps = { profile: Pick; diff --git a/src/v1/profile/LoginBottomSheet.tsx b/src/components/profile/LoginBottomSheet.tsx similarity index 93% rename from src/v1/profile/LoginBottomSheet.tsx rename to src/components/profile/LoginBottomSheet.tsx index dd843092..93a324da 100644 --- a/src/v1/profile/LoginBottomSheet.tsx +++ b/src/components/profile/LoginBottomSheet.tsx @@ -1,7 +1,7 @@ import { IconClose, IconKakao, LogoWithText } from '@public/icons'; -import Button from '@/v1/base/Button'; -import BottomSheet from '@/v1/base/BottomSheet'; +import Button from '@/components/common/Button'; +import BottomSheet from '@/components/common/BottomSheet'; type LoginBottomSheetProps = { isOpen: boolean; diff --git a/src/v1/profile/bookShelf/MyProfileBookshelfContainer.tsx b/src/components/profile/bookShelf/MyProfileBookshelfContainer.tsx similarity index 74% rename from src/v1/profile/bookShelf/MyProfileBookshelfContainer.tsx rename to src/components/profile/bookShelf/MyProfileBookshelfContainer.tsx index dc520279..763c99e7 100644 --- a/src/v1/profile/bookShelf/MyProfileBookshelfContainer.tsx +++ b/src/components/profile/bookShelf/MyProfileBookshelfContainer.tsx @@ -1,6 +1,6 @@ import useMySummaryBookshelfQuery from '@/queries/bookshelf/useMySummaryBookShelfQuery'; -import ProfileBookshelfPresenter from '@/v1/profile/bookShelf/ProfileBookshelfPresenter'; +import ProfileBookshelfPresenter from '@/components/profile/bookShelf/ProfileBookshelfPresenter'; const MyProfileBookshelfContainer = () => { const { data } = useMySummaryBookshelfQuery(); diff --git a/src/v1/profile/bookShelf/ProfileBookShelf.tsx b/src/components/profile/bookShelf/ProfileBookShelf.tsx similarity index 58% rename from src/v1/profile/bookShelf/ProfileBookShelf.tsx rename to src/components/profile/bookShelf/ProfileBookShelf.tsx index 677f416a..8005fc5c 100644 --- a/src/v1/profile/bookShelf/ProfileBookShelf.tsx +++ b/src/components/profile/bookShelf/ProfileBookShelf.tsx @@ -1,7 +1,7 @@ import type { APIUser } from '@/types/user'; -import MyProfileBookshelfContainer from '@/v1/profile/bookShelf/MyProfileBookshelfContainer'; -import UserProfileBookshelfContainer from '@/v1/profile/bookShelf/UserProfileBookshelfContainer'; +import MyProfileBookshelfContainer from '@/components/profile/bookShelf/MyProfileBookshelfContainer'; +import UserProfileBookshelfContainer from '@/components/profile/bookShelf/UserProfileBookshelfContainer'; const ProfileBookShelf = ({ userId }: { userId: 'me' | APIUser['userId'] }) => { return userId === 'me' ? ( diff --git a/src/v1/profile/bookShelf/ProfileBookshelfPresenter.tsx b/src/components/profile/bookShelf/ProfileBookshelfPresenter.tsx similarity index 95% rename from src/v1/profile/bookShelf/ProfileBookshelfPresenter.tsx rename to src/components/profile/bookShelf/ProfileBookshelfPresenter.tsx index 33b04e6e..0bccbbb8 100644 --- a/src/v1/profile/bookShelf/ProfileBookshelfPresenter.tsx +++ b/src/components/profile/bookShelf/ProfileBookshelfPresenter.tsx @@ -1,6 +1,6 @@ import { APIBookshelf } from '@/types/bookshelf'; -import BookShelf from '@/v1/bookShelf/BookShelf'; +import BookShelf from '@/components/bookShelf/BookShelf'; import { IconArrowRight, IconHeart } from '@public/icons'; import Link from 'next/link'; diff --git a/src/v1/profile/bookShelf/UserProfileBookshelfContainer.tsx b/src/components/profile/bookShelf/UserProfileBookshelfContainer.tsx similarity index 79% rename from src/v1/profile/bookShelf/UserProfileBookshelfContainer.tsx rename to src/components/profile/bookShelf/UserProfileBookshelfContainer.tsx index cc074e46..3269dba7 100644 --- a/src/v1/profile/bookShelf/UserProfileBookshelfContainer.tsx +++ b/src/components/profile/bookShelf/UserProfileBookshelfContainer.tsx @@ -1,7 +1,7 @@ import useUserSummaryBookshelfQuery from '@/queries/bookshelf/useUserSummaryBookShelfQuery'; import type { APIUser } from '@/types/user'; -import ProfileBookshelfPresenter from '@/v1/profile/bookShelf/ProfileBookshelfPresenter'; +import ProfileBookshelfPresenter from '@/components/profile/bookShelf/ProfileBookshelfPresenter'; const UserProfileBookshelfContainer = ({ userId, diff --git a/src/v1/profile/group/ProfileGroup.tsx b/src/components/profile/group/ProfileGroup.tsx similarity index 87% rename from src/v1/profile/group/ProfileGroup.tsx rename to src/components/profile/group/ProfileGroup.tsx index 2db54d86..d729b533 100644 --- a/src/v1/profile/group/ProfileGroup.tsx +++ b/src/components/profile/group/ProfileGroup.tsx @@ -1,9 +1,9 @@ -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; import { APIUser } from '@/types/user'; -import ProfileGroupContainer from '@/v1/profile/group/ProfileGroupContainer'; -import Skeleton from '@/v1/base/Skeleton'; +import ProfileGroupContainer from '@/components/profile/group/ProfileGroupContainer'; +import Skeleton from '@/components/common/Skeleton'; const ProfileGroup = ({ userId }: { userId: 'me' | APIUser['userId'] }) => { return ( diff --git a/src/v1/profile/group/ProfileGroupContainer.tsx b/src/components/profile/group/ProfileGroupContainer.tsx similarity index 89% rename from src/v1/profile/group/ProfileGroupContainer.tsx rename to src/components/profile/group/ProfileGroupContainer.tsx index 0ddcd883..edf0270e 100644 --- a/src/v1/profile/group/ProfileGroupContainer.tsx +++ b/src/components/profile/group/ProfileGroupContainer.tsx @@ -4,7 +4,7 @@ import type { APIUser } from '@/types/user'; import { checkAuthentication } from '@/utils/helpers'; -import ProfileGroupPresenter from '@/v1/profile/group/ProfileGroupPresenter'; +import ProfileGroupPresenter from '@/components/profile/group/ProfileGroupPresenter'; const ProfileGroupContainer = ({ userId, diff --git a/src/v1/profile/group/ProfileGroupPresenter.tsx b/src/components/profile/group/ProfileGroupPresenter.tsx similarity index 94% rename from src/v1/profile/group/ProfileGroupPresenter.tsx rename to src/components/profile/group/ProfileGroupPresenter.tsx index 04db7568..9f99d864 100644 --- a/src/v1/profile/group/ProfileGroupPresenter.tsx +++ b/src/components/profile/group/ProfileGroupPresenter.tsx @@ -1,6 +1,6 @@ import { APIGroup } from '@/types/group'; import { APIUser } from '@/types/user'; -import SimpleBookGroupCard from '@/v1/bookGroup/SimpleBookGroupCard'; +import SimpleBookGroupCard from '@/components/bookGroup/SimpleBookGroupCard'; import { IconArrowRight } from '@public/icons'; import Link from 'next/link'; diff --git a/src/v1/profile/info/MyProfileInfoContainer.tsx b/src/components/profile/info/MyProfileInfoContainer.tsx similarity index 88% rename from src/v1/profile/info/MyProfileInfoContainer.tsx rename to src/components/profile/info/MyProfileInfoContainer.tsx index f266cc41..fe32ae12 100644 --- a/src/v1/profile/info/MyProfileInfoContainer.tsx +++ b/src/components/profile/info/MyProfileInfoContainer.tsx @@ -3,7 +3,7 @@ import { usePathname, useRouter } from 'next/navigation'; import useMyProfileQuery from '@/queries/user/useMyProfileQuery'; -import ProfileInfoPresenter from '@/v1/profile/info/ProfileInfoPresenter'; +import ProfileInfoPresenter from '@/components/profile/info/ProfileInfoPresenter'; const MyProfileContainer = () => { const { data } = useMyProfileQuery(); diff --git a/src/v1/profile/info/ProfileInfo.tsx b/src/components/profile/info/ProfileInfo.tsx similarity index 77% rename from src/v1/profile/info/ProfileInfo.tsx rename to src/components/profile/info/ProfileInfo.tsx index c664f695..ad52ea25 100644 --- a/src/v1/profile/info/ProfileInfo.tsx +++ b/src/components/profile/info/ProfileInfo.tsx @@ -1,10 +1,10 @@ import type { APIUser } from '@/types/user'; -import SSRSafeSuspense from '@/components/SSRSafeSuspense'; +import SSRSafeSuspense from '@/components/common/SSRSafeSuspense'; -import MyProfileContainer from '@/v1/profile/info/MyProfileInfoContainer'; -import UserProfileInfoContainer from '@/v1/profile/info/UserProfileInfoContainer'; -import Skeleton from '@/v1/base/Skeleton'; +import MyProfileContainer from '@/components/profile/info/MyProfileInfoContainer'; +import UserProfileInfoContainer from '@/components/profile/info/UserProfileInfoContainer'; +import Skeleton from '@/components/common/Skeleton'; type ProfileInfoProps = { userId: 'me' | APIUser['userId']; diff --git a/src/v1/profile/info/ProfileInfoPresenter.tsx b/src/components/profile/info/ProfileInfoPresenter.tsx similarity index 91% rename from src/v1/profile/info/ProfileInfoPresenter.tsx rename to src/components/profile/info/ProfileInfoPresenter.tsx index d2ecdba2..d2d3df0d 100644 --- a/src/v1/profile/info/ProfileInfoPresenter.tsx +++ b/src/components/profile/info/ProfileInfoPresenter.tsx @@ -1,6 +1,6 @@ import type { APIUser } from '@/types/user'; -import Avatar from '@/v1/base/Avatar'; -import Badge from '@/v1/base/Badge'; +import Avatar from '@/components/common/Avatar'; +import Badge from '@/components/common/Badge'; type ProfileInfoProps = Pick; diff --git a/src/v1/profile/info/UserProfileInfoContainer.tsx b/src/components/profile/info/UserProfileInfoContainer.tsx similarity index 80% rename from src/v1/profile/info/UserProfileInfoContainer.tsx rename to src/components/profile/info/UserProfileInfoContainer.tsx index 15faea50..79d99008 100644 --- a/src/v1/profile/info/UserProfileInfoContainer.tsx +++ b/src/components/profile/info/UserProfileInfoContainer.tsx @@ -1,7 +1,7 @@ import useUserProfileQuery from '@/queries/user/useUserProfileQuery'; import type { APIUser } from '@/types/user'; -import ProfileInfoPresenter from '@/v1/profile/info/ProfileInfoPresenter'; +import ProfileInfoPresenter from '@/components/profile/info/ProfileInfoPresenter'; const UserProfileInfoContainer = ({ userId, diff --git a/src/constants/metadata/appleSplashScreens.ts b/src/constants/metadata/appleSplashScreens.ts index 680b5446..a6063ec4 100644 --- a/src/constants/metadata/appleSplashScreens.ts +++ b/src/constants/metadata/appleSplashScreens.ts @@ -3,229 +3,229 @@ const appleSplashScreens = [ rel: 'apple-touch-startup-image', media: 'screen and (device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png', + url: '/images/splash-screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png', + url: '/images/splash-screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png', + url: '/images/splash-screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png', + url: '/images/splash-screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png', + url: '/images/splash-screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png', + url: '/images/splash-screens/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_11__iPhone_XR_landscape.png', + url: '/images/splash-screens/iPhone_11__iPhone_XR_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png', + url: '/images/splash-screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png', + url: '/images/splash-screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png', + url: '/images/splash-screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 1032px) and (device-height: 1376px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/13__iPad_Pro_M4_landscape.png', + url: '/images/splash-screens/13__iPad_Pro_M4_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/12.9__iPad_Pro_landscape.png', + url: '/images/splash-screens/12.9__iPad_Pro_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 834px) and (device-height: 1210px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/11__iPad_Pro_M4_landscape.png', + url: '/images/splash-screens/11__iPad_Pro_M4_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png', + url: '/images/splash-screens/11__iPad_Pro__10.5__iPad_Pro_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 820px) and (device-height: 1180px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/10.9__iPad_Air_landscape.png', + url: '/images/splash-screens/10.9__iPad_Air_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/10.5__iPad_Air_landscape.png', + url: '/images/splash-screens/10.5__iPad_Air_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/10.2__iPad_landscape.png', + url: '/images/splash-screens/10.2__iPad_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png', + url: '/images/splash-screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 744px) and (device-height: 1133px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)', - url: 'images/splash-screens/8.3__iPad_Mini_landscape.png', + url: '/images/splash-screens/8.3__iPad_Mini_landscape.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png', + url: '/images/splash-screens/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png', + url: '/images/splash-screens/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png', + url: '/images/splash-screens/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png', + url: '/images/splash-screens/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png', + url: '/images/splash-screens/iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png', + url: '/images/splash-screens/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_11__iPhone_XR_portrait.png', + url: '/images/splash-screens/iPhone_11__iPhone_XR_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png', + url: '/images/splash-screens/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png', + url: '/images/splash-screens/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png', + url: '/images/splash-screens/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 1032px) and (device-height: 1376px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/13__iPad_Pro_M4_portrait.png', + url: '/images/splash-screens/13__iPad_Pro_M4_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/12.9__iPad_Pro_portrait.png', + url: '/images/splash-screens/12.9__iPad_Pro_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 834px) and (device-height: 1210px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/11__iPad_Pro_M4_portrait.png', + url: '/images/splash-screens/11__iPad_Pro_M4_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png', + url: '/images/splash-screens/11__iPad_Pro__10.5__iPad_Pro_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 820px) and (device-height: 1180px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/10.9__iPad_Air_portrait.png', + url: '/images/splash-screens/10.9__iPad_Air_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/10.5__iPad_Air_portrait.png', + url: '/images/splash-screens/10.5__iPad_Air_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/10.2__iPad_portrait.png', + url: '/images/splash-screens/10.2__iPad_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png', + url: '/images/splash-screens/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png', }, { rel: 'apple-touch-startup-image', media: 'screen and (device-width: 744px) and (device-height: 1133px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)', - url: 'images/splash-screens/8.3__iPad_Mini_portrait.png', + url: '/images/splash-screens/8.3__iPad_Mini_portrait.png', }, ]; diff --git a/src/hooks/group/useJoinBookGroup.ts b/src/hooks/group/useJoinBookGroup.ts index f86175b2..1894392a 100644 --- a/src/hooks/group/useJoinBookGroup.ts +++ b/src/hooks/group/useJoinBookGroup.ts @@ -1,7 +1,7 @@ import { isAxiosErrorWithCustomCode } from '@/utils/helpers'; import { SERVICE_ERROR_MESSAGE } from '@/constants'; import groupAPI from '@/apis/group'; -import useToast from '@/v1/base/Toast/useToast'; +import useToast from '@/components/common/Toast/useToast'; import { useBookGroupJoinInfo } from '@/queries/group/useBookGroupQuery'; const useJoinBookGroup = (groupId: number) => { diff --git a/src/hooks/useFunnel.tsx b/src/hooks/useFunnel.tsx index ce841111..3241a653 100644 --- a/src/hooks/useFunnel.tsx +++ b/src/hooks/useFunnel.tsx @@ -5,8 +5,8 @@ import { usePathname, useRouter, useSearchParams } from 'next/navigation'; import { assert } from '@/utils/assert'; -import type { FunnelProps, StepProps } from '@/v1/base/Funnel'; -import { Funnel, Step } from '@/v1/base/Funnel'; +import type { FunnelProps, StepProps } from '@/components/common/Funnel'; +import { Funnel, Step } from '@/components/common/Funnel'; export type NonEmptyArray = readonly [T, ...T[]]; diff --git a/src/queries/group/useEntireGroupsQuery/index.tsx b/src/queries/group/useEntireGroupsQuery.ts similarity index 100% rename from src/queries/group/useEntireGroupsQuery/index.tsx rename to src/queries/group/useEntireGroupsQuery.ts diff --git a/src/queries/job/useAllJobQuery/index.ts b/src/queries/job/useAllJobQuery.ts similarity index 100% rename from src/queries/job/useAllJobQuery/index.ts rename to src/queries/job/useAllJobQuery.ts diff --git a/src/queries/recommend/useAuthRecommendedBooks/index.tsx b/src/queries/recommend/useAuthRecommendedBooks.ts similarity index 64% rename from src/queries/recommend/useAuthRecommendedBooks/index.tsx rename to src/queries/recommend/useAuthRecommendedBooks.ts index dbe6a10c..d793ac89 100644 --- a/src/queries/recommend/useAuthRecommendedBooks/index.tsx +++ b/src/queries/recommend/useAuthRecommendedBooks.ts @@ -1,12 +1,13 @@ -import RecommendAPI from '@/apis/recommend'; -import { APIJobGroup } from '@/types/job'; import { useQuery } from '@tanstack/react-query'; +import { APIJobGroup } from '@/types/job'; +import recommendAPI from '@/apis/recommend'; + const useAuthRecommendedBooks = (jobGroup: APIJobGroup['name']) => useQuery(['authRecommendedBooks', jobGroup], () => - RecommendAPI.getAuthRecommendedBooks(jobGroup).then( - response => response.data - ) + recommendAPI + .getAuthRecommendedBooks(jobGroup) + .then(response => response.data) ); export default useAuthRecommendedBooks; diff --git a/src/queries/recommend/useAuthRecommendedBookshelf/index.tsx b/src/queries/recommend/useAuthRecommendedBookshelf.ts similarity index 64% rename from src/queries/recommend/useAuthRecommendedBookshelf/index.tsx rename to src/queries/recommend/useAuthRecommendedBookshelf.ts index 007ab485..656f10f7 100644 --- a/src/queries/recommend/useAuthRecommendedBookshelf/index.tsx +++ b/src/queries/recommend/useAuthRecommendedBookshelf.ts @@ -1,12 +1,13 @@ -import RecommendAPI from '@/apis/recommend'; -import { APIJobGroup } from '@/types/job'; import { useQuery } from '@tanstack/react-query'; +import { APIJobGroup } from '@/types/job'; +import recommendAPI from '@/apis/recommend'; + const useAuthRecommendedBookshelf = (jobGroup: APIJobGroup['name']) => useQuery(['authRecommendedBookshelf', jobGroup], () => - RecommendAPI.getAuthRecommendedBookshelf(jobGroup).then( - response => response.data - ) + recommendAPI + .getAuthRecommendedBookshelf(jobGroup) + .then(response => response.data) ); export default useAuthRecommendedBookshelf; diff --git a/src/queries/recommend/useUnAuthRecommendedBookshelfQuery/index.tsx b/src/queries/recommend/useUnAuthRecommendedBookshelfQuery.ts similarity index 66% rename from src/queries/recommend/useUnAuthRecommendedBookshelfQuery/index.tsx rename to src/queries/recommend/useUnAuthRecommendedBookshelfQuery.ts index 49051853..a7b369fa 100644 --- a/src/queries/recommend/useUnAuthRecommendedBookshelfQuery/index.tsx +++ b/src/queries/recommend/useUnAuthRecommendedBookshelfQuery.ts @@ -1,9 +1,10 @@ -import RecommendAPI from '@/apis/recommend'; import { useQuery } from '@tanstack/react-query'; +import recommendAPI from '@/apis/recommend'; + const useUnAuthRecommendedBookshelfQuery = () => useQuery(['unAuthRecommendedBookshelf'], () => - RecommendAPI.getUnAuthRecommendedBookshelf().then(response => response.data) + recommendAPI.getUnAuthRecommendedBookshelf().then(response => response.data) ); export default useUnAuthRecommendedBookshelfQuery; diff --git a/src/queries/user/useMyProfileMutation/index.ts b/src/queries/user/useMyProfileMutation.ts similarity index 99% rename from src/queries/user/useMyProfileMutation/index.ts rename to src/queries/user/useMyProfileMutation.ts index 00c4ce00..eb43eb33 100644 --- a/src/queries/user/useMyProfileMutation/index.ts +++ b/src/queries/user/useMyProfileMutation.ts @@ -1,4 +1,5 @@ import { useMutation } from '@tanstack/react-query'; + import userAPI from '@/apis/user'; import { APIUser } from '@/types/user'; import { APIJob, APIJobGroup } from '@/types/job'; diff --git a/src/stories/book/detail/BookInfo.stories.tsx b/src/stories/book/detail/BookInfo.stories.tsx index 06abde34..c2afb602 100644 --- a/src/stories/book/detail/BookInfo.stories.tsx +++ b/src/stories/book/detail/BookInfo.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import BookInfo from '@/v1/book/detail/BookInfo'; +import BookInfo from '@/components/book/detail/BookInfo'; const meta: Meta = { title: 'book/detail/BookInfo', diff --git a/src/stories/bookGroup/BookGroupStatus.stories.tsx b/src/stories/bookGroup/BookGroupStatus.stories.tsx index 34a3dc3e..018edc58 100644 --- a/src/stories/bookGroup/BookGroupStatus.stories.tsx +++ b/src/stories/bookGroup/BookGroupStatus.stories.tsx @@ -1,4 +1,4 @@ -import BookGroupStatus from '@/v1/bookGroup/BookGroupStatus'; +import BookGroupStatus from '@/components/bookGroup/BookGroupStatus'; import { Meta, StoryObj } from '@storybook/react'; const meta: Meta = { diff --git a/src/stories/bookGroup/BookInfoCard.stories.tsx b/src/stories/bookGroup/BookInfoCard.stories.tsx index 49f46411..a8bb41be 100644 --- a/src/stories/bookGroup/BookInfoCard.stories.tsx +++ b/src/stories/bookGroup/BookInfoCard.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import BookInfoCard from '@/v1/bookGroup/BookInfoCard'; +import BookInfoCard from '@/components/bookGroup/BookInfoCard'; const meta: Meta = { title: 'bookGroup/BookInfoCard', diff --git a/src/stories/bookGroup/DetailBookGroupCard.stories.tsx b/src/stories/bookGroup/DetailBookGroupCard.stories.tsx index 6125e0fd..26db5221 100644 --- a/src/stories/bookGroup/DetailBookGroupCard.stories.tsx +++ b/src/stories/bookGroup/DetailBookGroupCard.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import DetailBookGroupCard from '@/v1/bookGroup/DetailBookGroupCard'; +import DetailBookGroupCard from '@/components/bookGroup/DetailBookGroupCard'; const meta: Meta = { title: 'bookgroup/DetailBookGroupCard', diff --git a/src/stories/bookGroup/SearchGroup.stories.tsx b/src/stories/bookGroup/SearchGroup.stories.tsx index d78175a6..6adf06b1 100644 --- a/src/stories/bookGroup/SearchGroup.stories.tsx +++ b/src/stories/bookGroup/SearchGroup.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import SearchGroup from '@/v1/bookGroup/SearchGroup'; +import SearchGroup from '@/components/bookGroup/SearchGroup'; const meta: Meta = { - title: 'Base/SearchGroup', + title: 'Common/SearchGroup', component: SearchGroup, tags: ['autodocs'], }; diff --git a/src/stories/bookGroup/SimpleBookGroupCard.stories.tsx b/src/stories/bookGroup/SimpleBookGroupCard.stories.tsx index ecf95895..d3c9a3e4 100644 --- a/src/stories/bookGroup/SimpleBookGroupCard.stories.tsx +++ b/src/stories/bookGroup/SimpleBookGroupCard.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import SimpleBookGroupCard from '@/v1/bookGroup/SimpleBookGroupCard'; +import SimpleBookGroupCard from '@/components/bookGroup/SimpleBookGroupCard'; const meta: Meta = { title: 'BookGroup/SimpleBookGroupCard', diff --git a/src/stories/bookGroup/create/steps/EnterTitleStep.stories.tsx b/src/stories/bookGroup/create/steps/EnterTitleStep.stories.tsx index 4267f3a6..ee74133c 100644 --- a/src/stories/bookGroup/create/steps/EnterTitleStep.stories.tsx +++ b/src/stories/bookGroup/create/steps/EnterTitleStep.stories.tsx @@ -1,10 +1,10 @@ import { Meta, StoryObj } from '@storybook/react'; import { FormProvider, useForm } from 'react-hook-form'; -import type { EnterTitleStepFormValues } from '@/v1/bookGroup/create/types'; +import type { EnterTitleStepFormValues } from '@/components/bookGroup/create/types'; import { appLayoutMeta } from '@/stories/meta'; -import { EnterTitleStep } from '@/v1/bookGroup/create/steps'; +import { EnterTitleStep } from '@/components/bookGroup/create/steps'; const meta: Meta = { title: 'bookGroup/create/steps/EnterTitleStep', diff --git a/src/stories/bookGroup/create/steps/SelectBookStep.stories.tsx b/src/stories/bookGroup/create/steps/SelectBookStep.stories.tsx index ea79bb43..851dbe5e 100644 --- a/src/stories/bookGroup/create/steps/SelectBookStep.stories.tsx +++ b/src/stories/bookGroup/create/steps/SelectBookStep.stories.tsx @@ -1,10 +1,10 @@ import { Meta, StoryObj } from '@storybook/react'; import { FormProvider, useForm } from 'react-hook-form'; -import type { SelectBookStepFormValues } from '@/v1/bookGroup/create/types'; +import type { SelectBookStepFormValues } from '@/components/bookGroup/create/types'; import { appLayoutMeta } from '@/stories/meta'; -import { SelectBookStep } from '@/v1/bookGroup/create/steps'; +import { SelectBookStep } from '@/components/bookGroup/create/steps'; const meta: Meta = { title: 'bookGroup/create/steps/SelectBookStep', diff --git a/src/stories/bookGroup/create/steps/SelectJoinTypeStep.stories.tsx b/src/stories/bookGroup/create/steps/SelectJoinTypeStep.stories.tsx index c8a84d4f..bb0bb8c8 100644 --- a/src/stories/bookGroup/create/steps/SelectJoinTypeStep.stories.tsx +++ b/src/stories/bookGroup/create/steps/SelectJoinTypeStep.stories.tsx @@ -1,10 +1,10 @@ import { Meta, StoryObj } from '@storybook/react'; import { FormProvider, useForm } from 'react-hook-form'; -import type { SelectJoinTypeStepFormValues } from '@/v1/bookGroup/create/types'; +import type { SelectJoinTypeStepFormValues } from '@/components/bookGroup/create/types'; import { appLayoutMeta } from '@/stories/meta'; -import { SelectJoinTypeStep } from '@/v1/bookGroup/create/steps'; +import { SelectJoinTypeStep } from '@/components/bookGroup/create/steps'; const meta: Meta = { title: 'bookGroup/create/steps/SelectJoinTypeStep', diff --git a/src/stories/bookGroup/create/steps/SetUpDetailStep.stories.tsx b/src/stories/bookGroup/create/steps/SetUpDetailStep.stories.tsx index 47fbf10e..d350b4d7 100644 --- a/src/stories/bookGroup/create/steps/SetUpDetailStep.stories.tsx +++ b/src/stories/bookGroup/create/steps/SetUpDetailStep.stories.tsx @@ -1,12 +1,12 @@ import { Meta, StoryObj } from '@storybook/react'; import { FormProvider, useForm } from 'react-hook-form'; -import type { SetUpDetailStepFormValues } from '@/v1/bookGroup/create/types'; +import type { SetUpDetailStepFormValues } from '@/components/bookGroup/create/types'; import { getTodayDate } from '@/utils/date'; import { appLayoutMeta } from '@/stories/meta'; -import { SetUpDetailStep } from '@/v1/bookGroup/create/steps'; +import { SetUpDetailStep } from '@/components/bookGroup/create/steps'; const meta: Meta = { title: 'bookGroup/create/steps/SetUpDetailStep', diff --git a/src/stories/bookGroup/detail/MemberItem.stories.tsx b/src/stories/bookGroup/detail/MemberItem.stories.tsx index 3e1658d3..73075cd5 100644 --- a/src/stories/bookGroup/detail/MemberItem.stories.tsx +++ b/src/stories/bookGroup/detail/MemberItem.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import MemberItem from '@/v1/bookGroup/detail/MemberItem'; +import MemberItem from '@/components/bookGroup/detail/MemberItem'; const meta: Meta = { title: 'bookgroup/detail/MemberItem', diff --git a/src/stories/bookGroup/detail/ShortMemberInfo.stories.tsx b/src/stories/bookGroup/detail/ShortMemberInfo.stories.tsx index 9a6bc2c6..c15bccec 100644 --- a/src/stories/bookGroup/detail/ShortMemberInfo.stories.tsx +++ b/src/stories/bookGroup/detail/ShortMemberInfo.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import ShortMemberInfo from '@/v1/bookGroup/detail/ShortMemberInfo'; +import ShortMemberInfo from '@/components/bookGroup/detail/ShortMemberInfo'; const meta: Meta = { title: 'bookgroup/detail/ShortMemberInfo', diff --git a/src/stories/bookSearch/BestSellers.stories.tsx b/src/stories/bookSearch/BestSellers.stories.tsx index 6cd49747..10934568 100644 --- a/src/stories/bookSearch/BestSellers.stories.tsx +++ b/src/stories/bookSearch/BestSellers.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import BestSellers from '@/v1/bookSearch/BestSellers'; +import BestSellers from '@/components/bookSearch/BestSellers'; const meta: Meta = { title: 'bookSearch/BestSellers', diff --git a/src/stories/bookSearch/RecentSearch.stories.tsx b/src/stories/bookSearch/RecentSearch.stories.tsx index b5e54f01..fb5c860d 100644 --- a/src/stories/bookSearch/RecentSearch.stories.tsx +++ b/src/stories/bookSearch/RecentSearch.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import RecentSearch from '@/v1/bookSearch/RecentSearchList'; +import RecentSearch from '@/components/bookSearch/RecentSearchList'; const meta: Meta = { title: 'bookSearch/RecentSearch', diff --git a/src/stories/bookSearch/SearchResult.stories.tsx b/src/stories/bookSearch/SearchResult.stories.tsx index 9edf0f07..4fa73857 100644 --- a/src/stories/bookSearch/SearchResult.stories.tsx +++ b/src/stories/bookSearch/SearchResult.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; import type { APISearchedBook } from '@/types/book'; -import BookSearchList from '@/v1/bookSearch/BookSearchList'; +import BookSearchList from '@/components/bookSearch/BookSearchList'; const meta: Meta = { title: 'bookSearch/BookSearchList', diff --git a/src/stories/bookShelf/BookShelfCard.stories.tsx b/src/stories/bookShelf/BookShelfCard.stories.tsx index 7ea75c50..8c3efe07 100644 --- a/src/stories/bookShelf/BookShelfCard.stories.tsx +++ b/src/stories/bookShelf/BookShelfCard.stories.tsx @@ -1,4 +1,4 @@ -import BookShelfCard from '@/v1/bookShelf/BookShelfCard'; +import BookShelfCard from '@/components/bookShelf/BookShelfCard'; import { Meta, StoryObj } from '@storybook/react'; const meta: Meta = { diff --git a/src/stories/comment/CommentList.stories.tsx b/src/stories/comment/CommentList.stories.tsx index 21e53162..d1930e63 100644 --- a/src/stories/comment/CommentList.stories.tsx +++ b/src/stories/comment/CommentList.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import CommentList from '@/v1/comment/CommentList'; +import CommentList from '@/components/comment/CommentList'; const meta: Meta = { title: 'comment/CommentList', diff --git a/src/stories/base/Avatar.stories.tsx b/src/stories/common/Avatar.stories.tsx similarity index 82% rename from src/stories/base/Avatar.stories.tsx rename to src/stories/common/Avatar.stories.tsx index 58b1179c..eea91e56 100644 --- a/src/stories/base/Avatar.stories.tsx +++ b/src/stories/common/Avatar.stories.tsx @@ -1,9 +1,9 @@ import { Meta, StoryObj } from '@storybook/react'; -import Avatar from '@/v1/base/Avatar'; +import Avatar from '@/components/common/Avatar'; const meta: Meta = { - title: 'Base/Avatar', + title: 'Common/Avatar', component: Avatar, tags: ['autodocs'], }; diff --git a/src/stories/base/Badge.stories.tsx b/src/stories/common/Badge.stories.tsx similarity index 93% rename from src/stories/base/Badge.stories.tsx rename to src/stories/common/Badge.stories.tsx index 18b6da04..de90e2e4 100644 --- a/src/stories/base/Badge.stories.tsx +++ b/src/stories/common/Badge.stories.tsx @@ -1,9 +1,9 @@ -import Badge from '@/v1/base/Badge'; +import Badge from '@/components/common/Badge'; import { IconHeart } from '@public/icons'; import { Meta, StoryObj } from '@storybook/react'; const meta: Meta = { - title: 'Base/Badge', + title: 'Common/Badge', component: Badge, tags: ['autodocs'], }; diff --git a/src/stories/base/BottomActionButton.stories.tsx b/src/stories/common/BottomActionButton.stories.tsx similarity index 81% rename from src/stories/base/BottomActionButton.stories.tsx rename to src/stories/common/BottomActionButton.stories.tsx index a290ffd3..cee9d753 100644 --- a/src/stories/base/BottomActionButton.stories.tsx +++ b/src/stories/common/BottomActionButton.stories.tsx @@ -1,8 +1,8 @@ -import BottomActionButton from '@/v1/base/BottomActionButton'; +import BottomActionButton from '@/components/common/BottomActionButton'; import { Meta, StoryObj } from '@storybook/react'; const meta: Meta = { - title: 'Base/BottomActionButton', + title: 'Common/BottomActionButton', component: BottomActionButton, tags: ['autodocs'], parameters: { diff --git a/src/stories/base/BottomNavigation.stories.tsx b/src/stories/common/BottomNavigation.stories.tsx similarity index 88% rename from src/stories/base/BottomNavigation.stories.tsx rename to src/stories/common/BottomNavigation.stories.tsx index 893ca237..7bf66300 100644 --- a/src/stories/base/BottomNavigation.stories.tsx +++ b/src/stories/common/BottomNavigation.stories.tsx @@ -1,9 +1,9 @@ import { Meta, StoryObj } from '@storybook/react'; -import BottomNavigation from '@/v1/base/BottomNavigation'; +import BottomNavigation from '@/components/common/BottomNavigation'; const meta: Meta = { - title: 'Base/BottomNavigation', + title: 'Common/BottomNavigation', component: BottomNavigation, tags: ['autodocs'], parameters: { diff --git a/src/stories/base/BottomSheet.stories.tsx b/src/stories/common/BottomSheet.stories.tsx similarity index 94% rename from src/stories/base/BottomSheet.stories.tsx rename to src/stories/common/BottomSheet.stories.tsx index 57b329e0..80fe1cdf 100644 --- a/src/stories/base/BottomSheet.stories.tsx +++ b/src/stories/common/BottomSheet.stories.tsx @@ -1,12 +1,12 @@ import { Meta, StoryObj } from '@storybook/react'; import { IconClose, IconKakao, LogoWithText } from '@public/icons'; -import Button from '@/v1/base/Button'; -import BottomSheet from '@/v1/base/BottomSheet'; +import Button from '@/components/common/Button'; +import BottomSheet from '@/components/common/BottomSheet'; import useDisclosure from '@/hooks/useDisclosure'; const meta: Meta = { - title: 'Base/BottomSheet', + title: 'Common/BottomSheet', component: BottomSheet, tags: ['autodocs'], }; diff --git a/src/stories/base/Button.stories.tsx b/src/stories/common/Button.stories.tsx similarity index 95% rename from src/stories/base/Button.stories.tsx rename to src/stories/common/Button.stories.tsx index 8f4bf1cc..355f5b65 100644 --- a/src/stories/base/Button.stories.tsx +++ b/src/stories/common/Button.stories.tsx @@ -1,9 +1,9 @@ import { Meta, StoryObj } from '@storybook/react'; -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; const meta: Meta = { - title: 'Base/Button', + title: 'Common/Button', component: Button, tags: ['autodocs'], argTypes: { diff --git a/src/stories/base/DatePicker.stories.tsx b/src/stories/common/DatePicker.stories.tsx similarity index 92% rename from src/stories/base/DatePicker.stories.tsx rename to src/stories/common/DatePicker.stories.tsx index 68de957a..2d2968e2 100644 --- a/src/stories/base/DatePicker.stories.tsx +++ b/src/stories/common/DatePicker.stories.tsx @@ -1,12 +1,12 @@ import { getTodayDate } from '@/utils/date'; -import Button from '@/v1/base/Button'; -import DatePicker from '@/v1/base/DatePicker'; -import ErrorMessage from '@/v1/base/ErrorMessage'; +import Button from '@/components/common/Button'; +import DatePicker from '@/components/common/DatePicker'; +import ErrorMessage from '@/components/common/ErrorMessage'; import { Meta, StoryObj } from '@storybook/react'; import { SubmitHandler, useForm } from 'react-hook-form'; const meta: Meta = { - title: 'Base/DatePicker', + title: 'Common/DatePicker', component: DatePicker, tags: ['autodocs'], }; diff --git a/src/stories/base/Drawer.stories.tsx b/src/stories/common/Drawer.stories.tsx similarity index 93% rename from src/stories/base/Drawer.stories.tsx rename to src/stories/common/Drawer.stories.tsx index dabd0cad..fdc41fa5 100644 --- a/src/stories/base/Drawer.stories.tsx +++ b/src/stories/common/Drawer.stories.tsx @@ -2,11 +2,11 @@ import { Meta, StoryObj } from '@storybook/react'; import useDisclosure from '@/hooks/useDisclosure'; -import Button from '@/v1/base/Button'; -import Drawer from '@/v1/base/Drawer'; +import Button from '@/components/common/Button'; +import Drawer from '@/components/common/Drawer'; const meta: Meta = { - title: 'Base/Drawer', + title: 'Common/Drawer', component: Drawer, }; diff --git a/src/stories/base/FloatingButton.stories.tsx b/src/stories/common/FloatingButton.stories.tsx similarity index 77% rename from src/stories/base/FloatingButton.stories.tsx rename to src/stories/common/FloatingButton.stories.tsx index 66786897..c0445d6a 100644 --- a/src/stories/base/FloatingButton.stories.tsx +++ b/src/stories/common/FloatingButton.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import FloatingButton from '@/v1/base/FloatingButton'; +import FloatingButton from '@/components/common/FloatingButton'; const meta: Meta = { - title: 'Base/FloatingButton', + title: 'Common/FloatingButton', component: FloatingButton, tags: ['autodocs'], }; diff --git a/src/stories/base/Input.stories.tsx b/src/stories/common/Input.stories.tsx similarity index 95% rename from src/stories/base/Input.stories.tsx rename to src/stories/common/Input.stories.tsx index 4f5347ab..aa65a19c 100644 --- a/src/stories/base/Input.stories.tsx +++ b/src/stories/common/Input.stories.tsx @@ -1,11 +1,11 @@ import { Meta, StoryObj } from '@storybook/react'; -import Input from '@/v1/base/Input'; -import Button from '@/v1/base/Button'; +import Input from '@/components/common/Input'; +import Button from '@/components/common/Button'; import { Control, SubmitHandler, useForm, useWatch } from 'react-hook-form'; -import ErrorMessage from '@/v1/base/ErrorMessage'; +import ErrorMessage from '@/components/common/ErrorMessage'; const meta: Meta = { - title: 'Base/Input', + title: 'Common/Input', component: Input, args: { fontSize: 'small', diff --git a/src/stories/base/InputLength.stories.tsx b/src/stories/common/InputLength.stories.tsx similarity index 87% rename from src/stories/base/InputLength.stories.tsx rename to src/stories/common/InputLength.stories.tsx index 007918de..9e087c86 100644 --- a/src/stories/base/InputLength.stories.tsx +++ b/src/stories/common/InputLength.stories.tsx @@ -1,13 +1,13 @@ import { Meta, StoryObj } from '@storybook/react'; import { SubmitHandler, useForm } from 'react-hook-form'; -import Button from '@/v1/base/Button'; -import Input from '@/v1/base/Input'; -import InputLength from '@/v1/base/InputLength'; -import ErrorMessage from '@/v1/base/ErrorMessage'; +import Button from '@/components/common/Button'; +import Input from '@/components/common/Input'; +import InputLength from '@/components/common/InputLength'; +import ErrorMessage from '@/components/common/ErrorMessage'; const meta: Meta = { - title: 'Base/InputLength', + title: 'Common/InputLength', component: InputLength, tags: ['autodocs'], }; diff --git a/src/stories/base/LikeButton.stories.tsx b/src/stories/common/LikeButton.stories.tsx similarity index 81% rename from src/stories/base/LikeButton.stories.tsx rename to src/stories/common/LikeButton.stories.tsx index d8622453..ca0d384b 100644 --- a/src/stories/base/LikeButton.stories.tsx +++ b/src/stories/common/LikeButton.stories.tsx @@ -1,8 +1,8 @@ -import LikeButton from '@/v1/base/LikeButton'; +import LikeButton from '@/components/common/LikeButton'; import { Meta, StoryObj } from '@storybook/react'; const meta: Meta = { - title: 'Base/LikeButton', + title: 'Common/LikeButton', component: LikeButton, tags: ['autodocs'], }; diff --git a/src/stories/base/Loading.stories.tsx b/src/stories/common/Loading.stories.tsx similarity index 82% rename from src/stories/base/Loading.stories.tsx rename to src/stories/common/Loading.stories.tsx index 8d181b5c..7fac5a2d 100644 --- a/src/stories/base/Loading.stories.tsx +++ b/src/stories/common/Loading.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import Loading from '@/v1/base/Loading'; +import Loading from '@/components/common/Loading'; const meta: Meta = { - title: 'Base/Loading', + title: 'Common/Loading', component: Loading, tags: ['autodocs'], }; diff --git a/src/stories/base/Menu.stories.tsx b/src/stories/common/Menu.stories.tsx similarity index 92% rename from src/stories/base/Menu.stories.tsx rename to src/stories/common/Menu.stories.tsx index 3d2f8fc6..c5103256 100644 --- a/src/stories/base/Menu.stories.tsx +++ b/src/stories/common/Menu.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import Menu from '@/v1/base/Menu'; +import Menu from '@/components/common/Menu'; const meta: Meta = { - title: 'Base/Menu', + title: 'Common/Menu', component: Menu, }; diff --git a/src/stories/base/Modal.stories.tsx b/src/stories/common/Modal.stories.tsx similarity index 93% rename from src/stories/base/Modal.stories.tsx rename to src/stories/common/Modal.stories.tsx index 32d3d414..b5fe7c0c 100644 --- a/src/stories/base/Modal.stories.tsx +++ b/src/stories/common/Modal.stories.tsx @@ -1,11 +1,11 @@ import { Meta, StoryObj } from '@storybook/react'; -import Modal from '@/v1/base/Modal'; +import Modal from '@/components/common/Modal'; import useDisclosure from '@/hooks/useDisclosure'; -import Button from '@/v1/base/Button'; +import Button from '@/components/common/Button'; import { Fragment } from 'react'; const meta: Meta = { - title: 'Base/Modal', + title: 'Common/Modal', component: Modal, tags: ['autodocs'], }; diff --git a/src/stories/base/ProgressBar.stories.tsx b/src/stories/common/ProgressBar.stories.tsx similarity index 74% rename from src/stories/base/ProgressBar.stories.tsx rename to src/stories/common/ProgressBar.stories.tsx index 82af9595..b6859969 100644 --- a/src/stories/base/ProgressBar.stories.tsx +++ b/src/stories/common/ProgressBar.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import ProgressBar from '@/v1/base/ProgressBar'; +import ProgressBar from '@/components/common/ProgressBar'; const meta: Meta = { - title: 'Base/ProgressBar', + title: 'Common/ProgressBar', component: ProgressBar, tags: ['autodocs'], }; diff --git a/src/stories/base/RadioButton.stories.tsx b/src/stories/common/RadioButton.stories.tsx similarity index 90% rename from src/stories/base/RadioButton.stories.tsx rename to src/stories/common/RadioButton.stories.tsx index cf62a4a5..3636fce9 100644 --- a/src/stories/base/RadioButton.stories.tsx +++ b/src/stories/common/RadioButton.stories.tsx @@ -1,11 +1,11 @@ import { Meta, StoryObj } from '@storybook/react'; import { SubmitHandler, useForm } from 'react-hook-form'; -import RadioButton from '@/v1/base/RadioButton'; -import Button from '@/v1/base/Button'; +import RadioButton from '@/components/common/RadioButton'; +import Button from '@/components/common/Button'; const meta: Meta = { - title: 'Base/RadioButton', + title: 'Common/RadioButton', component: RadioButton, tags: ['autodocs'], }; diff --git a/src/stories/base/Select.stories.tsx b/src/stories/common/Select.stories.tsx similarity index 93% rename from src/stories/base/Select.stories.tsx rename to src/stories/common/Select.stories.tsx index 5f1f624d..76b48a16 100644 --- a/src/stories/base/Select.stories.tsx +++ b/src/stories/common/Select.stories.tsx @@ -1,11 +1,11 @@ import { Meta, StoryObj } from '@storybook/react'; -import Select from '@/v1/base/Select'; +import Select from '@/components/common/Select'; import { SubmitHandler, useForm } from 'react-hook-form'; -import Button from '@/v1/base/Button'; -import ErrorMessage from '@/v1/base/ErrorMessage'; +import Button from '@/components/common/Button'; +import ErrorMessage from '@/components/common/ErrorMessage'; const meta: Meta = { - title: 'Base/Select', + title: 'Common/Select', component: Select, tags: ['autodocs'], }; diff --git a/src/stories/base/Skeleton.stories.tsx b/src/stories/common/Skeleton.stories.tsx similarity index 93% rename from src/stories/base/Skeleton.stories.tsx rename to src/stories/common/Skeleton.stories.tsx index 5c50d626..423a5cc9 100644 --- a/src/stories/base/Skeleton.stories.tsx +++ b/src/stories/common/Skeleton.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import Skeleton from '@/v1/base/Skeleton'; +import Skeleton from '@/components/common/Skeleton'; const meta: Meta = { - title: 'Base/Skeleton', + title: 'Common/Skeleton', component: Skeleton, }; diff --git a/src/stories/base/Stepper.stories.tsx b/src/stories/common/Stepper.stories.tsx similarity index 83% rename from src/stories/base/Stepper.stories.tsx rename to src/stories/common/Stepper.stories.tsx index d7bfdcfc..800e5e92 100644 --- a/src/stories/base/Stepper.stories.tsx +++ b/src/stories/common/Stepper.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import Stepper from '@/v1/base/Stepper'; +import Stepper from '@/components/common/Stepper'; const meta: Meta = { - title: 'Base/Stepper', + title: 'Common/Stepper', component: Stepper, tags: ['autodocs'], }; diff --git a/src/stories/base/Switch.stories.tsx b/src/stories/common/Switch.stories.tsx similarity index 90% rename from src/stories/base/Switch.stories.tsx rename to src/stories/common/Switch.stories.tsx index 29e80fb2..28ed0f75 100644 --- a/src/stories/base/Switch.stories.tsx +++ b/src/stories/common/Switch.stories.tsx @@ -1,11 +1,11 @@ import { Meta, StoryObj } from '@storybook/react'; import { SubmitHandler, useForm } from 'react-hook-form'; -import Switch from '@/v1/base/Switch'; -import Button from '@/v1/base/Button'; +import Switch from '@/components/common/Switch'; +import Button from '@/components/common/Button'; const meta: Meta = { - title: 'Base/Switch', + title: 'Common/Switch', component: Switch, tags: ['autodocs'], }; diff --git a/src/stories/base/TextArea.stories.tsx b/src/stories/common/TextArea.stories.tsx similarity index 89% rename from src/stories/base/TextArea.stories.tsx rename to src/stories/common/TextArea.stories.tsx index b89d7cff..c43e5eae 100644 --- a/src/stories/base/TextArea.stories.tsx +++ b/src/stories/common/TextArea.stories.tsx @@ -1,10 +1,10 @@ import { Meta, StoryObj } from '@storybook/react'; import { SubmitHandler, useForm } from 'react-hook-form'; -import TextArea from '@/v1/base/TextArea'; -import Button from '@/v1/base/Button'; +import TextArea from '@/components/common/TextArea'; +import Button from '@/components/common/Button'; const meta: Meta = { - title: 'Base/TextArea', + title: 'Common/TextArea', component: TextArea, }; diff --git a/src/stories/base/Toast.stories.tsx b/src/stories/common/Toast.stories.tsx similarity index 88% rename from src/stories/base/Toast.stories.tsx rename to src/stories/common/Toast.stories.tsx index ef774d23..bf0863de 100644 --- a/src/stories/base/Toast.stories.tsx +++ b/src/stories/common/Toast.stories.tsx @@ -1,11 +1,11 @@ import { Meta, StoryObj } from '@storybook/react'; -import Button from '@/v1/base/Button'; -import useToast from '@/v1/base/Toast/useToast'; -import ToastItem from '@/v1/base/Toast/ToastItem'; +import Button from '@/components/common/Button'; +import useToast from '@/components/common/Toast/useToast'; +import ToastItem from '@/components/common/Toast/ToastItem'; const meta: Meta = { - title: 'Base/Toast', + title: 'Common/Toast', component: ToastItem, tags: ['autodocs'], }; diff --git a/src/stories/base/TopHeader.stories.tsx b/src/stories/common/TopHeader.stories.tsx similarity index 89% rename from src/stories/base/TopHeader.stories.tsx rename to src/stories/common/TopHeader.stories.tsx index a2a00cc5..fdc2d0f3 100644 --- a/src/stories/base/TopHeader.stories.tsx +++ b/src/stories/common/TopHeader.stories.tsx @@ -1,9 +1,9 @@ import { Meta, StoryObj } from '@storybook/react'; import { IconHamburger } from '@public/icons'; -import TopHeader from '@/v1/base/TopHeader'; +import TopHeader from '@/components/common/TopHeader'; const meta: Meta = { - title: 'Base/TopHeader', + title: 'Common/TopHeader', component: TopHeader, tags: ['autodocs'], }; diff --git a/src/stories/base/TopNavigation.stories.tsx b/src/stories/common/TopNavigation.stories.tsx similarity index 96% rename from src/stories/base/TopNavigation.stories.tsx rename to src/stories/common/TopNavigation.stories.tsx index 2294d470..c15d3bcb 100644 --- a/src/stories/base/TopNavigation.stories.tsx +++ b/src/stories/common/TopNavigation.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import TopNavigation from '@/v1/base/TopNavigation'; +import TopNavigation from '@/components/common/TopNavigation'; import { IconPost, IconShare, @@ -9,7 +9,7 @@ import { } from '@public/icons'; const meta: Meta = { - title: 'Base/TopNavigation', + title: 'Common/TopNavigation', component: TopNavigation, tags: ['autodocs'], }; diff --git a/src/stories/layout/Layout.stories.tsx b/src/stories/layout/Layout.stories.tsx index 49cbcec2..fc320c93 100644 --- a/src/stories/layout/Layout.stories.tsx +++ b/src/stories/layout/Layout.stories.tsx @@ -1,4 +1,4 @@ -import Layout from '@/v1/layout/Layout'; +import Layout from '@/components/layout/Layout'; import { Meta, StoryObj } from '@storybook/react'; const meta: Meta = { diff --git a/src/stories/meta.tsx b/src/stories/meta.tsx index ae570da4..462fb9d3 100644 --- a/src/stories/meta.tsx +++ b/src/stories/meta.tsx @@ -1,5 +1,5 @@ import { Meta } from '@storybook/react'; -import Layout from '@/v1/layout/Layout'; +import Layout from '@/components/layout/Layout'; export const appLayoutMeta: Meta = { parameters: {