Merge pull request #495 from sayyyho/dev

Test: 로딩 All 등록 및 중복 처리 테스트
LikeLion-at-DGU · Aug 6, 2024 · 7c4e43c · 7c4e43c
2 parents 604c9f0 + 676d213
commit 7c4e43c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/src/components/common/ErorrAlert/ErrorAlert.jsx b/src/components/common/ErorrAlert/ErrorAlert.jsx
@@ -52,7 +52,7 @@ const ModalContainer = styled.div`
   }
 `;
 
-export const ErrorAlert = ({ show, onClose }) => (
+export const ErrorAlert = ({ show }) => (
   <CSSTransition in={show} timeout={500} classNames="modal" unmountOnExit>
     <ModalLayout>
       <ModalContainer state={show ? "entering" : "exiting"}>

diff --git a/src/pages/TestPage/Test.jsx b/src/pages/TestPage/Test.jsx
diff --git a/src/pages/ThemePage/ThemePage.jsx b/src/pages/ThemePage/ThemePage.jsx
@@ -7,6 +7,7 @@ import Modal from "../../components/Modal/Modal";
 import DateRangeCalendar from "../../components/DateRangeCalendar/DateRangeCalendar";
 import { CheckUp } from "../../components/CheckUp/CheckUp";
 import { useRecoilState, useSetRecoilState } from "recoil";
+import { Loading } from "../Loading/Loading";
 import {
   routineStart,
   routineEnd,
@@ -51,7 +52,7 @@ const ThemePage = () => {
   }, [startDay, endDay]);
 
   if (!themeData) {
-    return <p>데이터를 불러오는 중입니다...</p>; // theme이 null인 경우 처리
+    return <Loading />; // theme이 null인 경우 처리
   }
 
   const formatDate = (date) => {
@@ -85,7 +86,7 @@ const ThemePage = () => {
             />
           ))
         ) : (
-          <p>데이터를 불러오는 중입니다...</p>
+          <Loading />
         )}
       </S.RoutineBoxContainer>
       {isCalendarVisible && (

diff --git a/src/router.jsx b/src/router.jsx
@@ -14,7 +14,6 @@ import SearchPage from "./pages/SearchPage/SearchPage";
 import MyPage from "./pages/MyPage/MyPage";
 import SubCategoryPage from "./pages/SubCategoryPage/SubCategoryPage";
 import { SearchResultP } from "./pages/SearchPage/SearchResultP";
-import { Test } from "./pages/TestPage/Test";
 import { NotFound } from "./pages/NotFound/NotFount";
 import { AgreePage } from "./pages/AgreePage/AgreePage";
 import { Loading } from "./pages/Loading/Loading";
@@ -86,10 +85,6 @@ const router = createBrowserRouter([
         element: <SharePage />,
         loader: loader,
       },
-      {
-        path: "/test",
-        element: <Test />,
-      },
       {
         path: "/search/data/:data",
         element: <SearchResultP />,