Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/client/App/Home/MentorCard/MentorCard.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.mentor-card {
border-bottom: 1px solid #ddd;
border-bottom: 2px solid #57068C;
border-right: 2px solid #57068C;
border-left: 2px solid #57068C;
}

.mentor-info {
Expand All @@ -10,7 +12,7 @@

.mentor-info h2 {
margin: 0;
padding-bottom: .5rem;
padding-bottom: 1rem;
}

.mentor-info ul {
Expand Down
2 changes: 1 addition & 1 deletion src/client/App/Login/Login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function ({ login }) {

return (
<form onSubmit={handleSubmit}>
<h1>Mentorship Network</h1>
<h1>Manage.Mentorship</h1>
<span className="error">{error}</span>
<br/>
<input type="text" placeholder="Username" onChange={handleUsername} />
Expand Down
14 changes: 13 additions & 1 deletion src/client/App/Navbar/Navbar.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.navbar {
border-bottom: 1px solid #ddd;
border-bottom: 4px solid #57068C;
padding: 0 2rem;
}

Expand All @@ -14,11 +14,19 @@
}

.logo > h1 {
padding-top: 0.5rem;
display: inline-block;
margin: 1rem 2rem;
vertical-align: top;
}

.logo > h2 {
display: inline-block;
margin: 1rem 1rem;
vertical-align: bottom;
color: grey;
}

.navbar > span {
display: inline-block;
float: right;
Expand All @@ -28,3 +36,7 @@
.navbar > span > button {
margin-left: 1rem;
}

/* h1 { color: #111; font-family: 'Helvetica Neue', sans-serif; font-weight: bold; letter-spacing: -1px; line-height: 1; }

h2 { color: #111; font-family: 'Open Sans', sans-serif; font-weight: 300; line-height: 32px; margin: 0 0 72px;} */
5 changes: 3 additions & 2 deletions src/client/App/Navbar/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ export default function ({ username, logout }) {
return (
<div className="navbar">
<div className="logo">
<img src="client/static/nyuad-logo.png" alt=""/>
<h1>Mentorship Network</h1>
<img src="client/static/logo.png" alt=""/>
<h1>Manage.Mentorship</h1>
<h2>a modern web-app for a busy board</h2>
</div>
<span>
{username ? username : ""}
Expand Down
Binary file added src/client/static/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/db/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ def verify_session(cls, username, token):
user = cls.get(username)
if user is None:
return False
if user["session"] is None:
return False
if user["session"]["expires_at"] < time.time():
return False

Expand Down