From 29b4a9d339972bc884f9aad064584e0045ecd042 Mon Sep 17 00:00:00 2001
From: chelsea <chelsea@chelseawoodruff.net>
Date: Sat, 11 Oct 2025 23:56:52 -0500
Subject: [PATCH] Add topbar navigation to all pages and make logo clickable
 (Issues #14, #13)

- Create reusable _nav.html navigation include
- Add topbar to all settings pages (settings, profile, communities, filters, experience)
- Add topbar to all admin pages (admin, polling, polling_logs, setup)
- Replace hardcoded nav in dashboard with include
- Wrap logo in link to index page (fixes clicking logo to go home)

Fixes #14, #13
---
 templates/_nav.html                 | 47 +++++++++++++++++++++++++++
 templates/admin.html                |  1 +
 templates/admin_polling.html        |  1 +
 templates/admin_polling_logs.html   |  1 +
 templates/dashboard.html            | 49 +----------------------------
 templates/settings.html             |  1 +
 templates/settings_communities.html |  1 +
 templates/settings_experience.html  |  1 +
 templates/settings_filters.html     |  1 +
 templates/settings_profile.html     |  1 +
 10 files changed, 56 insertions(+), 48 deletions(-)
 create mode 100644 templates/_nav.html
diff --git a/templates/_nav.html b/templates/_nav.html
new file mode 100644
index 0000000..3ac9011
--- /dev/null
+++ b/templates/_nav.html
@@ -0,0 +1,47 @@
+<!-- Modern Top Navigation -->
+<nav class="top-nav">
+    <div class="nav-content">
+        <div class="nav-left">
+            <a href="{{ url_for('index') }}" class="logo-section">
+                <img src="{{ url_for('serve_logo') }}" alt="BalanceBoard" class="nav-logo">
+                <span class="brand-text"><span class="brand-balance">balance</span><span class="brand-board">Board</span></span>
+            </a>
+        </div>
+
+        <div class="nav-center">
+            <div class="search-bar">
+                <input type="text" placeholder="Search content..." class="search-input">
+                <button class="search-btn">🔍</button>
+            </div>
+        </div>
+
+        <div class="nav-right">
+            {% if current_user.is_authenticated %}
+                <div class="user-menu">
+                    <div class="user-info">
+                        <div class="user-avatar">
+                            {% if current_user.profile_picture_url %}
+                                <img src="{{ current_user.profile_picture_url }}" alt="Avatar">
+                            {% else %}
+                                <div class="avatar-placeholder">{{ current_user.username[:2].upper() }}</div>
+                            {% endif %}
+                        </div>
+                        <span class="username">{{ current_user.username }}</span>
+                    </div>
+                    <div class="user-dropdown">
+                        <a href="{{ url_for('settings') }}" class="dropdown-item">⚙️ Settings</a>
+                        {% if current_user.is_admin %}
+                            <a href="{{ url_for('admin_panel') }}" class="dropdown-item">👨‍💼 Admin Panel</a>
+                        {% endif %}
+                        <a href="{{ url_for('logout') }}" class="dropdown-item">🚪 Logout</a>
+                    </div>
+                </div>
+            {% else %}
+                <div class="anonymous-actions">
+                    <a href="{{ url_for('login') }}" class="login-btn">🔑 Login</a>
+                    <a href="{{ url_for('signup') }}" class="register-btn">📝 Sign Up</a>
+                </div>
+            {% endif %}
+        </div>
+    </div>
+</nav>
diff --git a/templates/admin.html b/templates/admin.html
index bee893f..38b4581 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -345,6 +345,7 @@
     </style>
 </head>
 <body>
+    {% include '_nav.html' %}
     <div class="admin-container">
         <a href="{{ url_for('index') }}" class="back-link">← Back to Feed</a>
 
diff --git a/templates/admin_polling.html b/templates/admin_polling.html
index abafd9a..b36240e 100644
--- a/templates/admin_polling.html
+++ b/templates/admin_polling.html
@@ -177,6 +177,7 @@
     </style>
 </head>
 <body>
+    {% include '_nav.html' %}
     <div class="admin-container">
         <div class="admin-header">
             <h1>📡 Polling Management</h1>
diff --git a/templates/admin_polling_logs.html b/templates/admin_polling_logs.html
index 9571c11..fb180b5 100644
--- a/templates/admin_polling_logs.html
+++ b/templates/admin_polling_logs.html
@@ -107,6 +107,7 @@
     </style>
 </head>
 <body>
+    {% include '_nav.html' %}
     <div class="admin-container">
         <div class="admin-header">
             <h1>📋 Polling Logs</h1>
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 32fb28e..e0d02a7 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -3,54 +3,7 @@
 {% block title %}Dashboard - BalanceBoard{% endblock %}
 
 {% block content %}
-<!-- Modern Top Navigation -->
-<nav class="top-nav">
-    <div class="nav-content">
-        <div class="nav-left">
-            <div class="logo-section">
-                <img src="{{ url_for('serve_logo') }}" alt="BalanceBoard" class="nav-logo">
-                <span class="brand-text"><span class="brand-balance">balance</span><span class="brand-board">Board</span></span>
-            </div>
-        </div>
-        
-        <div class="nav-center">
-            <div class="search-bar">
-                <input type="text" placeholder="Search content..." class="search-input">
-                <button class="search-btn">🔍</button>
-            </div>
-        </div>
-        
-        <div class="nav-right">
-            {% if anonymous %}
-                <div class="anonymous-actions">
-                    <a href="{{ url_for('login') }}" class="login-btn">🔑 Login</a>
-                    <a href="{{ url_for('signup') }}" class="register-btn">📝 Sign Up</a>
-                </div>
-            {% else %}
-                {# This block only executes for authenticated users (per app.py line 278) #}
-                <div class="user-menu">
-                    <div class="user-info">
-                        <div class="user-avatar">
-                            {% if current_user.profile_picture_url %}
-                                <img src="{{ current_user.profile_picture_url }}" alt="Avatar">
-                            {% else %}
-                                <div class="avatar-placeholder">{{ current_user.username[:2].upper() }}</div>
-                            {% endif %}
-                        </div>
-                        <span class="username">{{ current_user.username }}</span>
-                    </div>
-                    <div class="user-dropdown">
-                        <a href="{{ url_for('settings') }}" class="dropdown-item">⚙️ Settings</a>
-                        {% if current_user.is_admin %}
-                            <a href="{{ url_for('admin_panel') }}" class="dropdown-item">👨‍💼 Admin Panel</a>
-                        {% endif %}
-                        <a href="{{ url_for('logout') }}" class="dropdown-item">🚪 Logout</a>
-                    </div>
-                </div>
-            {% endif %}
-        </div>
-    </div>
-</nav>
+{% include '_nav.html' %}
 
 <!-- Main Content Area -->
 <main class="main-content">
diff --git a/templates/settings.html b/templates/settings.html
index a7a85ce..2048ca6 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -230,6 +230,7 @@
 {% endblock %}
 
 {% block content %}
+{% include '_nav.html' %}
 <div class="settings-container">
     <div class="settings-header">
         <h1>Settings</h1>
diff --git a/templates/settings_communities.html b/templates/settings_communities.html
index 09169aa..8020aa1 100644
--- a/templates/settings_communities.html
+++ b/templates/settings_communities.html
@@ -235,6 +235,7 @@
 {% endblock %}
 
 {% block content %}
+{% include '_nav.html' %}
 <div class="settings-container">
     <div class="settings-header">
         <h1>Community Settings</h1>
diff --git a/templates/settings_experience.html b/templates/settings_experience.html
index 77608ad..4be21bc 100644
--- a/templates/settings_experience.html
+++ b/templates/settings_experience.html
@@ -241,6 +241,7 @@
 {% endblock %}
 
 {% block content %}
+{% include '_nav.html' %}
 <div class="experience-settings">
     <div class="experience-header">
         <h1>Experience Settings</h1>
diff --git a/templates/settings_filters.html b/templates/settings_filters.html
index 0951358..e6df5ff 100644
--- a/templates/settings_filters.html
+++ b/templates/settings_filters.html
@@ -263,6 +263,7 @@
 {% endblock %}
 
 {% block content %}
+{% include '_nav.html' %}
 <div class="settings-container">
     <div class="settings-header">
         <h1>Filter Settings</h1>
diff --git a/templates/settings_profile.html b/templates/settings_profile.html
index e5dd6dd..65286ec 100644
--- a/templates/settings_profile.html
+++ b/templates/settings_profile.html
@@ -225,6 +225,7 @@
 {% endblock %}
 
 {% block content %}
+{% include '_nav.html' %}
 <div class="settings-container">
     <div class="settings-header">
         <h1>Profile Settings</h1>
