Mark/webpage
1
1
Fork 0
Code Pull Requests Actions 5 Packages Releases Activity

Render handout page on server
All checks were successful
CI / Check typos (push) Successful in 22s
Details
CI / Check links (push) Successful in 23s
Details
CI / Clippy (push) Successful in 1m5s
Details
CI / Build and test (push) Successful in 1m12s
Details
CI / Build container (push) Successful in 1m37s
Details
CI / Deploy on waypoint (push) Successful in 45s
Details

Browse Source
This commit is contained in:
rm-dr
2025-11-04 19:28:21 -08:00
parent 62a3da195f
commit 7afc0b2a29
11 changed files with 609 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
crates/service/service-webpage/src/routes/mod.rs
View File

@@ -1,3 +1,5 @@
use std::{pin::Pin, sync::Arc, time::Duration};
use assetserver::Asset;
use axum::Router;
use maud::{DOCTYPE, Markup, PreEscaped, html};
@@ -16,59 +18,65 @@ pub(super) fn router() -> Router<()> {
let (asset_prefix, asset_router) = assets::asset_router();
info!("Serving assets at {asset_prefix}");
let server = build_server().into_router();
let server = build_server();
tokio::task::spawn(server.clone().start_rerender_task(Duration::from_secs(3)));
let router = server.into_router();
Router::new().merge(server).nest(asset_prefix, asset_router)
Router::new().merge(router).nest(asset_prefix, asset_router)
}
fn build_server() -> PageServer {
PageServer::new(Box::new(page_wrapper))
fn build_server() -> Arc<PageServer> {
let server = PageServer::new(Box::new(page_wrapper));
server
.add_page("/", pages::index())
.add_page("/links", pages::links())
.add_page("/whats-a-betalupi", pages::betalupi())
.add_page("/handouts", pages::handouts())
.add_page("/handouts", pages::handouts());
server
}
fn page_wrapper(page: &Page) -> Markup {
html! {
(DOCTYPE)
html {
head {
meta charset="UTF" {}
meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" {}
meta content="text/html; charset=UTF-8" http-equiv="content-type" {}
meta property="og:type" content="website" {}
fn page_wrapper<'a>(page: &'a Page) -> Pin<Box<dyn Future<Output = Markup> + 'a + Send + Sync>> {
Box::pin(async move {
html! {
(DOCTYPE)
html {
head {
meta charset="UTF" {}
meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" {}
meta content="text/html; charset=UTF-8" http-equiv="content-type" {}
meta property="og:type" content="website" {}
link rel="stylesheet" href=(Styles_Main::URL) {}
link rel="stylesheet" href=(Styles_Main::URL) {}
(&page.meta)
title { (PreEscaped(page.meta.title.clone())) }
}
(&page.meta)
title { (PreEscaped(page.meta.title.clone())) }
}
body {
div class="wrapper" {
main { ( page.generate_html() ) }
body {
div class="wrapper" {
main { ( page.generate_html().await ) }
footer {
hr class = "footline" {}
div class = "footContainer" {
p {
"This site was built by hand using "
(FarLink("https://rust-lang.org", "Rust"))
", "
(FarLink("https://maud.lambda.xyz", "Maud"))
", "
(FarLink("https://github.com/connorskees/grass", "Grass"))
", and "
(FarLink("https://docs.rs/axum/latest/axum", "Axum"))
"."
footer {
hr class = "footline" {}
div class = "footContainer" {
p {
"This site was built by hand using "
(FarLink("https://rust-lang.org", "Rust"))
", "
(FarLink("https://maud.lambda.xyz", "Maud"))
", "
(FarLink("https://github.com/connorskees/grass", "Grass"))
", and "
(FarLink("https://docs.rs/axum/latest/axum", "Axum"))
"."
}
}
}
}
}
}
}
}
})
}
#[test]