diff --git a/apps/nowait-user/src/api/order.ts b/apps/nowait-user/src/api/order.ts index 782f1153..03561901 100644 --- a/apps/nowait-user/src/api/order.ts +++ b/apps/nowait-user/src/api/order.ts @@ -7,7 +7,7 @@ import type { } from "../types/order/order"; const api = axios.create({ - baseURL: "", + baseURL: "/", withCredentials: true, }); @@ -19,7 +19,7 @@ export const createOrder = async ( tableId: number, payload: OrderType ): Promise => { - const res = await api.post(`${API_URI}/orders/create/${publicCode}/${tableId}`, payload); + const res = await api.post(`/orders/create/${publicCode}/${tableId}`, payload); return res.data; }; @@ -28,7 +28,7 @@ export const getOrderDetails = async ( publicCode: string, tableId: number ): Promise => { - const res = await api.get(`${API_URI}/orders/items/${publicCode}/${tableId}`); + const res = await api.get(`/orders/items/${publicCode}/${tableId}`); return res.data; }; diff --git a/apps/nowait-user/src/assets/default-department.png b/apps/nowait-user/src/assets/default-department.png index a592219a..4ae2cd8e 100644 Binary files a/apps/nowait-user/src/assets/default-department.png and b/apps/nowait-user/src/assets/default-department.png differ diff --git a/apps/nowait-user/src/assets/default-image-lg.png b/apps/nowait-user/src/assets/default-image-lg.png index 922ec837..ca986fd4 100644 Binary files a/apps/nowait-user/src/assets/default-image-lg.png and b/apps/nowait-user/src/assets/default-image-lg.png differ diff --git a/apps/nowait-user/src/assets/default-menu-image-sm.png b/apps/nowait-user/src/assets/default-menu-image-sm.png index 9b3d7cc4..47f6b0b0 100644 Binary files a/apps/nowait-user/src/assets/default-menu-image-sm.png and b/apps/nowait-user/src/assets/default-menu-image-sm.png differ diff --git a/apps/nowait-user/src/assets/waitingSuccess.png b/apps/nowait-user/src/assets/waitingSuccess.png deleted file mode 100644 index 94bbe1b5..00000000 Binary files a/apps/nowait-user/src/assets/waitingSuccess.png and /dev/null differ diff --git a/apps/nowait-user/src/assets/waitingSuccess.svg b/apps/nowait-user/src/assets/waitingSuccess.svg new file mode 100644 index 00000000..bd44f494 --- /dev/null +++ b/apps/nowait-user/src/assets/waitingSuccess.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/nowait-user/src/components/common/SuccessMessagePage.tsx b/apps/nowait-user/src/components/common/SuccessMessagePage.tsx index 86eafe1c..902c39ac 100644 --- a/apps/nowait-user/src/components/common/SuccessMessagePage.tsx +++ b/apps/nowait-user/src/components/common/SuccessMessagePage.tsx @@ -3,7 +3,7 @@ import { useNavigate, useParams } from "react-router-dom"; import CenteredContentLayout from "../layout/CenteredContentLayout"; interface PropsType { - imageSrc: string; + ImageSrc: React.ComponentType> | string; imageAlt: string; width?: string; height?: string; @@ -14,7 +14,7 @@ interface PropsType { } const SuccessMessagePage = ({ - imageSrc, + ImageSrc, imageAlt, width = "150px", height = "150px", @@ -25,9 +25,14 @@ const SuccessMessagePage = ({ }: PropsType) => { const navigate = useNavigate(); const { storeId } = useParams(); + return ( - {imageAlt} + {typeof ImageSrc === "string" ? ( + {imageAlt} + ) : ( + + )}

{title}

{message} diff --git a/apps/nowait-user/src/components/order/ConfirmModal.tsx b/apps/nowait-user/src/components/order/ConfirmModal.tsx index 400fd687..e758f620 100644 --- a/apps/nowait-user/src/components/order/ConfirmModal.tsx +++ b/apps/nowait-user/src/components/order/ConfirmModal.tsx @@ -61,10 +61,10 @@ const ConfirmModal = ({ transition={{ duration: 0.3, ease: "easeInOut" }} className="absolute left-1/2 bottom-8 -translate-x-1/2 w-[clamp(328px,calc(100%-32px),398px)] bg-white rounded-[20px] px-4 pt-9" > -

+

{title}

-

+

{description}