From 256f271711d73cf7ed6f6c2e291f1a326e138269 Mon Sep 17 00:00:00 2001 From: AryaArunB Date: Thu, 14 Apr 2022 17:03:57 +0530 Subject: [PATCH 1/3] added copyrights to the signin page --- src/components/SignIn/SignIn.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/SignIn/SignIn.jsx b/src/components/SignIn/SignIn.jsx index a501c78b..608f6f32 100644 --- a/src/components/SignIn/SignIn.jsx +++ b/src/components/SignIn/SignIn.jsx @@ -150,10 +150,17 @@ export class SignIn extends Component { Signup +
+ © 2018 - {new Date().getFullYear()} Boston Children's Hospital, Red + Hat, Massachusetts Open Cloud, Boston University. All rights reserved. +

+ + + ); From 6fdb4ff46b360d950b4073997f82a42c4691f480 Mon Sep 17 00:00:00 2001 From: AryaArunB Date: Thu, 14 Apr 2022 20:14:04 +0530 Subject: [PATCH 2/3] Changes the color of copyright text to white Signed-off-by: AryaArunB --- src/components/SignIn/SignIn.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SignIn/SignIn.jsx b/src/components/SignIn/SignIn.jsx index 608f6f32..8e118a80 100644 --- a/src/components/SignIn/SignIn.jsx +++ b/src/components/SignIn/SignIn.jsx @@ -150,7 +150,7 @@ export class SignIn extends Component { Signup -
+
© 2018 - {new Date().getFullYear()} Boston Children's Hospital, Red Hat, Massachusetts Open Cloud, Boston University. All rights reserved.
From 0a1ec43c1aa588eb14f185fc4bd490c2ca685706 Mon Sep 17 00:00:00 2001 From: AryaArunB Date: Thu, 21 Apr 2022 11:26:51 +0530 Subject: [PATCH 3/3] fixed the issues pointed out Signed-off-by: AryaArunB --- src/components/SignIn/SignIn.css | 12 +++++++ src/components/SignIn/SignIn.jsx | 58 ++++++++++++-------------------- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/src/components/SignIn/SignIn.css b/src/components/SignIn/SignIn.css index e38a23ac..b4d25b46 100644 --- a/src/components/SignIn/SignIn.css +++ b/src/components/SignIn/SignIn.css @@ -59,4 +59,16 @@ width: 500px; margin: 0 auto; } +} + +.footer-copyrights { + /* position */ + position: absolute; + bottom: 2em; + left: 0; + right: 0; + + /* font */ + text-align: center; + font-size: 0.8em; } \ No newline at end of file diff --git a/src/components/SignIn/SignIn.jsx b/src/components/SignIn/SignIn.jsx index 8e118a80..86c60b2b 100644 --- a/src/components/SignIn/SignIn.jsx +++ b/src/components/SignIn/SignIn.jsx @@ -60,10 +60,8 @@ export class SignIn extends Component { store.set('authToken')(token); this.setState({ loading: false }); - if (location.state && location.state.from) - history.replace(location.state.from); - else - history.push('/dashboard'); + if (location.state && location.state.from) history.replace(location.state.from); + else history.push('/dashboard'); } catch (error) { this.showError('Invalid username or password'); this.setState({ loading: false }); @@ -78,37 +76,26 @@ export class SignIn extends Component { hideError() { this.setState({ error: null }); } + render() { - const { - error, username, password, loading, - } = this.state; + const { error, username, password, loading } = this.state; return (
- { - error && ( -
- } - /> -
- ) - } -
- - + } /> +
+ )} +
+ +
@@ -146,21 +133,18 @@ export class SignIn extends Component { Log In

- Need an account? {' '} + Need an account?{' '} Signup -

- © 2018 - {new Date().getFullYear()} Boston Children's Hospital, Red - Hat, Massachusetts Open Cloud, Boston University. All rights reserved. -

- -
- +
+ © 2018 - {new Date().getFullYear()} Boston Children's Hospital, Red Hat, + Massachusetts Open Cloud, Boston University. All rights reserved. +
);