diff --git a/frontend/src/components/login/createAccount.js b/frontend/src/components/login/createAccount.js index 535b093..08af8ed 100644 --- a/frontend/src/components/login/createAccount.js +++ b/frontend/src/components/login/createAccount.js @@ -67,7 +67,7 @@ export default function CreateAccount() { const [login, setLogin] = React.useState(true); const [status, setStatus] = React.useState(null); const [statusText, setStatusText] = React.useState(null); - const [button, setButton] = React.useState(false); + const [disabled, setDisabled] = React.useState(false); const putCreateAccount = async (url, data) => { const response = await fetch(url, { @@ -86,12 +86,12 @@ export default function CreateAccount() { if (response.status == "200") { setLogin(false) } - setButton(false) + setDisabled(false) setTimeout(() => { setStatus(null) }, 5000) } const handleClick = (e) => { if (username !== "" && password !== "") { - setButton(true) + setDisabled(true) putCreateAccount(url, { email: username, password: password }) setUsername("") @@ -102,7 +102,7 @@ export default function CreateAccount() { const handleKeyDown = (e) => { if (e.key === "Enter") { if (username !== "" && password !== "") { - setButton(true) + setDisabled(true) putCreateAccount(url, { email: username, password: password }) setUsername("") @@ -146,7 +146,7 @@ export default function CreateAccount() { value={username} className={classes.input} onKeyDown={handleKeyDown} - disabled={button} + disabled={disabled} /> @@ -163,13 +163,13 @@ export default function CreateAccount() { onChange={handleChangePW} className={classes.input} onKeyDown={handleKeyDown} - disabled={button} + disabled={disabled} /> - diff --git a/frontend/src/components/login/login.js b/frontend/src/components/login/login.js index 2981f38..54ddacf 100644 --- a/frontend/src/components/login/login.js +++ b/frontend/src/components/login/login.js @@ -68,7 +68,7 @@ export default function Login() { const [password, setPassword] = React.useState(""); const [login, setLogin] = React.useState(true); const [status, setStatus] = React.useState(null); - const [button, setButton] = React.useState(false); + const [disabled, setDisabled] = React.useState(false); const [statusText, setStatusText] = React.useState(null); const postLogin = async (url, data) => { @@ -85,18 +85,19 @@ export default function Login() { body: JSON.stringify(data) }); setStatus(response.status) - setStatusText(response.statusText) + console.log(response.body.text) + setStatusText("test") if (response.status == "200") { setLogin(false) } - setButton(false) + setDisabled(false) setTimeout(() => { setStatus(null) }, 5000) } const handleClick = (e) => { if (username !== "" && password !== "") { - setButton(true) + setDisabled(true) postLogin(url, { email: username, password: password }) setUsername("") @@ -107,7 +108,7 @@ export default function Login() { const handleKeyDown = (e) => { if (e.key === "Enter") { if (username !== "" && password !== "") { - setButton(true) + setDisabled(true) postLogin(url, { email: username, password: password }) setUsername("") @@ -154,7 +155,7 @@ export default function Login() { onChange={handleChangeUSR} className={classes.input} onKeyDown={handleKeyDown} - disabled={button} + disabled={disabled} /> @@ -171,7 +172,7 @@ export default function Login() { onChange={handleChangePW} className={classes.input} onKeyDown={handleKeyDown} - disabled={button} + disabled={disabled} /> @@ -186,7 +187,7 @@ export default function Login() { -