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

edited status text

Browse Source
This commit is contained in:
Hawk
2020-04-30 22:06:08 +02:00
parent 4848b32b1a
commit c964dfdb86
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,7 @@ export default function CreateAccount() {
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 [statusText, setStatusText] = React.useState(null);
const [button, setButton] = React.useState(false); const [button, setButton] = React.useState(false);
const putCreateAccount = async (url, data) => { const putCreateAccount = async (url, data) => {
@@ -81,6 +82,7 @@ export default function CreateAccount() {
body: JSON.stringify(data) body: JSON.stringify(data)
}); });
setStatus(response.status) setStatus(response.status)
setStatusText(response.statusText)
if (response.status == "200") { if (response.status == "200") {
setLogin(false) setLogin(false)
} }
@@ -98,7 +100,7 @@ export default function CreateAccount() {
} }
const handleKeyDown = (e) => { const handleKeyDown = (e) => {
if (e.keyCode == 13) { if (e.key === "Enter") {
if (username !== "" && password !== "") { if (username !== "" && password !== "") {
setButton(true) setButton(true)
putCreateAccount(url, { email: username, password: password }) putCreateAccount(url, { email: username, password: password })
@@ -177,7 +179,7 @@ export default function CreateAccount() {
</form> </form>
</CardContent> </CardContent>
</Card> </Card>
<LoginFeedback login={status} successText="Account created successfully" errorText="Oops something went wrong"></LoginFeedback> <LoginFeedback login={status} text={statusText}></LoginFeedback>
</Box > : <Redirect to={"/login"} /> </Box > : <Redirect to={"/login"} />
) )

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

@@ -69,6 +69,7 @@ export default function Login() {
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 [button, setButton] = React.useState(false);
const [statusText, setStatusText] = React.useState(null);
const postLogin = async (url, data) => { const postLogin = async (url, data) => {
@@ -84,6 +85,7 @@ export default function Login() {
body: JSON.stringify(data) body: JSON.stringify(data)
}); });
setStatus(response.status) setStatus(response.status)
setStatusText(response.statusText)
if (response.status == "200") { if (response.status == "200") {
setLogin(false) setLogin(false)
} }
@@ -103,7 +105,7 @@ export default function Login() {
} }
const handleKeyDown = (e) => { const handleKeyDown = (e) => {
if (e.keyCode == 13) { if (e.key === "Enter") {
if (username !== "" && password !== "") { if (username !== "" && password !== "") {
setButton(true) setButton(true)
postLogin(url, { email: username, password: password }) postLogin(url, { email: username, password: password })
@@ -194,7 +196,7 @@ export default function Login() {
</form> </form>
</CardContent> </CardContent>
</Card> </Card>
<LoginFeedback login={status} successText="Login Successful" errorText="Wrong Username or Password"></LoginFeedback> <LoginFeedback login={status} text={statusText}></LoginFeedback>
</Box > : <Redirect to='/' /> </Box > : <Redirect to='/' />
) )

4
frontend/src/components/login/loginfeedback.js
View File

@@ -35,14 +35,14 @@ export default function LoginFeedback(props) {
setOutput( setOutput(
<Snackbar open={open} autoHideDuration={2000} onClose={handleClose}> <Snackbar open={open} autoHideDuration={2000} onClose={handleClose}>
<Alert onClose={handleClose} severity="success"> <Alert onClose={handleClose} severity="success">
{props.successText} {props.text}
</Alert> </Alert>
</Snackbar>) </Snackbar>)
} else if (login != null) { } else if (login != null) {
setOutput( setOutput(
<Snackbar open={open1} autoHideDuration={3000} onClose={handleClose1}> <Snackbar open={open1} autoHideDuration={3000} onClose={handleClose1}>
<Alert onClose={handleClose1} severity="error"> <Alert onClose={handleClose1} severity="error">
{props.errorText} {props.text}
</Alert> </Alert>
</Snackbar> </Snackbar>
) )