-
Notifications
You must be signed in to change notification settings - Fork 1
[Refactor/#35] 공용 컴포넌트 추출 및 폴더 구조 정리 #45
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 4 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
56791c2
refactor: auth flow 폴더 구조 및 네이밍 수정
Seojegyeong e7afde9
refactor: intro 폴더 구조 및 네이밍 수정
Seojegyeong f7a000e
refactor: skeleton 폴더 구조 및 네이밍 수정
Seojegyeong 031172f
fix: import 경로 수정
Seojegyeong df948cc
fix: pnpm-lock.yaml 신규 의존성 반영 및 skeleton 폴더명 대소문자 수정
Seojegyeong 48aa5df
fix: input 포커스 상태 유지
Seojegyeong b068d7d
fix: TModalPayload 제거
Seojegyeong bf85f0d
fix: p태그 br로 수정
Seojegyeong c803319
fix: 모달 userId로 고유 id 생성
Seojegyeong 7068a2d
feat: queryClient 기본 설정 추가
Seojegyeong 171d67d
fix: validation 중복 코드 삭제 및 네이밍 변경
Seojegyeong 350b02e
fix: 리뷰 수정
Seojegyeong 9fa008a
fix: 코드 입력 필드 활성 상태 수정
Seojegyeong 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
Large diffs are not rendered by default.
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
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.
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
2 changes: 1 addition & 1 deletion
2
...ts/auth/skeleton/SignupStep01Skeleton.tsx → ...auth/Skeleton/SignupEmailStepSkeleton.tsx
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
2 changes: 1 addition & 1 deletion
2
...mponents/auth/skeleton/SignupSkeleton.tsx → ...ents/auth/Skeleton/SignupPageSkeleton.tsx
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
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,59 @@ | ||
| import { twMerge } from "tailwind-merge"; | ||
|
|
||
| import Button from "@/components/common/button/Button"; | ||
|
|
||
| interface IInputActionsProps { | ||
| button?: boolean; | ||
| buttonText?: string; | ||
| onButtonClick?: () => void; | ||
| validationState?: string; | ||
| timer?: string; | ||
| validation?: boolean; | ||
| error?: boolean; | ||
| type?: string; | ||
| } | ||
|
|
||
| export default function InputActions({ | ||
| button, | ||
| buttonText, | ||
| onButtonClick, | ||
| validationState, | ||
| timer, | ||
| validation = false, | ||
| error = false, | ||
| type, | ||
| }: IInputActionsProps) { | ||
| if (!button && !validationState && !timer) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <div className="flex items-center gap-2"> | ||
| {timer && ( | ||
| <span className="text-status-red font-body2 mr-3">{timer}</span> | ||
| )} | ||
| {button && ( | ||
| <Button | ||
| size="small" | ||
| disabled={type === "code" ? false : error || !validation} | ||
| variant={validation ? "primary" : "custom"} | ||
| className="py-1 px-3 h-full" | ||
| onClick={onButtonClick} | ||
| type="button" | ||
| > | ||
| {buttonText} | ||
| </Button> | ||
| )} | ||
| {validationState && ( | ||
| <span | ||
| className={twMerge( | ||
| "flex items-center justify-center rounded-2xl font-body1 whitespace-nowrap py-1 px-3 h-full cursor-default", | ||
| validation ? "bg-brand-800 text-white" : "opacity-50", | ||
| )} | ||
| > | ||
| {validationState} | ||
| </span> | ||
| )} | ||
| </div> | ||
| ); | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.