Migrate to servable

crates/service/service-webpage/src/components/md/mod.rs

@@ -2,7 +2,7 @@ use lazy_static::lazy_static;
 use markdown_it::generics::inline::full_link;
 use markdown_it::{MarkdownIt, Node};
 use maud::{Markup, PreEscaped, Render};
-use page::servable::PageMetadata;
+use servable::PageMetadata;
 
 use crate::components::md::emote::InlineEmote;
 use crate::components::md::frontmatter::{TomlFrontMatter, YamlFrontMatter};

crates/service/service-webpage/src/pages/handouts.rs

@@ -1,14 +1,14 @@
 use std::{
 	pin::Pin,
-	sync::Arc,
+	sync::{Arc, LazyLock},
 	time::{Duration, Instant},
 };
 
 use chrono::{DateTime, TimeDelta, Utc};
 use maud::{Markup, PreEscaped, html};
-use page::{DeviceType, RenderContext, servable::Page};
 use parking_lot::Mutex;
 use serde::Deserialize;
+use servable::{DeviceType, HtmlPage, RenderContext};
 use tracing::{debug, warn};
 
 use crate::{
@@ -16,7 +16,8 @@ use crate::{
 		md::{Markdown, meta_from_markdown},
 		misc::FarLink,
 	},
-	pages::{MAIN_TEMPLATE, backlinks, footer},
+	pages::{LAZY_IMAGE_JS, backlinks, footer},
+	routes::{IMG_ICON, MAIN_CSS},
 };
 
 #[derive(Debug, Deserialize)]
