From 651e709e46e95f6d8a197a6ee19af5028b007edf Mon Sep 17 00:00:00 2001
From: jakobsn <jakob_sn_@hotmail.com>
Date: Tue, 29 Oct 2019 15:30:31 +0100
Subject: [PATCH] Add navbar

---
 .../4a7a69f1d0514a515600940b77084078a78239fd  |  3 ++
 src/app/static/stylesheet.css                 | 39 ++++++++++++++++++-
 src/app/templates/guestbook.html              | 10 +++--
 src/app/templates/index.html                  | 12 ++----
 src/app/templates/login.html                  | 38 +++++++++++-------
 src/app/templates/register.html               |  5 ++-
 src/app/utils.py                              | 15 +++++++
 src/app/views.py                              | 20 +++++++---
 8 files changed, 108 insertions(+), 34 deletions(-)
 create mode 100644 src/app/sessions/4a7a69f1d0514a515600940b77084078a78239fd
 create mode 100644 src/app/utils.py
diff --git a/src/app/sessions/4a7a69f1d0514a515600940b77084078a78239fd b/src/app/sessions/4a7a69f1d0514a515600940b77084078a78239fd
new file mode 100644
index 0000000..71583e4
--- /dev/null
+++ b/src/app/sessions/4a7a69f1d0514a515600940b77084078a78239fd
@@ -0,0 +1,3 @@
+gAN9cQAoWAoAAABzZXNzaW9uX2lkcQFYKAAAADRhN2E2OWYxZDA1MTRhNTE1NjAwOTQwYjc3MDg0
+MDc4YTc4MjM5ZmRxAlgIAAAAdXNlcm5hbWVxA1gBAAAAYXEEWAIAAABpcHEFWAkAAAAxMjcuMC4w
+LjFxBnUu
diff --git a/src/app/static/stylesheet.css b/src/app/static/stylesheet.css
index 4f14609..692858e 100644
--- a/src/app/static/stylesheet.css
+++ b/src/app/static/stylesheet.css
@@ -1,7 +1,8 @@
 body {
     background-color: lightblue;
     display: flex; /* or inline-flex */
-    flex-direction: column
+    flex-direction: column;
+    margin: 0;
 }
 
 h1 {
@@ -10,4 +11,40 @@ h1 {
 
 img {
     margin: auto;
+}
+
+nav {
+    margin-bottom: 10px;
+}
+
+nav li {
+    float: left;
+}
+
+nav li a {
+  display: block;
+  color: white;
+  text-align: center;
+  padding: 20px 16px;
+  text-decoration: none;
+}
+
+nav li a:hover {
+  background-color: lightskyblue;
+}
+
+nav ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: gray;
+}
+
+#title {
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none;
 }
\ No newline at end of file
diff --git a/src/app/templates/guestbook.html b/src/app/templates/guestbook.html
index 4bea4b5..09747d0 100644
--- a/src/app/templates/guestbook.html
+++ b/src/app/templates/guestbook.html
@@ -1,4 +1,4 @@
-$def with (entries, guestbook_form)
+$def with (nav, entries, guestbook_form)
 
 <head>
     <title>Friends</title>
@@ -8,6 +8,9 @@ $def with (entries, guestbook_form)
 </head>
 
 <body>
+
+    $:nav
+
     <h1>Guestbook</h1>
     <ul>
         $for entry in entries:
@@ -23,6 +26,5 @@ $def with (entries, guestbook_form)
             $:guestbook_form.render()
         </form> 
 
-    <br>
-    <a href="/">Home</a>
-</body>
\ No newline at end of file
+    </body>
+    
\ No newline at end of file
diff --git a/src/app/templates/index.html b/src/app/templates/index.html
index b9ff4e5..0a11129 100644
--- a/src/app/templates/index.html
+++ b/src/app/templates/index.html
@@ -1,4 +1,4 @@
-
+$def with (nav)
 <head>
     <title>Beelance2</title>
     <meta charset="utf-8">
@@ -8,16 +8,10 @@
 
 <body>
 
-    <h1>Beelance2</h1>
-
-    <img src="static/honeybee.png" alt="Honeybee">
+    $:nav
     
-    <br>
-    <br>
-    <a href="register"> - Register!</a>
-    <br>
-    <a href="guestbook">- Guestbook</a>
 
+    <img src="static/honeybee.png" alt="Honeybee">
 
 
 </body>
