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.

Sign up for GitHub

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

Jump to bottom

Feat/find #23

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Feat/find #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b06716
design: 회원가입 focus outline 적용
jiohjung98 Sep 12, 2024
e3513f8
design: 이메일/비밀번호찾기 focus outline 적용
jiohjung98 Sep 12, 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
8 changes: 6 additions & 2 deletions src/components/find/FindEmail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const FindEmail = ({ onEmailFound }: { onEmailFound: () => void }) => {
value={phoneNumber}
onChange={handlePhoneNumberChange}
placeholder="휴대폰 번호 입력"
className="flex-1 min-w-0 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2"
className="flex-1 min-w-0 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 focus:outline-normal"
/>
{phoneNumberValid ? (
isRequest ? (
Expand Down Expand Up @@ -178,7 +178,11 @@ const FindEmail = ({ onEmailFound }: { onEmailFound: () => void }) => {
onChange={handleValidNumberChange}
type="text"
placeholder="인증 번호 입력"
className="flex-1 min-w-0 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2"
className={`flex-1 min-w-0 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2
${isRequest && !isComplete && !isError && 'outline-normal'}
${isRequest && isComplete && 'outline-success'}
${isRequest && isError && 'outline-error'}
`}
/>
{isRequest && validNumberOk ? (
<div
Expand Down
2 changes: 1 addition & 1 deletion src/components/find/FindPassword.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const FindPassword = () => {
onChange={(e) => {
setEmail(e.target.value);
}}
className="w-full mt-2 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 "
className="w-full mt-2 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 focus:outline-normal"
/>
</div>
</div>
Expand Down
8 changes: 5 additions & 3 deletions src/components/signup/Step3.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const Step3: React.FC<StepProps> = ({ onNext, onUpdate }) => {
setEmail(e.target.value);
onUpdate({ email: e.target.value });
}}
className="w-full mt-4 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 "
className="w-full mt-4 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 focus:outline-normal"
/>
</div>

Expand All @@ -82,7 +82,8 @@ const Step3: React.FC<StepProps> = ({ onNext, onUpdate }) => {
placeholder="비밀번호 입력"
value={password}
onChange={handlePasswordChange}
className="w-full mt-4 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 "
className={`w-full mt-4 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2
${password ? (passwordValid ? 'outline-success' : 'focus:outline-normal') : ''}`}
/>
{!password && (
<p className="text-[#6E6F73] text-xs mt-2">영문, 숫자, 특수문자 포함 8-20자로 입력해주세요.</p>
Expand All @@ -102,7 +103,8 @@ const Step3: React.FC<StepProps> = ({ onNext, onUpdate }) => {
placeholder="비밀번호 재입력"
value={confirmPassword}
onChange={handleConfirmPasswordChange}
className="w-full mt-4 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 "
className={`w-full mt-4 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2
${password ? (passwordMatch ? 'outline-success' : 'focus:outline-normal') : ''}`}
/>
<div className="mt-1 min-h-[25px]">
{passwordMatch === false && (
Expand Down
17 changes: 9 additions & 8 deletions src/components/signup/Step4.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ const Step4: React.FC<StepProps> = ({ onNext, onUpdate }) => {
value={nickname}
onChange={handleNicknameChange}
placeholder="닉네임 입력"
className="flex-1 min-w-0 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2"
className={`flex-1 min-w-0 px-4 py-[14px] bg-bg rounded-[12px] text-body2
${nickname ? (isNicknameValid === true ? 'outline-success' : 'outline-normal') : 'outline-none'}`}
/>
<div
onClick={checkNickname}
Expand All @@ -135,7 +136,7 @@ const Step4: React.FC<StepProps> = ({ onNext, onUpdate }) => {
중복확인
</div>
</div>
<div className="mt-2 min-h-[25px]">
<div className="">
{isNicknameValid === true && (
<p className="text-blue-500 text-xs mt-2">사용 가능한 닉네임입니다.</p>
)}
Expand All @@ -145,14 +146,14 @@ const Step4: React.FC<StepProps> = ({ onNext, onUpdate }) => {
</div>
</div>

<div className="mb-10">
<div className="mb-4">
<div className="text-body3">이름</div>
<input
type="text"
placeholder="이름 입력"
value={name}
onChange={(e) => setName(e.target.value)}
className="w-full mt-2 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2"
className="w-full mt-2 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 focus:outline-normal"
/>
</div>

Expand All @@ -163,7 +164,7 @@ const Step4: React.FC<StepProps> = ({ onNext, onUpdate }) => {
placeholder="생년월일 8자리 입력"
value={birthdate}
onChange={handleBirthdateChange}
className="w-full px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 mt-2"
className="w-full px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 mt-2 focus:outline-normal"
/>
</div>

Expand All @@ -172,13 +173,13 @@ const Step4: React.FC<StepProps> = ({ onNext, onUpdate }) => {
<div className='flex w-full mt-2'>
<button
onClick={() => handleInvestmentExperienceChange('no')}
className={`flex-1 py-3 px-4 rounded-lg border pr-1 ${investmentExperience === 'no' ? 'border-purple-600 text-purple-600' : 'border-gray-100 text-gray-600'}`}
className={`flex-1 py-3 px-4 rounded-lg border mr-1 ${investmentExperience === 'no' ? 'border-purple-600 text-purple-600' : 'border-gray-100 text-gray-600'}`}
>
투자 경험 없음
</button>
<button
onClick={() => handleInvestmentExperienceChange('yes')}
className={`flex-1 py-3 px-4 rounded-lg border pl-1 ${investmentExperience === 'yes' ? 'border-purple-600 text-purple-600' : 'border-gray-100 text-gray-600'}`}
className={`flex-1 py-3 px-4 rounded-lg border ml-1 ${investmentExperience === 'yes' ? 'border-purple-600 text-purple-600' : 'border-gray-100 text-gray-600'}`}
>
투자 경험 있음
</button>
Expand All @@ -193,7 +194,7 @@ const Step4: React.FC<StepProps> = ({ onNext, onUpdate }) => {
type="text"
value={investmentYears}
onChange={handleInvestmentYearsChange}
className="w-full mt-2 py-3 px-4 rounded-[12px] border border-gray-100"
className="w-full mt-2 py-3 px-4 rounded-[12px] border border-gray-100 focus:outline-normal"
/>
<div className="text-body3 my-auto ml-2">년</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/signup/modal/PhoneVerification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ const PhoneVerification: React.FC<PhoneVerificationProps> = ({ onNext, onPhoneNu
value={phoneNumber}
onChange={handlePhoneNumberChange}
placeholder="휴대폰 번호 입력"
className="flex-1 min-w-0 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2"
className="flex-1 min-w-0 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2 focus:outline-normal"
/>
{phoneNumberValid ? (
isRequest ? (
Expand Down
Loading