Skip to content

Commit

Permalink
Merge pull request #82 from team-offonoff/fix/refactor-components-folder
Browse files Browse the repository at this point in the history
컴포넌트 폴더 리팩토링
  • Loading branch information
Jinho1011 authored Dec 7, 2023
2 parents 87c5ccd + 18495c5 commit 611eb9c
Show file tree
Hide file tree
Showing 21 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions src/routes/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/routes/index.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down

0 comments on commit 611eb9c

Please sign in to comment.