From 82f7e8305665bad63e89edad32151f5ff8ed98b3 Mon Sep 17 00:00:00 2001
From: Peter Stockings <pstockings@jadeworld.com>
Date: Tue, 14 Mar 2023 22:30:43 +1100
Subject: [PATCH] Fix error on refresh where footer elements fused with action
 button

---
 app.py                                | 10 +++++-----
 templates/base.html                   |  6 ++++--
 templates/partials/page/calendar.html |  1 +
 templates/partials/page/person.html   |  2 +-
 templates/partials/people_link.html   |  2 +-
 templates/partials/stats.html         |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app.py b/app.py
index 24a183e..76a70c6 100644
--- a/app.py
+++ b/app.py
@@ -115,8 +115,8 @@ def get_calendar(person_id):
 
     if htmx:
         return render_template('partials/page/calendar.html',
-                               person=person, selected_date=selected_date, selected_view=selected_view, next_date=next_date, previous_date=previous_date, start_date=start_date, end_date=end_date), 200, {"HX-Trigger": "updatedPeople"}
-    return render_template('calendar.html', person=person, selected_date=selected_date, selected_view=selected_view, next_date=next_date, previous_date=previous_date, start_date=start_date, end_date=end_date), 200, {"HX-Trigger": "updatedPeople"}
+                               person=person, selected_date=selected_date, selected_view=selected_view, next_date=next_date, previous_date=previous_date, start_date=start_date, end_date=end_date)
+    return render_template('calendar.html', person=person, selected_date=selected_date, selected_view=selected_view, next_date=next_date, previous_date=previous_date, start_date=start_date, end_date=end_date)
 
 
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>/modal", methods=['GET'])
@@ -291,9 +291,9 @@ def settings():
 def my_utility_processor():
 
     def is_selected_page(url):
-        if htmx:
-            parsed_url = urlparse(htmx.current_url)
-            return 'bg-gray-200' if url == parsed_url.path else ''
+        # if htmx:
+        #    parsed_url = urlparse(htmx.current_url)
+        #    return 'bg-gray-200' if url == parsed_url.path else ''
         if url == request.path:
             return 'bg-gray-200'
         return ''
diff --git a/templates/base.html b/templates/base.html
index 6fc8381..f8977c8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -87,7 +87,8 @@
                     <div class="flex-1 px-3 bg-white divide-y space-y-1">
                         <div class="space-y-2 pt-2">
                             <a hx-get="{{ url_for('dashboard') }}" hx-push-url="true" hx-target="#container"
-                                class="text-base text-gray-900 font-normal rounded-lg flex items-center p-2 hover:bg-gray-100 group cursor-pointer {{ is_selected_page(url_for('dashboard')) }}">
+                                class="text-base text-gray-900 font-normal rounded-lg flex items-center p-2 hover:bg-gray-100 group cursor-pointer {{ is_selected_page(url_for('dashboard')) }}"
+                                _="on click toggle .bg-gray-200 on me">
                                 <svg class="w-6 h-6 text-gray-500 group-hover:text-gray-900 transition duration-75"
                                     fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                                     <path d="M2 10a8 8 0 018-8v8h8a8 8 0 11-16 0z"></path>
@@ -104,7 +105,8 @@
                         </ul>
                         <div class="space-y-2 pt-2">
                             <a hx-get="{{ url_for('settings') }}" hx-push-url="true" hx-target="#container"
-                                class="text-base text-gray-900 font-normal rounded-lg hover:bg-gray-100 group transition duration-75 flex items-center p-2 cursor-pointer {{ is_selected_page(url_for('settings')) }}">
+                                class="text-base text-gray-900 font-normal rounded-lg hover:bg-gray-100 group transition duration-75 flex items-center p-2 cursor-pointer {{ is_selected_page(url_for('settings')) }}"
+                                _="on click toggle .bg-gray-200 on me">
                                 <svg class="w-6 h-6 text-gray-500 group-hover:text-gray-900 transition duration-75"
                                     fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
                                     data-darkreader-inline-fill="" style="--darkreader-inline-fill:currentColor;">
diff --git a/templates/partials/page/calendar.html b/templates/partials/page/calendar.html
index 62d8cf8..84a0914 100644
--- a/templates/partials/page/calendar.html
+++ b/templates/partials/page/calendar.html
@@ -174,4 +174,5 @@
         <path fill="#FFFFFF" d="M16,10c0,0.553-0.048,1-0.601,1H11v4.399C11,15.951,10.553,16,10,16c-0.553,0-1-0.049-1-0.601V11H4.601
                                 C4.049,11,4,10.553,4,10c0-0.553,0.049-1,0.601-1H9V4.601C9,4.048,9.447,4,10,4c0.553,0,1,0.048,1,0.601V9h4.399
                                 C15.952,9,16,9.447,16,10z" />
+    </svg>
 </button>
\ No newline at end of file
diff --git a/templates/partials/page/person.html b/templates/partials/page/person.html
index b543787..d325fe6 100644
--- a/templates/partials/page/person.html
+++ b/templates/partials/page/person.html
@@ -155,6 +155,6 @@
     <svg viewBox="0 0 20 20" enable-background="new 0 0 20 20" class="w-6 h-6 inline-block">
         <path fill="#FFFFFF" d="M16,10c0,0.553-0.048,1-0.601,1H11v4.399C11,15.951,10.553,16,10,16c-0.553,0-1-0.049-1-0.601V11H4.601
                                 C4.049,11,4,10.553,4,10c0-0.553,0.049-1,0.601-1H9V4.601C9,4.048,9.447,4,10,4c0.553,0,1,0.048,1,0.601V9h4.399
-                                C15.952,9,16,9.447,16,10z">
+                                C15.952,9,16,9.447,16,10z" />
     </svg>
 </button>
\ No newline at end of file
diff --git a/templates/partials/people_link.html b/templates/partials/people_link.html
index 7b7c0e1..98dbbd1 100644
--- a/templates/partials/people_link.html
+++ b/templates/partials/people_link.html
@@ -2,7 +2,7 @@
 <li>
     <a hx-get="{{ url_for('get_calendar' ,person_id=p['PersonId']) }}" hx-push-url="true" hx-target="#container"
         class="text-base text-gray-900 font-normal rounded-lg hover:bg-gray-100 flex items-center p-2 group cursor-pointer {% if
-    p['IsActive']==1 %} bg-gray-200 {% endif %} {{ is_selected_page(url_for('get_calendar' ,person_id=p['PersonId'])) }}">
+    p['IsActive']==1 %} bg-gray-200 {% endif %} {{ is_selected_page(url_for('get_calendar' ,person_id=p['PersonId'])) }}" _="on click toggle .bg-gray-200 on me">
         <svg class="w-6 h-6 text-gray-500 flex-shrink-0 group-hover:text-gray-900 transition duration-75"
             fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
             <path fill-rule="evenodd" d="M10 9a3 3 0 100-6 3 3 0 000 6zm-7 9a7 7 0 1114 0H3z" clip-rule="evenodd">
diff --git a/templates/partials/stats.html b/templates/partials/stats.html
index bf93a16..5039ea7 100644
--- a/templates/partials/stats.html
+++ b/templates/partials/stats.html
@@ -1,5 +1,5 @@
 <div class="mt-4 w-full grid grid-cols-1 md:grid-cols-3 2xl:grid-cols-4 xl:grid-cols-5 gap-4">
-    {% for stat in stats%}
+    {% for stat in stats %}
     <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
         <div class="flex items-center">
             <div class="flex-shrink-0">