refactor(website): ♻️ refactored website to use new ergonomics macros

Author: arctic-hen7

website/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "perseus-website"
-version = "0.3.0-beta.13"
+version = "0.3.0-beta.16"
 edition = "2018"
 description = "The official website for the Perseus framework."
 authors = ["arctic_hen7 <[email protected]>"]
@@ -13,7 +13,7 @@ readme = "./README.md"
 
 [dependencies]
 # We use the current version of Perseus, not the local one
-perseus = {  version = "0.3.0-beta.15", features = [ "translator-fluent" ] }
+perseus = {  version = "0.3.0-beta.16", features = [ "translator-fluent" ] }
 sycamore = "0.6"
 sycamore-router = "0.6"
 serde = "1"

website/src/templates/comparisons.rs

@@ -288,6 +288,8 @@ pub struct ComparisonsPageProps {
     /// The comparison data for Perseus itself.
     pub perseus_comparison: Comparison,
 }
+
+#[perseus::template(ComparisonsPage)]
 #[component(ComparisonsPage<G>)]
 pub fn comparisons_page(props: ComparisonsPageProps) -> SycamoreTemplate<G> {
     let comparisons = props.comparisons.clone();
@@ -362,22 +364,25 @@ pub fn comparisons_page(props: ComparisonsPageProps) -> SycamoreTemplate<G> {
     }
 }
 
+#[perseus::head]
+pub fn head() -> SycamoreTemplate<SsrNode> {
+    template! {
+        title { (format!("{} | {}", t!("comparisons-title"), t!("perseus"))) }
+    }
+}
+
 pub fn get_template<G: GenericNode>() -> Template<G> {
     Template::new("comparisons")
-        .template(|props| {
-            template! {
-                ComparisonsPage(serde_json::from_str(&props.unwrap()).unwrap())
-            }
-        })
-        .head(|_| {
-            template! {
-                title { (format!("{} | {}", t!("comparisons-title"), t!("perseus"))) }
-            }
-        })
+        .template(comparisons_page)
+        .head(head)
         .build_state_fn(get_build_state)
 }
 
-pub async fn get_build_state(_path: String, _locale: String) -> RenderFnResultWithCause<String> {
+#[perseus::autoserde(build_state)]
+pub async fn get_build_state(
+    _path: String,
+    _locale: String,
+) -> RenderFnResultWithCause<ComparisonsPageProps> {
     // Get all the comparisons from JSON
     // This includes the special properties for Perseus itself
     let mut perseus_comparison: Option<Comparison> = None;
@@ -416,6 +421,5 @@ pub async fn get_build_state(_path: String, _locale: String) -> RenderFnResultWi
             })
         }
     };
-    let props_str = serde_json::to_string(&props)?;
-    Ok(props_str)
+    Ok(props)
 }

website/src/templates/docs/generation.rs

@@ -105,7 +105,11 @@ pub struct DocsManifest {
     pub history_map: HashMap<String, String>,
 }
 
-pub async fn get_build_state(path: String, locale: String) -> RenderFnResultWithCause<String> {
+#[perseus::autoserde(build_state)]
+pub async fn get_build_state(
+    path: String,
+    locale: String,
+) -> RenderFnResultWithCause<DocsPageProps> {
     let path_vec: Vec<&str> = path.split('/').collect();
     // Localize the path again to what it'll be on the filesystem
     // TODO get Perseus to pass in props from build paths for ease of use?
@@ -281,8 +285,7 @@ pub async fn get_build_state(path: String, locale: String) -> RenderFnResultWith
         current_version: version.to_string(),
     };
 
-    let props_str = serde_json::to_string(&props)?;
-    Ok(props_str)
+    Ok(props)
 }
 
 pub async fn get_build_paths() -> RenderFnResult<Vec<String>> {

website/src/templates/docs/template.rs

@@ -18,6 +18,7 @@ pub struct DocsPageProps {
     pub current_version: String,
 }
 
+#[perseus::template(DocsPage)]
 #[component(DocsPage<G>)]
 pub fn docs_page(props: DocsPageProps) -> SycamoreTemplate<G> {
     // These come pre-translated for the current locale
@@ -50,22 +51,20 @@ pub fn docs_page(props: DocsPageProps) -> SycamoreTemplate<G> {
     }
 }
 
+#[perseus::head]
+pub fn head(props: DocsPageProps) -> SycamoreTemplate<SsrNode> {
+    template! {
+        title { (format!("{} | {}", props.title, t!("docs-title-base"))) }
+        link(rel = "stylesheet", href = ".perseus/static/styles/markdown.css")
+        link(rel = "stylesheet", href = ".perseus/static/styles/docs_links_markdown.css")
+        link(rel = "stylesheet", href = ".perseus/static/prism.css")
+    }
+}
+
 pub fn get_template<G: GenericNode>() -> Template<G> {
     Template::new("docs")
         .build_paths_fn(get_build_paths)
         .build_state_fn(get_build_state)
-        .template(|props| {
-            template! {
-                DocsPage(serde_json::from_str(&props.unwrap()).unwrap())
-            }
-        })
-        .head(|props| {
-            let props: DocsPageProps = serde_json::from_str(&props.unwrap()).unwrap();
-            template! {
-                title { (format!("{} | {}", props.title, t!("docs-title-base"))) }
-                link(rel = "stylesheet", href = ".perseus/static/styles/markdown.css")
-                link(rel = "stylesheet", href = ".perseus/static/styles/docs_links_markdown.css")
-                link(rel = "stylesheet", href = ".perseus/static/prism.css")
-            }
-        })
+        .template(docs_page)
+        .head(head)
 }

website/src/templates/index.rs

@@ -5,6 +5,7 @@ use perseus::{link, t, GenericNode, Template};
 use sycamore::prelude::Template as SycamoreTemplate;
 use sycamore::prelude::*;
 
+#[perseus::template(IndexPage)]
 #[component(IndexPage<G>)]
 pub fn index_page() -> SycamoreTemplate<G> {
     template! {
@@ -128,16 +129,13 @@ pub fn index_page() -> SycamoreTemplate<G> {
     }
 }
 
+#[perseus::head]
+pub fn head() -> SycamoreTemplate<SsrNode> {
+    template! {
+        title { (t!("perseus")) }
+    }
+}
+
 pub fn get_template<G: GenericNode>() -> Template<G> {
-    Template::new("index")
-        .template(|_| {
-            template! {
-                IndexPage()
-            }
-        })
-        .head(|_| {
-            template! {
-                title { (t!("perseus")) }
-            }
-        })
+    Template::new("index").template(index_page).head(head)
 }