peterstockings/cardio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix redirect to new workout page

Browse Source
This commit is contained in:
Peter Stockings
2023-03-30 20:42:14 +11:00
parent 114b501adf
commit 5baa91df82
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.py
View File

@@ -255,8 +255,8 @@ def render_users_and_workouts():
users_data.append(user_data) users_data.append(user_data)
if htmx: if htmx:
render_template('users_and_workouts_wrapper.html', return render_template('users_and_workouts_wrapper.html',
users=users_data, bikes=Bike.query.all()) users=users_data, bikes=Bike.query.all())
return render_template('users_and_workouts.html', users=users_data, bikes=Bike.query.all()) return render_template('users_and_workouts.html', users=users_data, bikes=Bike.query.all())

2
templates/users.html
View File

@@ -1,7 +1,7 @@
<form class="block p-6 bg-white border border-gray-200 rounded-lg shadow mt-8" hx-post="{{ url_for('users') }}" <form class="block p-6 bg-white border border-gray-200 rounded-lg shadow mt-8" hx-post="{{ url_for('users') }}"
hx-target="#users-container"> hx-target="#users-container">
<div class="grid gap-4 grid-cols-1 md:grid-cols-3 mb-2 mb-2"> <div class="grid gap-4 grid-cols-1 md:grid-cols-3">
<div class="w-full mb-6 md:mb-0"> <div class="w-full mb-6 md:mb-0">
<label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-city"> <label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-city">
Name Name

8
templates/users_and_workouts_wrapper.html
View File

@@ -4,6 +4,14 @@
{% endwith %} {% endwith %}
{% endfor %} {% endfor %}
<script>
document.querySelectorAll('.accordion-button').forEach(header => {
header.addEventListener('click', () => {
header.parentElement.parentElement.querySelector('div.collapse').classList.toggle('hidden');
});
});
</script>
{% with users=users, bikes=bikes %} {% with users=users, bikes=bikes %}
{% include 'users.html' %} {% include 'users.html' %}
{% endwith %} {% endwith %}

20
templates/workouts_list.html
View File

@@ -36,11 +36,14 @@
</div> </div>
<button <button
class="shadow mt-6 bg-purple-500 hover:bg-purple-400 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded w-full ml-0 md:ml-4" class="shadow mt-6 bg-purple-500 hover:bg-purple-400 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded w-full ml-0 md:ml-4"
type="submit">New Workout</button> type="submit" onclick="location.href = '{{ url_for('new_workout', user_id=u.id) }}';">New Workout</button>
</div> </div>
</div> </div>
<div class="border border-t-0 border-neutral-200 border-b-lg bg-white dark:border-neutral-600 dark:bg-neutral-800"> <div
class="border border-t-0 border-neutral-200 border-b-lg bg-white dark:border-neutral-600 dark:bg-neutral-800 mb-8">
{% if u.workouts_count > 0 %}
<h2 class="mb-0"> <h2 class="mb-0">
<button <button
class="accordion-button group relative flex w-full items-center rounded-t-[15px] border-0 bg-white py-4 px-5 text-left text-base text-neutral-800 transition [overflow-anchor:none] hover:z-[2] focus:z-[3] focus:outline-none dark:bg-neutral-800 dark:text-white [&:not([data-te-collapse-collapsed])]:bg-white [&:not([data-te-collapse-collapsed])]:text-primary [&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(229,231,235)] dark:[&:not([data-te-collapse-collapsed])]:bg-neutral-800 dark:[&:not([data-te-collapse-collapsed])]:text-primary-400 dark:[&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(75,85,99)]" class="accordion-button group relative flex w-full items-center rounded-t-[15px] border-0 bg-white py-4 px-5 text-left text-base text-neutral-800 transition [overflow-anchor:none] hover:z-[2] focus:z-[3] focus:outline-none dark:bg-neutral-800 dark:text-white [&:not([data-te-collapse-collapsed])]:bg-white [&:not([data-te-collapse-collapsed])]:text-primary [&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(229,231,235)] dark:[&:not([data-te-collapse-collapsed])]:bg-neutral-800 dark:[&:not([data-te-collapse-collapsed])]:text-primary-400 dark:[&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(75,85,99)]"
@@ -115,14 +118,5 @@
</div> </div>
</div> {% endif %}
</div>
<script>
document.querySelectorAll('.accordion-button').forEach(header => {
header.addEventListener('click', () => {
header.parentElement.parentElement.querySelector('div.collapse').classList.toggle('hidden');
});
});
</script>