diff --git a/apps/nowait-user/public/bookmarkStoreImage.png b/apps/nowait-user/public/bookmarkStoreImage.png new file mode 100644 index 00000000..2ec60c77 Binary files /dev/null and b/apps/nowait-user/public/bookmarkStoreImage.png differ diff --git a/apps/nowait-user/src/api/reservation.ts b/apps/nowait-user/src/api/reservation.ts index 42d617e4..a89358be 100644 --- a/apps/nowait-user/src/api/reservation.ts +++ b/apps/nowait-user/src/api/reservation.ts @@ -1,4 +1,3 @@ -import axios from "axios"; import UserApi from "../utils/UserApi"; const SERVER_URI = import.meta.env.VITE_SERVER_URI; @@ -12,7 +11,7 @@ export const createReservation = async ( storeId: string, payload: ReservationType ) => { - const res = await UserApi.post(`/reservations/create/${storeId}`, payload); + const res = await UserApi.post(`/reservations/create/redis/${storeId}`, payload); return res.data; }; diff --git a/apps/nowait-user/src/pages/bookmark/BookmarkPage.tsx b/apps/nowait-user/src/pages/bookmark/BookmarkPage.tsx deleted file mode 100644 index 6a6327b2..00000000 --- a/apps/nowait-user/src/pages/bookmark/BookmarkPage.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import HomeHeader from "../../components/Header"; - -const BookmarkPage = () => { - return ( -
-
- -
-
- ); -}; - -export default BookmarkPage; diff --git a/apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx b/apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx index cc23d1e7..b003c03b 100644 --- a/apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx +++ b/apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx @@ -14,7 +14,8 @@ const WaitingSummaryPage = () => { const payload = { partySize, }; - await createReservation(id!, payload); + const res = await createReservation(id!, payload); + console.log(res,"예약 응답") navigate(`/store/${id}/waiting/success`); } catch (error) { console.log(error); diff --git a/apps/nowait-user/src/pages/waiting/bookmark/BookmarkPage.tsx b/apps/nowait-user/src/pages/waiting/bookmark/BookmarkPage.tsx new file mode 100644 index 00000000..efcad533 --- /dev/null +++ b/apps/nowait-user/src/pages/waiting/bookmark/BookmarkPage.tsx @@ -0,0 +1,70 @@ +import HomeHeader from "../../../components/Header"; +import IsBookmark from "../storeDetail/components/IsBookmark"; + +const dummyData = [ + { + id: 1, + image: "/bookmarkStoreImage.png", + wait: "대기 0팀", + store: "스페이시스", + lesson: "바이오메카트로닉스공학과", + }, + { + id: 1, + image: "/bookmarkStoreImage.png", + wait: "대기 0팀", + store: "스페이시스", + lesson: "바이오메카트로닉스공학과", + }, +]; + +const BookmarkPage = () => { + return ( +
+
+ +

+ 북마크한 부스 +

+
    + {dummyData.map((data) => { + return ( +
  • +
    + 북마크한 주점 메인 이미지 +

    + {data.wait} +

    +
    +
    +
    + 학과 메인 이미지 +
    +

    + {data.store} +

    +

    + {data.lesson} +

    +
    +
    + +
    +
    • + ); + })} +
+
+
+ ); +}; + +export default BookmarkPage; diff --git a/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx b/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx index cbd104fb..6841e753 100644 --- a/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx +++ b/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx @@ -7,6 +7,8 @@ import { useNavigate, useParams } from "react-router-dom"; import MenuList from "../../../components/common/MenuList"; import IsBookmark from "./components/IsBookmark"; import { getBookmark } from "../../../api/reservation"; +import axios from "axios"; +import UserApi from "../../../utils/UserApi"; const TAG = [ { id: 1, type: "default", tag: "태그 추가" }, @@ -18,15 +20,6 @@ const StoreDetailPage = () => { const navigate = useNavigate(); const { id } = useParams(); - const a = async () => { - try { - const res = await getBookmark(); - console.log(res); - } catch (error) { - console.log(error) - } - }; - return (
@@ -64,7 +57,6 @@ const StoreDetailPage = () => {
-

diff --git a/apps/nowait-user/src/pages/waiting/waitingPartysize/WaitingPartySizeForm.tsx b/apps/nowait-user/src/pages/waiting/waitingPartysize/WaitingPartySizeForm.tsx index ed15ba7a..f4117517 100644 --- a/apps/nowait-user/src/pages/waiting/waitingPartysize/WaitingPartySizeForm.tsx +++ b/apps/nowait-user/src/pages/waiting/waitingPartysize/WaitingPartySizeForm.tsx @@ -29,7 +29,7 @@ const WaitingPartySizeForm = () => {