add tags to model

content/posts/lambda-calculus/index.md

@@ -1,6 +1,7 @@
 ---
 title: Lambda calculus is the DNA of all computation
 date: 2024-09-07T20:32:00.281Z
+tags: [lambda calculus, fun]
 desc: >
   Lambda calculus can be used to express any computation, but what does it entail? As it turns out first class functions are the single most powerful abstraction.
 scripts:

content/posts/remember-forums.md

@@ -1,6 +1,7 @@
 ---
 title: Remember forums?
 date: 2024-09-21T19:14:29.799Z
+tags: [thought, internet]
 desc: >
   It feels to me like forums are slowly getting forgotten, replaced with more high-paced services like Discord or Twitter.
   In my opinion this isn't a good thing at all.

src/html/home.rs

@@ -2,7 +2,7 @@ use camino::Utf8Path;
 use hauchiwa::Sack;
 use hypertext::{html_elements, maud, maud_move, GlobalAttributes, Raw, Renderable};
 
-use crate::{html::Post, text::md::parse, Link, LinkDate, MyData};
+use crate::{model::Post, text::md::parse, Link, LinkDate, MyData};
 
 const INTRO: &str = r#"
 ## かもし

src/html/isodate.rs

@@ -1,24 +0,0 @@
-//! This module is supplementary to Serde, it allows you tu parse JS dates.
-
-use chrono::{DateTime, Utc};
-use serde::{self, Deserialize, Deserializer};
-
-// pub fn serialize<S>(
-//     date: &DateTime<Utc>,
-//     serializer: S,
-// ) -> Result<S::Ok, S::Error>
-// where
-//     S: Serializer,
-// {
-//     let s = date.to_rfc3339();
-//     serializer.serialize_str(&s)
-// }
-
-pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<DateTime<Utc>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let s = String::deserialize(deserializer)?;
-    let dt = chrono::DateTime::parse_from_rfc3339(&s).map_err(serde::de::Error::custom)?;
-    Ok(dt.into())
-}

src/html/misc.rs

@@ -4,7 +4,7 @@ use camino::Utf8Path;
 use hauchiwa::Outline;
 use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
 
-use crate::{html::Wiki, Link, MySack};
+use crate::{model::Wiki, Link, MySack};
 
 /// Render the outline for a document
 pub(crate) fn show_outline(outline: Outline) -> impl Renderable {

src/html/mod.rs

@@ -1,6 +1,5 @@
 mod head;
 mod home;
-mod isodate;
 mod list;
 mod misc;
 pub mod post;
@@ -16,11 +15,8 @@ use hypertext::{html_elements, maud, maud_move, GlobalAttributes, Raw, Renderabl
 
 pub(crate) use home::home;
 use post::article;
-pub(crate) use post::Post;
-pub(crate) use slideshow::Slideshow;
-pub(crate) use wiki::Wiki;
 
-use crate::{LinkDate, MySack};
+use crate::{model::Post, LinkDate, MySack};
 
 fn navbar() -> impl Renderable {
 	static ITEMS: &[(&str, &str)] = &[
@@ -219,11 +215,11 @@ pub fn as_html(
 	outline: Outline,
 	bibliography: Bibliography,
 ) -> String {
-	flox(&meta.title, parsed, sack, outline, bibliography)
+	flox(meta, parsed, sack, outline, bibliography)
 }
 
 pub(crate) fn flox(
-	title: &str,
+	meta: &Post,
 	parsed: &str,
 	sack: &MySack,
 	outline: Outline,
@@ -248,7 +244,7 @@ pub(crate) fn flox(
 						pre #output {}
 					}
 				}
-				(article(title, parsed, sack, outline, bibliography))
+				(article(meta, parsed, sack, outline, bibliography))
 			}
 		),
 		String::from("Flox"),

src/html/post.rs

@@ -1,21 +1,9 @@
 use camino::Utf8Path;
-use chrono::{DateTime, Utc};
 use hauchiwa::{Bibliography, Outline};
 use hayagriva::Library;
-use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
-use serde::Deserialize;
+use hypertext::{html_elements, maud_move, rsx, rsx_move, GlobalAttributes, Raw, Renderable};
 
-use crate::MySack;
-
-/// Represents a simple post.
-#[derive(Deserialize, Debug, Clone)]
-pub struct Post {
-	pub title: String,
-	#[serde(with = "super::isodate")]
-	pub date: DateTime<Utc>,
-	pub desc: Option<String>,
-	pub scripts: Option<Vec<String>>,
-}
+use crate::{model::Post, MySack};
 
 pub fn parse_content(
 	content: &str,
@@ -52,7 +40,7 @@ where
 {
 	let main = maud_move!(
 		main {
-			(article(&meta.title, parsed, sack, outline, bibliography))
+			(article(meta, parsed, sack, outline, bibliography))
 		}
 	);
 
@@ -60,7 +48,7 @@ where
 }
 
 pub fn article<'p, 's, 'html>(
-	title: &'p str,
+	meta: &'p Post,
 	parsed: &'p str,
 	_: &'s MySack,
 	outline: Outline,
@@ -84,18 +72,38 @@ where
 				(crate::html::misc::show_outline(outline))
 			}
 
-			article .wiki-article /*class:list={classlist)*/ {
-				header class="markdown" {
-					h1 #top { (title) }
+			(paper_page(meta, parsed, bibliography))
+		}
+	)
+}
+
+fn paper_page<'a>(meta: &'a Post, parsed: &'a str, bib: Bibliography) -> impl Renderable + 'a {
+	maud_move!(
+		article .wiki-article {
+			header {
+				h1 #top {
+					(&meta.title)
+				}
+				div .line {
+					div .date {
+						(meta.date.format("%Y-%m-%d").to_string())
+					}
+					@if let Some(ref tags) = meta.tags {
+						ul .tags {
+							@for tag in tags {
+								li { (tag) }
+							}
+						}
+					}
+				}
 			}
 			section .wiki-article__markdown.markdown {
 				(Raw(parsed))
 			}
 
-				@if let Some(bib) = bibliography.0 {
+			@if let Some(bib) = bib.0 {
 				(crate::html::misc::emit_bibliography(bib))
 			}
 		}
-		}
 	)
 }

