Merge pull request #193 from imi21123/test

Feat: refactoring 진행 중

package.json

@@ -24,6 +24,7 @@
     "react-router-dom": "^6.19.0",
     "react-scripts": "5.0.1",
     "react-slick": "^0.29.0",
+    "react-swipeable": "^7.0.1",
     "recoil": "^0.7.7",
     "recoil-persist": "^5.1.0",
     "recoilize": "^3.2.0",

src/App.css

@@ -17,11 +17,8 @@
     background-color: white;
     padding-top: 4rem;
   }
-  .bottom_navbar {
-    left: calc(50% - 207px); /* Center the navbar */
-    right: calc(50% - 207px); /* Center the navbar */
-  }
-  .bottom_navbar2 {
+
+  .navbar {
     left: calc(50% - 207px); /* Center the navbar */
     right: calc(50% - 207px); /* Center the navbar */
   }
@@ -44,11 +41,8 @@
     background-color: white;
     padding-top: 4rem;
   }
-  .bottom_navbar {
-    left: calc(50% - 215px); /* Center the navbar */
-    right: calc(50% - 215px); /* Center the navbar */
-  }
-  .bottom_navbar2 {
+
+  .navbar {
     left: calc(50% - 215px); /* Center the navbar */
     right: calc(50% - 215px); /* Center the navbar */
   }
@@ -57,6 +51,7 @@
     left: calc(50% - 215px); /* Center the navbar */
     right: calc(50% - 215px); /* Center the navbar */
   }
+
   .top_header_page {
     left: calc(50% - 215px); /* Center the navbar */
     right: calc(50% - 215px); /* Center the navbar */
@@ -66,17 +61,12 @@
 @media (min-width: 800px) {
   .App {
     width: 600px;
-
     background-color: white;
     padding-top: 4rem;
     box-shadow: rgba(0, 0, 0, 0.15) 0px 8px 36px;
   }
-  .bottom_navbar {
-    left: calc(50% - 300px); /* Center the navbar */
-    right: calc(50% - 300px); /* Center the navbar */
-  }
 
-  .bottom_navbor2 {
+  .navbar {
     left: calc(50% - 300px); /* Center the navbar */
     right: calc(50% - 300px); /* Center the navbar */
   }

src/App.js

@@ -10,7 +10,7 @@ import "./App.css";
 import loading from "./assets/animation/loading.json";
 import Auth from "./hoc/auth";
 import useInterval from "./hooks/useInterval";
-import CafeSearchPage from "./pages/CafeSearch/CafeSearch";
+import StoreSearchPage from "./pages/StoreSearch/StoreSearch";
 import CartPage from "./pages/CartPage/CartPage";
 import HomePage from "./pages/HomePage/Homepage";
 import KakaoLoginPage from "./pages/LoginPage/Login";
@@ -34,6 +34,7 @@ import PaymentPage from "./pages/PaymentPage/PaymentPage";
 import PaymentFailPage from "./pages/PaymentPage/Redirect/PaymentFailPage";
 import PaymentSuccessPage from "./pages/PaymentPage/Redirect/PaymentSuccessPage";
 import ReadyPage from "./pages/ReadyPage/ReadyPage";
+import Splash from "./pages/Splash/Splash";
 
 function App() {
   const [cookies, , removeCookies] = useCookies();
@@ -109,12 +110,13 @@ function App() {
         >
           <Routes>
             {/* 로그인 하지 않아도 볼 수 있는 페이지 */}
+            <Route path="/splash" element={<Splash />} />
             {/* 메인페이지 */}
             <Route path="/" element={<NewHomePage />} />
             {/* 없는 경로로 갈 경우 메인페이지로 강제 이동 */}
             <Route path="/*" element={<Navigate to="/"></Navigate>}></Route>
             {/* 카페검색*/}
-            <Route path="/search" element={<CafeSearchPage />} />
+            <Route path="/search" element={<StoreSearchPage />} />
             {/* 로그인*/}
             <Route path="/kakaologin" element={<NewLoginPage />} />
             <Route path="/policyinlogin" element={<PolicyInLogin />} />
@@ -130,7 +132,7 @@ function App() {
             <Route path="/position" element={<PositionpolicyPage />} />
             {/* 마이페이지-이벤트 페이지 */}
             <Route path="/eventing" element={<EventingPage />} />
-            {/* 카페 상세 페이지*/}
+            {/* 가게상세 페이지*/}
             <Route path="/store" element={<StoreDetailPage />} />
             {/* 마이페이지*/}
             <Route path="/mypage" element={<MyPage />} />