Skip to content
Snippets Groups Projects
Commit 6a07d843 authored by DongJae Oh's avatar DongJae Oh
Browse files

Merge branch 'style' into 'main'

feat: disable 로직 추가, 스타일 추가

See merge request !20
parents 8eee8e64 55f391b9
No related branches found
No related tags found
1 merge request!20feat: disable 로직 추가, 스타일 추가
import React, { useState } from "react"; import React, { useState } from "react";
function EmailButton({onClick,text,email,setWarningMessage,setViewable,disableValue,}) function EmailButton({
{ onClick,
text,
email,
setWarningMessage,
setViewable,
disableValue,
setDisableValue,
}) {
const [verifyNum, setVerifyNum] = useState(""); const [verifyNum, setVerifyNum] = useState("");
const [verificationComplete, setVerificationComplete] = useState(false); const [verificationComplete, setVerificationComplete] = useState(false);
const [verifyText, setVerifyText] = useState(""); const [verifyText, setVerifyText] = useState("");
const onValueChange = (e) => { const onValueChange = (e) => {
setWarningMessage(``); setWarningMessage(``);
...@@ -31,6 +38,7 @@ function EmailButton({onClick,text,email,setWarningMessage,setViewable,disableVa ...@@ -31,6 +38,7 @@ function EmailButton({onClick,text,email,setWarningMessage,setViewable,disableVa
if (response.ok) { if (response.ok) {
setVerificationComplete(true); setVerificationComplete(true);
setDisableValue(true);
setVerifyText("인증 완료"); setVerifyText("인증 완료");
setViewable(""); setViewable("");
} else { } else {
...@@ -43,28 +51,25 @@ function EmailButton({onClick,text,email,setWarningMessage,setViewable,disableVa ...@@ -43,28 +51,25 @@ function EmailButton({onClick,text,email,setWarningMessage,setViewable,disableVa
}; };
return ( return (
<div className="email-verification-div">
<div className="email-verification-container">
<button <button
type="button" type="button"
className="email-button" className={disableValue ? "email-button disabled-button" : "email-button"}
onClick={onClick} onClick={onClick}
disabled={disableValue} disabled={disableValue}
> >
{text} {text}
</button> </button>
<input <input
type="text" type="text"
value={verifyNum} value={verifyNum}
onChange={onValueChange} onChange={onValueChange}
placeholder="인증번호" placeholder="Verification Number"
className="email-verification-input" className="email-verification-input"
/> />
<input <input
type="button" type="button"
className="email-check-button" className={verificationComplete ? "email-check-button disabled-button" : "email-check-button"}
onClick={handleCheckboxClick} onClick={handleCheckboxClick}
value={verifyText} value={verifyText}
disabled={verificationComplete} disabled={verificationComplete}
......
...@@ -13,6 +13,7 @@ function CommonForm({ onSubmit, buttonText, fields, showVerificationButton, setW ...@@ -13,6 +13,7 @@ function CommonForm({ onSubmit, buttonText, fields, showVerificationButton, setW
const emailVerificationSend = async () => { const emailVerificationSend = async () => {
setWarningMessage(``); setWarningMessage(``);
setEmailMessage("전송 중"); setEmailMessage("전송 중");
setDisableValue(true);
try { try {
const response = await fetch("http://localhost:8080/api/auth/mail", { const response = await fetch("http://localhost:8080/api/auth/mail", {
method: "POST", method: "POST",
...@@ -26,14 +27,17 @@ function CommonForm({ onSubmit, buttonText, fields, showVerificationButton, setW ...@@ -26,14 +27,17 @@ function CommonForm({ onSubmit, buttonText, fields, showVerificationButton, setW
if (response.ok) { if (response.ok) {
setEmailMessage("재전송"); setEmailMessage("재전송");
setDisableValue(false);
} else { } else {
const errorResponse = await response.json(); const errorResponse = await response.json();
setWarningMessage(errorResponse.error); setWarningMessage(errorResponse.error);
setEmailMessage("전송"); setEmailMessage("전송");
setDisableValue(false);
} }
} catch (error) { } catch (error) {
setWarningMessage(`${error.response.data.error}`); setWarningMessage(`${error.response.data.error}`);
setEmailMessage("전송"); setEmailMessage("전송");
setDisableValue(false);
} }
} }
...@@ -64,6 +68,7 @@ function CommonForm({ onSubmit, buttonText, fields, showVerificationButton, setW ...@@ -64,6 +68,7 @@ function CommonForm({ onSubmit, buttonText, fields, showVerificationButton, setW
viewable={viewable} viewable={viewable}
setViewable={setViewable} setViewable={setViewable}
disableValue={disableValue} disableValue={disableValue}
setDisableValue={setDisableValue}
/> />
)} )}
</div> </div>
......
...@@ -54,6 +54,7 @@ function FindForm({ onSubmit, buttonText, fields, showVerificationButton, setWar ...@@ -54,6 +54,7 @@ function FindForm({ onSubmit, buttonText, fields, showVerificationButton, setWar
if (response.ok) { if (response.ok) {
setEmailMessage("재전송"); setEmailMessage("재전송");
setDisableValue(false);
} else { } else {
const errorResponse = await response.json(); const errorResponse = await response.json();
setWarningMessage(errorResponse.error); setWarningMessage(errorResponse.error);
...@@ -100,6 +101,7 @@ function FindForm({ onSubmit, buttonText, fields, showVerificationButton, setWar ...@@ -100,6 +101,7 @@ function FindForm({ onSubmit, buttonText, fields, showVerificationButton, setWar
viewable={viewable} viewable={viewable}
setViewable={setViewable} setViewable={setViewable}
disableValue={disableValue} disableValue={disableValue}
setDisableValue={setDisableValue}
/> />
)} )}
</div> </div>
......
...@@ -164,3 +164,8 @@ ...@@ -164,3 +164,8 @@
.text-separator { .text-separator {
margin: 0 5px; margin: 0 5px;
} }
.disabled-button:hover {
background-color: initial;
cursor: default;
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment