Merge pull request #73 from imi21123/test

Fix: OrderProcessPage 충돌 해결, css 파일명 수정
readyvery · Nov 21, 2023 · dd7ad0b · dd7ad0b
2 parents 6618eb6 + 3273479
commit dd7ad0b
Show file tree

Hide file tree

Showing 12 changed files with 241 additions and 139 deletions.
diff --git a/src/App.css b/src/App.css
@@ -56,9 +56,10 @@
 @media (min-width: 800px) {
   .App {
     width: 600px;
-    height: 94vh;
+    height: 100%;
     background-color: white;
     padding-top: 3.5rem;
+    box-shadow: rgba(0, 0, 0, 0.15) 0px 8px 36px;
   }
   .bottom_navbar {
     left: calc(50% - 300px); /* Center the navbar */

diff --git a/src/App.js b/src/App.js
@@ -19,6 +19,8 @@ import OrderStorage from "./pages/OrderStorage/OrderStorage";
 import PackagingStatusPage from "./pages/PackagingStatusPage/PackagingStatusPage";
 import PaymentPage from "./pages/PaymentPage/PaymentPage";
 import ReadyPage from "./pages/ReadyPage/ReadyPage";
+import PaymentSuccessPage from "./pages/PaymentPage/Redirect/PaymentSuccessPage";
+import PaymentFailPage from "./pages/PaymentPage/Redirect/PaymentFailPage";
 
 function App() {
   return (
@@ -62,6 +64,10 @@ function App() {
         <Route path="/cart" element={<CartPage />} />
         {/* 결제 페이지 */}
         <Route path="/payment" element={<PaymentPage />} />
+        {/* 결제 성공 리다이렉트 페이지 */}
+        <Route path="/payment/success" element={<PaymentSuccessPage />} />
+        {/* 결제 실패 리다이렉트 페이지 */}
+        <Route path="/payment/fail" element={<PaymentFailPage />} />
       </Routes>
     </div>
   );

diff --git a/src/pages/CartPage/style.css → src/pages/CartPage/CartPage.css b/src/pages/CartPage/style.css → src/pages/CartPage/CartPage.css
diff --git a/src/pages/CartPage/CartPage.jsx b/src/pages/CartPage/CartPage.jsx
@@ -1,6 +1,6 @@
 import { Link, useLocation } from "react-router-dom";
 import Header from "../../components/views/Header/Header";
-import "./style.css";
+import "./CartPage.css";
 
 const CartPage = () => {
   const location = useLocation();

diff --git a/src/pages/OrderProcessPage/style.css → src/pages/OrderProcessPage/OrderProcess.css b/src/pages/OrderProcessPage/style.css → src/pages/OrderProcessPage/OrderProcess.css