reformat files
This commit is contained in:
		| @@ -1,21 +1,11 @@ | ||||
| {% import "includes/macros" as macros %} | ||||
| {% import "includes/forms/boat" as boat %} | ||||
|  | ||||
| {% extends "base" %} | ||||
|  | ||||
| {% block content %} | ||||
| 		{% if flash %} | ||||
| 			{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }} | ||||
| 		{% endif %} | ||||
|  | ||||
| 	<div class="max-w-screen-lg w-full"> | ||||
| 		<h1 class="h1">Boats</h1> | ||||
| 		{{ boat::new() }} | ||||
|  | ||||
| 		{% for boat in boats %} | ||||
|       {{ boat::edit(boat=boat, uuid=loop.index) }} | ||||
|     {% endfor %} | ||||
|  | ||||
| 	</div> | ||||
|  | ||||
|     {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %} | ||||
|     <div class="max-w-screen-lg w-full"> | ||||
|         <h1 class="h1">Boats</h1> | ||||
|         {{ boat::new() }} | ||||
|         {% for boat in boats %}{{ boat::edit(boat=boat, uuid=loop.index) }}{% endfor %} | ||||
|     </div> | ||||
| {% endblock content %} | ||||
|   | ||||
| @@ -1,27 +1,18 @@ | ||||
| {% import "includes/macros" as macros %} | ||||
| {% import "includes/forms/boat" as boat %} | ||||
|  | ||||
| {% extends "base" %} | ||||
|  | ||||
| {% block content %} | ||||
| 		{% if flash %} | ||||
| 			{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }} | ||||
| 		{% endif %} | ||||
|  | ||||
| 	<div class="max-w-screen-lg w-full"> | ||||
| 		<h1 class="h1">Mail</h1> | ||||
| 		<form action="/admin/mail" method="post" enctype="multipart/form-data"> | ||||
| 			<select name="role_id"> | ||||
| 				{% for role in roles %} | ||||
| 			  		<option value="{{ role.id }}">{{ role.name }}</option> | ||||
| 				{% endfor %} | ||||
| 			</select> | ||||
| 			<input type="text" name="subject" /> | ||||
| 			<textarea name="body" rows="4" cols="50"></textarea> | ||||
|     			<input type="file" name="files" multiple /> | ||||
| 			<input type="submit" /> | ||||
| 		</form> | ||||
|  | ||||
| 	</div> | ||||
|  | ||||
|     {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %} | ||||
|     <div class="max-w-screen-lg w-full"> | ||||
|         <h1 class="h1">Mail</h1> | ||||
|         <form action="/admin/mail" method="post" enctype="multipart/form-data"> | ||||
|             <select name="role_id"> | ||||
|                 {% for role in roles %}<option value="{{ role.id }}">{{ role.name }}</option>{% endfor %} | ||||
|             </select> | ||||
|             <input type="text" name="subject" /> | ||||
|             <textarea name="body" rows="4" cols="50"></textarea> | ||||
|             <input type="file" name="files" multiple /> | ||||
|             <input type="submit" /> | ||||
|         </form> | ||||
|     </div> | ||||
| {% endblock content %} | ||||
|   | ||||
| @@ -1,47 +1,44 @@ | ||||
| {% import "includes/macros" as macros %} | ||||
|  | ||||
| {% extends "base" %} | ||||
|  | ||||
| {% block content %} | ||||
| 	<div class="max-w-screen-lg w-full bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"> | ||||
| 		{% if flash %} | ||||
| 			{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }} | ||||
| 		{% endif %} | ||||
|  | ||||
| 		<h1 class="h1">Gebühren</h1> | ||||
|  | ||||
| 		<!-- START filterBar --> | ||||
| 		<div class="search-wrapper"> | ||||
| 			<label for="name" class="sr-only">Suche</label> | ||||
| 			<input type="search" name="name" id="filter-js" class="search-bar" placeholder="Suchen nach Name"/> | ||||
| 		</div> | ||||
| 		<!-- END filterBar --> | ||||
|  | ||||
| 		<div class="bg-primary-100 dark:bg-primary-950 p-3 rounded-b-md grid gap-4"> | ||||
| 			<div id="filter-result-js" class="text-primary-950 dark:text-white text-right"></div> | ||||
|  | ||||
| 		{% for fee in fees | sort(attribute="name") %} | ||||
| 			<div {% if fee.paid %} style="background-color: green;" {% endif %} data-filterable="true" data-filter="{{ fee.name }} {% if fee.paid %} has-already-paid {% else %} has-not-paid {% endif %}" class="bg-white dark:bg-primary-900 p-3 rounded-md w-full"> | ||||
|               		<div class="grid sm:grid-cols-1 gap-3"> | ||||
| 				<div style="width: 100%" class="col-span-2"> | ||||
| 				<b>{{ fee.name }}</b> | ||||
| 				</div> | ||||
| 				<div style="width: 100%"> | ||||
| 				{{ fee.sum_in_cents / 100 }}€: | ||||
| 				</div> | ||||
| 				<div style="width: 100%"> | ||||
| 				{% for p in fee.parts %} | ||||
| 					 {{ p.0 }} ({{ p.1 / 100 }}€) {% if not loop.last %} + {% endif %} | ||||
| 				{% endfor %} | ||||
| 				</div> | ||||
| 				{% if "admin" in loggedin_user.roles %} | ||||
| 					<a href="/admin/user/fees/paid?{{ fee.user_ids }}">Zahlungsstatus ändern</a> | ||||
| 				{% endif %} | ||||
| 			</div> | ||||
| 			</div> | ||||
| 		{% endfor %} | ||||
| 		</div> | ||||
|  | ||||
| 	</div> | ||||
|  | ||||
|     <div class="max-w-screen-lg w-full bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"> | ||||
|         {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %} | ||||
|         <h1 class="h1">Gebühren</h1> | ||||
|         <!-- START filterBar --> | ||||
|         <div class="search-wrapper"> | ||||
|             <label for="name" class="sr-only">Suche</label> | ||||
|             <input type="search" | ||||
|                    name="name" | ||||
|                    id="filter-js" | ||||
|                    class="search-bar" | ||||
|                    placeholder="Suchen nach Name" /> | ||||
|         </div> | ||||
|         <!-- END filterBar --> | ||||
|         <div class="bg-primary-100 dark:bg-primary-950 p-3 rounded-b-md grid gap-4"> | ||||
|             <div id="filter-result-js" | ||||
|                  class="text-primary-950 dark:text-white text-right"></div> | ||||
|             {% for fee in fees | sort(attribute="name") %} | ||||
|                 <div {% if fee.paid %}style="background-color: green;"{% endif %} | ||||
|                      data-filterable="true" | ||||
|                      data-filter="{{ fee.name }} {% if fee.paid %} has-already-paid {% else %} has-not-paid {% endif %}" | ||||
|                      class="bg-white dark:bg-primary-900 p-3 rounded-md w-full"> | ||||
|                     <div class="grid sm:grid-cols-1 gap-3"> | ||||
|                         <div style="width: 100%" class="col-span-2"> | ||||
|                             <b>{{ fee.name }}</b> | ||||
|                         </div> | ||||
|                         <div style="width: 100%">{{ fee.sum_in_cents / 100 }}€:</div> | ||||
|                         <div style="width: 100%"> | ||||
|                             {% for p in fee.parts %} | ||||
|                                 {{ p.0 }} ({{ p.1 / 100 }}€) | ||||
|                                 {% if not loop.last %}+{% endif %} | ||||
|                             {% endfor %} | ||||
|                         </div> | ||||
|                         {% if "admin" in loggedin_user.roles %} | ||||
|                             <a href="/admin/user/fees/paid?{{ fee.user_ids }}">Zahlungsstatus ändern</a> | ||||
|                         {% endif %} | ||||
|                     </div> | ||||
|                 </div> | ||||
|             {% endfor %} | ||||
|         </div> | ||||
|     </div> | ||||
| {% endblock content %} | ||||
|   | ||||
| @@ -1,98 +1,97 @@ | ||||
| {% import "includes/macros" as macros %} | ||||
|  | ||||
| {% extends "base" %} | ||||
|  | ||||
| {% block content %} | ||||
| 	<div class="max-w-screen-lg w-full"> | ||||
| 		{% if flash %} | ||||
| 			{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }} | ||||
| 		{% endif %} | ||||
|  | ||||
| 		<h1 class="h1">Users</h1> | ||||
|  | ||||
| 		{% if allowed_to_edit %} | ||||
| 		<form action="/admin/user/new" method="post" class="mt-4 bg-primary-900 rounded-md text-white px-3 pb-3 pt-2 sm:flex items-end justify-between"> | ||||
| 			<div class="w-full"> | ||||
| 				<h2 class="text-md font-bold mb-2 uppercase tracking-wide">Neuen User hinzufügen</h2> | ||||
| 				<div class="grid md:grid-cols-3"> | ||||
| 					<div> | ||||
| 						<label for="name" class="sr-only">Name</label> | ||||
| 						<input type="text" name="name" class="relative block rounded-md border-0 py-1.5 px-2 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary-600 sm:text-sm sm:leading-6 mb-2 md:mb-0" placeholder="Name"/> | ||||
| 					</div> | ||||
| 				</div> | ||||
| 			</div> | ||||
| 			<div class="text-right"> | ||||
| 				<input value="Hinzufügen" type="submit" class="w-28 mt-2 sm:mt-0 rounded-md bg-primary-500 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"/> | ||||
| 			</div> | ||||
| 		</form> | ||||
| 		{% endif %} | ||||
|  | ||||
| 		<!-- START filterBar --> | ||||
| 		<div class="search-wrapper"> | ||||
| 			<label for="name" class="sr-only">Suche</label> | ||||
| 			<input type="search" name="name" id="filter-js" class="search-bar" placeholder="Suchen nach (Name, [yes|no]-role:<name>)"/> | ||||
| 		</div> | ||||
| 		<!-- END filterBar --> | ||||
|  | ||||
| 		<div class="bg-primary-100 dark:bg-primary-950 p-3 rounded-b-md grid gap-4"> | ||||
| 			<div id="filter-result-js" class="text-primary-950 dark:text-white text-right"></div> | ||||
| 			{% for user in users %} | ||||
|         <div data-filterable="true" data-filter="{{ user.name }} | ||||
| 	      	{% for role in roles %} | ||||
| 			{% if role.name in user.roles %} | ||||
| 				yes-role:{{role.name}} | ||||
| 			{% else %} | ||||
| 				no-role:{{role.name}} | ||||
| 			{% endif %} | ||||
|                  role-{{role}}	 | ||||
| 		{% endfor%} | ||||
|  | ||||
| 	"> | ||||
|           <form action="/admin/user" method="post" class="bg-white dark:bg-primary-900 p-3 rounded-md w-full"> | ||||
|             <div class="w-full grid gap-3"> | ||||
|               <input type="hidden" name="id" value="{{ user.id }}"/> | ||||
|               <div class="font-bold mb-1 text-black dark:text-white">{{ user.name }} | ||||
|                 {% if user.last_access %} | ||||
|                   (last access: | ||||
|                   {{ user.last_access | date }}) | ||||
|                 {% endif %} | ||||
|                 {% if user.pw %} | ||||
|                   <a class="block mt-1 font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline" href="/admin/user/{{ user.id }}/reset-pw">Passwort zurücksetzen</a> | ||||
|                 {% endif %} | ||||
|               </div> | ||||
|               <div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3"> | ||||
| 	      	{% for role in roles %} | ||||
|                 	{{ macros::checkbox(label=role.name, name="roles[" ~ role.id ~ "]", id=loop.index , checked=role.name in user.roles, disabled=allowed_to_edit == false) }} | ||||
| 		{% endfor%} | ||||
|                 {{ macros::input(label='DOB', name='dob', id=loop.index, type="text", value=user.dob, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Weight (kg)', name='weight', id=loop.index, type="text", value=user.weight, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Sex', name='sex', id=loop.index, type="text", value=user.sex, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Mitglied seit', name='member_since_date', id=loop.index, type="text", value=user.member_since_date, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Geburtsdatum', name='birthdate', id=loop.index, type="text", value=user.birthdate, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Mail', name='mail', id=loop.index, type="text", value=user.mail, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Nickname', name='nickname', id=loop.index, type="text", value=user.nickname, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Notizen', name='notes', id=loop.index, type="text", value=user.notes, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Telefon', name='phone', id=loop.index, type="text", value=user.phone, readonly=allowed_to_edit == false) }} | ||||
|                 {{ macros::input(label='Adresse', name='address', id=loop.index, type="text", value=user.address, readonly=allowed_to_edit == false) }} | ||||
| 		{% if allowed_to_edit %} | ||||
|           	{{ macros::select(label="Familie", data=families, name='family_id', selected_id=user.family_id, display=['names'], default="Keine Familie", new_last_entry='Neue Familie anlegen') }} | ||||
| 		{% endif %} | ||||
|               </div> | ||||
|             </div> | ||||
| 	    {% if allowed_to_edit %} | ||||
|             <div class="mt-3 text-right"> | ||||
|               <a href="/admin/user/{{ user.id }}/delete" class="w-28 btn btn-alert" onclick="return confirm('Wirklich löschen?');"> | ||||
|                 {% include "includes/delete-icon" %} | ||||
|                 Löschen | ||||
|               </a> | ||||
|               <input value="Ändern" type="submit" class="w-28 btn btn-primary ml-1"/> | ||||
|             </div> | ||||
| 	    {% endif %} | ||||
|           </form> | ||||
|     <div class="max-w-screen-lg w-full"> | ||||
|         {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %} | ||||
|         <h1 class="h1">Users</h1> | ||||
|         {% if allowed_to_edit %} | ||||
|             <form action="/admin/user/new" | ||||
|                   method="post" | ||||
|                   class="mt-4 bg-primary-900 rounded-md text-white px-3 pb-3 pt-2 sm:flex items-end justify-between"> | ||||
|                 <div class="w-full"> | ||||
|                     <h2 class="text-md font-bold mb-2 uppercase tracking-wide">Neuen User hinzufügen</h2> | ||||
|                     <div class="grid md:grid-cols-3"> | ||||
|                         <div> | ||||
|                             <label for="name" class="sr-only">Name</label> | ||||
|                             <input type="text" | ||||
|                                    name="name" | ||||
|                                    class="relative block rounded-md border-0 py-1.5 px-2 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary-600 sm:text-sm sm:leading-6 mb-2 md:mb-0" | ||||
|                                    placeholder="Name" /> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="text-right"> | ||||
|                     <input value="Hinzufügen" | ||||
|                            type="submit" | ||||
|                            class="w-28 mt-2 sm:mt-0 rounded-md bg-primary-500 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer" /> | ||||
|                 </div> | ||||
|             </form> | ||||
|         {% endif %} | ||||
|         <!-- START filterBar --> | ||||
|         <div class="search-wrapper"> | ||||
|             <label for="name" class="sr-only">Suche</label> | ||||
|             <input type="search" | ||||
|                    name="name" | ||||
|                    id="filter-js" | ||||
|                    class="search-bar" | ||||
|                    placeholder="Suchen nach (Name, [yes|no]-role:<name>)" /> | ||||
|         </div> | ||||
| 			{% endfor %} | ||||
| 		</div> | ||||
|  | ||||
| 	</div> | ||||
|  | ||||
|         <!-- END filterBar --> | ||||
|         <div class="bg-primary-100 dark:bg-primary-950 p-3 rounded-b-md grid gap-4"> | ||||
|             <div id="filter-result-js" | ||||
|                  class="text-primary-950 dark:text-white text-right"></div> | ||||
|             {% for user in users %} | ||||
|                 <div data-filterable="true" | ||||
|                      data-filter="{{ user.name }} {% for role in roles %} {% if role.name in user.roles %} yes-role:{{ role.name }} {% else %} no-role:{{ role.name }} {% endif %} role-{{ role }} {% endfor %}  "> | ||||
|                     <form action="/admin/user" | ||||
|                           method="post" | ||||
|                           class="bg-white dark:bg-primary-900 p-3 rounded-md w-full"> | ||||
|                         <div class="w-full grid gap-3"> | ||||
|                             <input type="hidden" name="id" value="{{ user.id }}" /> | ||||
|                             <div class="font-bold mb-1 text-black dark:text-white"> | ||||
|                                 {{ user.name }} | ||||
|                                 {% if user.last_access %} | ||||
|                                     (last access: | ||||
|                                     {{ user.last_access | date }}) | ||||
|                                 {% endif %} | ||||
|                                 {% if user.pw %} | ||||
|                                     <a class="block mt-1 font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline" | ||||
|                                        href="/admin/user/{{ user.id }}/reset-pw">Passwort zurücksetzen</a> | ||||
|                                 {% endif %} | ||||
|                             </div> | ||||
|                             <div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3"> | ||||
|                                 {% for role in roles %} | ||||
|                                     {{ macros::checkbox(label=role.name, name="roles[" ~ role.id ~ "]", id=loop.index , checked=role.name in user.roles, disabled=allowed_to_edit == false) }} | ||||
|                                 {% endfor %} | ||||
|                                 {{ macros::input(label='DOB', name='dob', id=loop.index, type="text", value=user.dob, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Weight (kg)', name='weight', id=loop.index, type="text", value=user.weight, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Sex', name='sex', id=loop.index, type="text", value=user.sex, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Mitglied seit', name='member_since_date', id=loop.index, type="text", value=user.member_since_date, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Geburtsdatum', name='birthdate', id=loop.index, type="text", value=user.birthdate, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Mail', name='mail', id=loop.index, type="text", value=user.mail, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Nickname', name='nickname', id=loop.index, type="text", value=user.nickname, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Notizen', name='notes', id=loop.index, type="text", value=user.notes, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Telefon', name='phone', id=loop.index, type="text", value=user.phone, readonly=allowed_to_edit == false) }} | ||||
|                                 {{ macros::input(label='Adresse', name='address', id=loop.index, type="text", value=user.address, readonly=allowed_to_edit == false) }} | ||||
|                                 {% if allowed_to_edit %} | ||||
|                                     {{ macros::select(label="Familie", data=families, name='family_id', selected_id=user.family_id, display=['names'], default="Keine Familie", new_last_entry='Neue Familie anlegen') }} | ||||
|                                 {% endif %} | ||||
|                             </div> | ||||
|                         </div> | ||||
|                         {% if allowed_to_edit %} | ||||
|                             <div class="mt-3 text-right"> | ||||
|                                 <a href="/admin/user/{{ user.id }}/delete" | ||||
|                                    class="w-28 btn btn-alert" | ||||
|                                    onclick="return confirm('Wirklich löschen?');"> | ||||
|                                     {% include "includes/delete-icon" %} | ||||
|                                     Löschen | ||||
|                                 </a> | ||||
|                                 <input value="Ändern" type="submit" class="w-28 btn btn-primary ml-1" /> | ||||
|                             </div> | ||||
|                         {% endif %} | ||||
|                     </form> | ||||
|                 </div> | ||||
|             {% endfor %} | ||||
|         </div> | ||||
|     </div> | ||||
| {% endblock content %} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user