-
-
+ {basicAuctionList && (
+
+ )}
+ {urgentBasicAuctionList && (
+
+ )}
{/* 특정 유저의 상품 모아 놓기(필수 아님) */}
{/* */}
diff --git a/src/components/AuctionCategory/CategoryUnit.css.ts b/src/components/AuctionCategory/CategoryUnit.css.ts
index 02607f77..5b80de37 100644
--- a/src/components/AuctionCategory/CategoryUnit.css.ts
+++ b/src/components/AuctionCategory/CategoryUnit.css.ts
@@ -56,7 +56,7 @@ export const unitContent = style({
export const unitContentForSpan = style({
cursor: 'pointer',
-
+ padding: '4px 0 4px 4px',
':hover': {
fontWeight: '700',
},
diff --git a/src/components/AuctionImageInfo/AuctionImageInfo.css.ts b/src/components/AuctionImageInfo/AuctionImageInfo.css.ts
index a75a0317..67801427 100644
--- a/src/components/AuctionImageInfo/AuctionImageInfo.css.ts
+++ b/src/components/AuctionImageInfo/AuctionImageInfo.css.ts
@@ -13,8 +13,9 @@ export const subImageWrapper = style({
display: 'flex',
flexDirection: 'column',
gap: '10px',
- marginRight: '10px',
+ marginRight: '5px',
overflowY: 'auto',
+ minWidth: '62px',
});
export const subImageWrapperButton = styleVariants({
@@ -37,8 +38,7 @@ export const subImageWrapperButton = styleVariants({
});
export const subImage = style({
- height: '60px',
- width: '60px',
+ display: 'flex',
objectFit: 'contain',
});
diff --git a/src/components/AuctionImageInfo/index.tsx b/src/components/AuctionImageInfo/index.tsx
index 0f953a7b..343b24c0 100644
--- a/src/components/AuctionImageInfo/index.tsx
+++ b/src/components/AuctionImageInfo/index.tsx
@@ -1,7 +1,8 @@
-/* eslint-disable jsx-a11y/img-redundant-alt */
/* eslint-disable @next/next/no-img-element */
import { useState } from 'react';
+import Image from 'next/image';
+
import * as S from './AuctionImageInfo.css';
interface AuctionImageInfoProps {
@@ -32,8 +33,10 @@ function AuctionImageInfo({ imageList }: AuctionImageInfoProps) {
}
onClick={() => setFocusImage(image)}
>
-
@@ -41,8 +44,10 @@ function AuctionImageInfo({ imageList }: AuctionImageInfoProps) {
))}
-
diff --git a/src/components/AuctionInfo/AuctionCountdown.tsx b/src/components/AuctionInfo/AuctionCountdown.tsx
index df374785..b06941e9 100644
--- a/src/components/AuctionInfo/AuctionCountdown.tsx
+++ b/src/components/AuctionInfo/AuctionCountdown.tsx
@@ -11,7 +11,7 @@ interface AuctionCountdownProps {
}
function AuctionCountdown({ auctionStatus, endTime, setExpired }: AuctionCountdownProps) {
- const { isTimeout, day, hour, minute, second } = useCountdownTimer({ endTime });
+ const { isTimeout, day, hour, minute, second } = useCountdownTimer({ endTime, auctionStatus });
useEffect(() => {
if (auctionStatus === 'CONCLUDED') {
diff --git a/src/components/AuctionInfo/AuctionInstantBuyConfirmModal.tsx b/src/components/AuctionInfo/AuctionInstantBuyConfirmModal.tsx
index e861ac8f..1ee82dc8 100644
--- a/src/components/AuctionInfo/AuctionInstantBuyConfirmModal.tsx
+++ b/src/components/AuctionInfo/AuctionInstantBuyConfirmModal.tsx
@@ -5,5 +5,7 @@ interface AuctionInstantBuyConfirmModalProps {
export default function AuctionInstantBuyConfirmModal({
InstantBuyPrice,
}: AuctionInstantBuyConfirmModalProps) {
- return
{`${InstantBuyPrice.toLocaleString('ko-KR')} 원에 입찰을 진행하시겠습니까?`}
;
+ return (
+
{`${InstantBuyPrice.toLocaleString('ko-KR')} 원에 즉시 구매를 진행하시겠습니까?`}
+ );
}
diff --git a/src/components/Modal/Modal.css.ts b/src/components/Modal/Modal.css.ts
index a1b930d4..2030d158 100644
--- a/src/components/Modal/Modal.css.ts
+++ b/src/components/Modal/Modal.css.ts
@@ -1,5 +1,7 @@
import { keyframes, style, styleVariants } from '@vanilla-extract/css';
+import colors from '@/styles/color';
+
const overlayShow = keyframes({
'0%': {
opacity: '0',
@@ -47,8 +49,9 @@ export const modal = style({
export const closeButton = style({
display: 'flex',
+ width: '100%',
justifyContent: 'flex-end',
- borderBottom: '1.5px solid black',
+ borderBottom: `1px solid rgba(0, 0, 0, 0.3)`,
backgroundColor: 'transparent',
paddingBottom: '10px',
cursor: 'pointer',
@@ -83,13 +86,13 @@ export const button = styleVariants({
positiveButton: [
buttonBase,
{
- backgroundColor: 'rgb(196,39,39)',
+ backgroundColor: colors.primary9,
},
],
negativeButton: [
buttonBase,
{
- backgroundColor: 'black',
+ backgroundColor: colors.gray10,
},
],
});
diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
index f293e7ed..ee2b0fa4 100644
--- a/src/components/Modal/Modal.tsx
+++ b/src/components/Modal/Modal.tsx
@@ -2,6 +2,8 @@ import * as Dialog from '@radix-ui/react-dialog';
import * as VisuallyHidden from '@radix-ui/react-visually-hidden';
import { CircleXIcon } from 'lucide-react';
+import colors from '@/styles/color';
+
import * as S from './Modal.css';
export interface ModalProps {
@@ -24,7 +26,7 @@ export function Modal(SAMPLE: ModalProps) {
-
+
{children}
diff --git a/src/components/Modal/ModalFooter.tsx b/src/components/Modal/ModalFooter.tsx
index b792da1b..3a198c48 100644
--- a/src/components/Modal/ModalFooter.tsx
+++ b/src/components/Modal/ModalFooter.tsx
@@ -1,7 +1,8 @@
import * as Dialog from '@radix-ui/react-dialog';
-import * as VisuallyHidden from '@radix-ui/react-visually-hidden';
import { CircleXIcon } from 'lucide-react';
+import colors from '@/styles/color';
+
import * as S from './Modal.css';
interface ModalFooterProps {
@@ -21,15 +22,12 @@ export default function ModalFooter(props: ModalFooterProps) {
- <>
-
-
-
-
-
-
- >
+
+
+
+
+ {/* 없으면 에러나서 넣어둠. */}
{children}