From cb27a0946fb64af7dc172c2afe07fcd9b31f0d65 Mon Sep 17 00:00:00 2001 From: Hawk Date: Thu, 30 Apr 2020 23:01:01 +0200 Subject: [PATCH] edited labels --- backend/package.json | 2 +- frontend/src/components/login/createAccount.js | 7 ++++--- frontend/src/components/login/login.js | 10 ++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/backend/package.json b/backend/package.json index 536bbf7..6fd2b7a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -27,4 +27,4 @@ "devDependencies": { "cross-env": "^7.0.2" } -} \ No newline at end of file +} diff --git a/frontend/src/components/login/createAccount.js b/frontend/src/components/login/createAccount.js index 08af8ed..3f3ed5f 100644 --- a/frontend/src/components/login/createAccount.js +++ b/frontend/src/components/login/createAccount.js @@ -81,13 +81,14 @@ export default function CreateAccount() { referrerPolicy: 'no-referrer', body: JSON.stringify(data) }); + const text = await response.text() + await setStatusText(text) setStatus(response.status) - setStatusText(response.statusText) if (response.status == "200") { - setLogin(false) + setTimeout(() => { setLogin(false) }, 2000) } setDisabled(false) - setTimeout(() => { setStatus(null) }, 5000) + setTimeout(() => { setStatus(null) }, 2000) } const handleClick = (e) => { if (username !== "" && password !== "") { diff --git a/frontend/src/components/login/login.js b/frontend/src/components/login/login.js index 54ddacf..6afb83e 100644 --- a/frontend/src/components/login/login.js +++ b/frontend/src/components/login/login.js @@ -84,14 +84,16 @@ export default function Login() { referrerPolicy: 'no-referrer', body: JSON.stringify(data) }); + + const text = await response.text() + await setStatusText(text) setStatus(response.status) - console.log(response.body.text) - setStatusText("test") if (response.status == "200") { - setLogin(false) + setTimeout(() => { setLogin(false) }, 2000) + } setDisabled(false) - setTimeout(() => { setStatus(null) }, 5000) + setTimeout(() => { setStatus(null) }, 2000) } const handleClick = (e) => {