-
Notifications
You must be signed in to change notification settings - Fork 4
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
[선물홈 세부 페이지] 친구 등록, 2030 세부 페이지 UI 구현 #51
Merged
Merged
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
90412d0
feat: 임시로 세부 페이지 라우터 추가
urjimyu 6d34a1f
style: 모바일 뷰 가로폭 조정 및 패딩 없애기
urjimyu 1f6aa0f
style: 선물홈 세부페이지 공통 스타일 작성
urjimyu 1024842
feat: 선물홈 친구, 2030 세부 페이지 UI 구현
urjimyu eda63ac
Merge branch 'develop' into feat/#46-gift-detail-ui
urjimyu 59b072f
feat: 미니 타이머 UI 구현
urjimyu d00ca9a
feat: 미니타이머 UI 추가
urjimyu 53ec36f
feat: 미니타이머 공통 컴포넌트로 분리
urjimyu a6eadb3
Merge branch 'develop' into feat/#46-gift-detail-ui
urjimyu 1f88a7e
chore: 빌드 에러 해결
urjimyu abf9b13
chore: 폴더구조 변경
urjimyu 17f8a52
Merge branch 'develop' into feat/#46-gift-detail-ui
urjimyu 03b5032
chore: 빌드 에러 해결
urjimyu 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,23 @@ | ||
import styled from 'styled-components'; | ||
|
||
export const MiniTimerWrapper = styled.div` | ||
width: 10.3rem; | ||
height: 2.7rem; | ||
|
||
padding: 0.3rem 1rem; | ||
margin: 2.2rem 0 1.2rem 0; | ||
|
||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
|
||
column-gap: 0.4rem; | ||
|
||
border-radius: 1.4rem; | ||
background: ${({ theme }) => theme.colors.G_01}; | ||
`; | ||
|
||
export const MiniTimerNumbers = styled.span` | ||
${({ theme }) => theme.fonts.body_09}; | ||
color: ${({ theme }) => theme.colors.P_06}; | ||
`; |
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,15 @@ | ||
import * as S from './MiniTimer.styled'; | ||
|
||
interface MiniTimerProps { | ||
time: string; | ||
} | ||
|
||
function MiniTimer({ time }: MiniTimerProps) { | ||
return ( | ||
<S.MiniTimerWrapper> | ||
<S.MiniTimerNumbers>{time}</S.MiniTimerNumbers> | ||
</S.MiniTimerWrapper> | ||
); | ||
} | ||
|
||
export default MiniTimer; |
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,7 @@ | ||
import * as S from './GiftAddPage.styled'; | ||
|
||
function GiftAddPage() { | ||
return <S.GiftAddPageWrapper></S.GiftAddPageWrapper>; | ||
} | ||
|
||
export default GiftAddPage; |
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,62 @@ | ||
import styled from 'styled-components'; | ||
|
||
export const GiftHomeDetailPageWrapper = styled.div` | ||
width: 100%; | ||
|
||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
|
||
background-color: ${({ theme }) => theme.colors.white}; | ||
`; | ||
|
||
export const GiftHomeDetailWrapper = styled.div` | ||
width: 100%; | ||
padding: 0 2rem; | ||
|
||
display: flex; | ||
justify-content: space-between; | ||
flex-wrap: wrap; | ||
`; | ||
|
||
export const GiftsItemWrapper = styled.div` | ||
width: 16rem; | ||
height: 25.7rem; | ||
padding: 0; | ||
|
||
display: flex; | ||
flex-direction: column; | ||
align-items: flex-start; | ||
`; | ||
|
||
export const GiftsItemImage = styled.img` | ||
width: 16rem; | ||
height: 16rem; | ||
|
||
border-radius: 1rem; | ||
background-color: ${({ theme }) => theme.colors.G_03}; | ||
border: 1px solid ${({ theme }) => theme.colors.G_02}; | ||
`; | ||
|
||
export const GiftsItemTitle = styled.p` | ||
display: -webkit-box; | ||
width: 12.8rem; | ||
-webkit-box-orient: vertical; | ||
-webkit-line-clamp: 2; | ||
|
||
${({ theme }) => theme.fonts.body_09}; | ||
overflow: hidden; | ||
color: ${({ theme }) => theme.colors.black}; | ||
text-overflow: ellipsis; | ||
text-align: left; | ||
`; | ||
|
||
export const GiftsItemPrice = styled.span` | ||
${({ theme }) => theme.fonts.body_07}; | ||
color: ${({ theme }) => theme.colors.black}; | ||
`; | ||
|
||
export const GiftsItemUser = styled.span` | ||
${({ theme }) => theme.fonts.caption_02}; | ||
color: ${({ theme }) => theme.colors.G_08}; | ||
`; |
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,43 @@ | ||
import * as S from './GiftHomeDetail.styled'; | ||
import MiniTimer from '../../components/common/MiniTimer/MiniTimer'; | ||
|
||
function GiftHomeDetail() { | ||
const price = 42000; | ||
const name = '왕호은'; | ||
const time = '00:00:00'; | ||
|
||
return ( | ||
<S.GiftHomeDetailPageWrapper> | ||
{/* 공통 헤더 추가 예정 */} | ||
<MiniTimer time={time} /> | ||
<S.GiftHomeDetailWrapper> | ||
<S.GiftsItemWrapper> | ||
<S.GiftsItemImage></S.GiftsItemImage> | ||
<S.GiftsItemTitle>어센틱 로고 후디 멜란지 그레이</S.GiftsItemTitle> | ||
<S.GiftsItemPrice>{price}원</S.GiftsItemPrice> | ||
<S.GiftsItemUser>{name}</S.GiftsItemUser> | ||
</S.GiftsItemWrapper> | ||
<S.GiftsItemWrapper> | ||
<S.GiftsItemImage></S.GiftsItemImage> | ||
<S.GiftsItemTitle>어센틱 로고 후디 멜란지 그레이</S.GiftsItemTitle> | ||
<S.GiftsItemPrice>{price}원</S.GiftsItemPrice> | ||
<S.GiftsItemUser>{name}</S.GiftsItemUser> | ||
</S.GiftsItemWrapper> | ||
<S.GiftsItemWrapper> | ||
<S.GiftsItemImage></S.GiftsItemImage> | ||
<S.GiftsItemTitle>어센틱 로고 후디 멜란지 그레이</S.GiftsItemTitle> | ||
<S.GiftsItemPrice>{price}원</S.GiftsItemPrice> | ||
<S.GiftsItemUser>{name}</S.GiftsItemUser> | ||
</S.GiftsItemWrapper> | ||
<S.GiftsItemWrapper> | ||
<S.GiftsItemImage></S.GiftsItemImage> | ||
<S.GiftsItemTitle>어센틱 로고 후디 멜란지 그레이</S.GiftsItemTitle> | ||
<S.GiftsItemPrice>{price}원</S.GiftsItemPrice> | ||
<S.GiftsItemUser>{name}</S.GiftsItemUser> | ||
</S.GiftsItemWrapper> | ||
</S.GiftHomeDetailWrapper> | ||
</S.GiftHomeDetailPageWrapper> | ||
); | ||
} | ||
|
||
export default GiftHomeDetail; |
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,52 @@ | ||
import * as S from './GiftHomeDetail.styled'; | ||
import MiniTimer from '../../components/common/MiniTimer/MiniTimer'; | ||
|
||
function GiftHomeDetail() { | ||
const price = 42000; | ||
const name = '왕호은'; | ||
const people = 3; | ||
const time = '00:00:00'; | ||
|
||
return ( | ||
<S.GiftHomeDetailPageWrapper> | ||
{/* 공통 헤더 추가 예정 */} | ||
<MiniTimer time={time} /> | ||
<S.GiftHomeDetailWrapper> | ||
<S.GiftsItemWrapper> | ||
<S.GiftsItemImage></S.GiftsItemImage> | ||
<S.GiftsItemTitle>어센틱 로고 후디 멜란지 그레이</S.GiftsItemTitle> | ||
<S.GiftsItemPrice>{price}원</S.GiftsItemPrice> | ||
<S.GiftsItemUser> | ||
{name} | 인당 {Math.floor(price / people)}원 | ||
</S.GiftsItemUser> | ||
</S.GiftsItemWrapper> | ||
Comment on lines
+15
to
+22
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. 컴포넌트를 분리할 수 있다면 분리하자! 라는 마인드의 관점도 추천드립니다! minitimer 부분 처리하는 컴포넌트와 지금 아이템 데이터패칭 부분이 지금 코드에선 같이 존재하니까 이 부분 분리하는 것도 더 좋은 관심사의 분리가 될 수 있을 것 같아 의견을 제시해보아용! |
||
<S.GiftsItemWrapper> | ||
<S.GiftsItemImage></S.GiftsItemImage> | ||
<S.GiftsItemTitle>어센틱 로고 후디 멜란지 그레이</S.GiftsItemTitle> | ||
<S.GiftsItemPrice>{price}원</S.GiftsItemPrice> | ||
<S.GiftsItemUser> | ||
{name} | 인당 {Math.floor(price / people)}원 | ||
</S.GiftsItemUser> | ||
</S.GiftsItemWrapper> | ||
<S.GiftsItemWrapper> | ||
<S.GiftsItemImage></S.GiftsItemImage> | ||
<S.GiftsItemTitle>어센틱 로고 후디 멜란지 그레이</S.GiftsItemTitle> | ||
<S.GiftsItemPrice>{price}원</S.GiftsItemPrice> | ||
<S.GiftsItemUser> | ||
{name} | 인당 {Math.floor(price / people)}원 | ||
</S.GiftsItemUser> | ||
</S.GiftsItemWrapper> | ||
<S.GiftsItemWrapper> | ||
<S.GiftsItemImage></S.GiftsItemImage> | ||
<S.GiftsItemTitle>어센틱 로고 후디 멜란지 그레이</S.GiftsItemTitle> | ||
<S.GiftsItemPrice>{price}원</S.GiftsItemPrice> | ||
<S.GiftsItemUser> | ||
{name} | 인당 {Math.floor(price / people)}원 | ||
</S.GiftsItemUser> | ||
</S.GiftsItemWrapper> | ||
</S.GiftHomeDetailWrapper> | ||
</S.GiftHomeDetailPageWrapper> | ||
); | ||
} | ||
|
||
export default GiftHomeDetail; |
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
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.
article도 좋을 것 같아요!