Implement two row navbar (fixes #12)

Author: kadraman

iwa/blueprints/auth/templates/auth/login.html

@@ -69,7 +69,7 @@ <h2 class="fs-6 fw-normal text-center text-secondary mb-4">Sign in to your accou
                         </div>
                       </div>
                       <div class="col-12">
-                        <p class="m-0 text-secondary text-center">Don't have an account? <a href="#!"
+                        <p class="m-0 text-secondary text-center">Don't have an account? <a href="{{ url_for('auth.register') }}"
                             class="link-primary text-decoration-none">Sign up</a></p>
                       </div>
                     </div>

iwa/blueprints/main/templates/main/index.html

@@ -6,17 +6,17 @@
 <div class="site-blocks-cover" style="background-image: url('/static/img/home_hero_1a.jpg');">
   <div class="container">
     <div class="row">
-      <div class="col-lg-7 mx-auto order-lg-2 py-5">
+      <div class="col-lg-10 mx-auto order-lg-2 py-5">
         <div class="site-block-cover-content text-center">
           <h2 class="sub-title">Local Service, Global Reach</h2>
-          <h1 class="main-title">Welcome To IWA Pharmacy Direct</h1>
+          <h1 class="main-title">Welcome To <br/>IWA Pharmacy Direct</h1>
         </div>
-        <div class="p-5 text-center bg-body-tertiary rounded-3" style="opacity: 0.9">
-          {% if session.loggedin %}
-          <h4>Welcome back</h4>
-          {% else %}
-          <h4>Welcome Guest</h4>
-          {% endif %}
+        <div class="p-4 text-center bg-body-tertiary rounded-3" style="opacity: 0.9">
+          <div class="py-2 text-center">
+            <h4>We are one of the nation’s largest online pharmacies</h4>
+            <p class="text-secondary">We're here to give you choice and convenience when it comes to everyday healthcare. Find out how our services
+              can help you today.</p>
+          </div>
           <p class="pt-4">
             {% if not session.loggedin %}
             <a href="{{ url_for('auth.register') }}" class="btn p-2 btn-outline-info">Register</a>
@@ -30,14 +30,6 @@ <h4>Welcome Guest</h4>
 </div>
 
 <div class="site-section bg-light">
-  <div class="container">
-    <div class="row py-2 text-center">
-      <h4>We are one of the nation’s largest online pharmacies</h4>
-      <p>We're here to give you choice and convenience when it comes to everyday healthcare. Find out how our services
-        can help you today.</p>
-    </div>
-  </div>
-
   <div class="container">
     <div class="row align-items-stretch row-cols-1 row-cols-md-3 mb-3 text-center">
       <div class="col">

iwa/blueprints/products/templates/products/index.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 <!-- page title -->
-<div class="py-3">
+<div class="bg-white py-3">
     <div class="container">
         <div class="row">
             <div class="col-md-12 mb-0"><a href="{{ url_for('products.index') }}">Shop</a> </div>

iwa/blueprints/products/templates/products/view.html

@@ -4,7 +4,7 @@
 
 {% block content %}
 <!-- page title -->
-<div class="py-3">
+<div class="bg-white py-3">
     <div class="container">
         <div class="row">
             <div class="col-md-12 mb-0"><a href="{{ url_for('products.index') }}">Shop</a> <span

iwa/blueprints/users/routes.py

@@ -173,8 +173,9 @@ def load_logged_in_user():
     email = session.get("email")
     if email is None:
         g.user = None
+        logger.debug("No user is logged in.")
     else:
         g.user = (
             get_db().execute("SELECT * FROM users WHERE email = ?", (email,)).fetchone()
-       )
-    logger.debug(f"Loading logged in user {g.user['email']}")
+        )
+        logger.debug(f"Loading logged in user {g.user['email']}")

iwa/static/css/app.css

@@ -66,6 +66,18 @@ a:hover {
     color: #fff !important;
 }
 
+.btn-nav {
+    min-width: 75px;
+    background: transparent;
+    color: #eee;
+    text-transform: capitalize;
+    font-size: 1em;
+}
+
+.btn-nav:hover {
+    text-decoration: underline;
+}
+
 .form-control {
     height: 43px;
 }
@@ -106,7 +118,6 @@ a:hover {
     background: #3c3d41;
     color: #fff;
     position: relative;
-    z-index: 1000;
 }
 
 /* Site Footer */
@@ -203,7 +214,6 @@ a:hover {
 .dropdown-submenu:hover .dropdown-menu {
     display: block; /* Show the submenu on hover */
 }
-.navbar{ height: 75px;}
 
 /* Blocks */
 .site-blocks-cover {
@@ -243,7 +253,7 @@ a:hover {
 }
 @media (min-width: 768px) {
     .site-blocks-cover h1 {
-        font-size: 70px;
+        font-size: 50px;
     }
 }
 .site-blocks-cover p {

iwa/templates/base.html

@@ -4,18 +4,24 @@
     (url_for('users.security'),  'security', 'bi-lock',             'Security'),
     (url_for('users.orders'),    'orders',   'bi-bag',              'Orders'),
     (url_for('users.reviews'),   'reviews',  'bi-chat-square-text', 'Reviews'),
-    (url_for('users.messages'),  'messages', 'bi-envelope',         'Messages')
+    (url_for('users.messages'),  'messages', 'bi-envelope',         'Messages'),
+    (url_for(request.endpoint),  'divider',  '',                    ''),
+    (url_for('auth.logout'),     'logout',   'bi-box-arrow-right',  'Logout')
 ] -%}
 
 <div class="side-menu">
     <div class="list-group list-group-flush">
         {% for href, id, icon, caption in navigation_bar %}
+            {% if id == 'divider' %}
+                <div class="bg-light" style="height: 50px"></div>
+            {% else %}
             <a {% if id == active_page %} class="list-group-item list-group-item-action active" {% else %} class="list-group-item list-group-item-action" {% endif %} href="{{ href|e }}"><i class="bi {{ icon|e }}"></i> {{ caption|e }}
                 {% if id == 'messages' %}
                     <span id="unread-message-count" class="badge bg-info">0</span>
                     <span class="visually-hidden">unread messages</span>
                 {% endif %}
             </a>
+            {% endif %}
         {% endfor %}
     </div>
 </div>

iwa/templates/includes/sidebar.html

@@ -39,7 +39,8 @@ def login_required(view):
     """View decorator that redirects anonymous users to the login page."""
     @functools.wraps(view)
     def wrapped_view(**kwargs):
-        if session['email'] is None:
+        email = session.get("email")
+        if email is None:
             return redirect(url_for("auth.login"))
 
         return view(**kwargs)

iwa/utils/view_utils.py

@@ -14,5 +14,5 @@ qrcode==8.0
 pytest==8.1.1
 coverage==7.5.1
 openai==1.76.2
-tiktoken==0.7.0
+tiktoken==0.9.0
 cachelib==0.9.0