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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {
OrderDetailsType,
OrderStatus,
} from "../../../../types/order/order";
import { formatKoreanDateTime } from "../../../../utils/formatKoreanDateTime";

interface OrderCardProps {
order: {
Expand All @@ -21,7 +22,6 @@ const ORDER_STATUS_MAP = {
} as const;

const OrderCard = ({ order }: OrderCardProps) => {

const status = ORDER_STATUS_MAP[order.status];

return (
Expand All @@ -30,7 +30,9 @@ const OrderCard = ({ order }: OrderCardProps) => {
<h2 className={`text-title-18-bold mb-2 ${status.color}`}>
{status.label}
</h2>
<p className="text-14-regular text-black-60">{order.createdAt}</p>
<p className="text-14-regular text-black-60">
{formatKoreanDateTime(order.createdAt)}
</p>
</header>

<ul className="border-b border-[#ececec] pb-5 mb-5">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import SubStract from "../../../../assets/icon/subtract.svg?react";
import Clock from "../../../../assets/icon/clock.svg?react";
import Arrow from "../../../../assets/icon/arrow-right.svg?react";
import { useNavigate } from "react-router-dom";
import { formatTimeRange } from "../../../../utils/formatTimeRange";
import { formatBusinessHours } from "../../../../utils/formatBusinessHours";

interface PropsType {
storeId: string;
Expand Down Expand Up @@ -32,7 +32,7 @@ const StoreInfoSection = ({
</p>
<p className="flex items-center text-16-regular">
<Clock className="mr-1.5" />
{formatTimeRange(openTime)}
{formatBusinessHours(openTime)}
</p>
</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// "00002359" 오픈 시간 데이터 "00:00 - 23:59"로 변경하는 함수
export const formatTimeRange = (time: string | undefined) => {
export const formatBusinessHours = (time: string | undefined) => {
const startHour = time?.slice(0, 2);
const startMinute = time?.slice(2, 4);
const endHour = time?.slice(4, 6);
Expand Down
11 changes: 11 additions & 0 deletions apps/nowait-user/src/utils/formatKoreanDateTime.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export const formatKoreanDateTime = (isoString: string) => {
const date = new Date(isoString);

const year = date.getFullYear();
const month = date.getMonth() + 1; // 0부터 시작
const day = date.getDate();
const hours = date.getHours();
const minutes = date.getMinutes().toString().padStart(2, "0");

return `${year}년 ${month}월 ${day}일 ${hours}:${minutes}`;
};