-
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
[토너먼트] 토너먼트 플로우 화면 퍼블리싱 #72
Changes from all commits
6fccf07
f8ee2a1
eaaac41
319480a
09eb47b
3a7ec58
d539d1e
9217f49
14a1175
d19f23a
dbcbd10
c8a2b66
3aa243f
a22ef19
8b8865f
a78fcf3
331544c
a6ee2d2
0afd138
73a4ef9
eca41f8
3fa715b
12ff9d0
bd7a06f
adf5bc1
3e93d61
e7ac4dc
6569d7e
6c2af77
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import type { SVGProps } from 'react'; | ||
const SvgIcExternalGray = (props: SVGProps<SVGSVGElement>) => ( | ||
<svg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16' {...props}> | ||
<path | ||
stroke='#ACA7A9' | ||
strokeLinecap='round' | ||
strokeLinejoin='round' | ||
d='M7.25 2h-3A2.25 2.25 0 0 0 2 4.25v7.5A2.25 2.25 0 0 0 4.25 14h7.5A2.25 2.25 0 0 0 14 11.75v-3M10.25 2H14m0 0v3.375M14 2 7.624 8.375' | ||
/> | ||
</svg> | ||
); | ||
export default SvgIcExternalGray; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import type { SVGProps } from 'react'; | ||
const SvgIcRefreshGray = (props: SVGProps<SVGSVGElement>) => ( | ||
<svg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24' {...props}> | ||
<path | ||
stroke='#ACA7A9' | ||
strokeLinecap='round' | ||
strokeLinejoin='round' | ||
strokeWidth={1.5} | ||
d='M18.869 16a8.01 8.01 0 0 1-6.94 4 8.01 8.01 0 0 1-7.428-5m11.494 0H20v4M5.073 8a8.01 8.01 0 0 1 6.939-4 8.01 8.01 0 0 1 7.428 5M8.005 9H4V5' | ||
/> | ||
</svg> | ||
); | ||
export default SvgIcRefreshGray; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,10 @@ | ||
import styled from 'styled-components'; | ||
|
||
function Header() { | ||
return <div>Header</div>; | ||
return <HeaderWrapper>Header</HeaderWrapper>; | ||
} | ||
|
||
export default Header; | ||
const HeaderWrapper = styled.div` | ||
height: 5.6rem; | ||
`; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
import styled from 'styled-components'; | ||
|
||
export const TournamentCardWrapper = styled.div` | ||
display: flex; | ||
justify-content: center; | ||
gap: 1.5rem; | ||
`; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import TournamentCard from './TournamentCard/TournamentCard'; | ||
import TournamentFooter from './tournamentFooter/TournamentFooter'; | ||
import TournamentTitle from './tournamentTitle/TournamentTitle'; | ||
import { TournamentCardWrapper } from './TournamentFlowContainer.style'; | ||
|
||
const TournamentFlowContainer = () => { | ||
return ( | ||
<> | ||
<TournamentTitle /> | ||
<TournamentCardWrapper> | ||
<TournamentCard /> <TournamentCard /> | ||
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. 해당 화면에서 TournamenCard가 반복되면, map을 사용하는 것도 좋을 거 같아요 !! 하지만 이 부분은 추후 로직 구현할때 함께 생각해보면 좋을 거 같아서 미리 리뷰 남겨봅니다 ; ) 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. 앗 당연하죵 ㅎㅎ!!! 감사합니당 |
||
</TournamentCardWrapper> | ||
<TournamentFooter /> | ||
</> | ||
); | ||
}; | ||
|
||
export default TournamentFlowContainer; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,26 +3,39 @@ import styled from 'styled-components'; | |
interface TournamentCardWrapperProps { | ||
isClicked: boolean; | ||
} | ||
export const Wrapper = styled.div``; | ||
export const LinkIconWrapper = styled.button` | ||
${({ theme: { mixin } }) => mixin.inlineFlexBox({ align: 'center', justify: 'center' })} | ||
|
||
position: relative; | ||
left: 50%; | ||
transform: translateX(-50%); | ||
width: 9.9rem; | ||
border: none; | ||
background-color: ${({ theme }) => theme.colors.white}; | ||
`; | ||
|
||
export const SelectWrapper = styled.div<{ isClicked: boolean }>` | ||
display: ${({ isClicked }) => (isClicked ? 'flex' : 'none')}; | ||
width: 5rem; | ||
justify-content: center; | ||
align-items: center; | ||
position: absolute; | ||
|
||
width: 5rem; | ||
top: -12%; | ||
left: 50%; | ||
justify-content: center; | ||
align-items: center; | ||
transform: translateX(-50%); | ||
`; | ||
|
||
export const TournamentCardWrapper = styled.div<TournamentCardWrapperProps>` | ||
display: flex; | ||
flex-direction: column; | ||
width: 16rem; | ||
position: relative; | ||
border-radius: 12px; | ||
|
||
width: 16rem; | ||
border: ${({ isClicked }) => | ||
isClicked ? '3px solid var(--Pink-P-06, #FF2176)' : '3px solid var(--Gray-G-02, #ebe9ea)'}; | ||
border-radius: 12px; | ||
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. 여기 rem으로 고치면 좋을 것 같아요~! 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. 반응형 border 고려해서 border-radius는 px 컨벤션 가져가도 좋을 것 같아요! 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. 추후에 같이 얘기해보져 여러분! |
||
background: ${({ theme }) => theme.colors.white}; | ||
cursor: pointer; | ||
|
||
|
@@ -44,6 +57,8 @@ export const Title = styled.p` | |
|
||
export const Price = styled.p` | ||
margin-bottom: 1.2rem; | ||
${({ theme }) => theme.fonts.caption_02}; | ||
color: ${({ theme }) => theme.colors.G_09}; | ||
`; | ||
|
||
export const TournamentImgWrapper = styled.div` | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import styled from 'styled-components'; | ||
|
||
export const TournamentFooterWrapper = styled.footer` | ||
display: flex; | ||
justify-content: space-between; | ||
position: absolute; | ||
align-items: center; | ||
|
||
width: 37.5rem; | ||
bottom: 0; | ||
padding: 2rem; | ||
left: 50%; | ||
transform: translate(-50%); | ||
`; | ||
|
||
export const Btnpre = styled.button` | ||
${({ theme: { mixin } }) => mixin.inlineFlexBox({ align: 'center', justify: 'center' })} | ||
|
||
height: 4.4rem; | ||
padding: 1rem 1.1rem 1rem 0rem; | ||
|
||
border: none; | ||
border-radius: 9.9rem; | ||
background-color: ${({ theme }) => theme.colors.white}; | ||
`; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,19 @@ | ||
import { IcRefreshGray } from '../../../../assets/svg'; | ||
import * as S from './TournamernTitle.style'; | ||
|
||
const TournamentTitle = () => { | ||
return <div></div>; | ||
const round = 1; | ||
return ( | ||
<> | ||
{/* 라운드 컴포넌트 */} | ||
<S.Title>Round {round}</S.Title> | ||
<S.SetCount>1/6</S.SetCount> | ||
{/* 세트 수 현재 상황 */} | ||
<S.RefreshWrapper> | ||
<IcRefreshGray /> | ||
</S.RefreshWrapper> | ||
</> | ||
); | ||
}; | ||
|
||
export default TournamentTitle; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
import styled from 'styled-components'; | ||
|
||
export const Title = styled.p` | ||
${({ theme }) => theme.fonts.suit}; | ||
font-size: 3.4rem; | ||
color: ${({ theme }) => theme.colors.P_06}; | ||
`; | ||
|
||
export const SetCount = styled.p` | ||
margin-bottom: 4rem; | ||
font-size: 1.8rem; | ||
color: ${({ theme }) => theme.colors.G_05}; | ||
${({ theme }) => theme.fonts.body_02}; | ||
`; | ||
|
||
export const RefreshWrapper = styled.div` | ||
display: flex; | ||
justify-content: flex-end; | ||
|
||
width: 2.4rem; | ||
`; |
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.
주석 지워볼까용!!