Skip to content

Commit

Permalink
expiration message fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Gemma committed Nov 29, 2023
1 parent 04cb2a3 commit 542fd6a
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/NavBar/Navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@

.ls-login-image2 {
width: 15px !important;
margin-top: 14px !important;
margin-top: 23px !important;
margin-bottom: 21px !important;
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/SignIn/SignInFormNoLS.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function SignInFormNoLS() {
<div className="login">
<div className="appAside" />
<div className="appForm">
{expirationMessage != '' && <h3>{expirationMessage}</h3>}
{expirationMessage !== '' && <h3>{expirationMessage}</h3>}
<div className="pageSwitcher">
<NavLink

Expand Down
95 changes: 47 additions & 48 deletions frontend/src/components/SignInOptions/SignInOptions.css
Original file line number Diff line number Diff line change
@@ -1,76 +1,75 @@
.signInContainer {
width: 100vw;
display: flex;
flex-wrap: nowrap;
align-content: center;
justify-content: center;
align-items: center;
}

.optionsContainer {
width: 100vw;
display: flex;
flex-wrap: nowrap;
align-content: center;
justify-content: center;
align-items: center;
}
.optionsContainer {
width: 388px;
border-radius: 1px;
border-radius: 8px;
background: #f9f9f9;
height: 43vh;
border: 1px solid #ede8e8;
border: 2px solid #dbe6ee;
margin-top: 19vh;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
}

.lsContainer{
}
.lsContainer {
width: 100%;
height: 50%;
display: flex;
justify-content: center;
align-items: center;
}

.ls-login-image{
}
.ls-login-image {
width: 160px;
}

.noLsContainer{
}
.noLsContainer {
width: 100%;
height: 50%;
display: flex;
justify-content: center;
align-items: center;
border-top: 1px solid #e8e8e8;
}

.Sign-in{
border-top: 1px solid #f0f0f0;
}
.Sign-in {
text-decoration: none;
}

h6{
}
h6 {
font-size: 15px !important;
font-weight: 500;
color: #3d72a6;
}


h6:hover{
}

h6:hover {
font-size: 15px !important;
font-weight: 600;
}

@media (max-width: 860px) {
}
@media (max-width: 860px) {
.optionsContainer {
width: 60vw;
border-radius: 1px;
background: #f9f9f9;
height: 43vh;
border: 1px solid #ede8e8;
margin-top: 19vh;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
width: 60vw;
border-radius: 8px;
background: #f9f9f9;
height: 43vh;
border: 2px solid #dbe6ee;
margin-top: 19vh;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
}

.ls-login-image {
width: 140px;
width: 140px;
}

h6{
font-size: 13px !important;
width: 51vw;
h6 {
font-size: 13px !important;
width: 51vw;
}
}
}
1 change: 1 addition & 0 deletions frontend/src/components/context/AuthContext.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ function AuthProviderWrapper (props) {
const logOutUser = () => {
removeToken()
setIsLoggedIn(false)
setExpirationMessage('')
navigate('/')
}

Expand Down

0 comments on commit 542fd6a

Please sign in to comment.