From a04baa3935e2a53ac67593b870198f7382ff230b Mon Sep 17 00:00:00 2001 From: RGBCube Date: Fri, 5 Jan 2024 16:01:47 +0300 Subject: [PATCH] Utilize maud better, dont do div class="..." --- src/errors/internal_server_error/mod.rs | 10 ++++---- src/errors/not_found/mod.rs | 10 ++++---- src/page/cube/mod.rs | 6 ++--- src/routes/index/mod.rs | 32 +++++++++++++++++-------- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/errors/internal_server_error/mod.rs b/src/errors/internal_server_error/mod.rs index d8e5e68..703011c 100644 --- a/src/errors/internal_server_error/mod.rs +++ b/src/errors/internal_server_error/mod.rs @@ -21,11 +21,11 @@ pub fn handler( asset::Css::Shared("not-found.css"), array::from_fn(|_| { (html! { - div class="frame" { "error" } - div class="square black" {} - div class="square red" {} - div class="square red" {} - div class="square black" {} + .frame { "error" } + .square .black {} + .square .red {} + .square .red {} + .square .black {} }) .clone() }), diff --git a/src/errors/not_found/mod.rs b/src/errors/not_found/mod.rs index 195ed5f..1d20407 100644 --- a/src/errors/not_found/mod.rs +++ b/src/errors/not_found/mod.rs @@ -21,11 +21,11 @@ pub fn handler( asset::Css::Shared("not-found.css"), array::from_fn(|_| { (html! { - div class="frame" { "404" } - div class="square black" {} - div class="square magenta" {} - div class="square magenta" {} - div class="square black" {} + .frame { "404" } + .square .black {} + .square .magenta {} + .square .magenta {} + .square .black {} }) .clone() }), diff --git a/src/page/cube/mod.rs b/src/page/cube/mod.rs index b1596d8..1755b5e 100644 --- a/src/page/cube/mod.rs +++ b/src/page/cube/mod.rs @@ -19,10 +19,10 @@ pub fn create(css: Css, faces: [Markup; 6]) -> Markup { (css) }, html! { - div class="scene" { - div class="cube" { + .scene { + .cube { @for (name, content) in ["front", "top", "back", "bottom", "right", "left"].iter().zip(faces) { - div class=(format!("face {name}")) { + .(format!("face {name}")) { (content) } } diff --git a/src/routes/index/mod.rs b/src/routes/index/mod.rs index 7a520be..89b443a 100644 --- a/src/routes/index/mod.rs +++ b/src/routes/index/mod.rs @@ -15,23 +15,35 @@ pub async fn handler() -> actix_web::Result { asset::css::owned!("index.css"), [ html! { - a href="/contact" { - div class="frame" { - "contact" + a href="/about" { + .frame { + "about" + } } - } }, html! { - a href="https://github.com/RGBCube" { - div class="frame" { - "github" + a href="https://github.com/RGBCube" { + .frame { + "github" + } } - } }, html! {}, html! {}, - html! {}, - html! {}, + html! { + a href="/contact" { + .frame { + "contact" + } + } + }, + html! { + a href="/blog" { + .frame { + "blog" + } + } + }, ], )) }