Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added apps/nowait-user/public/bookmarkStoreImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions apps/nowait-user/src/api/reservation.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import axios from "axios";
import UserApi from "../utils/UserApi";

const SERVER_URI = import.meta.env.VITE_SERVER_URI;
Expand All @@ -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;
};

Expand Down
13 changes: 0 additions & 13 deletions apps/nowait-user/src/pages/bookmark/BookmarkPage.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
70 changes: 70 additions & 0 deletions apps/nowait-user/src/pages/waiting/bookmark/BookmarkPage.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<div>
<div className="px-5">
<HomeHeader />
<h1 className="mt-5 mb-4 text-title-20-bold text-black-90">
북마크한 부스
</h1>
<ul>
{dummyData.map((data) => {
return (
<li key={data.id} className="mb-6">
<div className="relative top-0 right-0">
<img
className="w-full object-cover"
src={data.image}
alt="북마크한 주점 메인 이미지"
></img>
<p className="absolute top-[12px] right-[12px] text-primary bg-[#ffe9df] px-2 py-[7px] font-bold text-[12px] rounded-[6px]">
{data.wait}
</p>
</div>
<div className="flex justify-between py-3">
<div className="flex items-center gap-2.5">
<img
className="w-[40px] h-[40px] object-cover rounded-full bg-black-40"
src=""
alt="학과 메인 이미지"
></img>
<div className="flex flex-col justify-between">
<h1 className="text-title-16-bold text-black-90">
{data.store}
</h1>
<h2 className="text-14-regular text-black-70">
{data.lesson}
</h2>
</div>
</div>
<IsBookmark />
</div>
</li>
);
})}
</ul>
</div>
</div>
);
};

export default BookmarkPage;
12 changes: 2 additions & 10 deletions apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: "태그 추가" },
Expand All @@ -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 (
<div>
<div className="px-5">
Expand Down Expand Up @@ -64,7 +57,6 @@ const StoreDetailPage = () => {
</section>
<section className="pt-5 pb-[28px]">
<div className="mb-6">
<button onClick={a}>북마크조회</button>
<p className="flex items-center mb-1.5 text-16-regular text-black-80">
<span className="w-[18px] flex justify-center mr-1.5">
<SubStract />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const WaitingPartySizeForm = () => {
<PageFooterButton>
<Button
onClick={() =>
navigate(`/store/${id}/waitingsummary`, { state: partySize })
navigate(`/store/${id}/waiting/summary`, { state: partySize })
}
>
다음
Expand Down
10 changes: 7 additions & 3 deletions apps/nowait-user/src/routes/Router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import KakaoRedirectHandler from "../pages/login/KakaoRedirectHandler";
import AuthGuard from "../components/AuthGuard";
import PageTransitionWrapper from "../components/layout/PageTransitionWrapper";
import WaitingPartySizeForm from "../pages/waiting/waitingPartysize/WaitingPartySizeForm";
import WaitingSummaryPage from "../pages/waiting/WaitingSummary/WaitingSummaryPage";
import WaitingSummaryPage from "../pages/waiting/waitingSummary/WaitingSummaryPage";
import AddMenuPage from "../pages/order/addMenu/AddMenuPage";
import RemittanceWaitPage from "../pages/order/remittenceWait/RemittanceWaitPage";
import OrderDetailsPage from "../pages/order/orderDetails/OrderDetailsPage";
import RemittancePage from "../pages/order/remittance/RemittancePage";
import BookmarkPage from "../pages/bookmark/BookmarkPage";
import BookmarkPage from "../pages/waiting/bookmark/BookmarkPage";

// AuthGuard로 래핑하는 헬퍼 함수
const withAuth = (Component: React.ComponentType) => (
Expand Down Expand Up @@ -53,8 +53,12 @@ const Router = () => {
element={withAuth(WaitingPartySizeForm)}
/>
<Route
path="/store/:id/waitingsummary"
path="/store/:id/waiting/summary"
element={withAuth(WaitingSummaryPage)}
/>
<Route
path="/store/:id/waiting/success"
element={withAuth(WaitingSuccessPage)}
/>
<Route path="/" element={withAuth(HomePage)} />

Expand Down
Loading