From 18495c5c8392f1f4a77e0ae88d2f1a8bc34d4560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=84=EC=A7=84=ED=98=B8?= Date: Thu, 7 Dec 2023 16:06:27 +0900 Subject: [PATCH] fix: refactor components folder --- .../{ => Home}/ChoiceSlide/ChoiceSlide.styles.tsx | 0 src/components/{ => Home}/ChoiceSlide/ChoiceSlide.tsx | 2 +- .../{ => Home}/ChoiceSlider/ChoiceSlider.tsx | 2 +- .../{ => Home}/CommentBox/CommentBox.styles.tsx | 0 src/components/{ => Home}/CommentBox/CommentBox.tsx | 4 ++-- src/components/{ => Home}/Timer/Timer.tsx | 0 .../{ => Home}/TopicCard/TopicCard.styles.tsx | 0 src/components/{ => Home}/TopicCard/TopicCard.tsx | 10 +++++----- src/components/{ => Home}/TopicSwiper/TopicSwiper.tsx | 0 .../BottomNavigation/BottomNavigation.stories.tsx | 0 .../BottomNavigation/BottomNavigation.styles.tsx | 0 .../BottomNavigation/BottomNavigation.tsx | 2 +- .../{ => commons}/BottomSheet/BottomSheet.stories.tsx | 0 .../{ => commons}/BottomSheet/BottomSheet.tsx | 2 +- .../Header/NotificationButton/NotificationButton.tsx | 0 src/components/{ => commons}/Layout/Layout.styles.tsx | 0 src/components/{ => commons}/Layout/Layout.tsx | 0 src/components/{ => commons}/Portal/Portal.tsx | 0 src/components/{ => commons}/Text/Text.tsx | 0 src/routes/Home/Home.tsx | 8 ++++---- src/routes/index.tsx | 2 +- 21 files changed, 16 insertions(+), 16 deletions(-) rename src/components/{ => Home}/ChoiceSlide/ChoiceSlide.styles.tsx (100%) rename src/components/{ => Home}/ChoiceSlide/ChoiceSlide.tsx (96%) rename src/components/{ => Home}/ChoiceSlider/ChoiceSlider.tsx (96%) rename src/components/{ => Home}/CommentBox/CommentBox.styles.tsx (100%) rename src/components/{ => Home}/CommentBox/CommentBox.tsx (93%) rename src/components/{ => Home}/Timer/Timer.tsx (100%) rename src/components/{ => Home}/TopicCard/TopicCard.styles.tsx (100%) rename src/components/{ => Home}/TopicCard/TopicCard.tsx (90%) rename src/components/{ => Home}/TopicSwiper/TopicSwiper.tsx (100%) rename src/components/{ => commons}/BottomNavigation/BottomNavigation.stories.tsx (100%) rename src/components/{ => commons}/BottomNavigation/BottomNavigation.styles.tsx (100%) rename src/components/{ => commons}/BottomNavigation/BottomNavigation.tsx (96%) rename src/components/{ => commons}/BottomSheet/BottomSheet.stories.tsx (100%) rename src/components/{ => commons}/BottomSheet/BottomSheet.tsx (96%) rename src/components/{ => commons}/Header/NotificationButton/NotificationButton.tsx (100%) rename src/components/{ => commons}/Layout/Layout.styles.tsx (100%) rename src/components/{ => commons}/Layout/Layout.tsx (100%) rename src/components/{ => commons}/Portal/Portal.tsx (100%) rename src/components/{ => commons}/Text/Text.tsx (100%) diff --git a/src/components/ChoiceSlide/ChoiceSlide.styles.tsx b/src/components/Home/ChoiceSlide/ChoiceSlide.styles.tsx similarity index 100% rename from src/components/ChoiceSlide/ChoiceSlide.styles.tsx rename to src/components/Home/ChoiceSlide/ChoiceSlide.styles.tsx diff --git a/src/components/ChoiceSlide/ChoiceSlide.tsx b/src/components/Home/ChoiceSlide/ChoiceSlide.tsx similarity index 96% rename from src/components/ChoiceSlide/ChoiceSlide.tsx rename to src/components/Home/ChoiceSlide/ChoiceSlide.tsx index 8eccf59..d580ece 100644 --- a/src/components/ChoiceSlide/ChoiceSlide.tsx +++ b/src/components/Home/ChoiceSlide/ChoiceSlide.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import Text from '@components/Text/Text'; +import Text from '@components/commons/Text/Text'; import { ChoiceContent } from '@interfaces/api/topic'; import { colors } from '@styles/theme'; diff --git a/src/components/ChoiceSlider/ChoiceSlider.tsx b/src/components/Home/ChoiceSlider/ChoiceSlider.tsx similarity index 96% rename from src/components/ChoiceSlider/ChoiceSlider.tsx rename to src/components/Home/ChoiceSlider/ChoiceSlider.tsx index f605f40..94f7b4b 100644 --- a/src/components/ChoiceSlider/ChoiceSlider.tsx +++ b/src/components/Home/ChoiceSlider/ChoiceSlider.tsx @@ -2,7 +2,7 @@ import { useAnimation, PanInfo, motion } from 'framer-motion'; import React from 'react'; import styled from 'styled-components'; -import ChoiceSlide from '@components/ChoiceSlide/ChoiceSlide'; +import ChoiceSlide from '@components/Home/ChoiceSlide/ChoiceSlide'; import { Choice } from '@interfaces/api/topic'; interface ChoiceSliderProps { diff --git a/src/components/CommentBox/CommentBox.styles.tsx b/src/components/Home/CommentBox/CommentBox.styles.tsx similarity index 100% rename from src/components/CommentBox/CommentBox.styles.tsx rename to src/components/Home/CommentBox/CommentBox.styles.tsx diff --git a/src/components/CommentBox/CommentBox.tsx b/src/components/Home/CommentBox/CommentBox.tsx similarity index 93% rename from src/components/CommentBox/CommentBox.tsx rename to src/components/Home/CommentBox/CommentBox.tsx index bbac126..6e4367d 100644 --- a/src/components/CommentBox/CommentBox.tsx +++ b/src/components/Home/CommentBox/CommentBox.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import Text from '@components/Text/Text'; -import { UserProfileImage } from '@components/TopicCard/TopicCard.styles'; +import Text from '@components/commons/Text/Text'; +import { UserProfileImage } from '@components/Home/TopicCard/TopicCard.styles'; import { colors } from '@styles/theme'; diff --git a/src/components/Timer/Timer.tsx b/src/components/Home/Timer/Timer.tsx similarity index 100% rename from src/components/Timer/Timer.tsx rename to src/components/Home/Timer/Timer.tsx diff --git a/src/components/TopicCard/TopicCard.styles.tsx b/src/components/Home/TopicCard/TopicCard.styles.tsx similarity index 100% rename from src/components/TopicCard/TopicCard.styles.tsx rename to src/components/Home/TopicCard/TopicCard.styles.tsx diff --git a/src/components/TopicCard/TopicCard.tsx b/src/components/Home/TopicCard/TopicCard.tsx similarity index 90% rename from src/components/TopicCard/TopicCard.tsx rename to src/components/Home/TopicCard/TopicCard.tsx index aa4e9bc..9e83ef4 100644 --- a/src/components/TopicCard/TopicCard.tsx +++ b/src/components/Home/TopicCard/TopicCard.tsx @@ -2,11 +2,11 @@ import { PanInfo, motion, useAnimation } from 'framer-motion'; import React, { useEffect, useLayoutEffect, useRef, useState } from 'react'; import { useNavigate } from 'react-router'; -import ChoiceSlide from '@components/ChoiceSlide/ChoiceSlide'; -import ChoiceSlider from '@components/ChoiceSlider/ChoiceSlider'; -import CommentBox from '@components/CommentBox/CommentBox'; -import Text from '@components/Text/Text'; -import Timer from '@components/Timer/Timer'; +import Text from '@components/commons/Text/Text'; +import ChoiceSlide from '@components/Home/ChoiceSlide/ChoiceSlide'; +import ChoiceSlider from '@components/Home/ChoiceSlider/ChoiceSlider'; +import CommentBox from '@components/Home/CommentBox/CommentBox'; +import Timer from '@components/Home/Timer/Timer'; import { TopicResponse } from '@interfaces/api/topic'; import { colors } from '@styles/theme'; diff --git a/src/components/TopicSwiper/TopicSwiper.tsx b/src/components/Home/TopicSwiper/TopicSwiper.tsx similarity index 100% rename from src/components/TopicSwiper/TopicSwiper.tsx rename to src/components/Home/TopicSwiper/TopicSwiper.tsx diff --git a/src/components/BottomNavigation/BottomNavigation.stories.tsx b/src/components/commons/BottomNavigation/BottomNavigation.stories.tsx similarity index 100% rename from src/components/BottomNavigation/BottomNavigation.stories.tsx rename to src/components/commons/BottomNavigation/BottomNavigation.stories.tsx diff --git a/src/components/BottomNavigation/BottomNavigation.styles.tsx b/src/components/commons/BottomNavigation/BottomNavigation.styles.tsx similarity index 100% rename from src/components/BottomNavigation/BottomNavigation.styles.tsx rename to src/components/commons/BottomNavigation/BottomNavigation.styles.tsx diff --git a/src/components/BottomNavigation/BottomNavigation.tsx b/src/components/commons/BottomNavigation/BottomNavigation.tsx similarity index 96% rename from src/components/BottomNavigation/BottomNavigation.tsx rename to src/components/commons/BottomNavigation/BottomNavigation.tsx index ed1fb83..3e57523 100644 --- a/src/components/BottomNavigation/BottomNavigation.tsx +++ b/src/components/commons/BottomNavigation/BottomNavigation.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { NavLink } from 'react-router-dom'; -import Text from '@components/Text/Text'; +import Text from '@components/commons/Text/Text'; import { ABIcon, WriteBoxIcon, ProfileIcon, SelectedHomeIcon } from '@icons/index'; diff --git a/src/components/BottomSheet/BottomSheet.stories.tsx b/src/components/commons/BottomSheet/BottomSheet.stories.tsx similarity index 100% rename from src/components/BottomSheet/BottomSheet.stories.tsx rename to src/components/commons/BottomSheet/BottomSheet.stories.tsx diff --git a/src/components/BottomSheet/BottomSheet.tsx b/src/components/commons/BottomSheet/BottomSheet.tsx similarity index 96% rename from src/components/BottomSheet/BottomSheet.tsx rename to src/components/commons/BottomSheet/BottomSheet.tsx index 3c2cc98..3964767 100644 --- a/src/components/BottomSheet/BottomSheet.tsx +++ b/src/components/commons/BottomSheet/BottomSheet.tsx @@ -2,7 +2,7 @@ import { motion, PanInfo, useAnimation, useMotionValue, useTransform } from 'fra import React from 'react'; import { styled } from 'styled-components'; -import ReactPortal from '@components/Portal/Portal'; +import ReactPortal from '@components/commons/Portal/Portal'; interface BottomSheetProps { open: boolean; diff --git a/src/components/Header/NotificationButton/NotificationButton.tsx b/src/components/commons/Header/NotificationButton/NotificationButton.tsx similarity index 100% rename from src/components/Header/NotificationButton/NotificationButton.tsx rename to src/components/commons/Header/NotificationButton/NotificationButton.tsx diff --git a/src/components/Layout/Layout.styles.tsx b/src/components/commons/Layout/Layout.styles.tsx similarity index 100% rename from src/components/Layout/Layout.styles.tsx rename to src/components/commons/Layout/Layout.styles.tsx diff --git a/src/components/Layout/Layout.tsx b/src/components/commons/Layout/Layout.tsx similarity index 100% rename from src/components/Layout/Layout.tsx rename to src/components/commons/Layout/Layout.tsx diff --git a/src/components/Portal/Portal.tsx b/src/components/commons/Portal/Portal.tsx similarity index 100% rename from src/components/Portal/Portal.tsx rename to src/components/commons/Portal/Portal.tsx diff --git a/src/components/Text/Text.tsx b/src/components/commons/Text/Text.tsx similarity index 100% rename from src/components/Text/Text.tsx rename to src/components/commons/Text/Text.tsx diff --git a/src/routes/Home/Home.tsx b/src/routes/Home/Home.tsx index 68ae278..1ab0dda 100644 --- a/src/routes/Home/Home.tsx +++ b/src/routes/Home/Home.tsx @@ -4,10 +4,10 @@ import 'swiper/css/navigation'; import 'swiper/css/pagination'; import 'swiper/css/scrollbar'; -import NotificationButton from '@components/Header/NotificationButton/NotificationButton'; -import Layout from '@components/Layout/Layout'; -import TopicCard from '@components/TopicCard/TopicCard'; -import TopicSwiper from '@components/TopicSwiper/TopicSwiper'; +import NotificationButton from '@components/commons/Header/NotificationButton/NotificationButton'; +import Layout from '@components/commons/Layout/Layout'; +import TopicCard from '@components/Home/TopicCard/TopicCard'; +import TopicSwiper from '@components/Home/TopicSwiper/TopicSwiper'; import { Container } from './Home.styles'; diff --git a/src/routes/index.tsx b/src/routes/index.tsx index fe33ed6..cf5c95f 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { RouteObject, RouterProvider, createBrowserRouter } from 'react-router-dom'; -import Layout from '@components/Layout/Layout'; +import Layout from '@components/commons/Layout/Layout'; import GoogleLogin from './Auth/google/GoogleLogin'; import KakaoLogin from './Auth/kakao/KakaoLogin';