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

Improve styling on settings page and add search for exercises/people

Browse Source
This commit is contained in:
Peter Stockings
2023-07-14 22:20:46 +10:00
parent 9cd3ce15e0
commit 9c2d95fd61
3 changed files with 168 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
templates/partials/exercise.html
View File

@@ -8,26 +8,51 @@
type="text" name="name" value="{{ name }}"> type="text" name="name" value="{{ name }}">
{% endif %} {% endif %}
</td> </td>
<td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900"> <td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900 float-right">
{% if is_edit|default(false, true) == false %} {% if is_edit|default(false, true) == false %}
<a hx-get="{{ url_for('get_exercise_edit_form', exercise_id=exercise_id) }}" <button
class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"> class="inline-flex justify-center p-2 text-blue-600 rounded-full cursor-pointer hover:bg-blue-100 dark:text-blue-500 dark:hover:bg-gray-600"
Edit hx-get="{{ url_for('get_exercise_edit_form', exercise_id=exercise_id) }}">
</a> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
<a hx-delete="{{ url_for('delete_exercise', exercise_id=exercise_id) }}" stroke="currentColor" class="w-6 h-6">
hx-confirm="Are you sure you wish to delete {{ name }} from exercises?" <path stroke-linecap="round" stroke-linejoin="round"
class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"> d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10" />
Remove </svg>
</a> <span class="sr-only">Edit</span>
</button>
<button
class="inline-flex justify-center p-2 text-blue-600 rounded-full cursor-pointer hover:bg-blue-100 dark:text-blue-500 dark:hover:bg-gray-600"
hx-delete="{{ url_for('delete_exercise', exercise_id=exercise_id) }}"
hx-confirm="Are you sure you wish to delete {{ name }} from exercises?">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round"
d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
</svg>
<span class="sr-only">Delete</span>
</button>
{% else %} {% else %}
<a hx-put="{{ url_for('update_exercise', exercise_id=exercise_id) }}" hx-include="closest tr" <button
class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"> class="inline-flex justify-center p-2 text-blue-600 rounded-full cursor-pointer hover:bg-blue-100 dark:text-blue-500 dark:hover:bg-gray-600"
Update hx-put="{{ url_for('update_exercise', exercise_id=exercise_id) }}" hx-include="closest tr">
</a>
<a hx-get="{{ url_for('get_exercise', exercise_id=exercise_id) }}" <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"> stroke="currentColor" class="w-6 h-6">
Cancel <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" />
</a> </svg>
<span class="sr-only">Save</span>
</button>
<button
class="inline-flex justify-center p-2 text-blue-600 rounded-full cursor-pointer hover:bg-blue-100 dark:text-blue-500 dark:hover:bg-gray-600"
hx-get="{{ url_for('get_exercise', exercise_id=exercise_id) }}">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg>
<span class="sr-only">Cancel</span>
</button>
{% endif %} {% endif %}
</td> </td>

92
templates/partials/page/settings.html
View File

