-
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
[토너먼트] 토너먼트 인트로 화면 퍼블리싱 #54
Changes from 14 commits
f6eb747
57da97b
6816a53
d450734
c578d40
af1a54c
4820b5c
7ee9506
5167615
c7f484e
530d6c3
ca653f0
3ee0d32
8b6e348
7913e8c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import TournamentStartText from './tournamentStartText/TournamentStartText'; | ||
import TournamentItemCount from './tournamentItemCount/TournamentItemCount'; | ||
import styled from 'styled-components'; | ||
import { Svg3Dicons } from '../../../assets/svg'; | ||
|
||
export default function TournamentConatainer() { | ||
return ( | ||
<> | ||
<TournamentStartText /> | ||
<TournamentItemCount /> | ||
<TournamentImg> | ||
<Svg3Dicons /> | ||
</TournamentImg> | ||
Comment on lines
+9
to
+13
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. 너무 깔끔하고 좋아요👍👍 |
||
{/* 공통버튼 btn_cta_fill 들어갈 예정*/} | ||
</> | ||
); | ||
} | ||
|
||
const TournamentImg = styled.div` | ||
width: 20rem; | ||
height: 20rem; | ||
margin: 0 auto; | ||
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. 덕분에 margin 0 auto 알아갑니다 :)
Comment on lines
+1
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. 이 파일에 대한 스타일 코드는 따로 하지 않은 이유가 있는지 궁금합니다 !! 추후 확장성을 위해 컨벤션을 맞추면 좋지 않을까 생각해서요! :) |
||
`; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import styled from 'styled-components'; | ||
|
||
export const TournamentItemCountWrapper = styled.article` | ||
margin-bottom: 5.5rem; | ||
`; | ||
|
||
export const TotalItems = styled.p` | ||
${({ theme }) => theme.fonts.body_09}; | ||
color: ${({ theme }) => theme.colors.G_09}; | ||
`; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import * as S from './TournamentItemCount.style'; | ||
|
||
export default function TournamentItemCount() { | ||
const count = 16; | ||
return ( | ||
<S.TournamentItemCountWrapper> | ||
<S.TotalItems>총 등록된 선물 {count}개</S.TotalItems> | ||
</S.TournamentItemCountWrapper> | ||
); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
export default function TournamentStartButton() { | ||
return ( | ||
<div> | ||
<button>시작하기</button> | ||
</div> | ||
); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import styled from 'styled-components'; | ||
|
||
export const TournamentStartTextWrapper = styled.article` | ||
display: flex; | ||
flex-direction: column; | ||
gap: 0.4rem; | ||
margin-bottom: 2rem; | ||
|
||
text-align: left; | ||
`; | ||
|
||
export const Title = styled.p` | ||
${({ theme }) => theme.fonts.Title}; | ||
`; | ||
|
||
export const SubTitle = styled.p` | ||
${({ theme }) => theme.fonts.body_07}; | ||
`; | ||
|
||
export const UserName = styled.span` | ||
color: ${({ theme }) => theme.colors.P_06}; | ||
`; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { useRecoilValue } from 'recoil'; | ||
import { userNameState } from '../../../../recoil/atoms'; | ||
import * as S from './TournamentStartText.style'; | ||
|
||
export default function TournamentStartText() { | ||
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. rface 써서 화살표 함수로 바꾸면 좋을 것 같아요~! 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. 화살표 함수 리팩토링 코드리뷰 반영해놓겠습니다 감사해요! |
||
const userName = useRecoilValue(userNameState); | ||
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. 리코일까지 작성한 거 넘 좋아요🙌 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. 저도 같은 방식으로 추후에 구현하겠습니다. 감사합니다 ㅎㅎ 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. 넘 좋아요 !!! 빠르게 로그인이 되어야 겠군요 : - ) |
||
|
||
return ( | ||
<S.TournamentStartTextWrapper> | ||
<S.SubTitle>선물 등록이 마감되어</S.SubTitle> | ||
<S.Title> | ||
<S.UserName>{userName}</S.UserName>님을 위한 <br /> | ||
선물 토너먼트를 시작합니다 | ||
</S.Title> | ||
</S.TournamentStartTextWrapper> | ||
); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import styled from 'styled-components'; | ||
import TournamentConatainer from '../components/tournament/intro/TournamentContainer'; | ||
|
||
const TournamentPage = () => { | ||
return ( | ||
<TournamentPageWrapper> | ||
<TournamentConatainer /> | ||
</TournamentPageWrapper> | ||
); | ||
}; | ||
|
||
export default TournamentPage; | ||
|
||
const TournamentPageWrapper = styled.section` | ||
margin: 0 2rem; | ||
`; | ||
Comment on lines
+1
to
+16
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. 이 파일에서의 스타일 코드 분리도 컨벤션처럼 하면 어떤가 ! 합니다 특별한 이유가 있었다면 답글로 달아주세요 !! : ) 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. 아! 제가 작업할 때 밑에 적고 분리를 추후에 해서 빼먹었던 것 같네요! 빠르게 코드리뷰 반영해놓을게요 감사해요! |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,6 @@ | ||
//이런 식으로 작성 | ||
import { atom } from 'recoil'; | ||
|
||
//import { atom } from "recoil"; | ||
|
||
// export const SweetState = atom({ | ||
// key: "sweet", | ||
// default: {}, | ||
// }); | ||
export const userNameState = atom({ | ||
key: '', | ||
default: '시동훈', | ||
}); |
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.
아주 사소하지만 Container 오타인 것 같아요~!