add error/succ messages

src/page.rs

@@ -1,40 +1,49 @@
 use crate::Language;
+use axum_messages::Messages;
 use maud::{html, Markup, DOCTYPE};
 
 // TODO: set dynamic meta lang attribute
 
-// TODO: remove function
-#[deprecated]
-pub fn new(content: Markup, lang: Language) -> Markup {
-    let page = Page::new(lang);
-    page.content(content)
-}
-
 pub(crate) struct Page {
     lang: Language,
-    succ: Option<String>,
-    err: Option<String>,
+    found_camera: Option<String>,
+    new_name: bool,
+    err: Option<(String, String, String)>,
 }
 
 impl Page {
     pub fn new(lang: Language) -> Self {
         Self {
             lang,
-            succ: None,
+            found_camera: None,
+            new_name: false,
             err: None,
         }
     }
 
-    pub fn succ(&mut self, msg: String) {
-        self.succ = Some(msg);
-    }
-
-    pub fn err(&mut self, msg: String) {
-        self.err = Some(msg);
-    }
-
-    fn has_msg(&self) -> bool {
-        self.succ.is_some() || self.err.is_some()
+    pub fn messages(&mut self, messages: Messages) {
+        for message in messages {
+            let text = &message.to_string()[..];
+            match (message.level, text) {
+                (_, "set-name-succ") => {
+                    self.new_name = true;
+                }
+                (_, msg) if msg.starts_with("found-cam|") => {
+                    let (_, name) = msg.split_once('|').expect("we just checked |");
+                    self.found_camera = Some(name.into());
+                }
+                (_, msg) if msg.starts_with("err|") => {
+                    let mut parts = msg.splitn(4, '|');
+                    let _ = parts.next().expect("just checked |");
+                    if let (Some(title), Some(body), Some(footer)) =
+                        (parts.next(), parts.next(), parts.next())
+                    {
+                        self.err = Some((title.into(), body.into(), footer.into()));
+                    }
+                }
+                (_, _) => {}
+            }
+        }
     }
 
     pub fn content(self, content: Markup) -> Markup {
@@ -83,39 +92,44 @@ impl Page {
                 }
 
                 main.container {
-                    article class="succ w-full" {
-                        header {
-                          "Camera found"
-                        }
-                        "✨ You are a star ✨ Star dust sprinkle, sprinkle. "
-                        a href="#ranking" {
-                          "See your ranking"
-                        }
-                        footer {
-                          "Rear Exit Cam"
+                    @if let Some(found_camera) = &self.found_camera {
+                        article class="succ w-full" {
+                            header {
+                              "Camera "
+                                (found_camera)
+                              " found"
+                            }
+                            "✨ You are a star ✨ Star dust sprinkle, sprinkle. "
+                            a href="#ranking" {
+                              "See your ranking"
+                            }
+                            footer {
+                              "Rear Exit Cam"
+                            }
                         }
                     }
 
-                    article class="name w-full" {
-                        header {
-                          "Camera found"
-                        }
-                        "text"
-                        footer {
-                          "Name of Camera"
+                    @if self.new_name {
+                        article class="name w-full" {
+                            header {
+                              "New name!"
+                            }
+                            "Welcome"
                         }
                     }
 
-                    article class="error w-full" {
-                        header {
-                          "Camera found"
-                        }
-                        "text"
-                        footer {
-                          "Name of Camera"
+                    @if let Some(err) = &self.err {
+                        article class="error w-full" {
+                            header {
+                                (err.0)
+                            }
+                            (err.1)
+                            footer {
+                                (err.2)
+                            }
                         }
                     }
-                   
+
                     section { (content) }
                 }