setup update 2

app/templates/base.html

@@ -71,7 +71,7 @@
                 <ul class="navbar-nav">
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">
-                            <i class="bi bi-person-circle"></i> {{ current_user.name }}
+                            <i class="bi bi-person-circle"></i> {{ current_user.first_name }} {{ current_user.last_name }}
                         </a>
                         <ul class="dropdown-menu dropdown-menu-end">
                             <li><a class="dropdown-item" href="{{ url_for('auth.profile') }}">
@@ -90,15 +90,6 @@
             </div>
         </div>
     </nav>
-    
-    <!-- Main Content -->
-    <main class="container-fluid pt-5 mt-4">
-        {% block content %}{% endblock %}
-    </main>
-    {% else %}
-    <main class="container-fluid">
-        {% block content %}{% endblock %}
-    </main>
     {% endif %}
     
     <!-- Flash Messages -->
@@ -119,6 +110,9 @@
         {% endwith %}
     </div>
     
+    <!-- Main Content -->
+    {% block content %}{% endblock %}
+    
     <!-- Bootstrap JS -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
     <!-- jQuery -->

app/templates/dashboard.html

@@ -3,6 +3,9 @@
 {% block title %}Dashboard - Edu-Space Admin{% endblock %}
 
 {% block content %}
+{% if current_user.is_authenticated %}
+<div class="container-fluid pt-5 mt-4">
+{% endif %}
 <div class="row mb-4">
     <div class="col-12">
         <h1 class="h3 mb-0">
@@ -154,7 +157,7 @@
                                 {% for reservation in upcoming_reservations %}
                                 <tr>
                                     <td>{{ reservation.start_time.strftime('%Y-%m-%d %H:%M') }}</td>
-                                    <td>{{ reservation.classroom.code }}</td>
+<td>{{ reservation.classroom.code }}</td>
                                     <td>{{ reservation.commission.get_full_code() }}</td>
                                     <td>{{ reservation.commission.teacher_name }}</td>
                                     <td>
@@ -163,9 +166,9 @@
                                         </span>
                                     </td>
                                     <td>
-                                        <a href="{{ url_for('schedule.view_reservation', Id=reservation.id) }}" 
+                                        <a href="{{ url_for('schedule.list_reservations') }}" 
                                            class="btn btn-sm btn-outline-primary">
-                                            <i class="bi bi-eye"></i>
+                                            <i class="bi bi-eye"></i> View
                                         </a>
                                     </td>
                                 </tr>
@@ -183,6 +186,9 @@
         </div>
     </div>
 </div>
+{% if current_user.is_authenticated %}
+</div>
+{% endif %}
 {% endblock %}
 
 {% block extra_js %}