Skip to content

Commit

Permalink
Merge pull request #155 from ssu-student-union/fix/#154_login_qa
Browse files Browse the repository at this point in the history
로그인 1차 QA 완료
  • Loading branch information
jongse7 authored Sep 24, 2024
2 parents a5431f5 + acbd67e commit c9983f1
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 12 deletions.
16 changes: 8 additions & 8 deletions src/pages/general/containers/CertifyApplySection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@ export function CertifyApplySection() {
return (
<div className="flex min-h-screen items-center justify-center">
<div className="flex w-full max-w-md flex-col items-center p-4">
<div className="pb-4 text-2xl font-bold not-italic leading-[normal] text-[rgb(0,0,0)]">
<div className="xs: pb-4 text-3xl font-bold not-italic leading-[normal] text-[rgb(0,0,0)] xs:text-2xl sm:text-2xl">
학생인증이 안 되시나요?
</div>
<div className="w-[540px] text-center text-base font-medium text-gray-700">
<div className="w-[540px] text-center text-base font-medium text-gray-700 xs:text-xs sm:text-xs">
신편입학, 학적 변동의 이유로 학생 인증이 지연될 수 있습니다 <br></br>
문의를 보내주시면 기입해주신 이메일을 통해 문의 접수를 도와드리겠습니다
</div>
<form className="mt-[36px]" noValidate onSubmit={handleSubmit(onSubmit)}>
<form className="mt-[36px] w-[420px] xs:w-[300px] sm:w-[300px]" noValidate onSubmit={handleSubmit(onSubmit)}>
<Input
type="text"
placeholder="이름"
className="w-[420px]"
className="w-[420px] xs:w-[300px] sm:w-[300px]"
{...register('name', {
required: '이름은 필수 입력입니다.',
})}
Expand All @@ -93,7 +93,7 @@ export function CertifyApplySection() {
<Input
type="text"
placeholder="학번"
className="mt-5"
className="mt-5 w-[420px] xs:w-[300px] sm:w-[300px]"
{...register('id', {
required: '학번은 필수 입력입니다.',
})}
Expand All @@ -105,7 +105,7 @@ export function CertifyApplySection() {
<Input
type="email"
placeholder="이메일"
className="mt-3"
className="mt-3 w-[420px] xs:w-[300px] sm:w-[300px]"
{...register('email', {
required: '이메일은 필수 입력입니다.',
})}
Expand All @@ -115,7 +115,7 @@ export function CertifyApplySection() {
{errors.email?.message && <small className=" text-[13px] text-red-600">{errors.email.message}</small>}

<textarea
className=" mt-5 flex h-24 min-h-[46px] w-full rounded-md border border-black bg-background px-[20px] py-[16px] text-sm font-semibold ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-gray-400 focus:border focus:border-primary focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
className="mt-5 flex h-24 min-h-[46px] w-[420px] rounded-md border border-gray-500 bg-background px-[20px] py-[16px] text-sm font-semibold ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-gray-400 focus:border focus:border-primary focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 xs:w-[300px] sm:w-[300px]"
placeholder="문의내용"
{...register('inquiry', {
required: '문의내용는 필수 입력입니다.',
Expand All @@ -130,7 +130,7 @@ export function CertifyApplySection() {
disabled={isSubmitting || isButtonDisabled}
variant="default"
size="default"
className={`mt-4 w-[420px] ${isSubmitting || isButtonDisabled ? 'bg-gray-400' : ''}`}
className={`xs: mt-4 w-[420px] xs:w-[300px] sm:w-[300px] ${isSubmitting || isButtonDisabled ? 'bg-gray-400' : ''}`}
>
문의 보내기
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/general/containers/GeneralRegisterSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export function GeneralRegisterSection({ subSection1, buttonSection }: LoginForm
};

const handleCertifyError = () => {
navigate('//register/errorapply');
navigate('/register/errorapply');
};

return (
Expand Down
1 change: 0 additions & 1 deletion src/pages/general/containers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export const faculties = [
'공과대학',
'IT대학',
'융합특성화자유전공학부',
'차세대반도체학과',
];

export const departments: DepartmentMap = {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/kakao/containers/RegisterButtonSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function RegisterButtonSection() {
}}
>
<div className="flex flex-col items-center text-center">
<h1 className="mb-[-10px] text-xs font-normal">제64대 숭실대학교 총학생회</h1>
<h1 className="mb-[-10px] text-xs font-normal">제64대 총학생회</h1>
<h1 className="text-[56px] font-bold">US:SUM</h1>
<div onClick={handleLogin}>
<KakaoButton />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/kakao/containers/RegisterTextSection.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export function RegisterTextSection() {
return (
<div
className="text-[600px] text-white "
className="register_text text-[600px] text-white "
style={{
transform: 'rotate(-12.416deg)',
WebkitTextStrokeWidth: '1px',
Expand Down
18 changes: 18 additions & 0 deletions src/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,21 @@ body {
font-size: 1.5rem;
}
}

@media screen and (max-height: 838px) {
.register_text {
font-size: 450px;
}
}

@media screen and (max-height: 720px) {
.register_text {
font-size: 380px;
}
}

@media screen and (max-height: 620px) {
.register_text {
font-size: 290px;
}
}

0 comments on commit c9983f1

Please sign in to comment.