diff --git a/src/_apis/error/throwAxiosError.ts b/src/apis/error/throwAxiosError.ts similarity index 100% rename from src/_apis/error/throwAxiosError.ts rename to src/apis/error/throwAxiosError.ts diff --git a/src/_apis/httpClient/httpClient.ts b/src/apis/httpClient/httpClient.ts similarity index 97% rename from src/_apis/httpClient/httpClient.ts rename to src/apis/httpClient/httpClient.ts index b5e199ba..34ef9092 100644 --- a/src/_apis/httpClient/httpClient.ts +++ b/src/apis/httpClient/httpClient.ts @@ -1,6 +1,6 @@ import axios, { AxiosInstance, AxiosRequestConfig } from "axios"; -import { requestInterceptors, responseInterceptors } from "@/_apis/interceptor"; -import { ERROR, TOKEN } from "@/_constants"; +import { requestInterceptors, responseInterceptors } from "@/apis/interceptor"; +import { ERROR, TOKEN } from "@/constants"; import Storage from "../storage"; import { refresh } from "../token"; diff --git a/src/_apis/httpClient/index.ts b/src/apis/httpClient/index.ts similarity index 100% rename from src/_apis/httpClient/index.ts rename to src/apis/httpClient/index.ts diff --git a/src/_apis/interceptor/index.ts b/src/apis/interceptor/index.ts similarity index 95% rename from src/_apis/interceptor/index.ts rename to src/apis/interceptor/index.ts index 9550a416..acc229cd 100644 --- a/src/_apis/interceptor/index.ts +++ b/src/apis/interceptor/index.ts @@ -1,5 +1,5 @@ import { AxiosRequestConfig, AxiosResponse } from "axios"; -import { TOKEN } from "@/_constants"; +import { TOKEN } from "@/constants"; import Storage from "../storage"; export const requestInterceptors = (requestConfig: AxiosRequestConfig) => { diff --git a/src/_apis/storage/index.ts b/src/apis/storage/index.ts similarity index 89% rename from src/_apis/storage/index.ts rename to src/apis/storage/index.ts index 73683836..7d839466 100644 --- a/src/_apis/storage/index.ts +++ b/src/apis/storage/index.ts @@ -1,4 +1,4 @@ -import { StorageSettingKey, StorageTokenKey } from "@/_types"; +import { StorageSettingKey, StorageTokenKey } from "@/types"; type StorageKey = StorageSettingKey | StorageTokenKey; diff --git a/src/_apis/token/authorization.ts b/src/apis/token/authorization.ts similarity index 65% rename from src/_apis/token/authorization.ts rename to src/apis/token/authorization.ts index a2334806..1463c2e4 100644 --- a/src/_apis/token/authorization.ts +++ b/src/apis/token/authorization.ts @@ -1,5 +1,5 @@ -import Storage from "@/_apis/storage"; -import { TOKEN } from "@/_constants"; +import Storage from "@/apis/storage"; +import { TOKEN } from "@/constants"; const authorization = () => ({ headers: { diff --git a/src/_apis/token/index.ts b/src/apis/token/index.ts similarity index 100% rename from src/_apis/token/index.ts rename to src/apis/token/index.ts diff --git a/src/_apis/token/refresh.ts b/src/apis/token/refresh.ts similarity index 84% rename from src/_apis/token/refresh.ts rename to src/apis/token/refresh.ts index fd78c442..97a43b99 100644 --- a/src/_apis/token/refresh.ts +++ b/src/apis/token/refresh.ts @@ -1,5 +1,5 @@ -import { TOKEN } from "@/_constants"; -import Storage from "@/_apis/storage"; +import { TOKEN } from "@/constants"; +import Storage from "@/apis/storage"; import axios from "axios"; const instance = axios.create({ diff --git a/src/app/applications/page.tsx b/src/app/applications/page.tsx index c0e17477..f4c8b91e 100644 --- a/src/app/applications/page.tsx +++ b/src/app/applications/page.tsx @@ -1,6 +1,6 @@ "use client"; -import ApplicationsPage from "@/insert.applications"; +import ApplicationsPage from "@/templates/applications"; import React from "react"; const Applications = () => { diff --git a/src/app/bamboo/page.tsx b/src/app/bamboo/page.tsx index 37f9a99b..8771524b 100644 --- a/src/app/bamboo/page.tsx +++ b/src/app/bamboo/page.tsx @@ -1,6 +1,6 @@ "use client"; -import BambooPage from "@/_pages/bamboo"; +import BambooPage from "@/templates/bamboo"; const Bamboo = () => { return ; diff --git a/src/app/calender/page.tsx b/src/app/calender/page.tsx index c1d8448c..194e16a9 100644 --- a/src/app/calender/page.tsx +++ b/src/app/calender/page.tsx @@ -1,6 +1,6 @@ "use client"; -import CalenderPage from "@/_pages/calender"; +import CalenderPage from "@/templates/calender"; const Calender = () => { return ; diff --git a/src/app/domitory/page.tsx b/src/app/domitory/page.tsx index ff09717d..15057acc 100644 --- a/src/app/domitory/page.tsx +++ b/src/app/domitory/page.tsx @@ -1,6 +1,6 @@ "use client"; -import DomitoryPage from "@/_pages/domitory"; +import DomitoryPage from "@/templates/domitory"; const Domitory = () => { return ; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 86151a2a..e4f6e2b7 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,4 +1,4 @@ -import Provider from "@/_provider/provider.helper"; +import Provider from "@/provider/provider.helper"; export const metadata = { title: "BSM", diff --git a/src/app/meal/page.tsx b/src/app/meal/page.tsx index 3c2e6219..02220cc3 100644 --- a/src/app/meal/page.tsx +++ b/src/app/meal/page.tsx @@ -1,6 +1,6 @@ "use client"; -import MealPage from "@/_pages/meal"; +import MealPage from "@/templates/meal"; import React from "react"; const Meal = () => { diff --git a/src/app/meister/page.tsx b/src/app/meister/page.tsx index 59e077c4..c0fc0cbd 100644 --- a/src/app/meister/page.tsx +++ b/src/app/meister/page.tsx @@ -1,6 +1,6 @@ "use client"; -import MeisterPage from "@/_pages/meister"; +import MeisterPage from "@/templates/meister"; const Meister = () => { return ; diff --git a/src/app/oauth/page.tsx b/src/app/oauth/page.tsx index 530ddd14..613a7cc0 100644 --- a/src/app/oauth/page.tsx +++ b/src/app/oauth/page.tsx @@ -1,6 +1,6 @@ "use client"; -import OAuthPage from "@/_pages/oauth"; +import OAuthPage from "@/templates/oauth"; const OAuth = () => { return ; diff --git a/src/app/page.tsx b/src/app/page.tsx index 8e01b42c..a979ff4f 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,6 +1,6 @@ "use client"; -import HomePage from "@/_pages/home"; +import HomePage from "@/templates/home"; const Home = () => { return ; diff --git a/src/app/post/[id]/page.tsx b/src/app/post/[id]/page.tsx index d6a11db8..f5727929 100644 --- a/src/app/post/[id]/page.tsx +++ b/src/app/post/[id]/page.tsx @@ -1,6 +1,6 @@ "use client"; -import PostPage from "@/_pages/forum-post"; +import PostPage from "@/templates/forum-post"; interface IPostAppPageParams { params: { diff --git a/src/app/post/[id]/update/page.tsx b/src/app/post/[id]/update/page.tsx index 7ad90fef..fc365083 100644 --- a/src/app/post/[id]/update/page.tsx +++ b/src/app/post/[id]/update/page.tsx @@ -1,6 +1,6 @@ "use client"; -import UpdatePage from "@/_pages/forum-edit"; +import UpdatePage from "@/templates/forum-edit"; interface IPostUpdateAppPageParams { params: { diff --git a/src/app/post/page.tsx b/src/app/post/page.tsx index b22ab990..3d98905c 100644 --- a/src/app/post/page.tsx +++ b/src/app/post/page.tsx @@ -1,6 +1,6 @@ "use client"; -import ForumPage from "@/_pages/forum"; +import ForumPage from "@/templates/forum"; const Post = () => { return ; diff --git a/src/app/post/write/page.tsx b/src/app/post/write/page.tsx index f19b3b03..4d5da580 100644 --- a/src/app/post/write/page.tsx +++ b/src/app/post/write/page.tsx @@ -1,6 +1,6 @@ "use client"; -import WritePage from "@/_pages/forum-write"; +import WritePage from "@/templates/forum-write"; const Write = () => { return ; diff --git a/src/app/reserve/page.tsx b/src/app/reserve/page.tsx index dbaf591b..79b78fb5 100644 --- a/src/app/reserve/page.tsx +++ b/src/app/reserve/page.tsx @@ -1,6 +1,6 @@ "use client"; -import ReservePage from "@/_pages/reserve"; +import ReservePage from "@/templates/reserve"; const Reserve = () => { return ; diff --git a/src/app/timetable/page.tsx b/src/app/timetable/page.tsx index 4dd307f6..983a3677 100644 --- a/src/app/timetable/page.tsx +++ b/src/app/timetable/page.tsx @@ -1,6 +1,6 @@ "use client"; -import TimeTablePage from "@/_pages/timetable"; +import TimeTablePage from "@/templates/timetable"; const TimeTable = () => { return ; diff --git a/src/_assets/data/emptyCategories.ts b/src/assets/data/emptyCategories.ts similarity index 92% rename from src/_assets/data/emptyCategories.ts rename to src/assets/data/emptyCategories.ts index c2193d45..6de6ad50 100644 --- a/src/_assets/data/emptyCategories.ts +++ b/src/assets/data/emptyCategories.ts @@ -1,4 +1,4 @@ -import { FORUM } from "@/_constants"; +import { FORUM } from "@/constants"; const categories = [ { diff --git a/src/_assets/data/emptyClassInfo.ts b/src/assets/data/emptyClassInfo.ts similarity index 81% rename from src/_assets/data/emptyClassInfo.ts rename to src/assets/data/emptyClassInfo.ts index a48214bb..56b5812b 100644 --- a/src/_assets/data/emptyClassInfo.ts +++ b/src/assets/data/emptyClassInfo.ts @@ -1,4 +1,4 @@ -import { IClassInfo } from "@/_interfaces"; +import { IClassInfo } from "@/interfaces"; const emptyClassInfo: IClassInfo = { period: "", diff --git a/src/_assets/data/emptyClassLevel.ts b/src/assets/data/emptyClassLevel.ts similarity index 100% rename from src/_assets/data/emptyClassLevel.ts rename to src/assets/data/emptyClassLevel.ts diff --git a/src/_assets/data/emptyInputPost.ts b/src/assets/data/emptyInputPost.ts similarity index 76% rename from src/_assets/data/emptyInputPost.ts rename to src/assets/data/emptyInputPost.ts index e07fc7e5..47c07278 100644 --- a/src/_assets/data/emptyInputPost.ts +++ b/src/assets/data/emptyInputPost.ts @@ -1,5 +1,5 @@ -import { POST } from "@/_constants"; -import { IInputPost } from "@/_interfaces"; +import { POST } from "@/constants"; +import { IInputPost } from "@/interfaces"; const emptyInputPost: IInputPost = { id: "", diff --git a/src/_assets/data/emptyMealList.ts b/src/assets/data/emptyMealList.ts similarity index 85% rename from src/_assets/data/emptyMealList.ts rename to src/assets/data/emptyMealList.ts index 205aa55e..8bd26429 100644 --- a/src/_assets/data/emptyMealList.ts +++ b/src/assets/data/emptyMealList.ts @@ -1,4 +1,4 @@ -import { IMealList } from "@/_interfaces"; +import { IMealList } from "@/interfaces"; const emptyMealList: IMealList = { data: { diff --git a/src/_assets/data/emptyMeister.ts b/src/assets/data/emptyMeister.ts similarity index 92% rename from src/_assets/data/emptyMeister.ts rename to src/assets/data/emptyMeister.ts index 7934f0d5..616b5b3b 100644 --- a/src/_assets/data/emptyMeister.ts +++ b/src/assets/data/emptyMeister.ts @@ -1,4 +1,4 @@ -import IMeister from "@/_interfaces/meister.interface"; +import IMeister from "@/interfaces/meister.interface"; const emptyMeister: IMeister = { meister: { diff --git a/src/_assets/data/emptyReserve.ts b/src/assets/data/emptyReserve.ts similarity index 100% rename from src/_assets/data/emptyReserve.ts rename to src/assets/data/emptyReserve.ts diff --git a/src/_assets/data/emptyTimetable.ts b/src/assets/data/emptyTimetable.ts similarity index 97% rename from src/_assets/data/emptyTimetable.ts rename to src/assets/data/emptyTimetable.ts index 5739c727..3e7f04ed 100644 --- a/src/_assets/data/emptyTimetable.ts +++ b/src/assets/data/emptyTimetable.ts @@ -1,4 +1,4 @@ -import { ITimetable } from "@/_interfaces"; +import { ITimetable } from "@/interfaces"; const emptyTimetable: ITimetable = { SUNDAY: [ diff --git a/src/_assets/data/index.ts b/src/assets/data/index.ts similarity index 100% rename from src/_assets/data/index.ts rename to src/assets/data/index.ts diff --git a/src/_assets/icons/AddCommentIcon.tsx b/src/assets/icons/AddCommentIcon.tsx similarity index 100% rename from src/_assets/icons/AddCommentIcon.tsx rename to src/assets/icons/AddCommentIcon.tsx diff --git a/src/_assets/icons/Arrow.tsx b/src/assets/icons/Arrow.tsx similarity index 98% rename from src/_assets/icons/Arrow.tsx rename to src/assets/icons/Arrow.tsx index d4e7926e..34cd4f15 100644 --- a/src/_assets/icons/Arrow.tsx +++ b/src/assets/icons/Arrow.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; const path = { top: "M1.66419 23.4679C2.24222 24.0457 3.02609 24.3703 3.84342 24.3703C4.66075 24.3703 5.44462 24.0457 6.02265 23.4679L21.2803 8.21018L36.538 23.4679C37.1193 24.0293 37.898 24.34 38.7061 24.333C39.5143 24.326 40.2874 24.0018 40.8589 23.4303C41.4304 22.8588 41.7546 22.0857 41.7616 21.2775C41.7686 20.4694 41.4579 19.6907 40.8965 19.1094L23.4596 1.67249C22.8815 1.09464 22.0977 0.77002 21.2803 0.77002C20.463 0.77002 19.6791 1.09464 19.1011 1.67249L1.66419 19.1094C1.08634 19.6874 0.761719 20.4713 0.761719 21.2886C0.761719 22.106 1.08634 22.8898 1.66419 23.4679Z", diff --git a/src/_assets/icons/CategoryArrow.tsx b/src/assets/icons/CategoryArrow.tsx similarity index 95% rename from src/_assets/icons/CategoryArrow.tsx rename to src/assets/icons/CategoryArrow.tsx index b5a24b61..e6052696 100644 --- a/src/_assets/icons/CategoryArrow.tsx +++ b/src/assets/icons/CategoryArrow.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; const CategoryArrow = ({ width = 12, diff --git a/src/_assets/icons/Check.tsx b/src/assets/icons/Check.tsx similarity index 97% rename from src/_assets/icons/Check.tsx rename to src/assets/icons/Check.tsx index a7ba16bf..913252f3 100644 --- a/src/_assets/icons/Check.tsx +++ b/src/assets/icons/Check.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; const Check = ({ width = 24, height = 24, isPointable }: SVGAttribute) => { return ( diff --git a/src/_assets/icons/CheckIcon.tsx b/src/assets/icons/CheckIcon.tsx similarity index 100% rename from src/_assets/icons/CheckIcon.tsx rename to src/assets/icons/CheckIcon.tsx diff --git a/src/_assets/icons/CommentIcon.tsx b/src/assets/icons/CommentIcon.tsx similarity index 95% rename from src/_assets/icons/CommentIcon.tsx rename to src/assets/icons/CommentIcon.tsx index 7b9af36d..955454eb 100644 --- a/src/_assets/icons/CommentIcon.tsx +++ b/src/assets/icons/CommentIcon.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; const CommentIcon = ({ width = 22, diff --git a/src/_assets/icons/Curve.tsx b/src/assets/icons/Curve.tsx similarity index 100% rename from src/_assets/icons/Curve.tsx rename to src/assets/icons/Curve.tsx diff --git a/src/_assets/icons/DesktopIcon.tsx b/src/assets/icons/DesktopIcon.tsx similarity index 100% rename from src/_assets/icons/DesktopIcon.tsx rename to src/assets/icons/DesktopIcon.tsx diff --git a/src/_assets/icons/DistributionIcon.tsx b/src/assets/icons/DistributionIcon.tsx similarity index 100% rename from src/_assets/icons/DistributionIcon.tsx rename to src/assets/icons/DistributionIcon.tsx diff --git a/src/_assets/icons/Emoji.tsx b/src/assets/icons/Emoji.tsx similarity index 100% rename from src/_assets/icons/Emoji.tsx rename to src/assets/icons/Emoji.tsx diff --git a/src/_assets/icons/GraphIcon.tsx b/src/assets/icons/GraphIcon.tsx similarity index 100% rename from src/_assets/icons/GraphIcon.tsx rename to src/assets/icons/GraphIcon.tsx diff --git a/src/_assets/icons/HistorySeparator.tsx b/src/assets/icons/HistorySeparator.tsx similarity index 95% rename from src/_assets/icons/HistorySeparator.tsx rename to src/assets/icons/HistorySeparator.tsx index 281c9f4b..24972148 100644 --- a/src/_assets/icons/HistorySeparator.tsx +++ b/src/assets/icons/HistorySeparator.tsx @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; import React from "react"; const HistorySeparator = () => { diff --git a/src/_assets/icons/Like.tsx b/src/assets/icons/Like.tsx similarity index 97% rename from src/_assets/icons/Like.tsx rename to src/assets/icons/Like.tsx index 6bda358a..60ceb6ae 100644 --- a/src/_assets/icons/Like.tsx +++ b/src/assets/icons/Like.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; const Like = ({ width = 50, height = 50, isPointable }: SVGAttribute) => { return ( diff --git a/src/_assets/icons/LikeIcon.tsx b/src/assets/icons/LikeIcon.tsx similarity index 95% rename from src/_assets/icons/LikeIcon.tsx rename to src/assets/icons/LikeIcon.tsx index a7b4d510..3168fde9 100644 --- a/src/_assets/icons/LikeIcon.tsx +++ b/src/assets/icons/LikeIcon.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; import Like from "./Like"; interface ILikeIconProps extends SVGAttribute { diff --git a/src/_assets/icons/LinkArrow.tsx b/src/assets/icons/LinkArrow.tsx similarity index 95% rename from src/_assets/icons/LinkArrow.tsx rename to src/assets/icons/LinkArrow.tsx index 37a40832..32ded025 100644 --- a/src/_assets/icons/LinkArrow.tsx +++ b/src/assets/icons/LinkArrow.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; const LinkArrow = ({ width = 12, diff --git a/src/_assets/icons/Logo.tsx b/src/assets/icons/Logo.tsx similarity index 99% rename from src/_assets/icons/Logo.tsx rename to src/assets/icons/Logo.tsx index 15ecba39..f1e6136a 100644 --- a/src/_assets/icons/Logo.tsx +++ b/src/assets/icons/Logo.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; import styled from "styled-components"; const Logo = ({ isPointable }: SVGAttribute) => { diff --git a/src/_assets/icons/ProgressIcon.tsx b/src/assets/icons/ProgressIcon.tsx similarity index 100% rename from src/_assets/icons/ProgressIcon.tsx rename to src/assets/icons/ProgressIcon.tsx diff --git a/src/_assets/icons/Setting.tsx b/src/assets/icons/Setting.tsx similarity index 99% rename from src/_assets/icons/Setting.tsx rename to src/assets/icons/Setting.tsx index 4fb1fcd3..9156d948 100644 --- a/src/_assets/icons/Setting.tsx +++ b/src/assets/icons/Setting.tsx @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; interface ISettingProps extends React.SVGAttributes { width?: number; diff --git a/src/_assets/icons/Time.tsx b/src/assets/icons/Time.tsx similarity index 97% rename from src/_assets/icons/Time.tsx rename to src/assets/icons/Time.tsx index d0eb7b0e..12a4352a 100644 --- a/src/_assets/icons/Time.tsx +++ b/src/assets/icons/Time.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; const Time = ({ width = 21, height = 21, isPointable }: SVGAttribute) => { return ( diff --git a/src/_assets/icons/UploadIcon.tsx b/src/assets/icons/UploadIcon.tsx similarity index 98% rename from src/_assets/icons/UploadIcon.tsx rename to src/assets/icons/UploadIcon.tsx index 6e4debe5..c3d4862d 100644 --- a/src/_assets/icons/UploadIcon.tsx +++ b/src/assets/icons/UploadIcon.tsx @@ -1,4 +1,4 @@ -import { color, flex } from "@/_styles"; +import { color, flex } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_assets/icons/View.tsx b/src/assets/icons/View.tsx similarity index 97% rename from src/_assets/icons/View.tsx rename to src/assets/icons/View.tsx index dd84225d..b7fd3040 100644 --- a/src/_assets/icons/View.tsx +++ b/src/assets/icons/View.tsx @@ -1,4 +1,4 @@ -import { SVGAttribute } from "@/_interfaces"; +import { SVGAttribute } from "@/interfaces"; const View = ({ width = 31, height = 23, isPointable }: SVGAttribute) => { return ( diff --git a/src/_assets/icons/XIcon.tsx b/src/assets/icons/XIcon.tsx similarity index 100% rename from src/_assets/icons/XIcon.tsx rename to src/assets/icons/XIcon.tsx diff --git a/src/_assets/icons/emojis/Grinning.tsx b/src/assets/icons/emojis/Grinning.tsx similarity index 96% rename from src/_assets/icons/emojis/Grinning.tsx rename to src/assets/icons/emojis/Grinning.tsx index 571c22ab..4d357552 100644 --- a/src/_assets/icons/emojis/Grinning.tsx +++ b/src/assets/icons/emojis/Grinning.tsx @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; import StyledEmoji, { IStyledEmoji } from "./StyledEmoji"; const Grinning = ({ isHover, ...props }: IStyledEmoji) => { diff --git a/src/_assets/icons/emojis/HoldingBackTears.tsx b/src/assets/icons/emojis/HoldingBackTears.tsx similarity index 98% rename from src/_assets/icons/emojis/HoldingBackTears.tsx rename to src/assets/icons/emojis/HoldingBackTears.tsx index dcbb6f29..b8e450ca 100644 --- a/src/_assets/icons/emojis/HoldingBackTears.tsx +++ b/src/assets/icons/emojis/HoldingBackTears.tsx @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; import StyledEmoji, { IStyledEmoji } from "./StyledEmoji"; const HoldingBackTears = ({ isHover, ...props }: IStyledEmoji) => { diff --git a/src/_assets/icons/emojis/Kissing.tsx b/src/assets/icons/emojis/Kissing.tsx similarity index 98% rename from src/_assets/icons/emojis/Kissing.tsx rename to src/assets/icons/emojis/Kissing.tsx index 4b706a30..392b4a8e 100644 --- a/src/_assets/icons/emojis/Kissing.tsx +++ b/src/assets/icons/emojis/Kissing.tsx @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; import StyledEmoji, { IStyledEmoji } from "./StyledEmoji"; const Kissing = ({ isHover, ...props }: IStyledEmoji) => { diff --git a/src/_assets/icons/emojis/Laughing.tsx b/src/assets/icons/emojis/Laughing.tsx similarity index 97% rename from src/_assets/icons/emojis/Laughing.tsx rename to src/assets/icons/emojis/Laughing.tsx index 1837caa6..c55e369d 100644 --- a/src/_assets/icons/emojis/Laughing.tsx +++ b/src/assets/icons/emojis/Laughing.tsx @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; import StyledEmoji, { IStyledEmoji } from "./StyledEmoji"; const Laughing = ({ isHover, ...props }: IStyledEmoji) => { diff --git a/src/_assets/icons/emojis/Relaxed.tsx b/src/assets/icons/emojis/Relaxed.tsx similarity index 98% rename from src/_assets/icons/emojis/Relaxed.tsx rename to src/assets/icons/emojis/Relaxed.tsx index 3b5e3189..c1c30bd8 100644 --- a/src/_assets/icons/emojis/Relaxed.tsx +++ b/src/assets/icons/emojis/Relaxed.tsx @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; import StyledEmoji, { IStyledEmoji } from "./StyledEmoji"; const Relaxed = ({ isHover, ...props }: IStyledEmoji) => { diff --git a/src/_assets/icons/emojis/StyledEmoji.tsx b/src/assets/icons/emojis/StyledEmoji.tsx similarity index 100% rename from src/_assets/icons/emojis/StyledEmoji.tsx rename to src/assets/icons/emojis/StyledEmoji.tsx diff --git a/src/_assets/icons/index.ts b/src/assets/icons/index.ts similarity index 100% rename from src/_assets/icons/index.ts rename to src/assets/icons/index.ts diff --git a/src/_assets/images/QR.png b/src/assets/images/QR.png similarity index 100% rename from src/_assets/images/QR.png rename to src/assets/images/QR.png diff --git a/src/_assets/images/emoticon.png b/src/assets/images/emoticon.png similarity index 100% rename from src/_assets/images/emoticon.png rename to src/assets/images/emoticon.png diff --git a/src/_assets/images/empty_image.png b/src/assets/images/empty_image.png similarity index 100% rename from src/_assets/images/empty_image.png rename to src/assets/images/empty_image.png diff --git a/src/_assets/images/hugging_face.png b/src/assets/images/hugging_face.png similarity index 100% rename from src/_assets/images/hugging_face.png rename to src/assets/images/hugging_face.png diff --git a/src/_assets/images/index.ts b/src/assets/images/index.ts similarity index 100% rename from src/_assets/images/index.ts rename to src/assets/images/index.ts diff --git a/src/_assets/images/loading.gif b/src/assets/images/loading.gif similarity index 100% rename from src/_assets/images/loading.gif rename to src/assets/images/loading.gif diff --git a/src/_assets/images/profile_default.png b/src/assets/images/profile_default.png similarity index 100% rename from src/_assets/images/profile_default.png rename to src/assets/images/profile_default.png diff --git a/src/_assets/images/shushing_face.png b/src/assets/images/shushing_face.png similarity index 100% rename from src/_assets/images/shushing_face.png rename to src/assets/images/shushing_face.png diff --git a/src/_assets/images/thinking_face.png b/src/assets/images/thinking_face.png similarity index 100% rename from src/_assets/images/thinking_face.png rename to src/assets/images/thinking_face.png diff --git a/src/_components/Flex/Column.tsx b/src/components/Flex/Column.tsx similarity index 100% rename from src/_components/Flex/Column.tsx rename to src/components/Flex/Column.tsx diff --git a/src/_components/Flex/Row.tsx b/src/components/Flex/Row.tsx similarity index 100% rename from src/_components/Flex/Row.tsx rename to src/components/Flex/Row.tsx diff --git a/src/_components/Flex/index.ts b/src/components/Flex/index.ts similarity index 100% rename from src/_components/Flex/index.ts rename to src/components/Flex/index.ts diff --git a/src/_components/Flex/type.ts b/src/components/Flex/type.ts similarity index 100% rename from src/_components/Flex/type.ts rename to src/components/Flex/type.ts diff --git a/src/_components/atoms/AnonymousBox.tsx b/src/components/atoms/AnonymousBox.tsx similarity index 92% rename from src/_components/atoms/AnonymousBox.tsx rename to src/components/atoms/AnonymousBox.tsx index 8b853240..4819252b 100644 --- a/src/_components/atoms/AnonymousBox.tsx +++ b/src/components/atoms/AnonymousBox.tsx @@ -1,6 +1,6 @@ import styled, { css } from "styled-components"; -import { color, font } from "@/_styles"; -import { Check } from "@/_assets/icons"; +import { color, font } from "@/styles"; +import { Check } from "@/assets/icons"; interface IAnonymousBoxProps { clicked: boolean; diff --git a/src/_components/atoms/Button.tsx b/src/components/atoms/Button.tsx similarity index 91% rename from src/_components/atoms/Button.tsx rename to src/components/atoms/Button.tsx index 33219514..a75b64bd 100644 --- a/src/_components/atoms/Button.tsx +++ b/src/components/atoms/Button.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { color, font } from "@/_styles"; +import { color, font } from "@/styles"; interface IButtonProps extends React.ButtonHTMLAttributes { color: string; diff --git a/src/_components/atoms/Category.tsx b/src/components/atoms/Category.tsx similarity index 93% rename from src/_components/atoms/Category.tsx rename to src/components/atoms/Category.tsx index de2b3812..7eb2d359 100644 --- a/src/_components/atoms/Category.tsx +++ b/src/components/atoms/Category.tsx @@ -1,6 +1,6 @@ import styled, { css } from "styled-components"; -import { color, font } from "@/_styles"; -import { Row } from "@/_components/Flex"; +import { color, font } from "@/styles"; +import { Row } from "@/components/Flex"; interface ICategoryProps extends React.InputHTMLAttributes { id?: string; diff --git a/src/_components/atoms/CustomEditor.tsx b/src/components/atoms/CustomEditor.tsx similarity index 91% rename from src/_components/atoms/CustomEditor.tsx rename to src/components/atoms/CustomEditor.tsx index c410b22b..851b6c92 100644 --- a/src/_components/atoms/CustomEditor.tsx +++ b/src/components/atoms/CustomEditor.tsx @@ -8,9 +8,9 @@ import MDEditor, { MDEditorProps, getCommands, } from "@uiw/react-md-editor"; -import { UploadIcon } from "@/_assets/icons"; -import { getImageUrl } from "@/_helpers"; -import useModal from "@/_hooks/useModal"; +import { UploadIcon } from "@/assets/icons"; +import { getImageUrl } from "@/helpers"; +import useModal from "@/hooks/useModal"; import DragDrop from "./DragDrop"; type CustomEditorPropsType = MDEditorProps & React.RefAttributes; diff --git a/src/_components/atoms/CustomViewer.tsx b/src/components/atoms/CustomViewer.tsx similarity index 100% rename from src/_components/atoms/CustomViewer.tsx rename to src/components/atoms/CustomViewer.tsx diff --git a/src/_components/atoms/DragDrop.tsx b/src/components/atoms/DragDrop.tsx similarity index 99% rename from src/_components/atoms/DragDrop.tsx rename to src/components/atoms/DragDrop.tsx index 229ec0c6..0b408c38 100644 --- a/src/_components/atoms/DragDrop.tsx +++ b/src/components/atoms/DragDrop.tsx @@ -1,5 +1,5 @@ import Image from "next/image"; -import { color } from "@/_styles"; +import { color } from "@/styles"; import React from "react"; import styled, { css } from "styled-components"; import { Column, Row } from "../Flex"; diff --git a/src/_components/atoms/ImageWithFallback.tsx b/src/components/atoms/ImageWithFallback.tsx similarity index 100% rename from src/_components/atoms/ImageWithFallback.tsx rename to src/components/atoms/ImageWithFallback.tsx diff --git a/src/_components/atoms/Input.tsx b/src/components/atoms/Input.tsx similarity index 97% rename from src/_components/atoms/Input.tsx rename to src/components/atoms/Input.tsx index 0028a2ad..11db76ed 100644 --- a/src/_components/atoms/Input.tsx +++ b/src/components/atoms/Input.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled, { css } from "styled-components"; -import { color, font } from "@/_styles"; +import { color, font } from "@/styles"; interface IInputProps extends React.InputHTMLAttributes { width?: string; diff --git a/src/_components/atoms/Select.tsx b/src/components/atoms/Select.tsx similarity index 96% rename from src/_components/atoms/Select.tsx rename to src/components/atoms/Select.tsx index 9616d9c5..8a8083eb 100644 --- a/src/_components/atoms/Select.tsx +++ b/src/components/atoms/Select.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled, { css } from "styled-components"; -import { color, font } from "@/_styles"; -import { Arrow } from "@/_assets/icons"; +import { color, font } from "@/styles"; +import { Arrow } from "@/assets/icons"; interface ISelectProps { options: string[]; diff --git a/src/_components/atoms/Switch.tsx b/src/components/atoms/Switch.tsx similarity index 97% rename from src/_components/atoms/Switch.tsx rename to src/components/atoms/Switch.tsx index 45bfeb1a..6493a085 100644 --- a/src/_components/atoms/Switch.tsx +++ b/src/components/atoms/Switch.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled, { keyframes } from "styled-components"; -import { color } from "@/_styles"; +import { color } from "@/styles"; interface ISwitchProps { isSwitch: boolean; diff --git a/src/_components/atoms/index.ts b/src/components/atoms/index.ts similarity index 100% rename from src/_components/atoms/index.ts rename to src/components/atoms/index.ts diff --git a/src/_components/common/Aside/InfomationBox.tsx b/src/components/common/Aside/InfomationBox.tsx similarity index 88% rename from src/_components/common/Aside/InfomationBox.tsx rename to src/components/common/Aside/InfomationBox.tsx index 3744343b..a0493f0b 100644 --- a/src/_components/common/Aside/InfomationBox.tsx +++ b/src/components/common/Aside/InfomationBox.tsx @@ -1,13 +1,13 @@ import styled from "styled-components"; import Link from "next/link"; -import { color, font } from "@/_styles"; -import { USER, ROUTER } from "@/_constants"; -import { IUser } from "@/_interfaces"; -import { Row, Column } from "@/_components/Flex"; -import { getUserRole } from "@/_helpers"; -import flex from "@/_styles/flex"; -import { ImageWithFallback } from "@/_components/atoms"; -import { defaultProfile } from "@/_assets/images"; +import { color, font } from "@/styles"; +import { USER, ROUTER } from "@/constants"; +import { IUser } from "@/interfaces"; +import { Row, Column } from "@/components/Flex"; +import { getUserRole } from "@/helpers"; +import flex from "@/styles/flex"; +import { ImageWithFallback } from "@/components/atoms"; +import { defaultProfile } from "@/assets/images"; interface IInfomationBoxProps { user: IUser; diff --git a/src/_components/common/Aside/JoinCheckBox.tsx b/src/components/common/Aside/JoinCheckBox.tsx similarity index 96% rename from src/_components/common/Aside/JoinCheckBox.tsx rename to src/components/common/Aside/JoinCheckBox.tsx index cfc6193d..fc89df60 100644 --- a/src/_components/common/Aside/JoinCheckBox.tsx +++ b/src/components/common/Aside/JoinCheckBox.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { color, font } from "@/_styles"; +import { color, font } from "@/styles"; const JoinCheckBox = () => { return ( diff --git a/src/_components/common/Aside/MeisterBox.tsx b/src/components/common/Aside/MeisterBox.tsx similarity index 91% rename from src/_components/common/Aside/MeisterBox.tsx rename to src/components/common/Aside/MeisterBox.tsx index c5ff78da..fb6492c0 100644 --- a/src/_components/common/Aside/MeisterBox.tsx +++ b/src/components/common/Aside/MeisterBox.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; -import { color, font } from "@/_styles"; -import { SERVICE } from "@/_constants"; -import { Row } from "@/_components/Flex"; +import { color, font } from "@/styles"; +import { SERVICE } from "@/constants"; +import { Row } from "@/components/Flex"; const scores = [ { diff --git a/src/_components/common/Aside/index.tsx b/src/components/common/Aside/index.tsx similarity index 90% rename from src/_components/common/Aside/index.tsx rename to src/components/common/Aside/index.tsx index b7c60e60..94c23aec 100644 --- a/src/_components/common/Aside/index.tsx +++ b/src/components/common/Aside/index.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; -import useUser from "@/_hooks/useUser"; -import { Row } from "@/_components/Flex"; +import useUser from "@/hooks/useUser"; +import { Row } from "@/components/Flex"; import InfomationBox from "./InfomationBox"; import MeisterBox from "./MeisterBox"; import JoinCheckBox from "./JoinCheckBox"; diff --git a/src/_components/common/Footer/Info.tsx b/src/components/common/Footer/Info.tsx similarity index 93% rename from src/_components/common/Footer/Info.tsx rename to src/components/common/Footer/Info.tsx index 89e2653e..da01dc12 100644 --- a/src/_components/common/Footer/Info.tsx +++ b/src/components/common/Footer/Info.tsx @@ -1,8 +1,8 @@ import styled from "styled-components"; import Image from "next/image"; -import { color, font } from "@/_styles"; -import { QR } from "@/_assets/images"; -import { Row, Column } from "@/_components/Flex"; +import { color, font } from "@/styles"; +import { QR } from "@/assets/images"; +import { Row, Column } from "@/components/Flex"; const Info = () => { const { name, service, headline, serviceInfo, policy, inquery, copyRight } = { diff --git a/src/_components/common/Footer/index.tsx b/src/components/common/Footer/index.tsx similarity index 93% rename from src/_components/common/Footer/index.tsx rename to src/components/common/Footer/index.tsx index 21659364..088bd647 100644 --- a/src/_components/common/Footer/index.tsx +++ b/src/components/common/Footer/index.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { color } from "@/_styles"; +import { color } from "@/styles"; import Info from "./Info"; const Footer = () => { diff --git a/src/_components/common/Header/Navigation.tsx b/src/components/common/Header/Navigation.tsx similarity index 94% rename from src/_components/common/Header/Navigation.tsx rename to src/components/common/Header/Navigation.tsx index 7cb33d68..8897506c 100644 --- a/src/_components/common/Header/Navigation.tsx +++ b/src/components/common/Header/Navigation.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { color, flex, font } from "@/_styles"; +import { color, flex, font } from "@/styles"; const navigationTypes = [ { diff --git a/src/_components/common/Header/SubHeader.tsx b/src/components/common/Header/SubHeader.tsx similarity index 93% rename from src/_components/common/Header/SubHeader.tsx rename to src/components/common/Header/SubHeader.tsx index f5bf0f70..cf808960 100644 --- a/src/_components/common/Header/SubHeader.tsx +++ b/src/components/common/Header/SubHeader.tsx @@ -1,5 +1,5 @@ -import { Logo, Setting } from "@/_assets/icons"; -import { color } from "@/_styles"; +import { Logo, Setting } from "@/assets/icons"; +import { color } from "@/styles"; import React from "react"; import styled, { keyframes } from "styled-components"; import SubNavigation from "./SubNavigation"; diff --git a/src/_components/common/Header/SubNavigation.tsx b/src/components/common/Header/SubNavigation.tsx similarity index 97% rename from src/_components/common/Header/SubNavigation.tsx rename to src/components/common/Header/SubNavigation.tsx index 941f52d5..d87af9db 100644 --- a/src/_components/common/Header/SubNavigation.tsx +++ b/src/components/common/Header/SubNavigation.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { color, flex, font } from "@/_styles"; +import { color, flex, font } from "@/styles"; import Link from "next/link"; const navigations = [ diff --git a/src/_components/common/Header/index.tsx b/src/components/common/Header/index.tsx similarity index 89% rename from src/_components/common/Header/index.tsx rename to src/components/common/Header/index.tsx index 2730386c..81ec75a3 100644 --- a/src/_components/common/Header/index.tsx +++ b/src/components/common/Header/index.tsx @@ -1,10 +1,10 @@ import React from "react"; import styled from "styled-components"; import Link from "next/link"; -import { color, flex } from "@/_styles"; -import { Logo, Setting } from "@/_assets/icons"; -import useModal from "@/_hooks/useModal"; -import { SettingModal } from "@/_components/common"; +import { color, flex } from "@/styles"; +import { Logo, Setting } from "@/assets/icons"; +import useModal from "@/hooks/useModal"; +import { SettingModal } from "@/components/common"; import Navigation from "./Navigation"; import SubHeader from "./SubHeader"; diff --git a/src/_components/common/Modal/BambooCreateModal/index.tsx b/src/components/common/Modal/BambooCreateModal/index.tsx similarity index 87% rename from src/_components/common/Modal/BambooCreateModal/index.tsx rename to src/components/common/Modal/BambooCreateModal/index.tsx index f599a503..8b81084b 100644 --- a/src/_components/common/Modal/BambooCreateModal/index.tsx +++ b/src/components/common/Modal/BambooCreateModal/index.tsx @@ -1,8 +1,8 @@ -import { XIcon } from "@/_assets/icons"; -import { Button } from "@/_components/atoms"; -import useModal from "@/_hooks/useModal"; -import { useCreateBambooMutation } from "@/_pages/bamboo/services/mutation.service"; -import { color, flex, font } from "@/_styles"; +import { XIcon } from "@/assets/icons"; +import { Button } from "@/components/atoms"; +import useModal from "@/hooks/useModal"; +import { useCreateBambooMutation } from "@/templates/bamboo/services/mutation.service"; +import { color, flex, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_components/common/Modal/BambooManageModal/BambooHeader.tsx b/src/components/common/Modal/BambooManageModal/BambooHeader.tsx similarity index 84% rename from src/_components/common/Modal/BambooManageModal/BambooHeader.tsx rename to src/components/common/Modal/BambooManageModal/BambooHeader.tsx index 7da7db64..5dd472d3 100644 --- a/src/_components/common/Modal/BambooManageModal/BambooHeader.tsx +++ b/src/components/common/Modal/BambooManageModal/BambooHeader.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; -import { font } from "@/_styles"; -import { XIcon } from "@/_assets/icons"; -import useModal from "@/_hooks/useModal"; +import { font } from "@/styles"; +import { XIcon } from "@/assets/icons"; +import useModal from "@/hooks/useModal"; const BambooHeader = () => { const { closeModal } = useModal(); diff --git a/src/_components/common/Modal/BambooManageModal/BambooManagePostListItem.tsx b/src/components/common/Modal/BambooManageModal/BambooManagePostListItem.tsx similarity index 84% rename from src/_components/common/Modal/BambooManageModal/BambooManagePostListItem.tsx rename to src/components/common/Modal/BambooManageModal/BambooManagePostListItem.tsx index f3853977..073f777e 100644 --- a/src/_components/common/Modal/BambooManageModal/BambooManagePostListItem.tsx +++ b/src/components/common/Modal/BambooManageModal/BambooManagePostListItem.tsx @@ -1,9 +1,9 @@ -import { Row } from "@/_components/Flex"; -import Button from "@/_components/atoms/Button"; -import useDate from "@/_hooks/useDate"; -import IBambooPendingPost from "@/_interfaces/bambooPendingPost.interface"; -import { useAllowBambooMutation } from "@/_pages/bamboo/services/mutation.service"; -import { color, flex, font } from "@/_styles"; +import { Row } from "@/components/Flex"; +import Button from "@/components/atoms/Button"; +import useDate from "@/hooks/useDate"; +import IBambooPendingPost from "@/interfaces/bambooPendingPost.interface"; +import { useAllowBambooMutation } from "@/templates/bamboo/services/mutation.service"; +import { color, flex, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_components/common/Modal/BambooManageModal/index.tsx b/src/components/common/Modal/BambooManageModal/index.tsx similarity index 90% rename from src/_components/common/Modal/BambooManageModal/index.tsx rename to src/components/common/Modal/BambooManageModal/index.tsx index 3eb0389a..8779214e 100644 --- a/src/_components/common/Modal/BambooManageModal/index.tsx +++ b/src/components/common/Modal/BambooManageModal/index.tsx @@ -1,7 +1,7 @@ -import { color, flex, font } from "@/_styles"; +import { color, flex, font } from "@/styles"; import React from "react"; import styled from "styled-components"; -import { useBambooPendingListQuery } from "@/_pages/bamboo/services/query.service"; +import { useBambooPendingListQuery } from "@/templates/bamboo/services/query.service"; import BambooHeader from "./BambooHeader"; import BambooManagePostListItem from "./BambooManagePostListItem"; diff --git a/src/_components/common/Modal/ConfirmModal/index.tsx b/src/components/common/Modal/ConfirmModal/index.tsx similarity index 87% rename from src/_components/common/Modal/ConfirmModal/index.tsx rename to src/components/common/Modal/ConfirmModal/index.tsx index 6f2ba6b5..2114da32 100644 --- a/src/_components/common/Modal/ConfirmModal/index.tsx +++ b/src/components/common/Modal/ConfirmModal/index.tsx @@ -1,6 +1,6 @@ -import { Row } from "@/_components/Flex"; -import { Button } from "@/_components/atoms"; -import { color, flex, font } from "@/_styles"; +import { Row } from "@/components/Flex"; +import { Button } from "@/components/atoms"; +import { color, flex, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_components/common/Modal/EmojiModal/ModalHeader.tsx b/src/components/common/Modal/EmojiModal/ModalHeader.tsx similarity index 89% rename from src/_components/common/Modal/EmojiModal/ModalHeader.tsx rename to src/components/common/Modal/EmojiModal/ModalHeader.tsx index ed43059e..20f056ea 100644 --- a/src/_components/common/Modal/EmojiModal/ModalHeader.tsx +++ b/src/components/common/Modal/EmojiModal/ModalHeader.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; -import { color, font } from "@/_styles"; -import { XIcon, HoldingBackTears } from "@/_assets/icons"; +import { color, font } from "@/styles"; +import { XIcon, HoldingBackTears } from "@/assets/icons"; interface IModalHeaderProps { handleClickCloseButton: () => void; diff --git a/src/_components/common/Modal/EmojiModal/ModalList.tsx b/src/components/common/Modal/EmojiModal/ModalList.tsx similarity index 100% rename from src/_components/common/Modal/EmojiModal/ModalList.tsx rename to src/components/common/Modal/EmojiModal/ModalList.tsx diff --git a/src/_components/common/Modal/EmojiModal/ModalListItem.tsx b/src/components/common/Modal/EmojiModal/ModalListItem.tsx similarity index 97% rename from src/_components/common/Modal/EmojiModal/ModalListItem.tsx rename to src/components/common/Modal/EmojiModal/ModalListItem.tsx index 19118bba..109c3291 100644 --- a/src/_components/common/Modal/EmojiModal/ModalListItem.tsx +++ b/src/components/common/Modal/EmojiModal/ModalListItem.tsx @@ -1,6 +1,6 @@ import Image from "next/image"; import styled from "styled-components"; -import { color, font } from "@/_styles"; +import { color, font } from "@/styles"; const ModalListItem = () => { return ( diff --git a/src/_components/common/Modal/EmojiModal/index.tsx b/src/components/common/Modal/EmojiModal/index.tsx similarity index 97% rename from src/_components/common/Modal/EmojiModal/index.tsx rename to src/components/common/Modal/EmojiModal/index.tsx index 09271f7e..b719adaa 100644 --- a/src/_components/common/Modal/EmojiModal/index.tsx +++ b/src/components/common/Modal/EmojiModal/index.tsx @@ -1,5 +1,5 @@ import styled, { css } from "styled-components"; -import { color } from "@/_styles"; +import { color } from "@/styles"; import ModalList from "./ModalList"; import ModalHeader from "./ModalHeader"; diff --git a/src/_components/common/Modal/PlanAddModal/index.tsx b/src/components/common/Modal/PlanAddModal/index.tsx similarity index 87% rename from src/_components/common/Modal/PlanAddModal/index.tsx rename to src/components/common/Modal/PlanAddModal/index.tsx index 76710704..96bceeac 100644 --- a/src/_components/common/Modal/PlanAddModal/index.tsx +++ b/src/components/common/Modal/PlanAddModal/index.tsx @@ -1,10 +1,10 @@ -import { XIcon } from "@/_assets/icons"; -import { Column } from "@/_components/Flex"; -import { Button, Input, Select } from "@/_components/atoms"; -import useModal from "@/_hooks/useModal"; -import useUser from "@/_hooks/useUser"; -import { useAddCalenderPlanMutation } from "@/_pages/calender/services/mutation.service"; -import { color, flex, font } from "@/_styles"; +import { XIcon } from "@/assets/icons"; +import { Column } from "@/components/Flex"; +import { Button, Input, Select } from "@/components/atoms"; +import useModal from "@/hooks/useModal"; +import useUser from "@/hooks/useUser"; +import { useAddCalenderPlanMutation } from "@/templates/calender/services/mutation.service"; +import { color, flex, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_components/common/Modal/SettingModal/SettingBody.tsx b/src/components/common/Modal/SettingModal/SettingBody.tsx similarity index 97% rename from src/_components/common/Modal/SettingModal/SettingBody.tsx rename to src/components/common/Modal/SettingModal/SettingBody.tsx index e6cae472..9e8222d5 100644 --- a/src/_components/common/Modal/SettingModal/SettingBody.tsx +++ b/src/components/common/Modal/SettingModal/SettingBody.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; -import { color, font } from "@/_styles"; -import { Switch } from "@/_components/atoms"; +import { color, font } from "@/styles"; +import { Switch } from "@/components/atoms"; const settingOptions = [ { diff --git a/src/_components/common/Modal/SettingModal/SettingHeader.tsx b/src/components/common/Modal/SettingModal/SettingHeader.tsx similarity index 86% rename from src/_components/common/Modal/SettingModal/SettingHeader.tsx rename to src/components/common/Modal/SettingModal/SettingHeader.tsx index 84118580..8705160a 100644 --- a/src/_components/common/Modal/SettingModal/SettingHeader.tsx +++ b/src/components/common/Modal/SettingModal/SettingHeader.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; -import { font } from "@/_styles"; -import { XIcon, Setting } from "@/_assets/icons"; -import useModal from "@/_hooks/useModal"; +import { font } from "@/styles"; +import { XIcon, Setting } from "@/assets/icons"; +import useModal from "@/hooks/useModal"; const SettingHeader = () => { const { closeModal } = useModal(); diff --git a/src/_components/common/Modal/SettingModal/index.tsx b/src/components/common/Modal/SettingModal/index.tsx similarity index 93% rename from src/_components/common/Modal/SettingModal/index.tsx rename to src/components/common/Modal/SettingModal/index.tsx index c0d5cb11..7c898568 100644 --- a/src/_components/common/Modal/SettingModal/index.tsx +++ b/src/components/common/Modal/SettingModal/index.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { color } from "@/_styles"; +import { color } from "@/styles"; import SettingHeader from "./SettingHeader"; import SettingBody from "./SettingBody"; diff --git a/src/_components/common/Modal/View.tsx b/src/components/common/Modal/View.tsx similarity index 95% rename from src/_components/common/Modal/View.tsx rename to src/components/common/Modal/View.tsx index b3be24f0..f6068797 100644 --- a/src/_components/common/Modal/View.tsx +++ b/src/components/common/Modal/View.tsx @@ -1,5 +1,5 @@ import styled, { css } from "styled-components"; -import { IModalState } from "@/_interfaces"; +import { IModalState } from "@/interfaces"; interface ModalViewProps extends IModalState { onClose?: () => void; diff --git a/src/_components/common/Modal/index.tsx b/src/components/common/Modal/index.tsx similarity index 81% rename from src/_components/common/Modal/index.tsx rename to src/components/common/Modal/index.tsx index 5345cf64..7e7e2dc4 100644 --- a/src/_components/common/Modal/index.tsx +++ b/src/components/common/Modal/index.tsx @@ -1,6 +1,6 @@ import { useRecoilState } from "recoil"; -import useModal from "@/_hooks/useModal"; -import modalStore from "@/_store/modal.store"; +import useModal from "@/hooks/useModal"; +import modalStore from "@/store/modal.store"; import ModalView from "./View"; const Modal = () => { diff --git a/src/_components/common/index.ts b/src/components/common/index.ts similarity index 100% rename from src/_components/common/index.ts rename to src/components/common/index.ts diff --git a/src/_config/index.ts b/src/config/index.ts similarity index 100% rename from src/_config/index.ts rename to src/config/index.ts diff --git a/src/_constants/applications.constant.ts b/src/constants/applications.constant.ts similarity index 100% rename from src/_constants/applications.constant.ts rename to src/constants/applications.constant.ts diff --git a/src/_constants/bamboo.constant.ts b/src/constants/bamboo.constant.ts similarity index 100% rename from src/_constants/bamboo.constant.ts rename to src/constants/bamboo.constant.ts diff --git a/src/_constants/domitory.constant.ts b/src/constants/domitory.constant.ts similarity index 100% rename from src/_constants/domitory.constant.ts rename to src/constants/domitory.constant.ts diff --git a/src/_constants/error.constant.ts b/src/constants/error.constant.ts similarity index 100% rename from src/_constants/error.constant.ts rename to src/constants/error.constant.ts diff --git a/src/_constants/forum.constant.ts b/src/constants/forum.constant.ts similarity index 100% rename from src/_constants/forum.constant.ts rename to src/constants/forum.constant.ts diff --git a/src/_constants/index.ts b/src/constants/index.ts similarity index 100% rename from src/_constants/index.ts rename to src/constants/index.ts diff --git a/src/_constants/key.constant.ts b/src/constants/key.constant.ts similarity index 100% rename from src/_constants/key.constant.ts rename to src/constants/key.constant.ts diff --git a/src/_constants/likeType.constant.ts b/src/constants/likeType.constant.ts similarity index 100% rename from src/_constants/likeType.constant.ts rename to src/constants/likeType.constant.ts diff --git a/src/_constants/lostfound.constant.ts b/src/constants/lostfound.constant.ts similarity index 100% rename from src/_constants/lostfound.constant.ts rename to src/constants/lostfound.constant.ts diff --git a/src/_constants/meal.constant.ts b/src/constants/meal.constant.ts similarity index 100% rename from src/_constants/meal.constant.ts rename to src/constants/meal.constant.ts diff --git a/src/_constants/post.constant.ts b/src/constants/post.constant.ts similarity index 100% rename from src/_constants/post.constant.ts rename to src/constants/post.constant.ts diff --git a/src/_constants/postInput.constant.ts b/src/constants/postInput.constant.ts similarity index 100% rename from src/_constants/postInput.constant.ts rename to src/constants/postInput.constant.ts diff --git a/src/_constants/role.constant.ts b/src/constants/role.constant.ts similarity index 100% rename from src/_constants/role.constant.ts rename to src/constants/role.constant.ts diff --git a/src/_constants/router.constant.ts b/src/constants/router.constant.ts similarity index 100% rename from src/_constants/router.constant.ts rename to src/constants/router.constant.ts diff --git a/src/_constants/service.constant.ts b/src/constants/service.constant.ts similarity index 100% rename from src/_constants/service.constant.ts rename to src/constants/service.constant.ts diff --git a/src/_constants/token.constant.ts b/src/constants/token.constant.ts similarity index 100% rename from src/_constants/token.constant.ts rename to src/constants/token.constant.ts diff --git a/src/_constants/user.constant.ts b/src/constants/user.constant.ts similarity index 100% rename from src/_constants/user.constant.ts rename to src/constants/user.constant.ts diff --git a/src/_fixture/applicationList.ts b/src/fixture/applicationList.ts similarity index 100% rename from src/_fixture/applicationList.ts rename to src/fixture/applicationList.ts diff --git a/src/_fixture/index.ts b/src/fixture/index.ts similarity index 100% rename from src/_fixture/index.ts rename to src/fixture/index.ts diff --git a/src/_fixture/post.ts b/src/fixture/post.ts similarity index 76% rename from src/_fixture/post.ts rename to src/fixture/post.ts index 787d0b21..d49a0cf4 100644 --- a/src/_fixture/post.ts +++ b/src/fixture/post.ts @@ -1,5 +1,5 @@ -import { POST } from "@/_constants"; -import { IPost } from "@/_interfaces"; +import { POST } from "@/constants"; +import { IPost } from "@/interfaces"; const post: IPost = { id: "-1", diff --git a/src/_fixture/postList.ts b/src/fixture/postList.ts similarity index 78% rename from src/_fixture/postList.ts rename to src/fixture/postList.ts index 412cb5e3..451317cb 100644 --- a/src/_fixture/postList.ts +++ b/src/fixture/postList.ts @@ -1,5 +1,5 @@ -import { POST } from "@/_constants"; -import { PostListType } from "@/_types"; +import { POST } from "@/constants"; +import { PostListType } from "@/types"; const postList: PostListType = [ { diff --git a/src/_gql/post/data.ts b/src/graphql/post/data.ts similarity index 100% rename from src/_gql/post/data.ts rename to src/graphql/post/data.ts diff --git a/src/_gql/post/queries.ts b/src/graphql/post/queries.ts similarity index 96% rename from src/_gql/post/queries.ts rename to src/graphql/post/queries.ts index 1ef94cd2..0bb391fe 100644 --- a/src/_gql/post/queries.ts +++ b/src/graphql/post/queries.ts @@ -1,5 +1,5 @@ import { gql } from "@apollo/client"; -import { PostCategoryType } from "@/_types"; +import { PostCategoryType } from "@/types"; import { DEFAULT_POST, ALL_POST, posts } from "./data"; interface IPostProps { diff --git a/src/_helpers/checkPostValid.helper.ts b/src/helpers/checkPostValid.helper.ts similarity index 95% rename from src/_helpers/checkPostValid.helper.ts rename to src/helpers/checkPostValid.helper.ts index fe39ce8e..1551c360 100644 --- a/src/_helpers/checkPostValid.helper.ts +++ b/src/helpers/checkPostValid.helper.ts @@ -1,5 +1,5 @@ -import { POST } from "@/_constants"; -import { IInputPost } from "@/_interfaces"; +import { POST } from "@/constants"; +import { IInputPost } from "@/interfaces"; import { toast } from "react-toastify"; const checkPostValid = (post: IInputPost) => { diff --git a/src/_helpers/checkTextOverflow.helper.ts b/src/helpers/checkTextOverflow.helper.ts similarity index 100% rename from src/_helpers/checkTextOverflow.helper.ts rename to src/helpers/checkTextOverflow.helper.ts diff --git a/src/_helpers/filterInputPost.helper.ts b/src/helpers/filterInputPost.helper.ts similarity index 90% rename from src/_helpers/filterInputPost.helper.ts rename to src/helpers/filterInputPost.helper.ts index 41d3ca84..4f21d4d7 100644 --- a/src/_helpers/filterInputPost.helper.ts +++ b/src/helpers/filterInputPost.helper.ts @@ -1,5 +1,5 @@ -import { POST } from "@/_constants"; -import { IInputPost } from "@/_interfaces"; +import { POST } from "@/constants"; +import { IInputPost } from "@/interfaces"; const filterInputPost = (post: IInputPost) => { const { diff --git a/src/_helpers/getCategory.helper.ts b/src/helpers/getCategory.helper.ts similarity index 86% rename from src/_helpers/getCategory.helper.ts rename to src/helpers/getCategory.helper.ts index 2a78d50e..b705360c 100644 --- a/src/_helpers/getCategory.helper.ts +++ b/src/helpers/getCategory.helper.ts @@ -1,4 +1,4 @@ -import { PostCategoryType } from "@/_types"; +import { PostCategoryType } from "@/types"; const POSTNAME = { COMMON: "일반", diff --git a/src/_helpers/getClassName.helper.ts b/src/helpers/getClassName.helper.ts similarity index 100% rename from src/_helpers/getClassName.helper.ts rename to src/helpers/getClassName.helper.ts diff --git a/src/_helpers/getDay.helper.ts b/src/helpers/getDay.helper.ts similarity index 100% rename from src/_helpers/getDay.helper.ts rename to src/helpers/getDay.helper.ts diff --git a/src/_helpers/getImageUrl.helper.ts b/src/helpers/getImageUrl.helper.ts similarity index 86% rename from src/_helpers/getImageUrl.helper.ts rename to src/helpers/getImageUrl.helper.ts index ecae22ca..d5fe1348 100644 --- a/src/_helpers/getImageUrl.helper.ts +++ b/src/helpers/getImageUrl.helper.ts @@ -1,4 +1,4 @@ -import httpClient from "@/_apis/httpClient"; +import httpClient from "@/apis/httpClient"; const getImageUrl = async (file: File | undefined) => { if (file) { diff --git a/src/_helpers/getMealName.helper.ts b/src/helpers/getMealName.helper.ts similarity index 100% rename from src/_helpers/getMealName.helper.ts rename to src/helpers/getMealName.helper.ts diff --git a/src/_helpers/getMeisterChapter.helper.ts b/src/helpers/getMeisterChapter.helper.ts similarity index 100% rename from src/_helpers/getMeisterChapter.helper.ts rename to src/helpers/getMeisterChapter.helper.ts diff --git a/src/_helpers/getPageSize.helper.ts b/src/helpers/getPageSize.helper.ts similarity index 60% rename from src/_helpers/getPageSize.helper.ts rename to src/helpers/getPageSize.helper.ts index 2c384de8..91e5c0df 100644 --- a/src/_helpers/getPageSize.helper.ts +++ b/src/helpers/getPageSize.helper.ts @@ -1,5 +1,5 @@ -import Storage from "@/_apis/storage"; -import { TOKEN } from "@/_constants"; +import Storage from "@/apis/storage"; +import { TOKEN } from "@/constants"; const getPageSize = () => { return Storage.getItem(TOKEN.POST_RENDER_LIMIT) ?? 10; diff --git a/src/_helpers/getStatusColor.helper.ts b/src/helpers/getStatusColor.helper.ts similarity index 84% rename from src/_helpers/getStatusColor.helper.ts rename to src/helpers/getStatusColor.helper.ts index 9738266d..8f22fcc6 100644 --- a/src/_helpers/getStatusColor.helper.ts +++ b/src/helpers/getStatusColor.helper.ts @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; const getStatusColor = (index: number) => { if (!index) return color.primary_yellow; diff --git a/src/_helpers/getTextDepth.helper.ts b/src/helpers/getTextDepth.helper.ts similarity index 100% rename from src/_helpers/getTextDepth.helper.ts rename to src/helpers/getTextDepth.helper.ts diff --git a/src/_helpers/getTimetableType.helper.ts b/src/helpers/getTimetableType.helper.ts similarity index 100% rename from src/_helpers/getTimetableType.helper.ts rename to src/helpers/getTimetableType.helper.ts diff --git a/src/_helpers/getToken.helper.ts b/src/helpers/getToken.helper.ts similarity index 56% rename from src/_helpers/getToken.helper.ts rename to src/helpers/getToken.helper.ts index 0f429023..c5d8f128 100644 --- a/src/_helpers/getToken.helper.ts +++ b/src/helpers/getToken.helper.ts @@ -1,5 +1,5 @@ -import Storage from "@/_apis/storage"; -import { TOKEN } from "@/_constants"; +import Storage from "@/apis/storage"; +import { TOKEN } from "@/constants"; const getToken = () => { return Storage.getItem(TOKEN.ACCESS) || ""; diff --git a/src/_helpers/getUserRole.helper.ts b/src/helpers/getUserRole.helper.ts similarity index 85% rename from src/_helpers/getUserRole.helper.ts rename to src/helpers/getUserRole.helper.ts index 7b77763f..754acbac 100644 --- a/src/_helpers/getUserRole.helper.ts +++ b/src/helpers/getUserRole.helper.ts @@ -1,4 +1,4 @@ -import { USER } from "@/_constants"; +import { USER } from "@/constants"; const ROLE = { STUDENT: "학생", diff --git a/src/_helpers/getWriteContentLabel.helper.ts b/src/helpers/getWriteContentLabel.helper.ts similarity index 86% rename from src/_helpers/getWriteContentLabel.helper.ts rename to src/helpers/getWriteContentLabel.helper.ts index 4258f1a8..371b2b6c 100644 --- a/src/_helpers/getWriteContentLabel.helper.ts +++ b/src/helpers/getWriteContentLabel.helper.ts @@ -1,5 +1,5 @@ -import { POST } from "@/_constants"; -import { PostCategoryType } from "@/_types"; +import { POST } from "@/constants"; +import { PostCategoryType } from "@/types"; const getWriteContentLabel = (category: PostCategoryType) => { if (category === POST.PROJECT) return "프로젝트에 대해 설명해주세요."; diff --git a/src/_helpers/index.ts b/src/helpers/index.ts similarity index 100% rename from src/_helpers/index.ts rename to src/helpers/index.ts diff --git a/src/_helpers/isAdmin.helper.ts b/src/helpers/isAdmin.helper.ts similarity index 73% rename from src/_helpers/isAdmin.helper.ts rename to src/helpers/isAdmin.helper.ts index fb2ea858..a6c0ca9d 100644 --- a/src/_helpers/isAdmin.helper.ts +++ b/src/helpers/isAdmin.helper.ts @@ -1,4 +1,4 @@ -import ROLE from "@/_constants/role.constant"; +import ROLE from "@/constants/role.constant"; const isAdmin = (authority: string) => { if (authority === ROLE.ADMIN) return true; diff --git a/src/_hooks/useDate.ts b/src/hooks/useDate.ts similarity index 100% rename from src/_hooks/useDate.ts rename to src/hooks/useDate.ts diff --git a/src/_hooks/useDidMountEffect.ts b/src/hooks/useDidMountEffect.ts similarity index 100% rename from src/_hooks/useDidMountEffect.ts rename to src/hooks/useDidMountEffect.ts diff --git a/src/_hooks/useEmoji.ts b/src/hooks/useEmoji.ts similarity index 100% rename from src/_hooks/useEmoji.ts rename to src/hooks/useEmoji.ts diff --git a/src/_hooks/useMeisterHTML.ts b/src/hooks/useMeisterHTML.ts similarity index 99% rename from src/_hooks/useMeisterHTML.ts rename to src/hooks/useMeisterHTML.ts index 4df91559..de51f995 100644 --- a/src/_hooks/useMeisterHTML.ts +++ b/src/hooks/useMeisterHTML.ts @@ -1,4 +1,4 @@ -import { color } from "@/_styles"; +import { color } from "@/styles"; // 심신미약자나 노약자, 임산부, 유아는 코드를 읽는 것을 삼가하기바람 diff --git a/src/_hooks/useModal.ts b/src/hooks/useModal.ts similarity index 85% rename from src/_hooks/useModal.ts rename to src/hooks/useModal.ts index afeadf77..37f6eff1 100644 --- a/src/_hooks/useModal.ts +++ b/src/hooks/useModal.ts @@ -1,7 +1,7 @@ import React from "react"; import { useRecoilState } from "recoil"; -import { IModalState } from "@/_interfaces"; -import modalStore from "@/_store/modal.store"; +import { IModalState } from "@/interfaces"; +import modalStore from "@/store/modal.store"; const useModal = () => { const [modal, setModal] = useRecoilState(modalStore); diff --git a/src/_hooks/useTextarea.ts b/src/hooks/useTextarea.ts similarity index 100% rename from src/_hooks/useTextarea.ts rename to src/hooks/useTextarea.ts diff --git a/src/_hooks/useTimetableBar.ts b/src/hooks/useTimetableBar.ts similarity index 97% rename from src/_hooks/useTimetableBar.ts rename to src/hooks/useTimetableBar.ts index c833525d..2c1e6683 100644 --- a/src/_hooks/useTimetableBar.ts +++ b/src/hooks/useTimetableBar.ts @@ -1,5 +1,5 @@ import React from "react"; -import useDate from "@/_hooks/useDate"; +import useDate from "@/hooks/useDate"; const useTimetableBar = () => { const date = useDate(); diff --git a/src/_hooks/useUser.ts b/src/hooks/useUser.ts similarity index 77% rename from src/_hooks/useUser.ts rename to src/hooks/useUser.ts index b1588dd1..b4851258 100644 --- a/src/_hooks/useUser.ts +++ b/src/hooks/useUser.ts @@ -2,15 +2,15 @@ import React from "react"; import { useRouter } from "next/navigation"; import { useQuery } from "@tanstack/react-query"; import { useRecoilState } from "recoil"; -import httpClient, { HttpClient } from "@/_apis/httpClient/httpClient"; -import KEY from "@/_constants/key.constant"; -import { IUser } from "@/_interfaces"; -import { emptyUser, userStore } from "@/_store/user.store"; -import useWindow from "@/_hooks/useWindow"; -import useModal from "@/_hooks/useModal"; -import Storage from "@/_apis/storage"; -import { ERROR, TOKEN } from "@/_constants"; -import { authorization, refresh } from "@/_apis/token"; +import httpClient, { HttpClient } from "@/apis/httpClient/httpClient"; +import KEY from "@/constants/key.constant"; +import { IUser } from "@/interfaces"; +import { emptyUser, userStore } from "@/store/user.store"; +import useWindow from "@/hooks/useWindow"; +import useModal from "@/hooks/useModal"; +import Storage from "@/apis/storage"; +import { ERROR, TOKEN } from "@/constants"; +import { authorization, refresh } from "@/apis/token"; import { isAxiosError } from "axios"; interface UseUserOptions { diff --git a/src/_hooks/useWindow.ts b/src/hooks/useWindow.ts similarity index 100% rename from src/_hooks/useWindow.ts rename to src/hooks/useWindow.ts diff --git a/src/_interfaces/SVGAttribute.interface.ts b/src/interfaces/SVGAttribute.interface.ts similarity index 100% rename from src/_interfaces/SVGAttribute.interface.ts rename to src/interfaces/SVGAttribute.interface.ts diff --git a/src/_interfaces/bambooPendingPost.interface.ts b/src/interfaces/bambooPendingPost.interface.ts similarity index 100% rename from src/_interfaces/bambooPendingPost.interface.ts rename to src/interfaces/bambooPendingPost.interface.ts diff --git a/src/_interfaces/bambooPost.interface.ts b/src/interfaces/bambooPost.interface.ts similarity index 100% rename from src/_interfaces/bambooPost.interface.ts rename to src/interfaces/bambooPost.interface.ts diff --git a/src/_interfaces/calender.interface.ts b/src/interfaces/calender.interface.ts similarity index 100% rename from src/_interfaces/calender.interface.ts rename to src/interfaces/calender.interface.ts diff --git a/src/_interfaces/calenderItem.interface.ts b/src/interfaces/calenderItem.interface.ts similarity index 100% rename from src/_interfaces/calenderItem.interface.ts rename to src/interfaces/calenderItem.interface.ts diff --git a/src/_interfaces/classInfo.interface.ts b/src/interfaces/classInfo.interface.ts similarity index 100% rename from src/_interfaces/classInfo.interface.ts rename to src/interfaces/classInfo.interface.ts diff --git a/src/_interfaces/classLevel.interface.ts b/src/interfaces/classLevel.interface.ts similarity index 100% rename from src/_interfaces/classLevel.interface.ts rename to src/interfaces/classLevel.interface.ts diff --git a/src/_interfaces/comment.interface.ts b/src/interfaces/comment.interface.ts similarity index 100% rename from src/_interfaces/comment.interface.ts rename to src/interfaces/comment.interface.ts diff --git a/src/_interfaces/commentList.interface.ts b/src/interfaces/commentList.interface.ts similarity index 100% rename from src/_interfaces/commentList.interface.ts rename to src/interfaces/commentList.interface.ts diff --git a/src/_interfaces/createReserve.interface.ts b/src/interfaces/createReserve.interface.ts similarity index 100% rename from src/_interfaces/createReserve.interface.ts rename to src/interfaces/createReserve.interface.ts diff --git a/src/_interfaces/emoji.interface.ts b/src/interfaces/emoji.interface.ts similarity index 100% rename from src/_interfaces/emoji.interface.ts rename to src/interfaces/emoji.interface.ts diff --git a/src/_interfaces/index.ts b/src/interfaces/index.ts similarity index 100% rename from src/_interfaces/index.ts rename to src/interfaces/index.ts diff --git a/src/_interfaces/infiniteResult.interface.ts b/src/interfaces/infiniteResult.interface.ts similarity index 100% rename from src/_interfaces/infiniteResult.interface.ts rename to src/interfaces/infiniteResult.interface.ts diff --git a/src/_interfaces/inputPost.interface.ts b/src/interfaces/inputPost.interface.ts similarity index 86% rename from src/_interfaces/inputPost.interface.ts rename to src/interfaces/inputPost.interface.ts index 4fda269e..40e7e791 100644 --- a/src/_interfaces/inputPost.interface.ts +++ b/src/interfaces/inputPost.interface.ts @@ -1,4 +1,4 @@ -import { PostCategoryType } from "@/_types"; +import { PostCategoryType } from "@/types"; export default interface IInputPost { id: string; diff --git a/src/_interfaces/meal.interface.ts b/src/interfaces/meal.interface.ts similarity index 100% rename from src/_interfaces/meal.interface.ts rename to src/interfaces/meal.interface.ts diff --git a/src/_interfaces/mealList.interface.ts b/src/interfaces/mealList.interface.ts similarity index 100% rename from src/_interfaces/mealList.interface.ts rename to src/interfaces/mealList.interface.ts diff --git a/src/_interfaces/meister.interface.ts b/src/interfaces/meister.interface.ts similarity index 100% rename from src/_interfaces/meister.interface.ts rename to src/interfaces/meister.interface.ts diff --git a/src/_interfaces/modal.interface.ts b/src/interfaces/modal.interface.ts similarity index 100% rename from src/_interfaces/modal.interface.ts rename to src/interfaces/modal.interface.ts diff --git a/src/_interfaces/plan.interface.ts b/src/interfaces/plan.interface.ts similarity index 100% rename from src/_interfaces/plan.interface.ts rename to src/interfaces/plan.interface.ts diff --git a/src/_interfaces/post.interface.ts b/src/interfaces/post.interface.ts similarity index 93% rename from src/_interfaces/post.interface.ts rename to src/interfaces/post.interface.ts index 8ab2563a..cb33f446 100644 --- a/src/_interfaces/post.interface.ts +++ b/src/interfaces/post.interface.ts @@ -1,4 +1,4 @@ -import { PostCategoryType } from "@/_types"; +import { PostCategoryType } from "@/types"; export default interface IPost { id: string; diff --git a/src/_interfaces/postInfiniteList.interface.ts b/src/interfaces/postInfiniteList.interface.ts similarity index 69% rename from src/_interfaces/postInfiniteList.interface.ts rename to src/interfaces/postInfiniteList.interface.ts index d3dd5f92..f9425052 100644 --- a/src/_interfaces/postInfiniteList.interface.ts +++ b/src/interfaces/postInfiniteList.interface.ts @@ -1,4 +1,4 @@ -import PostListType from "@/_types/postList.type"; +import PostListType from "@/types/postList.type"; export default interface IPostInfiniteList { entity: PostListType; diff --git a/src/_interfaces/postList.interface.ts b/src/interfaces/postList.interface.ts similarity index 100% rename from src/_interfaces/postList.interface.ts rename to src/interfaces/postList.interface.ts diff --git a/src/_interfaces/postQuery.interface.ts b/src/interfaces/postQuery.interface.ts similarity index 100% rename from src/_interfaces/postQuery.interface.ts rename to src/interfaces/postQuery.interface.ts diff --git a/src/_interfaces/recomment.interface.ts b/src/interfaces/recomment.interface.ts similarity index 100% rename from src/_interfaces/recomment.interface.ts rename to src/interfaces/recomment.interface.ts diff --git a/src/_interfaces/reserve.interface.ts b/src/interfaces/reserve.interface.ts similarity index 100% rename from src/_interfaces/reserve.interface.ts rename to src/interfaces/reserve.interface.ts diff --git a/src/_interfaces/reserveList.interface.ts b/src/interfaces/reserveList.interface.ts similarity index 100% rename from src/_interfaces/reserveList.interface.ts rename to src/interfaces/reserveList.interface.ts diff --git a/src/_interfaces/timetable.interface.ts b/src/interfaces/timetable.interface.ts similarity index 62% rename from src/_interfaces/timetable.interface.ts rename to src/interfaces/timetable.interface.ts index f17c98ec..96192cf5 100644 --- a/src/_interfaces/timetable.interface.ts +++ b/src/interfaces/timetable.interface.ts @@ -1,4 +1,4 @@ -import { IClassInfo } from "@/_interfaces"; +import { IClassInfo } from "@/interfaces"; export default interface ITimetable { [day: string]: IClassInfo[]; diff --git a/src/_interfaces/user.interface.ts b/src/interfaces/user.interface.ts similarity index 100% rename from src/_interfaces/user.interface.ts rename to src/interfaces/user.interface.ts diff --git a/src/_provider/apolloClientProvider.helper.tsx b/src/provider/apolloClientProvider.helper.tsx similarity index 92% rename from src/_provider/apolloClientProvider.helper.tsx rename to src/provider/apolloClientProvider.helper.tsx index b43cd5a9..6ee75228 100644 --- a/src/_provider/apolloClientProvider.helper.tsx +++ b/src/provider/apolloClientProvider.helper.tsx @@ -1,4 +1,4 @@ -import { getToken } from "@/_helpers"; +import { getToken } from "@/helpers"; import { ApolloClient, ApolloProvider, InMemoryCache } from "@apollo/client"; import { PropsWithChildren } from "react"; diff --git a/src/_provider/layoutProvider.helper.tsx b/src/provider/layoutProvider.helper.tsx similarity index 81% rename from src/_provider/layoutProvider.helper.tsx rename to src/provider/layoutProvider.helper.tsx index 00a3ca68..c612e43e 100644 --- a/src/_provider/layoutProvider.helper.tsx +++ b/src/provider/layoutProvider.helper.tsx @@ -1,6 +1,6 @@ -import { Column } from "@/_components/Flex"; -import { Footer, Header, Modal } from "@/_components/common"; -import { GlobalStyle } from "@/_styles"; +import { Column } from "@/components/Flex"; +import { Footer, Header, Modal } from "@/components/common"; +import { GlobalStyle } from "@/styles"; import React from "react"; import { ToastContainer, toast } from "react-toastify"; import styled from "styled-components"; diff --git a/src/_provider/provider.helper.tsx b/src/provider/provider.helper.tsx similarity index 100% rename from src/_provider/provider.helper.tsx rename to src/provider/provider.helper.tsx diff --git a/src/_provider/reactQueryProvider.helper.tsx b/src/provider/reactQueryProvider.helper.tsx similarity index 90% rename from src/_provider/reactQueryProvider.helper.tsx rename to src/provider/reactQueryProvider.helper.tsx index 840f3da0..7d3e8257 100644 --- a/src/_provider/reactQueryProvider.helper.tsx +++ b/src/provider/reactQueryProvider.helper.tsx @@ -1,6 +1,6 @@ "use client"; -import throwAxiosError from "@/_apis/error/throwAxiosError"; +import throwAxiosError from "@/apis/error/throwAxiosError"; import React from "react"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; diff --git a/src/_store/bamboo.store.ts b/src/store/bamboo.store.ts similarity index 73% rename from src/_store/bamboo.store.ts rename to src/store/bamboo.store.ts index 98ed6625..81d02eec 100644 --- a/src/_store/bamboo.store.ts +++ b/src/store/bamboo.store.ts @@ -1,4 +1,4 @@ -import BAMBOO from "@/_constants/bamboo.constant"; +import BAMBOO from "@/constants/bamboo.constant"; import { atom } from "recoil"; export const bambooFilterStore = atom({ diff --git a/src/_store/categories.store.ts b/src/store/categories.store.ts similarity index 63% rename from src/_store/categories.store.ts rename to src/store/categories.store.ts index 853d7298..78ad2caa 100644 --- a/src/_store/categories.store.ts +++ b/src/store/categories.store.ts @@ -1,5 +1,5 @@ -import { POST } from "@/_constants"; -import { PostCategoryType } from "@/_types"; +import { POST } from "@/constants"; +import { PostCategoryType } from "@/types"; import { atom } from "recoil"; export const categoriesStore = atom({ diff --git a/src/_store/domitory.store.ts b/src/store/domitory.store.ts similarity index 73% rename from src/_store/domitory.store.ts rename to src/store/domitory.store.ts index 43cbbec5..bfb33592 100644 --- a/src/_store/domitory.store.ts +++ b/src/store/domitory.store.ts @@ -1,4 +1,4 @@ -import DOMITORY from "@/_constants/domitory.constant"; +import DOMITORY from "@/constants/domitory.constant"; import { atom } from "recoil"; export const domitoryFilterStore = atom({ diff --git a/src/_store/forumFilter.store.ts b/src/store/forumFilter.store.ts similarity index 78% rename from src/_store/forumFilter.store.ts rename to src/store/forumFilter.store.ts index cc47a0b4..ceee7ac2 100644 --- a/src/_store/forumFilter.store.ts +++ b/src/store/forumFilter.store.ts @@ -1,4 +1,4 @@ -import { FORUM } from "@/_constants"; +import { FORUM } from "@/constants"; import { atom } from "recoil"; export const forumFilterStore = atom({ diff --git a/src/_store/modal.store.ts b/src/store/modal.store.ts similarity index 80% rename from src/_store/modal.store.ts rename to src/store/modal.store.ts index 1a9ed751..b2488ef0 100644 --- a/src/_store/modal.store.ts +++ b/src/store/modal.store.ts @@ -1,4 +1,4 @@ -import { IModalState } from "@/_interfaces"; +import { IModalState } from "@/interfaces"; import { atom } from "recoil"; const modalStore = atom({ diff --git a/src/_store/reserveViewType.store.ts b/src/store/reserveViewType.store.ts similarity index 100% rename from src/_store/reserveViewType.store.ts rename to src/store/reserveViewType.store.ts diff --git a/src/_store/room.store.ts b/src/store/room.store.ts similarity index 100% rename from src/_store/room.store.ts rename to src/store/room.store.ts diff --git a/src/_store/user.store.ts b/src/store/user.store.ts similarity index 90% rename from src/_store/user.store.ts rename to src/store/user.store.ts index 6d33dd87..cb6cff38 100644 --- a/src/_store/user.store.ts +++ b/src/store/user.store.ts @@ -1,4 +1,4 @@ -import { IUser } from "@/_interfaces"; +import { IUser } from "@/interfaces"; import { atom } from "recoil"; export const emptyUser: IUser = { diff --git a/src/_styles/color.ts b/src/styles/color.ts similarity index 100% rename from src/_styles/color.ts rename to src/styles/color.ts diff --git a/src/_styles/flex.ts b/src/styles/flex.ts similarity index 100% rename from src/_styles/flex.ts rename to src/styles/flex.ts diff --git a/src/_styles/font.ts b/src/styles/font.ts similarity index 100% rename from src/_styles/font.ts rename to src/styles/font.ts diff --git a/src/_styles/index.ts b/src/styles/index.ts similarity index 100% rename from src/_styles/index.ts rename to src/styles/index.ts diff --git a/src/_styles/style.ts b/src/styles/style.ts similarity index 100% rename from src/_styles/style.ts rename to src/styles/style.ts diff --git a/src/_pages/applications/index.tsx b/src/templates/applications/index.tsx similarity index 83% rename from src/_pages/applications/index.tsx rename to src/templates/applications/index.tsx index 31e0af44..024a24a9 100644 --- a/src/_pages/applications/index.tsx +++ b/src/templates/applications/index.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; -import { Aside } from "@/_components/common"; -import { Column } from "@/_components/Flex"; -import { font } from "@/_styles"; +import { Aside } from "@/components/common"; +import { Column } from "@/components/Flex"; +import { font } from "@/styles"; import AppList from "./layouts/AppList"; const ApplicationsPage = () => { diff --git a/src/_pages/applications/layouts/AppList.tsx b/src/templates/applications/layouts/AppList.tsx similarity index 89% rename from src/_pages/applications/layouts/AppList.tsx rename to src/templates/applications/layouts/AppList.tsx index 29fec1e0..e25b5cfc 100644 --- a/src/_pages/applications/layouts/AppList.tsx +++ b/src/templates/applications/layouts/AppList.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { applicaionList } from "@/_fixture"; +import { applicaionList } from "@/fixture"; import AppListItem from "./AppListItem"; const AppList = () => { diff --git a/src/_pages/applications/layouts/AppListItem.tsx b/src/templates/applications/layouts/AppListItem.tsx similarity index 91% rename from src/_pages/applications/layouts/AppListItem.tsx rename to src/templates/applications/layouts/AppListItem.tsx index df0596e5..3c2e74ec 100644 --- a/src/_pages/applications/layouts/AppListItem.tsx +++ b/src/templates/applications/layouts/AppListItem.tsx @@ -1,8 +1,8 @@ import Link from "next/link"; import styled from "styled-components"; -import { Row, Column } from "@/_components/Flex"; -import { color, font } from "@/_styles"; -import { Arrow } from "@/_assets/icons"; +import { Row, Column } from "@/components/Flex"; +import { color, font } from "@/styles"; +import { Arrow } from "@/assets/icons"; interface IAppListItemProps { name: string; diff --git a/src/_pages/bamboo/index.tsx b/src/templates/bamboo/index.tsx similarity index 88% rename from src/_pages/bamboo/index.tsx rename to src/templates/bamboo/index.tsx index b2848cb2..0f4068f4 100644 --- a/src/_pages/bamboo/index.tsx +++ b/src/templates/bamboo/index.tsx @@ -1,9 +1,9 @@ -import { Aside } from "@/_components/common"; -import { Row } from "@/_components/Flex"; -import { flex } from "@/_styles"; +import { flex } from "@/styles"; +import { Aside } from "@/components/common"; +import { Row } from "@/components/Flex"; import React from "react"; import styled from "styled-components"; -import { HuggingFace, ShushingFace, ThinkingFace } from "@/_assets/images"; +import { HuggingFace, ShushingFace, ThinkingFace } from "@/assets/images"; import BambooButton from "./layouts/BambooButton"; import BambooPostList from "./layouts/BambooPostList"; diff --git a/src/_pages/bamboo/layouts/BambooButton.tsx b/src/templates/bamboo/layouts/BambooButton.tsx similarity index 91% rename from src/_pages/bamboo/layouts/BambooButton.tsx rename to src/templates/bamboo/layouts/BambooButton.tsx index 1bcb40b3..75f791d5 100644 --- a/src/_pages/bamboo/layouts/BambooButton.tsx +++ b/src/templates/bamboo/layouts/BambooButton.tsx @@ -1,5 +1,5 @@ -import { Column, Row } from "@/_components/Flex"; -import { color, flex, font } from "@/_styles"; +import { Column, Row } from "@/components/Flex"; +import { color, flex, font } from "@/styles"; import Image, { StaticImageData } from "next/image"; import React from "react"; import styled from "styled-components"; diff --git a/src/_pages/bamboo/layouts/BambooPostList.tsx b/src/templates/bamboo/layouts/BambooPostList.tsx similarity index 86% rename from src/_pages/bamboo/layouts/BambooPostList.tsx rename to src/templates/bamboo/layouts/BambooPostList.tsx index 0e657bfd..1e279463 100644 --- a/src/_pages/bamboo/layouts/BambooPostList.tsx +++ b/src/templates/bamboo/layouts/BambooPostList.tsx @@ -2,14 +2,14 @@ import React from "react"; import styled from "styled-components"; import InfiniteScroll from "react-infinite-scroll-component"; import { PuffLoader } from "react-spinners"; -import { color, flex, font } from "@/_styles"; -import useUser from "@/_hooks/useUser"; -import { Row } from "@/_components/Flex"; -import { IBambooPost } from "@/_interfaces"; -import { BambooManageModal } from "@/_components/common"; -import useModal from "@/_hooks/useModal"; -import { isAdmin } from "@/_helpers"; -import BambooCreateModal from "@/_components/common/Modal/BambooCreateModal"; +import { color, flex, font } from "@/styles"; +import useUser from "@/hooks/useUser"; +import { Row } from "@/components/Flex"; +import { IBambooPost } from "@/interfaces"; +import { BambooManageModal } from "@/components/common"; +import useModal from "@/hooks/useModal"; +import { isAdmin } from "@/helpers"; +import BambooCreateModal from "@/components/common/Modal/BambooCreateModal"; import BambooPostListItem from "./BambooPostListItem"; import { useBambooListQuery } from "../services/query.service"; diff --git a/src/_pages/bamboo/layouts/BambooPostListItem.tsx b/src/templates/bamboo/layouts/BambooPostListItem.tsx similarity index 86% rename from src/_pages/bamboo/layouts/BambooPostListItem.tsx rename to src/templates/bamboo/layouts/BambooPostListItem.tsx index 82b3425e..45e18318 100644 --- a/src/_pages/bamboo/layouts/BambooPostListItem.tsx +++ b/src/templates/bamboo/layouts/BambooPostListItem.tsx @@ -1,10 +1,10 @@ -import { Row } from "@/_components/Flex"; -import { Button } from "@/_components/atoms"; -import { isAdmin } from "@/_helpers"; -import useDate from "@/_hooks/useDate"; -import useUser from "@/_hooks/useUser"; -import { IBambooPost } from "@/_interfaces"; -import { color, flex, font } from "@/_styles"; +import { Row } from "@/components/Flex"; +import { Button } from "@/components/atoms"; +import { isAdmin } from "@/helpers"; +import useDate from "@/hooks/useDate"; +import useUser from "@/hooks/useUser"; +import { IBambooPost } from "@/interfaces"; +import { color, flex, font } from "@/styles"; import React from "react"; import styled from "styled-components"; import { useDeleteBambooMutation } from "../services/mutation.service"; diff --git a/src/_pages/bamboo/services/api.service.ts b/src/templates/bamboo/services/api.service.ts similarity index 94% rename from src/_pages/bamboo/services/api.service.ts rename to src/templates/bamboo/services/api.service.ts index 374e8415..93aa5cb0 100644 --- a/src/_pages/bamboo/services/api.service.ts +++ b/src/templates/bamboo/services/api.service.ts @@ -1,4 +1,4 @@ -import httpClient from "@/_apis/httpClient"; +import httpClient from "@/apis/httpClient"; export const getBambooPostList = async (page: number) => { const { data } = await httpClient.bamboo.get({ diff --git a/src/_pages/bamboo/services/mutation.service.ts b/src/templates/bamboo/services/mutation.service.ts similarity index 93% rename from src/_pages/bamboo/services/mutation.service.ts rename to src/templates/bamboo/services/mutation.service.ts index 203a6507..a8da6443 100644 --- a/src/_pages/bamboo/services/mutation.service.ts +++ b/src/templates/bamboo/services/mutation.service.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; import { toast } from "react-toastify"; -import { KEY } from "@/_constants"; -import useModal from "@/_hooks/useModal"; +import { KEY } from "@/constants"; +import useModal from "@/hooks/useModal"; import { createBambooPost, deleteBambooPost, diff --git a/src/_pages/bamboo/services/query.service.ts b/src/templates/bamboo/services/query.service.ts similarity index 87% rename from src/_pages/bamboo/services/query.service.ts rename to src/templates/bamboo/services/query.service.ts index cf711cf4..d806f83d 100644 --- a/src/_pages/bamboo/services/query.service.ts +++ b/src/templates/bamboo/services/query.service.ts @@ -1,6 +1,6 @@ import { useInfiniteQuery, useQuery } from "@tanstack/react-query"; -import { KEY } from "@/_constants"; -import IBambooPendingPost from "@/_interfaces/bambooPendingPost.interface"; +import { KEY } from "@/constants"; +import IBambooPendingPost from "@/interfaces/bambooPendingPost.interface"; import { getBambooPendingPostList, getBambooPostList } from "./api.service"; export const useBambooListQuery = () => { diff --git a/src/_pages/calender/index.tsx b/src/templates/calender/index.tsx similarity index 89% rename from src/_pages/calender/index.tsx rename to src/templates/calender/index.tsx index f34c2e32..8712984d 100644 --- a/src/_pages/calender/index.tsx +++ b/src/templates/calender/index.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; -import { color, flex, font } from "@/_styles"; -import { Column } from "@/_components/Flex"; +import { color, flex, font } from "@/styles"; +import { Column } from "@/components/Flex"; import ScheduleBox from "./layouts/ScheduleBox"; const CalenderPage = () => { diff --git a/src/_pages/calender/layouts/CalenderList.tsx b/src/templates/calender/layouts/CalenderList.tsx similarity index 93% rename from src/_pages/calender/layouts/CalenderList.tsx rename to src/templates/calender/layouts/CalenderList.tsx index 8c8e40b2..11c4fd2f 100644 --- a/src/_pages/calender/layouts/CalenderList.tsx +++ b/src/templates/calender/layouts/CalenderList.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import dayjs from "dayjs"; -import ICalenderItem from "@/_interfaces/calenderItem.interface"; +import ICalenderItem from "@/interfaces/calenderItem.interface"; import CalenderListItem from "./CalenderListItem"; interface ICalenderListProps { diff --git a/src/_pages/calender/layouts/CalenderListItem.tsx b/src/templates/calender/layouts/CalenderListItem.tsx similarity index 87% rename from src/_pages/calender/layouts/CalenderListItem.tsx rename to src/templates/calender/layouts/CalenderListItem.tsx index df1e65e0..5791fa24 100644 --- a/src/_pages/calender/layouts/CalenderListItem.tsx +++ b/src/templates/calender/layouts/CalenderListItem.tsx @@ -1,12 +1,12 @@ -import { defaultProfile } from "@/_assets/images"; -import { Row } from "@/_components/Flex"; -import { ImageWithFallback } from "@/_components/atoms"; -import PlanAddModal from "@/_components/common/Modal/PlanAddModal"; -import { getClassName, getDay } from "@/_helpers"; -import useModal from "@/_hooks/useModal"; -import useUser from "@/_hooks/useUser"; -import ICalenderItem from "@/_interfaces/calenderItem.interface"; -import { color, flex, font } from "@/_styles"; +import { defaultProfile } from "@/assets/images"; +import { Row } from "@/components/Flex"; +import { ImageWithFallback } from "@/components/atoms"; +import PlanAddModal from "@/components/common/Modal/PlanAddModal"; +import { getClassName, getDay } from "@/helpers"; +import useModal from "@/hooks/useModal"; +import useUser from "@/hooks/useUser"; +import ICalenderItem from "@/interfaces/calenderItem.interface"; +import { color, flex, font } from "@/styles"; import styled, { css } from "styled-components"; import { useDeleteCalenderPlanMutation } from "../services/mutation.service"; diff --git a/src/_pages/calender/layouts/DateBox.tsx b/src/templates/calender/layouts/DateBox.tsx similarity index 86% rename from src/_pages/calender/layouts/DateBox.tsx rename to src/templates/calender/layouts/DateBox.tsx index 848e0b1a..7a0ad1c9 100644 --- a/src/_pages/calender/layouts/DateBox.tsx +++ b/src/templates/calender/layouts/DateBox.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; -import { Row } from "@/_components/Flex"; -import { font } from "@/_styles"; +import { Row } from "@/components/Flex"; +import { font } from "@/styles"; interface IDateBoxProps { currentMonth: number; diff --git a/src/_pages/calender/layouts/ScheduleBox.tsx b/src/templates/calender/layouts/ScheduleBox.tsx similarity index 94% rename from src/_pages/calender/layouts/ScheduleBox.tsx rename to src/templates/calender/layouts/ScheduleBox.tsx index aff72f61..f6a67a25 100644 --- a/src/_pages/calender/layouts/ScheduleBox.tsx +++ b/src/templates/calender/layouts/ScheduleBox.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; -import { color } from "@/_styles"; -import { Column } from "@/_components/Flex"; +import { color } from "@/styles"; +import { Column } from "@/components/Flex"; import DateBox from "./DateBox"; import WeekBox from "./WeekBox"; import CalenderList from "./CalenderList"; diff --git a/src/_pages/calender/layouts/WeekBox.tsx b/src/templates/calender/layouts/WeekBox.tsx similarity index 89% rename from src/_pages/calender/layouts/WeekBox.tsx rename to src/templates/calender/layouts/WeekBox.tsx index 7d447d7c..a96c51c6 100644 --- a/src/_pages/calender/layouts/WeekBox.tsx +++ b/src/templates/calender/layouts/WeekBox.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; -import { color, flex, font } from "@/_styles"; -import useDate from "@/_hooks/useDate"; +import { color, flex, font } from "@/styles"; +import useDate from "@/hooks/useDate"; const WeekBox = () => { const { weekdaysKOR: weekdays } = useDate(); diff --git a/src/_pages/calender/services/api.service.ts b/src/templates/calender/services/api.service.ts similarity index 85% rename from src/_pages/calender/services/api.service.ts rename to src/templates/calender/services/api.service.ts index b3184838..35460c57 100644 --- a/src/_pages/calender/services/api.service.ts +++ b/src/templates/calender/services/api.service.ts @@ -1,5 +1,5 @@ -import httpClient from "@/_apis/httpClient"; -import { ICalender } from "@/_interfaces"; +import httpClient from "@/apis/httpClient"; +import { ICalender } from "@/interfaces"; export const getCalenderList = async (month: number) => { const { data } = await httpClient.calender.get({ diff --git a/src/_pages/calender/services/mutation.service.ts b/src/templates/calender/services/mutation.service.ts similarity index 87% rename from src/_pages/calender/services/mutation.service.ts rename to src/templates/calender/services/mutation.service.ts index 565efe28..0b9a4bed 100644 --- a/src/_pages/calender/services/mutation.service.ts +++ b/src/templates/calender/services/mutation.service.ts @@ -1,7 +1,7 @@ import { toast } from "react-toastify"; -import useModal from "@/_hooks/useModal"; -import { KEY } from "@/_constants"; -import { ICalender } from "@/_interfaces"; +import useModal from "@/hooks/useModal"; +import { KEY } from "@/constants"; +import { ICalender } from "@/interfaces"; import { useMutation, useQueryClient } from "@tanstack/react-query"; import { createCalenderItem, deleteCalenderItem } from "./api.service"; diff --git a/src/_pages/calender/services/query.service.ts b/src/templates/calender/services/query.service.ts similarity index 91% rename from src/_pages/calender/services/query.service.ts rename to src/templates/calender/services/query.service.ts index d010811f..47111252 100644 --- a/src/_pages/calender/services/query.service.ts +++ b/src/templates/calender/services/query.service.ts @@ -1,4 +1,4 @@ -import { KEY } from "@/_constants"; +import { KEY } from "@/constants"; import { useQuery } from "@tanstack/react-query"; import { getCalenderList } from "./api.service"; diff --git a/src/_pages/domitory/index.tsx b/src/templates/domitory/index.tsx similarity index 87% rename from src/_pages/domitory/index.tsx rename to src/templates/domitory/index.tsx index ab1f3b87..58cf0dd0 100644 --- a/src/_pages/domitory/index.tsx +++ b/src/templates/domitory/index.tsx @@ -1,7 +1,7 @@ -import { Aside } from "@/_components/common"; -import { color, flex, font } from "@/_styles"; -import { Column, Row } from "@/_components/Flex"; -import { Button } from "@/_components/atoms"; +import { Aside } from "@/components/common"; +import { color, flex, font } from "@/styles"; +import { Column, Row } from "@/components/Flex"; +import { Button } from "@/components/atoms"; import React from "react"; import styled from "styled-components"; import DomitoryFilter from "./layouts/DomitoryFilter"; diff --git a/src/_pages/domitory/layouts/DomitoryFilter.tsx b/src/templates/domitory/layouts/DomitoryFilter.tsx similarity index 86% rename from src/_pages/domitory/layouts/DomitoryFilter.tsx rename to src/templates/domitory/layouts/DomitoryFilter.tsx index e6883edf..96776c97 100644 --- a/src/_pages/domitory/layouts/DomitoryFilter.tsx +++ b/src/templates/domitory/layouts/DomitoryFilter.tsx @@ -1,11 +1,11 @@ import React from "react"; import styled, { css, keyframes } from "styled-components"; -import { Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; -import { FORUM } from "@/_constants"; +import { Row } from "@/components/Flex"; +import { color, font } from "@/styles"; +import { FORUM } from "@/constants"; import { useRecoilState } from "recoil"; -import { domitoryFilterStore } from "@/_store/domitory.store"; -import DOMITORY from "@/_constants/domitory.constant"; +import { domitoryFilterStore } from "@/store/domitory.store"; +import DOMITORY from "@/constants/domitory.constant"; const filters = [ { diff --git a/src/_pages/domitory/layouts/DomitoryListItem.tsx b/src/templates/domitory/layouts/DomitoryListItem.tsx similarity index 94% rename from src/_pages/domitory/layouts/DomitoryListItem.tsx rename to src/templates/domitory/layouts/DomitoryListItem.tsx index 4ed14867..6643dc2b 100644 --- a/src/_pages/domitory/layouts/DomitoryListItem.tsx +++ b/src/templates/domitory/layouts/DomitoryListItem.tsx @@ -1,5 +1,5 @@ -import { Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; +import { Row } from "@/components/Flex"; +import { color, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_pages/forum-edit/index.tsx b/src/templates/forum-edit/index.tsx similarity index 92% rename from src/_pages/forum-edit/index.tsx rename to src/templates/forum-edit/index.tsx index 4c97f45f..9788cea8 100644 --- a/src/_pages/forum-edit/index.tsx +++ b/src/templates/forum-edit/index.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Aside } from "@/_components/common"; +import { Aside } from "@/components/common"; import UpdateBox from "./layouts/UpdateBox"; interface IPostPageParams { diff --git a/src/_pages/forum-edit/layouts/InputBox.tsx b/src/templates/forum-edit/layouts/InputBox.tsx similarity index 93% rename from src/_pages/forum-edit/layouts/InputBox.tsx rename to src/templates/forum-edit/layouts/InputBox.tsx index b84ce252..d423ddfc 100644 --- a/src/_pages/forum-edit/layouts/InputBox.tsx +++ b/src/templates/forum-edit/layouts/InputBox.tsx @@ -3,14 +3,14 @@ import styled from "styled-components"; import { toast } from "react-toastify"; import { useRouter } from "next/navigation"; import { useApolloClient } from "@apollo/client"; -import { CustomEditor, Input } from "@/_components/atoms"; -import { Column, Row } from "@/_components/Flex"; -import { emptyInputPost } from "@/_assets/data"; -import { color, font } from "@/_styles"; -import { POST, POST_INPUT, ROUTER } from "@/_constants"; -import { filterInputPost, getImageUrl } from "@/_helpers"; -import useDate from "@/_hooks/useDate"; -import DragDrop from "@/_components/atoms/DragDrop"; +import { CustomEditor, Input } from "@/components/atoms"; +import { Column, Row } from "@/components/Flex"; +import { emptyInputPost } from "@/assets/data"; +import { color, font } from "@/styles"; +import { POST, POST_INPUT, ROUTER } from "@/constants"; +import { filterInputPost, getImageUrl } from "@/helpers"; +import useDate from "@/hooks/useDate"; +import DragDrop from "@/components/atoms/DragDrop"; import { useUpdatePostMutation } from "../services/mutation.service"; import { useUpdatePostQuery } from "../services/query.service"; diff --git a/src/_pages/forum-edit/layouts/UpdateBox.tsx b/src/templates/forum-edit/layouts/UpdateBox.tsx similarity index 89% rename from src/_pages/forum-edit/layouts/UpdateBox.tsx rename to src/templates/forum-edit/layouts/UpdateBox.tsx index ad167116..79560334 100644 --- a/src/_pages/forum-edit/layouts/UpdateBox.tsx +++ b/src/templates/forum-edit/layouts/UpdateBox.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; -import { Column } from "@/_components/Flex"; -import { color, font } from "@/_styles"; +import { Column } from "@/components/Flex"; +import { color, font } from "@/styles"; import InputBox from "./InputBox"; interface IUpdateBoxProps { diff --git a/src/_pages/forum-edit/services/mutation.service.ts b/src/templates/forum-edit/services/mutation.service.ts similarity index 74% rename from src/_pages/forum-edit/services/mutation.service.ts rename to src/templates/forum-edit/services/mutation.service.ts index 3e3e0ec7..629c54eb 100644 --- a/src/_pages/forum-edit/services/mutation.service.ts +++ b/src/templates/forum-edit/services/mutation.service.ts @@ -1,4 +1,4 @@ -import { UPDATE_POST } from "@/_gql/post/queries"; +import { UPDATE_POST } from "@/graphql/post/queries"; import { useMutation } from "@apollo/client"; export const useUpdatePostMutation = () => { diff --git a/src/_pages/forum-edit/services/query.service.ts b/src/templates/forum-edit/services/query.service.ts similarity index 84% rename from src/_pages/forum-edit/services/query.service.ts rename to src/templates/forum-edit/services/query.service.ts index e50e33c4..c177be15 100644 --- a/src/_pages/forum-edit/services/query.service.ts +++ b/src/templates/forum-edit/services/query.service.ts @@ -1,4 +1,4 @@ -import { GET_UPDATE_POST } from "@/_gql/post/queries"; +import { GET_UPDATE_POST } from "@/graphql/post/queries"; import { useQuery } from "@apollo/client"; interface IUseUpdatePostQueryProps { diff --git a/src/_pages/forum-post/index.tsx b/src/templates/forum-post/index.tsx similarity index 91% rename from src/_pages/forum-post/index.tsx rename to src/templates/forum-post/index.tsx index 3f09f403..9888c012 100644 --- a/src/_pages/forum-post/index.tsx +++ b/src/templates/forum-post/index.tsx @@ -1,4 +1,4 @@ -import Aside from "@/_components/common/Aside"; +import Aside from "@/components/common/Aside"; import React from "react"; import styled from "styled-components"; import Post from "./layouts/Post"; diff --git a/src/_pages/forum-post/layouts/Post.tsx b/src/templates/forum-post/layouts/Post.tsx similarity index 88% rename from src/_pages/forum-post/layouts/Post.tsx rename to src/templates/forum-post/layouts/Post.tsx index de288b3a..e1ce94e0 100644 --- a/src/_pages/forum-post/layouts/Post.tsx +++ b/src/templates/forum-post/layouts/Post.tsx @@ -1,9 +1,9 @@ import React from "react"; import styled from "styled-components"; import { useRouter } from "next/navigation"; -import { color } from "@/_styles"; -import { IPost } from "@/_interfaces"; -import { post as emptyPost } from "@/_fixture"; +import { color } from "@/styles"; +import { IPost } from "@/interfaces"; +import { post as emptyPost } from "@/fixture"; import PostBody from "./PostBody"; import PostHead from "./PostHead"; import { usePostQuery } from "../services/query.service"; diff --git a/src/_pages/forum-post/layouts/PostBody/Comment/CommentList.tsx b/src/templates/forum-post/layouts/PostBody/Comment/CommentList.tsx similarity index 94% rename from src/_pages/forum-post/layouts/PostBody/Comment/CommentList.tsx rename to src/templates/forum-post/layouts/PostBody/Comment/CommentList.tsx index 0a10d0b2..ca94212c 100644 --- a/src/_pages/forum-post/layouts/PostBody/Comment/CommentList.tsx +++ b/src/templates/forum-post/layouts/PostBody/Comment/CommentList.tsx @@ -1,9 +1,9 @@ -import { color, flex } from "@/_styles"; +import { color, flex } from "@/styles"; import React from "react"; import styled from "styled-components"; import InfiniteScroll from "react-infinite-scroll-component"; import { PuffLoader } from "react-spinners"; -import { IComment } from "@/_interfaces"; +import { IComment } from "@/interfaces"; import CommentListItem from "./CommentListItem"; import { useCommentListQuery } from "../../../services/query.service"; diff --git a/src/_pages/forum-post/layouts/PostBody/Comment/CommentListItem.tsx b/src/templates/forum-post/layouts/PostBody/Comment/CommentListItem.tsx similarity index 94% rename from src/_pages/forum-post/layouts/PostBody/Comment/CommentListItem.tsx rename to src/templates/forum-post/layouts/PostBody/Comment/CommentListItem.tsx index 9008621e..adb8c2fb 100644 --- a/src/_pages/forum-post/layouts/PostBody/Comment/CommentListItem.tsx +++ b/src/templates/forum-post/layouts/PostBody/Comment/CommentListItem.tsx @@ -1,12 +1,12 @@ -import { AddCommentIcon, Arrow, LikeIcon } from "@/_assets/icons"; -import { defaultProfile } from "@/_assets/images"; -import { Column, Row } from "@/_components/Flex"; -import { ImageWithFallback } from "@/_components/atoms"; -import useDate from "@/_hooks/useDate"; -import useUser from "@/_hooks/useUser"; -import { checkTextOverflow, getTextDepth } from "@/_helpers"; -import { IComment } from "@/_interfaces"; -import { color, flex, font } from "@/_styles"; +import { AddCommentIcon, Arrow, LikeIcon } from "@/assets/icons"; +import { defaultProfile } from "@/assets/images"; +import { Column, Row } from "@/components/Flex"; +import { ImageWithFallback } from "@/components/atoms"; +import useDate from "@/hooks/useDate"; +import useUser from "@/hooks/useUser"; +import { checkTextOverflow, getTextDepth } from "@/helpers"; +import { IComment } from "@/interfaces"; +import { color, flex, font } from "@/styles"; import React from "react"; import { toast } from "react-toastify"; import styled from "styled-components"; diff --git a/src/_pages/forum-post/layouts/PostBody/Comment/CreateCommentBox.tsx b/src/templates/forum-post/layouts/PostBody/Comment/CreateCommentBox.tsx similarity index 89% rename from src/_pages/forum-post/layouts/PostBody/Comment/CreateCommentBox.tsx rename to src/templates/forum-post/layouts/PostBody/Comment/CreateCommentBox.tsx index a2045c5a..5df3a8a7 100644 --- a/src/_pages/forum-post/layouts/PostBody/Comment/CreateCommentBox.tsx +++ b/src/templates/forum-post/layouts/PostBody/Comment/CreateCommentBox.tsx @@ -1,9 +1,9 @@ import React from "react"; import styled from "styled-components"; -import { color, font } from "@/_styles"; -import { Emoji } from "@/_assets/icons"; -import useEmoji from "@/_hooks/useEmoji"; -import { EmojiModal } from "@/_components/common"; +import { color, font } from "@/styles"; +import { Emoji } from "@/assets/icons"; +import useEmoji from "@/hooks/useEmoji"; +import { EmojiModal } from "@/components/common"; import { useCreatePostCommentMutation } from "../../../services/mutation.service"; interface ICreateCommentBoxProps { diff --git a/src/_pages/forum-post/layouts/PostBody/CountBox.tsx b/src/templates/forum-post/layouts/PostBody/CountBox.tsx similarity index 91% rename from src/_pages/forum-post/layouts/PostBody/CountBox.tsx rename to src/templates/forum-post/layouts/PostBody/CountBox.tsx index 1aaaf9df..566f3496 100644 --- a/src/_pages/forum-post/layouts/PostBody/CountBox.tsx +++ b/src/templates/forum-post/layouts/PostBody/CountBox.tsx @@ -1,8 +1,8 @@ import React from "react"; import styled from "styled-components"; -import { Row } from "@/_components/Flex"; -import { font } from "@/_styles"; -import { CommentIcon, LikeIcon } from "@/_assets/icons"; +import { Row } from "@/components/Flex"; +import { font } from "@/styles"; +import { CommentIcon, LikeIcon } from "@/assets/icons"; import { useUpdatePostLikeMutation } from "../../services/mutation.service"; interface ICountBoxProps { diff --git a/src/_pages/forum-post/layouts/PostBody/Recomment/CreateRecommentBox.tsx b/src/templates/forum-post/layouts/PostBody/Recomment/CreateRecommentBox.tsx similarity index 86% rename from src/_pages/forum-post/layouts/PostBody/Recomment/CreateRecommentBox.tsx rename to src/templates/forum-post/layouts/PostBody/Recomment/CreateRecommentBox.tsx index c5d088a5..d26858ec 100644 --- a/src/_pages/forum-post/layouts/PostBody/Recomment/CreateRecommentBox.tsx +++ b/src/templates/forum-post/layouts/PostBody/Recomment/CreateRecommentBox.tsx @@ -1,10 +1,10 @@ -import { defaultProfile } from "@/_assets/images"; -import { Column, Row } from "@/_components/Flex"; -import { ImageWithFallback } from "@/_components/atoms"; -import useTextarea from "@/_hooks/useTextarea"; -import useUser from "@/_hooks/useUser"; -import { useCreateRecommentMutation } from "@/_pages/forum-post/services/mutation.service"; -import { color, font } from "@/_styles"; +import { defaultProfile } from "@/assets/images"; +import { Column, Row } from "@/components/Flex"; +import { ImageWithFallback } from "@/components/atoms"; +import useTextarea from "@/hooks/useTextarea"; +import useUser from "@/hooks/useUser"; +import { useCreateRecommentMutation } from "@/templates/forum-post/services/mutation.service"; +import { color, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_pages/forum-post/layouts/PostBody/Recomment/RecommentList.tsx b/src/templates/forum-post/layouts/PostBody/Recomment/RecommentList.tsx similarity index 89% rename from src/_pages/forum-post/layouts/PostBody/Recomment/RecommentList.tsx rename to src/templates/forum-post/layouts/PostBody/Recomment/RecommentList.tsx index 2bcd0bf6..9d9cb154 100644 --- a/src/_pages/forum-post/layouts/PostBody/Recomment/RecommentList.tsx +++ b/src/templates/forum-post/layouts/PostBody/Recomment/RecommentList.tsx @@ -1,6 +1,6 @@ -import { IRecomment } from "@/_interfaces"; -import { useRecommentListQuery } from "@/_pages/forum-post/services/query.service"; -import { color, flex } from "@/_styles"; +import { IRecomment } from "@/interfaces"; +import { useRecommentListQuery } from "@/templates/forum-post/services/query.service"; +import { color, flex } from "@/styles"; import React from "react"; import InfiniteScroll from "react-infinite-scroll-component"; import { PuffLoader } from "react-spinners"; diff --git a/src/_pages/forum-post/layouts/PostBody/Recomment/RecommentListItem.tsx b/src/templates/forum-post/layouts/PostBody/Recomment/RecommentListItem.tsx similarity index 93% rename from src/_pages/forum-post/layouts/PostBody/Recomment/RecommentListItem.tsx rename to src/templates/forum-post/layouts/PostBody/Recomment/RecommentListItem.tsx index 76428403..c4153232 100644 --- a/src/_pages/forum-post/layouts/PostBody/Recomment/RecommentListItem.tsx +++ b/src/templates/forum-post/layouts/PostBody/Recomment/RecommentListItem.tsx @@ -1,12 +1,12 @@ -import { LikeIcon } from "@/_assets/icons"; -import { defaultProfile } from "@/_assets/images"; -import { Column, Row } from "@/_components/Flex"; -import { ImageWithFallback } from "@/_components/atoms"; -import useDate from "@/_hooks/useDate"; -import useUser from "@/_hooks/useUser"; -import { checkTextOverflow, getTextDepth } from "@/_helpers"; -import { IRecomment } from "@/_interfaces"; -import { color, flex, font } from "@/_styles"; +import { LikeIcon } from "@/assets/icons"; +import { defaultProfile } from "@/assets/images"; +import { Column, Row } from "@/components/Flex"; +import { ImageWithFallback } from "@/components/atoms"; +import useDate from "@/hooks/useDate"; +import useUser from "@/hooks/useUser"; +import { checkTextOverflow, getTextDepth } from "@/helpers"; +import { IRecomment } from "@/interfaces"; +import { color, flex, font } from "@/styles"; import React from "react"; import { toast } from "react-toastify"; import styled from "styled-components"; diff --git a/src/_pages/forum-post/layouts/PostBody/SectionBox.tsx b/src/templates/forum-post/layouts/PostBody/SectionBox.tsx similarity index 91% rename from src/_pages/forum-post/layouts/PostBody/SectionBox.tsx rename to src/templates/forum-post/layouts/PostBody/SectionBox.tsx index 4e701e1d..3f5f9e55 100644 --- a/src/_pages/forum-post/layouts/PostBody/SectionBox.tsx +++ b/src/templates/forum-post/layouts/PostBody/SectionBox.tsx @@ -1,7 +1,7 @@ -import { Column } from "@/_components/Flex"; -import { CustomViewer } from "@/_components/atoms"; -import useDate from "@/_hooks/useDate"; -import { font } from "@/_styles"; +import { Column } from "@/components/Flex"; +import { CustomViewer } from "@/components/atoms"; +import useDate from "@/hooks/useDate"; +import { font } from "@/styles"; import Image from "next/image"; import Link from "next/link"; import React from "react"; diff --git a/src/_pages/forum-post/layouts/PostBody/index.tsx b/src/templates/forum-post/layouts/PostBody/index.tsx similarity index 92% rename from src/_pages/forum-post/layouts/PostBody/index.tsx rename to src/templates/forum-post/layouts/PostBody/index.tsx index c826a268..725f9e52 100644 --- a/src/_pages/forum-post/layouts/PostBody/index.tsx +++ b/src/templates/forum-post/layouts/PostBody/index.tsx @@ -1,9 +1,9 @@ import styled from "styled-components"; -import { IPost } from "@/_interfaces"; -import { POST } from "@/_constants"; -import { Column } from "@/_components/Flex"; -import { CustomViewer } from "@/_components/atoms"; -import { color, flex, font } from "@/_styles"; +import { IPost } from "@/interfaces"; +import { POST } from "@/constants"; +import { Column } from "@/components/Flex"; +import { CustomViewer } from "@/components/atoms"; +import { color, flex, font } from "@/styles"; import CountBox from "./CountBox"; import SectionBox from "./SectionBox"; import CreateCommentBox from "./Comment/CreateCommentBox"; diff --git a/src/_pages/forum-post/layouts/PostHead/Category.tsx b/src/templates/forum-post/layouts/PostHead/Category.tsx similarity index 77% rename from src/_pages/forum-post/layouts/PostHead/Category.tsx rename to src/templates/forum-post/layouts/PostHead/Category.tsx index 094aeb7d..4b97700f 100644 --- a/src/_pages/forum-post/layouts/PostHead/Category.tsx +++ b/src/templates/forum-post/layouts/PostHead/Category.tsx @@ -1,8 +1,8 @@ import styled from "styled-components"; -import { font } from "@/_styles"; -import { CategoryArrow } from "@/_assets/icons"; -import getCategory from "@/_helpers/getCategory.helper"; -import { PostCategoryType } from "@/_types"; +import { font } from "@/styles"; +import { CategoryArrow } from "@/assets/icons"; +import getCategory from "@/helpers/getCategory.helper"; +import { PostCategoryType } from "@/types"; interface IPostCategoryProps { postType: PostCategoryType; diff --git a/src/_pages/forum-post/layouts/PostHead/PostTitle.tsx b/src/templates/forum-post/layouts/PostHead/PostTitle.tsx similarity index 81% rename from src/_pages/forum-post/layouts/PostHead/PostTitle.tsx rename to src/templates/forum-post/layouts/PostHead/PostTitle.tsx index 6bacc952..027525ca 100644 --- a/src/_pages/forum-post/layouts/PostHead/PostTitle.tsx +++ b/src/templates/forum-post/layouts/PostHead/PostTitle.tsx @@ -1,12 +1,12 @@ import styled from "styled-components"; -import { Column, Row } from "@/_components/Flex"; -import color from "@/_styles/color"; -import { flex, font } from "@/_styles"; -import { Time } from "@/_assets/icons"; -import { IPost } from "@/_interfaces"; -import { ImageWithFallback } from "@/_components/atoms"; -import { defaultProfile } from "@/_assets/images"; -import useDate from "@/_hooks/useDate"; +import { Column, Row } from "@/components/Flex"; +import color from "@/styles/color"; +import { flex, font } from "@/styles"; +import { Time } from "@/assets/icons"; +import { IPost } from "@/interfaces"; +import { ImageWithFallback } from "@/components/atoms"; +import { defaultProfile } from "@/assets/images"; +import useDate from "@/hooks/useDate"; import React from "react"; const PostTitle = ({ ...post }: IPost) => { diff --git a/src/_pages/forum-post/layouts/PostHead/ReactBox.tsx b/src/templates/forum-post/layouts/PostHead/ReactBox.tsx similarity index 86% rename from src/_pages/forum-post/layouts/PostHead/ReactBox.tsx rename to src/templates/forum-post/layouts/PostHead/ReactBox.tsx index 0591d6a4..962606cc 100644 --- a/src/_pages/forum-post/layouts/PostHead/ReactBox.tsx +++ b/src/templates/forum-post/layouts/PostHead/ReactBox.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; -import { CommentIcon, Like } from "@/_assets/icons"; -import { Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; +import { CommentIcon, Like } from "@/assets/icons"; +import { Row } from "@/components/Flex"; +import { color, font } from "@/styles"; interface IPostReactBoxProps { commentCount: number; diff --git a/src/_pages/forum-post/layouts/PostHead/index.tsx b/src/templates/forum-post/layouts/PostHead/index.tsx similarity index 90% rename from src/_pages/forum-post/layouts/PostHead/index.tsx rename to src/templates/forum-post/layouts/PostHead/index.tsx index 51d7fc58..d7dd7390 100644 --- a/src/_pages/forum-post/layouts/PostHead/index.tsx +++ b/src/templates/forum-post/layouts/PostHead/index.tsx @@ -1,12 +1,12 @@ import styled from "styled-components"; import Swal from "sweetalert2"; import { useRouter } from "next/navigation"; -import { ROUTER } from "@/_constants"; -import { Row } from "@/_components/Flex"; -import { color, flex, font } from "@/_styles"; -import { IPost } from "@/_interfaces"; -import useUser from "@/_hooks/useUser"; -import { PostCategoryType } from "@/_types"; +import { ROUTER } from "@/constants"; +import { Row } from "@/components/Flex"; +import { color, flex, font } from "@/styles"; +import { IPost } from "@/interfaces"; +import useUser from "@/hooks/useUser"; +import { PostCategoryType } from "@/types"; import Category from "./Category"; import PostTitle from "./PostTitle"; import ReactBox from "./ReactBox"; diff --git a/src/_pages/forum-post/services/api.service.ts b/src/templates/forum-post/services/api.service.ts similarity index 96% rename from src/_pages/forum-post/services/api.service.ts rename to src/templates/forum-post/services/api.service.ts index 32562f38..73c9ba26 100644 --- a/src/_pages/forum-post/services/api.service.ts +++ b/src/templates/forum-post/services/api.service.ts @@ -1,5 +1,5 @@ -import httpClient from "@/_apis/httpClient"; -import { LIKE } from "@/_constants"; +import httpClient from "@/apis/httpClient"; +import { LIKE } from "@/constants"; interface IGetPostCommentListProps { id: string; diff --git a/src/_pages/forum-post/services/mutation.service.ts b/src/templates/forum-post/services/mutation.service.ts similarity index 97% rename from src/_pages/forum-post/services/mutation.service.ts rename to src/templates/forum-post/services/mutation.service.ts index f4c54518..4970b8ab 100644 --- a/src/_pages/forum-post/services/mutation.service.ts +++ b/src/templates/forum-post/services/mutation.service.ts @@ -1,5 +1,5 @@ -import { KEY, ROUTER } from "@/_constants"; -import { DELETE_POST } from "@/_gql/post/queries"; +import { KEY, ROUTER } from "@/constants"; +import { DELETE_POST } from "@/graphql/post/queries"; import { useApolloClient, useMutation as useApolloMutation, diff --git a/src/_pages/forum-post/services/query.service.ts b/src/templates/forum-post/services/query.service.ts similarity index 91% rename from src/_pages/forum-post/services/query.service.ts rename to src/templates/forum-post/services/query.service.ts index c5d5031b..666ff7db 100644 --- a/src/_pages/forum-post/services/query.service.ts +++ b/src/templates/forum-post/services/query.service.ts @@ -1,8 +1,8 @@ -import { IPostQuery } from "@/_interfaces"; -import { GET_POST } from "@/_gql/post/queries"; +import { IPostQuery } from "@/interfaces"; +import { GET_POST } from "@/graphql/post/queries"; import { useQuery as useApolloQuery } from "@apollo/client"; import { useInfiniteQuery } from "@tanstack/react-query"; -import { KEY } from "@/_constants"; +import { KEY } from "@/constants"; import { getPostCommentList, getRecommentList } from "./api.service"; export const usePostQuery = ({ id }: IPostQuery) => { diff --git a/src/_pages/forum-write/index.tsx b/src/templates/forum-write/index.tsx similarity index 90% rename from src/_pages/forum-write/index.tsx rename to src/templates/forum-write/index.tsx index 8be596eb..719bd1d9 100644 --- a/src/_pages/forum-write/index.tsx +++ b/src/templates/forum-write/index.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Aside } from "@/_components/common"; +import { Aside } from "@/components/common"; import WriteBox from "./layouts/WriteBox"; const WritePage = () => { diff --git a/src/_pages/forum-write/layouts/InputBox.tsx b/src/templates/forum-write/layouts/InputBox.tsx similarity index 92% rename from src/_pages/forum-write/layouts/InputBox.tsx rename to src/templates/forum-write/layouts/InputBox.tsx index c930cea3..b3c42246 100644 --- a/src/_pages/forum-write/layouts/InputBox.tsx +++ b/src/templates/forum-write/layouts/InputBox.tsx @@ -3,21 +3,21 @@ import styled from "styled-components"; import { toast } from "react-toastify"; import { useRouter } from "next/navigation"; import { useApolloClient } from "@apollo/client"; -import { Category, CustomEditor, Input } from "@/_components/atoms"; -import { Column, Row } from "@/_components/Flex"; -import { emptyCategories, emptyInputPost } from "@/_assets/data"; -import { color, font } from "@/_styles"; -import { POST, POST_INPUT, ROUTER } from "@/_constants"; +import { Category, CustomEditor, Input } from "@/components/atoms"; +import { Column, Row } from "@/components/Flex"; +import { emptyCategories, emptyInputPost } from "@/assets/data"; +import { color, font } from "@/styles"; +import { POST, POST_INPUT, ROUTER } from "@/constants"; import { checkPostValid, getImageUrl, getWriteContentLabel, isAdmin, -} from "@/_helpers"; -import useUser from "@/_hooks/useUser"; -import useDate from "@/_hooks/useDate"; -import DragDrop from "@/_components/atoms/DragDrop"; -import { PostCategoryType } from "@/_types"; +} from "@/helpers"; +import useUser from "@/hooks/useUser"; +import useDate from "@/hooks/useDate"; +import DragDrop from "@/components/atoms/DragDrop"; +import { PostCategoryType } from "@/types"; import { useCreatePostMutation } from "../services/mutation.service"; const InputBox = () => { diff --git a/src/_pages/forum-write/layouts/WriteBox.tsx b/src/templates/forum-write/layouts/WriteBox.tsx similarity index 88% rename from src/_pages/forum-write/layouts/WriteBox.tsx rename to src/templates/forum-write/layouts/WriteBox.tsx index 0bdc46f2..40794ef0 100644 --- a/src/_pages/forum-write/layouts/WriteBox.tsx +++ b/src/templates/forum-write/layouts/WriteBox.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; -import { Column } from "@/_components/Flex"; -import { color, font } from "@/_styles"; +import { Column } from "@/components/Flex"; +import { color, font } from "@/styles"; import InputBox from "./InputBox"; const WriteBox = () => { diff --git a/src/_pages/forum-write/services/mutation.service.ts b/src/templates/forum-write/services/mutation.service.ts similarity index 74% rename from src/_pages/forum-write/services/mutation.service.ts rename to src/templates/forum-write/services/mutation.service.ts index 6332f99e..8bdbb5d1 100644 --- a/src/_pages/forum-write/services/mutation.service.ts +++ b/src/templates/forum-write/services/mutation.service.ts @@ -1,4 +1,4 @@ -import { CREATE_POST } from "@/_gql/post/queries"; +import { CREATE_POST } from "@/graphql/post/queries"; import { useMutation } from "@apollo/client"; export const useCreatePostMutation = () => { diff --git a/src/_pages/forum/index.tsx b/src/templates/forum/index.tsx similarity index 90% rename from src/_pages/forum/index.tsx rename to src/templates/forum/index.tsx index 2ad53412..d84de644 100644 --- a/src/_pages/forum/index.tsx +++ b/src/templates/forum/index.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Aside } from "@/_components/common"; +import { Aside } from "@/components/common"; import Forum from "./layouts/Forum"; const ForumPage = () => { diff --git a/src/_pages/forum/layouts/Categories.tsx b/src/templates/forum/layouts/Categories.tsx similarity index 80% rename from src/_pages/forum/layouts/Categories.tsx rename to src/templates/forum/layouts/Categories.tsx index 76f4f114..5a06909c 100644 --- a/src/_pages/forum/layouts/Categories.tsx +++ b/src/templates/forum/layouts/Categories.tsx @@ -1,9 +1,9 @@ import React from "react"; import { useRecoilState } from "recoil"; -import { categoriesStore } from "@/_store/categories.store"; -import { Category } from "@/_components/atoms"; -import { emptyCategories } from "@/_assets/data"; -import { PostCategoryType } from "@/_types"; +import { categoriesStore } from "@/store/categories.store"; +import { Category } from "@/components/atoms"; +import { emptyCategories } from "@/assets/data"; +import { PostCategoryType } from "@/types"; import styled from "styled-components"; const Categories = () => { diff --git a/src/_pages/forum/layouts/Forum.tsx b/src/templates/forum/layouts/Forum.tsx similarity index 90% rename from src/_pages/forum/layouts/Forum.tsx rename to src/templates/forum/layouts/Forum.tsx index 2e22fb11..336e77a2 100644 --- a/src/_pages/forum/layouts/Forum.tsx +++ b/src/templates/forum/layouts/Forum.tsx @@ -1,12 +1,12 @@ import React from "react"; import styled from "styled-components"; import { useRouter } from "next/navigation"; -import { KEY, ROUTER } from "@/_constants"; -import { Row } from "@/_components/Flex"; +import { KEY, ROUTER } from "@/constants"; +import { Row } from "@/components/Flex"; import { useQueryClient } from "@tanstack/react-query"; import { useRecoilValue } from "recoil"; -import { color, flex, font } from "@/_styles"; -import { categoriesStore } from "@/_store/categories.store"; +import { color, flex, font } from "@/styles"; +import { categoriesStore } from "@/store/categories.store"; import Categories from "./Categories"; import PostList from "./PostList"; import { usePostListQuery } from "../services/query.service"; diff --git a/src/_pages/forum/layouts/PostList.tsx b/src/templates/forum/layouts/PostList.tsx similarity index 88% rename from src/_pages/forum/layouts/PostList.tsx rename to src/templates/forum/layouts/PostList.tsx index c8bfc1af..f5902318 100644 --- a/src/_pages/forum/layouts/PostList.tsx +++ b/src/templates/forum/layouts/PostList.tsx @@ -1,10 +1,10 @@ -import { Column } from "@/_components/Flex"; -import { IPostInfiniteList } from "@/_interfaces"; +import { Column } from "@/components/Flex"; +import { IPostInfiniteList } from "@/interfaces"; import { UseInfiniteQueryResult } from "@tanstack/react-query"; import { PuffLoader } from "react-spinners"; import InfiniteScroll from "react-infinite-scroll-component"; import styled from "styled-components"; -import { flex } from "@/_styles"; +import { flex } from "@/styles"; import PostListItem from "./PostListItem"; const PostList = ({ diff --git a/src/_pages/forum/layouts/PostListItem.tsx b/src/templates/forum/layouts/PostListItem.tsx similarity index 86% rename from src/_pages/forum/layouts/PostListItem.tsx rename to src/templates/forum/layouts/PostListItem.tsx index 5d4941e1..c5d6fcc7 100644 --- a/src/_pages/forum/layouts/PostListItem.tsx +++ b/src/templates/forum/layouts/PostListItem.tsx @@ -1,13 +1,13 @@ import styled from "styled-components"; -import { Column, Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; -import { IPost } from "@/_interfaces"; -import { defaultProfile, emptyImage } from "@/_assets/images"; -import { ImageWithFallback } from "@/_components/atoms"; +import { Column, Row } from "@/components/Flex"; +import { color, font } from "@/styles"; +import { IPost } from "@/interfaces"; +import { defaultProfile, emptyImage } from "@/assets/images"; +import { ImageWithFallback } from "@/components/atoms"; import Link from "next/link"; -import { POST, ROUTER } from "@/_constants"; -import { CommentIcon, LikeIcon, Time } from "@/_assets/icons"; -import useDate from "@/_hooks/useDate"; +import { POST, ROUTER } from "@/constants"; +import { CommentIcon, LikeIcon, Time } from "@/assets/icons"; +import useDate from "@/hooks/useDate"; interface IPostListItemProps { post: Omit; diff --git a/src/_pages/forum/services/query.service.ts b/src/templates/forum/services/query.service.ts similarity index 78% rename from src/_pages/forum/services/query.service.ts rename to src/templates/forum/services/query.service.ts index 53f6f31c..20a3b8c7 100644 --- a/src/_pages/forum/services/query.service.ts +++ b/src/templates/forum/services/query.service.ts @@ -1,10 +1,10 @@ import { useApolloClient } from "@apollo/client"; -import { GET_POST_LIST } from "@/_gql/post/queries"; -import { PostCategoryType } from "@/_types"; -import { KEY } from "@/_constants"; +import { GET_POST_LIST } from "@/graphql/post/queries"; +import { PostCategoryType } from "@/types"; +import { KEY } from "@/constants"; import { useInfiniteQuery } from "@tanstack/react-query"; -import { IPostInfiniteList } from "@/_interfaces"; -import getPageSize from "@/_helpers/getPageSize.helper"; +import { IPostInfiniteList } from "@/interfaces"; +import getPageSize from "@/helpers/getPageSize.helper"; interface IUsePostListQueryProps { category: PostCategoryType; diff --git a/src/_pages/home/index.tsx b/src/templates/home/index.tsx similarity index 88% rename from src/_pages/home/index.tsx rename to src/templates/home/index.tsx index 6267ebfe..17032fe9 100644 --- a/src/_pages/home/index.tsx +++ b/src/templates/home/index.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Aside } from "@/_components/common"; +import { Aside } from "@/components/common"; const HomePage = () => { return ( diff --git a/src/_pages/meal/index.tsx b/src/templates/meal/index.tsx similarity index 92% rename from src/_pages/meal/index.tsx rename to src/templates/meal/index.tsx index 740f7631..b53e4ddf 100644 --- a/src/_pages/meal/index.tsx +++ b/src/templates/meal/index.tsx @@ -1,10 +1,10 @@ import React from "react"; import styled from "styled-components"; -import { emptyMealList } from "@/_assets/data"; -import { IMealList } from "@/_interfaces"; -import { color, flex, font } from "@/_styles"; -import { Column } from "@/_components/Flex"; -import useDate from "@/_hooks/useDate"; +import { emptyMealList } from "@/assets/data"; +import { IMealList } from "@/interfaces"; +import { color, flex, font } from "@/styles"; +import { Column } from "@/components/Flex"; +import useDate from "@/hooks/useDate"; import MealListItem from "./layouts/MealListItem"; import { useMealQuery } from "./services/query.service"; diff --git a/src/_pages/meal/layouts/BlinkerBox.tsx b/src/templates/meal/layouts/BlinkerBox.tsx similarity index 94% rename from src/_pages/meal/layouts/BlinkerBox.tsx rename to src/templates/meal/layouts/BlinkerBox.tsx index d497d96e..a51d663f 100644 --- a/src/_pages/meal/layouts/BlinkerBox.tsx +++ b/src/templates/meal/layouts/BlinkerBox.tsx @@ -1,4 +1,4 @@ -import { color, flex } from "@/_styles"; +import { color, flex } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_pages/meal/layouts/MealListItem.tsx b/src/templates/meal/layouts/MealListItem.tsx similarity index 93% rename from src/_pages/meal/layouts/MealListItem.tsx rename to src/templates/meal/layouts/MealListItem.tsx index 214456bc..4675d335 100644 --- a/src/_pages/meal/layouts/MealListItem.tsx +++ b/src/templates/meal/layouts/MealListItem.tsx @@ -1,8 +1,8 @@ import React from "react"; import styled from "styled-components"; -import { color, flex, font } from "@/_styles"; -import { Row } from "@/_components/Flex"; -import { getMealName } from "@/_helpers"; +import { color, flex, font } from "@/styles"; +import { Row } from "@/components/Flex"; +import { getMealName } from "@/helpers"; import BlinkerBox from "./BlinkerBox"; interface IMealListItemProps { diff --git a/src/_pages/meal/services/api.service.ts b/src/templates/meal/services/api.service.ts similarity index 76% rename from src/_pages/meal/services/api.service.ts rename to src/templates/meal/services/api.service.ts index 5ae6c089..b35a8174 100644 --- a/src/_pages/meal/services/api.service.ts +++ b/src/templates/meal/services/api.service.ts @@ -1,4 +1,4 @@ -import httpClient from "@/_apis/httpClient"; +import httpClient from "@/apis/httpClient"; export const getMealList = async (date: string) => { const { data } = await httpClient.meal.getById({ params: { id: date } }); diff --git a/src/_pages/meal/services/query.service.ts b/src/templates/meal/services/query.service.ts similarity index 90% rename from src/_pages/meal/services/query.service.ts rename to src/templates/meal/services/query.service.ts index 4b56f123..c8813713 100644 --- a/src/_pages/meal/services/query.service.ts +++ b/src/templates/meal/services/query.service.ts @@ -1,4 +1,4 @@ -import { KEY } from "@/_constants"; +import { KEY } from "@/constants"; import { useQuery } from "@tanstack/react-query"; import { getMealList } from "./api.service"; diff --git a/src/_pages/meister/chart/MeisterChart.tsx b/src/templates/meister/chart/MeisterChart.tsx similarity index 96% rename from src/_pages/meister/chart/MeisterChart.tsx rename to src/templates/meister/chart/MeisterChart.tsx index b5b3bf08..c2ad2244 100644 --- a/src/_pages/meister/chart/MeisterChart.tsx +++ b/src/templates/meister/chart/MeisterChart.tsx @@ -1,8 +1,8 @@ import React from "react"; import * as d3 from "d3"; -import { color } from "@/_styles"; -import { IMeister } from "@/_interfaces"; -import { useDidMountEffect } from "@/_hooks/useDidMountEffect"; +import { color } from "@/styles"; +import { IMeister } from "@/interfaces"; +import { useDidMountEffect } from "@/hooks/useDidMountEffect"; interface MeisterChartData { group: diff --git a/src/_pages/meister/chart/RadarChart.tsx b/src/templates/meister/chart/RadarChart.tsx similarity index 97% rename from src/_pages/meister/chart/RadarChart.tsx rename to src/templates/meister/chart/RadarChart.tsx index 2e892309..f79b6d89 100644 --- a/src/_pages/meister/chart/RadarChart.tsx +++ b/src/templates/meister/chart/RadarChart.tsx @@ -1,4 +1,4 @@ -import { IMeister } from "@/_interfaces"; +import { IMeister } from "@/interfaces"; import React, { useState } from "react"; import Radar from "react-d3-radar"; diff --git a/src/_pages/meister/index.tsx b/src/templates/meister/index.tsx similarity index 94% rename from src/_pages/meister/index.tsx rename to src/templates/meister/index.tsx index 22ccc8cb..4b7a4866 100644 --- a/src/_pages/meister/index.tsx +++ b/src/templates/meister/index.tsx @@ -1,11 +1,11 @@ -import flex from "@/_styles/flex"; -import emptyMeister from "@/_assets/data/emptyMeister"; -import { Column, Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; -import { Button, Category } from "@/_components/atoms"; +import flex from "@/styles/flex"; +import emptyMeister from "@/assets/data/emptyMeister"; +import { Column, Row } from "@/components/Flex"; +import { color, font } from "@/styles"; +import { Button, Category } from "@/components/atoms"; import { useRouter } from "next/navigation"; -import { ROUTER } from "@/_constants"; -import { useMeisterHTML } from "@/_hooks/useMeisterHTML"; +import { ROUTER } from "@/constants"; +import { useMeisterHTML } from "@/hooks/useMeisterHTML"; import React from "react"; import styled from "styled-components"; import MeisterProfileBox from "./layouts/MeisterProfileBox"; diff --git a/src/_pages/meister/layouts/BasicJobSkillCard.tsx b/src/templates/meister/layouts/BasicJobSkillCard.tsx similarity index 91% rename from src/_pages/meister/layouts/BasicJobSkillCard.tsx rename to src/templates/meister/layouts/BasicJobSkillCard.tsx index 9e331e08..d77e6ba2 100644 --- a/src/_pages/meister/layouts/BasicJobSkillCard.tsx +++ b/src/templates/meister/layouts/BasicJobSkillCard.tsx @@ -1,12 +1,12 @@ -import { Column, Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; -import flex from "@/_styles/flex"; +import { Column, Row } from "@/components/Flex"; +import { color, font } from "@/styles"; +import flex from "@/styles/flex"; import React from "react"; import { CircularProgressbar, buildStyles } from "react-circular-progressbar"; import styled from "styled-components"; import "react-circular-progressbar/dist/styles.css"; -import { getMeisterChapter } from "@/_helpers"; +import { getMeisterChapter } from "@/helpers"; interface IStatusCard { chapter: string; diff --git a/src/_pages/meister/layouts/Distribution.tsx b/src/templates/meister/layouts/Distribution.tsx similarity index 87% rename from src/_pages/meister/layouts/Distribution.tsx rename to src/templates/meister/layouts/Distribution.tsx index 1c139b2f..40c08b2e 100644 --- a/src/_pages/meister/layouts/Distribution.tsx +++ b/src/templates/meister/layouts/Distribution.tsx @@ -1,8 +1,8 @@ -import DistributionIcon from "@/_assets/icons/DistributionIcon"; -import { Row } from "@/_components/Flex"; -import { IMeister } from "@/_interfaces"; -import { color, font } from "@/_styles"; -import flex from "@/_styles/flex"; +import DistributionIcon from "@/assets/icons/DistributionIcon"; +import { Row } from "@/components/Flex"; +import { IMeister } from "@/interfaces"; +import { color, font } from "@/styles"; +import flex from "@/styles/flex"; import React from "react"; import styled from "styled-components"; import RadarChart from "../chart/RadarChart"; diff --git a/src/_pages/meister/layouts/MeisterProfileBox.tsx b/src/templates/meister/layouts/MeisterProfileBox.tsx similarity index 92% rename from src/_pages/meister/layouts/MeisterProfileBox.tsx rename to src/templates/meister/layouts/MeisterProfileBox.tsx index 6d44a532..b45e0028 100644 --- a/src/_pages/meister/layouts/MeisterProfileBox.tsx +++ b/src/templates/meister/layouts/MeisterProfileBox.tsx @@ -1,8 +1,8 @@ -import { defaultProfile } from "@/_assets/images"; -import { Column, Row } from "@/_components/Flex"; -import { ImageWithFallback } from "@/_components/atoms"; -import useUser from "@/_hooks/useUser"; -import { color, font } from "@/_styles"; +import { defaultProfile } from "@/assets/images"; +import { Column, Row } from "@/components/Flex"; +import { ImageWithFallback } from "@/components/atoms"; +import useUser from "@/hooks/useUser"; +import { color, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_pages/meister/layouts/Ranking.tsx b/src/templates/meister/layouts/Ranking.tsx similarity index 93% rename from src/_pages/meister/layouts/Ranking.tsx rename to src/templates/meister/layouts/Ranking.tsx index fccf5f1a..b8362797 100644 --- a/src/_pages/meister/layouts/Ranking.tsx +++ b/src/templates/meister/layouts/Ranking.tsx @@ -1,8 +1,8 @@ -import { Category } from "@/_components/atoms"; -import { flex, font } from "@/_styles"; +import { Category } from "@/components/atoms"; +import { flex, font } from "@/styles"; import React from "react"; import styled from "styled-components"; -import useUser from "@/_hooks/useUser"; +import useUser from "@/hooks/useUser"; import { useMeisterRankingQuery } from "../services/query.service"; import RankingListItem from "./RankingListItem"; diff --git a/src/_pages/meister/layouts/RankingListItem.tsx b/src/templates/meister/layouts/RankingListItem.tsx similarity index 96% rename from src/_pages/meister/layouts/RankingListItem.tsx rename to src/templates/meister/layouts/RankingListItem.tsx index 26981079..9b0fe119 100644 --- a/src/_pages/meister/layouts/RankingListItem.tsx +++ b/src/templates/meister/layouts/RankingListItem.tsx @@ -1,5 +1,5 @@ -import { Column, Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; +import { Column, Row } from "@/components/Flex"; +import { color, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_pages/meister/layouts/StatusCard.tsx b/src/templates/meister/layouts/StatusCard.tsx similarity index 90% rename from src/_pages/meister/layouts/StatusCard.tsx rename to src/templates/meister/layouts/StatusCard.tsx index a46068d5..83acfc23 100644 --- a/src/_pages/meister/layouts/StatusCard.tsx +++ b/src/templates/meister/layouts/StatusCard.tsx @@ -1,12 +1,12 @@ -import { Column, Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; -import flex from "@/_styles/flex"; +import { Column, Row } from "@/components/Flex"; +import { color, font } from "@/styles"; +import flex from "@/styles/flex"; import React from "react"; import { CircularProgressbar, buildStyles } from "react-circular-progressbar"; import styled from "styled-components"; import "react-circular-progressbar/dist/styles.css"; -import { getMeisterChapter } from "@/_helpers"; +import { getMeisterChapter } from "@/helpers"; interface IStatusCard { chapter: string; diff --git a/src/_pages/meister/layouts/YearlyMeisterScore.tsx b/src/templates/meister/layouts/YearlyMeisterScore.tsx similarity index 87% rename from src/_pages/meister/layouts/YearlyMeisterScore.tsx rename to src/templates/meister/layouts/YearlyMeisterScore.tsx index 3100fa67..dafe0754 100644 --- a/src/_pages/meister/layouts/YearlyMeisterScore.tsx +++ b/src/templates/meister/layouts/YearlyMeisterScore.tsx @@ -1,10 +1,10 @@ -import GraphIcon from "@/_assets/icons/GraphIcon"; -import { Row } from "@/_components/Flex"; -import { color, font } from "@/_styles"; +import GraphIcon from "@/assets/icons/GraphIcon"; +import { Row } from "@/components/Flex"; +import { color, font } from "@/styles"; import React from "react"; import styled from "styled-components"; -import { getStatusColor } from "@/_helpers"; -import { IMeister } from "@/_interfaces"; +import { getStatusColor } from "@/helpers"; +import { IMeister } from "@/interfaces"; import MeisterChart from "../chart/MeisterChart"; interface IYearlyMeisterScroeProps { diff --git a/src/_pages/meister/services/api.service.ts b/src/templates/meister/services/api.service.ts similarity index 91% rename from src/_pages/meister/services/api.service.ts rename to src/templates/meister/services/api.service.ts index eea06a75..7c0697ef 100644 --- a/src/_pages/meister/services/api.service.ts +++ b/src/templates/meister/services/api.service.ts @@ -1,4 +1,4 @@ -import httpClient from "@/_apis/httpClient"; +import httpClient from "@/apis/httpClient"; export const getMeister = async () => { const { data } = await httpClient.meister.get(); diff --git a/src/_pages/meister/services/query.service.ts b/src/templates/meister/services/query.service.ts similarity index 95% rename from src/_pages/meister/services/query.service.ts rename to src/templates/meister/services/query.service.ts index c48442eb..91a6b23b 100644 --- a/src/_pages/meister/services/query.service.ts +++ b/src/templates/meister/services/query.service.ts @@ -1,4 +1,4 @@ -import { KEY } from "@/_constants"; +import { KEY } from "@/constants"; import { useQuery } from "@tanstack/react-query"; import { getMeister, getMeisterDetail, getMeisterRanking } from "./api.service"; diff --git a/src/_pages/oauth/index.tsx b/src/templates/oauth/index.tsx similarity index 83% rename from src/_pages/oauth/index.tsx rename to src/templates/oauth/index.tsx index c347469d..fcc9d3d5 100644 --- a/src/_pages/oauth/index.tsx +++ b/src/templates/oauth/index.tsx @@ -2,12 +2,12 @@ import React from "react"; import Image from "next/image"; import { useQueryClient } from "@tanstack/react-query"; import { useSearchParams } from "next/navigation"; -import { loading } from "@/_assets/images"; -import Storage from "@/_apis/storage"; +import { loading } from "@/assets/images"; +import Storage from "@/apis/storage"; import styled from "styled-components"; -import { color, font } from "@/_styles"; -import { Column } from "@/_components/Flex"; -import { KEY, TOKEN } from "@/_constants"; +import { color, font } from "@/styles"; +import { Column } from "@/components/Flex"; +import { KEY, TOKEN } from "@/constants"; import { useLoginMutation } from "./services/mutation.service"; const OAuthPage = () => { diff --git a/src/_pages/oauth/services/api.service.ts b/src/templates/oauth/services/api.service.ts similarity index 83% rename from src/_pages/oauth/services/api.service.ts rename to src/templates/oauth/services/api.service.ts index 0790e049..7fdf10a6 100644 --- a/src/_pages/oauth/services/api.service.ts +++ b/src/templates/oauth/services/api.service.ts @@ -1,4 +1,4 @@ -import httpClient from "@/_apis/httpClient"; +import httpClient from "@/apis/httpClient"; export interface ILoginParams { authCode: string | null; diff --git a/src/_pages/oauth/services/mutation.service.ts b/src/templates/oauth/services/mutation.service.ts similarity index 81% rename from src/_pages/oauth/services/mutation.service.ts rename to src/templates/oauth/services/mutation.service.ts index 36d99d1b..9ca7b931 100644 --- a/src/_pages/oauth/services/mutation.service.ts +++ b/src/templates/oauth/services/mutation.service.ts @@ -1,8 +1,8 @@ -import throwAxiosError from "@/_apis/error/throwAxiosError"; +import throwAxiosError from "@/apis/error/throwAxiosError"; import { useRouter } from "next/navigation"; import { useMutation, useQueryClient } from "@tanstack/react-query"; -import Storage from "@/_apis/storage"; -import { KEY, ROUTER, TOKEN } from "@/_constants"; +import Storage from "@/apis/storage"; +import { KEY, ROUTER, TOKEN } from "@/constants"; import { ILoginParams, login } from "./api.service"; export const useLoginMutation = ({ authCode }: ILoginParams) => { diff --git a/src/_pages/reserve/index.tsx b/src/templates/reserve/index.tsx similarity index 88% rename from src/_pages/reserve/index.tsx rename to src/templates/reserve/index.tsx index 83f5e282..d5108dd6 100644 --- a/src/_pages/reserve/index.tsx +++ b/src/templates/reserve/index.tsx @@ -1,13 +1,13 @@ -import { Column } from "@/_components/Flex"; -import { Aside } from "@/_components/common"; -import { color, flex, font } from "@/_styles"; -import { emptyReserve } from "@/_assets/data"; -import { IReserveList } from "@/_interfaces"; +import { Column } from "@/components/Flex"; +import { Aside } from "@/components/common"; +import { color, flex, font } from "@/styles"; +import { emptyReserve } from "@/assets/data"; +import { IReserveList } from "@/interfaces"; import React from "react"; import dayjs from "dayjs"; import styled from "styled-components"; import { useRecoilValue } from "recoil"; -import { reserveViewTypeStore } from "@/_store/reserveViewType.store"; +import { reserveViewTypeStore } from "@/store/reserveViewType.store"; import ReserveJoinBox from "./layouts/ReserveJoinBox"; import ReserveCategories from "./layouts/ReserveCategories"; import ReserveMap from "./layouts/ReserveMap"; diff --git a/src/_pages/reserve/layouts/ReserveCategories.tsx b/src/templates/reserve/layouts/ReserveCategories.tsx similarity index 84% rename from src/_pages/reserve/layouts/ReserveCategories.tsx rename to src/templates/reserve/layouts/ReserveCategories.tsx index 841969c4..78ca0b06 100644 --- a/src/_pages/reserve/layouts/ReserveCategories.tsx +++ b/src/templates/reserve/layouts/ReserveCategories.tsx @@ -1,5 +1,5 @@ -import { Category } from "@/_components/atoms"; -import { reserveViewTypeStore } from "@/_store/reserveViewType.store"; +import { Category } from "@/components/atoms"; +import { reserveViewTypeStore } from "@/store/reserveViewType.store"; import React from "react"; import { useRecoilState } from "recoil"; import styled from "styled-components"; diff --git a/src/_pages/reserve/layouts/ReserveJoinBox.tsx b/src/templates/reserve/layouts/ReserveJoinBox.tsx similarity index 95% rename from src/_pages/reserve/layouts/ReserveJoinBox.tsx rename to src/templates/reserve/layouts/ReserveJoinBox.tsx index 7f024cec..2d48dba9 100644 --- a/src/_pages/reserve/layouts/ReserveJoinBox.tsx +++ b/src/templates/reserve/layouts/ReserveJoinBox.tsx @@ -1,8 +1,8 @@ -import { XIcon } from "@/_assets/icons"; -import CheckIcon from "@/_assets/icons/CheckIcon"; -import { Column, Row } from "@/_components/Flex"; -import { roomStore } from "@/_store/room.store"; -import { color, flex, font } from "@/_styles"; +import { XIcon } from "@/assets/icons"; +import CheckIcon from "@/assets/icons/CheckIcon"; +import { Column, Row } from "@/components/Flex"; +import { roomStore } from "@/store/room.store"; +import { color, flex, font } from "@/styles"; import React from "react"; import { toast } from "react-toastify"; import { useRecoilState } from "recoil"; diff --git a/src/_pages/reserve/layouts/ReserveList.tsx b/src/templates/reserve/layouts/ReserveList.tsx similarity index 87% rename from src/_pages/reserve/layouts/ReserveList.tsx rename to src/templates/reserve/layouts/ReserveList.tsx index b834a26c..dfb49eed 100644 --- a/src/_pages/reserve/layouts/ReserveList.tsx +++ b/src/templates/reserve/layouts/ReserveList.tsx @@ -1,5 +1,5 @@ -import { IReserve } from "@/_interfaces"; -import { flex } from "@/_styles"; +import { IReserve } from "@/interfaces"; +import { flex } from "@/styles"; import React from "react"; import styled from "styled-components"; import ReserveListItem from "./ReserveListItem"; diff --git a/src/_pages/reserve/layouts/ReserveListItem.tsx b/src/templates/reserve/layouts/ReserveListItem.tsx similarity index 91% rename from src/_pages/reserve/layouts/ReserveListItem.tsx rename to src/templates/reserve/layouts/ReserveListItem.tsx index 8a785e31..83ef8415 100644 --- a/src/_pages/reserve/layouts/ReserveListItem.tsx +++ b/src/templates/reserve/layouts/ReserveListItem.tsx @@ -1,6 +1,6 @@ -import useUser from "@/_hooks/useUser"; -import { IReserve } from "@/_interfaces"; -import { color, font } from "@/_styles"; +import useUser from "@/hooks/useUser"; +import { IReserve } from "@/interfaces"; +import { color, font } from "@/styles"; import React from "react"; import styled from "styled-components"; import { useDeleteReserveMutation } from "../services/mutation.service"; diff --git a/src/_pages/reserve/layouts/ReserveMap.tsx b/src/templates/reserve/layouts/ReserveMap.tsx similarity index 94% rename from src/_pages/reserve/layouts/ReserveMap.tsx rename to src/templates/reserve/layouts/ReserveMap.tsx index 6cfb7c60..592fd73f 100644 --- a/src/_pages/reserve/layouts/ReserveMap.tsx +++ b/src/templates/reserve/layouts/ReserveMap.tsx @@ -1,6 +1,6 @@ -import { Column, Row } from "@/_components/Flex"; -import { roomStore } from "@/_store/room.store"; -import { color, flex, font } from "@/_styles"; +import { Column, Row } from "@/components/Flex"; +import { roomStore } from "@/store/room.store"; +import { color, flex, font } from "@/styles"; import React from "react"; import { useRecoilState } from "recoil"; import styled, { css } from "styled-components"; diff --git a/src/_pages/reserve/services/api.service.ts b/src/templates/reserve/services/api.service.ts similarity index 82% rename from src/_pages/reserve/services/api.service.ts rename to src/templates/reserve/services/api.service.ts index 49f212e3..9bd297d5 100644 --- a/src/_pages/reserve/services/api.service.ts +++ b/src/templates/reserve/services/api.service.ts @@ -1,5 +1,5 @@ -import httpClient from "@/_apis/httpClient"; -import { ICreateReserve } from "@/_interfaces"; +import httpClient from "@/apis/httpClient"; +import { ICreateReserve } from "@/interfaces"; export const getReserveList = async (date: string) => { const { data } = await httpClient.reserve.get({ params: { date } }); diff --git a/src/_pages/reserve/services/mutation.service.ts b/src/templates/reserve/services/mutation.service.ts similarity index 90% rename from src/_pages/reserve/services/mutation.service.ts rename to src/templates/reserve/services/mutation.service.ts index 4721141c..0f7d7838 100644 --- a/src/_pages/reserve/services/mutation.service.ts +++ b/src/templates/reserve/services/mutation.service.ts @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; -import { KEY } from "@/_constants"; -import { ICreateReserve } from "@/_interfaces"; +import { KEY } from "@/constants"; +import { ICreateReserve } from "@/interfaces"; import { toast } from "react-toastify"; import { createReserve, deleteReserve } from "./api.service"; diff --git a/src/_pages/reserve/services/query.service.ts b/src/templates/reserve/services/query.service.ts similarity index 91% rename from src/_pages/reserve/services/query.service.ts rename to src/templates/reserve/services/query.service.ts index 87c3d4fd..9ebdbd94 100644 --- a/src/_pages/reserve/services/query.service.ts +++ b/src/templates/reserve/services/query.service.ts @@ -1,4 +1,4 @@ -import { KEY } from "@/_constants"; +import { KEY } from "@/constants"; import { useQuery } from "@tanstack/react-query"; import { getReserveList } from "./api.service"; diff --git a/src/_pages/timetable/index.tsx b/src/templates/timetable/index.tsx similarity index 100% rename from src/_pages/timetable/index.tsx rename to src/templates/timetable/index.tsx diff --git a/src/_pages/timetable/layouts/TimeTableBar.tsx b/src/templates/timetable/layouts/TimeTableBar.tsx similarity index 94% rename from src/_pages/timetable/layouts/TimeTableBar.tsx rename to src/templates/timetable/layouts/TimeTableBar.tsx index df3f14a9..dffd3eec 100644 --- a/src/_pages/timetable/layouts/TimeTableBar.tsx +++ b/src/templates/timetable/layouts/TimeTableBar.tsx @@ -1,8 +1,8 @@ -import { color, font } from "@/_styles"; +import { color, font } from "@/styles"; import styled from "styled-components"; -import { ITimetable } from "@/_interfaces"; -import useTimetableBar from "@/_hooks/useTimetableBar"; -import useDate from "@/_hooks/useDate"; +import { ITimetable } from "@/interfaces"; +import useTimetableBar from "@/hooks/useTimetableBar"; +import useDate from "@/hooks/useDate"; import React from "react"; interface ITimeTableBarProps { diff --git a/src/_pages/timetable/layouts/TimeTableBox.tsx b/src/templates/timetable/layouts/TimeTableBox.tsx similarity index 93% rename from src/_pages/timetable/layouts/TimeTableBox.tsx rename to src/templates/timetable/layouts/TimeTableBox.tsx index d7f52fe0..a7923435 100644 --- a/src/_pages/timetable/layouts/TimeTableBox.tsx +++ b/src/templates/timetable/layouts/TimeTableBox.tsx @@ -1,9 +1,9 @@ import React from "react"; import styled from "styled-components"; -import useDate from "@/_hooks/useDate"; +import useDate from "@/hooks/useDate"; import { useQueryClient } from "@tanstack/react-query"; -import { KEY } from "@/_constants"; -import { emptyTimetable } from "@/_assets/data"; +import { KEY } from "@/constants"; +import { emptyTimetable } from "@/assets/data"; import TimeTableBar from "./TimeTableBar"; import { useTimetableListQuery } from "../services/query.service"; import TimeTableCategory from "./TimeTableCategory"; diff --git a/src/_pages/timetable/layouts/TimeTableCategory.tsx b/src/templates/timetable/layouts/TimeTableCategory.tsx similarity index 90% rename from src/_pages/timetable/layouts/TimeTableCategory.tsx rename to src/templates/timetable/layouts/TimeTableCategory.tsx index 236095e4..931e4442 100644 --- a/src/_pages/timetable/layouts/TimeTableCategory.tsx +++ b/src/templates/timetable/layouts/TimeTableCategory.tsx @@ -1,8 +1,8 @@ import styled from "styled-components"; -import { Column } from "@/_components/Flex"; -import { Category } from "@/_components/atoms"; -import { font } from "@/_styles"; -import { getTimetableType } from "@/_helpers"; +import { Column } from "@/components/Flex"; +import { Category } from "@/components/atoms"; +import { font } from "@/styles"; +import { getTimetableType } from "@/helpers"; interface ITimeTableCategoryProps { weekdays: Array; diff --git a/src/_pages/timetable/layouts/TimeTableTable.tsx b/src/templates/timetable/layouts/TimeTableTable.tsx similarity index 90% rename from src/_pages/timetable/layouts/TimeTableTable.tsx rename to src/templates/timetable/layouts/TimeTableTable.tsx index 209934ae..cb312049 100644 --- a/src/_pages/timetable/layouts/TimeTableTable.tsx +++ b/src/templates/timetable/layouts/TimeTableTable.tsx @@ -1,7 +1,7 @@ -import { Column } from "@/_components/Flex"; -import useDate from "@/_hooks/useDate"; -import { ITimetable } from "@/_interfaces"; -import { color, flex, font } from "@/_styles"; +import { Column } from "@/components/Flex"; +import useDate from "@/hooks/useDate"; +import { ITimetable } from "@/interfaces"; +import { color, flex, font } from "@/styles"; import React from "react"; import styled from "styled-components"; diff --git a/src/_pages/timetable/services/api.service.ts b/src/templates/timetable/services/api.service.ts similarity index 80% rename from src/_pages/timetable/services/api.service.ts rename to src/templates/timetable/services/api.service.ts index a5a71658..26317a36 100644 --- a/src/_pages/timetable/services/api.service.ts +++ b/src/templates/timetable/services/api.service.ts @@ -1,4 +1,4 @@ -import httpClient from "@/_apis/httpClient"; +import httpClient from "@/apis/httpClient"; export const getTimetable = async (timetableType: "bar" | "table") => { const { data } = await httpClient.timetable.getById({ diff --git a/src/_pages/timetable/services/query.service.ts b/src/templates/timetable/services/query.service.ts similarity index 92% rename from src/_pages/timetable/services/query.service.ts rename to src/templates/timetable/services/query.service.ts index 58c5c612..876a7e19 100644 --- a/src/_pages/timetable/services/query.service.ts +++ b/src/templates/timetable/services/query.service.ts @@ -1,4 +1,4 @@ -import { KEY } from "@/_constants"; +import { KEY } from "@/constants"; import { useQuery } from "@tanstack/react-query"; import { getTimetable } from "./api.service"; diff --git a/src/_types/index.ts b/src/types/index.ts similarity index 100% rename from src/_types/index.ts rename to src/types/index.ts diff --git a/src/_types/postCategory.type.ts b/src/types/postCategory.type.ts similarity index 100% rename from src/_types/postCategory.type.ts rename to src/types/postCategory.type.ts diff --git a/src/_types/postList.type.ts b/src/types/postList.type.ts similarity index 67% rename from src/_types/postList.type.ts rename to src/types/postList.type.ts index 961e3eaa..d33bdd26 100644 --- a/src/_types/postList.type.ts +++ b/src/types/postList.type.ts @@ -1,4 +1,4 @@ -import { IPost } from "@/_interfaces"; +import { IPost } from "@/interfaces"; type PostListType = Array>; diff --git a/src/_types/storageSettingKey.type.ts b/src/types/storageSettingKey.type.ts similarity index 100% rename from src/_types/storageSettingKey.type.ts rename to src/types/storageSettingKey.type.ts diff --git a/src/_types/storageTokenKey.type.ts b/src/types/storageTokenKey.type.ts similarity index 100% rename from src/_types/storageTokenKey.type.ts rename to src/types/storageTokenKey.type.ts