Skip to content
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

UI: #69 유저 정보 설정 페이지 UI 구현 #78

Merged
merged 19 commits into from
Aug 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a1a0143
Feat: #69 유저 개인정보 설정 페이지 구현
Yoonyesol Aug 16, 2024
6db43d9
Refactor: #69 UserSettingPage에서 이미지, 링크 관련 코드를 컴포넌트로 분리
Yoonyesol Aug 17, 2024
a372a22
Refactor: #69 SignUpPage에서 이미지, 링크 관련 코드를 컴포넌트로 분리
Yoonyesol Aug 17, 2024
80ef5f4
Refactor: #69 이미지 전송을 위해 폼에서 이미지를 처리할 수 있도록 코드 리팩토링
Yoonyesol Aug 17, 2024
1c786b6
Refactor: #69 UserAuthenticatePage의 이메일 인증 로직을 훅으로 분리 및 인증 submit 버튼을…
Yoonyesol Aug 18, 2024
7cf194c
Refactor: #69 SignUpPage의 이메일 인증 로직, 인증 submit 버튼 분리
Yoonyesol Aug 18, 2024
d158e4f
Merge branch 'develop' of https://github.com/GU-99/grow-up-fe into fe…
Yoonyesol Aug 19, 2024
ca4aa5f
Refactor: #69 인증코드 확인 로직 분리
Yoonyesol Aug 19, 2024
b668810
Rename: #69 유저설정 페이지 관련 컴포넌트 이름 수정 및 auth-form 폴더 구조 수정
Yoonyesol Aug 19, 2024
517a68d
Feat: #69 인증버튼 라벨 props 추가
Yoonyesol Aug 19, 2024
f1c3614
Merge branch 'develop' of https://github.com/GU-99/grow-up-fe into fe…
Yoonyesol Aug 20, 2024
d9bebc1
Fix: #69 conflict 에러 해결
Yoonyesol Aug 20, 2024
6d82610
UI: #69 전체적인 코드 태그 수정 및 디자인 코드 수정, 로고 수정
Yoonyesol Aug 21, 2024
280c55b
Refactor: #69 인증번호관리 훅에서 타이머 visible 코드 삭제 및 타이머 visible 로직 수정
Yoonyesol Aug 21, 2024
87da504
UI: #69 일부 코드 태그 수정 및 디자인 코드 수정
Yoonyesol Aug 22, 2024
f8265b4
UI: #69 링크 컴포넌트 버튼 내부 아이콘 크기 조절
Yoonyesol Aug 22, 2024
22e0104
Comment: #69 타이머 만료 코드 주석 수정
Yoonyesol Aug 23, 2024
d5cb38f
Merge branch 'develop' of https://github.com/GU-99/grow-up-fe into fe…
Yoonyesol Aug 23, 2024
5d5b59b
UI: #69 label 태그 중첩 해결 및 input 태그 height 수정
Yoonyesol Aug 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
UI: #69 일부 코드 태그 수정 및 디자인 코드 수정
Yoonyesol committed Aug 22, 2024
commit 87da5045d5c2d36d19f4035493e1981594e7dbc1
6 changes: 3 additions & 3 deletions src/components/user/auth-form/ProfileImageContainer.tsx
Original file line number Diff line number Diff line change
@@ -37,11 +37,11 @@ export default function ProfileImageContainer({ imageUrl, setImageUrl }: Profile
};

return (
<section className="flex flex-col items-center gap-8">
<div className="group relative flex h-100 w-100 items-center justify-center overflow-hidden rounded-full border border-input">
<section className="flex flex-col items-center">
<div className="group relative flex size-100 items-center justify-center overflow-hidden rounded-full border border-input">
{imageUrl ? (
<>
<img src={imageUrl} alt="profileImage" className="h-full w-full object-cover" />
<img src={imageUrl} alt="profileImage" className="size-full object-cover" />
<div className="absolute inset-0 hidden items-center justify-center bg-black bg-opacity-50 group-hover:flex">
<p role="presentation" className="cursor-pointer" onClick={handleRemoveImg} onKeyDown={handleRemoveImg}>
<FaRegTrashCan className="size-15 text-white" />
2 changes: 1 addition & 1 deletion src/layouts/AuthFormLayout.tsx
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ export default function AuthFormLayout({ children, onSubmit, marginTop }: AuthFo
<br />
Grow Up your Life with us.
</section>
<form onSubmit={onSubmit} className={`${marginTop} flex h-screen w-300 flex-col justify-center gap-8 py-30`}>
<form onSubmit={onSubmit} className={`flex h-screen w-300 flex-col justify-center gap-8 py-30 ${marginTop}`}>
{children}
</form>
</>
2 changes: 1 addition & 1 deletion src/layouts/page/AuthLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Outlet } from 'react-router-dom';
import AuthGULogo from '@/assets/auth_logo.svg';
import AuthGULogo from '@assets/auth_logo.svg';

export default function AuthLayout() {
return (
5 changes: 2 additions & 3 deletions src/pages/setting/UserAuthenticatePage.tsx
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import VerificationButton from '@components/user/auth-form/VerificationButton';
import { EmailVerificationForm } from '@/types/UserType';

function UserAuthenticatePage() {
const { isVerificationRequested, isTimerVisible, requestVerificationCode, verifyCode, handleTimerTimeout } =
const { isVerificationRequested, requestVerificationCode, verifyCode, expireVerificationCode } =
useEmailVerification();

const {
@@ -55,10 +55,9 @@ function UserAuthenticatePage() {
{/* 인증 요청 및 확인 버튼 */}
<VerificationButton
isVerificationRequested={isVerificationRequested}
isTimerVisible={isTimerVisible}
isSubmitting={isSubmitting}
requestCode={handleSubmit(requestVerificationCode)}
handleTimerTimeout={handleTimerTimeout}
expireVerificationCode={expireVerificationCode}
buttonLabel="확인"
/>
</form>