diff --git a/src/components/common/item/ProductItem.tsx b/src/components/common/item/ProductItem.tsx
index 90234be0..33674ff0 100644
--- a/src/components/common/item/ProductItem.tsx
+++ b/src/components/common/item/ProductItem.tsx
@@ -22,7 +22,7 @@ const ProductItem = ({ product, children }: { product: ProductProps; children: R
-
+
{product.timeRemaining &&
}
diff --git a/src/components/login/queries.ts b/src/components/login/queries.ts
index 27469f06..f3aa9441 100644
--- a/src/components/login/queries.ts
+++ b/src/components/login/queries.ts
@@ -22,7 +22,7 @@ export const postSignup = async (data: User) => {
};
export const logout = async () => {
- await httpClient.post(API_END_POINT.LOGOUT, {}, { withCredentials: true });
+ await httpClient.post(API_END_POINT.LOGOUT, { withCredentials: true });
removeToken();
};
diff --git a/src/components/order/OrderListTab.tsx b/src/components/order/OrderListTab.tsx
index cb0106cb..2b3522e5 100644
--- a/src/components/order/OrderListTab.tsx
+++ b/src/components/order/OrderListTab.tsx
@@ -35,10 +35,10 @@ const OrderListTab = ({ activeTab, setActiveTab }: OrderListTabProps) => {
onClick={() => setActiveTab('AuctionHistory')}
>
{isWidthScreen ? (
- '진행중인 경매'
+ '참여한 경매'
) : (
<>
- 진행중인
+ 참여한
경매
>
diff --git a/src/components/order/OrderLostProduct.tsx b/src/components/order/OrderLostProduct.tsx
index bcc52825..364e10df 100644
--- a/src/components/order/OrderLostProduct.tsx
+++ b/src/components/order/OrderLostProduct.tsx
@@ -4,6 +4,13 @@ import { LuUsers } from 'react-icons/lu';
import ProductItem from '../common/item/ProductItem';
const OrderLostProduct = ({ product }: { product: IUserAuctionLostItem }) => {
+ const date = new Date(product.endDateTime);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+
+ const formattedDate = `${year}.${month}.${day}`;
+
return (
@@ -18,14 +25,14 @@ const OrderLostProduct = ({ product }: { product: IUserAuctionLostItem }) => {
마감된 날짜
- {`${product.endDateTime}`}
+ {formattedDate}
-
{`${product.highestBid}`}
+
{`${(product.highestBid).toLocaleString()}원`}
);
diff --git a/src/components/order/OrderWonProduct.tsx b/src/components/order/OrderWonProduct.tsx
index 63124b20..4eff68d3 100644
--- a/src/components/order/OrderWonProduct.tsx
+++ b/src/components/order/OrderWonProduct.tsx
@@ -4,6 +4,13 @@ import { LuUsers } from 'react-icons/lu';
import ProductItem from '../common/item/ProductItem';
const OrderWonProduct = ({ product }: { product: IUserAuctionWonItem }) => {
+ const date = new Date(product.endDateTime);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+
+ const formattedDate = `${year}.${month}.${day}`;
+
return (
@@ -18,14 +25,14 @@ const OrderWonProduct = ({ product }: { product: IUserAuctionWonItem }) => {
마감된 날짜
- {`${product.endDateTime}`}
+ {formattedDate}
-
{`${product.winningBid}`}
+
{`${(product.winningBid).toLocaleString()}원`}
);
diff --git a/src/components/user/UserOrder.tsx b/src/components/user/UserOrder.tsx
index 985e6eb0..41dbd01d 100644
--- a/src/components/user/UserOrder.tsx
+++ b/src/components/user/UserOrder.tsx
@@ -13,14 +13,14 @@ interface ParticipationCountItmes {
}
interface Props {
- participationCount?: ParticipationCountItmes;
+ participantCount?: ParticipationCountItmes;
preRegisterCount?: number;
registeredAuctionCount?: number;
}
-const UserOrder = ({ participationCount, preRegisterCount, registeredAuctionCount}: Props) => {
+const UserOrder = ({ participantCount, preRegisterCount, registeredAuctionCount}: Props) => {
const navigate = useNavigate();
- const $participationCount = participationCount || { failedAuctionCount: 0, ongoingAuctionCount: 0, successfulAuctionCount: 0 };
+ const $participantCount = participantCount || { failedAuctionCount: 0, ongoingAuctionCount: 0, successfulAuctionCount: 0 };
const $preRegisterCount = preRegisterCount || 0;
const $registeredAuctionCount = registeredAuctionCount || 0;
@@ -41,11 +41,11 @@ const UserOrder = ({ participationCount, preRegisterCount, registeredAuctionCoun
>
- 진행중인 경매
- {$participationCount.ongoingAuctionCount} 건
+ 참여한 경매
+ {$participantCount.ongoingAuctionCount} 건
{/* 성공한 경매 */}
@@ -59,7 +59,7 @@ const UserOrder = ({ participationCount, preRegisterCount, registeredAuctionCoun
>
성공한 경매
- {$participationCount.successfulAuctionCount} 건
+ {$participantCount.successfulAuctionCount} 건
{/* 실패한 경매 */}
@@ -73,7 +73,7 @@ const UserOrder = ({ participationCount, preRegisterCount, registeredAuctionCoun
>
실패한 경매
- {$participationCount.failedAuctionCount} 건
+ {$participantCount.failedAuctionCount} 건
diff --git a/src/components/user/UserProfile.tsx b/src/components/user/UserProfile.tsx
index 2c58e389..0a92a048 100644
--- a/src/components/user/UserProfile.tsx
+++ b/src/components/user/UserProfile.tsx
@@ -3,12 +3,14 @@ import { useNavigate } from 'react-router-dom';
interface Props {
nickname?: string;
bio?: string;
+ link?: string;
}
-const UserProfile = ({ nickname, bio }: Props) => {
+const UserProfile = ({ nickname, bio, link }: Props) => {
const navigator = useNavigate();
const userNickname = nickname || null;
const userBio = bio || null;
+ const userLink = link || null;
return (
@@ -23,7 +25,7 @@ const UserProfile = ({ nickname, bio }: Props) => {