page rewrite

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

@@ -1,34 +1,29 @@
 use maud::html;
-use page::page::{Page, PageMetadata};
+use page::servable::{Page, PageMetadata};
 use reqwest::StatusCode;
 
-use crate::pages::page_wrapper;
+use crate::pages::MAIN_TEMPLATE;
 
 pub fn notfound() -> Page {
-	Page {
-		meta: PageMetadata {
-			title: "Betalupi: About".into(),
-			author: None,
+	MAIN_TEMPLATE.derive(
+		PageMetadata {
+			title: "Page not found".into(),
+			author:None,
 			description: None,
 			image: Some("/assets/img/icon.png".to_owned()),
-			backlinks: Some(false),
 		},
-
-		response_code: StatusCode::NOT_FOUND,
-		generate_html: Box::new(move |page, _ctx| {
+		move |_page, _ctx| {
 			Box::pin(async {
-				let inner = html! {
-					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"}
+				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"}
+						}
 					}
-				};
-
-				page_wrapper(&page.meta, inner, false).await
+				}
 			})
-		}),
-
-		..Default::default()
-	}
+		},
+	).response_code(StatusCode::NOT_FOUND)
 }