\ No newline at end of file
diff --git a/src/app/templates/login.html b/src/app/templates/login.html
index 2c0b45c..8f369e5 100644
--- a/src/app/templates/login.html
+++ b/src/app/templates/login.html
@@ -1,16 +1,28 @@
-$def with (login_form, friends)
+$def with (nav, login_form, friends)
 
-<h3>Log In</h3>
-<form method="POST">
-    $:login_form.render()
-</form> 
+<head>
+    <title>Beelance2</title>
+    <meta charset="utf-8">
+    <link rel="stylesheet" type="text/css" href="static/stylesheet.css">
 
-$if session.username:
-    <h1>Logged in as $session.username</h1>
-    <a href="logout">Logout</a>
+</head>
 
-    <h3>Registered friends:</h3>
-        <ul>
-            $for user in friends:
-                <li id="user[0]">$user[1]</li>
-        </ul>
\ No newline at end of file
+<body>
+    
+    $:nav
+
+    <h3>Log In</h3>
+    <form method="POST">
+        $:login_form.render()
+    </form> 
+
+    $if session.username:
+        <h1>Logged in as $session.username</h1>
+
+        <h3>Registered friends:</h3>
+            <ul>
+                $for user in friends:
+                    <li id="user[0]">$user[1]</li>
+            </ul>
+
+</body>
\ No newline at end of file
diff --git a/src/app/templates/register.html b/src/app/templates/register.html
index fb01fe2..51644d8 100644
--- a/src/app/templates/register.html
+++ b/src/app/templates/register.html
@@ -1,4 +1,4 @@
-$def with (register_form)
+$def with (nav, register_form)
 
 <head>
     <title>Friends</title>
@@ -8,6 +8,9 @@ $def with (register_form)
 </head>
 
 <body>
+
+    $:nav
+
     <h2>Become a friend!</h2>
     <form method="POST">
         $:register_form.render()
diff --git a/src/app/utils.py b/src/app/utils.py
new file mode 100644
index 0000000..c63adac
--- /dev/null
+++ b/src/app/utils.py
@@ -0,0 +1,15 @@
+
+def get_nav_bar(session):
+    result = '<nav>'
+    result += ' <ul>'
+    result += '    <li><h1 id="title">Beelance2</h1></li>'
+    result += '    <li><a href="/">Home</a></li>'
+    if session.username:
+        result += '    <li><a href="logout">Logout</a></li>'
+    else:
+        result += '    <li><a href="register">Register</a></li>'
+        result += '    <li><a href="login">Login</a></li>'
+    result += '    <li><a href="guestbook">Guestbook</a></li>'
+    result += ' </ul>'
+    result += '</nav>'
+    return result
diff --git a/src/app/views.py b/src/app/views.py
index 021aaa8..7385be7 100644
--- a/src/app/views.py
+++ b/src/app/views.py
@@ -1,6 +1,7 @@
 import web
 from forms import login_form, register_form, guestbook_form
 import model
+from utils import get_nav_bar
 
 # Define application routes
 urls = (
@@ -27,11 +28,14 @@ else:
 # Add session to global variables
 render._add_global(session, 'session')
 
+
 class Index():
     
     # Get main page
     def GET(self):
-        return render.index()
+        nav = get_nav_bar(session)
+        return render.index(nav)
+
 
 class Login():
 
@@ -41,7 +45,8 @@ class Login():
             friends = model.get_users()
         else:
             friends = [[],[]]
-        return render.login(login_form, friends)
+        nav = get_nav_bar(session)
+        return render.login(nav, login_form, friends)
 
     # Log In
     def POST(self):
@@ -54,19 +59,21 @@ class Login():
             session.username = data.username
         else:
             friends = [[],[]]
-        return render.login(login_form, friends)
+        nav = get_nav_bar(session)
+        return render.login(nav, login_form, friends)
 
 
 class Register:
 
     # Get the registration form
     def GET(self):
-        return render.register(register_form)
+        nav = get_nav_bar(session)
+        return render.register(nav, register_form)
 
     # Register new user in database
     def POST(self):
         data = web.input()
-        model.set_user(data.username, data.password)
+        model.set_user(nav, data.username, data.password)
         raise web.seeother('/')
 
 
@@ -75,7 +82,8 @@ class Guestbook:
     # Get guestbook entries
     def GET(self):
         entries = model.get_guestbook_entries()
-        return render.guestbook(entries, guestbook_form)
+        nav = get_nav_bar(session)
+        return render.guestbook(nav, entries, guestbook_form)
 
     def POST(self):
         data = web.input()
