diff --git a/frontend/src/components/login/createAccount.js b/frontend/src/components/login/createAccount.js
index f1d4c5d..c20e9cb 100644
--- a/frontend/src/components/login/createAccount.js
+++ b/frontend/src/components/login/createAccount.js
@@ -34,7 +34,7 @@ const useStyles = makeStyles(theme => ({
const CssTextField = withStyles({
root: {
'& label.Mui-focused': {
- color: 'white',
+ color: '#FFC800',
},
'&:hover label': {
color: '#FFC800',
@@ -54,7 +54,7 @@ const CssTextField = withStyles({
borderColor: "#FFC800",
},
'&.Mui-focused fieldset': {
- borderColor: 'white',
+ borderColor: '#FFC800',
},
},
},
@@ -83,9 +83,9 @@ export default function CreateAccount() {
if (response.status == "200") {
setLogin(false)
}
+ setTimeout(() => { setStatus(null) }, 5000)
}
const handleClick = (e) => {
-
if (username !== "" && password !== "") {
putCreateAccount(url, { email: username, password: password })
@@ -93,6 +93,17 @@ export default function CreateAccount() {
setPassword("")
}
}
+
+ const handleKeyDown = (e) => {
+ if (e.keyCode == 13) {
+ if (username !== "" && password !== "") {
+ putCreateAccount(url, { email: username, password: password })
+
+ setUsername("")
+ setPassword("")
+ }
+ }
+ }
const handleChangeUSR = (e) => {
setUsername(e.target.value)
}
@@ -121,18 +132,21 @@ export default function CreateAccount() {
-
diff --git a/frontend/src/components/login/login.js b/frontend/src/components/login/login.js
index 10ba5ca..e34ab7a 100644
--- a/frontend/src/components/login/login.js
+++ b/frontend/src/components/login/login.js
@@ -70,6 +70,7 @@ export default function Login() {
const [status, setStatus] = React.useState(null);
const postLogin = async (url, data) => {
+
const response = await fetch(url, {
method: 'POST',
mode: 'cors',
@@ -85,6 +86,8 @@ export default function Login() {
if (response.status == "200") {
setLogin(false)
}
+
+ setTimeout(() => { setStatus(null) }, 5000)
}
const handleClick = (e) => {
@@ -96,6 +99,18 @@ export default function Login() {
setPassword("")
}
}
+
+ const handleKeyDown = (e) => {
+ if (e.keyCode == 13) {
+ if (username !== "" && password !== "") {
+ postLogin(url, { email: username, password: password })
+
+ setUsername("")
+ setPassword("")
+ }
+ }
+ }
+
const handleChangeUSR = (e) => {
setUsername(e.target.value)
}
@@ -126,18 +141,21 @@ export default function Login() {
diff --git a/frontend/src/components/login/loginfeedback.js b/frontend/src/components/login/loginfeedback.js
index 3ac61d4..2cd55b3 100644
--- a/frontend/src/components/login/loginfeedback.js
+++ b/frontend/src/components/login/loginfeedback.js
@@ -10,12 +10,20 @@ export default function LoginFeedback(props) {
const [login, setLogin] = React.useState(null);
const [open, setOpen] = React.useState(true);
const [open1, setOpen1] = React.useState(true);
+ const [output, setOutput] = React.useState(null);
+ const [change, setChange] = React.useState(false);
+
useEffect(() => {
if (login != props.login) {
+ setChange(true)
+ setOpen(true)
+ setOpen1(true)
setLogin(props.login)
}
}, [login, setLogin, props.login]);
+
const handleClose = (event, reason) => {
+
setOpen(false);
};
const handleClose1 = (event, reason) => {
@@ -24,26 +32,33 @@ export default function LoginFeedback(props) {
const snack = (login) => {
if (login == "200") {
- return (
+ setOutput(
{props.successText}
)
} else if (login != null) {
- return (
+ setOutput(
{props.errorText}
)
+ } else {
+ setOutput(null)
}
+ setChange(false)
+ }
+
+ if (change == true) {
+ snack(login)
}
return (
- {snack(login)}
+ {output}
)