Merge pull request #44 from marina-yhm/test

Feat: 오더 기본값 고정되는 부분 수정
readyvery · Nov 30, 2023 · 7803014 · 7803014
2 parents d5aaa4a + 280ae1f
commit 7803014
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 60 deletions.
diff --git a/src/App.js b/src/App.js
@@ -1,4 +1,3 @@
-import { message } from 'antd';
 import axios from "axios";
 import React, { Suspense } from "react";
 import { useCookies } from "react-cookie";
@@ -25,17 +24,15 @@ function App() {
   const NewMyPage = Auth(Mypage, true);
 
   const expiredTime = 1000 * 60 * 60 * 24;
-  // const expiredTime = 60000
   // const expiredTime = 65000;
   useInterval(() => {
-    console.log(cookies);
+    // console.log(cookies.refreshToken);
     // if (
     //   cookies.refreshToken !== "undefined" &&
     //   cookies.refreshToken !== undefined &&
     //   cookies.refreshToken
-
     // ) {
-    if(cookies.accessToken){
+    if (cookies.accessToken) {
       const config = {
         withCredentials: true,
       };
@@ -50,33 +47,12 @@ function App() {
         })
         .catch((err) => {
           console.log(err);
-          // const config = {
-          //   withCredentials: true,
-          // };
-
-          // axios
-          //   .get(apiUrl + "/api/v1/user/logout", config)
-          //   .then((response) => {
-          //     console.log(response);
-          //     setIsAuthenticated(false);
-          //     setIsLoggedIn({
-          //       accessToken: null,
-          //       expiredTime: null,
-          //     });
-          //     removeCookies("accessToken");
-          //     removeCookies("JSESSIONID");
-          //     window.localStorage.setItem("isAuthenticated", false);
-          //   })
-          //   .catch((error) => {
-          //     message.info("관리자에게 문의하세요.");
-          //     navigate("/");
-          //   });
-          message.info("토큰이 만료되었습니다. 로그인을 진행해주세요.");
+          alert("토큰이 만료되었습니다. 로그인을 진행해주세요.");
           navigate("/");
         });
-      }
+    }
     // }
-  }, expiredTime);
+  }, expiredTime - 60000);
   return (
     <div className="App">
       <RecoilRoot>

diff --git a/src/components/views/Header/Header2.jsx b/src/components/views/Header/Header2.jsx
@@ -15,16 +15,17 @@ const Header = () => {
   const [store, setStore] = useState(null);
   useEffect(() => {
     const config = {
-      withCredentials: true
+      withCredentials: true,
     };
 
-    axios.get(`${baseUrl}/api/v1/store/sales`, config)
+    axios
+      .get(`${baseUrl}/api/v1/store/sales`, config)
       .then((res) => {
         console.log(res);
         setStore(res.data.status);
       })
-      .catch((err) => console.log(err))
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+      .catch((err) => console.log(err));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const [Sound, setSound] = useRecoilState(soundState);
@@ -56,7 +57,7 @@ const Header = () => {
               <div className="header-font">영업종료 </div>
             </div>
           )}
-          {Sound ? (
+          {Sound && Sound ? (
             <div className="header-img-wrapper">
               <img src={SoundOn} onClick={onClickHandler} alt="SoundOn" />
             </div>

diff --git a/src/pages/Home/Receipt/Receipt.css b/src/pages/Home/Receipt/Receipt.css
@@ -77,21 +77,23 @@
 
   padding: 3% 7% 1% 7%;
 }
+
 .receipt-FoodName {
-  padding-left: 10%;
-  display: flex;
   flex-direction: column;
   align-items: flex-start;
 
+  display: block; /* 블록 요소로 설정하여 각각 새로운 라인에 표시 */
+  text-align: left; /* 왼쪽 정렬 */
   color: #4f4f4f;
   font-family: "SemiBold";
   font-size: 1.4375rem;
   font-weight: 700;
   line-height: 130%; /* 1.625rem */
   letter-spacing: -0.0125rem;
 }
+
 .receiptOption {
-  padding-left: 20%;
+  padding-left: 10%;
   display: flex;
   flex-direction: column;
   align-items: flex-start;

diff --git a/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx b/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx
@@ -151,8 +151,8 @@ const PendingReceipt = ({ orderProps, setStatus, setOrder, fetchData }) => {
       {orderProps?.foodies?.map((e, i) => (
         <React.Fragment key={i}>
           <div className="receiptTextBox">
-            <span className="receipt-FoodName">{e.name}</span>
-            <span className="receipt-text">{e.count}</span>
+            <span className="receipt-FoodName">• {e.name}</span>
+            <span className="receipt-FoodName">{e.count}</span>
           </div>
           <div className="receiptOption">
             {e.options.map((option) => (

diff --git a/src/pages/Home/StatusHome/Complete.jsx b/src/pages/Home/StatusHome/Complete.jsx
@@ -51,7 +51,8 @@ const Complete = ({ orderInfo }) => {
       setStatusSelect("null");
       setOrderSelect(null);
     }
-  }, [orderInfo, setOrderSelect, setStatusSelect, sortedOrders]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   return (
     <div className="Order-wrapper">

diff --git a/src/pages/Home/StatusHome/Progress.jsx b/src/pages/Home/StatusHome/Progress.jsx
@@ -39,7 +39,8 @@ const Progress = ({ orderInfo }) => {
       setStatusSelect("null");
       setOrderSelect(null);
     }
-  }, [orderInfo, setOrderSelect, setStatusSelect, sortedOrders]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   const onClickHandler = (selectedOrder) => {
     setOrderSelect(selectedOrder);

diff --git a/src/pages/Home/StatusHome/Wait.jsx b/src/pages/Home/StatusHome/Wait.jsx
@@ -15,6 +15,17 @@ const Wait = ({ orderInfo }) => {
   const [selectedOrderId, setSelectedOrderId] = useState(null);
   const [isRecentFirst, setIsRecentFirst] = useRecoilState(isRecentFirstState);
 
+  useEffect(() => {
+    const isAudioPlay = () => {
+      if (playSound && orderInfo?.orders?.length !== null) {
+        AudioPlayer(); // 소리 재생
+        console.log("소리 재생");
+      }
+    };
+    isAudioPlay();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   /*
   const sortedOrders = isRecentFirst
     ? [...(orderInfo?.orders || [])].sort((prev, cur) => {
@@ -28,24 +39,6 @@ const Wait = ({ orderInfo }) => {
     ? [...(orderInfo?.orders || [])].reverse()
     : orderInfo?.orders;
 
-  useEffect(() => {
-    const firstOrder = sortedOrders?.length > 0 ? sortedOrders[0] : null;
-    setOrderSelect(firstOrder);
-    setSelectedOrderId(firstOrder?.idx || null);
-
-    if (firstOrder !== null) {
-      setStatusSelect("pending");
-    } else {
-      setStatusSelect("null");
-      setOrderSelect(null);
-    }
-
-    if (playSound && orderInfo?.orders?.length !== null) {
-      AudioPlayer(); // 소리 재생
-      console.log("소리 재생");
-    }
-  }, [orderInfo, playSound, setOrderSelect, setStatusSelect, sortedOrders]);
-
   const onClickHandler = (selectedOrder) => {
     setOrderSelect(selectedOrder);
     setSelectedOrderId(selectedOrder?.idx && selectedOrder?.idx);
@@ -60,6 +53,41 @@ const Wait = ({ orderInfo }) => {
     }
   };
 
+  // useEffect(() => {
+  //   const firstOrder = sortedOrders?.length > 0 ? sortedOrders[0] : null;
+
+  //   if (firstOrder !== null) {
+  //     setStatusSelect("pending");
+  //     setOrderSelect(firstOrder);
+  //     setSelectedOrderId(firstOrder.idx);
+  //   } else {
+  //     setStatusSelect("null");
+  //     setOrderSelect(null);
+  //     setSelectedOrderId(null);
+  //   }
+
+  //   // eslint-disable-next-line react-hooks/exhaustive-deps
+  // }, [sortedOrders]);
+
+  useEffect(() => {
+    const sortedOrders = isRecentFirst
+      ? [...(orderInfo?.orders || [])].reverse()
+      : orderInfo?.orders;
+    const firstOrder = sortedOrders?.length > 0 ? sortedOrders[0] : null;
+
+    if (firstOrder !== null) {
+      setStatusSelect("pending");
+      setOrderSelect(firstOrder);
+      setSelectedOrderId(firstOrder.idx);
+    } else {
+      setStatusSelect("null");
+      setOrderSelect(null);
+      setSelectedOrderId(null);
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   return (
     <div className="Order-wrapper">
       <div className="Order-title__wrapper">
@@ -95,7 +123,6 @@ const Wait = ({ orderInfo }) => {
           />
         ))}
       </div>
-      {/* <button onClick={Player}>Play Audio</button> */}
     </div>
   );
 };