Migrate to servable

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)
+});