Compare commits

..

5 Commits

Author SHA1 Message Date
0318d1dfb2 Merge pull request 'impressum' (#504) from impressum into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m58s
CI/CD Pipeline / deploy-staging (push) Successful in 6m4s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #504
2024-05-17 12:29:20 +02:00
261753c6b4 reformat
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m58s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-05-17 12:28:45 +02:00
d0038677ca add last data field
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-05-17 12:27:58 +02:00
4bd91b2a7e add impressum
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-05-17 12:26:10 +02:00
17f4291af0 Merge pull request 'marie-magic' (#501) from marie-magic into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m20s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 6m18s
Reviewed-on: #501
2024-05-16 22:46:42 +02:00
3 changed files with 101 additions and 1 deletions

View File

@ -65,6 +65,17 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
Template::render("index", context.into_json()) Template::render("index", context.into_json())
} }
#[get("/impressum")]
async fn impressum(db: &State<SqlitePool>, user: Option<User>) -> Template {
let mut context = Context::new();
if let Some(user) = user {
context.insert("loggedin_user", &UserWithDetails::from_user(user, db).await);
}
Template::render("impressum", context.into_json())
}
#[get("/steering")] #[get("/steering")]
async fn steering(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_>>) -> Template { async fn steering(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_>>) -> Template {
let mut context = Context::new(); let mut context = Context::new();
@ -179,7 +190,7 @@ pub struct Config {
pub fn config(rocket: Rocket<Build>) -> Rocket<Build> { pub fn config(rocket: Rocket<Build>) -> Rocket<Build> {
rocket rocket
.mount("/", routes![index, steering]) .mount("/", routes![index, steering, impressum])
.mount("/auth", auth::routes()) .mount("/auth", auth::routes())
.mount("/wikiauth", routes![wikiauth]) .mount("/wikiauth", routes![wikiauth])
.mount("/log", log::routes()) .mount("/log", log::routes())

View File

@ -0,0 +1,88 @@
{% extends "base" %}
{% block content %}
<div class="max-w-screen-lg w-full">
<h1 class="h1">Impressum</h1>
<div class="grid gap-3 my-5">
<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">
Die Website wird vom ASKÖ Ruderverein Donau Linz betrieben.
<br />
<strong>Postanschrift:</strong>
<br />
ASKÖ Ruderverein Donau Linz
<br />
Heilhamerweg 2
<br />
4040 Linz
<br />
ZVR: 363903285
</div>
</div>
</div>
<div class="grid gap-3 my-5">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert">
<h2 class="h2">Datenschutz</h2>
<div class="p-3">
Folgende Daten werden verarbeitet:
<ul>
<li>
Server-Log Files: IP-Adresse, Adresse der besuchten Seite, Browseragent, Datum und Uhrzeit. Wir nutzen diese Daten nicht und geben Sie in der Regel nicht weiter, können jedoch nicht ausschließen, dass diese Daten beim Vorliegen von rechtswidrigem Verhalten eingesehen werden.
</li>
<li>
Cookie: Diese Website verwendet nur einen Cookie (loggedin_user), der verschlüsselte Informationen über den Login-Status speichert. Weitere Cookies werden nicht verwendet.
</li>
</ul>
</div>
</div>
</div>
{% if loggedin_user %}
<div class="grid gap-3 my-5">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert">
<h2 class="h2">Daten</h2>
<div class="p-3">
Folgende personenbezogenen haben wir von dir gespeichert:
<ul>
<li>Name: {{ loggedin_user.name }}</li>
<li>Passwort (verschlüsselt als argon Hash)</li>
<li>Letzter Zugriff: {{ loggedin_user.last_access }}</li>
<li>Mitglied seit: {{ loggedin_user.member_since_date }}</li>
<li>Geburtsdatum: {{ loggedin_user.birthdate }}</li>
<li>Mail: {{ loggedin_user.mail }}</li>
{% if loggedin_user.nickname %}<li>Spitzname: {{ loggedin_user.nickname }}</li>{% endif %}
<li>Telefonnummer: {{ loggedin_user.phone }}</li>
<li>Adresse: {{ loggedin_user.address }}</li>
<li>(Beitrittserklärung)</li>
{% if loggedin_user.family_id %}
<li>Verbindung zu Familienmitglied (gespeichert um Familientarif anstatt Vollmitglied zu haben)</li>
{% endif %}
<li>Rollen: {{ loggedin_user.roles }} (werden für verschiedene Funktionen im Ruderassistenten verwendet)</li>
<li>Anmeldungen zu Ausfahrten</li>
<li>Anmeldungen zu Events (zB Fetzenfahrt, Anrudern, USI-Rudern, ...)</li>
<li>Logbucheinträge</li>
<li>Selber eingetragene Bootsschäden, solange sie nicht > 1 Monat verifiziert und repariert wurden</li>
<li>Selber eingetragene Bootsreservierung</li>
<li>Boote, sofern es welche im Privatbesitz gibt</li>
</ul>
</div>
</div>
</div>
{% endif %}
<div class="grid gap-3 my-5">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert">
<h2 class="h2">Lizenzen</h2>
<div class="p-3">
<ul>
<li>
Die Wetterdaten werden von <a href="https://openweathermap.org">OpenWeather</a> bereitgestellt.
</li>
</ul>
</div>
</div>
</div>
</div>
{% endblock content %}

View File

@ -6,6 +6,7 @@
style="text-decoration:underline">... und dir?</a> style="text-decoration:underline">... und dir?</a>
</div> </div>
<div> <div>
<a href="/impressum">Impressum</a>
<button id="theme-toggle-js" <button id="theme-toggle-js"
type="button" type="button"
data-theme="light" data-theme="light"