-
Notifications
You must be signed in to change notification settings - Fork 2
design: 로그인 및 랜딩 페이지 퍼블리싱 #22
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
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
a2a943e
design: 전체 배경 그라데이션 삽입
AAminha 05c137a
design: 로그인 페이지 에셋 추가
AAminha 9a56abc
design: 로그인 페이지 퍼블리싱
AAminha d19e2dc
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-fin…
AAminha 1933ca2
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-fin…
AAminha f39424a
design: 로그인 페이지 에셋 변경 및 반영
AAminha 0a34498
design: 랜딩페이지 퍼블리싱
AAminha 35f3b17
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-fin…
AAminha 8e65900
remove: 불필요한 에셋 제거
AAminha fc18a98
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-fin…
AAminha b0323a6
remove: 중복 에셋 제거
AAminha 9df2041
refactor: 로그인 아이콘에 aria-label 추가
AAminha cff0e69
style: 랜딩페이지 원 크기 수정
AAminha 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 hidden or 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
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 hidden or 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
File renamed without changes
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.
Binary file not shown.
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 hidden or 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 hidden or 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 @@ | ||
| export const STYLE_CLASS = [ | ||
| { | ||
| imagePosition: 'left-[calc(50%-200px)]', | ||
| mask: 'bottom-26 left-[calc(50%+65px)]', | ||
| circle: 'h-41 w-41', | ||
| textPosition: '-top-20 left-[calc(50%-30px)] text-right', | ||
| description: | ||
| '따뜻한 편지 사례들을 모아 볼 수 있어요.\n응원이 필요한 사람들에게\n단체로 롤링페이퍼를 쓸 수도 있습니다.', | ||
| }, | ||
| { | ||
| imagePosition: 'left-[calc(50%-200px)]', | ||
| mask: 'bottom-5 left-[calc(50%-75px)]', | ||
| circle: 'h-42 w-42', | ||
| textPosition: '-top-14 left-[calc(50%+40px)] text-left', | ||
| description: '주고받은 편지 내역을 확인해 보세요.\n보는 것 만으로도 마음이 따뜻해집니다.', | ||
| }, | ||
| { | ||
| imagePosition: 'left-[calc(50%+130px)]', | ||
| mask: 'bottom-8 left-[calc(50%)]', | ||
| circle: 'h-65 w-65', | ||
| textPosition: '-top-14 left-1/2 text-center', | ||
| description: | ||
| '모르는 사람에게 고민을 털어 놓아 보세요.\n다른 사람에게도 위로, 응원, 축하를 보낼 수 있어요.', | ||
| }, | ||
| ]; |
This file contains hidden or 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,49 @@ | ||
| import { useState } from 'react'; | ||
| import { Navigate } from 'react-router'; | ||
| import { twMerge } from 'tailwind-merge'; | ||
|
|
||
| import LandingImg from '@/assets/images/landing.png'; | ||
|
|
||
| import { STYLE_CLASS } from './constants'; | ||
|
|
||
| const Landing = () => { | ||
| const [step, setStep] = useState(0); | ||
|
|
||
| if (step === 3) return <Navigate to="/login" />; | ||
|
|
||
| return ( | ||
| <main className="relative flex grow justify-center" onClick={() => setStep((prev) => prev + 1)}> | ||
| <img | ||
| src={LandingImg} | ||
| alt="서비스 소개 이미지" | ||
| className={twMerge( | ||
| 'fixed bottom-0 h-70 w-auto max-w-none -translate-x-1/2 transition-all duration-200', | ||
| STYLE_CLASS[step].imagePosition, | ||
| )} | ||
| /> | ||
| <section | ||
| className={twMerge( | ||
| 'fixed z-1 -translate-x-1/2 transition-all duration-200', | ||
| STYLE_CLASS[step].mask, | ||
| )} | ||
| > | ||
| <p | ||
| className={twMerge( | ||
| 'body-sb absolute z-2 w-max -translate-x-1/2 whitespace-pre-wrap text-white transition-all duration-200', | ||
| STYLE_CLASS[step].textPosition, | ||
| )} | ||
| > | ||
| {STYLE_CLASS[step].description} | ||
| </p> | ||
| <div | ||
| className={twMerge( | ||
| 'rounded-full shadow-[0_0_0_9999px_rgba(0,0,0,0.5)]', | ||
| STYLE_CLASS[step].circle, | ||
| )} | ||
| /> | ||
| </section> | ||
| </main> | ||
| ); | ||
| }; | ||
|
|
||
| export default Landing; | ||
This file contains hidden or 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.
오 저는 tranlate 정렬translate-x-[-50%] 이렇게 했었는데 더 간편한 방법이 있었군용