diff --git a/src/components/views/Audio/AudioPlayer.jsx b/src/components/views/Audio/AudioPlayer.jsx index 33f8bae..b5f17a3 100644 --- a/src/components/views/Audio/AudioPlayer.jsx +++ b/src/components/views/Audio/AudioPlayer.jsx @@ -3,7 +3,6 @@ import VeryMp3 from "../../../assets/Very.mp3"; const AudioPlayer = () => { const audio = new Audio(VeryMp3); audio.play().catch((error) => { - // Autoplay was prevented, handle it here console.error("Autoplay prevented:", error); }); }; diff --git a/src/components/views/Header/Header.jsx b/src/components/views/Header/Header.jsx index 92e614a..7b0c9d6 100644 --- a/src/components/views/Header/Header.jsx +++ b/src/components/views/Header/Header.jsx @@ -23,6 +23,25 @@ const Header = () => { console.log(Sound); }; + // const apiUrl = process.env.REACT_APP_API_ROOT; + // const [storeOpen, setStoreOpen] = useState(false); + // useEffect(() => { + // const config = { + // withCredentials: true, + // } + // axios + // .get(`${apiUrl}/api/v1/store/sales`, config) + // .then((response) => { + // console.log(response); + // setStoreOpen(response.data); + // console.log(storeOpen); + // }) + // .catch((error) => { + // console.error(error); + // } + // // eslint-disable-next-line react-hooks/exhaustive-deps + // }, []); + return (
diff --git a/src/hoc/auth.jsx b/src/hoc/auth.jsx index b72c227..c983392 100644 --- a/src/hoc/auth.jsx +++ b/src/hoc/auth.jsx @@ -1,17 +1,18 @@ -/*import { useCookies } from "react-cookie"; +import moment from "moment"; +import { useEffect } from "react"; +import { useCookies } from "react-cookie"; import { useLocation, useNavigate } from "react-router-dom"; import { useRecoilValue, useSetRecoilState } from "recoil"; -import { getUserSelector, loginState } from "../Atom/status";*/ +import { getUserSelector, loginState } from "../Atom/status"; function Auth(SpecificComponent, option) { function AuthenticationCheck(props) { - /*const navigate = useNavigate(); + const navigate = useNavigate(); const location = useLocation(); const userInfo = useRecoilValue(getUserSelector); const setIsLoggedIn = useSetRecoilState(loginState); const [cookies] = useCookies(["accessToken"]); - useEffect(() => { const isAuth = window.localStorage.getItem("isAuthenticated"); if (userInfo === "404" && location.pathname !== "/") { @@ -35,7 +36,7 @@ function Auth(SpecificComponent, option) { } // eslint-disable-next-line react-hooks/exhaustive-deps - }, []);*/ + }, []); return ; } return AuthenticationCheck; diff --git a/src/pages/Home/MainHome.jsx b/src/pages/Home/MainHome.jsx index 270f932..6559db2 100644 --- a/src/pages/Home/MainHome.jsx +++ b/src/pages/Home/MainHome.jsx @@ -18,14 +18,13 @@ const MainHome = () => { const onClickHandler = (e) => { const { name } = e.target; - // 현재 선택된 상태 + const currentStatus = status[name]; if (!currentStatus) { setStatus((prevStatus) => { const updatedStatus = { ...prevStatus }; - updatedStatus[name] = true; // 선택된 status를 true로 설정 + updatedStatus[name] = true; - // 나머지 값들을 모두 false로 설정 for (const key in updatedStatus) { if (key !== name) { updatedStatus[key] = false; diff --git a/src/pages/Home/Receipt/Receipt.jsx b/src/pages/Home/Receipt/Receipt.jsx index 257278b..bcef6f8 100644 --- a/src/pages/Home/Receipt/Receipt.jsx +++ b/src/pages/Home/Receipt/Receipt.jsx @@ -1,5 +1,5 @@ import React from "react"; -import { useRecoilState } from "recoil"; +import { useRecoilValue } from "recoil"; import { selectOrder, selectStatus } from "../../../Atom/order"; import loading from "../../../assets/icons/loading.svg"; import "./Receipt.css"; @@ -9,28 +9,12 @@ import PendingReceipt from "./StatusReceipt/PendingReceipt"; import ProgressReceipt from "./StatusReceipt/ProgressReceipt"; const Receipt = () => { - const Status = useRecoilState(selectStatus); - const Order = useRecoilState(selectOrder); + const Status = useRecoilValue(selectStatus); + const Order = useRecoilValue(selectOrder); - const orderInfo = { - orders: [ - { - id: 123, //db 인덱스 - orderNum: 2, // 그날의 그가게의 주문번호 - pickUp: "픽업", - foodies: [ - { - name: "아메리카노", - count: 3, - options: ["샷 추가", "휘핑", "ICE", "그란데"], - }, - ], - phone: "010-6439-3547", // 고객의 전화번호 - time: "21/11/08 11:44:30", // 주문시간 - payment: "현대카드", - price: 8500, - }, - ], + const onClickHandler = () => { + console.log(Status); + console.log(Order); }; return ( @@ -39,32 +23,12 @@ const Receipt = () => { {Status === "pending" ? ( ) : Status === "progress" ? ( - - ) : //
progress
- Status === "complete" ? ( - + + ) : Status === "complete" ? ( + ) : ( - //
complete
- loading + loading 주문을 선택해주세요
)} diff --git a/src/pages/Home/Receipt/StatusReceipt/CompleteReceipt.jsx b/src/pages/Home/Receipt/StatusReceipt/CompleteReceipt.jsx index 04fe983..8dd2937 100644 --- a/src/pages/Home/Receipt/StatusReceipt/CompleteReceipt.jsx +++ b/src/pages/Home/Receipt/StatusReceipt/CompleteReceipt.jsx @@ -1,8 +1,28 @@ import React from "react"; -const CompleteReceipt = ({ - orderProps: { orderNum, time, phone, foodies, payment, price }, -}) => { +const CompleteReceipt = ({ orderProps }) => { + const { orderNum, time, phone, foodies, payment, price } = orderProps; + + // api연결 + // const apiUrl = process.env.REACT_APP_API_ROOT; + // const [storeOpen, setStoreOpen] = useState(false); + // useEffect(() => { + // const config = { + // withCredentials: true, + // } + // axios + // .get(`${apiUrl}/api/v1/store/sales`, config) + // .then((response) => { + // console.log(response); + // setStoreOpen(response.data); + // console.log(storeOpen); + // }) + // .catch((error) => { + // console.error(error); + // } + // // eslint-disable-next-line react-hooks/exhaustive-deps + // }, []); + return (
diff --git a/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx b/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx index 53a9338..702bf02 100644 --- a/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx +++ b/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx @@ -9,7 +9,6 @@ const PendingReceipt = ({ orderProps }) => { const [RefuseModal, setRefuseModal] = useState(false); const handleReceiveModal = () => { - console.log(ReceiveModal); setReceiveModal((prev) => !prev); }; @@ -17,6 +16,26 @@ const PendingReceipt = ({ orderProps }) => { setRefuseModal((prev) => !prev); }; + //api 연결 + // const apiUrl = process.env.REACT_APP_API_ROOT; + // const [storeOpen, setStoreOpen] = useState(false); + // useEffect(() => { + // const config = { + // withCredentials: true, + // } + // axios + // .get(`${apiUrl}/api/v1/store/sales`, config) + // .then((response) => { + // console.log(response); + // setStoreOpen(response.data); + // console.log(storeOpen); + // }) + // .catch((error) => { + // console.error(error); + // } + // // eslint-disable-next-line react-hooks/exhaustive-deps + // }, []); + return (
diff --git a/src/pages/Home/Receipt/StatusReceipt/ProgressReceipt.jsx b/src/pages/Home/Receipt/StatusReceipt/ProgressReceipt.jsx index 51c2422..bdec4ad 100644 --- a/src/pages/Home/Receipt/StatusReceipt/ProgressReceipt.jsx +++ b/src/pages/Home/Receipt/StatusReceipt/ProgressReceipt.jsx @@ -1,12 +1,31 @@ import React from "react"; -const ProgressReceipt = ({ - orderProps: { orderNum, time, phone, foodies, payment, price }, -}) => { +const ProgressReceipt = ({ orderProps }) => { + const { orderNum, time, phone, foodies, payment, price } = orderProps; const onClickBtn = () => { console.log("제조완료"); }; + // api 연결 + // const apiUrl = process.env.REACT_APP_API_ROOT; + // const [storeOpen, setStoreOpen] = useState(false); + // useEffect(() => { + // const config = { + // withCredentials: true, + // } + // axios + // .get(`${apiUrl}/api/v1/store/sales`, config) + // .then((response) => { + // console.log(response); + // setStoreOpen(response.data); + // console.log(storeOpen); + // }) + // .catch((error) => { + // console.error(error); + // } + // // eslint-disable-next-line react-hooks/exhaustive-deps + // }, []); + return (
diff --git a/src/pages/Home/StatusHome/DetailHome.css b/src/pages/Home/StatusHome/DetailHome.css index fa9de71..ad7f6f9 100644 --- a/src/pages/Home/StatusHome/DetailHome.css +++ b/src/pages/Home/StatusHome/DetailHome.css @@ -38,15 +38,15 @@ } .Order-content__box { - width: 33.375rem; + /* width: 33.375rem; */ + width: 100%; padding: 2% 0% 2% 0%; border-top: 2px solid #838383; display: flex; flex-direction: row; - flex-wrap: wrap; - justify-content: flex-start; + justify-content: space-around; align-items: center; } diff --git a/src/pages/Home/StatusHome/Wait.jsx b/src/pages/Home/StatusHome/Wait.jsx index 528fc3d..a548206 100644 --- a/src/pages/Home/StatusHome/Wait.jsx +++ b/src/pages/Home/StatusHome/Wait.jsx @@ -1,7 +1,9 @@ import React, { useEffect, useState } from "react"; import { useRecoilState } from "recoil"; import { ordercnt, selectOrder, selectStatus } from "../../../Atom/order"; +// import { soundState } from "../../../Atom/status"; import downArrow from "../../../assets/icons/icon_downArrow_black.svg"; +// import AudioPlayer from "../../../components/views/Audio/AudioPlayer"; import OrderBox from "../../../components/views/Order/OrderBox"; import "./DetailHome.css"; @@ -99,12 +101,31 @@ const Wait = () => { setSelectedOrderId(selectedOrder ? selectedOrder.id : null); }; - useEffect(() => { - /* - while (orderInfo.orders.length !== 0 && soundState) { - AudioPlayer(); - }*/ + //api 연결 + // const apiUrl = process.env.REACT_APP_API_ROOT; + // const [storeOpen, setStoreOpen] = useState(false); + // useEffect(() => { + // const config = { + // withCredentials: true, + // } + // axios + // .get(`${apiUrl}/api/v1/store/sales`, config) + // .then((response) => { + // console.log(response); + // setStoreOpen(response.data); + // console.log(storeOpen); + // }) + // .catch((error) => { + // console.error(error); + // } + // // eslint-disable-next-line react-hooks/exhaustive-deps + // }, []); + + // while (orderInfo.orders.length !== 0 && soundState) { + // AudioPlayer(); + // } + useEffect(() => { // OrderBox가 생성될 때마다 개수 증가 setOrderCount((prev) => ({ ...prev, pending: orderInfo.orders.length })); }, [orderInfo.orders.length, setOrderCount]); diff --git a/src/pages/Mypage/MainMypage.jsx b/src/pages/Mypage/MainMypage.jsx index 1fd44d2..21f5697 100644 --- a/src/pages/Mypage/MainMypage.jsx +++ b/src/pages/Mypage/MainMypage.jsx @@ -2,18 +2,17 @@ import axios from "axios"; import React, { useEffect } from "react"; import { useCookies } from "react-cookie"; import { useNavigate } from "react-router-dom"; -import { useSetRecoilState } from 'recoil'; -import { isAuthenticatedState, loginState } from '../../Atom/status'; +import { useSetRecoilState } from "recoil"; +import { isAuthenticatedState, loginState } from "../../Atom/status"; import kakao from "../../assets/icons/icon_kakao.svg"; import readyvery from "../../assets/icons/img_readyVery.svg"; - import "./MainMypage.css"; const MainMypage = () => { const navigate = useNavigate(); const apiUrl = process.env.REACT_APP_API_ROOT; - const [, ,removeCookies] = useCookies(); + const [, , removeCookies] = useCookies(); const setIsLoggedIn = useSetRecoilState(loginState); const setIsAuthenticated = useSetRecoilState(isAuthenticatedState); @@ -31,14 +30,15 @@ const MainMypage = () => { withCredentials: true, }; - axios.get(apiUrl + "/api/v1/user/logout", config) - .then((response) => { - console.log(response); - setIsAuthenticated(false); - setIsLoggedIn({ - accessToken: null, - expiredTime: null - }) + axios + .get(apiUrl + "/api/v1/user/logout", config) + .then((response) => { + console.log(response); + setIsAuthenticated(false); + setIsLoggedIn({ + accessToken: null, + expiredTime: null, + }); navigate("/"); removeCookies("accessToken"); removeCookies("JSESSIONID"); @@ -47,9 +47,8 @@ const MainMypage = () => { .catch((error) => { alert("관리자에게 문의하세요."); navigate("/"); - }); - } + }; return (
@@ -57,15 +56,21 @@ const MainMypage = () => {
오늘도 준비된 -
오르다커피 사장님
+
+ 오르다커피 사장님 +
-
readyvery
+
+ readyvery +
- 레디베리 상담 + 레디베리 상담 매일 00:00 ~ 24:00
-
kakao
+
+ kakao +
@@ -76,33 +81,41 @@ const MainMypage = () => {
가게명 - 오르다커피 + 오르다커피
가게주소 - 경기 부천시 지봉로 46 백호빌딩 2층 + + 경기 부천시 지봉로 46 백호빌딩 2층 +
매장 연락처 - 0507-1358-6887 + 0507-1358-6887
영업시간 - 평일 08:40-23:00 / 토요일 11:00-22:00 / 일요일 휴무 + + 평일 08:40-23:00 / 토요일 11:00-22:00 / 일요일 휴무 +
등록 계좌번호 - KB국민은행 22930104331825 + + KB국민은행 22930104331825 +
-
로그아웃
+
+ 로그아웃 +
); };