Skip to content

Commit

Permalink
[feat] 회원가입 페이지 qa 완료
Browse files Browse the repository at this point in the history
  • Loading branch information
zestlee1106 committed Nov 7, 2023
1 parent 6be400f commit 02a8f0a
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 19 deletions.
4 changes: 2 additions & 2 deletions components/Button/Button.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
}

&.disabled {
@apply bg-g2 text-g3;
@apply bg-g2 text-g4;
}

&.noBg {
@apply bg-g0 border border-solid border-r1 rounded-[2px] text-r1 font-bold;
@apply bg-g0 border border-solid border-r1 rounded-[2px] text-r1 font-semibold;
}

&.none {
Expand Down
2 changes: 1 addition & 1 deletion components/Input/Input.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.input {
@apply border-g4 border-solid border-[1px] rounded-[2px] w-full h-[48px] focus:border-g6 placeholder-g4 pl-[12px] font-pretendard font-normal;
@apply border-g4 border-solid border-[1px] rounded-[2px] w-full h-[48px] focus:border-g6 placeholder-[#BDBDBD] pl-[12px] font-pretendard font-normal;

&.error {
@apply border-a1;
Expand Down
2 changes: 1 addition & 1 deletion components/Input/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function Input({ placeholder, register, type, error, maxLength, disabled, fixedW
}
return type;
}, [type, isPasswordShow]);
const [inputValue, setInputValue] = useState(fixedWord || '' as string);
const [inputValue, setInputValue] = useState(fixedWord || ('' as string));

const togglePasswordVisibility = () => {
setIsPasswordShow((state) => !state);
Expand Down
2 changes: 1 addition & 1 deletion components/Modal/Modal.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

.overlay {
@apply bg-[rgba(0,0,0,0.2)] w-full h-full fixed top-0 z-[1000] max-w-[440px] min-w-[320px];
@apply bg-[rgba(0,0,0,0.8)] w-full h-full fixed top-0 z-[1000] max-w-[440px] min-w-[320px];
}

.full {
Expand Down
7 changes: 5 additions & 2 deletions components/Modal/ModalBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,18 @@ function Modal({
) : (
<div>
<h2>{title}</h2>
<p className={`${buttonType === 'wrapper' && 'text-r1'}`} dangerouslySetInnerHTML={{ __html: content }} />
<p
className={`${buttonType === 'wrapper' && 'text-r1'} mt-[4px]`}
dangerouslySetInnerHTML={{ __html: content }}
/>
</div>
)}
{buttonType && buttonType !== 'none' && buttonType !== 'wrapper' ? (
<div className="mt-[20px] flex gap-x-2 items-center justify-center">{renderButton()}</div>
) : (
<>
<div className="mt-[10] flex flex-col items-center justify-center space-y-[10px]">{renderButton()}</div>
<Button onClick={handleCustomEvent} color="r1" size="lg" _className="mt-[20px]">
<Button onClick={handleCustomEvent} color="r1" size="lg" _className="mt-[20px] font-semibold">
{customButtonName}
</Button>
</>
Expand Down
4 changes: 2 additions & 2 deletions components/Radio/Radio.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ function Radio({ options, selectedOption, onChange, register }: RadioProps) {
type="radio"
value={option.value}
defaultChecked={index === 0}
className="form-radio text-indigo-600 h-4 w-4 hidden"
className="hidden w-4 h-4 text-indigo-600 form-radio"
{...register}
onChange={handleChange}
/>
<span>{option.label}</span>
<span className="font-[500]">{option.label}</span>
</label>
))}
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion components/Select/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const customStyles: StylesConfig<Option, boolean, GroupBase<Option>> = {
}),
placeholder: (provided) => ({
...provided,
color: '#777777',
color: '#bdbdbd',
}),
menu: (provided) => ({
...provided,
Expand Down
4 changes: 2 additions & 2 deletions pages/signup/step1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default function SignUp() {
openModal({
props: {
title: 'Check Your Mail Box',
content: `A verification has just been sent to<br/> <b>${data.email}<b>`,
content: `A verification has just been sent to<br/> <b class="font-semibold">${data.email}<b>`,
buttonType: 'outline',
buttonName: 'Resend link',
handleClose: async () => {
Expand Down Expand Up @@ -223,7 +223,7 @@ export default function SignUp() {
<div className="flex mb-[6px] justify-center mr-[41px]">
<p className="text-[14px]">{signUpTranslation.t('checkMember')}</p>
<button
className="text-[16px] text-r1 ml-1 underline"
className="text-[16px] text-r1 ml-1 underline font-semibold"
onClick={() => {
Router.push('/login');
}}
Expand Down
11 changes: 6 additions & 5 deletions pages/signup/step3.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ export const getStaticProps = async ({ locale }: GetStaticPropsContext) => ({

const options = [
{
label: 'male',
label: 'Male',
value: 'male',
},
{
label: 'female',
label: 'Female',
value: 'female',
},
{
label: 'other',
label: 'Other',
value: 'other',
},
];
Expand All @@ -44,7 +44,7 @@ const monthList = Array.from({ length: 12 }, (_, index) => ({

// Year List
const currentYear = new Date().getFullYear();
const yearList = Array.from({ length: 10 }, (_, index) => ({
const yearList = Array.from({ length: 80 }, (_, index) => ({
value: currentYear - index,
label: `${currentYear - index}`,
}));
Expand Down Expand Up @@ -119,7 +119,7 @@ export default function SignUp() {
{signUpTranslation.t('step3Title')}
</Typography>
</div>
<form onSubmit={handleSubmit(onSubmit)} className="grid gap-y-[30px]">
<form onSubmit={handleSubmit(onSubmit)} className="grid gap-y-[30px] mb-[80px]">
<section>
<p className="text-[16px] text-g7 font-semibold mb-[8px]">{signUpTranslation.t('name')}</p>
<div className="mb-[8px]">
Expand Down Expand Up @@ -150,6 +150,7 @@ export default function SignUp() {
<section>
<p className="text-[16px] text-g7 font-semibold mb-[8px]">{signUpTranslation.t('aboutYou')}</p>
<Textarea placeholder={signUpTranslation.t('introduce') as string} register={register('introduce')} />
<div className="text-right text-[14px] text-g5 mt-[4px]">{watch('introduce')?.length} / 1000 byte</div>
</section>
<div className="fixed bottom-0 w-full overflow-x-hidden left-[50%] translate-x-[-50%] px-[20px] max-w-max">
<div className="w-full">
Expand Down
2 changes: 1 addition & 1 deletion public/locales/en/signup.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"createAccount": "Create Account",
"createAccount": "Create account",
"emailPlaceholder": "Your email",
"acceptAll": "Accept all",
"14over": "I'm 14 or over",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/ko/signup.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"createAccount": "Create Account",
"createAccount": "Create account",
"emailPlaceholder": "Your email",
"acceptAll": "Accept all",
"14over": "I'm 14 or over",
Expand Down

0 comments on commit 02a8f0a

Please sign in to comment.