src/html/slideshow.rs

@@ -1,13 +1,11 @@
 use std::fmt::Write;
 
 use camino::Utf8Path;
-use chrono::{DateTime, Utc};
 use hauchiwa::{Bibliography, Outline};
 use hayagriva::Library;
 use hypertext::{html_elements, maud, GlobalAttributes, Raw, Renderable};
-use serde::Deserialize;
 
-use crate::MySack;
+use crate::{model::Slideshow, MySack};
 
 const CSS: &str = r#"
 .slides img {
@@ -17,15 +15,6 @@ const CSS: &str = r#"
 }
 "#;
 
-/// Represents a slideshow
-#[derive(Deserialize, Debug, Clone)]
-pub(crate) struct Slideshow {
-	pub title: String,
-	#[serde(with = "super::isodate")]
-	pub date: DateTime<Utc>,
-	pub desc: Option<String>,
-}
-
 pub fn parse_content(
 	content: &str,
 	sack: &MySack,

src/html/wiki.rs

@@ -2,15 +2,8 @@ use camino::Utf8Path;
 use hauchiwa::{Bibliography, Outline};
 use hayagriva::Library;
 use hypertext::{html_elements, maud_move, GlobalAttributes, Raw, Renderable};
-use serde::Deserialize;
 
-use crate::MySack;
-
-/// Represents a wiki page
-#[derive(Deserialize, Debug, Clone)]
-pub struct Wiki {
-	pub title: String,
-}
+use crate::{model::Wiki, MySack};
 
 pub fn parse_content(
 	content: &str,

src/main.rs

@@ -1,4 +1,5 @@
 mod html;
+mod model;
 mod text;
 mod ts;
 
@@ -8,8 +9,8 @@ use camino::{Utf8Path, Utf8PathBuf};
 use chrono::{DateTime, Datelike, Utc};
 use clap::{Parser, ValueEnum};
 use hauchiwa::{Collection, Processor, Sack, Website};
-use html::{Post, Slideshow, Wiki};
 use hypertext::Renderable;
+use model::{Post, Slideshow, Wiki};
 
 #[derive(Parser, Debug, Clone)]
 struct Args {

src/model.rs

@@ -0,0 +1,53 @@
+use chrono::{DateTime, Utc};
+use serde::Deserialize;
+
+/// Represents a simple post.
+#[derive(Deserialize, Debug, Clone)]
+pub struct Post {
+	pub title: String,
+	#[serde(with = "isodate")]
+	pub date: DateTime<Utc>,
+	pub desc: Option<String>,
+	pub tags: Option<Vec<String>>,
+	pub scripts: Option<Vec<String>>,
+}
+
+/// Represents a slideshow
+#[derive(Deserialize, Debug, Clone)]
+pub(crate) struct Slideshow {
+	pub title: String,
+	#[serde(with = "isodate")]
+	pub date: DateTime<Utc>,
+	pub desc: Option<String>,
+}
+
+/// Represents a wiki page
+#[derive(Deserialize, Debug, Clone)]
+pub struct Wiki {
+	pub title: String,
+}
+
+mod isodate {
+	use chrono::{DateTime, Utc};
+	use serde::{self, Deserialize, Deserializer};
+
+	// pub fn serialize<S>(
+	//     date: &DateTime<Utc>,
+	//     serializer: S,
+	// ) -> Result<S::Ok, S::Error>
+	// where
+	//     S: Serializer,
+	// {
+	//     let s = date.to_rfc3339();
+	//     serializer.serialize_str(&s)
+	// }
+
+	pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<DateTime<Utc>, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
+		let s = String::deserialize(deserializer)?;
+		let dt = chrono::DateTime::parse_from_rfc3339(&s).map_err(serde::de::Error::custom)?;
+		Ok(dt.into())
+	}
+}

styles/_markdown.scss

@@ -11,7 +11,9 @@
 		font-size: 1.5rem;
 	}
 
-  h4, > h5, > h6 {
+	h4,
+	> h5,
+	> h6 {
 		font-size: 1.2rem;
 	}
 
@@ -22,10 +24,12 @@
 		line-height: 1.5em;
 	}
 
-  ul, ol {
+	ul,
+	ol {
 		padding-left: 1em;
 
-    ul, ol {
+		ul,
+		ol {
 			padding-left: 1em;
 		}
 	}
@@ -46,7 +50,12 @@
 		}
 	}
 
-  > h1, > h2, > h3, > h4, > h5, > h6 {
+	> h1,
+	> h2,
+	> h3,
+	> h4,
+	> h5,
+	> h6 {
 		margin-bottom: 0.5em;
 		font-family: var(--serif);
 		font-weight: 500;
@@ -56,7 +65,6 @@
 		}
 	}
 
-
 	img:not([class]) {
 		max-width: 100%;
 		height: auto;
@@ -84,7 +92,8 @@
 		border-collapse: collapse;
 		overflow-x: auto;
 
-    th, td {
+		th,
+		td {
 			padding: 0.2em 0.5em;
 			border: 1px solid #dbdbdb;
 		}

styles/layouts/_page.scss

@@ -1,7 +1,6 @@
 $bp-m: 58rem;
 $bp-l: 80rem;
 
-
 .wiki-main {
 	position: relative;
 	display: grid;
@@ -83,7 +82,9 @@ $bp-l: 80rem;
 	padding: 1em;
 	padding-top: 2em;
 	background-color: white;
-  transition: margin ease-in-out 0.2s, padding ease-in-out 0.2s;
+	transition:
+		margin ease-in-out 0.2s,
+		padding ease-in-out 0.2s;
 
 	@media (min-width: $bp-m) {
 		max-width: min(100%, 50em);
@@ -99,6 +100,38 @@ $bp-l: 80rem;
 		padding: 2em;
 	}
 
+	header {
+		margin-bottom: 1em;
+
+		h1 {
+			font-size: 2.5rem;
+			font-family: var(--serif);
+			font-weight: 500;
+			line-height: 1em;
+			margin-bottom: 0.3em;
+		}
+
+		.line {
+			display: flex;
+			flex-direction: row;
+			gap: 0.5em;
+		}
+
+		.tags {
+			display: inline;
+			list-style: none;
+			padding: 0px;
+
+			li {
+				display: inline;
+
+				&:not(:last-child)::after {
+					content: ", ";
+				}
+			}
+		}
+	}
+
 	&__markdown {
 		max-width: calc(100vw - 2em);
 	}