Skip to content
Merged
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
6 changes: 3 additions & 3 deletions apps/nowait-user/src/api/order.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type {
} from "../types/order/order";

const api = axios.create({
baseURL: "",
baseURL: "/",
withCredentials: true,
});

Expand All @@ -19,7 +19,7 @@ export const createOrder = async (
tableId: number,
payload: OrderType
): Promise<CreateOrderServerResponse> => {
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;
};

Expand All @@ -28,7 +28,7 @@ export const getOrderDetails = async (
publicCode: string,
tableId: number
): Promise<OrderDetailsServerResponse> => {
const res = await api.get(`${API_URI}/orders/items/${publicCode}/${tableId}`);
const res = await api.get(`/orders/items/${publicCode}/${tableId}`);
return res.data;
};

Expand Down
Binary file modified apps/nowait-user/src/assets/default-department.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/nowait-user/src/assets/default-image-lg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/nowait-user/src/assets/default-menu-image-sm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed apps/nowait-user/src/assets/waitingSuccess.png
Binary file not shown.
24 changes: 24 additions & 0 deletions apps/nowait-user/src/assets/waitingSuccess.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions apps/nowait-user/src/components/common/SuccessMessagePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useNavigate, useParams } from "react-router-dom";
import CenteredContentLayout from "../layout/CenteredContentLayout";

interface PropsType {
imageSrc: string;
ImageSrc: React.ComponentType<React.SVGProps<SVGSVGElement>> | string;
imageAlt: string;
width?: string;
height?: string;
Expand All @@ -14,7 +14,7 @@ interface PropsType {
}

const SuccessMessagePage = ({
imageSrc,
ImageSrc,
imageAlt,
width = "150px",
height = "150px",
Expand All @@ -25,9 +25,14 @@ const SuccessMessagePage = ({
}: PropsType) => {
const navigate = useNavigate();
const { storeId } = useParams();

return (
<CenteredContentLayout onClick={onClick} buttonText={buttonText}>
<img src={imageSrc} alt={imageAlt} width={width} height={height} />
{typeof ImageSrc === "string" ? (
<img src={ImageSrc} alt={imageAlt} width={width} height={height} />
) : (
<ImageSrc width={width} height={height} aria-label={imageAlt} />
)}
<h1 className="text-headline-24-bold mb-2">{title}</h1>
<h2 className="whitespace-pre-line text-16-regular text-black-70 mb-3.5">
{message}
Expand Down
4 changes: 2 additions & 2 deletions apps/nowait-user/src/components/order/ConfirmModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
<h1 className="whitespace-pre-line text-headline-22-bold mb-2">
<h1 className="whitespace-pre-line text-headline-22-bold mb-2 px-1">
{title}
</h1>
<h2 className="whitespace-pre-line text-16-regular text-black-70 mb-12">
<h2 className="whitespace-pre-line text-16-regular text-black-70 mb-12 px-1">
{description}
</h2>
<Button fullWidth={true} textColor="#ffffff" onClick={open}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const OrderSuccessPage = () => {

return (
<SuccessMessagePage
imageSrc={OrderSuccess}
ImageSrc={OrderSuccess}
imageAlt="주문 완료 이미지"
title="주문이 접수되었어요!"
message={`입금 확인 후 조리를 진행할게요.\n조금만 기다려 주세요.`}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import SuccessMessagePage from "../../../components/common/SuccessMessagePage";
import { useNavigate } from "react-router-dom";
import waitingSuccess from "../../../assets/waitingSuccess.png";
import WaitingSuccess from "../../../assets/waitingSuccess.svg?react";

const WaitingSuccessPage = () => {
const navigate = useNavigate();

return (
<SuccessMessagePage
imageSrc={waitingSuccess}
ImageSrc={WaitingSuccess}
imageAlt="대기 등록 완료 이미지"
width="227px"
height="150px"
Expand Down