merge to main

apps/nowait-user/src/api/order.ts

@@ -19,7 +19,7 @@ export const createOrder = async (
   tableId: number,
   payload: OrderType
 ): Promise<CreateOrderServerResponse> => {
-  const res = await api.post(`${API_URI}/orders/create/${storeId}/${tableId}`, payload);
+  const res = await axios.post(`/orders/create/${storeId}/${tableId}`, payload);
   return res.data;
 };
 
@@ -28,7 +28,7 @@ export const getOrderDetails = async (
   storeId: number | undefined,
   tableId: number
 ): Promise<OrderDetailsServerResponse> => {
-  const res = await api.get(`/orders/items/${storeId}/${tableId}`);
+  const res = await axios.get(`/orders/items/${storeId}/${tableId}`);
   return res.data;
 };
 

apps/nowait-user/src/components/SmallActionButton.tsx

@@ -18,7 +18,7 @@ export const SmallActionButton = ({
     <button
       type={type}
       aria-label={ariaLabel}
-      className={`${className} py-2 px-4 rounded-[12px] border-1 bg-white ${mode==="default" ? "border-[#ececec] text-black-70" : "border-[#dddddd] text-black-80"}`}
+      className={`${className} py-2 px-4 rounded-[12px] border-1 ${mode==="default" ? "border-[#ececec] text-black-70" : "border-[#dddddd] text-black-80"}`}
       onClick={onClick}
     >
       <div className="flex items-center justify-center gap-1 text-[14px] font-bold">

apps/nowait-user/src/pages/order/orderList/components/CartItem.tsx

@@ -25,10 +25,10 @@ const CartItem = ({ id, name, originPrice, price, quantity }: PropsType) => {
       <div className="w-full p-5">
         <div className="flex justify-between items-start">
           <div className="max-w-[12.5rem]">
-            <h1 className="text-title-18-medium text-ellipsis line-clamp-2">
+            <h1 className="text-title-18-semibold text-black-90 text-ellipsis line-clamp-2">
               {name}
             </h1>
-            <h2 className="text-title-18-bold">
+            <h2 className="text-title-18-bold text-black-90">
               {originPrice.toLocaleString()}원
             </h2>
           </div>

apps/nowait-user/src/pages/waiting/storeNotice/StoreNoticePage.tsx

@@ -9,7 +9,7 @@ const StoreNoticePage = () => {
       <BackHeader title="공지사항" />
       <section className="px-5 py-[30px] mt-[38px]">
         <h1 className="text-title-18-bold text-black-90 mb-4">{title}</h1>
-        <p className="text-16-regular text-black-80 break-keep">{content}</p>
+        <p dangerouslySetInnerHTML={{ __html: content }} className="text-16-regular text-black-80 break-keep"></p>
       </section>
     </div>
   );

apps/nowait-user/vercel.json

@@ -10,7 +10,7 @@
     },
     {
       "source": "/orders/:path*",
-      "destination": "https://nowait.co.kr/orders/:path*"
+      "destination": "https://nowait.co.kr/:path*"
     },
     { "source": "/(.*)", "destination": "/index.html" }
   ],