Merge branch 'test' into polling

Author: 1223v

src/App.js

@@ -33,15 +33,13 @@ 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) {
       const config = {
@@ -57,28 +55,6 @@ 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("토큰이 만료되었습니다. 로그인을 진행해주세요.");
           navigate("/");
         });

src/components/views/Header/Header2.jsx

@@ -26,7 +26,7 @@ const Header = () => {
         console.log(res);
         setSelectStore(res.data.status);
       })
-      .catch((err) => console.log(err));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const onClickHandler = () => {
@@ -55,7 +55,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>

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;

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) => (

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">

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);

src/pages/Home/StatusHome/Wait.jsx

@@ -15,7 +15,6 @@ const Wait = ({ orderInfo }) => {
   const [playSound, setplaySound] = useRecoilState(soundState);
   const [selectedOrderId, setSelectedOrderId] = useState(null);
   const [isRecentFirst, setIsRecentFirst] = useRecoilState(isRecentFirstState);
-
   const sortedOrders = isRecentFirst
     ? [...(orderInfo?.orders || [])].reverse()
     : orderInfo?.orders;
@@ -54,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">