diff --git a/src/pages/Home/Receipt/StatusReceipt/CompleteReceipt.jsx b/src/pages/Home/Receipt/StatusReceipt/CompleteReceipt.jsx index 6ce431f..7c4d1a6 100644 --- a/src/pages/Home/Receipt/StatusReceipt/CompleteReceipt.jsx +++ b/src/pages/Home/Receipt/StatusReceipt/CompleteReceipt.jsx @@ -1,3 +1,4 @@ +import { message } from "antd"; import axios from "axios"; import React from "react"; @@ -21,7 +22,7 @@ const CompleteReceipt = ({ orderProps, setStatus, setOrder, fetchData }) => { .then((res) => { console.log(res); if (res.data.success === true) { - alert("픽업완료 처리되었습니다."); + message.info("픽업완료 처리되었습니다."); // 데이터 다시 fetch fetchData(); // select된 데이터 변경 diff --git a/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx b/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx index 0b3b343..1b78672 100644 --- a/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx +++ b/src/pages/Home/Receipt/StatusReceipt/PendingReceipt.jsx @@ -1,3 +1,4 @@ +import { message } from "antd"; import axios from "axios"; import React, { useState } from "react"; import { Button, Col, Row } from "react-bootstrap"; @@ -31,7 +32,7 @@ const PendingReceipt = ({ orderProps, setStatus, setOrder, fetchData }) => { .then((res) => { console.log(res); if (res.status === 200) { - alert("취소되었습니다."); + message.info("취소되었습니다."); setRefuseModal((prev) => !prev); // 데이터 다시 fetch fetchData(); diff --git a/src/pages/Home/Receipt/StatusReceipt/ProgressReceipt.jsx b/src/pages/Home/Receipt/StatusReceipt/ProgressReceipt.jsx index 0a5721b..a932048 100644 --- a/src/pages/Home/Receipt/StatusReceipt/ProgressReceipt.jsx +++ b/src/pages/Home/Receipt/StatusReceipt/ProgressReceipt.jsx @@ -1,3 +1,4 @@ +import { message } from "antd"; import axios from "axios"; import React from "react"; @@ -22,7 +23,7 @@ const ProgressReceipt = ({ orderProps, setStatus, setOrder, fetchData }) => { .then((res) => { console.log(res); if (res.data.success === true) { - alert("제조완료 처리되었습니다."); + message.info("제조완료 처리되었습니다."); // 데이터 다시 fetch fetchData(); // select된 데이터 변경 diff --git a/src/pages/Mypage/MainMypage.jsx b/src/pages/Mypage/MainMypage.jsx index 2ddfc0c..4ba63c9 100644 --- a/src/pages/Mypage/MainMypage.jsx +++ b/src/pages/Mypage/MainMypage.jsx @@ -1,5 +1,5 @@ import axios from "axios"; -import React, { useEffect, useMemo, useState } from "react"; +import React, { useEffect, useState } from "react"; import { useCookies } from "react-cookie"; import { useNavigate } from "react-router-dom"; import { useSetRecoilState } from "recoil"; @@ -17,47 +17,23 @@ const MainMypage = React.memo(() => { const setIsAuthenticated = useSetRecoilState(isAuthenticatedState); const [cafeInfo, setCafeInfo] = useState({}); - // const fetchData = () => { - // const config = { - // withCredentials: true - // }; - - // axios.get(`${apiUrl}/api/v1/user/info`, config) - // .then((res) => { - // console.log(res); - // setCafeInfo(res.data); - // }) - // .catch((err) => console.log(err)); - // }; - - // useEffect(() => { - // fetchData(); - // // eslint-disable-next-line react-hooks/exhaustive-deps - // }, []); - const fetchData = () => { const config = { withCredentials: true }; - return axios.get(`${apiUrl}/api/v1/user/info`, config) + axios.get(`${apiUrl}/api/v1/user/info`, config) .then((res) => { console.log(res); - return res.data; + setCafeInfo(res.data); }) .catch((err) => console.log(err)); }; - const memoizedFetchData = useMemo(() => { + useEffect(() => { fetchData(); // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); // empty dependency array means the function doesn't depend on any external variable - - useEffect(() => { - memoizedFetchData().then((data) => { - setCafeInfo(data); - }); - }, [memoizedFetchData]); + }, []); const handleLogout = () => { const config = {