@@ -174,7 +175,7 @@ fn build_list_for_group(handouts: &[HandoutEntry], group: &str, req_ctx: &Render
 // MARK: page
 //
 
-pub fn handouts() -> Page {
+pub static HANDOUTS: LazyLock<HtmlPage> = LazyLock::new(|| {
 	let md = Markdown::parse(include_str!("handouts.md"));
 
 	let index = CachedRequest::new(
@@ -188,24 +189,27 @@ pub fn handouts() -> Page {
 	let mut meta = meta_from_markdown(&md).unwrap().unwrap();
 
 	if meta.image.is_none() {
-		meta.image = Some("/assets/img/icon.png".to_owned());
+		meta.image = Some(IMG_ICON.route().into());
 	}
 
 	let html = PreEscaped(md.render());
 
-	MAIN_TEMPLATE
-		.derive(meta, move |page, ctx| {
+	HtmlPage::default()
+		.with_style_linked(MAIN_CSS.route())
+		.with_script_inline(LAZY_IMAGE_JS)
+		.with_meta(meta)
+		.with_render(move |page, ctx| {
 			let html = html.clone();
 			let index = index.clone();
 			render(html, index, page, ctx)
 		})
-		.html_ttl(Some(TimeDelta::seconds(300)))
-}
+		.with_ttl(Some(TimeDelta::seconds(300)))
+});
 
 fn render<'a>(
 	html: Markup,
 	index: Arc<CachedRequest<Result<Vec<HandoutEntry>, reqwest::Error>>>,
-	_page: &'a Page,
+	_page: &'a HtmlPage,
 	ctx: &'a RenderContext,
 ) -> Pin<Box<dyn Future<Output = Markup> + Send + Sync + 'a>> {
 	Box::pin(async move {

crates/service/service-webpage/src/pages/index.rs

@@ -1,9 +1,6 @@
 use maud::{Markup, html};
-use page::{
-	RenderContext,
-	servable::{Page, PageMetadata},
-};
-use std::pin::Pin;
+use servable::{HtmlPage, PageMetadata, RenderContext};
+use std::{pin::Pin, sync::LazyLock};
 
 use crate::{
 	components::{
@@ -12,23 +9,25 @@ use crate::{
 		md::Markdown,
 		misc::FarLink,
 	},
-	pages::{MAIN_TEMPLATE, footer},
+	pages::{LAZY_IMAGE_JS, footer},
+	routes::{IMG_ICON, MAIN_CSS},
 };
 
-pub fn index() -> Page {
-	MAIN_TEMPLATE.derive(
-		PageMetadata {
+pub static INDEX: LazyLock<HtmlPage> = LazyLock::new(|| {
+	HtmlPage::default()
+		.with_style_linked(MAIN_CSS.route())
+		.with_script_inline(LAZY_IMAGE_JS)
+		.with_meta(PageMetadata {
 			title: "Betalupi: About".into(),
 			author: Some("Mark".into()),
 			description: None,
-			image: Some("/assets/img/icon.png".to_owned()),
-		},
-		render,
-	)
-}
+			image: Some(IMG_ICON.route().into()),
+		})
+		.with_render(render)
+});
 
 fn render<'a>(
-	_page: &'a Page,
+	_page: &'a HtmlPage,
 	_ctx: &'a RenderContext,
 ) -> Pin<Box<dyn Future<Output = Markup> + Send + Sync + 'a>> {
 	Box::pin(async {

crates/service/service-webpage/src/pages/mod.rs

@@ -1,57 +1,29 @@
 use chrono::TimeDelta;
 use maud::{Markup, PreEscaped, html};
-use page::{
-	RenderContext,
-	servable::{Page, PageMetadata, PageTemplate},
-};
+use reqwest::StatusCode;
+use servable::{HtmlPage, PageMetadata, RenderContext};
+use std::sync::LazyLock;
 
-use crate::components::{
-	fa::FAIcon,
-	md::{Markdown, meta_from_markdown},
-	misc::FarLink,
+use crate::{
+	components::{
+		fa::FAIcon,
+		md::{Markdown, meta_from_markdown},
+		misc::FarLink,
+	},
+	routes::{IMG_ICON, MAIN_CSS},
 };
 
 mod handouts;
 mod index;
-mod notfound;
 
-pub use handouts::handouts;
-pub use index::index;
-pub use notfound::notfound;
-
-pub fn links() -> Page {
-	/*
-	Dead links:
-
-	https://www.commitstrip.com/en/
-	http://www.3dprintmath.com/
-	*/
-
-	page_from_markdown(
-		include_str!("links.md"),
-		Some("/assets/img/icon.png".to_owned()),
-	)
-}
-
-pub fn betalupi() -> Page {
-	page_from_markdown(
-		include_str!("betalupi.md"),
-		Some("/assets/img/icon.png".to_owned()),
-	)
-}
-
-pub fn htwah_typesetting() -> Page {
-	page_from_markdown(
-		include_str!("htwah-typesetting.md"),
-		Some("/assets/img/icon.png".to_owned()),
-	)
-}
+pub use handouts::HANDOUTS;
+pub use index::INDEX;
 
 //
 // MARK: md
 //
 
-fn page_from_markdown(md: impl Into<String>, default_image: Option<String>) -> Page {
+fn page_from_markdown(md: impl Into<String>, default_image: Option<String>) -> HtmlPage {
 	let md: String = md.into();
 	let md = Markdown::parse(&md);
 
@@ -68,8 +40,11 @@ fn page_from_markdown(md: impl Into<String>, default_image: Option<String>) -> P
 
 	let html = PreEscaped(md.render());
 
-	MAIN_TEMPLATE
-		.derive(meta, move |_page, ctx| {
+	HtmlPage::default()
+		.with_script_inline(LAZY_IMAGE_JS)
+		.with_style_linked(MAIN_CSS.route())
+		.with_meta(meta)
+		.with_render(move |_page, ctx| {
 			let html = html.clone();
 
 			Box::pin(async move {
@@ -86,48 +61,46 @@ fn page_from_markdown(md: impl Into<String>, default_image: Option<String>) -> P
 				}
 			})
 		})
-		.html_ttl(Some(TimeDelta::days(1)))
-		.immutable(true)
+		.with_ttl(Some(TimeDelta::days(1)))
 }
 
 //
 // MARK: components
 //
 
+const LAZY_IMAGE_JS: &str = "
+	window.onload = function() {
+		var imgs = document.querySelectorAll('.img-placeholder');
+
+		imgs.forEach(img => {
+			img.style.border = 'none';
+			img.style.filter = 'blur(10px)';
+			img.style.transition = 'filter 0.3s';
+
+			var lg = new Image();
+			lg.src = img.dataset.large;
+			lg.onload = function () {
+				img.src = img.dataset.large;
+				img.style.filter = 'blur(0px)';
+			};
+		})
+	}
+	";
+
+/*
 const MAIN_TEMPLATE: PageTemplate = PageTemplate {
 	// Order matters, base htmx goes first
-	scripts_linked: &["/assets/htmx.js", "/assets/htmx-json.js"],
-
-	// TODO: use htmx for this
-	scripts_inline: &["
-		window.onload = function() {
-			var imgs = document.querySelectorAll('.img-placeholder');
-
-			imgs.forEach(img => {
-				img.style.border = 'none';
-				img.style.filter = 'blur(10px)';
-				img.style.transition = 'filter 0.3s';
-
-				var lg = new Image();
-				lg.src = img.dataset.large;
-				lg.onload = function () {
-					img.src = img.dataset.large;
-					img.style.filter = 'blur(0px)';
-				};
-			})
-		}
-	"],
-
-	styles_inline: &[],
-	styles_linked: &["/assets/css/main.css"],
+	scripts: &[
+		ScriptSource::Linked(&"/assets/htmx-2.0.8.js"),
+		ScriptSource::Linked(&"/assets/htmx-json-1.19.12.js"),
+	],
 
 	extra_meta: &[(
 		"viewport",
 		"width=device-width,initial-scale=1,user-scalable=no",
 	)],
-
-	..PageTemplate::const_default()
 };
+*/
 
 pub fn backlinks(ctx: &RenderContext) -> Option<Markup> {
 	let mut backlinks = vec![("/", "home")];
@@ -184,3 +157,56 @@ pub fn footer() -> Markup {
 		}
 	)
 }
+
+//
+// MARK: pages
+//
+
+pub const LINKS: LazyLock<HtmlPage> = LazyLock::new(|| {
+	/*
+	Dead links:
+
+	https://www.commitstrip.com/en/
+	http://www.3dprintmath.com/
+	*/
+
+	page_from_markdown(include_str!("links.md"), Some(IMG_ICON.route().into()))
+});
+
+pub const BETALUPI: LazyLock<HtmlPage> = LazyLock::new(|| {
+	page_from_markdown(include_str!("betalupi.md"), Some(IMG_ICON.route().into()))
+});
+
+pub const HTWAH_TYPESETTING: LazyLock<HtmlPage> = LazyLock::new(|| {
+	page_from_markdown(
+		include_str!("htwah-typesetting.md"),
+		Some(IMG_ICON.route().into()),
+	)
+});
+
+pub static NOT_FOUND: LazyLock<HtmlPage> = LazyLock::new(|| {
+	HtmlPage::default()
+		.with_style_linked(MAIN_CSS.route())
+		.with_meta(PageMetadata {
+			title: "Page not found".into(),
+			author: None,
+			description: None,
+			image: Some(IMG_ICON.route().into()),
+		})
+		.with_render(
+			move |_page, _ctx| {
+				Box::pin(async {
+					html! {
+						div class="wrapper" {
+							div style="display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh" {
+								p style="font-weight:bold;font-size:50pt;margin:0;" { "404" }
+								p style="font-size:13pt;margin:0;color:var(--grey);" { "(page not found)" }
+								a style="font-size:12pt;margin:10pt;padding:5px;" href="/" {"<- Back to site"}
+							}
+						}
+					}
+				})
+			}
+		)
+		.with_code(StatusCode::NOT_FOUND)
+});

crates/service/service-webpage/src/pages/notfound.rs

@@ -1,29 +0,0 @@
-use maud::html;
-use page::servable::{Page, PageMetadata};
-use reqwest::StatusCode;
-
-use crate::pages::MAIN_TEMPLATE;
-
-pub fn notfound() -> Page {
-	MAIN_TEMPLATE.derive(
-		PageMetadata {
-			title: "Page not found".into(),
-			author:None,
-			description: None,
-			image: Some("/assets/img/icon.png".to_owned()),
-		},
-		move |_page, _ctx| {
-			Box::pin(async {
-				html! {
-					div class="wrapper" {
-						div style="display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh" {
-							p style="font-weight:bold;font-size:50pt;margin:0;" { "404" }
-							p style="font-size:13pt;margin:0;color:var(--grey);" { "(page not found)" }
-							a style="font-size:12pt;margin:10pt;padding:5px;" href="/" {"<- Back to site"}
-						}
-					}
-				}
-			})
-		},
-	).response_code(StatusCode::NOT_FOUND)
-}

crates/service/service-webpage/src/routes/mod.rs

@@ -1,10 +1,7 @@
 use axum::Router;
-use macro_sass::sass;
-use page::{
-	ServableRoute,
-	servable::{Redirect, StaticAsset},
+use servable::{
+	CACHE_BUST_STR, Redirect, ServableRouter, ServableWithRoute, StaticAsset, mime::MimeType,
 };
-use toolbox::mime::MimeType;
 use tower_http::compression::{CompressionLayer, DefaultPredicate};
 
 use crate::pages;
@@ -20,184 +17,270 @@ pub(super) fn router() -> Router<()> {
 	build_server().into_router().layer(compression)
 }
 
-fn build_server() -> ServableRoute {
-	ServableRoute::new()
-		.with_404(pages::notfound())
-		.add_page("/", pages::index())
-		.add_page("/links", pages::links())
-		.add_page("/whats-a-betalupi", pages::betalupi())
-		.add_page("/handouts", pages::handouts())
+pub static HTMX: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/htmx-2.0.8.js".into(),
+	servable::HTMX_2_0_8.with_ttl(None),
+);
+
+pub static HTMX_JSON: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/htmx-json-1.19.12.js".into(),
+	servable::EXT_JSON_1_19_12,
+);
+
+pub static MAIN_CSS: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| format!("/assets/{}/css/main.css", *CACHE_BUST_STR),
+	StaticAsset {
+		bytes: grass::include!("css/main.scss").as_bytes(),
+		mime: MimeType::Css,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static IMG_COVER_SMALL: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/img/cover-small.jpg".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/images/cover-small.jpg"),
+		mime: MimeType::Jpg,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static IMG_BETALUPI: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/img/betalupi.png".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/images/betalupi-map.png"),
+		mime: MimeType::Png,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static IMG_ICON: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/img/icon.png".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/images/icon.png"),
+		mime: MimeType::Png,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+//
+// MARK: fonts
+//
+
+pub static FONT_FIRACODE_BOLD: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/FiraCode-Bold.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fira/FiraCode-Bold.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FIRACODE_LIGHT: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/FiraCode-Light.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fira/FiraCode-Light.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FIRACODE_MEDIUM: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/FiraCode-Medium.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fira/FiraCode-Medium.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FIRACODE_REGULAR: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/FiraCode-Regular.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fira/FiraCode-Regular.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FIRACODE_SEMIBOLD: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/FiraCode-SemiBold.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fira/FiraCode-SemiBold.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FIRACODE_VF: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/FiraCode-VF.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fira/FiraCode-VF.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+//
+// MARK: icons
+//
+pub static FONT_FA_BRANDS_WOFF2: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/fa/fa-brands-400.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fa/fa-brands-400.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FA_REGULAR_WOFF2: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/fa/fa-regular-400.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fa/fa-regular-400.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FA_SOLID_WOFF2: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/fa/fa-solid-900.woff2".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fa/fa-solid-900.woff2"),
+		mime: MimeType::Woff2,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FA_BRANDS_TTF: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/fa/fa-brands-400.ttf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fa/fa-brands-400.ttf"),
+		mime: MimeType::Ttf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FA_REGULAR_TTF: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/fa/fa-regular-400.ttf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fa/fa-regular-400.ttf"),
+		mime: MimeType::Ttf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static FONT_FA_SOLID_TTF: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/fonts/fa/fa-solid-900.ttf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/fonts/fa/fa-solid-900.ttf"),
+		mime: MimeType::Ttf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+//
+// MARK: htwah
+//
+pub static HTWAH_DEFINITIONS: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/htwah/definitions.pdf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/htwah/definitions.pdf"),
+		mime: MimeType::Pdf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static HTWAH_NUMBERING: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/htwah/numbering.pdf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/htwah/numbering.pdf"),
+		mime: MimeType::Pdf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static HTWAH_SOLS_A: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/htwah/sols-a.pdf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/htwah/sols-a.pdf"),
+		mime: MimeType::Pdf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static HTWAH_SOLS_B: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/htwah/sols-b.pdf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/htwah/sols-b.pdf"),
+		mime: MimeType::Pdf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static HTWAH_SPACING_A: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/htwah/spacing-a.pdf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/htwah/spacing-a.pdf"),
+		mime: MimeType::Pdf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+pub static HTWAH_SPACING_B: ServableWithRoute<StaticAsset> = ServableWithRoute::new(
+	|| "/assets/htwah/spacing-b.pdf".into(),
+	StaticAsset {
+		bytes: include_bytes!("../../assets/htwah/spacing-b.pdf"),
+		mime: MimeType::Pdf,
+		ttl: StaticAsset::DEFAULT_TTL,
+	},
+);
+
+fn build_server() -> ServableRouter {
+	ServableRouter::new()
+		.with_404(&pages::NOT_FOUND)
+		.add_page("/", &pages::INDEX)
+		.add_page("/links", pages::LINKS)
+		.add_page("/whats-a-betalupi", pages::BETALUPI)
+		.add_page("/handouts", &pages::HANDOUTS)
 		.add_page("/htwah", {
 			#[expect(clippy::unwrap_used)]
 			Redirect::new("/handouts").unwrap()
 		})
-		.add_page("/htwah/typesetting", pages::htwah_typesetting())
-		.add_page("/assets/htmx.js", page::HTMX_2_0_8)
-		.add_page("/assets/htmx-json.js", page::EXT_JSON_1_19_12)
+		.add_page("/htwah/typesetting", pages::HTWAH_TYPESETTING)
+		.add_page_with_route(&HTMX)
+		.add_page_with_route(&HTMX_JSON)
 		//
-		.add_page(
-			"/assets/css/main.css",
-			StaticAsset {
-				bytes: sass!("css/main.scss").as_bytes(),
-				mime: MimeType::Css,
-			},
-		)
-		.add_page(
-			"/assets/img/cover-small.jpg",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/images/cover-small.jpg"),
-				mime: MimeType::Jpg,
-			},
-		)
-		.add_page(
-			"/assets/img/betalupi.png",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/images/betalupi-map.png"),
-				mime: MimeType::Png,
-			},
-		)
-		.add_page(
-			"/assets/img/icon.png",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/images/icon.png"),
-				mime: MimeType::Png,
-			},
-		)
+		.add_page_with_route(&MAIN_CSS)
+		.add_page_with_route(&IMG_COVER_SMALL)
+		.add_page_with_route(&IMG_BETALUPI)
+		.add_page_with_route(&IMG_ICON)
 		//
 		// MARK: fonts
 		//
-		.add_page(
-			"/assets/fonts/FiraCode-Bold.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fira/FiraCode-Bold.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
-		.add_page(
-			"/assets/fonts/FiraCode-Light.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fira/FiraCode-Light.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
-		.add_page(
-			"/assets/fonts/FiraCode-Medium.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fira/FiraCode-Medium.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
-		.add_page(
-			"/assets/fonts/FiraCode-Regular.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fira/FiraCode-Regular.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
-		.add_page(
-			"/assets/fonts/FiraCode-SemiBold.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fira/FiraCode-SemiBold.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
-		.add_page(
-			"/assets/fonts/FiraCode-VF.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fira/FiraCode-VF.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
+		.add_page_with_route(&FONT_FIRACODE_BOLD)
+		.add_page_with_route(&FONT_FIRACODE_LIGHT)
+		.add_page_with_route(&FONT_FIRACODE_MEDIUM)
+		.add_page_with_route(&FONT_FIRACODE_REGULAR)
+		.add_page_with_route(&FONT_FIRACODE_SEMIBOLD)
+		.add_page_with_route(&FONT_FIRACODE_VF)
 		//
 		// MARK: icons
 		//
-		.add_page(
-			"/assets/fonts/fa/fa-brands-400.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fa/fa-brands-400.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
-		.add_page(
-			"/assets/fonts/fa/fa-regular-400.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fa/fa-regular-400.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
-		.add_page(
-			"/assets/fonts/fa/fa-solid-900.woff2",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fa/fa-solid-900.woff2"),
-				mime: MimeType::Woff2,
-			},
-		)
-		.add_page(
-			"/assets/fonts/fa/fa-brands-400.ttf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fa/fa-brands-400.ttf"),
-				mime: MimeType::Ttf,
-			},
-		)
-		.add_page(
-			"/assets/fonts/fa/fa-regular-400.ttf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fa/fa-regular-400.ttf"),
-				mime: MimeType::Ttf,
-			},
-		)
-		.add_page(
-			"/assets/fonts/fa/fa-solid-900.ttf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/fonts/fa/fa-solid-900.ttf"),
-				mime: MimeType::Ttf,
-			},
-		)
+		.add_page_with_route(&FONT_FA_BRANDS_WOFF2)
+		.add_page_with_route(&FONT_FA_REGULAR_WOFF2)
+		.add_page_with_route(&FONT_FA_SOLID_WOFF2)
+		.add_page_with_route(&FONT_FA_BRANDS_TTF)
+		.add_page_with_route(&FONT_FA_REGULAR_TTF)
+		.add_page_with_route(&FONT_FA_SOLID_TTF)
 		//
 		// MARK: htwah
 		//
-		.add_page(
-			"/assets/htwah/definitions.pdf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/htwah/definitions.pdf"),
-				mime: MimeType::Pdf,
-			},
-		)
-		.add_page(
-			"/assets/htwah/numbering.pdf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/htwah/numbering.pdf"),
-				mime: MimeType::Pdf,
-			},
-		)
-		.add_page(
-			"/assets/htwah/sols-a.pdf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/htwah/sols-a.pdf"),
-				mime: MimeType::Pdf,
-			},
-		)
-		.add_page(
-			"/assets/htwah/sols-b.pdf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/htwah/sols-b.pdf"),
-				mime: MimeType::Pdf,
-			},
-		)
-		.add_page(
-			"/assets/htwah/spacing-a.pdf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/htwah/spacing-a.pdf"),
-				mime: MimeType::Pdf,
-			},
-		)
-		.add_page(
-			"/assets/htwah/spacing-b.pdf",
-			StaticAsset {
-				bytes: include_bytes!("../../assets/htwah/spacing-b.pdf"),
-				mime: MimeType::Pdf,
-			},
-		)
+		.add_page_with_route(&HTWAH_DEFINITIONS)
+		.add_page_with_route(&HTWAH_NUMBERING)
+		.add_page_with_route(&HTWAH_SOLS_A)
+		.add_page_with_route(&HTWAH_SOLS_B)
+		.add_page_with_route(&HTWAH_SPACING_A)
+		.add_page_with_route(&HTWAH_SPACING_B)
 }
 
 #[test]