-
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
[마이페이지,시작페이지] 최종 QA 반영입니다 ! #471
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b5cd315
refactor: done detail room empty view 중앙정렬
5e6525c
style: count user gap 적용
390291f
style: margin 조금 더 적용
52a5eac
feat: 토너먼트 애니메이션 직접 구현 위해 폴더 및 파일 생성
fbfb739
feat: tournament svg 추가
41e2ca0
feat: touranment 애니메이션 직접 구현 후 적용 X view에 안 보이는 이슈
39ff77e
Merge branch 'develop' into refactor/#460-final_qa
ca00edb
fix: 안쓰는 svg import문 삭제
111e873
Merge branch 'develop' into refactor/#460-final_qa
hoeun0723 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,14 @@ | ||
import type { SVGProps } from 'react'; | ||
const SvgTournament01 = (props: SVGProps<SVGSVGElement>) => ( | ||
<svg xmlns='http://www.w3.org/2000/svg' data-name='Layer 1' viewBox='0 0 375 50' {...props}> | ||
<path | ||
d='M271.5 42v-6h-168v6' | ||
data-name='2-line' | ||
style={{ | ||
fill: 'none', | ||
stroke: '#ffbad5', | ||
}} | ||
/> | ||
</svg> | ||
); | ||
export default SvgTournament01; |
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 type { SVGProps } from 'react'; | ||
const SvgTournament02 = (props: SVGProps<SVGSVGElement>) => ( | ||
<svg | ||
xmlns='http://www.w3.org/2000/svg' | ||
id='tournament02_svg__Layer_1' | ||
data-name='Layer 1' | ||
viewBox='0 0 375 32' | ||
{...props} | ||
> | ||
<defs> | ||
<style> | ||
{ | ||
'.tournament02_svg__cls-1{fill:none;stroke:#ff6aa3;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px}' | ||
} | ||
</style> | ||
</defs> | ||
<g id='tournament02_svg___2-gift' data-name='2-gift'> | ||
<path | ||
d='M93.9 18.1v-5.3c0-1.3 1.1-2.4 2.4-2.4h14.4c1.3 0 2.4 1.1 2.4 2.4v5.3m-19.2 0h19.2m-19.2 0v5.5c0 1.3 1.1 2.4 2.4 2.4h14.4c1.3 0 2.4-1.1 2.4-2.4v-5.5m-9.4 7.9V10.4m-1.2-.5c.2 0 .3-.1.4-.3s.1-.3 0-.5c-.3-.6-1.4-2.5-2.2-2.9-.9-.5-2.1-.2-2.6.7s-.2 2.1.7 2.6c.8.4 3 .4 3.7.4m1.6-.7c-.1.2-.1.4 0 .5.1.2.3.2.4.3.7 0 2.9 0 3.6-.4.9-.5 1.2-1.7.7-2.6s-1.7-1.2-2.6-.7c-.6.4-1.7 2.3-2.1 2.9M261.9 18.1v-5.3c0-1.3 1.1-2.4 2.4-2.4h14.4c1.3 0 2.4 1.1 2.4 2.4v5.3m-19.2 0h19.2m-19.2 0v5.5c0 1.3 1.1 2.4 2.4 2.4h14.4c1.3 0 2.4-1.1 2.4-2.4v-5.5m-9.4 7.9V10.4m-1.2-.5c.2 0 .3-.1.4-.3s.1-.3 0-.5c-.3-.6-1.4-2.5-2.2-2.9-.9-.5-2.1-.2-2.6.7s-.2 2.1.7 2.6c.8.4 3 .4 3.7.4m1.6-.7c-.1.2-.1.4 0 .5.1.2.3.2.4.3.7 0 2.9 0 3.6-.4.9-.5 1.2-1.7.7-2.6s-1.7-1.2-2.6-.7c-.6.4-1.7 2.3-2.1 2.9' | ||
className='tournament02_svg__cls-1' | ||
/> | ||
</g> | ||
</svg> | ||
); | ||
export default SvgTournament02; |
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,18 @@ | ||
import type { SVGProps } from 'react'; | ||
const SvgTournament03 = (props: SVGProps<SVGSVGElement>) => ( | ||
<svg | ||
xmlns='http://www.w3.org/2000/svg' | ||
id='tournament03_svg__Layer_1' | ||
data-name='Layer 1' | ||
viewBox='0 0 375 24' | ||
{...props} | ||
> | ||
<defs> | ||
<style>{'.tournament03_svg__cls-1{fill:none;stroke:#ffbad5}'}</style> | ||
</defs> | ||
<g id='tournament03_svg___1-line' data-name='1-line'> | ||
<path d='M145.5 14V8h-84v6M313.5 14V8h-84v6' className='tournament03_svg__cls-1' /> | ||
</g> | ||
</svg> | ||
); | ||
export default SvgTournament03; |
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 type { SVGProps } from 'react'; | ||
const SvgTournament04 = (props: SVGProps<SVGSVGElement>) => ( | ||
<svg | ||
xmlns='http://www.w3.org/2000/svg' | ||
id='tournament04_svg__Layer_1' | ||
data-name='Layer 1' | ||
viewBox='0 0 375 40' | ||
{...props} | ||
> | ||
<defs> | ||
<style> | ||
{ | ||
'.tournament04_svg__cls-1{fill:none;stroke:#ff6aa3;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px}' | ||
} | ||
</style> | ||
</defs> | ||
<path | ||
d='M51.9 16.1v-5.3c0-1.3 1.1-2.4 2.4-2.4h14.4c1.3 0 2.4 1.1 2.4 2.4v5.3m-19.2 0h19.2m-19.2 0v5.5c0 1.3 1.1 2.4 2.4 2.4h14.4c1.3 0 2.4-1.1 2.4-2.4v-5.5M61.7 24V8.4m-1.2-.5c.2 0 .3-.1.4-.3s.1-.3 0-.5c-.3-.6-1.4-2.5-2.2-2.9-.9-.5-2.1-.2-2.6.7s-.2 2.1.7 2.6c.8.4 3 .4 3.7.4m1.6-.7c-.1.2-.1.3 0 .5s.3.2.4.3c.7 0 2.9 0 3.6-.4.9-.5 1.2-1.7.7-2.6s-1.7-1.2-2.6-.7c-.6.4-1.7 2.3-2.1 2.9M135.9 16.1v-5.3c0-1.3 1.1-2.4 2.4-2.4h14.4c1.3 0 2.4 1.1 2.4 2.4v5.3m-19.2 0h19.2m-19.2 0v5.5c0 1.3 1.1 2.4 2.4 2.4h14.4c1.3 0 2.4-1.1 2.4-2.4v-5.5m-9.4 7.9V8.4m-1.2-.5c.2 0 .3-.1.4-.3s.1-.3 0-.5c-.3-.6-1.4-2.5-2.2-2.9-.9-.5-2.1-.2-2.6.7s-.2 2.1.7 2.6c.8.4 3 .4 3.7.4m1.6-.7c-.1.2-.1.3 0 .5s.3.2.4.3c.7 0 2.9 0 3.6-.4.9-.5 1.2-1.7.7-2.6s-1.7-1.2-2.6-.7c-.6.4-1.7 2.3-2.1 2.9M219.9 16.1v-5.3c0-1.3 1.1-2.4 2.4-2.4h14.4c1.3 0 2.4 1.1 2.4 2.4v5.3m-19.2 0h19.2m-19.2 0v5.5c0 1.3 1.1 2.4 2.4 2.4h14.4c1.3 0 2.4-1.1 2.4-2.4v-5.5m-9.4 7.9V8.4m-1.2-.5c.2 0 .3-.1.4-.3s.1-.3 0-.5c-.3-.6-1.4-2.5-2.2-2.9-.9-.5-2.1-.2-2.6.7s-.2 2.1.7 2.6c.8.4 3 .4 3.7.4m1.6-.7c-.1.2-.1.3 0 .5s.3.2.4.3c.7 0 2.9 0 3.6-.4.9-.5 1.2-1.7.7-2.6s-1.7-1.2-2.6-.7c-.6.4-1.7 2.3-2.1 2.9M303.9 16.1v-5.3c0-1.3 1.1-2.4 2.4-2.4h14.4c1.3 0 2.4 1.1 2.4 2.4v5.3m-19.2 0h19.2m-19.2 0v5.5c0 1.3 1.1 2.4 2.4 2.4h14.4c1.3 0 2.4-1.1 2.4-2.4v-5.5m-9.4 7.9V8.4m-1.2-.5c.2 0 .3-.1.4-.3s.1-.3 0-.5c-.3-.6-1.4-2.5-2.2-2.9-.9-.5-2.1-.2-2.6.7s-.2 2.1.7 2.6c.8.4 3 .4 3.7.4m1.6-.7c-.1.2-.1.3 0 .5s.3.2.4.3c.7 0 2.9 0 3.6-.4.9-.5 1.2-1.7.7-2.6s-1.7-1.2-2.6-.7c-.6.4-1.7 2.3-2.1 2.9' | ||
className='tournament04_svg__cls-1' | ||
/> | ||
</svg> | ||
); | ||
export default SvgTournament04; |
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 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 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
26 changes: 26 additions & 0 deletions
26
src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts
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,26 @@ | ||
import styled, { keyframes } from 'styled-components'; | ||
|
||
const slideIn = keyframes` | ||
0% { | ||
opacity: 0; | ||
transform: translateY(-50px); | ||
} | ||
100% { | ||
opacity: 1; | ||
transform: translateY(0); | ||
} | ||
`; | ||
export const TournamentWrapper = styled.div` | ||
display: flex; | ||
position: relative; | ||
z-index: 999; | ||
/* top: 36rem; | ||
z-index: 50; */ | ||
`; | ||
|
||
export const AnimatedTournament = styled.div<{ $animationDelay: string; $style: string }>` | ||
position: relative; | ||
top: ${(props) => props.$style}; | ||
animation: ${slideIn} 0.5s ease forwards; | ||
animation-delay: ${(props) => props.$animationDelay}; | ||
`; |
23 changes: 23 additions & 0 deletions
23
src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx
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 { Tournament01, Tournament02, Tournament03, Tournament04 } from '../../../../assets/svg'; | ||
import * as S from './StartTournamentAnimation.style'; | ||
|
||
const StartTournamentAnimation = () => { | ||
return ( | ||
<S.TournamentWrapper> | ||
<S.AnimatedTournament $animationDelay='0s' $style='0rem'> | ||
<Tournament04 /> | ||
</S.AnimatedTournament> | ||
<S.AnimatedTournament $animationDelay='0.25s' $style='20rem'> | ||
<Tournament03 /> | ||
</S.AnimatedTournament> | ||
<S.AnimatedTournament $animationDelay='0.5s' $style='40rem'> | ||
<Tournament02 /> | ||
</S.AnimatedTournament> | ||
<S.AnimatedTournament $animationDelay='0.75s' $style='60rem'> | ||
<Tournament01 /> | ||
</S.AnimatedTournament> | ||
</S.TournamentWrapper> | ||
); | ||
}; | ||
|
||
export default StartTournamentAnimation; |
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.
오오...!! 스크롤 안되던 문제를 100vh를 줘서 해결하신걸까요??
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.
앗 중앙정렬을 위해 100vh를 적용해주었습니다 !