Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Refactor] 모립세트 페이지 폴더구조 변경 #238

Merged
merged 2 commits into from
Dec 30, 2024
Merged

[Refactor] 모립세트 페이지 폴더구조 변경 #238

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75bf7cd
refactor: 허용서비스 페이지 컴포넌트 폴더 삭제 및 컴포넌트명으로 폴더 생성하여 적용 (#237)
Ivoryeee Dec 29, 2024
db82d90
code review: 코드리뷰 반영 (#237)
Ivoryeee Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...pages/MoribSetPage/AllowedServicePage.tsx → ...AllowedServicePage/AllowedServicePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import FriendSettingIcon from '@/shared/assets/svgs/friend_setting.svg?react';

import ModalContentsFriends from '@/pages/HomePage/ModalContentsFriends/ModalContentsFriends';

import BoxMakeAllowedService from './components/Box/BoxMakeAllowedService';
import BoxRecommendService from './components/Box/BoxRecommendService';
import CategoryAllowedService from './components/CategoryAllowedService';
import BoxMakeAllowedService from './BoxMakeAllowedService/BoxMakeAllowedService';
import BoxRecommendService from './BoxRecommendService/BoxRecommendService';
import CategoryAllowedService from './CategoryAllowedService/CategoryAllowedService';
suwonthugger marked this conversation as resolved.
Show resolved Hide resolved
import { AllowedService, UrlInfo } from './types';

const AllowedServicePage = () => {
Expand Down
2 changes: 1 addition & 1 deletion .../components/Box/BoxAllowedServiceItem.tsx → ...owedServiceItem/BoxAllowedServiceItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Dropdown from '@/shared/components/Dropdown';

import IconMeatBall from '@/shared/assets/svgs/todo_meatball_default.svg?react';

import { AllowedService } from './../../types';
import { AllowedService } from '../types';

interface BoxAllowedServiceItemProps {
allowedService: AllowedService;
Expand Down
2 changes: 1 addition & 1 deletion ...SetPage/components/Box/BoxEachUrlInfo.tsx → ...icePage/BoxEachUrlInfo/BoxEachUrlInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ReactNode } from 'react';

import { UrlInfo } from './../../types';
import { UrlInfo } from '../types';

interface BoxEachUrlInfoProps {
urlInfo: UrlInfo;
Expand Down
11 changes: 6 additions & 5 deletions .../components/Box/BoxMakeAllowedService.tsx → ...eAllowedService/BoxMakeAllowedService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import { Direction } from '@/shared/types/global';

import { CATEGORY_MODALTABS } from '@/shared/constants/tabSelections';

import { AllowedService } from './../../types';
import ColorPallete from './../ColorPallete';
import InputAllowedServiceUrl from './../Input/InputAllowedServiceUrl';
import TableAllowedService from './../TableAllowedService';
import BoxUrlList from './BoxUrlList';
import { AllowedService } from '../types';

import ColorPallete from '../ColorPallete/ColorPallete';
import InputAllowedServiceUrl from '../InputAllowedServiceUrl/InputAllowedServiceUrl';
import TableAllowedService from '../TableAllowedService/TableAllowedService';
import BoxUrlList from '../BoxUrlList/BoxUrlList';

interface BoxMakeAllowedServiceProps {
allowedService: AllowedService;
Expand Down
2 changes: 1 addition & 1 deletion ...ge/components/Box/BoxRecommendService.tsx → ...xRecommendService/BoxRecommendService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Direction } from '@/shared/types/global';

import { recommendServices } from '@/shared/constants/recommendSites';

import { UrlInfo } from './../../types';
import { UrlInfo } from '../types';

interface BoxRecommendServiceProps {
addUrlToAllowedService: (url: UrlInfo) => void;
Expand Down
4 changes: 2 additions & 2 deletions ...oribSetPage/components/Box/BoxUrlList.tsx → ...owedServicePage/BoxUrlList/BoxUrlList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import MinusBtn from '@/shared/assets/svgs/minus_btn.svg?react';

import { UrlInfo } from './../../types';
import BoxEachUrlInfo from './BoxEachUrlInfo';
import { UrlInfo } from '../types';
import BoxEachUrlInfo from '../BoxEachUrlInfo/BoxEachUrlInfo';

interface BoxUrlListProps {
urlList: UrlInfo[];
Expand Down
0 ...onents/Button/ButtonAddAllowedService.tsx → ...llowedService/ButtonAddAllowedService.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...age/components/CategoryAllowedService.tsx → ...AllowedService/CategoryAllowedService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import IconPlus from '@/shared/assets/svgs/plus.svg?react';

import { AllowedService } from './../types';
import BoxAllowedServiceItem from './Box/BoxAllowedServiceItem';
import { AllowedService } from '../types';
import BoxAllowedServiceItem from '../BoxAllowedServiceItem/BoxAllowedServiceItem';

interface CategoryAllowedServiceProps {
allowedServices: AllowedService[];
Expand Down
0 .../MoribSetPage/components/ColorPallete.tsx → ...ServicePage/ColorPallete/ColorPallete.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...mponents/Input/InputAllowedServiceUrl.tsx → ...owedServiceUrl/InputAllowedServiceUrl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { isUrlValid } from '@/shared/utils/isUrlValid/index';
import InputClearButton from '@/shared/assets/svgs/btn_inputClear.svg?react';
import IconInputError from '@/shared/assets/svgs/error_input.svg?react';

import ButtonAddAllowedService from '@/pages/MoribSetPage/components/Button/ButtonAddAllowedService';
import ButtonAddAllowedService from '../ButtonAddAllowedService/ButtonAddAllowedService';

import { UrlInfo } from './../../types';
import { UrlInfo } from '../types';

interface InputAllowedServiceUrlProps {
urlList: UrlInfo[];
Expand Down
2 changes: 1 addition & 1 deletion ...etPage/components/TableAllowedService.tsx → ...bleAllowedService/TableAllowedService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ReactNode } from 'react';

import { UrlInfo } from './../types';
import { UrlInfo } from '../../AllowedServicePage/types';

interface TableAllowedServiceProps {
children: ReactNode;
Expand Down
0 src/pages/MoribSetPage/types/index.ts → src/pages/AllowedServicePage/types/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/router/Router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ROUTES_CONFIG } from './routesConfig';
const LoginPage = lazy(() => import('@/pages/LoginPage/LoginPage'));
const HomePage = lazy(() => import('@/pages/HomePage/HomePage'));
const TimerPage = lazy(() => import('@/pages/TimerPage/TimerPage'));
const AllowedServicePage = lazy(() => import('@/pages/MoribSetPage/AllowedServicePage'));
const AllowedServicePage = lazy(() => import('@/pages/AllowedServicePage/AllowedServicePage'));

const ProtectedRoute = () => {
//Todo: 개발이 진행되면 실제 토큰 상태를 받아서 login page로 이동 시킴
Expand Down
Loading