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

Merge pull request 'boatshouse' (#259) from boatshouse into staging
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
Details
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details

Browse Source 
Reviewed-on: #259
This commit is contained in:
philipp 2024-03-09 16:59:56 +01:00
commit 2445e82c69
17 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/admin/boat/index.html.tera
View File

@ -2,7 +2,6 @@
{% 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() }}

1
templates/admin/list/index.html.tera
View File

@ -1,7 +1,6 @@
{% import "includes/macros" as macros %}
{% 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">List</h1>
<form action="/admin/list" method="post">

1
templates/admin/list/result.html.tera
View File

@ -1,7 +1,6 @@
{% import "includes/macros" as macros %}
{% 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">List - Result</h1>
<ol>

1
templates/admin/mail.html.tera
View File

@ -2,7 +2,6 @@
{% 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">

1
templates/admin/schnupper/index.html.tera
View File

@ -2,7 +2,6 @@
{% 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">Schnupper Verwaltung</h1>
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"

1
templates/admin/user/fees.html.tera
View File

@ -2,7 +2,6 @@
{% 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">

1
templates/admin/user/index.html.tera
View File

@ -2,7 +2,6 @@
{% 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"

1
templates/admin/user/scheckbuch.html.tera
View File

@ -3,7 +3,6 @@
{% 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">Scheckbücher</h1>
<!-- START filterBar -->
<div class="search-wrapper">

7
templates/base.html.tera
View File

@ -25,7 +25,12 @@
</div>
</header>
{% endif %}
<div class="flex min-h-screen {% if not loggedin_user and not show_kiosk_header %} items-center dark:bg-primary-900 {% else %} items-start {% endif %} justify-center px-4 py-12 sm:px-6 lg:px-8">
<div class="flex flex-wrap min-h-screen {% if not loggedin_user and not show_kiosk_header %} items-center dark:bg-primary-900 {% else %} items-start {% endif %} justify-center px-4 py-12 sm:px-6 lg:px-8">
{% if flash and loggedin_user %}
<div class="max-w-screen-lg w-full mb-3">
{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
</div>
{% endif %}
{% block content %}
{% endblock content %}
</div>

19
templates/board/boathouse.html.tera
View File

@ -3,11 +3,11 @@
{% import "includes/forms/boat" as boat %}
{% extends "base" %}
{% macro show_place(aisle_name, side_name, level) %}
<li>
<li class="truncate p-2 flex relative w-full">
{% set aisle = aisle_name ~ "-aisle" %}
{% set place = boathouse[aisle][side_name] %}
{% if place[level] %}
{{ place[level].1.name }} <a href="/board/boathouse/{{ place[level].0 }}/delete">X</a>
{{ place[level].1.name }} <a class="btn btn-primary absolute end-0" href="/board/boathouse/{{ place[level].0 }}/delete">X</a>
{% elif boats | length > 0 %}
<details>
<summary>Kein Boot</summary>
@ -36,18 +36,19 @@
</ol>
</div>
{% endmacro show_side %}
{% macro show_aisle(name) %}
<div id="{{ name }}-aisle">
{% macro show_aisle(name, last=false) %}
<div id="{{ name }}-aisle" class="grid grid-cols-2 gap-4 {% if not last %}md:border-r{% endif %}">
{{ self::show_side(aisle_name = name, side_name = "mountain") }}
{{ self::show_side(aisle_name = name, side_name = "water") }}
</div>
{% endmacro show_aisle %}
{% 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">
<div class="max-w-screen-lg w-full dark:text-white">
<h1 class="h1">Bootshaus</h1>
{{ self::show_aisle(name = "mountain") }}
{{ self::show_aisle(name = "middle") }}
{{ self::show_aisle(name = "water") }}
<div class="grid md:grid-cols-3 gap-4">
{{ self::show_aisle(name = "mountain") }}
{{ self::show_aisle(name = "middle") }}
{{ self::show_aisle(name = "water", last = true) }}
</div>
</div>
{% endblock content %}

1
templates/boatdamages.html.tera
View File

@ -4,7 +4,6 @@
{% block content %}
<div class="max-w-screen-lg w-full">
<h1 class="h1">Bootschäden</h1>
{% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3 mt-3") }}{% endif %}
<h2 class="text-md font-bold tracking-wide bg-primary-900 mt-3 p-3 text-white flex justify-between items-center rounded-md">
Neuen Schaden
<a href="#"

1
templates/ergo.final.html.tera
View File

@ -2,7 +2,6 @@
{% 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">Aktuelle Woche</h1>
<details>
<summary>Dirty Thirty</summary>

1
templates/ergo.html.tera
View File

@ -3,7 +3,6 @@
{% block content %}
<div class="max-w-screen-lg w-full">
<h1 class="h1">Ergo Challenges</h1>
{% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="my-3") }}{% endif %}
<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">

1
templates/index.html.tera
View File

@ -2,7 +2,6 @@
{% 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">Ruderassistent</h1>
<div class="grid gap-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"

2
templates/kiosk.html.tera
View File

@ -4,7 +4,7 @@
{% block content %}
<div class="w-full">
<h1 class="h1">Logbuch</h1>
{% if flash %}
{% if flash and not loggedin_user %}
<div class="pt-3 max-w-lg m-auto">
{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
</div>

3
templates/log.html.tera
View File

@ -4,9 +4,6 @@
{% block content %}
<div class="w-full">
<h1 class="h1">Logbuch</h1>
{% if flash %}
<div class="w-full">{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}</div>
{% endif %}
<div class="w-full grid md:grid-cols-5 gap-3 mt-5">
<div class="bg-white dark:bg-primary-900 rounded-md hidden md:block shadow">
<h2 class="h2">Boote</h2>

1
templates/planned.html.tera
View File

@ -3,7 +3,6 @@
{% extends "base" %}
{% block content %}
<div class="max-w-screen-xl w-full grid sm:grid-cols-2 lg:grid-cols-3 gap-4">
{% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
{% if "scheckbuch" in loggedin_user.roles %}
<div class="grid gap-3 sm:col-span-2 lg:col-span-3">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"