- Moved workout-related routes (create/delete/edit workouts, topsets, tags, start dates, show workout) from `app.py` into a new blueprint at `routes/workout.py`. - Integrated workout view model logic from `features/workout.py` directly into `routes/workout.py` helper function `_get_workout_view_model`. - Removed `features/workout.py` and the corresponding class instantiation in `db.py`. - Registered the new `workout_bp` blueprint in `app.py`. - Removed the original workout route definitions from `app.py`. - Updated `url_for` calls in relevant templates (`workout.html`, `person_overview.html`, `partials/workout_tags.html`, `partials/topset.html`, `partials/start_date.html`, `partials/new_set_form.html`, `notes.html`, `calendar.html`) to reference the new blueprint endpoints (e.g., `workout.create_workout`). - Updated `templates/changelog/changelog.html` to document this refactoring.
149 lines
7.7 KiB
HTML
149 lines
7.7 KiB
HTML
{% extends 'base.html' %}
|
|
|
|
{% block content %}
|
|
|
|
|
|
<nav class="flex md:pb-0 pb-4" aria-label="Breadcrumb">
|
|
<ol class="inline-flex items-center space-x-1 md:space-x-2 rtl:space-x-reverse">
|
|
<li class="inline-flex items-center">
|
|
<a hx-get="{{ url_for('dashboard') }}" hx-push-url="true" hx-target="#container"
|
|
class="inline-flex items-center text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white cursor-pointer">
|
|
<svg class="w-3 h-3 mr-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor"
|
|
viewBox="0 0 20 20">
|
|
<path
|
|
d="m19.707 9.293-2-2-7-7a1 1 0 0 0-1.414 0l-7 7-2 2a1 1 0 0 0 1.414 1.414L2 10.414V18a2 2 0 0 0 2 2h3a1 1 0 0 0 1-1v-4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v4a1 1 0 0 0 1 1h3a2 2 0 0 0 2-2v-7.586l.293.293a1 1 0 0 0 1.414-1.414Z" />
|
|
</svg>
|
|
Home
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<div class="flex items-center">
|
|
<svg class="rtl:rotate-180 w-3 h-3 text-gray-400 mx-1" aria-hidden="true"
|
|
xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 6 10">
|
|
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
|
d="m1 9 4-4-4-4" />
|
|
</svg>
|
|
{% set hx_current_url = request.headers.get('HX-Current-URL') %}
|
|
<a hx-get="{{ hx_current_url if hx_current_url else url_for('calendar.get_calendar', person_id=person_id) }}"
|
|
hx-push-url="true" hx-target="#container"
|
|
class="ms-1 text-sm font-medium text-gray-700 hover:text-blue-600 md:ms-2 dark:text-gray-400 dark:hover:text-white cursor-pointer">{{person_name}}</a>
|
|
</div>
|
|
</li>
|
|
<li aria-current="page">
|
|
<div class="flex items-center">
|
|
<svg class="rtl:rotate-180 w-3 h-3 text-gray-400 mx-1" aria-hidden="true"
|
|
xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 6 10">
|
|
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
|
d="m1 9 4-4-4-4" />
|
|
</svg>
|
|
<span class="ms-1 text-sm font-medium text-gray-500 md:ms-2 dark:text-gray-400">Workout</span>
|
|
</div>
|
|
</li>
|
|
</ol>
|
|
</nav>
|
|
|
|
<div class='p-0 md:p-4 m-0 md:m-2'>
|
|
<div class="relative w-full h-full">
|
|
<!-- Modal content -->
|
|
<div class="relative bg-white rounded-lg shadow">
|
|
<!-- Modal header -->
|
|
<div class="flex items-start justify-between p-2 md:p-4 border-0 md:border-b rounded-t">
|
|
<div class="flex flex-col w-full">
|
|
<div class="flex items-center justify-between">
|
|
<div class="w-full">
|
|
<h3 class="text-xl font-bold text-gray-900">{{ person_name }}</h3>
|
|
|
|
{{ render_partial('partials/workout_tags.html', person_id=person_id, workout_id=workout_id,
|
|
tags=tags) }}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
<div class="grid grid-cols-1 lg:grid-cols-2">
|
|
{{ render_partial('partials/start_date.html', person_id=person_id,
|
|
workout_id=workout_id,
|
|
start_date=start_date) }}
|
|
|
|
|
|
{{ render_partial('partials/workout_note.html', person_id=person_id,
|
|
workout_id=workout_id,
|
|
note=note) }}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<button type="button"
|
|
class="absolute right-0 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white mr-2"
|
|
hx-get="{{ url_for('workout.delete_workout', person_id=person_id, workout_id=workout_id) }}"
|
|
hx-confirm="Are you sure you wish to delete this workout?" hx-push-url="true"
|
|
hx-target="#container">
|
|
<svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20"
|
|
xmlns="http://www.w3.org/2000/svg" data-darkreader-inline-fill=""
|
|
style="--darkreader-inline-fill:currentColor;">
|
|
<path fill-rule="evenodd"
|
|
d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
|
|
clip-rule="evenodd"></path>
|
|
</svg>
|
|
<span class="sr-only">Close modal</span>
|
|
</button>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="relative bg-white rounded-lg shadow mt-4">
|
|
<div class="p-2 md:p-4 border-0 md:border-b rounded-t">
|
|
<!-- Modal footer -->
|
|
<div class="flex items-center p-1 md:p-2 rounded-b dark:border-gray-600">
|
|
{{ render_partial('partials/new_set_form.html', person_id=person_id,
|
|
workout_id=workout_id,
|
|
exercises=exercises,
|
|
has_value=False) }}
|
|
</div>
|
|
|
|
<!-- Modal body -->
|
|
<div class="p-3 md:p-6 space-y-6">
|
|
<table class="items-center w-full bg-transparent border-collapse table-fixed">
|
|
<thead>
|
|
<tr>
|
|
<th
|
|
class="px-4 bg-gray-50 text-gray-700 align-middle py-3 text-xs font-semibold text-left uppercase border-l-0 border-r-0 whitespace-nowrap">
|
|
Exercise</th>
|
|
<th
|
|
class="px-4 bg-gray-50 text-gray-700 align-middle py-3 text-xs font-semibold text-left uppercase border-l-0 border-r-0 whitespace-nowrap">
|
|
Top Set</th>
|
|
<th
|
|
class="bg-gray-50 text-gray-700 align-middle py-3 text-xs font-semibold text-left uppercase border-l-0 border-r-0 whitespace-nowrap w-9 sm:w-20">
|
|
</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody class="divide-y divide-gray-100" id="new-workout" hx-target="closest tr"
|
|
hx-swap="outerHTML swap:0.5s">
|
|
{% for top_set in top_sets %}
|
|
{{ render_partial('partials/topset.html', person_id=person_id,
|
|
workout_id=workout_id, **top_set) }}
|
|
{% endfor %}
|
|
</tbody>
|
|
</table>
|
|
|
|
{% if top_sets|length == 0 %}
|
|
<div class="bg-purple-100 rounded-lg py-5 px-6 mb-4 text-base text-purple-700 mb-3" role="alert"
|
|
id="no-workouts">
|
|
No top_sets found.
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
|
|
<div id="exercise-progress" class="mx-0 md:mx-5">
|
|
</div>
|
|
|
|
</div>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="hidden" hx-get="{{ url_for('get_stats') }}" hx-vals='{"person_id": "{{ person_id }}"}' hx-trigger="load"
|
|
hx-target="#stats" hx-swap="innerHTML">
|
|
</div>
|
|
|
|
{% endblock %} |