From 888a5ab97b38dae3e33c4dd1383bf3339d15113f Mon Sep 17 00:00:00 2001
From: oriNuguri25 <byeongjun25@naver.com>
Date: Tue, 26 Aug 2025 17:03:44 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EB=AA=A8=EB=8B=AC=20=ED=81=AC?=
 =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/home/components/CancelWaitingModal.tsx          | 2 +-
 apps/nowait-user/src/pages/login/LoginPage.tsx                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/nowait-user/src/pages/home/components/CancelWaitingModal.tsx b/apps/nowait-user/src/pages/home/components/CancelWaitingModal.tsx
index 64fa3c45..71c50f6c 100644
--- a/apps/nowait-user/src/pages/home/components/CancelWaitingModal.tsx
+++ b/apps/nowait-user/src/pages/home/components/CancelWaitingModal.tsx
@@ -35,7 +35,7 @@ const CancelWaitingModal = ({
             {/* 취소 버튼 */}
             <button
               onClick={onClose}
-              className="flex-1 px-3 py-2.5 rounded-[10px] bg-black-20 text-[16px] font-semibold leading-[136%] tracking-normal text-black-65 items-center justify-center"
+              className="flex-1 py-2.5 rounded-[10px] bg-black-20 text-[16px] font-semibold leading-[136%] tracking-normal text-black-65 items-center justify-center"
             >
               취소
             </button>
diff --git a/apps/nowait-user/src/pages/login/LoginPage.tsx b/apps/nowait-user/src/pages/login/LoginPage.tsx
index 8d1f3ad8..b571958b 100644
--- a/apps/nowait-user/src/pages/login/LoginPage.tsx
+++ b/apps/nowait-user/src/pages/login/LoginPage.tsx
@@ -7,7 +7,7 @@ import LoginImage_3 from "../../assets/login/login_img_3.svg?react";
 const LoginPage = () => {
   return (
     <div className="flex flex-col px-6 overflow-x-hidden h-[100dvh]">
-      <div className="mt-15 flex justify-start">
+      <div className="mt-10 flex justify-start">
         <Logo className="w-14.5 h-6" />
       </div>
       <div className="mt-3 text-start">
@@ -17,7 +17,7 @@ const LoginPage = () => {
           우리의 즐거운 축제
         </text>
       </div>
-      <div className="mt-16 mx-[-24px] flex justify-center">
+      <div className="mt-12.5 mx-[-24px] flex justify-center">
         <div className="w-[432px] aspect-square flex-shrink-0 flex items-center justify-center">
           <img src={LoginImage_1} alt="login_img_1" className="w-full" />
         </div>

From 14181be5421e30a39cd3d15394052175b665e20a Mon Sep 17 00:00:00 2001
From: hwangdae <klp2797@naver.com>
Date: Tue, 26 Aug 2025 19:48:13 +0900
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EC=A3=BC=EC=A0=90=20publicCode=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/nowait-user/src/api/menu.ts                     |  8 ++++----
 apps/nowait-user/src/api/order.ts                    | 12 ++++++------
 apps/nowait-user/src/api/reservation.ts              |  4 ++--
 .../src/pages/order/addMenu/AddMenuPage.tsx          |  2 +-
 apps/nowait-user/src/pages/order/home/StorePage.tsx  |  4 ++--
 .../pages/order/orderDetails/OrderDetailsPage.tsx    |  2 +-
 .../src/pages/order/orderList/OrderListPage.tsx      |  2 +-
 .../src/pages/order/remittance/RemittancePage.tsx    |  2 +-
 .../order/remittenceWait/RemittanceWaitPage.tsx      |  2 +-
 .../waiting/WaitingSummary/WaitingSummaryPage.tsx    |  2 +-
 .../pages/waiting/storeDetail/StoreDetailPage.tsx    |  5 ++---
 apps/nowait-user/src/types/order/order.ts            |  1 +
 apps/nowait-user/vercel.json                         |  4 ----
 13 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/apps/nowait-user/src/api/menu.ts b/apps/nowait-user/src/api/menu.ts
index 01e81aa8..10be6841 100644
--- a/apps/nowait-user/src/api/menu.ts
+++ b/apps/nowait-user/src/api/menu.ts
@@ -20,10 +20,10 @@ interface MenuServerResponse {
 }
 
 //주점에 해당하는 모든 메뉴 조회
-export const getStoreMenus = async (storeId: number) => {
+export const getStoreMenus = async (publicCode: string) => {
   try {
     const res = await axios.get<AllMenuServerResponse>(
-      `${API_URI}/v1/menus/all-menus/stores/${storeId}`
+      `${API_URI}/v1/menus/all-menus/stores/${publicCode}`
     );
     if (res?.data.success) return res.data;
   } catch (error) {
@@ -33,9 +33,9 @@ export const getStoreMenus = async (storeId: number) => {
 
 // 단일 메뉴 조회
 export const getStoreMenu = async (
-  storeId: number,
+  publicCode: string,
   menuId: number
 ): Promise<MenuServerResponse> => {
-  const res = await axios.get(`${API_URI}/v1/menus/${storeId}/${menuId}`);
+  const res = await axios.get(`${API_URI}/v1/menus/${publicCode}/${menuId}`);
   return res.data;
 };
diff --git a/apps/nowait-user/src/api/order.ts b/apps/nowait-user/src/api/order.ts
index d345575a..00fa3a27 100644
--- a/apps/nowait-user/src/api/order.ts
+++ b/apps/nowait-user/src/api/order.ts
@@ -15,28 +15,28 @@ const API_URI = import.meta.env.VITE_SERVER_URI;
 
 //주문 생성
 export const createOrder = async (
-  storeId: number,
+  publicCode: string,
   tableId: number,
   payload: OrderType
 ): Promise<CreateOrderServerResponse> => {
-  const res = await api.post(`/orders/create/${storeId}/${tableId}`, payload);
+  const res = await api.post(`/orders/create/${publicCode}/${tableId}`, payload);
   return res.data;
 };
 
 //주문 내역 조회
 export const getOrderDetails = async (
-  storeId: number | undefined,
+  publicCode: string,
   tableId: number
 ): Promise<OrderDetailsServerResponse> => {
-  const res = await api.get(`/orders/items/${storeId}/${tableId}`);
+  const res = await api.get(`/orders/items/${publicCode}/${tableId}`);
   return res.data;
 };
 
 //주점 QR, 계좌번호 조회
-export const getStorePayments = async (storeId: number) => {
+export const getStorePayments = async (publicCode: string) => {
   try {
     const res = await axios.get<StorePaymentsResponse>(
-      `${API_URI}/v1/store-payments/${storeId}`
+      `${API_URI}/v1/store-payments/${publicCode}`
     );
     return res.data;
   } catch (error) {
diff --git a/apps/nowait-user/src/api/reservation.ts b/apps/nowait-user/src/api/reservation.ts
index b9b9e84c..d8b575b5 100644
--- a/apps/nowait-user/src/api/reservation.ts
+++ b/apps/nowait-user/src/api/reservation.ts
@@ -37,9 +37,9 @@ export const getInfiniteAllStores = async (
 };
 
 // 주점 상세 정보 가져오기
-export const getStore = async (storeId: number | undefined) => {
+export const getStore = async (publicCode: string) => {
   try {
-    const res = await UserApi.get<StoreResponse>(`/v1/stores/${storeId}`);
+    const res = await UserApi.get<StoreResponse>(`/v1/stores/${publicCode}`);
     return res.data;
   } catch (error) {
     console.log(error);
diff --git a/apps/nowait-user/src/pages/order/addMenu/AddMenuPage.tsx b/apps/nowait-user/src/pages/order/addMenu/AddMenuPage.tsx
index 6747f15f..c0bb742c 100644
--- a/apps/nowait-user/src/pages/order/addMenu/AddMenuPage.tsx
+++ b/apps/nowait-user/src/pages/order/addMenu/AddMenuPage.tsx
@@ -17,7 +17,7 @@ const AddMenuPage = () => {
 
   const { data: menu, isLoading } = useQuery({
     queryKey: ["menu", menuId],
-    queryFn: () => getStoreMenu(Number(storeId!), Number(menuId!)),
+    queryFn: () => getStoreMenu(storeId!, Number(menuId!)),
     select: (data) => data?.response,
   });
 
diff --git a/apps/nowait-user/src/pages/order/home/StorePage.tsx b/apps/nowait-user/src/pages/order/home/StorePage.tsx
index ae424d4c..7987d294 100644
--- a/apps/nowait-user/src/pages/order/home/StorePage.tsx
+++ b/apps/nowait-user/src/pages/order/home/StorePage.tsx
@@ -29,11 +29,11 @@ const StorePage = () => {
 
     const { data: menus, isLoading } = useQuery({
     queryKey: ["storeMenus", storeId],
-    queryFn: () => getStoreMenus(Number(storeId!)),
+    queryFn: () => getStoreMenus(storeId!),
     select: (data) => data?.response,
   });
 
-
+  console.log(menus,"asd")
   return (
     <div>
       <div className="flex flex-col flex-grow pb-[112px] min-h-dvh pt-7.5 px-5">
diff --git a/apps/nowait-user/src/pages/order/orderDetails/OrderDetailsPage.tsx b/apps/nowait-user/src/pages/order/orderDetails/OrderDetailsPage.tsx
index 16def8a8..71d0d12d 100644
--- a/apps/nowait-user/src/pages/order/orderDetails/OrderDetailsPage.tsx
+++ b/apps/nowait-user/src/pages/order/orderDetails/OrderDetailsPage.tsx
@@ -27,7 +27,7 @@ const OrderDetailsPage = () => {
 
   const { data: orderDetails, isLoading } = useQuery({
     queryKey: ["orderDetails", storeId],
-    queryFn: () => getOrderDetails(Number(storeId!), Number(tableId!)),
+    queryFn: () => getOrderDetails(storeId!, Number(tableId!)),
     select: (data) => data?.response,
   });
   console.log(orderDetails);
diff --git a/apps/nowait-user/src/pages/order/orderList/OrderListPage.tsx b/apps/nowait-user/src/pages/order/orderList/OrderListPage.tsx
index bfb577bd..83aabe03 100644
--- a/apps/nowait-user/src/pages/order/orderList/OrderListPage.tsx
+++ b/apps/nowait-user/src/pages/order/orderList/OrderListPage.tsx
@@ -37,7 +37,7 @@ const OrderListPage = () => {
 
   const { data: menus } = useQuery({
     queryKey: ["storeMenuList", storeId],
-    queryFn: () => getStoreMenus(Number(storeId!)),
+    queryFn: () => getStoreMenus(storeId!),
     select: (data) => data?.response?.menuReadDto,
   });
   // 장바구니와 최신 메뉴 데이터 동기화
diff --git a/apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx b/apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx
index 4c4b24fc..1aed4920 100644
--- a/apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx
+++ b/apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx
@@ -29,7 +29,7 @@ const RemittancePage = () => {
 
   const { data: remittance, isLoading } = useQuery({
     queryKey: ["remittance", storeId],
-    queryFn: () => getStorePayments(Number(storeId!)),
+    queryFn: () => getStorePayments(storeId!),
     enabled: !!storeId,
     select: (data) => data?.response,
   });
diff --git a/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx b/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
index 312fb46c..dc76813c 100644
--- a/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
+++ b/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
@@ -32,7 +32,7 @@ const RemittanceWaitPage = () => {
         totalPrice,
       };
       const res = await createOrder(
-        Number(storeId!),
+        storeId!,
         Number(tableId!),
         payload
       );
diff --git a/apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx b/apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx
index 40331068..36e67dc5 100644
--- a/apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx
+++ b/apps/nowait-user/src/pages/waiting/WaitingSummary/WaitingSummaryPage.tsx
@@ -18,7 +18,7 @@ const WaitingSummaryPage = () => {
   const [reservationIsLoading, setReservationIsLoading] = useState(false);
   const { data: store, isLoading } = useQuery({
     queryKey: ["store", storeId],
-    queryFn: () => getStore(storeId ? parseInt(storeId) : undefined),
+    queryFn: () => getStore(storeId!),
     select: (data) => data?.response,
   });
 
diff --git a/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx b/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx
index 4cb777b6..8bd1cc0c 100644
--- a/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx
+++ b/apps/nowait-user/src/pages/waiting/storeDetail/StoreDetailPage.tsx
@@ -34,13 +34,12 @@ const StoreDetailPage = () => {
     isError,
   } = useQuery({
     queryKey: ["store", storeId],
-    queryFn: () => getStore(Number(storeId!)),
+    queryFn: () => getStore(storeId!),
     select: (data) => data?.response,
   });
-  console.log(store)
   const { data: menus, isLoading: menusIsLoading } = useQuery({
     queryKey: ["storeMenus", storeId],
-    queryFn: () => getStoreMenus(Number(storeId!)),
+    queryFn: () => getStoreMenus(storeId!),
     select: (data) => data?.response,
   });
 
diff --git a/apps/nowait-user/src/types/order/order.ts b/apps/nowait-user/src/types/order/order.ts
index ce8ecb3b..4561447e 100644
--- a/apps/nowait-user/src/types/order/order.ts
+++ b/apps/nowait-user/src/types/order/order.ts
@@ -10,6 +10,7 @@ export interface CreateOrderServerResponse {
   response: {
     orderId: number;
     storeId: number;
+    publicCode: string;
     storeName: string;
     sessionId: string;
     depositorName: string;
diff --git a/apps/nowait-user/vercel.json b/apps/nowait-user/vercel.json
index 965ecbb5..af1e9795 100644
--- a/apps/nowait-user/vercel.json
+++ b/apps/nowait-user/vercel.json
@@ -8,10 +8,6 @@
       "source": "/api/banner-images/:path*",
       "destination": "https://gtablestoreimage.s3.ap-northeast-2.amazonaws.com/:path*"
     },
-    {
-      "source": "/orders/:path*",
-      "destination": "https://nowait.co.kr/orders/:path*"
-    },
     { "source": "/(.*)", "destination": "/index.html" }
   ],
   "headers": [