diff --git a/src/client/App/Home/MentorCard/MentorCard.css b/src/client/App/Home/MentorCard/MentorCard.css index 1c74ee5..acd6e42 100644 --- a/src/client/App/Home/MentorCard/MentorCard.css +++ b/src/client/App/Home/MentorCard/MentorCard.css @@ -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 { @@ -10,7 +12,7 @@ .mentor-info h2 { margin: 0; - padding-bottom: .5rem; + padding-bottom: 1rem; } .mentor-info ul { diff --git a/src/client/App/Login/Login.jsx b/src/client/App/Login/Login.jsx index 7eb0c7a..fe83b54 100644 --- a/src/client/App/Login/Login.jsx +++ b/src/client/App/Login/Login.jsx @@ -46,7 +46,7 @@ export default function ({ login }) { return (
-

Mentorship Network

+

Manage.Mentorship

{error}
diff --git a/src/client/App/Navbar/Navbar.css b/src/client/App/Navbar/Navbar.css index 48a195c..5486ca8 100644 --- a/src/client/App/Navbar/Navbar.css +++ b/src/client/App/Navbar/Navbar.css @@ -1,5 +1,5 @@ .navbar { - border-bottom: 1px solid #ddd; + border-bottom: 4px solid #57068C; padding: 0 2rem; } @@ -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; @@ -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;} */ diff --git a/src/client/App/Navbar/Navbar.jsx b/src/client/App/Navbar/Navbar.jsx index d618c35..221d3e9 100644 --- a/src/client/App/Navbar/Navbar.jsx +++ b/src/client/App/Navbar/Navbar.jsx @@ -21,8 +21,9 @@ export default function ({ username, logout }) { return (
- -

Mentorship Network

+ +

Manage.Mentorship

+

a modern web-app for a busy board

{username ? username : ""} diff --git a/src/client/static/logo.png b/src/client/static/logo.png new file mode 100644 index 0000000..418e2a0 Binary files /dev/null and b/src/client/static/logo.png differ diff --git a/src/db/users.py b/src/db/users.py index 214670f..e06d9cb 100644 --- a/src/db/users.py +++ b/src/db/users.py @@ -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