Merge pull request #312 from hhbb0081/test

hhbb0081 · web-flow · commit 1f19f462e10f · 2024-05-18T14:13:38.000+09:00
Docs: 적립금 주석 처리
diff --git a/src/App.js b/src/App.js
@@ -30,8 +30,8 @@ import PaymentPage from "./pages/PaymentPage/PaymentPage";
 import PaymentFailPage from "./pages/PaymentPage/Redirect/PaymentFailPage";
 import PaymentLoadingPage from "./pages/PaymentPage/Redirect/PaymentLoadingPage";
 import Splash from "./pages/Splash/Splash";
-import StoreSearchPage from "./pages/StoreSearch/StoreSearch";
 import FestivalBoothSearch from "./pages/StoreSearch/FestivalBoothSearch";
+import StoreSearchPage from "./pages/StoreSearch/StoreSearch";
 function App() {
   // const [cookies, , removeCookies] = useCookies();
   // const [isAuth, setIsAuth] = useRecoilState(isAuthenticatedState);
@@ -60,50 +60,6 @@ function App() {
   const NewFestivalBoothSearch = Auth(FestivalBoothSearch, true, 2);
   // const NewPackagingStatusPage = Auth(PackagingStatusPage, true);
 
-  // const minute = 1000 * 60 * 60 * 24; // 24시간
-  //const minute = 1000 * 60 * 10; // 10분
-  // const minute = 1000 * 10; // 10초
-  // // 주기적으로 실행되는 함수
-  // useInterval(() => {
-  //   const token = localStorage.getItem("accessToken");
-  //   console.log('local token: ', token);
-  //   console.log('isAuth: ', isAuth);
-  //   // 리프레시 토큰이 존재하고, 비어 있지 않은 경우
-  //   if (token) {
-  //     // http 요청에 사용될 헤더 설정과 함께 서버에 토큰 갱신 요청
-  //     let config = {
-  //       withCredentials: true,
-  //       headers: {
-  //         Authorization: `Bearer ${token ? token : cookies?.accessToken}`
-  //       }
-  //     };
-  //     console.log('AT 재발급');
-  //     axios
-  //       .get(apiUrl, config)
-  //       .then((response) => {
-  //         console.log(response);
-  //         // 현재 쿠키 삭제
-  //         if (response.status !== 200 ) {
-  //           message.info("다시 로그인해주세요.");
-  //           removeCookies();
-  //           localStorage.clear();
-  //           setIsAuth(false);
-  //           navigate("/login");
-  //         } else {
-  //           console.log("AT 재발급 성공! ");
-  //           console.log(cookies);
-  //           debugger;
-  //           cookies?.accessToken && localStorage.setItem("accessToken", cookies?.accessToken); // 로컬 스토리지에 AT 저장
-  //           removeCookies("accessToken"); // AT 쿠키 삭제
-  //         }
-  //       })
-  //       .catch((error) => {
-  //         console.error(error);
-  //         message.info("다시 로그인해주세요.");
-  //         navigate("/login");
-  //       });
-  //   }
-  // }, minute - 1000); // 24시간 주기에서 1분을 뺀 주기로 주기적 실행
 
   return (
     <div className="App">
diff --git a/src/components/views/PageComponent/OrderProgress.jsx b/src/components/views/PageComponent/OrderProgress.jsx
@@ -16,8 +16,8 @@ const OrderProgress = () => {
   const [degree, setDegree] = useState(-1);
   const [isOpen, setIsOpen] = useState(false);
   const [refreshKey, setRefreshKey] = useState(0);
-  const { estimatedTime, orderNum, progress, expectPoint } =
-    useFetchCurrentOrder(orderId, refreshKey);
+  const { estimatedTime, orderNum, progress } = 
+    useFetchCurrentOrder(orderId, refreshKey); // expectPoint 일시 삭제
   const cancelOrder = useCancelOrder();
   const [rotate, setRotate] = useState(false); //새로고침 클릭시 회전용
   const [debounceTimeout, setDebounceTimeout] = useState(null); // 디바운싱 상태
@@ -234,13 +234,13 @@ const OrderProgress = () => {
               </div>
             )}
 
-            {degree === 3 ? (
+            {/* {degree === 3 ? (
               <div className="order_progress__point">
                 <span className="order_progress__point_text">
                   <span>{expectPoint}</span>원 적립되었습니다
                 </span>
               </div>
-            ) : null}
+            ) : null} */}
           </div>
 
           {isOpen && (
diff --git a/src/hoc/auth.jsx b/src/hoc/auth.jsx
@@ -22,25 +22,21 @@ function Auth(SpecificComponent, option, adminRoute = null) {
               Authorization: `Bearer ${token ? token : cookies?.accessToken}`
           }
         }).then((response) => {
-            console.log(response);
             // debugger;
             const { auth } = response.data; // 로그인 여부
             const { role } = response.data; // GUEST, USER, CEO
             console.log(auth, role, option);
-          console.log(cookies);
           if (cookies.accessToken) {
             if(!token && auth) {
               // 로그인 후 첫 접속
               localStorage.setItem("accessToken", cookies.accessToken); // 로컬 스토리지에 AT 저장
-              // localStorage.setItem("expiredTime", moment().add(1, "days").format("yyyy-MM-DD HH:mm:ss")); // 만료시간 저장
               setIsAuth(true); // 로그인 여부 변경
               message.success("로그인에 성공하셨습니다.");
               removeCookie("accessToken"); // AT 쿠키 삭제
               return;
             } else if(token) {
               localStorage.clear();
               localStorage.setItem("accessToken", cookies.accessToken); // 로컬 스토리지에 AT 저장
-              // localStorage.setItem("expiredTime", moment().add(1, "days").format("yyyy-MM-DD HH:mm:ss")); // 만료시간 저장
               setIsAuth(true); // 로그인 여부 변경
               removeCookie("accessToken"); // AT 쿠키 삭제
               return;
@@ -57,7 +53,6 @@ function Auth(SpecificComponent, option, adminRoute = null) {
               removeCookie("accessToken");
             }
             if(option && location.pathname !== '/' && location.pathname !== '/booth' && location.pathname.split("?")[0] !== '/store'){
-              console.log("부스 & 홈 & 상세에서 나오지 마라");
               navigate('/login');
               return;
             }
diff --git a/src/hooks/useFetchFoodOptionInfo.jsx b/src/hooks/useFetchFoodOptionInfo.jsx
@@ -17,7 +17,6 @@ const useFetchFoodOptionInfo = (storeId, foodieId, inout) => {
         setImgUrl(response.data?.imgUrl);
         setName(response.data?.name);
         setPrice(response.data?.price);
-        console.log("메뉴 데이터: ", response.data);
       } catch (error) {
         console.error("Error fetching food option info:", error);
       }
diff --git a/src/hooks/useFetchOrderDetails.jsx b/src/hooks/useFetchOrderDetails.jsx
@@ -37,7 +37,6 @@ const useFetchOrderDetails = (orderId) => {
         setSalePrice(response.data.salePrice);
         setStoreName(response.data.storeName);
         setStorePhone(response.data.storePhone);
-        console.log('order detail: ', response.data);
       } catch (error) {
         console.error("Error fetching order details:", error);
       }
diff --git a/src/hooks/useFetchQuickOrder.jsx b/src/hooks/useFetchQuickOrder.jsx
@@ -24,7 +24,6 @@ const useFetchQuickOrder = () => {
         }
       } else {
         // isAuth가 false일 때 quickOrder 상태를 초기화합니다.
-        console.log('fetching quick order is diabled');
         setQuickOrder([]);
       }
     };
diff --git a/src/hooks/useLogout.jsx b/src/hooks/useLogout.jsx
@@ -15,7 +15,6 @@ const useLogout = (removeCookie, setIsAuth) => {
           }
         });
         if(response.status === 200){
-          console.log(response);
           localStorage.clear();
           setIsAuth(false);
           message.success("로그아웃에 성공하셨습니다.");
diff --git a/src/pages/OrderProcessPage/OrderProcessPage.jsx b/src/pages/OrderProcessPage/OrderProcessPage.jsx
@@ -130,7 +130,6 @@ const OrderProcessPage = () => {
       return texts;
     });
 
-    console.log('totalAmount: ', totalAmount - prevRadioPrice[index] + price);
     setTotalAmount((prevAmount) => prevAmount - prevRadioPrice[index] + price);
 
     setPrevRadioPrice((prevPrices) => {
@@ -148,10 +147,6 @@ const OrderProcessPage = () => {
 
   // 선택 옵션 변경
   const handleOptionChange = (idx, price, e) => {
-    const tmpOptionIdx = [...optionIdx, idx];
-    e.target.checked && console.log('옵션 변경 후 totalAmount: ', totalAmount + price, '옵션 변경 후 idx: ', tmpOptionIdx);
-    !e.target.checked && console.log('옵션 변경 후 totalAmount: ', totalAmount - price, '옵션 변경 후 idx: ', optionIdx.filter((e) => e !== idx));
-
     e.target.checked
       ? setTotalAmount((prevAmount) => prevAmount + price)
       : setTotalAmount((prevAmount) => prevAmount - price);
@@ -163,14 +158,12 @@ const OrderProcessPage = () => {
   // 수량 증가
   const handleCntUp = () => {
     const newOrderCnt = orderCnt + 1;
-    console.log('count: ', newOrderCnt);
     setOrderCnt(newOrderCnt);
   };
 
   // 수량 감소
   const handleCntDown = () => {
     const newOrderCnt = orderCnt === 1 ? 1 : orderCnt - 1;
-    console.log('count: ', newOrderCnt);
     setOrderCnt((prev) => (prev === 1 ? 1 : newOrderCnt));
   };
 
@@ -180,26 +173,9 @@ const OrderProcessPage = () => {
         .filter((el) => el?.essential)
         .map((e) => e.options[0]?.name);
 
-      console.log('essentialOptions: ', essentialOptions);
       setSelectedRadioTexts(essentialOptions);
     }
 
-    console.log('orderCount: ', orderCnt)
-    console.log('price: ', price);
-    console.log('category: ', parseInt(
-      category
-        ?.filter((el) => el?.essential)
-        .map((e) => parseInt(e?.options[0]?.price))
-        .reduce((prev, curr) => prev + curr, 0)));
-    console.log('totalPrice: ', 
-    (price +
-      parseInt(
-        category
-          ?.filter((el) => el?.essential)
-          .map((e) => parseInt(e?.options[0]?.price))
-          .reduce((prev, curr) => prev + curr, 0)
-      )));
-
     setTotalAmount(
       price && 
       price +
diff --git a/src/pages/StoreSearch/FestivalBoothSearch.jsx b/src/pages/StoreSearch/FestivalBoothSearch.jsx
@@ -1,9 +1,9 @@
-import React, { useState, useEffect, useRef } from "react";
-import { IMAGES } from "../../constants/images";
-import "./StoreSearch.css";
+import React, { useEffect, useRef, useState } from "react";
 import Header from "../../components/views/Header/Header";
 import NavBar from "../../components/views/NavBar/NavBar";
 import StoreList from "../../components/views/StoreList/StoreList";
+import { IMAGES } from "../../constants/images";
+import "./StoreSearch.css";
 
 function FestivalBoothSearch() {
   const [searchTerm, setSearchTerm] = useState("");
@@ -21,7 +21,6 @@ function FestivalBoothSearch() {
   useEffect(() => {
     const handler = setTimeout(() => {
       setDebouncedSearchTerm(searchTerm);
-      console.log("디바운싱:", searchTerm);
     }, debounceDelay);
 
     // 컴포넌트가 unmount되거나 다음 useEffect가 실행되기 전에 타이머를 정리
diff --git a/src/pages/StoreSearch/StoreSearch.jsx b/src/pages/StoreSearch/StoreSearch.jsx
@@ -1,9 +1,9 @@
-import React, { useState, useEffect, useRef } from "react";
-import { IMAGES } from "../../constants/images";
-import "./StoreSearch.css";
+import React, { useEffect, useRef, useState } from "react";
 import Header from "../../components/views/Header/Header";
 import NavBar from "../../components/views/NavBar/NavBar";
 import StoreList from "../../components/views/StoreList/StoreList";
+import { IMAGES } from "../../constants/images";
+import "./StoreSearch.css";
 
 function StoreSearch() {
   const [searchTerm, setSearchTerm] = useState("");
@@ -21,7 +21,6 @@ function StoreSearch() {
   useEffect(() => {
     const handler = setTimeout(() => {
       setDebouncedSearchTerm(searchTerm);
-      console.log("디바운싱:", searchTerm);
     }, debounceDelay);
 
     // 컴포넌트가 unmount되거나 다음 useEffect가 실행되기 전에 타이머를 정리

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ const useFetchFoodOptionInfo = (storeId, foodieId, inout) => {`
`17`	`17`	`setImgUrl(response.data?.imgUrl);`
`18`	`18`	`setName(response.data?.name);`
`19`	`19`	`setPrice(response.data?.price);`
`20`		`- console.log("메뉴 데이터: ", response.data);`
`21`	`20`	`} catch (error) {`
`22`	`21`	`console.error("Error fetching food option info:", error);`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ const useFetchOrderDetails = (orderId) => {`
`37`	`37`	`setSalePrice(response.data.salePrice);`
`38`	`38`	`setStoreName(response.data.storeName);`
`39`	`39`	`setStorePhone(response.data.storePhone);`
`40`		`- console.log('order detail: ', response.data);`
`41`	`40`	`} catch (error) {`
`42`	`41`	`console.error("Error fetching order details:", error);`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ const useFetchQuickOrder = () => {`
`24`	`24`	`}`
`25`	`25`	`} else {`
`26`	`26`	`// isAuth가 false일 때 quickOrder 상태를 초기화합니다.`
`27`		`- console.log('fetching quick order is diabled');`
`28`	`27`	`setQuickOrder([]);`
`29`	`28`	`}`
`30`	`29`	`};`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ const useLogout = (removeCookie, setIsAuth) => {`
`15`	`15`	`}`
`16`	`16`	`});`
`17`	`17`	`if(response.status === 200){`
`18`		`- console.log(response);`
`19`	`18`	`localStorage.clear();`
`20`	`19`	`setIsAuth(false);`
`21`	`20`	`message.success("로그아웃에 성공하셨습니다.");`