add error/succ messages

src/game.rs

@@ -1,4 +1,4 @@
-use crate::{language::language, page::new, Backend};
+use crate::{language::language, page::Page, Backend, NameUpdateError};
 use axum::{
     extract::{Path, State},
     http::HeaderMap,
@@ -7,6 +7,7 @@ use axum::{
     Form, Router,
 };
 use axum_extra::extract::CookieJar;
+use axum_messages::Messages;
 use maud::{html, Markup, PreEscaped};
 use serde::Deserialize;
 use std::sync::Arc;
@@ -15,6 +16,7 @@ use uuid::Uuid;
 async fn index(
     State(backend): State<Arc<Backend>>,
     cookies: CookieJar,
+    messages: Messages,
     headers: HeaderMap,
 ) -> Response {
     let (cookies, req) = backend.client_full(cookies, &headers).await;
@@ -24,66 +26,65 @@ async fn index(
     let amount_total_cameras = backend.amount_total_cameras().await;
     let highscore = backend.highscore().await;
 
-    let markup = new(
-        html! {
-            hgroup {
-                h1 { "Who finds the most cameras?" }
-            }
-            p {
-                mark { "TODO: Explanation of AEF / digital shadows / search game" }
-            }
+    let mut page = Page::new(req.lang);
+    page.messages(messages);
+    let markup = page.content(html! {
+    hgroup {
+        h1 { "Who finds the most cameras?" }
+    }
+    p {
+        mark { "TODO: Explanation of AEF / digital shadows / search game" }
+    }
 
-            div.mb-sm {
-                (client.get_display_name())
-                ", do you want to be named something different? No worries, change here 👇"
-            }
+    div.mb-sm {
+        (client.get_display_name())
+        ", do you want to be named something different? No worries, change here 👇"
+    }
 
-            form action="/name" method="post" {
-                fieldset role="group" {
-                    input
-                        name="name"
-                        placeholder="✨ Your new name starts here ✨"
-                        aria-label="Name";
-                    input type="submit" value="Save";
+    form action="/name" method="post" {
+        fieldset role="group" {
+            input
+                name="name"
+                placeholder="✨ Your new name starts here ✨"
+                aria-label="Name";
+            input type="submit" value="Save";
+        }
+    }
+
+        p.mb-0 {
+            "You have found "
+            (sightings.len())
+            "/"
+            (amount_total_cameras)
+            " cameras:"
+            progress value=(sightings.len()) max=(amount_total_cameras);
+        }
+
+        ol.flex.small {
+            @for sighting in &sightings {
+                li {
+                    (sighting.camera.name)
                 }
             }
+        }
 
-            p.mb-0 {
-                "You have found "
-                (sightings.len())
-                "/"
-                (amount_total_cameras)
-                " cameras:"
-                progress value=(sightings.len()) max=(amount_total_cameras);
-            }
-
-            ol.flex.small {
-                @for (idx, sighting) in sightings.iter().enumerate() {
-                    li {
-                        (sighting.camera.name)
-                    }
-                }
-            }
-
-            p {
-                h2 { "Highscore" }
-                ul.iterated {
-                    @for rank in highscore {
-                        li.card {
-                            span {
-                                span.font-headline.rank.text-muted { (rank.rank) "." }
-                                @if rank.client == client { (PreEscaped("<mark id='ranking'>")) }
-                                (rank.client.get_display_name())
-                                @if rank.client == client { (PreEscaped("</mark>")) }
-                            }
-                            span.font-headline.font-lg { (rank.amount) (PreEscaped("&nbsp;")) "📸" }
+        p {
+            h2 { "Highscore" }
+            ul.iterated {
+                @for rank in highscore {
+                    li.card {
+                        span {
+                            span.font-headline.rank.text-muted { (rank.rank) "." }
+                            @if rank.client == client { (PreEscaped("<mark id='ranking'>")) }
+                            (rank.client.get_display_name())
+                            @if rank.client == client { (PreEscaped("</mark>")) }
                         }
+                        span.font-headline.font-lg { (rank.amount) (PreEscaped("&nbsp;")) "📸" }
                     }
                 }
             }
-        },
-        req.lang,
-    );
+        }
+    });
 
     (cookies, markup).into_response()
 }
@@ -92,6 +93,7 @@ async fn game(
     State(backend): State<Arc<Backend>>,
     cookies: CookieJar,
     headers: HeaderMap,
+    messages: Messages,
     Path(uuid): Path<String>,
 ) -> Result<Redirect, Response> {
     let (cookies, client) = backend.client(cookies).await;
@@ -104,20 +106,22 @@ async fn game(
         return Err(not_found(cookies, headers).await.into_response());
     };
 
-    let succ = backend.client_found_camera(&client, &camera).await;
-    // TODO: show succ/err based on succ
+    if backend.client_found_camera(&client, &camera).await {
+        messages.info(format!("found-cam|{}", camera.name));
+    } else {
+        messages.info(format!(
+            "err|Try to find a new camera!|You have already collected this camera.|"
+        ));
+    }
 
     Ok(Redirect::to("/game"))
 }
 
 async fn not_found(cookies: CookieJar, headers: HeaderMap) -> Markup {
     let lang = language(&cookies, &headers);
-    new(
-        html! {
-            h1 { "uups" }
-        },
-        lang,
-    )
+    Page::new(lang).content(html! {
+         h1 { "uups" }
+    })
 }
 
 #[derive(Deserialize)]
@@ -128,13 +132,16 @@ struct NameForm {
 async fn set_name(
     State(backend): State<Arc<Backend>>,
     cookies: CookieJar,
+    messages: Messages,
     Form(form): Form<NameForm>,
 ) -> Response {
     let (cookies, client) = backend.client(cookies).await;
 
-    // Update the client's name in the backend
-    // TODO: handle succ/err msg
-    let _ = backend.set_client_name(&client, &form.name).await;
+    match backend.set_client_name(&client, &form.name).await {
+        Ok(()) => messages.info("set-name-succ"),
+        Err(NameUpdateError::TooShort(expected, actual)) => messages.info(format!("err|That's too little!|We need more information about you. Give us at least {expected} characters for you new name!|You sent us {actual} characters.")),
+        Err(NameUpdateError::TooLong(expected, actual)) => messages.info(format!("err|That's too much!|We only live in (20)25, so please use less than {expected} characters for your new name.|You sent us {actual} characters.")),
+    };
 
     // Redirect back to the game page
     (cookies, Redirect::to("/game")).into_response()