diff --git a/frontend/src/assets/images/docs/check-branch-created.png b/frontend/src/assets/images/docs/check-branch-created.png deleted file mode 100644 index e4435e72d..000000000 Binary files a/frontend/src/assets/images/docs/check-branch-created.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/clone.png b/frontend/src/assets/images/docs/clone.png deleted file mode 100644 index c71084574..000000000 Binary files a/frontend/src/assets/images/docs/clone.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/complete-onboarding.png b/frontend/src/assets/images/docs/complete-onboarding.png deleted file mode 100644 index e4a8fa5b4..000000000 Binary files a/frontend/src/assets/images/docs/complete-onboarding.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/create-branch.png b/frontend/src/assets/images/docs/create-branch.png deleted file mode 100644 index 27454f4fc..000000000 Binary files a/frontend/src/assets/images/docs/create-branch.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/create-fork.png b/frontend/src/assets/images/docs/create-fork.png deleted file mode 100644 index 324b5ae69..000000000 Binary files a/frontend/src/assets/images/docs/create-fork.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/create-room.png b/frontend/src/assets/images/docs/create-room.png deleted file mode 100644 index 8358dc02d..000000000 Binary files a/frontend/src/assets/images/docs/create-room.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/fork-repository.png b/frontend/src/assets/images/docs/fork-repository.png deleted file mode 100644 index 9a8d14223..000000000 Binary files a/frontend/src/assets/images/docs/fork-repository.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/input-name.png b/frontend/src/assets/images/docs/input-name.png deleted file mode 100644 index 234369f92..000000000 Binary files a/frontend/src/assets/images/docs/input-name.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/input-pair-name.png b/frontend/src/assets/images/docs/input-pair-name.png deleted file mode 100644 index 9b04526cb..000000000 Binary files a/frontend/src/assets/images/docs/input-pair-name.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/select-driver.png b/frontend/src/assets/images/docs/select-driver.png deleted file mode 100644 index d4974beaa..000000000 Binary files a/frontend/src/assets/images/docs/select-driver.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/select-mission.png b/frontend/src/assets/images/docs/select-mission.png deleted file mode 100644 index a46df445c..000000000 Binary files a/frontend/src/assets/images/docs/select-mission.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/set-role.png b/frontend/src/assets/images/docs/set-role.png deleted file mode 100644 index 8a53ae4b7..000000000 Binary files a/frontend/src/assets/images/docs/set-role.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/set-timer.png b/frontend/src/assets/images/docs/set-timer.png deleted file mode 100644 index 28aac7472..000000000 Binary files a/frontend/src/assets/images/docs/set-timer.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/start-free.png b/frontend/src/assets/images/docs/start-free.png deleted file mode 100644 index 55d1f8be1..000000000 Binary files a/frontend/src/assets/images/docs/start-free.png and /dev/null differ diff --git a/frontend/src/assets/images/docs/start-with-mission.png b/frontend/src/assets/images/docs/start-with-mission.png deleted file mode 100644 index 3cff8f87f..000000000 Binary files a/frontend/src/assets/images/docs/start-with-mission.png and /dev/null differ diff --git a/frontend/src/assets/images/characters/driver.png b/frontend/src/assets/images/driver.png similarity index 100% rename from frontend/src/assets/images/characters/driver.png rename to frontend/src/assets/images/driver.png diff --git a/frontend/src/assets/images/characters/navigator.png b/frontend/src/assets/images/navigator.png similarity index 100% rename from frontend/src/assets/images/characters/navigator.png rename to frontend/src/assets/images/navigator.png diff --git a/frontend/src/assets/index.ts b/frontend/src/assets/index.ts index ab07cd10b..74909a2a7 100644 --- a/frontend/src/assets/index.ts +++ b/frontend/src/assets/index.ts @@ -1,15 +1,46 @@ import AlarmSound from '@/assets/audio/alarm_sound.mp3'; -import Driver from '@/assets/images/characters/driver.png'; -import Navigator from '@/assets/images/characters/navigator.png'; import CheckBoxChecked from '@/assets/images/check_box_checked.svg'; import CheckBoxUnchecked from '@/assets/images/check_box_unchecked.svg'; +import checkBranchCreated from '@/assets/images/docs/check-branch-created.webp'; +import clone from '@/assets/images/docs/clone.webp'; +import createBranch from '@/assets/images/docs/create-branch.webp'; +import createFork from '@/assets/images/docs/create-fork.webp'; +import createRoom from '@/assets/images/docs/create-room.webp'; +import forkRepository from '@/assets/images/docs/fork-repository.webp'; +import inputName from '@/assets/images/docs/input-name.webp'; +import inputPairName from '@/assets/images/docs/input-pair-name.webp'; +import selectDriver from '@/assets/images/docs/select-driver.webp'; +import selectMission from '@/assets/images/docs/select-mission.webp'; +import setRole from '@/assets/images/docs/set-role.webp'; +import setTimer from '@/assets/images/docs/set-timer.webp'; +import startFree from '@/assets/images/docs/start-free.webp'; +import startWithMission from '@/assets/images/docs/start-with-mission.webp'; +import Driver from '@/assets/images/driver.png'; import GithubLogoWhite from '@/assets/images/github-mark-white.png'; import GithubLogo from '@/assets/images/github-mark.png'; import LogoIcon from '@/assets/images/logo_icon.svg'; import LogoIconWithTitle from '@/assets/images/logo_icon_with_title.svg'; import LogoTitle from '@/assets/images/logo_title.svg'; +import Navigator from '@/assets/images/navigator.png'; import Wave from '@/assets/images/wave.svg'; +export const DOCS_IMAGES = { + checkBranchCreated, + clone, + createBranch, + createFork, + createRoom, + forkRepository, + inputName, + inputPairName, + selectDriver, + selectMission, + setRole, + setTimer, + startFree, + startWithMission, +}; + export { GithubLogo, GithubLogoWhite, diff --git a/frontend/src/components/CoduoDocs/ContentBox/ContentBox.styles.ts b/frontend/src/components/CoduoDocs/ContentBox/ContentBox.styles.ts new file mode 100644 index 000000000..f327e8a59 --- /dev/null +++ b/frontend/src/components/CoduoDocs/ContentBox/ContentBox.styles.ts @@ -0,0 +1,65 @@ +import { Link } from 'react-router-dom'; + +import styled from 'styled-components'; + +export const Title = styled.p` + color: ${({ theme }) => theme.color.primary[700]}; + font-size: ${({ theme }) => theme.fontSize.base}; + font-weight: ${({ theme }) => theme.fontWeight.semibold}; + + @media (width <= 1400px) { + font-size: ${({ theme }) => theme.fontSize.base}; + } +`; + +export const ContentList = styled.ul` + display: flex; + flex-direction: column; + gap: 1rem; + + position: relative; + + padding-left: 15px; + + @media (width <= 1400px) { + gap: 0.8rem; + } +`; + +export const ContentItem = styled(Link)<{ $isActive: boolean }>` + position: relative; + + color: ${({ $isActive, theme }) => ($isActive ? theme.color.black[90] : theme.color.black[60])}; + font-size: ${({ theme }) => theme.fontSize.lg}; + text-decoration: none; + + transition: all 0.1s; + + &::before { + position: absolute; + top: 0; + left: -2rem; + + width: 3px; + height: 145%; + + background-color: ${({ $isActive, theme }) => ($isActive ? theme.color.secondary[500] : theme.color.black[30])}; + + transition: all 0.2s; + content: ''; + } + + @media (width <= 1400px) { + font-size: ${({ theme }) => theme.fontSize.md}; + } +`; + +export const Container = styled.div` + display: flex; + flex-direction: column; + gap: 1.1rem; + + @media (width <= 1400px) { + gap: 0.9rem; + } +`; diff --git a/frontend/src/components/CoduoDocs/FloatingSidebar/ContentBox.tsx b/frontend/src/components/CoduoDocs/ContentBox/ContentBox.tsx similarity index 94% rename from frontend/src/components/CoduoDocs/FloatingSidebar/ContentBox.tsx rename to frontend/src/components/CoduoDocs/ContentBox/ContentBox.tsx index 9c5c2a7af..b0c6b7798 100644 --- a/frontend/src/components/CoduoDocs/FloatingSidebar/ContentBox.tsx +++ b/frontend/src/components/CoduoDocs/ContentBox/ContentBox.tsx @@ -2,7 +2,7 @@ import { useNavigate } from 'react-router-dom'; import { Content } from '@/pages/CoduoDocs/CoduoDocs.type'; -import * as S from './FloatingSidebar.styles'; +import * as S from './ContentBox.styles'; interface ContentBoxProps { title: string; diff --git a/frontend/src/components/CoduoDocs/DocsImage/DocsImage.tsx b/frontend/src/components/CoduoDocs/DocsImage/DocsImage.tsx index 0dc79dcb1..bddc1bb65 100644 --- a/frontend/src/components/CoduoDocs/DocsImage/DocsImage.tsx +++ b/frontend/src/components/CoduoDocs/DocsImage/DocsImage.tsx @@ -3,20 +3,16 @@ import * as S from './DocsImage.styles'; interface DocsImageProps { information?: string; src: string; - webpSrc: string; alt: string; id?: string; } -const DocsImage = ({ information, src, alt, webpSrc, id, children }: React.PropsWithChildren) => { +const DocsImage = ({ information, src, alt, id, children }: React.PropsWithChildren) => { return ( {information && {information}} {children} - - - {alt} - + {alt} ); }; diff --git a/frontend/src/components/CoduoDocs/FloatingSidebar/FloatingSidebar.stories.tsx b/frontend/src/components/CoduoDocs/FloatingSidebar/FloatingSidebar.stories.tsx index 1c244f4a7..8b36239ce 100644 --- a/frontend/src/components/CoduoDocs/FloatingSidebar/FloatingSidebar.stories.tsx +++ b/frontend/src/components/CoduoDocs/FloatingSidebar/FloatingSidebar.stories.tsx @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from '@storybook/react'; -import ContentBox from '@/components/CoduoDocs/FloatingSidebar/ContentBox'; +import ContentBox from '@/components/CoduoDocs/ContentBox/ContentBox'; import FloatingSidebar from '@/components/CoduoDocs/FloatingSidebar/FloatingSidebar'; import { START_CONTENT } from '@/constants/coduoDocs'; diff --git a/frontend/src/components/CoduoDocs/FloatingSidebar/FloatingSidebar.styles.ts b/frontend/src/components/CoduoDocs/FloatingSidebar/FloatingSidebar.styles.ts index 41e09c0c2..49cb9fac4 100644 --- a/frontend/src/components/CoduoDocs/FloatingSidebar/FloatingSidebar.styles.ts +++ b/frontend/src/components/CoduoDocs/FloatingSidebar/FloatingSidebar.styles.ts @@ -1,5 +1,3 @@ -import { Link } from 'react-router-dom'; - import styled from 'styled-components'; export const Layout = styled.div` @@ -26,65 +24,3 @@ export const Layout = styled.div` display: none; } `; - -export const Title = styled.p` - color: ${({ theme }) => theme.color.primary[700]}; - font-size: ${({ theme }) => theme.fontSize.base}; - font-weight: ${({ theme }) => theme.fontWeight.semibold}; - - @media (width <= 1400px) { - font-size: ${({ theme }) => theme.fontSize.base}; - } -`; - -export const ContentList = styled.ul` - display: flex; - flex-direction: column; - gap: 1rem; - - position: relative; - - padding-left: 15px; - - @media (width <= 1400px) { - gap: 0.8rem; - } -`; - -export const ContentItem = styled(Link)<{ $isActive: boolean }>` - position: relative; - - color: ${({ $isActive, theme }) => ($isActive ? theme.color.black[90] : theme.color.black[60])}; - font-size: ${({ theme }) => theme.fontSize.lg}; - text-decoration: none; - - transition: all 0.1s; - - &::before { - position: absolute; - top: 0; - left: -2rem; - - width: 3px; - height: 145%; - - background-color: ${({ $isActive, theme }) => ($isActive ? theme.color.secondary[500] : theme.color.black[30])}; - - transition: all 0.2s; - content: ''; - } - - @media (width <= 1400px) { - font-size: ${({ theme }) => theme.fontSize.md}; - } -`; - -export const Container = styled.div` - display: flex; - flex-direction: column; - gap: 1.1rem; - - @media (width <= 1400px) { - gap: 0.9rem; - } -`; diff --git a/frontend/src/components/CoduoDocs/SourceCode/SourceCode.tsx b/frontend/src/components/CoduoDocs/SourceCode/SourceCode.tsx index d2a70351b..ca1860654 100644 --- a/frontend/src/components/CoduoDocs/SourceCode/SourceCode.tsx +++ b/frontend/src/components/CoduoDocs/SourceCode/SourceCode.tsx @@ -1,4 +1,4 @@ -import useCopyClipBoard from '@/hooks/common/useCopyClipboard'; +import useCopyClipBoard from '@/hooks/_common/useCopyClipboard'; import * as S from './SourceCode.styles'; diff --git a/frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.styles.ts b/frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryItem/CategoryItem.styles.ts similarity index 100% rename from frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.styles.ts rename to frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryItem/CategoryItem.styles.ts diff --git a/frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.tsx b/frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryItem/CategoryItem.tsx similarity index 100% rename from frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.tsx rename to frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryItem/CategoryItem.tsx diff --git a/frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.styles.ts b/frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryManagementModal.styles.ts similarity index 100% rename from frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.styles.ts rename to frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryManagementModal.styles.ts diff --git a/frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.tsx b/frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryManagementModal.tsx similarity index 88% rename from frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.tsx rename to frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryManagementModal.tsx index 971603ff8..da9f73f80 100644 --- a/frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.tsx +++ b/frontend/src/components/CompletedPairRoom/CategoryManagementModal/CategoryManagementModal.tsx @@ -1,5 +1,5 @@ -import { Modal } from '@/components/common/Modal'; -import CategoryItem from '@/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem'; +import { Modal } from '@/components/_common/Modal'; +import CategoryItem from '@/components/CompletedPairRoom/CategoryManagementModal/CategoryItem/CategoryItem'; import { Category } from '@/components/PairRoom/ReferenceCard/ReferenceCard.type'; import * as S from './CategoryManagementModal.styles'; diff --git a/frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/.DS_Store b/frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/.DS_Store deleted file mode 100644 index fd335169f..000000000 Binary files a/frontend/src/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/.DS_Store and /dev/null differ diff --git a/frontend/src/components/CompletedPairRoom/ReferenceCard/Header/Header.tsx b/frontend/src/components/CompletedPairRoom/ReferenceCard/Header/Header.tsx index 0d7f0c964..363e53e58 100644 --- a/frontend/src/components/CompletedPairRoom/ReferenceCard/Header/Header.tsx +++ b/frontend/src/components/CompletedPairRoom/ReferenceCard/Header/Header.tsx @@ -1,6 +1,6 @@ import { IoIosLink } from 'react-icons/io'; -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import { theme } from '@/styles/theme'; diff --git a/frontend/src/components/CompletedPairRoom/ReferenceCard/ReferenceCard.tsx b/frontend/src/components/CompletedPairRoom/ReferenceCard/ReferenceCard.tsx index f86f6fb17..882749bf3 100644 --- a/frontend/src/components/CompletedPairRoom/ReferenceCard/ReferenceCard.tsx +++ b/frontend/src/components/CompletedPairRoom/ReferenceCard/ReferenceCard.tsx @@ -1,11 +1,11 @@ import { useState } from 'react'; -import CategoryManagementModal from '@/components/CompletedPairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal'; +import CategoryManagementModal from '@/components/CompletedPairRoom/CategoryManagementModal/CategoryManagementModal'; import Header from '@/components/CompletedPairRoom/ReferenceCard/Header/Header'; import ReferenceList from '@/components/CompletedPairRoom/ReferenceCard/ReferenceList/ReferenceList'; import { PairRoomCard } from '@/components/PairRoom/PairRoomCard'; -import useModal from '@/hooks/common/useModal'; +import useModal from '@/hooks/_common/useModal'; import useCategories, { DEFAULT_CATEGORY_ID, DEFAULT_CATEGORY_VALUE } from '@/hooks/PairRoom/useCategories'; import { useGetReference } from '@/queries/PairRoom/reference/query'; diff --git a/frontend/src/components/CompletedPairRoom/RetrospectButton/RetrospectButton.tsx b/frontend/src/components/CompletedPairRoom/RetrospectButton/RetrospectButton.tsx index 25a90eeba..ad836ee2e 100644 --- a/frontend/src/components/CompletedPairRoom/RetrospectButton/RetrospectButton.tsx +++ b/frontend/src/components/CompletedPairRoom/RetrospectButton/RetrospectButton.tsx @@ -1,6 +1,6 @@ import { useNavigate } from 'react-router-dom'; -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import useUserStore from '@/stores/userStore'; diff --git a/frontend/src/components/CompletedPairRoom/TodoListCard/TodoItem/TodoItem.tsx b/frontend/src/components/CompletedPairRoom/TodoListCard/TodoItem/TodoItem.tsx index fc06ab709..8fb0bb134 100644 --- a/frontend/src/components/CompletedPairRoom/TodoListCard/TodoItem/TodoItem.tsx +++ b/frontend/src/components/CompletedPairRoom/TodoListCard/TodoItem/TodoItem.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { Todo } from '@/apis/todo'; -import useCopyClipBoard from '@/hooks/common/useCopyClipboard'; +import useCopyClipBoard from '@/hooks/_common/useCopyClipboard'; import * as S from './TodoItem.styles'; diff --git a/frontend/src/components/Landing/HowToPair/HowToPair.tsx b/frontend/src/components/Landing/HowToPair/HowToPair.tsx index 56997a8b0..7b74947ba 100644 --- a/frontend/src/components/Landing/HowToPair/HowToPair.tsx +++ b/frontend/src/components/Landing/HowToPair/HowToPair.tsx @@ -1,6 +1,6 @@ import { Driver, Navigator } from '@/assets'; -import { ScrollAnimationContainer } from '@/components/common/Animation/ScrollAnimationContainer'; +import { ScrollAnimationContainer } from '@/components/_common/ScrollAnimationContainer/ScrollAnimationContainer'; import * as S from './HowToPair.styles'; diff --git a/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateComplete/PairRoomCreateComplete.stories.tsx b/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateComplete/PairRoomCreateComplete.stories.tsx deleted file mode 100644 index 6a8ae51b6..000000000 --- a/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateComplete/PairRoomCreateComplete.stories.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import type { Meta, StoryObj } from '@storybook/react'; - -import { Modal } from '@/components/common/Modal'; - -import PairRoomCreateComplete from './PairRoomCreateComplete'; - -const meta = { - title: 'component/PairRoomCreateModal/PairRoomCreateComplete', - component: PairRoomCreateComplete, -} satisfies Meta; - -export default meta; - -type Story = StoryObj; - -export const Default: Story = { - render: () => { - return ( - console.log()} size="60rem" height="45rem"> - console.log()} /> - console.log()} accessCode="12345" /> - - ); - }, -}; diff --git a/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateComplete/PairRoomCreateComplete.tsx b/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateComplete/PairRoomCreateComplete.tsx deleted file mode 100644 index a76ebf235..000000000 --- a/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateComplete/PairRoomCreateComplete.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import { Link } from 'react-router-dom'; - -import { FaRegPaste, FaCheck } from 'react-icons/fa6'; - -import Button from '@/components/common/Button/Button'; -import { Modal } from '@/components/common/Modal'; - -import useCopyClipBoard from '@/hooks/common/useCopyClipboard'; - -import * as S from '../PairRoomCreateModal.styles'; - -interface PairRoomCreateCompleteProps { - accessCode: string; - closeModal: () => void; -} - -const PairRoomCreateComplete = ({ accessCode, closeModal }: PairRoomCreateCompleteProps) => { - const [isCopy, onCopy] = useCopyClipBoard(); - - const handleCopyClipBoard = (text: string) => { - onCopy(text); - }; - - return ( - <> - - - - handleCopyClipBoard(accessCode)}> - {accessCode} - {isCopy ? : } - - - - - - - - - - - ); -}; - -export default PairRoomCreateComplete; diff --git a/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateModal.tsx b/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateModal.tsx index 405d5927c..5b81bdda3 100644 --- a/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateModal.tsx +++ b/frontend/src/components/Main/PairRoomCreateModal/PairRoomCreateModal.tsx @@ -1,7 +1,7 @@ import { Link } from 'react-router-dom'; -import Button from '@/components/common/Button/Button'; -import { Modal } from '@/components/common/Modal'; +import Button from '@/components/_common/Button/Button'; +import { Modal } from '@/components/_common/Modal'; import * as S from './PairRoomCreateModal.styles'; diff --git a/frontend/src/components/Main/PairRoomEntryModal/PairRoomEntryModal.tsx b/frontend/src/components/Main/PairRoomEntryModal/PairRoomEntryModal.tsx index ed0cce49f..f04d20a15 100644 --- a/frontend/src/components/Main/PairRoomEntryModal/PairRoomEntryModal.tsx +++ b/frontend/src/components/Main/PairRoomEntryModal/PairRoomEntryModal.tsx @@ -1,14 +1,14 @@ import { useNavigate } from 'react-router-dom'; -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; -import { Modal } from '@/components/common/Modal'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; +import { Modal } from '@/components/_common/Modal'; import useToastStore from '@/stores/toastStore'; import { getPairRoomExists } from '@/apis/pairRoom'; -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; interface PairRoomEntryModal { isOpen: boolean; diff --git a/frontend/src/components/common/Background/WaveBackground.styles.ts b/frontend/src/components/Main/WaveBackground/WaveBackground.styles.ts similarity index 100% rename from frontend/src/components/common/Background/WaveBackground.styles.ts rename to frontend/src/components/Main/WaveBackground/WaveBackground.styles.ts diff --git a/frontend/src/components/common/Background/WaveBackground.tsx b/frontend/src/components/Main/WaveBackground/WaveBackground.tsx similarity index 100% rename from frontend/src/components/common/Background/WaveBackground.tsx rename to frontend/src/components/Main/WaveBackground/WaveBackground.tsx diff --git a/frontend/src/pages/MyPage/MyPageContent/ListLayout/ListLayout.styles.ts b/frontend/src/components/MyPage/ListLayout/ListLayout.styles.ts similarity index 100% rename from frontend/src/pages/MyPage/MyPageContent/ListLayout/ListLayout.styles.ts rename to frontend/src/components/MyPage/ListLayout/ListLayout.styles.ts diff --git a/frontend/src/pages/MyPage/MyPageContent/ListLayout/ListLayout.tsx b/frontend/src/components/MyPage/ListLayout/ListLayout.tsx similarity index 87% rename from frontend/src/pages/MyPage/MyPageContent/ListLayout/ListLayout.tsx rename to frontend/src/components/MyPage/ListLayout/ListLayout.tsx index 35817c18c..d229320e4 100644 --- a/frontend/src/pages/MyPage/MyPageContent/ListLayout/ListLayout.tsx +++ b/frontend/src/components/MyPage/ListLayout/ListLayout.tsx @@ -1,4 +1,4 @@ -import Spinner from '@/components/common/Spinner/Spinner'; +import Spinner from '@/components/_common/Spinner/Spinner'; import * as S from './ListLayout.styles'; diff --git a/frontend/src/pages/MyPage/MyPageContent/MyPageContent.tsx b/frontend/src/components/MyPage/MyPageContent/MyPageContent.tsx similarity index 93% rename from frontend/src/pages/MyPage/MyPageContent/MyPageContent.tsx rename to frontend/src/components/MyPage/MyPageContent/MyPageContent.tsx index 8753a2d83..64518499a 100644 --- a/frontend/src/pages/MyPage/MyPageContent/MyPageContent.tsx +++ b/frontend/src/components/MyPage/MyPageContent/MyPageContent.tsx @@ -1,9 +1,9 @@ import { useState } from 'react'; import { CurrentTabType } from '@/pages/MyPage/MyPage.type'; -import ListLayout from '@/pages/MyPage/MyPageContent/ListLayout/ListLayout'; -import MyPageTab from '@/pages/MyPage/MyPageTab/MyPageTab'; +import ListLayout from '@/components/MyPage/ListLayout/ListLayout'; +import MyPageTab from '@/components/MyPage/MyPageTab/MyPageTab'; import PairRoomButton from '@/components/MyPage/PairRoomButton/PairRoomButton'; import RetrospectButton from '@/components/MyPage/PairRoomButton/RetrospectButton'; diff --git a/frontend/src/pages/MyPage/MyPageTab/MyPageTab.styles.ts b/frontend/src/components/MyPage/MyPageTab/MyPageTab.styles.ts similarity index 100% rename from frontend/src/pages/MyPage/MyPageTab/MyPageTab.styles.ts rename to frontend/src/components/MyPage/MyPageTab/MyPageTab.styles.ts diff --git a/frontend/src/pages/MyPage/MyPageTab/MyPageTab.tsx b/frontend/src/components/MyPage/MyPageTab/MyPageTab.tsx similarity index 100% rename from frontend/src/pages/MyPage/MyPageTab/MyPageTab.tsx rename to frontend/src/components/MyPage/MyPageTab/MyPageTab.tsx diff --git a/frontend/src/components/MyPage/PairRoomButton/PairRoomButton.tsx b/frontend/src/components/MyPage/PairRoomButton/PairRoomButton.tsx index e40a560b5..cd4a7855e 100644 --- a/frontend/src/components/MyPage/PairRoomButton/PairRoomButton.tsx +++ b/frontend/src/components/MyPage/PairRoomButton/PairRoomButton.tsx @@ -1,11 +1,11 @@ import { IoIosArrowForward } from 'react-icons/io'; -import ConfirmModal from '@/components/common/ConfirmModal/ConfirmModal'; -import Spinner from '@/components/common/Spinner/Spinner'; +import ConfirmModal from '@/components/_common/ConfirmModal/ConfirmModal'; +import Spinner from '@/components/_common/Spinner/Spinner'; import type { PairRoomStatus } from '@/apis/pairRoom'; -import useModal from '@/hooks/common/useModal'; +import useModal from '@/hooks/_common/useModal'; import useDeletePairRoom from '@/queries/MyPage/useDeleteRoom'; diff --git a/frontend/src/components/MyPage/PairRoomButton/RetrospectButton.tsx b/frontend/src/components/MyPage/PairRoomButton/RetrospectButton.tsx index a04ba591c..47503309c 100644 --- a/frontend/src/components/MyPage/PairRoomButton/RetrospectButton.tsx +++ b/frontend/src/components/MyPage/PairRoomButton/RetrospectButton.tsx @@ -1,9 +1,9 @@ import { IoIosArrowForward } from 'react-icons/io'; -import ConfirmModal from '@/components/common/ConfirmModal/ConfirmModal'; -import Spinner from '@/components/common/Spinner/Spinner'; +import ConfirmModal from '@/components/_common/ConfirmModal/ConfirmModal'; +import Spinner from '@/components/_common/Spinner/Spinner'; -import useModal from '@/hooks/common/useModal'; +import useModal from '@/hooks/_common/useModal'; import { useDeleteRetrospect } from '@/queries/Retrospect/useDeleteRetrospect'; diff --git a/frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.styles.ts b/frontend/src/components/PairRoom/CategoryManagementModal/CategoryItem/CategoryItem.styles.ts similarity index 100% rename from frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.styles.ts rename to frontend/src/components/PairRoom/CategoryManagementModal/CategoryItem/CategoryItem.styles.ts diff --git a/frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.tsx b/frontend/src/components/PairRoom/CategoryManagementModal/CategoryItem/CategoryItem.tsx similarity index 94% rename from frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.tsx rename to frontend/src/components/PairRoom/CategoryManagementModal/CategoryItem/CategoryItem.tsx index 9d56469ac..c88e03ed7 100644 --- a/frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem.tsx +++ b/frontend/src/components/PairRoom/CategoryManagementModal/CategoryItem/CategoryItem.tsx @@ -1,7 +1,7 @@ import { CheckBoxChecked, CheckBoxUnchecked } from '@/assets'; -import Input from '@/components/common/Input/Input'; -import IconButton from '@/components/PairRoom/ReferenceCard/CategoryManagementModal/IconButton/IconButton'; +import Input from '@/components/_common/Input/Input'; +import IconButton from '@/components/PairRoom/CategoryManagementModal/IconButton/IconButton'; import useToastStore from '@/stores/toastStore'; diff --git a/frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.styles.ts b/frontend/src/components/PairRoom/CategoryManagementModal/CategoryManagementModal.styles.ts similarity index 100% rename from frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.styles.ts rename to frontend/src/components/PairRoom/CategoryManagementModal/CategoryManagementModal.styles.ts diff --git a/frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.tsx b/frontend/src/components/PairRoom/CategoryManagementModal/CategoryManagementModal.tsx similarity index 89% rename from frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.tsx rename to frontend/src/components/PairRoom/CategoryManagementModal/CategoryManagementModal.tsx index 3d696fc30..1ddba8be6 100644 --- a/frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal.tsx +++ b/frontend/src/components/PairRoom/CategoryManagementModal/CategoryManagementModal.tsx @@ -1,12 +1,12 @@ import { LuPlus } from 'react-icons/lu'; -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; -import { Modal } from '@/components/common/Modal'; -import CategoryItem from '@/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryItem/CategoryItem'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; +import { Modal } from '@/components/_common/Modal'; +import CategoryItem from '@/components/PairRoom/CategoryManagementModal/CategoryItem/CategoryItem'; import { Category } from '@/components/PairRoom/ReferenceCard/ReferenceCard.type'; -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; import { useAddCategory } from '@/queries/PairRoom/category/mutation'; diff --git a/frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/IconButton/IconButton.styles.ts b/frontend/src/components/PairRoom/CategoryManagementModal/IconButton/IconButton.styles.ts similarity index 100% rename from frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/IconButton/IconButton.styles.ts rename to frontend/src/components/PairRoom/CategoryManagementModal/IconButton/IconButton.styles.ts diff --git a/frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/IconButton/IconButton.tsx b/frontend/src/components/PairRoom/CategoryManagementModal/IconButton/IconButton.tsx similarity index 100% rename from frontend/src/components/PairRoom/ReferenceCard/CategoryManagementModal/IconButton/IconButton.tsx rename to frontend/src/components/PairRoom/CategoryManagementModal/IconButton/IconButton.tsx diff --git a/frontend/src/components/PairRoom/GuideModal/GuideModal.tsx b/frontend/src/components/PairRoom/GuideModal/GuideModal.tsx index 2a70c9fef..0ce93061d 100644 --- a/frontend/src/components/PairRoom/GuideModal/GuideModal.tsx +++ b/frontend/src/components/PairRoom/GuideModal/GuideModal.tsx @@ -4,12 +4,12 @@ import { FaCheck } from 'react-icons/fa6'; import { AlarmSound } from '@/assets'; -import Button from '@/components/common/Button/Button'; -import { Modal } from '@/components/common/Modal'; +import Button from '@/components/_common/Button/Button'; +import { Modal } from '@/components/_common/Modal'; import useToastStore from '@/stores/toastStore'; -import useCopyClipBoard from '@/hooks/common/useCopyClipboard'; +import useCopyClipBoard from '@/hooks/_common/useCopyClipboard'; import * as S from './GuideModal.styles'; diff --git a/frontend/src/components/PairRoom/PairListCard/AccessCodeSection/AccessCodeSection.tsx b/frontend/src/components/PairRoom/PairListCard/AccessCodeSection/AccessCodeSection.tsx index cb2a79e20..0def03a1b 100644 --- a/frontend/src/components/PairRoom/PairListCard/AccessCodeSection/AccessCodeSection.tsx +++ b/frontend/src/components/PairRoom/PairListCard/AccessCodeSection/AccessCodeSection.tsx @@ -1,6 +1,6 @@ import { FaRegPaste } from 'react-icons/fa6'; -import useCopyClipBoard from '@/hooks/common/useCopyClipboard'; +import useCopyClipBoard from '@/hooks/_common/useCopyClipboard'; import * as S from './AccessCodeSection.styles'; diff --git a/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.styles.ts b/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.styles.ts index e2a0139ce..9027d1445 100644 --- a/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.styles.ts +++ b/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.styles.ts @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import Tooltip from '@/components/common/Tooltip/Tooltip'; +import Tooltip from '@/components/_common/Tooltip/Tooltip'; export const Layout = styled.button<{ disabled: boolean }>` display: flex; diff --git a/frontend/src/components/PairRoom/PairListCard/Header/Header.tsx b/frontend/src/components/PairRoom/PairListCard/Header/Header.tsx index 104fb180c..10193e0b3 100644 --- a/frontend/src/components/PairRoom/PairListCard/Header/Header.tsx +++ b/frontend/src/components/PairRoom/PairListCard/Header/Header.tsx @@ -1,6 +1,6 @@ import { IoPeople } from 'react-icons/io5'; -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import { theme } from '@/styles/theme'; diff --git a/frontend/src/components/PairRoom/PairListCard/PairListCard.tsx b/frontend/src/components/PairRoom/PairListCard/PairListCard.tsx index 83f9e8217..760f15aaa 100644 --- a/frontend/src/components/PairRoom/PairListCard/PairListCard.tsx +++ b/frontend/src/components/PairRoom/PairListCard/PairListCard.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import ConfirmModal from '@/components/common/ConfirmModal/ConfirmModal'; +import ConfirmModal from '@/components/_common/ConfirmModal/ConfirmModal'; import AccessCodeSection from '@/components/PairRoom/PairListCard/AccessCodeSection/AccessCodeSection'; import CompleteRoomButton from '@/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton'; import Header from '@/components/PairRoom/PairListCard/Header/Header'; @@ -8,7 +8,7 @@ import PairListSection from '@/components/PairRoom/PairListCard/PairListSection/ import RepositorySection from '@/components/PairRoom/PairListCard/RepositorySection/RepositorySection'; import { PairRoomCard } from '@/components/PairRoom/PairRoomCard'; -import useModal from '@/hooks/common/useModal'; +import useModal from '@/hooks/_common/useModal'; import useCompletePairRoom from '@/queries/PairRoom/useCompletePairRoom'; diff --git a/frontend/src/components/PairRoom/PairRoleCard/PairRoleCard.tsx b/frontend/src/components/PairRoom/PairRoleCard/PairRoleCard.tsx index cf3fdf3d4..ebfd1d5c5 100644 --- a/frontend/src/components/PairRoom/PairRoleCard/PairRoleCard.tsx +++ b/frontend/src/components/PairRoom/PairRoleCard/PairRoleCard.tsx @@ -1,4 +1,4 @@ -import Tooltip from '@/components/common/Tooltip/Tooltip'; +import Tooltip from '@/components/_common/Tooltip/Tooltip'; import { PairRoomCard } from '@/components/PairRoom/PairRoomCard'; import * as S from './PairRoleCard.styles'; diff --git a/frontend/src/components/PairRoom/ReferenceCard/AddReferenceForm/AddReferenceForm.tsx b/frontend/src/components/PairRoom/ReferenceCard/AddReferenceForm/AddReferenceForm.tsx index e97076a90..c02fca87c 100644 --- a/frontend/src/components/PairRoom/ReferenceCard/AddReferenceForm/AddReferenceForm.tsx +++ b/frontend/src/components/PairRoom/ReferenceCard/AddReferenceForm/AddReferenceForm.tsx @@ -1,11 +1,11 @@ import { LuPlus } from 'react-icons/lu'; -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; import CategoryDropdown from '@/components/PairRoom/ReferenceCard/CategoryDropdown/CategoryDropdown'; import { Category } from '@/components/PairRoom/ReferenceCard/ReferenceCard.type'; -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; import useReference from '@/hooks/PairRoom/useReference'; import * as S from './AddReferenceForm.styles'; diff --git a/frontend/src/components/PairRoom/ReferenceCard/CategoryDropdown/CategoryDropdown.tsx b/frontend/src/components/PairRoom/ReferenceCard/CategoryDropdown/CategoryDropdown.tsx index b66f7a1d0..59e4baa8f 100644 --- a/frontend/src/components/PairRoom/ReferenceCard/CategoryDropdown/CategoryDropdown.tsx +++ b/frontend/src/components/PairRoom/ReferenceCard/CategoryDropdown/CategoryDropdown.tsx @@ -1,11 +1,11 @@ /* eslint-disable jsx-a11y/no-autofocus */ -import Dropdown from '@/components/common/Dropdown/Dropdown/Dropdown'; -import Input from '@/components/common/Input/Input'; +import Dropdown from '@/components/_common/Dropdown/Dropdown/Dropdown'; +import Input from '@/components/_common/Input/Input'; import { Category } from '@/components/PairRoom/ReferenceCard/ReferenceCard.type'; import useToastStore from '@/stores/toastStore'; -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; import { DEFAULT_CATEGORY_VALUE } from '@/hooks/PairRoom/useCategories'; import { useAddCategory } from '@/queries/PairRoom/category/mutation'; diff --git a/frontend/src/components/PairRoom/ReferenceCard/Header/Header.tsx b/frontend/src/components/PairRoom/ReferenceCard/Header/Header.tsx index 0e256cfc5..458395454 100644 --- a/frontend/src/components/PairRoom/ReferenceCard/Header/Header.tsx +++ b/frontend/src/components/PairRoom/ReferenceCard/Header/Header.tsx @@ -1,7 +1,7 @@ import { IoIosLink, IoIosArrowUp } from 'react-icons/io'; -import Button from '@/components/common/Button/Button'; -import ToolTipQuestionBox from '@/components/common/ToolTipQuestionBox/ToolTipQuestionBox'; +import Button from '@/components/_common/Button/Button'; +import ToolTipQuestionBox from '@/components/_common/ToolTipQuestionBox/ToolTipQuestionBox'; import { theme } from '@/styles/theme'; diff --git a/frontend/src/components/PairRoom/ReferenceCard/ReferenceCard.tsx b/frontend/src/components/PairRoom/ReferenceCard/ReferenceCard.tsx index 3fcfe7e63..4268526c2 100644 --- a/frontend/src/components/PairRoom/ReferenceCard/ReferenceCard.tsx +++ b/frontend/src/components/PairRoom/ReferenceCard/ReferenceCard.tsx @@ -1,12 +1,12 @@ import { useState } from 'react'; +import CategoryManagementModal from '@/components/PairRoom/CategoryManagementModal/CategoryManagementModal'; import { PairRoomCard } from '@/components/PairRoom/PairRoomCard'; import AddReferenceForm from '@/components/PairRoom/ReferenceCard/AddReferenceForm/AddReferenceForm'; -import CategoryManagementModal from '@/components/PairRoom/ReferenceCard/CategoryManagementModal/CategoryManagementModal'; import Header from '@/components/PairRoom/ReferenceCard/Header/Header'; import ReferenceList from '@/components/PairRoom/ReferenceCard/ReferenceList/ReferenceList'; -import useModal from '@/hooks/common/useModal'; +import useModal from '@/hooks/_common/useModal'; import useCategories, { DEFAULT_CATEGORY_ID, DEFAULT_CATEGORY_VALUE } from '@/hooks/PairRoom/useCategories'; import { useGetReference } from '@/queries/PairRoom/reference/query'; diff --git a/frontend/src/components/PairRoom/TimerCard/TimerCard.tsx b/frontend/src/components/PairRoom/TimerCard/TimerCard.tsx index 3aeba1ddb..a7fce05b4 100644 --- a/frontend/src/components/PairRoom/TimerCard/TimerCard.tsx +++ b/frontend/src/components/PairRoom/TimerCard/TimerCard.tsx @@ -3,10 +3,10 @@ import { useRef } from 'react'; import { PairRoomCard } from '@/components/PairRoom/PairRoomCard'; import TimerEditPanel from '@/components/PairRoom/TimerCard/TimerEditPanel/TimerEditPanel'; -import useTitleTime from '@/hooks/common/useTitleTime'; import useTimer from '@/hooks/PairRoom/useTimer'; +import useTitleTime from '@/hooks/PairRoom/useTitleTime'; -import { formatTime } from '@/utils/Timer/formatTime'; +import { formatTime } from '@/utils/formatTime'; import * as S from './TimerCard.styles'; diff --git a/frontend/src/components/PairRoom/TimerCard/TimerEditPanel/TimerEditPanel.tsx b/frontend/src/components/PairRoom/TimerCard/TimerEditPanel/TimerEditPanel.tsx index c94cbb80b..5adb06c6a 100644 --- a/frontend/src/components/PairRoom/TimerCard/TimerEditPanel/TimerEditPanel.tsx +++ b/frontend/src/components/PairRoom/TimerCard/TimerEditPanel/TimerEditPanel.tsx @@ -1,14 +1,14 @@ import { useRef } from 'react'; import { useParams } from 'react-router-dom'; -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; import useToastStore from '@/stores/toastStore'; -import useClickOutside from '@/hooks/common/useClickOutside'; -import useInput from '@/hooks/common/useInput'; -import useModal from '@/hooks/common/useModal'; +import useClickOutside from '@/hooks/_common/customEvent/useClickOutside'; +import useInput from '@/hooks/_common/useInput'; +import useModal from '@/hooks/_common/useModal'; import useUpdateDuration from '@/queries/PairRoom/useUpdateDuration'; diff --git a/frontend/src/components/PairRoom/TodoListCard/Header/Header.tsx b/frontend/src/components/PairRoom/TodoListCard/Header/Header.tsx index de044c8dd..332ea9335 100644 --- a/frontend/src/components/PairRoom/TodoListCard/Header/Header.tsx +++ b/frontend/src/components/PairRoom/TodoListCard/Header/Header.tsx @@ -1,6 +1,6 @@ import { IoIosCheckbox, IoIosArrowDown } from 'react-icons/io'; -import ToolTipQuestionBox from '@/components/common/ToolTipQuestionBox/ToolTipQuestionBox'; +import ToolTipQuestionBox from '@/components/_common/ToolTipQuestionBox/ToolTipQuestionBox'; import { theme } from '@/styles/theme'; diff --git a/frontend/src/components/PairRoom/TodoListCard/TodoItem/TodoItem.tsx b/frontend/src/components/PairRoom/TodoListCard/TodoItem/TodoItem.tsx index 03e6f98b5..a38e7c904 100644 --- a/frontend/src/components/PairRoom/TodoListCard/TodoItem/TodoItem.tsx +++ b/frontend/src/components/PairRoom/TodoListCard/TodoItem/TodoItem.tsx @@ -1,11 +1,11 @@ import { useState } from 'react'; import { useParams } from 'react-router-dom'; -import CheckBox from '@/components/common/CheckBox/CheckBox'; +import CheckBox from '@/components/_common/CheckBox/CheckBox'; import { Todo } from '@/apis/todo'; -import useCopyClipBoard from '@/hooks/common/useCopyClipboard'; +import useCopyClipBoard from '@/hooks/_common/useCopyClipboard'; import useTodos from '@/queries/PairRoom/useTodos'; diff --git a/frontend/src/components/PairRoom/TodoListCard/TodoList/TodoList.tsx b/frontend/src/components/PairRoom/TodoListCard/TodoList/TodoList.tsx index 52902dcdb..4fb200224 100644 --- a/frontend/src/components/PairRoom/TodoListCard/TodoList/TodoList.tsx +++ b/frontend/src/components/PairRoom/TodoListCard/TodoList/TodoList.tsx @@ -2,7 +2,7 @@ import { useParams } from 'react-router-dom'; import TodoItem from '@/components/PairRoom/TodoListCard/TodoItem/TodoItem'; -import useDragAndDrop from '@/hooks/common/useDragAndDrop'; +import useDragAndDrop from '@/hooks/PairRoom/useDragAndDrop'; import useTodos from '@/queries/PairRoom/useTodos'; diff --git a/frontend/src/components/PairRoom/TodoListCard/TodoListCard.tsx b/frontend/src/components/PairRoom/TodoListCard/TodoListCard.tsx index 3d5c0403d..f2180c1d0 100644 --- a/frontend/src/components/PairRoom/TodoListCard/TodoListCard.tsx +++ b/frontend/src/components/PairRoom/TodoListCard/TodoListCard.tsx @@ -2,13 +2,13 @@ import { useParams } from 'react-router-dom'; import { LuPlus } from 'react-icons/lu'; -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; import { PairRoomCard } from '@/components/PairRoom/PairRoomCard'; import Header from '@/components/PairRoom/TodoListCard/Header/Header'; import TodoList from '@/components/PairRoom/TodoListCard/TodoList/TodoList'; -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; import useTodos from '@/queries/PairRoom/useTodos'; diff --git a/frontend/src/components/PairRoomOnboarding/AddPairModal/AddPairModal.tsx b/frontend/src/components/PairRoomOnboarding/AddPairModal/AddPairModal.tsx index ee804b7bc..1987a8e71 100644 --- a/frontend/src/components/PairRoomOnboarding/AddPairModal/AddPairModal.tsx +++ b/frontend/src/components/PairRoomOnboarding/AddPairModal/AddPairModal.tsx @@ -1,12 +1,12 @@ -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; -import { Modal } from '@/components/common/Modal'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; +import { Modal } from '@/components/_common/Modal'; import useToastStore from '@/stores/toastStore'; import { getMemberName } from '@/apis/member'; -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; import { validatePairInfo } from '@/validations/validatePairName'; diff --git a/frontend/src/components/PairRoomOnboarding/CreateBranchInput/CreateBranchInput.tsx b/frontend/src/components/PairRoomOnboarding/CreateBranchInput/CreateBranchInput.tsx index fb2f2ed92..e3512f952 100644 --- a/frontend/src/components/PairRoomOnboarding/CreateBranchInput/CreateBranchInput.tsx +++ b/frontend/src/components/PairRoomOnboarding/CreateBranchInput/CreateBranchInput.tsx @@ -1,8 +1,8 @@ /* eslint-disable jsx-a11y/no-autofocus */ import { GithubLogoWhite } from '@/assets'; -import Input from '@/components/common/Input/Input'; -import { InputType } from '@/components/common/Input/Input.type'; +import Input from '@/components/_common/Input/Input'; +import { InputType } from '@/components/_common/Input/Input.type'; import useGetBranches from '@/queries/PairRoomOnboarding/useGetBranches'; diff --git a/frontend/src/components/PairRoomOnboarding/MissionSelectInput/MissionSelectInput.tsx b/frontend/src/components/PairRoomOnboarding/MissionSelectInput/MissionSelectInput.tsx index 53c1ed99c..9255b4cee 100644 --- a/frontend/src/components/PairRoomOnboarding/MissionSelectInput/MissionSelectInput.tsx +++ b/frontend/src/components/PairRoomOnboarding/MissionSelectInput/MissionSelectInput.tsx @@ -1,4 +1,4 @@ -import Spinner from '@/components/common/Spinner/Spinner'; +import Spinner from '@/components/_common/Spinner/Spinner'; import InformationBox from '@/components/PairRoomOnboarding/InformationBox/InformationBox'; import RepositoryButton from '@/components/PairRoomOnboarding/RepositoryButton/RepositoryButton'; diff --git a/frontend/src/components/PairRoomOnboarding/MissionSettingSection/MissionSettingSection.tsx b/frontend/src/components/PairRoomOnboarding/MissionSettingSection/MissionSettingSection.tsx index 2074b9d61..2b7062f03 100644 --- a/frontend/src/components/PairRoomOnboarding/MissionSettingSection/MissionSettingSection.tsx +++ b/frontend/src/components/PairRoomOnboarding/MissionSettingSection/MissionSettingSection.tsx @@ -1,8 +1,8 @@ -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import CreateBranchInput from '@/components/PairRoomOnboarding/CreateBranchInput/CreateBranchInput'; import MissionSelectInput from '@/components/PairRoomOnboarding/MissionSelectInput/MissionSelectInput'; -import useDebounce from '@/hooks/common/useDebounce'; +import useDebounce from '@/hooks/_common/useDebounce'; import useAutoMoveIndex from '@/hooks/PairRoomOnboarding/useAutoMoveIndex'; import useMissionBranch from '@/hooks/PairRoomOnboarding/useMissionBranch'; diff --git a/frontend/src/components/PairRoomOnboarding/PairNameInput/PairNameInput.tsx b/frontend/src/components/PairRoomOnboarding/PairNameInput/PairNameInput.tsx index a0fb95c2f..5ee5579ac 100644 --- a/frontend/src/components/PairRoomOnboarding/PairNameInput/PairNameInput.tsx +++ b/frontend/src/components/PairRoomOnboarding/PairNameInput/PairNameInput.tsx @@ -3,9 +3,9 @@ import { useState, useEffect } from 'react'; import { LogoIcon } from '@/assets'; -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; -import { InputType } from '@/components/common/Input/Input.type'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; +import { InputType } from '@/components/_common/Input/Input.type'; import * as S from './PairNameInput.styles'; diff --git a/frontend/src/components/PairRoomOnboarding/PairRoleInput/PairRoleInput.tsx b/frontend/src/components/PairRoomOnboarding/PairRoleInput/PairRoleInput.tsx index 74ffeab83..e4c4e343b 100644 --- a/frontend/src/components/PairRoomOnboarding/PairRoleInput/PairRoleInput.tsx +++ b/frontend/src/components/PairRoomOnboarding/PairRoleInput/PairRoleInput.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; -import Dropdown from '@/components/common/Dropdown/Dropdown/Dropdown'; -import HiddenMessage from '@/components/common/HiddenMessage/HiddenMessage'; +import Dropdown from '@/components/_common/Dropdown/Dropdown/Dropdown'; +import HiddenMessage from '@/components/_common/HiddenMessage/HiddenMessage'; import InformationBox from '@/components/PairRoomOnboarding/InformationBox/InformationBox'; import type { Role } from '@/hooks/PairRoomOnboarding/usePairRoomInformation'; diff --git a/frontend/src/components/PairRoomOnboarding/PairRoomSettingSection/PairRoomSettingSection.tsx b/frontend/src/components/PairRoomOnboarding/PairRoomSettingSection/PairRoomSettingSection.tsx index 720f0960f..2fd11fe76 100644 --- a/frontend/src/components/PairRoomOnboarding/PairRoomSettingSection/PairRoomSettingSection.tsx +++ b/frontend/src/components/PairRoomOnboarding/PairRoomSettingSection/PairRoomSettingSection.tsx @@ -1,11 +1,11 @@ -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import AddPairModal from '@/components/PairRoomOnboarding/AddPairModal/AddPairModal'; import PairNameInput from '@/components/PairRoomOnboarding/PairNameInput/PairNameInput'; import PairRoleInput from '@/components/PairRoomOnboarding/PairRoleInput/PairRoleInput'; import TimerDurationInput from '@/components/PairRoomOnboarding/TimerDurationInput/TimerDurationInput'; -import useDebounce from '@/hooks/common/useDebounce'; -import useModal from '@/hooks/common/useModal'; +import useDebounce from '@/hooks/_common/useDebounce'; +import useModal from '@/hooks/_common/useModal'; import useAutoMoveIndex from '@/hooks/PairRoomOnboarding/useAutoMoveIndex'; import usePairRoomInformation from '@/hooks/PairRoomOnboarding/usePairRoomInformation'; diff --git a/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.stories.tsx b/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.stories.tsx deleted file mode 100644 index 4374a54da..000000000 --- a/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.stories.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import type { Meta, StoryObj } from '@storybook/react'; - -import ProgressBar from './ProgressBar'; - -const meta = { - title: 'component/PairRoomOnboarding/ProgressBar', - component: ProgressBar, -} satisfies Meta; - -export default meta; - -type Story = StoryObj; - -export const Default: Story = { - args: { - step: 'ROLE', - }, -}; diff --git a/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.styles.ts b/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.styles.ts deleted file mode 100644 index e09bc303b..000000000 --- a/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.styles.ts +++ /dev/null @@ -1,51 +0,0 @@ -import styled from 'styled-components'; - -export const Layout = styled.div` - display: flex; - justify-content: center; - align-items: center; - - button { - width: 3rem; - height: 3rem; - - cursor: default; - - &:hover { - background-color: ${({ theme }) => theme.color.primary[500]}; - } - - &:active { - background-color: ${({ theme }) => theme.color.primary[500]}; - } - } -`; - -export const ButtonContainer = styled.div` - display: flex; - justify-content: center; - align-items: center; -`; - -export const ButtonWrapper = styled.div` - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - gap: 1.4rem; -`; - -export const ButtonLabel = styled.p` - min-width: 5rem; - - color: ${({ theme }) => theme.color.primary[800]}; - font-size: 1.4rem; - font-weight: ${({ theme }) => theme.fontWeight.light}; - text-align: center; -`; - -export const ProgressLine = styled.div` - width: 20rem; - height: 3.5rem; - border-top: 0.15rem dashed ${({ theme }) => theme.color.primary[500]}; -`; diff --git a/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.tsx b/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.tsx deleted file mode 100644 index db132d6b0..000000000 --- a/frontend/src/components/PairRoomOnboarding/ProgressBar/ProgressBar.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import Button from '@/components/common/Button/Button'; - -import * as S from './ProgressBar.styles'; - -interface ProgressBarProps { - step: string; -} - -const OPTIONS = [ - { id: '1', label: '' }, - { id: '1', label: '' }, -]; -//TODO: 추후에 제거 혹은 리팩토링 - -const ProgressBar = ({ step }: ProgressBarProps) => ( - - {OPTIONS.map((option, idx) => ( - - - - {option.label} - - {idx === 0 && } - - ))} - -); - -export default ProgressBar; diff --git a/frontend/src/components/PairRoomOnboarding/RepositoryButton/RepositoryButton.tsx b/frontend/src/components/PairRoomOnboarding/RepositoryButton/RepositoryButton.tsx index 5d923d882..23846c1e8 100644 --- a/frontend/src/components/PairRoomOnboarding/RepositoryButton/RepositoryButton.tsx +++ b/frontend/src/components/PairRoomOnboarding/RepositoryButton/RepositoryButton.tsx @@ -2,7 +2,7 @@ import { IoIosArrowForward } from 'react-icons/io'; import { GithubLogoWhite } from '@/assets'; -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import * as S from './RepositoryButton.styles'; diff --git a/frontend/src/components/PairRoomOnboarding/TimerDurationInput/TimerDurationInput.tsx b/frontend/src/components/PairRoomOnboarding/TimerDurationInput/TimerDurationInput.tsx index 2a0a96f31..841a44e56 100644 --- a/frontend/src/components/PairRoomOnboarding/TimerDurationInput/TimerDurationInput.tsx +++ b/frontend/src/components/PairRoomOnboarding/TimerDurationInput/TimerDurationInput.tsx @@ -1,8 +1,8 @@ /* eslint-disable jsx-a11y/no-autofocus */ import { useState } from 'react'; -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; import InformationBox from '@/components/PairRoomOnboarding/InformationBox/InformationBox'; import { validateTimerDuration } from '@/validations/validateTimerDuration'; diff --git a/frontend/src/components/Retrospect/Header/Header.tsx b/frontend/src/components/Retrospect/Header/Header.tsx index 7e65bbb19..590d6c6e9 100644 --- a/frontend/src/components/Retrospect/Header/Header.tsx +++ b/frontend/src/components/Retrospect/Header/Header.tsx @@ -1,4 +1,4 @@ -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import * as S from './Header.styles'; diff --git a/frontend/src/components/common/Button/Button.stories.tsx b/frontend/src/components/_common/Button/Button.stories.tsx similarity index 92% rename from frontend/src/components/common/Button/Button.stories.tsx rename to frontend/src/components/_common/Button/Button.stories.tsx index c52425faa..246cf9748 100644 --- a/frontend/src/components/common/Button/Button.stories.tsx +++ b/frontend/src/components/_common/Button/Button.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import { css } from 'styled-components'; -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; const meta = { title: 'component/common/Button', diff --git a/frontend/src/components/common/Button/Button.styles.ts b/frontend/src/components/_common/Button/Button.styles.ts similarity index 96% rename from frontend/src/components/common/Button/Button.styles.ts rename to frontend/src/components/_common/Button/Button.styles.ts index b2ca648ae..7cf5c41ce 100644 --- a/frontend/src/components/common/Button/Button.styles.ts +++ b/frontend/src/components/_common/Button/Button.styles.ts @@ -1,6 +1,6 @@ import styled, { css } from 'styled-components'; -import type { ButtonColor, ButtonSize } from '@/components/common/Button/Button.type'; +import type { ButtonColor, ButtonSize } from '@/components/_common/Button/Button.type'; interface ButtonStyleProp { $color: ButtonColor; diff --git a/frontend/src/components/common/Button/Button.tsx b/frontend/src/components/_common/Button/Button.tsx similarity index 84% rename from frontend/src/components/common/Button/Button.tsx rename to frontend/src/components/_common/Button/Button.tsx index 1d165f94c..c675aaeed 100644 --- a/frontend/src/components/common/Button/Button.tsx +++ b/frontend/src/components/_common/Button/Button.tsx @@ -2,8 +2,8 @@ import { ButtonHTMLAttributes } from 'react'; import { css } from 'styled-components'; -import * as S from '@/components/common/Button/Button.styles'; -import type { ButtonColor, ButtonSize } from '@/components/common/Button/Button.type'; +import * as S from '@/components/_common/Button/Button.styles'; +import type { ButtonColor, ButtonSize } from '@/components/_common/Button/Button.type'; interface ButtonProp extends ButtonHTMLAttributes { $css?: ReturnType; diff --git a/frontend/src/components/common/Button/Button.type.ts b/frontend/src/components/_common/Button/Button.type.ts similarity index 100% rename from frontend/src/components/common/Button/Button.type.ts rename to frontend/src/components/_common/Button/Button.type.ts diff --git a/frontend/src/components/common/CheckBox/CheckBox.styles.ts b/frontend/src/components/_common/CheckBox/CheckBox.styles.ts similarity index 100% rename from frontend/src/components/common/CheckBox/CheckBox.styles.ts rename to frontend/src/components/_common/CheckBox/CheckBox.styles.ts diff --git a/frontend/src/components/common/CheckBox/CheckBox.tsx b/frontend/src/components/_common/CheckBox/CheckBox.tsx similarity index 100% rename from frontend/src/components/common/CheckBox/CheckBox.tsx rename to frontend/src/components/_common/CheckBox/CheckBox.tsx diff --git a/frontend/src/components/common/ConfirmModal/ConfirmModal.styles.ts b/frontend/src/components/_common/ConfirmModal/ConfirmModal.styles.ts similarity index 100% rename from frontend/src/components/common/ConfirmModal/ConfirmModal.styles.ts rename to frontend/src/components/_common/ConfirmModal/ConfirmModal.styles.ts diff --git a/frontend/src/components/common/ConfirmModal/ConfirmModal.tsx b/frontend/src/components/_common/ConfirmModal/ConfirmModal.tsx similarity index 89% rename from frontend/src/components/common/ConfirmModal/ConfirmModal.tsx rename to frontend/src/components/_common/ConfirmModal/ConfirmModal.tsx index 9f4b1db8d..36d92fac3 100644 --- a/frontend/src/components/common/ConfirmModal/ConfirmModal.tsx +++ b/frontend/src/components/_common/ConfirmModal/ConfirmModal.tsx @@ -1,5 +1,5 @@ -import Button from '@/components/common/Button/Button'; -import { Modal } from '@/components/common/Modal'; +import Button from '@/components/_common/Button/Button'; +import { Modal } from '@/components/_common/Modal'; import * as S from './ConfirmModal.styles'; diff --git a/frontend/src/components/common/Dropdown/Dropdown/Dropdown.stories.tsx b/frontend/src/components/_common/Dropdown/Dropdown/Dropdown.stories.tsx similarity index 86% rename from frontend/src/components/common/Dropdown/Dropdown/Dropdown.stories.tsx rename to frontend/src/components/_common/Dropdown/Dropdown/Dropdown.stories.tsx index d99b29e9c..725718906 100644 --- a/frontend/src/components/common/Dropdown/Dropdown/Dropdown.stories.tsx +++ b/frontend/src/components/_common/Dropdown/Dropdown/Dropdown.stories.tsx @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from '@storybook/react'; -import Dropdown from '@/components/common/Dropdown/Dropdown/Dropdown'; +import Dropdown from '@/components/_common/Dropdown/Dropdown/Dropdown'; const meta = { title: 'component/common/Dropdown', diff --git a/frontend/src/components/common/Dropdown/Dropdown/Dropdown.styles.tsx b/frontend/src/components/_common/Dropdown/Dropdown/Dropdown.styles.tsx similarity index 95% rename from frontend/src/components/common/Dropdown/Dropdown/Dropdown.styles.tsx rename to frontend/src/components/_common/Dropdown/Dropdown/Dropdown.styles.tsx index 3ec607f8e..3a1a2d901 100644 --- a/frontend/src/components/common/Dropdown/Dropdown/Dropdown.styles.tsx +++ b/frontend/src/components/_common/Dropdown/Dropdown/Dropdown.styles.tsx @@ -1,8 +1,8 @@ import { RiArrowDropDownLine } from 'react-icons/ri'; import styled from 'styled-components'; -import Button from '@/components/common/Button/Button'; -import { Direction } from '@/components/common/Dropdown/Dropdown/Dropdown'; +import Button from '@/components/_common/Button/Button'; +import { Direction } from '@/components/_common/Dropdown/Dropdown/Dropdown'; import { Z_INDEX } from '@/constants/style'; diff --git a/frontend/src/components/common/Dropdown/Dropdown/Dropdown.tsx b/frontend/src/components/_common/Dropdown/Dropdown/Dropdown.tsx similarity index 93% rename from frontend/src/components/common/Dropdown/Dropdown/Dropdown.tsx rename to frontend/src/components/_common/Dropdown/Dropdown/Dropdown.tsx index 666a37bba..42c3f4992 100644 --- a/frontend/src/components/common/Dropdown/Dropdown/Dropdown.tsx +++ b/frontend/src/components/_common/Dropdown/Dropdown/Dropdown.tsx @@ -1,9 +1,9 @@ import { useState, useRef } from 'react'; -import * as S from '@/components/common/Dropdown/Dropdown/Dropdown.styles'; -import HiddenDropdown from '@/components/common/Dropdown/HiddenDropdown/HiddenDropdown'; +import * as S from '@/components/_common/Dropdown/Dropdown/Dropdown.styles'; +import HiddenDropdown from '@/components/_common/Dropdown/HiddenDropdown/HiddenDropdown'; -import useClickOutside from '@/hooks/common/useClickOutside'; +import useClickOutside from '@/hooks/_common/customEvent/useClickOutside'; import { theme } from '@/styles/theme'; diff --git a/frontend/src/components/common/Dropdown/HiddenDropdown/HiddenDropdown.tsx b/frontend/src/components/_common/Dropdown/HiddenDropdown/HiddenDropdown.tsx similarity index 93% rename from frontend/src/components/common/Dropdown/HiddenDropdown/HiddenDropdown.tsx rename to frontend/src/components/_common/Dropdown/HiddenDropdown/HiddenDropdown.tsx index 2c9a28396..c81182732 100644 --- a/frontend/src/components/common/Dropdown/HiddenDropdown/HiddenDropdown.tsx +++ b/frontend/src/components/_common/Dropdown/HiddenDropdown/HiddenDropdown.tsx @@ -1,4 +1,4 @@ -import { Option } from '@/components/common/Dropdown/Dropdown/Dropdown'; +import { Option } from '@/components/_common/Dropdown/Dropdown/Dropdown'; interface HiddenDropdownProps extends React.HTMLAttributes { options?: string[]; diff --git a/frontend/src/components/common/Header/Header.stories.tsx b/frontend/src/components/_common/Header/Header.stories.tsx similarity index 91% rename from frontend/src/components/common/Header/Header.stories.tsx rename to frontend/src/components/_common/Header/Header.stories.tsx index 738db9b4a..e410b55a3 100644 --- a/frontend/src/components/common/Header/Header.stories.tsx +++ b/frontend/src/components/_common/Header/Header.stories.tsx @@ -1,7 +1,7 @@ import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport'; import type { Meta, StoryObj } from '@storybook/react'; -import Header from '@/components/common/Header/Header'; +import Header from '@/components/_common/Header/Header'; const meta = { title: 'component/common/Header', diff --git a/frontend/src/components/common/Header/Header.styles.ts b/frontend/src/components/_common/Header/Header.styles.ts similarity index 100% rename from frontend/src/components/common/Header/Header.styles.ts rename to frontend/src/components/_common/Header/Header.styles.ts diff --git a/frontend/src/components/common/Header/Header.tsx b/frontend/src/components/_common/Header/Header.tsx similarity index 91% rename from frontend/src/components/common/Header/Header.tsx rename to frontend/src/components/_common/Header/Header.tsx index c4a6582e7..787ac32ce 100644 --- a/frontend/src/components/common/Header/Header.tsx +++ b/frontend/src/components/_common/Header/Header.tsx @@ -6,8 +6,8 @@ import { LogoIcon } from '@/assets'; import useUserStore from '@/stores/userStore'; -import useSignInHandler from '@/hooks/member/useSignInHandler'; -import useSignOutHandler from '@/hooks/member/useSignOutHandler'; +import useSignInHandler from '@/hooks/_common/member/useSignInHandler'; +import useSignOutHandler from '@/hooks/_common/member/useSignOutHandler'; import { theme } from '@/styles/theme'; diff --git a/frontend/src/components/common/HiddenMessage/HiddenMessage.styles.ts b/frontend/src/components/_common/HiddenMessage/HiddenMessage.styles.ts similarity index 100% rename from frontend/src/components/common/HiddenMessage/HiddenMessage.styles.ts rename to frontend/src/components/_common/HiddenMessage/HiddenMessage.styles.ts diff --git a/frontend/src/components/common/HiddenMessage/HiddenMessage.tsx b/frontend/src/components/_common/HiddenMessage/HiddenMessage.tsx similarity index 100% rename from frontend/src/components/common/HiddenMessage/HiddenMessage.tsx rename to frontend/src/components/_common/HiddenMessage/HiddenMessage.tsx diff --git a/frontend/src/components/common/Input/Input.stories.tsx b/frontend/src/components/_common/Input/Input.stories.tsx similarity index 88% rename from frontend/src/components/common/Input/Input.stories.tsx rename to frontend/src/components/_common/Input/Input.stories.tsx index ed7d49938..3343adc07 100644 --- a/frontend/src/components/common/Input/Input.stories.tsx +++ b/frontend/src/components/_common/Input/Input.stories.tsx @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from '@storybook/react'; -import Input from '@/components/common/Input/Input'; +import Input from '@/components/_common/Input/Input'; const meta = { title: 'component/common/Input', diff --git a/frontend/src/components/common/Input/Input.styles.ts b/frontend/src/components/_common/Input/Input.styles.ts similarity index 96% rename from frontend/src/components/common/Input/Input.styles.ts rename to frontend/src/components/_common/Input/Input.styles.ts index 4451872f3..7f291af83 100644 --- a/frontend/src/components/common/Input/Input.styles.ts +++ b/frontend/src/components/_common/Input/Input.styles.ts @@ -1,6 +1,6 @@ import styled, { css } from 'styled-components'; -import type { InputStatus } from '@/components/common/Input/Input.type'; +import type { InputStatus } from '@/components/_common/Input/Input.type'; const messageStatusStyles = { DEFAULT: css` diff --git a/frontend/src/components/common/Input/Input.tsx b/frontend/src/components/_common/Input/Input.tsx similarity index 89% rename from frontend/src/components/common/Input/Input.tsx rename to frontend/src/components/_common/Input/Input.tsx index 9bd001e39..b2bda2a6c 100644 --- a/frontend/src/components/common/Input/Input.tsx +++ b/frontend/src/components/_common/Input/Input.tsx @@ -2,8 +2,8 @@ import { forwardRef, InputHTMLAttributes } from 'react'; import { css } from 'styled-components'; -import * as S from '@/components/common/Input/Input.styles'; -import type { InputStatus } from '@/components/common/Input/Input.type'; +import * as S from '@/components/_common/Input/Input.styles'; +import type { InputStatus } from '@/components/_common/Input/Input.type'; interface InputProps extends InputHTMLAttributes { label?: string; diff --git a/frontend/src/components/common/Input/Input.type.ts b/frontend/src/components/_common/Input/Input.type.ts similarity index 100% rename from frontend/src/components/common/Input/Input.type.ts rename to frontend/src/components/_common/Input/Input.type.ts diff --git a/frontend/src/components/common/Modal/Body/Body.stories.ts b/frontend/src/components/_common/Modal/Body/Body.stories.ts similarity index 100% rename from frontend/src/components/common/Modal/Body/Body.stories.ts rename to frontend/src/components/_common/Modal/Body/Body.stories.ts diff --git a/frontend/src/components/common/Modal/Body/Body.styles.ts b/frontend/src/components/_common/Modal/Body/Body.styles.ts similarity index 100% rename from frontend/src/components/common/Modal/Body/Body.styles.ts rename to frontend/src/components/_common/Modal/Body/Body.styles.ts diff --git a/frontend/src/components/common/Modal/Body/Body.tsx b/frontend/src/components/_common/Modal/Body/Body.tsx similarity index 100% rename from frontend/src/components/common/Modal/Body/Body.tsx rename to frontend/src/components/_common/Modal/Body/Body.tsx diff --git a/frontend/src/components/common/Modal/CloseButton/CloseButton.stories.ts b/frontend/src/components/_common/Modal/CloseButton/CloseButton.stories.ts similarity index 100% rename from frontend/src/components/common/Modal/CloseButton/CloseButton.stories.ts rename to frontend/src/components/_common/Modal/CloseButton/CloseButton.stories.ts diff --git a/frontend/src/components/common/Modal/CloseButton/CloseButton.styles.ts b/frontend/src/components/_common/Modal/CloseButton/CloseButton.styles.ts similarity index 100% rename from frontend/src/components/common/Modal/CloseButton/CloseButton.styles.ts rename to frontend/src/components/_common/Modal/CloseButton/CloseButton.styles.ts diff --git a/frontend/src/components/common/Modal/CloseButton/CloseButton.tsx b/frontend/src/components/_common/Modal/CloseButton/CloseButton.tsx similarity index 100% rename from frontend/src/components/common/Modal/CloseButton/CloseButton.tsx rename to frontend/src/components/_common/Modal/CloseButton/CloseButton.tsx diff --git a/frontend/src/components/common/Modal/Footer/Footer.stories.tsx b/frontend/src/components/_common/Modal/Footer/Footer.stories.tsx similarity index 92% rename from frontend/src/components/common/Modal/Footer/Footer.stories.tsx rename to frontend/src/components/_common/Modal/Footer/Footer.stories.tsx index 3fb001a6e..9b65bf2b5 100644 --- a/frontend/src/components/common/Modal/Footer/Footer.stories.tsx +++ b/frontend/src/components/_common/Modal/Footer/Footer.stories.tsx @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from '@storybook/react'; -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import Footer from './Footer'; diff --git a/frontend/src/components/common/Modal/Footer/Footer.styles.ts b/frontend/src/components/_common/Modal/Footer/Footer.styles.ts similarity index 86% rename from frontend/src/components/common/Modal/Footer/Footer.styles.ts rename to frontend/src/components/_common/Modal/Footer/Footer.styles.ts index f5ac6d831..5f3db74e6 100644 --- a/frontend/src/components/common/Modal/Footer/Footer.styles.ts +++ b/frontend/src/components/_common/Modal/Footer/Footer.styles.ts @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import { Position, Direction } from '@/components/common/Modal/Footer/Footer'; +import { Position, Direction } from '@/components/_common/Modal/Footer/Footer'; const positionMapper = { LEFT: 'start', diff --git a/frontend/src/components/common/Modal/Footer/Footer.tsx b/frontend/src/components/_common/Modal/Footer/Footer.tsx similarity index 100% rename from frontend/src/components/common/Modal/Footer/Footer.tsx rename to frontend/src/components/_common/Modal/Footer/Footer.tsx diff --git a/frontend/src/components/common/Modal/Header/Header.stories.tsx b/frontend/src/components/_common/Modal/Header/Header.stories.tsx similarity index 100% rename from frontend/src/components/common/Modal/Header/Header.stories.tsx rename to frontend/src/components/_common/Modal/Header/Header.stories.tsx diff --git a/frontend/src/components/common/Modal/Header/Header.styles.ts b/frontend/src/components/_common/Modal/Header/Header.styles.ts similarity index 100% rename from frontend/src/components/common/Modal/Header/Header.styles.ts rename to frontend/src/components/_common/Modal/Header/Header.styles.ts diff --git a/frontend/src/components/common/Modal/Header/Header.tsx b/frontend/src/components/_common/Modal/Header/Header.tsx similarity index 100% rename from frontend/src/components/common/Modal/Header/Header.tsx rename to frontend/src/components/_common/Modal/Header/Header.tsx diff --git a/frontend/src/components/common/Modal/Modal.stories.tsx b/frontend/src/components/_common/Modal/Modal.stories.tsx similarity index 87% rename from frontend/src/components/common/Modal/Modal.stories.tsx rename to frontend/src/components/_common/Modal/Modal.stories.tsx index 6e9ba5d7c..1c6e1d10e 100644 --- a/frontend/src/components/common/Modal/Modal.stories.tsx +++ b/frontend/src/components/_common/Modal/Modal.stories.tsx @@ -1,10 +1,10 @@ import type { Meta, StoryObj } from '@storybook/react'; -import Button from '@/components/common/Button/Button'; -import Body from '@/components/common/Modal/Body/Body'; -import CloseButton from '@/components/common/Modal/CloseButton/CloseButton'; -import Footer from '@/components/common/Modal/Footer/Footer'; -import Header from '@/components/common/Modal/Header/Header'; +import Button from '@/components/_common/Button/Button'; +import Body from '@/components/_common/Modal/Body/Body'; +import CloseButton from '@/components/_common/Modal/CloseButton/CloseButton'; +import Footer from '@/components/_common/Modal/Footer/Footer'; +import Header from '@/components/_common/Modal/Header/Header'; import Modal from './Modal'; diff --git a/frontend/src/components/common/Modal/Modal.styles.ts b/frontend/src/components/_common/Modal/Modal.styles.ts similarity index 100% rename from frontend/src/components/common/Modal/Modal.styles.ts rename to frontend/src/components/_common/Modal/Modal.styles.ts diff --git a/frontend/src/components/common/Modal/Modal.tsx b/frontend/src/components/_common/Modal/Modal.tsx similarity index 80% rename from frontend/src/components/common/Modal/Modal.tsx rename to frontend/src/components/_common/Modal/Modal.tsx index 9ea363053..db6bdd268 100644 --- a/frontend/src/components/common/Modal/Modal.tsx +++ b/frontend/src/components/_common/Modal/Modal.tsx @@ -1,9 +1,9 @@ import { createPortal } from 'react-dom'; -import useAriaTrap from '@/hooks/common/useAriaTrap'; -import useEscapeKey from '@/hooks/common/useEscapeKey'; -import useFocusTrap from '@/hooks/common/useFocusTrap'; -import usePreventScroll from '@/hooks/common/usePreventScroll'; +import useEscapeKey from '@/hooks/_common/customEvent/useEscapeKey'; +import useFocusTrap from '@/hooks/_common/customEvent/useFocusTrap'; +import usePreventScroll from '@/hooks/_common/customEvent/usePreventScroll'; +import useAriaTrap from '@/hooks/_common/useAriaTrap'; import * as S from './Modal.styles'; import type { Position, Size, BackdropType } from './Modal.type'; diff --git a/frontend/src/components/common/Modal/Modal.type.ts b/frontend/src/components/_common/Modal/Modal.type.ts similarity index 100% rename from frontend/src/components/common/Modal/Modal.type.ts rename to frontend/src/components/_common/Modal/Modal.type.ts diff --git a/frontend/src/components/_common/Modal/index.ts b/frontend/src/components/_common/Modal/index.ts new file mode 100644 index 000000000..27880ea81 --- /dev/null +++ b/frontend/src/components/_common/Modal/index.ts @@ -0,0 +1,12 @@ +import Body from '@/components/_common/Modal/Body/Body'; +import CloseButton from '@/components/_common/Modal/CloseButton/CloseButton'; +import Footer from '@/components/_common/Modal/Footer/Footer'; +import Header from '@/components/_common/Modal/Header/Header'; +import Layout from '@/components/_common/Modal/Modal'; + +export const Modal = Object.assign(Layout, { + CloseButton, + Header, + Body, + Footer, +}); diff --git a/frontend/src/components/common/Animation/ScrollAnimationContainer.styles.ts b/frontend/src/components/_common/ScrollAnimationContainer/ScrollAnimationContainer.styles.ts similarity index 100% rename from frontend/src/components/common/Animation/ScrollAnimationContainer.styles.ts rename to frontend/src/components/_common/ScrollAnimationContainer/ScrollAnimationContainer.styles.ts diff --git a/frontend/src/components/common/Animation/ScrollAnimationContainer.tsx b/frontend/src/components/_common/ScrollAnimationContainer/ScrollAnimationContainer.tsx similarity index 96% rename from frontend/src/components/common/Animation/ScrollAnimationContainer.tsx rename to frontend/src/components/_common/ScrollAnimationContainer/ScrollAnimationContainer.tsx index 7394c8be9..6df1ddafd 100644 --- a/frontend/src/components/common/Animation/ScrollAnimationContainer.tsx +++ b/frontend/src/components/_common/ScrollAnimationContainer/ScrollAnimationContainer.tsx @@ -1,4 +1,4 @@ -import { IntersectionObserverOptions, useScrollAnimation } from '@/hooks/common/useScrollAnimation'; +import { IntersectionObserverOptions, useScrollAnimation } from '@/hooks/_common/useScrollAnimation'; import * as S from './ScrollAnimationContainer.styles'; diff --git a/frontend/src/components/common/ScrollIcon/ScrollIcon.styles.ts b/frontend/src/components/_common/ScrollIcon/ScrollIcon.styles.ts similarity index 100% rename from frontend/src/components/common/ScrollIcon/ScrollIcon.styles.ts rename to frontend/src/components/_common/ScrollIcon/ScrollIcon.styles.ts diff --git a/frontend/src/components/common/ScrollIcon/ScrollIcon.tsx b/frontend/src/components/_common/ScrollIcon/ScrollIcon.tsx similarity index 93% rename from frontend/src/components/common/ScrollIcon/ScrollIcon.tsx rename to frontend/src/components/_common/ScrollIcon/ScrollIcon.tsx index 3bd2b38ec..3fd160adb 100644 --- a/frontend/src/components/common/ScrollIcon/ScrollIcon.tsx +++ b/frontend/src/components/_common/ScrollIcon/ScrollIcon.tsx @@ -1,4 +1,4 @@ -import useScrollIcon from '@/hooks/common/useScrollIcon'; +import useScrollIcon from '@/hooks/Landing/useScrollIcon'; import * as S from './ScrollIcon.styles'; diff --git a/frontend/src/components/common/Spinner/Spinner.stories.tsx b/frontend/src/components/_common/Spinner/Spinner.stories.tsx similarity index 100% rename from frontend/src/components/common/Spinner/Spinner.stories.tsx rename to frontend/src/components/_common/Spinner/Spinner.stories.tsx diff --git a/frontend/src/components/common/Spinner/Spinner.styles.ts b/frontend/src/components/_common/Spinner/Spinner.styles.ts similarity index 94% rename from frontend/src/components/common/Spinner/Spinner.styles.ts rename to frontend/src/components/_common/Spinner/Spinner.styles.ts index 9a5f61f65..d0f785541 100644 --- a/frontend/src/components/common/Spinner/Spinner.styles.ts +++ b/frontend/src/components/_common/Spinner/Spinner.styles.ts @@ -1,6 +1,6 @@ import styled, { keyframes } from 'styled-components'; -import { SpinnerColor, SpinnerSize } from '@/components/common/Spinner/Spinner.type'; +import { SpinnerColor, SpinnerSize } from '@/components/_common/Spinner/Spinner.type'; const bounce = keyframes` 0%, diff --git a/frontend/src/components/common/Spinner/Spinner.tsx b/frontend/src/components/_common/Spinner/Spinner.tsx similarity index 82% rename from frontend/src/components/common/Spinner/Spinner.tsx rename to frontend/src/components/_common/Spinner/Spinner.tsx index df2860616..18c3a8f44 100644 --- a/frontend/src/components/common/Spinner/Spinner.tsx +++ b/frontend/src/components/_common/Spinner/Spinner.tsx @@ -1,4 +1,4 @@ -import { SpinnerColor, SpinnerSize } from '@/components/common/Spinner/Spinner.type'; +import { SpinnerColor, SpinnerSize } from '@/components/_common/Spinner/Spinner.type'; import * as S from './Spinner.styles'; diff --git a/frontend/src/components/common/Spinner/Spinner.type.ts b/frontend/src/components/_common/Spinner/Spinner.type.ts similarity index 100% rename from frontend/src/components/common/Spinner/Spinner.type.ts rename to frontend/src/components/_common/Spinner/Spinner.type.ts diff --git a/frontend/src/components/common/Toast/Toast.stories.tsx b/frontend/src/components/_common/Toast/Toast.stories.tsx similarity index 100% rename from frontend/src/components/common/Toast/Toast.stories.tsx rename to frontend/src/components/_common/Toast/Toast.stories.tsx diff --git a/frontend/src/components/common/Toast/Toast.styles.ts b/frontend/src/components/_common/Toast/Toast.styles.ts similarity index 100% rename from frontend/src/components/common/Toast/Toast.styles.ts rename to frontend/src/components/_common/Toast/Toast.styles.ts diff --git a/frontend/src/components/common/Toast/Toast.tsx b/frontend/src/components/_common/Toast/Toast.tsx similarity index 100% rename from frontend/src/components/common/Toast/Toast.tsx rename to frontend/src/components/_common/Toast/Toast.tsx diff --git a/frontend/src/components/common/ToastList/ToastList.styles.ts b/frontend/src/components/_common/ToastList/ToastList.styles.ts similarity index 100% rename from frontend/src/components/common/ToastList/ToastList.styles.ts rename to frontend/src/components/_common/ToastList/ToastList.styles.ts diff --git a/frontend/src/components/common/ToastList/ToastList.tsx b/frontend/src/components/_common/ToastList/ToastList.tsx similarity index 89% rename from frontend/src/components/common/ToastList/ToastList.tsx rename to frontend/src/components/_common/ToastList/ToastList.tsx index a6ad96f15..4ab5e2766 100644 --- a/frontend/src/components/common/ToastList/ToastList.tsx +++ b/frontend/src/components/_common/ToastList/ToastList.tsx @@ -1,6 +1,6 @@ import { createPortal } from 'react-dom'; -import Toast from '@/components/common/Toast/Toast'; +import Toast from '@/components/_common/Toast/Toast'; import useToastStore from '@/stores/toastStore'; diff --git a/frontend/src/components/common/ToolTipQuestionBox/ToolTipQuestionBox.styles.ts b/frontend/src/components/_common/ToolTipQuestionBox/ToolTipQuestionBox.styles.ts similarity index 100% rename from frontend/src/components/common/ToolTipQuestionBox/ToolTipQuestionBox.styles.ts rename to frontend/src/components/_common/ToolTipQuestionBox/ToolTipQuestionBox.styles.ts diff --git a/frontend/src/components/common/ToolTipQuestionBox/ToolTipQuestionBox.tsx b/frontend/src/components/_common/ToolTipQuestionBox/ToolTipQuestionBox.tsx similarity index 81% rename from frontend/src/components/common/ToolTipQuestionBox/ToolTipQuestionBox.tsx rename to frontend/src/components/_common/ToolTipQuestionBox/ToolTipQuestionBox.tsx index 32d787ba0..a150d8c4f 100644 --- a/frontend/src/components/common/ToolTipQuestionBox/ToolTipQuestionBox.tsx +++ b/frontend/src/components/_common/ToolTipQuestionBox/ToolTipQuestionBox.tsx @@ -1,5 +1,5 @@ -import Tooltip from '@/components/common/Tooltip/Tooltip'; -import { Direction } from '@/components/common/Tooltip/Tooltip.type'; +import Tooltip from '@/components/_common/Tooltip/Tooltip'; +import { Direction } from '@/components/_common/Tooltip/Tooltip.type'; import { theme } from '@/styles/theme'; diff --git a/frontend/src/components/common/Tooltip/Tooltip.styles.ts b/frontend/src/components/_common/Tooltip/Tooltip.styles.ts similarity index 97% rename from frontend/src/components/common/Tooltip/Tooltip.styles.ts rename to frontend/src/components/_common/Tooltip/Tooltip.styles.ts index b238a842a..7bf628d76 100644 --- a/frontend/src/components/common/Tooltip/Tooltip.styles.ts +++ b/frontend/src/components/_common/Tooltip/Tooltip.styles.ts @@ -1,6 +1,6 @@ import styled, { css, keyframes } from 'styled-components'; -import { Direction } from '@/components/common/Tooltip/Tooltip.type'; +import { Direction } from '@/components/_common/Tooltip/Tooltip.type'; import { Z_INDEX } from '@/constants/style'; diff --git a/frontend/src/components/common/Tooltip/Tooltip.tsx b/frontend/src/components/_common/Tooltip/Tooltip.tsx similarity index 88% rename from frontend/src/components/common/Tooltip/Tooltip.tsx rename to frontend/src/components/_common/Tooltip/Tooltip.tsx index e4bba4b12..99e590864 100644 --- a/frontend/src/components/common/Tooltip/Tooltip.tsx +++ b/frontend/src/components/_common/Tooltip/Tooltip.tsx @@ -1,4 +1,4 @@ -import { Direction } from '@/components/common/Tooltip/Tooltip.type'; +import { Direction } from '@/components/_common/Tooltip/Tooltip.type'; import { theme } from '@/styles/theme'; diff --git a/frontend/src/components/common/Tooltip/Tooltip.type.ts b/frontend/src/components/_common/Tooltip/Tooltip.type.ts similarity index 100% rename from frontend/src/components/common/Tooltip/Tooltip.type.ts rename to frontend/src/components/_common/Tooltip/Tooltip.type.ts diff --git a/frontend/src/components/common/Modal/index.ts b/frontend/src/components/common/Modal/index.ts deleted file mode 100644 index 9efeeacb4..000000000 --- a/frontend/src/components/common/Modal/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -import Body from '@/components/common/Modal/Body/Body'; -import CloseButton from '@/components/common/Modal/CloseButton/CloseButton'; -import Footer from '@/components/common/Modal/Footer/Footer'; -import Header from '@/components/common/Modal/Header/Header'; -import Layout from '@/components/common/Modal/Modal'; - -export const Modal = Object.assign(Layout, { - CloseButton, - Header, - Body, - Footer, -}); diff --git a/frontend/src/constants/coduoDocs.ts b/frontend/src/constants/coduoDocs.ts index e63de5c91..98792aac4 100644 --- a/frontend/src/constants/coduoDocs.ts +++ b/frontend/src/constants/coduoDocs.ts @@ -1,32 +1,3 @@ -import checkBranchCreated from '@/assets/images/docs/check-branch-created.png'; -import checkBranchCreatedWebp from '@/assets/images/docs/check-branch-created.webp'; -import clone from '@/assets/images/docs/clone.png'; -import cloneWebp from '@/assets/images/docs/clone.webp'; -import createBranch from '@/assets/images/docs/create-branch.png'; -import createBranchWebp from '@/assets/images/docs/create-branch.webp'; -import createFork from '@/assets/images/docs/create-fork.png'; -import createForkWebp from '@/assets/images/docs/create-fork.webp'; -import createRoom from '@/assets/images/docs/create-room.png'; -import createRoomWebp from '@/assets/images/docs/create-room.webp'; -import forkRepository from '@/assets/images/docs/fork-repository.png'; -import forkRepositoryWebp from '@/assets/images/docs/fork-repository.webp'; -import inputName from '@/assets/images/docs/input-name.png'; -import inputNameWebp from '@/assets/images/docs/input-name.webp'; -import inputPairName from '@/assets/images/docs/input-pair-name.png'; -import inputPairNameWebp from '@/assets/images/docs/input-pair-name.webp'; -import selectDriver from '@/assets/images/docs/select-driver.png'; -import selectDriverWebp from '@/assets/images/docs/select-driver.webp'; -import selectMission from '@/assets/images/docs/select-mission.png'; -import selectMissionWebp from '@/assets/images/docs/select-mission.webp'; -import setRole from '@/assets/images/docs/set-role.png'; -import setRoleWebp from '@/assets/images/docs/set-role.webp'; -import setTimer from '@/assets/images/docs/set-timer.png'; -import setTimerWebp from '@/assets/images/docs/set-timer.webp'; -import startFree from '@/assets/images/docs/start-free.png'; -import startFreeWebp from '@/assets/images/docs/start-free.webp'; -import startWithMission from '@/assets/images/docs/start-with-mission.png'; -import startWithMissionWebp from '@/assets/images/docs/start-with-mission.webp'; - export const START_CONTENT = [ { id: 'start-coduo', @@ -64,41 +35,3 @@ export const ABOUT_PAIR_PROGRAMMING = [ subtitle: '페어룸이란?', }, ]; - -/** - * - * export const DOCS_IMAGES = { - checkBranchCreated: `${S3_BASE_URL}/check-branch-created.png`, - 추후 이미지 배포 시 다음과 같이 url을 넣어주어 사용할 수 있습니다. -}; - */ -export const DOCS_IMAGES = { - checkBranchCreated, - createBranch, - createRoom, - selectMission, - startWithMission, - checkBranchCreatedWebp, - createBranchWebp, - createRoomWebp, - selectMissionWebp, - startWithMissionWebp, - forkRepository, - forkRepositoryWebp, - createFork, - createForkWebp, - clone, - cloneWebp, - inputName, - inputNameWebp, - inputPairName, - inputPairNameWebp, - selectDriver, - selectDriverWebp, - setRole, - setRoleWebp, - setTimer, - setTimerWebp, - startFree, - startFreeWebp, -}; diff --git a/frontend/src/hooks/common/useHashScroll.ts b/frontend/src/hooks/CoduoDocs/useHashScroll.ts similarity index 100% rename from frontend/src/hooks/common/useHashScroll.ts rename to frontend/src/hooks/CoduoDocs/useHashScroll.ts diff --git a/frontend/src/hooks/common/useScrollIcon.ts b/frontend/src/hooks/Landing/useScrollIcon.ts similarity index 96% rename from frontend/src/hooks/common/useScrollIcon.ts rename to frontend/src/hooks/Landing/useScrollIcon.ts index af5f25929..ff7285411 100644 --- a/frontend/src/hooks/common/useScrollIcon.ts +++ b/frontend/src/hooks/Landing/useScrollIcon.ts @@ -1,6 +1,6 @@ import { useState, useEffect } from 'react'; -import { TargetSection } from '@/components/common/ScrollIcon/ScrollIcon'; +import { TargetSection } from '@/components/_common/ScrollIcon/ScrollIcon'; interface UseScrollIconProps { targetSections?: TargetSection[]; diff --git a/frontend/src/hooks/common/useDragAndDrop.ts b/frontend/src/hooks/PairRoom/useDragAndDrop.ts similarity index 100% rename from frontend/src/hooks/common/useDragAndDrop.ts rename to frontend/src/hooks/PairRoom/useDragAndDrop.ts diff --git a/frontend/src/hooks/PairRoom/useEditCategory.ts b/frontend/src/hooks/PairRoom/useEditCategory.ts index 3209788ce..0ae2c67a7 100644 --- a/frontend/src/hooks/PairRoom/useEditCategory.ts +++ b/frontend/src/hooks/PairRoom/useEditCategory.ts @@ -2,7 +2,7 @@ import { useState } from 'react'; import useToastStore from '@/stores/toastStore'; -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; import useCategories from '@/hooks/PairRoom/useCategories'; import { useDeleteCategory, useUpdateCategory } from '@/queries/PairRoom/category/mutation'; diff --git a/frontend/src/hooks/common/useNotification.ts b/frontend/src/hooks/PairRoom/useNotification.ts similarity index 100% rename from frontend/src/hooks/common/useNotification.ts rename to frontend/src/hooks/PairRoom/useNotification.ts diff --git a/frontend/src/hooks/PairRoom/useReference.ts b/frontend/src/hooks/PairRoom/useReference.ts index 530c5ebb1..9640ca418 100644 --- a/frontend/src/hooks/PairRoom/useReference.ts +++ b/frontend/src/hooks/PairRoom/useReference.ts @@ -4,7 +4,7 @@ import { DEFAULT_CATEGORY_ID } from '@/hooks/PairRoom/useCategories'; import { useAddReferenceLink } from '@/queries/PairRoom/reference/mutation'; -import { formatLink } from '@/utils/Reference/formatLink'; +import { formatLink } from '@/utils/formatLink'; const useReference = (accessCode: string, reference: string, success: () => void) => { const addReference = useAddReferenceLink().mutateAsync; diff --git a/frontend/src/hooks/PairRoom/useTimer.ts b/frontend/src/hooks/PairRoom/useTimer.ts index a252da688..952d3aa2a 100644 --- a/frontend/src/hooks/PairRoom/useTimer.ts +++ b/frontend/src/hooks/PairRoom/useTimer.ts @@ -9,7 +9,7 @@ import useToastStore from '@/stores/toastStore'; import { getSSEConnection, startTimer, stopTimer } from '@/apis/timer'; -import useNotification from '@/hooks/common/useNotification'; +import useNotification from '@/hooks/PairRoom/useNotification'; import { QUERY_KEYS } from '@/constants/queryKeys'; diff --git a/frontend/src/hooks/common/useTitleTime.ts b/frontend/src/hooks/PairRoom/useTitleTime.ts similarity index 100% rename from frontend/src/hooks/common/useTitleTime.ts rename to frontend/src/hooks/PairRoom/useTitleTime.ts diff --git a/frontend/src/hooks/PairRoomOnboarding/useMissionBranch.ts b/frontend/src/hooks/PairRoomOnboarding/useMissionBranch.ts index 2ad499416..6559354ec 100644 --- a/frontend/src/hooks/PairRoomOnboarding/useMissionBranch.ts +++ b/frontend/src/hooks/PairRoomOnboarding/useMissionBranch.ts @@ -1,4 +1,4 @@ -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; import { validateBranchName } from '@/validations/validateBranchName'; diff --git a/frontend/src/hooks/PairRoomOnboarding/usePairRoomInformation.ts b/frontend/src/hooks/PairRoomOnboarding/usePairRoomInformation.ts index 63d6e2c0f..e0122ef58 100644 --- a/frontend/src/hooks/PairRoomOnboarding/usePairRoomInformation.ts +++ b/frontend/src/hooks/PairRoomOnboarding/usePairRoomInformation.ts @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { InputType, InputStatus } from '@/components/common/Input/Input.type'; +import { InputType, InputStatus } from '@/components/_common/Input/Input.type'; import useUserStore from '@/stores/userStore'; diff --git a/frontend/src/hooks/common/useClickOutside.ts b/frontend/src/hooks/_common/customEvent/useClickOutside.ts similarity index 100% rename from frontend/src/hooks/common/useClickOutside.ts rename to frontend/src/hooks/_common/customEvent/useClickOutside.ts diff --git a/frontend/src/hooks/common/useEscapeKey.ts b/frontend/src/hooks/_common/customEvent/useEscapeKey.ts similarity index 100% rename from frontend/src/hooks/common/useEscapeKey.ts rename to frontend/src/hooks/_common/customEvent/useEscapeKey.ts diff --git a/frontend/src/hooks/common/useFocusTrap.ts b/frontend/src/hooks/_common/customEvent/useFocusTrap.ts similarity index 100% rename from frontend/src/hooks/common/useFocusTrap.ts rename to frontend/src/hooks/_common/customEvent/useFocusTrap.ts diff --git a/frontend/src/hooks/common/usePreventBackNavigation.ts b/frontend/src/hooks/_common/customEvent/usePreventBackNavigation.ts similarity index 100% rename from frontend/src/hooks/common/usePreventBackNavigation.ts rename to frontend/src/hooks/_common/customEvent/usePreventBackNavigation.ts diff --git a/frontend/src/hooks/common/usePreventPageRefresh.ts b/frontend/src/hooks/_common/customEvent/usePreventPageRefresh.ts similarity index 93% rename from frontend/src/hooks/common/usePreventPageRefresh.ts rename to frontend/src/hooks/_common/customEvent/usePreventPageRefresh.ts index 174489062..8df20a104 100644 --- a/frontend/src/hooks/common/usePreventPageRefresh.ts +++ b/frontend/src/hooks/_common/customEvent/usePreventPageRefresh.ts @@ -4,7 +4,6 @@ const usePreventPageRefresh = () => { useEffect(() => { const handleBeforeUnload = (event: BeforeUnloadEvent) => { event.preventDefault(); - event.returnValue = ''; }; window.addEventListener('beforeunload', handleBeforeUnload); diff --git a/frontend/src/hooks/common/usePreventScroll.ts b/frontend/src/hooks/_common/customEvent/usePreventScroll.ts similarity index 100% rename from frontend/src/hooks/common/usePreventScroll.ts rename to frontend/src/hooks/_common/customEvent/usePreventScroll.ts diff --git a/frontend/src/hooks/member/useSignInHandler.ts b/frontend/src/hooks/_common/member/useSignInHandler.ts similarity index 100% rename from frontend/src/hooks/member/useSignInHandler.ts rename to frontend/src/hooks/_common/member/useSignInHandler.ts diff --git a/frontend/src/hooks/member/useSignOutHandler.ts b/frontend/src/hooks/_common/member/useSignOutHandler.ts similarity index 100% rename from frontend/src/hooks/member/useSignOutHandler.ts rename to frontend/src/hooks/_common/member/useSignOutHandler.ts diff --git a/frontend/src/hooks/member/useSignUpHandler.ts b/frontend/src/hooks/_common/member/useSignUpHandler.ts similarity index 100% rename from frontend/src/hooks/member/useSignUpHandler.ts rename to frontend/src/hooks/_common/member/useSignUpHandler.ts diff --git a/frontend/src/hooks/common/useAriaTrap.ts b/frontend/src/hooks/_common/useAriaTrap.ts similarity index 100% rename from frontend/src/hooks/common/useAriaTrap.ts rename to frontend/src/hooks/_common/useAriaTrap.ts diff --git a/frontend/src/hooks/common/useCopyClipboard.test.ts b/frontend/src/hooks/_common/useCopyClipboard.test.ts similarity index 96% rename from frontend/src/hooks/common/useCopyClipboard.test.ts rename to frontend/src/hooks/_common/useCopyClipboard.test.ts index cc91cbecb..97aa7dd24 100644 --- a/frontend/src/hooks/common/useCopyClipboard.test.ts +++ b/frontend/src/hooks/_common/useCopyClipboard.test.ts @@ -3,7 +3,7 @@ import { renderHook, act } from '@testing-library/react'; import useToastStore from '@/stores/toastStore'; -import useCopyClipBoard from '@/hooks/common/useCopyClipboard'; +import useCopyClipBoard from '@/hooks/_common/useCopyClipboard'; jest.mock('@/stores/toastStore'); diff --git a/frontend/src/hooks/common/useCopyClipboard.ts b/frontend/src/hooks/_common/useCopyClipboard.ts similarity index 100% rename from frontend/src/hooks/common/useCopyClipboard.ts rename to frontend/src/hooks/_common/useCopyClipboard.ts diff --git a/frontend/src/hooks/common/useDebounce.ts b/frontend/src/hooks/_common/useDebounce.ts similarity index 100% rename from frontend/src/hooks/common/useDebounce.ts rename to frontend/src/hooks/_common/useDebounce.ts diff --git a/frontend/src/hooks/common/useInput.test.ts b/frontend/src/hooks/_common/useInput.test.ts similarity index 94% rename from frontend/src/hooks/common/useInput.test.ts rename to frontend/src/hooks/_common/useInput.test.ts index e16aa2f09..42a299d05 100644 --- a/frontend/src/hooks/common/useInput.test.ts +++ b/frontend/src/hooks/_common/useInput.test.ts @@ -1,9 +1,9 @@ import { describe, it, expect } from '@jest/globals'; import { renderHook, act } from '@testing-library/react'; -import type { InputStatus } from '@/components/common/Input/Input.type'; +import type { InputStatus } from '@/components/_common/Input/Input.type'; -import useInput from '@/hooks/common/useInput'; +import useInput from '@/hooks/_common/useInput'; describe('useInput', () => { it('초기 상태가 올바른지 확인한다.', () => { diff --git a/frontend/src/hooks/common/useInput.ts b/frontend/src/hooks/_common/useInput.ts similarity index 91% rename from frontend/src/hooks/common/useInput.ts rename to frontend/src/hooks/_common/useInput.ts index 12087b061..844e8d855 100644 --- a/frontend/src/hooks/common/useInput.ts +++ b/frontend/src/hooks/_common/useInput.ts @@ -1,6 +1,6 @@ import { useState } from 'react'; -import type { InputStatus } from '@/components/common/Input/Input.type'; +import type { InputStatus } from '@/components/_common/Input/Input.type'; const useInput = (initialValue: string = '') => { const [value, setValue] = useState(initialValue); diff --git a/frontend/src/hooks/common/useModal.ts b/frontend/src/hooks/_common/useModal.ts similarity index 100% rename from frontend/src/hooks/common/useModal.ts rename to frontend/src/hooks/_common/useModal.ts diff --git a/frontend/src/hooks/common/useScrollAnimation.ts b/frontend/src/hooks/_common/useScrollAnimation.ts similarity index 100% rename from frontend/src/hooks/common/useScrollAnimation.ts rename to frontend/src/hooks/_common/useScrollAnimation.ts diff --git a/frontend/src/pages/Callback/Callback.tsx b/frontend/src/pages/Callback/Callback.tsx index eb7639903..f636c5ecc 100644 --- a/frontend/src/pages/Callback/Callback.tsx +++ b/frontend/src/pages/Callback/Callback.tsx @@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom'; import { LogoIconWithTitle } from '@/assets'; -import Spinner from '@/components/common/Spinner/Spinner'; +import Spinner from '@/components/_common/Spinner/Spinner'; import useUserStore from '@/stores/userStore'; diff --git a/frontend/src/pages/CoduoDocs/CoduoDocs.stories.tsx b/frontend/src/pages/CoduoDocs/CoduoDocs.stories.tsx deleted file mode 100644 index eb1bf863d..000000000 --- a/frontend/src/pages/CoduoDocs/CoduoDocs.stories.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import type { Meta, StoryObj } from '@storybook/react'; - -import CoduoDocs from '@/pages/CoduoDocs/CoduoDocs'; - -const meta = { - title: 'component/CoduoDocs/CoduoDocs', - component: CoduoDocs, -} satisfies Meta; - -export default meta; - -type Story = StoryObj; - -export const Default: Story = {}; diff --git a/frontend/src/pages/CoduoDocs/CoduoDocs.tsx b/frontend/src/pages/CoduoDocs/CoduoDocs.tsx index a6e0e315e..3bbd15a5b 100644 --- a/frontend/src/pages/CoduoDocs/CoduoDocs.tsx +++ b/frontend/src/pages/CoduoDocs/CoduoDocs.tsx @@ -1,12 +1,14 @@ +import { DOCS_IMAGES } from '@/assets'; + +import ContentBox from '@/components/CoduoDocs/ContentBox/ContentBox'; import DocsImage from '@/components/CoduoDocs/DocsImage/DocsImage'; -import ContentBox from '@/components/CoduoDocs/FloatingSidebar/ContentBox'; import FloatingSidebar from '@/components/CoduoDocs/FloatingSidebar/FloatingSidebar'; import Quote from '@/components/CoduoDocs/Quote/Quote'; import SourceCode from '@/components/CoduoDocs/SourceCode/SourceCode'; -import useHashScroll from '@/hooks/common/useHashScroll'; +import useHashScroll from '@/hooks/CoduoDocs/useHashScroll'; -import { ABOUT_PAIR_PROGRAMMING, DOCS_IMAGES, START_CONTENT } from '@/constants/coduoDocs'; +import { ABOUT_PAIR_PROGRAMMING, START_CONTENT } from '@/constants/coduoDocs'; import * as S from './CoduoDocs.styles'; @@ -29,12 +31,7 @@ const CoduoDocs = () => { 있는지 소개합니다. - + @@ -59,20 +56,9 @@ const CoduoDocs = () => { information="1. 미션과 함께 시작하기" src={DOCS_IMAGES.startWithMission} alt="start-with-mission" - webpSrc={DOCS_IMAGES.startWithMissionWebp} /> - - + + { information="4. 생성한 브랜치 확인하기" src={DOCS_IMAGES.checkBranchCreated} alt="check-branch-created" - webpSrc={DOCS_IMAGES.checkBranchCreatedWebp} > - + - + - + @@ -125,7 +100,6 @@ ex) cd java-guessing-number" information="1. '그냥 시작할래요' 버튼을 누르면 미션 없이 자유롭게 시작할 수 있습니다." src={DOCS_IMAGES.startFree} alt="start-free" - webpSrc={DOCS_IMAGES.startFreeWebp} > @@ -135,25 +109,18 @@ ex) cd java-guessing-number" id={START_CONTENT[3].id} src={DOCS_IMAGES.inputName} alt="input-name" - webpSrc={DOCS_IMAGES.inputNameWebp} > - + - + - + @@ -163,7 +130,6 @@ ex) cd java-guessing-number" id={START_CONTENT[5].id} src={DOCS_IMAGES.setTimer} alt="set-timer" - webpSrc={DOCS_IMAGES.setTimerWebp} > diff --git a/frontend/src/pages/Error/Error.tsx b/frontend/src/pages/Error/Error.tsx index 0b60eefee..2fc2c3b7e 100644 --- a/frontend/src/pages/Error/Error.tsx +++ b/frontend/src/pages/Error/Error.tsx @@ -1,6 +1,6 @@ import { Link } from 'react-router-dom'; -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; import * as S from './Error.styles'; diff --git a/frontend/src/pages/Landing/Landing.tsx b/frontend/src/pages/Landing/Landing.tsx index dc8c875bf..cdb172836 100644 --- a/frontend/src/pages/Landing/Landing.tsx +++ b/frontend/src/pages/Landing/Landing.tsx @@ -5,16 +5,16 @@ import { GithubLogoWhite, LogoIconWithTitle } from '@/assets'; import * as S from '@/pages/Landing/Landing.styles'; -import { ScrollAnimationContainer } from '@/components/common/Animation/ScrollAnimationContainer'; -import Button from '@/components/common/Button/Button'; -import ScrollIcon, { TargetSection } from '@/components/common/ScrollIcon/ScrollIcon'; +import Button from '@/components/_common/Button/Button'; +import { ScrollAnimationContainer } from '@/components/_common/ScrollAnimationContainer/ScrollAnimationContainer'; +import ScrollIcon, { TargetSection } from '@/components/_common/ScrollIcon/ScrollIcon'; import HowToPair from '@/components/Landing/HowToPair/HowToPair'; import useUserStore from '@/stores/userStore'; -import usePreventBackNavigation from '@/hooks/common/usePreventBackNavigation'; -import useTitleTime from '@/hooks/common/useTitleTime'; -import useSignInHandler from '@/hooks/member/useSignInHandler'; +import usePreventBackNavigation from '@/hooks/_common/customEvent/usePreventBackNavigation'; +import useSignInHandler from '@/hooks/_common/member/useSignInHandler'; +import useTitleTime from '@/hooks/PairRoom/useTitleTime'; const Landing = () => { const navigate = useNavigate(); diff --git a/frontend/src/pages/Layout.tsx b/frontend/src/pages/Layout.tsx index 30189a69a..15d4af156 100644 --- a/frontend/src/pages/Layout.tsx +++ b/frontend/src/pages/Layout.tsx @@ -1,7 +1,7 @@ import { Outlet } from 'react-router-dom'; -import Header from '@/components/common/Header/Header'; -import ToastList from '@/components/common/ToastList/ToastList'; +import Header from '@/components/_common/Header/Header'; +import ToastList from '@/components/_common/ToastList/ToastList'; import * as S from './Layout.styles'; diff --git a/frontend/src/pages/Loading/Loading.tsx b/frontend/src/pages/Loading/Loading.tsx index 6e39462bd..551c7d28a 100644 --- a/frontend/src/pages/Loading/Loading.tsx +++ b/frontend/src/pages/Loading/Loading.tsx @@ -1,4 +1,4 @@ -import Spinner from '@/components/common/Spinner/Spinner'; +import Spinner from '@/components/_common/Spinner/Spinner'; import * as S from './Loading.styles'; diff --git a/frontend/src/pages/Main/Main.tsx b/frontend/src/pages/Main/Main.tsx index 2810d6ae0..909f08b80 100644 --- a/frontend/src/pages/Main/Main.tsx +++ b/frontend/src/pages/Main/Main.tsx @@ -1,13 +1,13 @@ import * as S from '@/pages/Main/Main.styles'; -import { ScrollAnimationContainer } from '@/components/common/Animation/ScrollAnimationContainer'; -import WaveBackground from '@/components/common/Background/WaveBackground'; -import Button from '@/components/common/Button/Button'; +import Button from '@/components/_common/Button/Button'; +import { ScrollAnimationContainer } from '@/components/_common/ScrollAnimationContainer/ScrollAnimationContainer'; import PairRoomCreateModal from '@/components/Main/PairRoomCreateModal/PairRoomCreateModal'; import PairRoomEntryModal from '@/components/Main/PairRoomEntryModal/PairRoomEntryModal'; +import WaveBackground from '@/components/Main/WaveBackground/WaveBackground'; -import useModal from '@/hooks/common/useModal'; -import usePreventBackNavigation from '@/hooks/common/usePreventBackNavigation'; +import usePreventBackNavigation from '@/hooks/_common/customEvent/usePreventBackNavigation'; +import useModal from '@/hooks/_common/useModal'; const Main = () => { usePreventBackNavigation(); diff --git a/frontend/src/pages/MyPage/MyPage.tsx b/frontend/src/pages/MyPage/MyPage.tsx index fe16cf251..988dfca42 100644 --- a/frontend/src/pages/MyPage/MyPage.tsx +++ b/frontend/src/pages/MyPage/MyPage.tsx @@ -1,12 +1,11 @@ import { IoIosArrowForward } from 'react-icons/io'; -import MyPageContent from '@/pages/MyPage/MyPageContent/MyPageContent'; - -import ConfirmModal from '@/components/common/ConfirmModal/ConfirmModal'; +import ConfirmModal from '@/components/_common/ConfirmModal/ConfirmModal'; +import MyPageContent from '@/components/MyPage/MyPageContent/MyPageContent'; import useUserStore from '@/stores/userStore'; -import useModal from '@/hooks/common/useModal'; +import useModal from '@/hooks/_common/useModal'; import useDeleteMember from '@/queries/MyPage/useDeleteMember'; diff --git a/frontend/src/pages/PairRoom/PairRoom.tsx b/frontend/src/pages/PairRoom/PairRoom.tsx index e9a5471c9..5ea7bbaff 100644 --- a/frontend/src/pages/PairRoom/PairRoom.tsx +++ b/frontend/src/pages/PairRoom/PairRoom.tsx @@ -10,7 +10,7 @@ import ReferenceCard from '@/components/PairRoom/ReferenceCard/ReferenceCard'; import TimerCard from '@/components/PairRoom/TimerCard/TimerCard'; import TodoListCard from '@/components/PairRoom/TodoListCard/TodoListCard'; -import useModal from '@/hooks/common/useModal'; +import useModal from '@/hooks/_common/useModal'; import useGetPairRoom from '@/queries/PairRoom/useGetPairRoom'; import useUpdatePairRoom from '@/queries/PairRoom/useUpdatePairRoom'; diff --git a/frontend/src/pages/RetrospectForm/RetrospectForm.tsx b/frontend/src/pages/RetrospectForm/RetrospectForm.tsx index 29eee418e..7f5bf7077 100644 --- a/frontend/src/pages/RetrospectForm/RetrospectForm.tsx +++ b/frontend/src/pages/RetrospectForm/RetrospectForm.tsx @@ -1,13 +1,13 @@ import { useParams, useNavigate } from 'react-router-dom'; -import Button from '@/components/common/Button/Button'; -import ConfirmModal from '@/components/common/ConfirmModal/ConfirmModal'; +import Button from '@/components/_common/Button/Button'; +import ConfirmModal from '@/components/_common/ConfirmModal/ConfirmModal'; import Header from '@/components/Retrospect/Header/Header'; import Question from '@/components/Retrospect/Question/Question'; import TextArea from '@/components/Retrospect/Textarea/Textarea'; -import useModal from '@/hooks/common/useModal'; -import usePreventPageRefresh from '@/hooks/common/usePreventPageRefresh'; +import usePreventPageRefresh from '@/hooks/_common/customEvent/usePreventPageRefresh'; +import useModal from '@/hooks/_common/useModal'; import useInputAnswer from '@/hooks/Retrospect/useInputAnswer'; import { RETROSPECT_QUESTIONS } from '@/constants/retrospect'; diff --git a/frontend/src/pages/RetrospectView/RetrospectView.tsx b/frontend/src/pages/RetrospectView/RetrospectView.tsx index 26bdb8f96..a1f1b3c46 100644 --- a/frontend/src/pages/RetrospectView/RetrospectView.tsx +++ b/frontend/src/pages/RetrospectView/RetrospectView.tsx @@ -1,6 +1,6 @@ import { useNavigate, useParams } from 'react-router-dom'; -import Spinner from '@/components/common/Spinner/Spinner'; +import Spinner from '@/components/_common/Spinner/Spinner'; import Header from '@/components/Retrospect/Header/Header'; import Question from '@/components/Retrospect/Question/Question'; diff --git a/frontend/src/pages/SignUp/SignUp.tsx b/frontend/src/pages/SignUp/SignUp.tsx index b86274ce3..a941baabe 100644 --- a/frontend/src/pages/SignUp/SignUp.tsx +++ b/frontend/src/pages/SignUp/SignUp.tsx @@ -3,13 +3,13 @@ import { useNavigate } from 'react-router-dom'; import { LogoIconWithTitle } from '@/assets'; -import Button from '@/components/common/Button/Button'; -import Input from '@/components/common/Input/Input'; +import Button from '@/components/_common/Button/Button'; +import Input from '@/components/_common/Input/Input'; import useUserStore from '@/stores/userStore'; -import useInput from '@/hooks/common/useInput'; -import useSignUpHandler from '@/hooks/member/useSignUpHandler'; +import useSignUpHandler from '@/hooks/_common/member/useSignUpHandler'; +import useInput from '@/hooks/_common/useInput'; import { validateName } from '@/validations/validatePairName'; diff --git a/frontend/src/stores/toastStore.ts b/frontend/src/stores/toastStore.ts index 056de690e..1c222a977 100644 --- a/frontend/src/stores/toastStore.ts +++ b/frontend/src/stores/toastStore.ts @@ -1,6 +1,6 @@ import { create } from 'zustand'; -import type { Status } from '@/components/common/Toast/Toast'; +import type { Status } from '@/components/_common/Toast/Toast'; interface Toast { status: Status; diff --git a/frontend/src/utils/Reference/formatLink.ts b/frontend/src/utils/formatLink.ts similarity index 100% rename from frontend/src/utils/Reference/formatLink.ts rename to frontend/src/utils/formatLink.ts diff --git a/frontend/src/utils/Timer/formatTime.ts b/frontend/src/utils/formatTime.ts similarity index 100% rename from frontend/src/utils/Timer/formatTime.ts rename to frontend/src/utils/formatTime.ts diff --git a/frontend/src/validations/validateBranchName.ts b/frontend/src/validations/validateBranchName.ts index 4c262bfac..1677d452d 100644 --- a/frontend/src/validations/validateBranchName.ts +++ b/frontend/src/validations/validateBranchName.ts @@ -1,4 +1,4 @@ -import type { InputStatus } from '@/components/common/Input/Input.type'; +import type { InputStatus } from '@/components/_common/Input/Input.type'; export const validateBranchName = (name: string, branches: string[]) => { if (name.trim() === '') return { status: 'ERROR' as InputStatus, message: '값을 입력해 주세요.' }; diff --git a/frontend/src/validations/validateCategory.ts b/frontend/src/validations/validateCategory.ts index 24ce55110..fff904ac1 100644 --- a/frontend/src/validations/validateCategory.ts +++ b/frontend/src/validations/validateCategory.ts @@ -1,4 +1,4 @@ -import { InputStatus } from '@/components/common/Input/Input.type'; +import { InputStatus } from '@/components/_common/Input/Input.type'; import { DEFAULT_CATEGORY_VALUE } from '@/hooks/PairRoom/useCategories'; diff --git a/frontend/src/validations/validatePairName.ts b/frontend/src/validations/validatePairName.ts index c69c88f4b..ed4c074bd 100644 --- a/frontend/src/validations/validatePairName.ts +++ b/frontend/src/validations/validatePairName.ts @@ -1,4 +1,4 @@ -import type { InputStatus } from '@/components/common/Input/Input.type'; +import type { InputStatus } from '@/components/_common/Input/Input.type'; export const validateName = (name: string) => { if (name.trim() === '') return { status: 'ERROR' as InputStatus, message: '값을 입력해 주세요.' };