Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

[TASK] style notifications, add rowing icon and refactor menu
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details
CI/CD Pipeline / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Marie Birner 2024-03-21 20:42:49 +01:00
parent d1067988c6
commit 7050d68293
3 changed files with 154 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
templates/includes/macros.html.tera
View File

@ -16,22 +16,12 @@
<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10"> <header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">
<div class="max-w-screen-xl w-full flex justify-between items-center"> <div class="max-w-screen-xl w-full flex justify-between items-center">
<div class="w-1/3 truncate"> <div class="w-1/3 truncate">
{% if "Donau Linz" in loggedin_user.roles %}
<a href="/planned">
{% else %}
<a href="/"> <a href="/">
{% endif %}
Hü Hü
{{ loggedin_user.name }} {{ loggedin_user.name }}
</a> </a>
</div> </div>
<div> <div>
<a href="https://wiki.rudernlinz.at/ruderassistent#faq"
target="_blank"
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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">
{% include "includes/question-icon" %}
<span class="sr-only">FAQs</span>
</a>
{% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %} {% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
<a href="#" <a href="#"
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"
@ -63,6 +53,12 @@
<a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a> <a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a>
<a href="/log/show" <a href="/log/show"
class="block w-100 py-2 hover:text-primary-600 border-t">Logbuch</a> class="block w-100 py-2 hover:text-primary-600 border-t">Logbuch</a>
{% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
<a href="/admin/user"
class="block w-100 py-2 hover:text-primary-600 border-t">
Userverwaltung
</a>
{% endif %}
{% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %} {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
<a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a> <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
{% endif %} {% endif %}
@ -78,20 +74,6 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
<a href="/admin/user"
class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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">
<svg class="inline h-4"
width="16"
height="16"
fill="currentColor"
class="bi bi-person-lines-fill"
viewbox="0 0 16 16">
<path d="M6 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-5 6s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zM11 3.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5zm.5 2.5a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1h-4zm2 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2zm0 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2z" />
</svg>
<span class="sr-only">Userverwaltung</span>
</a>
{% endif %}
<a href="/auth/logout" <a href="/auth/logout"
class="inline-flex justify-center rounded-md bg-gray-200 ml-1 px-3 py-2 text-sm font-semibold text-primary-950 hover:bg-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"> class="inline-flex justify-center rounded-md bg-gray-200 ml-1 px-3 py-2 text-sm font-semibold text-primary-950 hover:bg-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
<svg class="inline h-4" <svg class="inline h-4"

18
templates/includes/rowing-icon.html.tera Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" class="flex-shrink-0 w-6 h-6 inline-block" height="100%" viewBox="0 0 583 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(1,0,0,1,-1574,-536.199)">
<g transform="matrix(1,0,0,1,0,10.8235)">
<g transform="matrix(0.948324,0.317305,0.307947,-0.920356,-304.665,1886.18)">
<rect x="1838.29" y="1006.52" width="17.353" height="644.204" style="fill:white;fill-opacity:0.7;"/>
</g>
<path d="M1944.68,934.772C1921.09,896.523 1932.18,782.181 1974.56,655.531C1990.23,608.676 2009.04,563.787 2029.1,525.376L2156.88,568.132C2149.78,610.876 2137.79,658.046 2122.11,704.901C2079.26,832.966 2018.43,931.728 1976.52,946.409L2085.08,568.504L1944.68,934.772Z" style="fill:white;fill-opacity:0.7;"/>
</g>
<g transform="matrix(-1,0,0,1,3730.88,10.8235)">
<g transform="matrix(0.948324,0.317305,0.307947,-0.920356,-304.665,1886.18)">
<rect x="1838.29" y="1006.52" width="17.353" height="644.204" style="fill:white;fill-opacity:0.7;"/>
</g>
<path d="M1944.68,934.772C1921.09,896.523 1932.18,782.181 1974.56,655.531C1990.23,608.676 2009.04,563.787 2029.1,525.376L2156.88,568.132C2149.78,610.876 2137.79,658.046 2122.11,704.901C2079.26,832.966 2018.43,931.728 1976.52,946.409L2085.08,568.504L1944.68,934.772Z" style="fill:white;fill-opacity:0.7;"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

161
templates/index.html.tera
View File

@ -3,197 +3,178 @@
{% block content %} {% block content %}
<div class="max-w-screen-lg w-full"> <div class="max-w-screen-lg w-full">
<h1 class="h1">Ruderassistent</h1> <h1 class="h1">Ruderassistent</h1>
<div class="grid gap-3"> <div class="grid gap-3 my-5">
<div class="m-auto">
<a href="/planned" class="btn btn-primary flex items-center justify-center">
{% include "includes/rowing-icon" %}
<span class="text-xl px-3">Geplante Ausfahrten</span>
</a>
</div>
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2">Nachrichten</h2> <h2 class="h2">Nachrichten</h2>
<div class="text-sm p-3"> <div class="divide-y">
{% for notification in notifications %} {% for notification in notifications %}
{% if not notification.read_at %} {% if not notification.read_at %}
<div class="relative flex bg-clip-border rounded-xl bg-white text-gray-700 shadow-md w-full flex-row"> <div class="relative flex justify-between items-center p-3">
<div class="p-6"> <div class="grow me-4">
<h6 class="block mb-4 font-sans text-base antialiased font-semibold leading-relaxed tracking-normal text-gray-700 uppercase"> <small class="uppercase text-gray-600 dark:text-gray-100">
{{ notification.category }} <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
</h6> </small>
<h4 class="block mb-2 font-sans text-2xl antialiased font-semibold leading-snug tracking-normal text-blue-gray-900"> <div class="mt-1">
{{ notification.message }} {{ notification.message }}
</h4> </div>
<p class="block mb-8 font-sans text-base antialiased font-normal leading-relaxed text-gray-700"> </div>
{{ notification.created_at | date(format="%d.%m.%Y %H:%M") }} <div>
</p>
{% if not notification.read_at %} {% if not notification.read_at %}
<a href="/notification/{{ notification.id }}/read" class="inline-block"> <a href="/notification/{{ notification.id }}/read" class="inline-block">
<button class="flex items-center gap-2 px-6 py-3 font-sans text-xs font-bold text-center text-gray-900 uppercase align-middle transition-all rounded-lg select-none disabled:opacity-50 disabled:shadow-none disabled:pointer-events-none hover:bg-gray-900/10 active:bg-gray-900/20" <button class="btn btn-primary"
type="button">Als gelesen markieren</button> type="button">
&#10003;
<span class="sr-only">Notification gelesen</span>
</button>
</a> </a>
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<details> </div>
<summary>Vergangene Nachrichten</summary>
<details class="py-3 bg-gray-200 dark:bg-primary-950 rounded-b-md">
<summary class="px-3">Vergangene Nachrichten</summary>
<div class="divide-y text-sm">
{% for notification in notifications %} {% for notification in notifications %}
{% if notification.read_at %} {% if notification.read_at %}
<div class="relative flex bg-clip-border rounded-xl bg-white text-gray-700 shadow-md w-full flex-row"> <div class="p-3 relative">
<div class="p-6"> <small class="uppercase text-gray-600 dark:text-gray-100">
<h6 class="block mb-4 font-sans text-base antialiased font-semibold leading-relaxed tracking-normal text-gray-700 uppercase"> <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
{{ notification.category }} </small>
</h6> <div class="mt-1">
<h4 class="block mb-2 font-sans text-2xl antialiased font-semibold leading-snug tracking-normal text-blue-gray-900">
{{ notification.message }} {{ notification.message }}
</h4>
<p class="block mb-8 font-sans text-base antialiased font-normal leading-relaxed text-gray-700">
{{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
</p>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div>
</details> </details>
</div> </div>
</div>
</div>
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert">
<h2 class="h2">Allgemein</h2>
<div class="text-sm p-3">
<ul class="list-disc ms-2">
<li class="py-1">
<a href="https://wiki.rudernlinz.at/ruderassistent#faq"
target="_blank"
class="link-primary">FAQ (extern)</a>
</li>
</ul>
</div>
</div>
</div>
{% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %} {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2">Ergo</h2> <h2 class="h2">Ergo</h2>
<div class="text-sm p-3"> <div class="p-3">
<ul class="list-disc ms-2"> <ul class="list-none ms-2">
<li class="py-1"> <li class="py-1">
<a href="/ergo" class="link-primary">Ergo</a> <a href="/ergo" class="block w-100 py-2 hover:text-primary-600">Ergo</a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</div>
{% endif %} {% endif %}
{% if "Donau Linz" in loggedin_user.roles and "Unterstützend" not in loggedin_user.roles and "Förderndes Mitglied" not in loggedin_user.roles %} {% if "Donau Linz" in loggedin_user.roles and "Unterstützend" not in loggedin_user.roles and "Förderndes Mitglied" not in loggedin_user.roles %}
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2">Aktives Vereinsmitglied</h2> <h2 class="h2">Aktives Vereinsmitglied</h2>
<div class="text-sm p-3"> <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
<ul class="list-disc ms-2">
<li class="py-1"> <li class="py-1">
<a href="/planned" class="link-primary">Geplante Ausfahrten</a> <a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/log" class="link-primary">Ausfahrt eintragen</a> <a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/log/show" class="link-primary">Logbuch</a> <a href="/log/show" class="block w-100 py-2 hover:text-primary-600">Logbuch</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/stat" class="link-primary">Statistik</a> <a href="/stat" class="block w-100 py-2 hover:text-primary-600">Statistik</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/stat/boats" class="link-primary">Bootsauswertung</a> <a href="/stat/boats" class="block w-100 py-2 hover:text-primary-600">Bootsauswertung</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/boatdamage" class="link-primary">Bootsschaden</a> <a href="/boatdamage" class="block w-100 py-2 hover:text-primary-600">Bootsschaden</a>
</li> </li>
</ul> </ul>
</div> </div>
</div>
</div>
{% endif %} {% endif %}
{% if "scheckbuch" in loggedin_user.roles %} {% if "scheckbuch" in loggedin_user.roles %}
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2">Scheckbuch</h2> <h2 class="h2">Scheckbuch</h2>
<div class="text-sm p-3"> <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
<ul class="list-disc ms-2">
<li class="py-1"> <li class="py-1">
<a href="/planned" class="link-primary">Geplante Ausfahrten</a> <a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
</li> </li>
</ul> </ul>
</div> </div>
</div>
</div>
{% endif %} {% endif %}
{% if "schnupper-betreuer" in loggedin_user.roles %} {% if "schnupper-betreuer" in loggedin_user.roles %}
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2">Schnupper-Betreuer</h2> <h2 class="h2">Schnupper-Betreuer</h2>
<div class="text-sm p-3"> <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
<ul class="list-disc ms-2">
<li class="py-1"> <li class="py-1">
<a href="/admin/schnupper" class="link-primary">Schnuppern</a> <a href="/admin/schnupper" class="block w-100 py-2 hover:text-primary-600">Schnuppern</a>
</li> </li>
</ul> </ul>
</div> </div>
</div>
</div>
{% endif %} {% endif %}
{% if "Vorstand" in loggedin_user.roles %} {% if "Vorstand" in loggedin_user.roles %}
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2">Vorstand</h2> <h2 class="h2">Vorstand</h2>
<div class="text-sm p-3"> <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
<ul class="list-disc ms-2">
<li class="py-1"> <li class="py-1">
<a href="/admin/user/fees" class="link-primary">Übersicht User Gebühren</a> <a href="/admin/user/fees" class="block w-100 py-2 hover:text-primary-600">Übersicht User Gebühren</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/admin/user/scheckbuch" class="link-primary">Scheckbuch</a> <a href="/admin/user/scheckbuch" class="block w-100 py-2 hover:text-primary-600">Scheckbuch</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/admin/user" class="link-primary">User</a> <a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/board/boathouse" class="link-primary">Bootshaus</a> <a href="/board/boathouse" class="block w-100 py-2 hover:text-primary-600">Bootshaus</a>
</li> </li>
</ul> </ul>
</div> </div>
</div>
</div>
{% endif %} {% endif %}
{% if "admin" in loggedin_user.roles %} {% if "admin" in loggedin_user.roles %}
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2">Admin</h2> <h2 class="h2">Admin</h2>
<div class="text-sm p-3"> <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
<ul class="list-disc ms-2">
<li class="py-1"> <li class="py-1">
<a href="/admin/boat" class="link-primary">Boote</a> <a href="/admin/boat" class="block w-100 py-2 hover:text-primary-600">Boote</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/admin/user" class="link-primary">User</a> <a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/admin/mail" class="link-primary">Mail (beautifully layouted)</a> <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail (beautifully layouted)</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/admin/rss" class="link-primary">Logs</a> <a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>
</li> </li>
<li class="py-1"> <li class="py-1">
<a href="/admin/list" class="link-primary">Fingerabdruck-Liste überprüfen</a> <a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a>
</li>
</ul>
</div>
{% endif %}
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert">
<h2 class="h2">Allgemein</h2>
<div class="p-3">
<ul class="list-none ms-2">
<li class="py-1">
<a href="https://wiki.rudernlinz.at/ruderassistent#faq"
target="_blank"
class="block w-100 py-2 hover:text-primary-600">FAQ (extern)</a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
{% endif %}
</div>
{% endblock content %} {% endblock content %}