-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feat: 주소 목록페이지 생성 #146
Merged
Merged
Feat: 주소 목록페이지 생성 #146
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
55d4442
fix: 프로필 이미지 기본파일 가져오는 오류 수정
aquaman122 3a25f4d
chore: DeliveryAddressAdd 페이지 추가
aquaman122 ea9b372
chore: 주소 가져오기
aquaman122 af1aed0
fix: 8-1 번에 현재입찰 금액 데이터 추가, 종료된 경매, 진행중인 경매 구분
aquaman122 cad3fa2
feat: 배송지 추가 기능추가
aquaman122 3e7afdb
chore: preEnroll -> preAuction으로 수정
aquaman122 8612530
chore: preEnroll -> preAuction으로 수정
aquaman122 39571c3
chore: 배송지 리스트 수정
aquaman122 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
export interface AddresDetail { | ||
name: string, | ||
phoneNumber: string, | ||
zonecode: string, | ||
address: string, | ||
addressDetail: string, | ||
defaultAddress: string, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import PriceIcon from '@/assets/icons/price.svg'; | ||
|
||
const CreatedAt = ({ createAt }: { createAt: string }) => { | ||
const date = new Date(createAt); | ||
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 ( | ||
<div | ||
aria-label="마감된 날짜" | ||
className="flex items-center text-xs sm:text-body2 text-gray2" | ||
> | ||
<img src={PriceIcon} alt="마감된 날짜" /> | ||
<span className='whitespace-nowrap'> | ||
{`마감된 날짜 `} | ||
<span className="text-xs text-black sm:text-body2Bold">{formattedDate}</span> | ||
</span> | ||
</div> | ||
); | ||
}; | ||
|
||
export default CreatedAt; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import ProductItem from '../common/item/ProductItem'; | ||
import type { IAuctionEndRegisteredItem } from 'AuctionItem'; | ||
import { useNavigate } from 'react-router-dom'; | ||
import MinPrice from '../common/atomic/MinPrice'; | ||
import ParticipantCount from '../common/atomic/ParticipantCount'; | ||
import { formatCurrencyWithWon } from '@/utils/formatCurrencyWithWon'; | ||
import CreatedAt from '../common/atomic/Created'; | ||
|
||
const EndMyRegister = ({ product }: { product: IAuctionEndRegisteredItem }) => { | ||
const navigate = useNavigate(); | ||
const winningBidAmount = product.winningBidAmount ?? 0; | ||
const formattedWinningBid = formatCurrencyWithWon(winningBidAmount); | ||
|
||
return ( | ||
<ProductItem product={product} onClick={() => navigate(`/auctions/bid/${product.auctionId}`)}> | ||
<MinPrice price={product.minPrice} /> | ||
<ParticipantCount count={product.participantCount} /> | ||
<div | ||
aria-label="낙찰 금액" | ||
className="flex items-center text-xs sm:text-body2 text-gray2" | ||
> | ||
<img alt="참여자" /> | ||
<span className='whitespace-nowrap'> | ||
낙찰 금액 <span className="text-xs text-black sm:text-body2Bold">{formattedWinningBid}</span> | ||
</span> | ||
</div> | ||
<div | ||
aria-label="참여자" | ||
className="flex items-center text-xs sm:text-body2 text-gray2" | ||
> | ||
<img alt="참여자" /> | ||
<span className='whitespace-nowrap'> | ||
낙찰 여부 <span className="text-xs text-black sm:text-body2Bold">{product.isWon ? '낙찰' : '유찰'}</span> | ||
</span> | ||
</div> | ||
<div | ||
aria-label="참여자" | ||
className="flex items-center text-xs sm:text-body2 text-gray2" | ||
> | ||
<img alt="참여자" /> | ||
<span className='whitespace-nowrap'> | ||
결제 여부 <span className="text-xs text-black sm:text-body2Bold">{product.isPaid ? '결제 완료' : '미결제'}</span> | ||
</span> | ||
</div> | ||
<CreatedAt createAt={product.createAt} /> | ||
</ProductItem> | ||
); | ||
}; | ||
|
||
export default EndMyRegister; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -86,7 +86,7 @@ const UserOrder = ({ participantCount, preRegisterCount, registeredAuctionCount} | |
<div | ||
className="flex flex-col items-center w-1/2 p-4 border rounded-lg cursor-pointer border-gray2" | ||
onClick={() => | ||
navigate(ROUTERS.REGISTERED_LIST, { state: { sortType: true } }) | ||
navigate(ROUTERS.REGISTERED_LIST, { state: { sortType: 'ongoing' } }) | ||
} | ||
> | ||
<img src={AuctionIcon} alt="정식 경매" className="w-8 h-8 mb-2" /> | ||
|
@@ -98,7 +98,7 @@ const UserOrder = ({ participantCount, preRegisterCount, registeredAuctionCount} | |
<div | ||
className="flex flex-col items-center w-1/2 p-4 border rounded-lg cursor-pointer border-gray2" | ||
onClick={() => | ||
navigate(ROUTERS.REGISTERED_LIST, { state: { sortType: false } }) | ||
navigate(ROUTERS.REGISTERED_LIST, { state: { sortType: 'preEnroll' } }) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 사전경매는 preAuction으로 통일해요! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 넵!! |
||
} | ||
> | ||
<img | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
파일명도 CreateAt으로 변경하는건 어떤가요
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
넵!! 그렇네요 둘이 다르군요