diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 42b9ebd1..21537d74 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -4,7 +4,7 @@ import type { Preview } from '@storybook/react'; import '@/styles/global.css'; import Layout from '../src/v1/layout/Layout'; -import ToastProvider from '../src/ui/Base/Toast/ToastProvider'; +import ToastProvider from '../src/v1/base/Toast/ToastProvider'; const preview: Preview = { parameters: { diff --git a/src/app/bookarchive/page.tsx b/src/app/bookarchive/page.tsx index 0bc8e5ac..3e884636 100644 --- a/src/app/bookarchive/page.tsx +++ b/src/app/bookarchive/page.tsx @@ -6,7 +6,7 @@ import { Suspense } from 'react'; import useMounted from '@/hooks/useMounted'; import BookArchiveForAuth from '@/v1/bookArchive/BookArchiveForAuth'; import BookArchiveForUnAuth from '@/v1/bookArchive/BookArchiveForUnAuth'; -import TopHeader from '@/ui/Base/TopHeader'; +import TopHeader from '@/v1/base/TopHeader'; export default function BookArchivePage() { return ( diff --git a/src/app/bookshelf/[bookshelfId]/page.tsx b/src/app/bookshelf/[bookshelfId]/page.tsx index 8277f05b..78a5d1ef 100644 --- a/src/app/bookshelf/[bookshelfId]/page.tsx +++ b/src/app/bookshelf/[bookshelfId]/page.tsx @@ -1,7 +1,7 @@ 'use client'; import { IconHeart, IconArrowLeft, IconShare, IconKakao } from '@public/icons'; -import useToast from '@/ui/Base/Toast/useToast'; +import useToast from '@/v1/base/Toast/useToast'; import useBookShelfBooksQuery from '@/queries/bookshelf/useBookShelfBookListQuery'; import useBookShelfInfoQuery from '@/queries/bookshelf/useBookShelfInfoQuery'; import { @@ -11,8 +11,8 @@ import { import { useEffect } from 'react'; import { useInView } from 'react-intersection-observer'; -import Button from '@/ui/Base/Button'; -import TopNavigation from '@/ui/Base/TopNavigation'; +import Button from '@/v1/base/Button'; +import TopNavigation from '@/v1/base/TopNavigation'; import BookShelfRow from '@/v1/bookShelf/BookShelfRow'; import { useRouter } from 'next/navigation'; import { isAuthed } from '@/utils/helpers'; diff --git a/src/app/group/page.tsx b/src/app/group/page.tsx index d8b9ab91..a2c4d79c 100644 --- a/src/app/group/page.tsx +++ b/src/app/group/page.tsx @@ -1,6 +1,6 @@ 'use client'; -import TopHeader from '@/ui/Base/TopHeader'; +import TopHeader from '@/v1/base/TopHeader'; import SearchGroup from '@/v1/bookGroup/SearchGroup'; import SimpleBookGroupCard from '@/v1/bookGroup/SimpleBookGroupCard'; import DetailBookGroupCard from '@/v1/bookGroup/DetailBookGroupCard'; diff --git a/src/app/loading.tsx b/src/app/loading.tsx index 74aace4a..95a9eab2 100644 --- a/src/app/loading.tsx +++ b/src/app/loading.tsx @@ -1,4 +1,4 @@ -import Loading from '@/ui/Base/Loading'; +import Loading from '@/v1/base/Loading'; export default function RootLoading() { return ; diff --git a/src/components/ContextProvider.tsx b/src/components/ContextProvider.tsx index 4a114cb4..92130a5f 100644 --- a/src/components/ContextProvider.tsx +++ b/src/components/ContextProvider.tsx @@ -6,7 +6,7 @@ import ChakraThemeProvider from '@/components/ChakraThemeProvider'; import ReactQueryProvider from '@/components/ReactQueryProvider'; import { ReactNode } from 'react'; import ErrorPage from '@/app/error'; -import ToastProvider from '@/ui/Base/Toast/ToastProvider'; +import ToastProvider from '@/v1/base/Toast/ToastProvider'; import Layout from '@/v1/layout/Layout'; const ContextProvider = ({ children }: { children: ReactNode }) => { diff --git a/src/stories/Base/Avatar.stories.tsx b/src/stories/base/Avatar.stories.tsx similarity index 90% rename from src/stories/Base/Avatar.stories.tsx rename to src/stories/base/Avatar.stories.tsx index deaff4d9..58b1179c 100644 --- a/src/stories/Base/Avatar.stories.tsx +++ b/src/stories/base/Avatar.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import Avatar from '@/ui/Base/Avatar'; +import Avatar from '@/v1/base/Avatar'; const meta: Meta = { title: 'Base/Avatar', diff --git a/src/stories/Base/Badge.stories.tsx b/src/stories/base/Badge.stories.tsx similarity index 96% rename from src/stories/Base/Badge.stories.tsx rename to src/stories/base/Badge.stories.tsx index a7859dda..18b6da04 100644 --- a/src/stories/Base/Badge.stories.tsx +++ b/src/stories/base/Badge.stories.tsx @@ -1,4 +1,4 @@ -import Badge from '@/ui/Base/Badge'; +import Badge from '@/v1/base/Badge'; import { IconHeart } from '@public/icons'; import { Meta, StoryObj } from '@storybook/react'; diff --git a/src/stories/Base/BottomActionButton.stories.tsx b/src/stories/base/BottomActionButton.stories.tsx similarity index 89% rename from src/stories/Base/BottomActionButton.stories.tsx rename to src/stories/base/BottomActionButton.stories.tsx index d6860131..a290ffd3 100644 --- a/src/stories/Base/BottomActionButton.stories.tsx +++ b/src/stories/base/BottomActionButton.stories.tsx @@ -1,4 +1,4 @@ -import BottomActionButton from '@/ui/Base/BottomActionButton'; +import BottomActionButton from '@/v1/base/BottomActionButton'; import { Meta, StoryObj } from '@storybook/react'; const meta: Meta = { diff --git a/src/stories/Base/BottomNavigation.stories.tsx b/src/stories/base/BottomNavigation.stories.tsx similarity index 93% rename from src/stories/Base/BottomNavigation.stories.tsx rename to src/stories/base/BottomNavigation.stories.tsx index 60bf6d14..893ca237 100644 --- a/src/stories/Base/BottomNavigation.stories.tsx +++ b/src/stories/base/BottomNavigation.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import BottomNavigation from '@/ui/Base/BottomNavigation'; +import BottomNavigation from '@/v1/base/BottomNavigation'; const meta: Meta = { title: 'Base/BottomNavigation', diff --git a/src/stories/Base/BottomSheet.stories.tsx b/src/stories/base/BottomSheet.stories.tsx similarity index 96% rename from src/stories/Base/BottomSheet.stories.tsx rename to src/stories/base/BottomSheet.stories.tsx index 728cd72b..57b329e0 100644 --- a/src/stories/Base/BottomSheet.stories.tsx +++ b/src/stories/base/BottomSheet.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; import { IconClose, IconKakao, LogoWithText } from '@public/icons'; -import Button from '@/ui/Base/Button'; -import BottomSheet from '@/ui/Base/BottomSheet'; +import Button from '@/v1/base/Button'; +import BottomSheet from '@/v1/base/BottomSheet'; import useDisclosure from '@/hooks/useDisclosure'; const meta: Meta = { diff --git a/src/stories/Base/Button.stories.tsx b/src/stories/base/Button.stories.tsx similarity index 96% rename from src/stories/Base/Button.stories.tsx rename to src/stories/base/Button.stories.tsx index a857e86b..93c1ff33 100644 --- a/src/stories/Base/Button.stories.tsx +++ b/src/stories/base/Button.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; -import Button from '@/ui/Base/Button'; +import Button from '@/v1/base/Button'; const meta: Meta = { title: 'Base/Button', diff --git a/src/stories/Base/FloatingButton.stories.tsx b/src/stories/base/FloatingButton.stories.tsx similarity index 87% rename from src/stories/Base/FloatingButton.stories.tsx rename to src/stories/base/FloatingButton.stories.tsx index 73cf5c83..66786897 100644 --- a/src/stories/Base/FloatingButton.stories.tsx +++ b/src/stories/base/FloatingButton.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import FloatingButton from '@/ui/Base/FloatingButton'; +import FloatingButton from '@/v1/base/FloatingButton'; const meta: Meta = { title: 'Base/FloatingButton', diff --git a/src/stories/Base/Input.stories.tsx b/src/stories/base/Input.stories.tsx similarity index 93% rename from src/stories/Base/Input.stories.tsx rename to src/stories/base/Input.stories.tsx index 664a666c..062f2df8 100644 --- a/src/stories/Base/Input.stories.tsx +++ b/src/stories/base/Input.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import Input from '@/ui/Base/Input'; -import Button from '@/ui/Base/Button'; +import Input from '@/v1/base/Input'; +import Button from '@/v1/base/Button'; import { Control, SubmitHandler, useForm, useWatch } from 'react-hook-form'; -import ErrorMessage from '@/ui/Base/ErrorMessage'; +import ErrorMessage from '@/v1/base/ErrorMessage'; const meta: Meta = { title: 'Base/Input', @@ -95,8 +95,7 @@ const Length = ({ return (
- {currentLength}/ - {maxLength} + {currentLength}/{maxLength}
); }; diff --git a/src/stories/Base/InputLength.stories.tsx b/src/stories/base/InputLength.stories.tsx similarity index 91% rename from src/stories/Base/InputLength.stories.tsx rename to src/stories/base/InputLength.stories.tsx index 9a3b10eb..007918de 100644 --- a/src/stories/Base/InputLength.stories.tsx +++ b/src/stories/base/InputLength.stories.tsx @@ -1,10 +1,10 @@ import { Meta, StoryObj } from '@storybook/react'; import { SubmitHandler, useForm } from 'react-hook-form'; -import Button from '@/ui/Base/Button'; -import Input from '@/ui/Base/Input'; -import InputLength from '@/ui/Base/InputLength'; -import ErrorMessage from '@/ui/Base/ErrorMessage'; +import Button from '@/v1/base/Button'; +import Input from '@/v1/base/Input'; +import InputLength from '@/v1/base/InputLength'; +import ErrorMessage from '@/v1/base/ErrorMessage'; const meta: Meta = { title: 'Base/InputLength', diff --git a/src/stories/Base/Loading.stories.tsx b/src/stories/base/Loading.stories.tsx similarity index 90% rename from src/stories/Base/Loading.stories.tsx rename to src/stories/base/Loading.stories.tsx index 0fe056ae..8d181b5c 100644 --- a/src/stories/Base/Loading.stories.tsx +++ b/src/stories/base/Loading.stories.tsx @@ -1,5 +1,5 @@ import { Meta, StoryObj } from '@storybook/react'; -import Loading from '@/ui/Base/Loading'; +import Loading from '@/v1/base/Loading'; const meta: Meta = { title: 'Base/Loading', diff --git a/src/stories/Base/Modal.stories.tsx b/src/stories/base/Modal.stories.tsx similarity index 95% rename from src/stories/Base/Modal.stories.tsx rename to src/stories/base/Modal.stories.tsx index ccc24ce3..32d3d414 100644 --- a/src/stories/Base/Modal.stories.tsx +++ b/src/stories/base/Modal.stories.tsx @@ -1,7 +1,7 @@ import { Meta, StoryObj } from '@storybook/react'; -import Modal from '@/ui/Base/Modal'; +import Modal from '@/v1/base/Modal'; import useDisclosure from '@/hooks/useDisclosure'; -import Button from '@/ui/Base/Button'; +import Button from '@/v1/base/Button'; import { Fragment } from 'react'; const meta: Meta = { diff --git a/src/stories/Base/RadioButton.stories.tsx b/src/stories/base/RadioButton.stories.tsx similarity index 94% rename from src/stories/Base/RadioButton.stories.tsx rename to src/stories/base/RadioButton.stories.tsx index bc6a2402..cf62a4a5 100644 --- a/src/stories/Base/RadioButton.stories.tsx +++ b/src/stories/base/RadioButton.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; import { SubmitHandler, useForm } from 'react-hook-form'; -import RadioButton from '@/ui/Base/RadioButton'; -import Button from '@/ui/Base/Button'; +import RadioButton from '@/v1/base/RadioButton'; +import Button from '@/v1/base/Button'; const meta: Meta = { title: 'Base/RadioButton', diff --git a/src/stories/Base/Select.stories.tsx b/src/stories/base/Select.stories.tsx similarity index 91% rename from src/stories/Base/Select.stories.tsx rename to src/stories/base/Select.stories.tsx index bd82d22d..5f1f624d 100644 --- a/src/stories/Base/Select.stories.tsx +++ b/src/stories/base/Select.stories.tsx @@ -1,8 +1,8 @@ import { Meta, StoryObj } from '@storybook/react'; -import Select from '@/ui/Base/Select'; +import Select from '@/v1/base/Select'; import { SubmitHandler, useForm } from 'react-hook-form'; -import Button from '@/ui/Base/Button'; -import ErrorMessage from '@/ui/Base/ErrorMessage'; +import Button from '@/v1/base/Button'; +import ErrorMessage from '@/v1/base/ErrorMessage'; const meta: Meta = { title: 'Base/Select', @@ -54,7 +54,9 @@ const SelectWithUseForm = () => { ))} - {errors.requiredNumber && {errors.requiredNumber.message}} + {errors.requiredNumber && ( + {errors.requiredNumber.message} + )}