@@ -1,5 +1,5 @@
<div class="mt-4 w-full grid grid-cols-1 md:grid-cols-2 xl:grid-cols-2 gap-4"> <div class="mt-4 w-full grid grid-cols-1 md:grid-cols-2 xl:grid-cols-2 gap-4">
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 "> <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 mb-8">
<div class="mb-4 flex items-center justify-between"> <div class="mb-4 flex items-center justify-between">
<div> <div>
<h3 class="text-xl font-bold text-gray-900 mb-2">Users</h3> <h3 class="text-xl font-bold text-gray-900 mb-2">Users</h3>
@@ -7,9 +7,9 @@
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<div class="overflow-x-auto rounded-lg"> <div class="overflow-x-hidden rounded-lg max-h-96">
<div class="align-middle inline-block min-w-full"> <div class="align-middle inline-block min-w-full">
<div class="shadow overflow-hidden sm:rounded-lg"> <div class="shadow overflow-x-hidden sm:rounded-lg max-h-96 overflow-y-auto overflow-x-hidden">
<table class="table-fixed min-w-full divide-y divide-gray-200"> <table class="table-fixed min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50"> <thead class="bg-gray-50">
<tr> <tr>
@@ -19,6 +19,23 @@
</th> </th>
<th scope="col" <th scope="col"
class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"> class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
<div class="relative">
<div
class="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
<svg class="w-4 h-4 text-gray-500 dark:text-gray-400" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"
data-darkreader-inline-stroke=""
style="--darkreader-inline-stroke: currentColor;"></path>
</svg>
</div>
<input type="search" id="people-search"
class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
placeholder="Search users...">
</div>
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -29,6 +46,25 @@
name=p['Name'])}} name=p['Name'])}}
{% endfor %} {% endfor %}
</tbody> </tbody>
<script>
(function () {
let searchInput = document.querySelector('#people-search')
let rows = Array.from(document.querySelectorAll('#new-person tr'))
searchInput.addEventListener("input", e => {
rows.filter(r => predicate(r, e.target.value)).forEach(r => {
r.classList.remove('hidden')
})
rows.filter(r => !predicate(r, e.target.value)).forEach(r => {
r.classList.add('hidden')
})
});
let predicate = (row, text) => row.querySelector('td').innerText.toLowerCase().includes(text.toLowerCase())
})();
</script>
</table> </table>
</div> </div>
</div> </div>
@@ -64,7 +100,7 @@
</form> </form>
</div> </div>
<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 "> <div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 mb-8">
<div class="mb-4 flex items-center justify-between"> <div class="mb-4 flex items-center justify-between">
<div> <div>
<h3 class="text-xl font-bold text-gray-900 mb-2">Exercises</h3> <h3 class="text-xl font-bold text-gray-900 mb-2">Exercises</h3>
@@ -72,18 +108,35 @@
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<div class="overflow-x-auto rounded-lg"> <div class="rounded-lg">
<div class="align-middle inline-block min-w-full"> <div class="align-middle inline-block min-w-full max-h-96 overflow-y-auto overflow-x-hidden">
<div class="shadow overflow-hidden sm:rounded-lg"> <div class="shadow overflow-hidden sm:rounded-lg ">
<table class="table-fixed min-w-full divide-y divide-gray-200"> <table class="table-fixed min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50"> <thead class="bg-gray-50">
<tr> <tr>
<th scope="col" <th scope="col"
class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider w-3/5"> class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider w-1/4">
Name Name
</th> </th>
<th scope="col" <th scope="col"
class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"> class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider w-3/4">
<div class="relative">
<div
class="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
<svg class="w-4 h-4 text-gray-500 dark:text-gray-400" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"
data-darkreader-inline-stroke=""
style="--darkreader-inline-stroke: currentColor;"></path>
</svg>
</div>
<input type="search" id="exercise-search"
class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
placeholder="Search exercises...">
</div>
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -94,13 +147,32 @@
name=e['Name'])}} name=e['Name'])}}
{% endfor %} {% endfor %}
</tbody> </tbody>
<script>
(function () {
let searchInput = document.querySelector('#exercise-search')
let rows = Array.from(document.querySelectorAll('#new-exercise tr'))
searchInput.addEventListener("input", e => {
rows.filter(r => predicate(r, e.target.value)).forEach(r => {
r.classList.remove('hidden')
})
rows.filter(r => !predicate(r, e.target.value)).forEach(r => {
r.classList.add('hidden')
})
});
let predicate = (row, text) => row.querySelector('td').innerText.toLowerCase().includes(text.toLowerCase())
})();
</script>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<form class="w-full mt-3" hx-post="{{ url_for('create_exercise') }}" hx-swap="beforeend" <form class="w-full mt-8" hx-post="{{ url_for('create_exercise') }}" hx-swap="beforeend"
hx-target="#new-exercise"> hx-target="#new-exercise">
<div class="flex flex-wrap -mx-3 mb-2"> <div class="flex flex-wrap -mx-3 mb-2">
<div class="grow px-3"> <div class="grow px-3">

61
templates/partials/person.html
View File

@@ -8,26 +8,51 @@
type="text" name="name" value="{{ name }}"> type="text" name="name" value="{{ name }}">
{% endif %} {% endif %}
</td> </td>
<td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900"> <td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900 float-right">
{% if is_edit|default(false, true) == false %} {% if is_edit|default(false, true) == false %}
<a hx-get="{{ url_for('get_person_edit_form', person_id=person_id) }}" <button
class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"> class="inline-flex justify-center p-2 text-blue-600 rounded-full cursor-pointer hover:bg-blue-100 dark:text-blue-500 dark:hover:bg-gray-600"
Edit hx-get="{{ url_for('get_person_edit_form', person_id=person_id) }}">
</a> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
<a hx-delete="{{ url_for('delete_person', person_id=person_id) }}" stroke="currentColor" class="w-6 h-6">
hx-confirm="Are you sure you wish to delete {{ name }} from users?" <path stroke-linecap="round" stroke-linejoin="round"
class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"> d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10" />
Remove </svg>
</a> <span class="sr-only">Edit</span>
</button>
<button
class="inline-flex justify-center p-2 text-blue-600 rounded-full cursor-pointer hover:bg-blue-100 dark:text-blue-500 dark:hover:bg-gray-600"
hx-delete="{{ url_for('delete_person', person_id=person_id) }}"
hx-confirm="Are you sure you wish to delete {{ name }} from users?">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round"
d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
</svg>
<span class="sr-only">Delete</span>
</button>
{% else %} {% else %}
<a hx-put="{{ url_for('update_person_name', person_id=person_id) }}" hx-include="closest tr" <button
class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"> class="inline-flex justify-center p-2 text-blue-600 rounded-full cursor-pointer hover:bg-blue-100 dark:text-blue-500 dark:hover:bg-gray-600"
Update hx-put="{{ url_for('update_person_name', person_id=person_id) }}" hx-include="closest tr">
</a>
<a hx-get="{{ url_for('get_person_name', person_id=person_id) }}" <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"> stroke="currentColor" class="w-6 h-6">
Cancel <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" />
</a> </svg>
<span class="sr-only">Cancel</span>
</button>
<button
class="inline-flex justify-center p-2 text-blue-600 rounded-full cursor-pointer hover:bg-blue-100 dark:text-blue-500 dark:hover:bg-gray-600"
hx-get="{{ url_for('get_person_name', person_id=person_id) }}">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg>
<span class="sr-only">Cancel</span>
</button>
{% endif %} {% endif %}
</td> </td>