SimCompanies/dashboard
2
1
Fork 0
Code Issues 17 Pull Requests Releases Activity

fixed var names

Browse Source
This commit is contained in:
Hawk
2020-04-30 22:34:47 +02:00
parent 5bf47622ef
commit 38b7a903d6
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/components/login/createAccount.js
View File

@@ -67,7 +67,7 @@ export default function CreateAccount() {
const [login, setLogin] = React.useState(true); const [login, setLogin] = React.useState(true);
const [status, setStatus] = React.useState(null); const [status, setStatus] = React.useState(null);
const [statusText, setStatusText] = 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 putCreateAccount = async (url, data) => {
const response = await fetch(url, { const response = await fetch(url, {
@@ -86,12 +86,12 @@ export default function CreateAccount() {
if (response.status == "200") { if (response.status == "200") {
setLogin(false) setLogin(false)
} }
setButton(false) setDisabled(false)
setTimeout(() => { setStatus(null) }, 5000) setTimeout(() => { setStatus(null) }, 5000)
} }
const handleClick = (e) => { const handleClick = (e) => {
if (username !== "" && password !== "") { if (username !== "" && password !== "") {
setButton(true) setDisabled(true)
putCreateAccount(url, { email: username, password: password }) putCreateAccount(url, { email: username, password: password })
setUsername("") setUsername("")
@@ -102,7 +102,7 @@ export default function CreateAccount() {
const handleKeyDown = (e) => { const handleKeyDown = (e) => {
if (e.key === "Enter") { if (e.key === "Enter") {
if (username !== "" && password !== "") { if (username !== "" && password !== "") {
setButton(true) setDisabled(true)
putCreateAccount(url, { email: username, password: password }) putCreateAccount(url, { email: username, password: password })
setUsername("") setUsername("")
@@ -146,7 +146,7 @@ export default function CreateAccount() {
value={username} value={username}
className={classes.input} className={classes.input}
onKeyDown={handleKeyDown} onKeyDown={handleKeyDown}
disabled={button} disabled={disabled}
/> />
</Box > </Box >
</Grid> </Grid>
@@ -163,13 +163,13 @@ export default function CreateAccount() {
onChange={handleChangePW} onChange={handleChangePW}
className={classes.input} className={classes.input}
onKeyDown={handleKeyDown} onKeyDown={handleKeyDown}
disabled={button} disabled={disabled}
/> />
</Box > </Box >
</Grid> </Grid>
<Grid item xs={12}> <Grid item xs={12}>
<Box display="flex" justifyContent="center" > <Box display="flex" justifyContent="center" >
<Button disabled={button} variant="contained" color="secondary" onClick={handleClick} > <Button disabled={disabled} variant="contained" color="secondary" onClick={handleClick} >
Create Account Create Account
</Button> </Button>
</Box > </Box >

17
frontend/src/components/login/login.js
View File

@@ -68,7 +68,7 @@ export default function Login() {
const [password, setPassword] = React.useState(""); const [password, setPassword] = React.useState("");
const [login, setLogin] = React.useState(true); const [login, setLogin] = React.useState(true);
const [status, setStatus] = React.useState(null); 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 [statusText, setStatusText] = React.useState(null);
const postLogin = async (url, data) => { const postLogin = async (url, data) => {
@@ -85,18 +85,19 @@ export default function Login() {
body: JSON.stringify(data) body: JSON.stringify(data)
}); });
setStatus(response.status) setStatus(response.status)
setStatusText(response.statusText) console.log(response.body.text)
setStatusText("test")
if (response.status == "200") { if (response.status == "200") {
setLogin(false) setLogin(false)
} }
setButton(false) setDisabled(false)
setTimeout(() => { setStatus(null) }, 5000) setTimeout(() => { setStatus(null) }, 5000)
} }
const handleClick = (e) => { const handleClick = (e) => {
if (username !== "" && password !== "") { if (username !== "" && password !== "") {
setButton(true) setDisabled(true)
postLogin(url, { email: username, password: password }) postLogin(url, { email: username, password: password })
setUsername("") setUsername("")
@@ -107,7 +108,7 @@ export default function Login() {
const handleKeyDown = (e) => { const handleKeyDown = (e) => {
if (e.key === "Enter") { if (e.key === "Enter") {
if (username !== "" && password !== "") { if (username !== "" && password !== "") {
setButton(true) setDisabled(true)
postLogin(url, { email: username, password: password }) postLogin(url, { email: username, password: password })
setUsername("") setUsername("")
@@ -154,7 +155,7 @@ export default function Login() {
onChange={handleChangeUSR} onChange={handleChangeUSR}
className={classes.input} className={classes.input}
onKeyDown={handleKeyDown} onKeyDown={handleKeyDown}
disabled={button} disabled={disabled}
/> />
</Box > </Box >
</Grid> </Grid>
@@ -171,7 +172,7 @@ export default function Login() {
onChange={handleChangePW} onChange={handleChangePW}
className={classes.input} className={classes.input}
onKeyDown={handleKeyDown} onKeyDown={handleKeyDown}
disabled={button} disabled={disabled}
/> />
</Box > </Box >
</Grid> </Grid>
@@ -186,7 +187,7 @@ export default function Login() {
</Grid> </Grid>
<Grid item xs={12}> <Grid item xs={12}>
<Box display="flex" justifyContent="center" > <Box display="flex" justifyContent="center" >
<Button disabled={button} variant="contained" color="secondary" onClick={handleClick}> <Button disabled={disabled} variant="contained" color="secondary" onClick={handleClick}>
Login Login
</Button> </Button>
</Box > </Box >