[TASK] add header
This commit is contained in:
Marie Birner
@@ -1,7 +1,8 @@
|
|||||||
|
{% import "includes/macros" as macros %}
|
||||||
|
|
||||||
{% extends "base" %}
|
{% extends "base" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
<div class="max-w-screen-lg w-full grid gap-4">
|
<div class="max-w-screen-lg w-full grid gap-4">
|
||||||
<h1 class="text-center text-3xl uppercase tracking-wide font-bold text-primary-900">Users</h1>
|
<h1 class="text-center text-3xl uppercase tracking-wide font-bold text-primary-900">Users</h1>
|
||||||
|
|
||||||
|
|||||||
@@ -1,29 +1,24 @@
|
|||||||
{% extends "base" %}
|
{% extends "base" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
{% if flash %}
|
|
||||||
{% if flash.0 == "success" %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="one-column p-1 text-white bg-green mb-3 light text-center">
|
|
||||||
{{ flash.1 }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if flash.0 == "error" %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="one-column p-1 text-white bg-red mb-3 bold text-center">
|
|
||||||
{{ flash.1 }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<div class="w-full max-w-md space-y-8">
|
<div class="w-full max-w-md space-y-8">
|
||||||
<div>
|
<div>
|
||||||
<img class="mx-auto h-16 w-auto" src="https://rudernlinz.at/wp-content/uploads/2021/02/cropped-logo.png" alt="Your Company">
|
<img class="mx-auto h-16 w-auto" src="https://rudernlinz.at/wp-content/uploads/2021/02/cropped-logo.png" alt="Your Company">
|
||||||
<h1 class="mt-6 text-center text-3xl uppercase tracking-wide font-bold text-primary-900">Ruderassistent</h1>
|
<h1 class="mt-6 text-center text-3xl uppercase tracking-wide font-bold text-primary-900">Ruderassistent</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{% if flash %}
|
||||||
|
{% if flash.0 == "success" %}
|
||||||
|
<div class="bg-[#4ade80] text-white px-3 py-1 rounded-md text-center">
|
||||||
|
{{ flash.1 }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if flash.0 == "error" %}
|
||||||
|
<div class="bg-[#f43f5e] text-white px-3 py-1 rounded-md text-center">
|
||||||
|
{{ flash.1 }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
<form class="mt-8 space-y-6" method="post" action="/auth">
|
<form class="mt-8 space-y-6" method="post" action="/auth">
|
||||||
<input type="hidden" name="remember" value="true">
|
<input type="hidden" name="remember" value="true">
|
||||||
<div class="-space-y-px rounded-md shadow-sm">
|
<div class="-space-y-px rounded-md shadow-sm">
|
||||||
@@ -49,6 +44,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
{% import "includes/macros" as macros %}
|
||||||
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="de">
|
<html lang="de">
|
||||||
<head>
|
<head>
|
||||||
@@ -5,10 +7,13 @@
|
|||||||
<link rel="stylesheet" href="/public/main.css">
|
<link rel="stylesheet" href="/public/main.css">
|
||||||
</head>
|
</head>
|
||||||
<body class="bg-gray-100">
|
<body class="bg-gray-100">
|
||||||
|
{%if loggedin_user %}
|
||||||
|
{{ macros::header(loggedin_user=loggedin_user) }}
|
||||||
|
{%endif%}
|
||||||
|
|
||||||
<div class="flex min-h-screen items-center justify-center px-4 py-12 sm:px-6 lg:px-8">
|
<div class="flex min-h-screen items-center justify-center px-4 py-12 sm:px-6 lg:px-8">
|
||||||
{% block content %}
|
{% block content %}{% endblock content %}
|
||||||
{% endblock content %}
|
</div>
|
||||||
</div>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
|||||||
23
templates/includes/macros.html.tera
Normal file
23
templates/includes/macros.html.tera
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{% macro header(loggedin_user) %}
|
||||||
|
<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full">
|
||||||
|
<div class="max-w-screen-lg w-full flex justify-between">
|
||||||
|
<div>
|
||||||
|
Hallo {{ loggedin_user.name }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
{% if loggedin_user.is_admin %}
|
||||||
|
<a href="/admin/user" class="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" class="rounded-md bg-primary-600 ml-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="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg>
|
||||||
|
<span class="sr-only">Ausloggen</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
<div class="h-8"></div>
|
||||||
|
{% endmacro input %}
|
||||||
@@ -1,128 +1,113 @@
|
|||||||
{% extends "base" %}
|
{% extends "base" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
<div class="max-w-screen-lg w-full grid gap-4">
|
||||||
<div class="max-w-screen-lg w-full grid gap-4">
|
{% if flash %}
|
||||||
{% if loggedin_user %}
|
{% if flash.0 == "success" %}
|
||||||
Hi {{ loggedin_user.name }}. <a href="/auth/logout">LOGOUT</a>
|
<div class="bg-[#4ade80] text-white px-3 py-1 rounded-md text-center">
|
||||||
|
{{ flash.1 }}
|
||||||
{% if loggedin_user.is_admin %}
|
</div>
|
||||||
<a href="/admin/user">USER</a>
|
{% endif %}
|
||||||
|
{% if flash.0 == "error" %}
|
||||||
|
<div class="bg-[#f43f5e] text-white px-3 py-1 rounded-md text-center">
|
||||||
|
{{ flash.1 }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if flash %}
|
<h1 class="text-center text-3xl uppercase tracking-wide font-bold text-primary-900">Ausfahrten</h1>
|
||||||
{% if flash.0 == "success" %}
|
|
||||||
<div class="row">
|
{% for day in days %}
|
||||||
<div class="one-column p-1 text-white bg-green mb-3 light text-center">
|
<div class="bg-white p-3 rounded-md flex items-end md:items-center justify-between">
|
||||||
{{ flash.1 }}
|
<h2>{{ day.day }}</h2>
|
||||||
</div>
|
|
||||||
</div>
|
{% for planned_event in day.planned_events %}
|
||||||
|
<h3>Planned event '{{ planned_event.name }}'</h3>
|
||||||
|
Planned amount cox: {{ planned_event.planned_amount_cox }}<br />
|
||||||
|
Allow guests: {{ planned_event.allow_guests }}<br />
|
||||||
|
Planned starting time: {{ planned_event.planned_starting_time }}<br />
|
||||||
|
Max people: {{ planned_event.max_people }}<br />
|
||||||
|
Notes: {{ planned_event.notes }}<br />
|
||||||
|
Folgende Steuerpersonen haben sich schon angemeldet:
|
||||||
|
{% for cox in planned_event.cox %}
|
||||||
|
{{ cox }}
|
||||||
|
{% if cox == loggedin_user.name %}
|
||||||
|
<a href="/cox/remove/{{ planned_event.id }}">ABMELDEN</a>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
<br />
|
||||||
|
|
||||||
|
Folgende Ruderer haben sich schon angemeldet:
|
||||||
|
{% for rower in planned_event.rower%}
|
||||||
|
{{ rower.name }} (angemeldet seit {{ rower.registered_at }})
|
||||||
|
{% if rower.name == loggedin_user.name %}
|
||||||
|
<a href="/remove/{{ planned_event.trip_details_id }}">ABMELDEN</a>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if planned_event.max_people > planned_event.rower | length %}
|
||||||
|
<a href="/join/{{ planned_event.trip_details_id }}">MITRUDERN</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if flash.0 == "error" %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="one-column p-1 text-white bg-red mb-3 bold text-center">
|
{% if loggedin_user.is_cox %}
|
||||||
{{ flash.1 }}
|
<a href="/cox/join/{{ planned_event.id }}">STEUERN</a>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<h1 class="text-center text-3xl uppercase tracking-wide font-bold text-primary-900">Ausfahrten</h1>
|
{% if loggedin_user.is_admin %}
|
||||||
|
<a href="/admin/planned-event/{{ planned_event.id }}/delete">DELETE</a>
|
||||||
|
|
||||||
|
|
||||||
{% for day in days %}
|
|
||||||
<div class="bg-white p-3 rounded-md flex items-end md:items-center justify-between">
|
|
||||||
<h2>{{ day.day }}</h2>
|
|
||||||
|
|
||||||
{% for planned_event in day.planned_events %}
|
|
||||||
<h3>Planned event '{{ planned_event.name }}'</h3>
|
|
||||||
Planned amount cox: {{ planned_event.planned_amount_cox }}<br />
|
|
||||||
Allow guests: {{ planned_event.allow_guests }}<br />
|
|
||||||
Planned starting time: {{ planned_event.planned_starting_time }}<br />
|
|
||||||
Max people: {{ planned_event.max_people }}<br />
|
|
||||||
Notes: {{ planned_event.notes }}<br />
|
|
||||||
Folgende Steuerpersonen haben sich schon angemeldet:
|
|
||||||
{% for cox in planned_event.cox %}
|
|
||||||
{{ cox }}
|
|
||||||
{% if cox == loggedin_user.name %}
|
|
||||||
<a href="/cox/remove/{{ planned_event.id }}">ABMELDEN</a>
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
<br />
|
|
||||||
|
|
||||||
Folgende Ruderer haben sich schon angemeldet:
|
|
||||||
{% for rower in planned_event.rower%}
|
|
||||||
{{ rower.name }} (angemeldet seit {{ rower.registered_at }})
|
|
||||||
{% if rower.name == loggedin_user.name %}
|
|
||||||
<a href="/remove/{{ planned_event.trip_details_id }}">ABMELDEN</a>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
{% if planned_event.max_people > planned_event.rower | length %}
|
|
||||||
<a href="/join/{{ planned_event.trip_details_id }}">MITRUDERN</a>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
|
{% for trip in day.trips %}
|
||||||
|
<h3>Ausfahrt von {{ trip.cox_name }}</h3>
|
||||||
|
Planned starting time: {{ trip.planned_starting_time }}<br />
|
||||||
|
Max people: {{ trip.max_people }}<br />
|
||||||
|
Notes: {{ trip.notes }}<br />
|
||||||
|
Folgende Ruderer haben sich schon angemeldet:
|
||||||
|
{% for rower in trip.rower %}
|
||||||
|
{{ rower.name }} (angemeldet seit {{ rower.registered_at }})
|
||||||
|
{% if rower.name == loggedin_user.name %}
|
||||||
|
<a href="/remove/{{ trip.trip_details_id }}">ABMELDEN</a>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
{% if loggedin_user.is_cox %}
|
{% if trip.max_people > trip.rower | length and trip.cox_id != loggedin_user.id %}
|
||||||
<a href="/cox/join/{{ planned_event.id }}">STEUERN</a>
|
<a href="/join/{{ trip.trip_details_id }}">MITRUDERN</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
{% if loggedin_user.is_admin %}
|
{% if loggedin_user.is_admin %}
|
||||||
<a href="/admin/planned-event/{{ planned_event.id }}/delete">DELETE</a>
|
<h3>Add planned event</h3>
|
||||||
|
<form action="/admin/planned-event" method="post">
|
||||||
|
<input type="hidden" name="day" value="{{ day.day }}" />
|
||||||
|
<input type="text" name="name" placeholder="name (e.g. USI)" />
|
||||||
|
<input type="number" name="planned_amount_cox" placeholder="Anzahl Steuerleute" />
|
||||||
|
Gäste <input type="checkbox" name="allow_guests" />
|
||||||
|
<input type="text" name="planned_starting_time" placeholder="Startzeit" />
|
||||||
|
<input type="number" name="max_people" placeholder="Anzahl Ruderer" />
|
||||||
|
<input type="text" name="notes" placeholder="Anmerkungen" />
|
||||||
|
|
||||||
|
<input type="submit" />
|
||||||
|
</form>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
|
{% if loggedin_user.is_cox%}
|
||||||
|
<h3>Add trip</h3>
|
||||||
|
<form action="/cox/trip" method="post">
|
||||||
|
<input type="hidden" name="day" value="{{ day.day }}" />
|
||||||
|
<input type="text" name="planned_starting_time" placeholder="Startzeit" />
|
||||||
|
<input type="number" name="max_people" placeholder="Anzahl Ruderer" />
|
||||||
|
<input type="text" name="notes" placeholder="Anmerkungen" />
|
||||||
|
|
||||||
{% for trip in day.trips %}
|
<input type="submit" />
|
||||||
<h3>Ausfahrt von {{ trip.cox_name }}</h3>
|
</form>
|
||||||
Planned starting time: {{ trip.planned_starting_time }}<br />
|
|
||||||
Max people: {{ trip.max_people }}<br />
|
|
||||||
Notes: {{ trip.notes }}<br />
|
|
||||||
Folgende Ruderer haben sich schon angemeldet:
|
|
||||||
{% for rower in trip.rower %}
|
|
||||||
{{ rower.name }} (angemeldet seit {{ rower.registered_at }})
|
|
||||||
{% if rower.name == loggedin_user.name %}
|
|
||||||
<a href="/remove/{{ trip.trip_details_id }}">ABMELDEN</a>
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
{% if trip.max_people > trip.rower | length and trip.cox_id != loggedin_user.id %}
|
|
||||||
<a href="/join/{{ trip.trip_details_id }}">MITRUDERN</a>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
</div>
|
||||||
{% if loggedin_user.is_admin %}
|
|
||||||
<h3>Add planned event</h3>
|
|
||||||
<form action="/admin/planned-event" method="post">
|
|
||||||
<input type="hidden" name="day" value="{{ day.day }}" />
|
|
||||||
<input type="text" name="name" placeholder="name (e.g. USI)" />
|
|
||||||
<input type="number" name="planned_amount_cox" placeholder="Anzahl Steuerleute" />
|
|
||||||
Gäste <input type="checkbox" name="allow_guests" />
|
|
||||||
<input type="text" name="planned_starting_time" placeholder="Startzeit" />
|
|
||||||
<input type="number" name="max_people" placeholder="Anzahl Ruderer" />
|
|
||||||
<input type="text" name="notes" placeholder="Anmerkungen" />
|
|
||||||
|
|
||||||
<input type="submit" />
|
|
||||||
</form>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if loggedin_user.is_cox%}
|
|
||||||
<h3>Add trip</h3>
|
|
||||||
<form action="/cox/trip" method="post">
|
|
||||||
<input type="hidden" name="day" value="{{ day.day }}" />
|
|
||||||
<input type="text" name="planned_starting_time" placeholder="Startzeit" />
|
|
||||||
<input type="number" name="max_people" placeholder="Anzahl Ruderer" />
|
|
||||||
<input type="text" name="notes" placeholder="Anmerkungen" />
|
|
||||||
|
|
||||||
<input type="submit" />
|
|
||||||
</form>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
|
|||||||
Reference in New Issue
Block a user