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

Ergo Challenge not Ergo-Challenge. Sth. completely different
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:
philipp 2024-10-25 20:57:21 +02:00
parent f405a3ca15
commit fbad517b56
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tera/ergo.rs
View File

@ -172,7 +172,7 @@ async fn new_user(
// inform all other `ergo` users // inform all other `ergo` users
let ergo = Role::find_by_name(db, "ergo").await.unwrap(); let ergo = Role::find_by_name(db, "ergo").await.unwrap();
Notification::create_for_role(db, &ergo, &format!("{} nimmt heuer an der Ergochallenge teil 💪", user.name), "Ergo-Challenge", None, None).await; Notification::create_for_role(db, &ergo, &format!("{} nimmt heuer an der Ergochallenge teil 💪", user.name), "Ergo Challenge", None, None).await;
// add to `ergo` group // add to `ergo` group
user.add_role(db,&ergo).await.unwrap(); user.add_role(db,&ergo).await.unwrap();
@ -226,7 +226,7 @@ async fn new_thirty(
.await; .await;
let ergo = Role::find_by_name(db, "ergo").await.unwrap(); let ergo = Role::find_by_name(db, "ergo").await.unwrap();
Notification::create_for_role(db, &ergo, &format!("{} ist gerade die Dirty Thirty Challenge gefahren 🥵", user.name), "Ergo-Challenge", Some("/ergo"), None).await; Notification::create_for_role(db, &ergo, &format!("{} ist gerade die Dirty Thirty Challenge gefahren 🥵", user.name), "Ergo Challenge", Some("/ergo"), None).await;
Flash::success(Redirect::to("/ergo"), "Erfolgreich eingetragen") Flash::success(Redirect::to("/ergo"), "Erfolgreich eingetragen")
} }
@ -270,7 +270,7 @@ async fn new_dozen(
.await; .await;
let ergo = Role::find_by_name(db, "ergo").await.unwrap(); let ergo = Role::find_by_name(db, "ergo").await.unwrap();
Notification::create_for_role(db, &ergo, &format!("{} ist gerade die Dirty Dozen Challenge gefahren 🥵", user.name), "Ergo-Challenge", Some("/ergo"), None).await; Notification::create_for_role(db, &ergo, &format!("{} ist gerade die Dirty Dozen Challenge gefahren 🥵", user.name), "Ergo Challenge", Some("/ergo"), None).await;
Flash::success(Redirect::to("/ergo"), "Erfolgreich eingetragen") Flash::success(Redirect::to("/ergo"), "Erfolgreich eingetragen")
} }

2
templates/ergo/index.html.tera
View File

@ -6,7 +6,7 @@
<div class="grid gap-3"> <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-Challenge?!</h2> <h2 class="h2">Ergo Challenge?!</h2>
<div class="p-3"> <div class="p-3">
<ul class="list-disc ms-2"> <ul class="list-disc ms-2">
<li class="py-1"> <li class="py-1">

4
templates/ergo/missing-data.html.tera
View File

@ -3,12 +3,12 @@
{% extends "base" %} {% extends "base" %}
{% block content %} {% block content %}
<div class="max-w-screen-lg w-full dark:text-white"> <div class="max-w-screen-lg w-full dark:text-white">
<h1 class="h1">Ergo-Challenge</h1> <h1 class="h1">Ergo Challenge</h1>
<div class="grid "> <div class="grid ">
<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">
<p class="px-3 pt-3"> <p class="px-3 pt-3">
Schön, dass du heuer bei der Ergo-Challenge mitmachen willst! Schön, dass du heuer bei der Ergo Challenge mitmachen willst!
Dafür benötigen wir 3 Daten: Geburtsjahr, Gewicht und Geschlecht. Dafür benötigen wir 3 Daten: Geburtsjahr, Gewicht und Geschlecht.
{% if loggedin_user.weight %}Wir haben von dir schon Daten, bitte überprüfe (und aktualisiere) diese kurz:{% endif %} {% if loggedin_user.weight %}Wir haben von dir schon Daten, bitte überprüfe (und aktualisiere) diese kurz:{% endif %}
</p> </p>

2
templates/index.html.tera
View File

@ -18,7 +18,7 @@
<a href="/ergo" style="display:inline-flex;" <a href="/ergo" style="display:inline-flex;"
class="btn btn-primary flex items-center justify-between w-80 max-w-full"> class="btn btn-primary flex items-center justify-between w-80 max-w-full">
<span class="text-2xl">💪</span> <span class="text-2xl">💪</span>
<span class="text-xl px-3">Ergo-Challenge</span> <span class="text-xl px-3">Ergo Challenge</span>
<span class="text-2xl">💪🏿</span> <span class="text-2xl">💪🏿</span>
</a> </a>
</div> </div>