Modify: 메인 링크 주소 수정

fullminji · Nov 2, 2023 · f42c735 · f42c735
1 parent e5b217b
commit f42c735
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 15 deletions.
diff --git a/public/index.html b/public/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Weread</title>
+    <title>Dobby</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/Router.jsx b/src/Router.jsx
@@ -28,7 +28,6 @@ const Router = () => {
           <Route path="/delivery" element={<Delivery />} />
           <Route path="/detail/:productId" element={<Detail />} />
           <Route path="/main" element={<Main />} />
-          {/* <Route path="/store/:id" element={<Store />} /> */}
           <Route path="/store" element={<Store />} />
           <Route path="/pay-complete" element={<PayComplete />} />
           <Route path="/payment" element={<Payment />} />

diff --git a/src/components/Nav/Nav.jsx b/src/components/Nav/Nav.jsx
@@ -14,15 +14,15 @@ const Nav = () => {
     localStorage.removeItem('token');
     localStorage.removeItem('nickname');
     alert('로그아웃 되었습니다.');
-    navigate('/main');
+    navigate('/main?dobbyBox=basic');
   };
 
   return (
     <div className="navHeader">
       <div className="header">
         <h1
           onClick={() => {
-            navigate('/main');
+            navigate('/main?dobbyBox=basic');
           }}
         >
           DOBBY

diff --git a/src/config.js b/src/config.js
@@ -1,6 +1,6 @@
 // src/config.js
 const BASE_URL = 'http://10.58.52.189:8000';
-const BASE_URL6 = 'http://10.58.52.196:8000';
+// const BASE_URL6 = 'http://10.58.52.196:8000';
 
 export const GET_SUBSCRIPTION_API = `${BASE_URL}/subscription`;
 export const GET_PRODUCTLIST_API = `${BASE_URL}/products`;
@@ -13,3 +13,4 @@ export const GET_PAYMENT_ADDRESS_API = `${BASE_URL}/cart/payment/address`;
 export const POST_PAYMENT_NEW_ADDRESS_API = `${BASE_URL}/cart/payment/address/done`;
 export const GET_PRODUCT_DETAIL_API = `${BASE_URL}/products`;
 export const POST_CART_DETAIL_API = `${BASE_URL}/cart`;
+export const PATCH_PAYMENT_ORDER_API = `${BASE_URL}/cart/payment/reversion`;
diff --git a/src/pages/Login/Login.jsx b/src/pages/Login/Login.jsx
@@ -44,7 +44,7 @@ const Login = () => {
           alert('로그인 되었습니다.');
           localStorage.setItem('nickname', data.nickname);
           localStorage.setItem('token', data.token);
-          navigate('/main?dobbybox=basic');
+          navigate('/main?dobbyBox=basic');
         } else if (data.message === 'INVALID EMAIL OR PASSWORD') {
           alert('가입되지 않은 정보입니다.');
         }

diff --git a/src/pages/Main/Layout/TabList/TabList.scss b/src/pages/Main/Layout/TabList/TabList.scss
@@ -6,10 +6,7 @@
   border-radius: 10px 10px 0 0;
   padding: 13px;
   color: #fff;
-
-  &:hover {
-    cursor: pointer;
-  }
+  cursor: pointer;
 
   &.active {
     background-color: #fff;

diff --git a/src/pages/Main/Main.jsx b/src/pages/Main/Main.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import Subscribe from './Layout/Subscribe/Subscribe';
 import CategorizedSlide from './Layout/CategorizedSlide/CategorizedSlide';
 import CategoryList from './Layout/CategoryList/CategoryList';
@@ -10,6 +10,7 @@ const Main = () => {
   const [searchParams, setSearchParams] = useSearchParams();
   const [productsData, setProductsData] = useState({});
   const [menuList, setMenuList] = useState([]);
+  const navigate = useNavigate();
 
   const setSubTypeParams = subtype => {
     const subscriptParams = new URLSearchParams(searchParams);
@@ -55,7 +56,9 @@ const Main = () => {
     })
       .then(res => res.json())
       .then(data => {
-        window.location.href = data.redirectUrl;
+        if (data.message === 'success') {
+          navigate(`/payment${searchParams.toString()}`);
+        }
       });
   };
 

diff --git a/src/pages/PayComplete/PayComplete.jsx b/src/pages/PayComplete/PayComplete.jsx
@@ -6,7 +6,7 @@ const PayComplete = () => {
   const navigate = useNavigate();
 
   const mainClick = () => {
-    navigate('/main');
+    navigate('/main?dobbyBox=basic');
   };
 
   return (

diff --git a/src/pages/Store/Layout/Search.jsx b/src/pages/Store/Layout/Search.jsx
@@ -1,12 +1,16 @@
 import React, { useState } from 'react';
-import './Search.scss';
 import { useSearchParams } from 'react-router-dom';
+import './Search.scss';
 
 const Search = () => {
   const [search, setSearch] = useState('');
   const [searchParams, setSearchParams] = useSearchParams();
 
   const handleSearch = () => {
+    if (!search) {
+      alert('검색어를 입력해주세요!');
+      return;
+    }
     searchParams.set('search', search);
     setSearchParams(searchParams);
   };

diff --git a/src/pages/Store/Layout/Search.scss b/src/pages/Store/Layout/Search.scss
@@ -6,7 +6,6 @@
   }
 
   button {
-    cursor: pointer;
     border: 1px solid #000;
     border-radius: 6px;
     padding: 2px 5px;