Merge commit '374fed9e3bdcee30a3f8315d1f0c392204a885df' into single-user-edit-page

Reviewed-on: #989

frontend/tests/log.spec.ts

@@ -115,7 +115,7 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
   await page.getByPlaceholder("Passwort").press("Enter");
 
   await page.goto("/log/show");
-  await page.getByText('(cox2)').click();
+  await page.getByRole('link', { name: 'Joe' }).nth(1).click();
   page.once("dialog", (dialog) => {
     dialog.accept().catch(() => {});
   });
@@ -208,7 +208,6 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
 
   await page.getByRole('link', { name: 'Logbuch' }).click();
   await expect(page.locator('body')).toContainText('Joe');
-  await expect(page.locator('body')).toContainText('(cox2)');
   await expect(page.locator('body')).toContainText('Ottensheim (25 km)');
   await expect(page.locator('body')).toContainText('Ruderer: cox2, rower2');
   
@@ -225,7 +224,7 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
   await page.getByPlaceholder("Passwort").press("Enter");
 
   await page.goto("/log/show");
-  await page.getByText('(cox2)').click();
+  await page.getByRole('link', { name: 'Joe' }).nth(1).click();
   page.once("dialog", (dialog) => {
     dialog.accept().catch(() => {});
   });
@@ -286,7 +285,6 @@ test("Cox can start and finish trip with cox steering only", async ({ page }, te
 
   await page.goto('/log/show');
   await expect(page.locator('body')).toContainText('cox_only_steering_boat');
-  await expect(page.locator('body')).toContainText('(cox2 - handgesteuert)');
   await expect(page.locator('body')).toContainText('Ottensheim (25 km)');
   
 
@@ -302,7 +300,7 @@ test("Cox can start and finish trip with cox steering only", async ({ page }, te
   await page.getByPlaceholder("Passwort").press("Enter");
 
   await page.goto("/log/show");
-  await page.getByText('(cox2 - handgesteuert)').click();
+  await page.getByRole("link", { name: "cox_only_steering_boat" }).click();
   page.once("dialog", (dialog) => {
     dialog.accept().catch(() => {});
   });
@@ -371,7 +369,7 @@ test("Kiosk can start and finish trip in one stop", async ({ page }, testInfo) =
   await page.getByPlaceholder("Passwort").press("Enter");
 
   await page.goto("/log/show");
-  await page.getByText('(cox2)').click();
+  await page.getByRole('link', { name: 'Joe' }).nth(1).click();
   page.once("dialog", (dialog) => {
     dialog.accept().catch(() => {});
   });

src/model/user/mod.rs

@@ -577,10 +577,6 @@ ASKÖ Ruderverein Donau Linz", self.name),
         .execute(db)
         .await
         .unwrap(); //Okay, because we can only create a User of a valid id
-        ActivityBuilder::new(&format!("User {self} hat sich eingeloggt."))
-            .relevant_for_user(self)
-            .save(db)
-            .await;
     }
 
     pub async fn delete(&self, db: &SqlitePool, deleted_by: &ManageUserUser) {

src/tera/auth.rs

@@ -1,5 +1,4 @@
 use rocket::{
-    FromForm, Request, Route, State,
     form::Form,
     get,
     http::{Cookie, CookieJar},
@@ -9,11 +8,13 @@ use rocket::{
     response::{Flash, Redirect},
     routes,
     time::{Duration, OffsetDateTime},
+    FromForm, Request, Route, State,
 };
-use rocket_dyn_templates::{Template, context, tera};
+use rocket_dyn_templates::{context, tera, Template};
 use sqlx::SqlitePool;
 
 use crate::model::{
+    activity::ActivityBuilder,
     log::Log,
     user::{LoginError, User},
 };
@@ -82,13 +83,12 @@ async fn login(
 
     cookies.add_private(Cookie::new("loggedin_user", format!("{}", user.id)));
 
-    Log::create(
+    ActivityBuilder::new(&format!(
-        db,
+        "{user} hat sich eingeloggt (User-Agent: {})",
-        format!(
+        agent.0
-            "Succ login of {} with this useragent: {}",
+    ))
-            login.name, agent.0
+    .relevant_for_user(&user)
-        ),
+    .save(db)
-    )
     .await;
 
     // Check for redirect_url cookie and redirect accordingly

templates/admin/user/index.html.tera

@@ -12,13 +12,13 @@
                 <div class="grid sm:grid-cols-3 gap-3 mt-3">
                       <button type="button"
                               onclick="document.getElementById('add-clubuser').showModal()"
-                              class="btn btn-primary">Vereinsmitglied</button>
+                              class="btn btn-primary">🥳 Vereinsmitglied</button>
                       <button type="button"
                               onclick="document.getElementById('add-scheckbuch').showModal()"
-                              class="btn btn-dark">Scheckbuch</button>
+                              class="btn btn-dark">🧑‍🏫 Scheckbuch</button>
                       <button type="button"
                               onclick="document.getElementById('add-schnupperkurs').showModal()"
-                              class="btn btn-dark">Schnupperkurs</button>
+                              class="btn btn-dark">👨‍🎓 Schnupperkurs</button>
 
 
                       </div>

templates/admin/user/view.html.tera

@@ -4,7 +4,9 @@
 {% block content %}
     <div class="max-w-screen-lg w-full">
         {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
-            <a href="/admin/user" class="link link-primary link-no-underline">&larr; Userverwaltung</a>
+            <div class="mb-5 lg:mb-0">
+                <a href="/admin/user" class="link link-primary link-no-underline">&larr; Userverwaltung</a>
+            </div>
         {% endif %}
         <h1 class="h1">{{ user.name }}</h1>
         <div class="grid sm:grid-cols-2 gap-8 my-8">
@@ -119,12 +121,12 @@
                         </div>
                         {% if allowed_to_edit %}
                             <div class="py-3">
-                                <div class="mt-3 text-right">
+                                <div class="text-right">
                                     <button type="button"
                                             onclick="document.getElementById('change-member-type').showModal()"
                                             class="btn btn-dark">Mitgliedsstatus ändern</button>
                                     <a href="/admin/user/{{ user.id }}/delete"
-                                       class="btn btn-alert"
+                                       class="btn btn-alert mt-3"
                                        onclick="return confirm('Ist {{ user.name }} wirklich aus dem Verein ausgetreten?');">
                                         {% include "includes/delete-icon" %}
                                         Mitglied ist ausgetreten
@@ -402,11 +404,11 @@
             {% endif %}
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">Aktivitäten</h2>
-                <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
+                <div class="mx-3 max-h-60 overflow-y-scroll">
                     <div class="py-3">
                         <ul class="list-disc ms-4">
                             {% for activity in activities %}
-                                <li>{{ activity.created_at | date(format="%d. %m. %Y") }}: {{ activity.text }}</li>
+                                <li><strong>{{ activity.created_at | date(format="%d. %m. %Y") }}:</strong> <small>{{ activity.text }}</small></li>
                             {% else %}
                                 <li>Noch keine Aktivität... Stay tuned 😆</li>
                             {% endfor %}

templates/log.completed.html.tera

@@ -26,7 +26,7 @@
             {% for log in logs %}
                 {% set_global allowed_to_edit = false %}
                 {% if loggedin_user %}
-                    {% if "Vorstand" in loggedin_user.roles %}
+                    {% if "Vorstand" in loggedin_user.roles or "admin" in loggedin_user.roles %}
                         {% set_global allowed_to_edit = true %}
                     {% endif %}
                 {% endif %}