Merge branch 'main' of ssh://git.hofer.link:2222/philipp/aef-website

src/index.rs

@@ -1,4 +1,4 @@
-use crate::{language::language, page::new};
+use crate::{language::language, page::Page};
 use axum::http::HeaderMap;
 use axum_extra::extract::CookieJar;
 use maud::{html, Markup};
@@ -8,7 +8,11 @@ pub(super) async fn index(cookies: CookieJar, headers: HeaderMap) -> Markup {
 
     rust_i18n::set_locale(lang.to_locale());
 
-    new(
+    let mut page = Page::new(lang);
+    page.succ("Yeah! That worked!".into());
+    page.err("Damn...".into());
+
+    page.content(
         html! {
             h1 { (t!("digital_shadows")) }
             hgroup {
@@ -73,7 +77,6 @@ pub(super) async fn index(cookies: CookieJar, headers: HeaderMap) -> Markup {
                 }
               }
             }
-        },
-        lang,
+        }
     )
 }

src/page.rs

@@ -3,10 +3,43 @@ use maud::{html, Markup, DOCTYPE};
 
 // TODO: set dynamic meta lang attribute
 
+// TODO: remove function
 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>,
+}
+
+impl Page {
+    pub fn new(lang: Language) -> Self {
+        Self {
+            lang,
+            succ: None,
+            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 content(self, content: Markup) -> Markup {
         html! {
             (DOCTYPE)
-        html lang=(lang) {
+            html lang=(self.lang) {
               head {
                 meta charset="utf-8";
                 meta name="viewport" content="width=device-width, initial-scale=1.0";
@@ -40,8 +73,8 @@ pub fn new(content: Markup, lang: Language) -> Markup {
                             }
 
                             li {
-                            button id="lang-toggle" lang=(lang.next_language()) {
-                              (lang.next_language())
+                                button id="lang-toggle" lang=(self.lang.next_language()) {
+                                  (self.lang.next_language())
                                 }
                             }
                         }
@@ -49,6 +82,20 @@ pub fn new(content: Markup, lang: Language) -> Markup {
                 }
 
                 main.container {
+                    @if self.has_msg() {
+                        section {
+                            @if let Some(succ) = self.succ {
+                                p class="succ" {
+                                    (succ)
+                                }
+                            }
+                            @if let Some(err) = self.err{
+                                p class="err" {
+                                    (err)
+                                }
+                            }
+                        }
+                    }
                     section { (content) }
                 }
 
@@ -65,4 +112,5 @@ pub fn new(content: Markup, lang: Language) -> Markup {
             }
             }
         }
+    }
 }