diff --git a/templates/base.html b/templates/base.html index 5fe4473..13bc9b8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -51,46 +51,6 @@ let config = { responsive: true, displayModeBar: false }; let hovertemplate = 'Estimated 1RM: %{y}kg
Topset:%{text}
Date: %{x}'; - - @@ -143,7 +103,6 @@
-
+
{% block content %} {% endblock %}
diff --git a/templates/calendar.html b/templates/calendar.html index cdfcd7e..bfc18ed 100644 --- a/templates/calendar.html +++ b/templates/calendar.html @@ -4,15 +4,14 @@ + id="refreshViewElement">
@@ -110,7 +107,7 @@
View workouts
diff --git a/templates/partials/people_link.html b/templates/partials/people_link.html index dbe0b80..8524c8c 100644 --- a/templates/partials/people_link.html +++ b/templates/partials/people_link.html @@ -1,7 +1,6 @@ {% for p in people %}
  • {{ + hx-vals='{"filter": "{{ t["TagFilter"] }}"}' {% endif%} hx-target="#container" hx-push-url="true">{{ t['TagName'] }} @@ -15,8 +14,7 @@ class="float-right w-4 cursor-pointer pl-[8px] text-[16px] text-[#afafaf] opacity-[.53] transition-all duration-200 ease-in-out hover:text-[#8b8b8b] dark:text-neutral-400 dark:hover:text-neutral-100" hx-get="{{ url_for('delete_tag', tag_id=t['TagId']) }}" {% if person_id %} hx-vals='{"filter": "{{ t["TagFilter"] }}", "person_id": "{{ person_id }}"}' {% else %} - hx-vals='{"filter": "{{ t["TagFilter"] }}"}' {% endif%} hx-target="#container" - hx-swap="innerHTML transition:true" hx-push-url="true" _="on htmx:confirm(issueRequest) + hx-vals='{"filter": "{{ t["TagFilter"] }}"}' {% endif%} hx-target="#container" hx-push-url="true" _="on htmx:confirm(issueRequest) halt the event call Swal.fire({title: 'Confirm', text:'Are you sure you want to delete {{ t['TagName'] }} tag?'}) if result.isConfirmed issueRequest()"> diff --git a/templates/partials/topset.html b/templates/partials/topset.html index 1b45648..d7109c8 100644 --- a/templates/partials/topset.html +++ b/templates/partials/topset.html @@ -3,7 +3,7 @@ {% if is_edit|default(false, true) == false %} {{ exercise_name }} {% else %} diff --git a/templates/partials/workout_tags_list.html b/templates/partials/workout_tags_list.html index 4e99f82..d760fea 100644 --- a/templates/partials/workout_tags_list.html +++ b/templates/partials/workout_tags_list.html @@ -2,8 +2,7 @@ {{ + hx-target="#container" hx-push-url="true" _='on click trigger closeModalWithoutRefresh'>{{ tag.tag_name }} {% endfor%} \ No newline at end of file diff --git a/templates/person.html b/templates/person.html index 64bc1df..d2bfe2f 100644 --- a/templates/person.html +++ b/templates/person.html @@ -2,7 +2,7 @@ {% block content %} - @@ -47,7 +47,7 @@ data-te-select-size="lg" name="exercise_id" class="bg-gray-50 border border-gray-300 " multiple hx-get="{{ url_for('get_person', person_id=person['PersonId']) }}" hx-include="[name='exercise_id'],[name='min_date'],[name='max_date'],[name='graph_axis']" - hx-target="#container" hx-push-url="true" hx-swap="innerHTML transition:true"> + hx-target="#container" hx-push-url="true"> {% for e in person['Exercises'] %}
    • @@ -98,7 +98,7 @@ name="max_date" value="{{ max_date }}" hx-get="{{ url_for('get_person', person_id=person['PersonId']) }}" hx-include="[name='exercise_id'],[name='min_date'],[name='max_date'],[name='graph_axis']" - hx-target="#container" hx-swap="innerHTML transition:true" hx-push-url="true" hx-trigger="change"> + hx-target="#container" hx-push-url="true" hx-trigger="change">
    @@ -110,7 +110,7 @@ data-te-select-size="lg" name="graph_axis" class="bg-gray-50 border border-gray-300 " multiple hx-get="{{ url_for('get_person', person_id=person['PersonId']) }}" hx-include="[name='exercise_id'],[name='min_date'],[name='max_date'],[name='graph_axis']" - hx-target="#container" hx-swap="innerHTML transition:true" hx-push-url="true"> + hx-target="#container" hx-push-url="true">