From 6d159c8fddb901437249c69dc1ef4afc30c905d0 Mon Sep 17 00:00:00 2001
From: Bruno Rocha <rochacbruno@gmail.com>
Date: Wed, 13 Nov 2024 17:28:19 +0000
Subject: [PATCH] feat: author and multi author support

fix #83
---
 example/content/2024-10-24-getting-started.md |   1 +
 example/content/markdown-format.md            |  16 +-
 example/marmite.yaml                          |  15 ++
 example/static/marmite.css                    | 230 +++++++++++++++++-
 example/templates/content.html                |  18 +-
 example/templates/content_authors.html        |  15 ++
 example/templates/content_date.html           |   6 +
 example/templates/content_title.html          |   8 +
 example/templates/list.html                   |  24 +-
 src/config.rs                                 |  15 ++
 src/content.rs                                |  22 ++
 src/markdown.rs                               |   6 +-
 src/site.rs                                   |  34 +++
 13 files changed, 398 insertions(+), 12 deletions(-)
 create mode 100644 example/templates/content_authors.html
 create mode 100644 example/templates/content_date.html
 create mode 100644 example/templates/content_title.html

diff --git a/example/content/2024-10-24-getting-started.md b/example/content/2024-10-24-getting-started.md
index c45cd42..f392e69 100644
--- a/example/content/2024-10-24-getting-started.md
+++ b/example/content/2024-10-24-getting-started.md
@@ -4,6 +4,7 @@ slug: getting-started
 tags: docs
 extra:
   mermaid: true
+authors: rochacbruno
 ---
 Learn how to create your blog with Marmite in minutes, you can start with zero-config 
 and then customize gradually later.
diff --git a/example/content/markdown-format.md b/example/content/markdown-format.md
index 369574d..83e22e6 100644
--- a/example/content/markdown-format.md
+++ b/example/content/markdown-format.md
@@ -4,19 +4,25 @@ date: 2024-10-17 12:00:01
 slug: markdown-format
 description: The content here accepts any valid CommonMark or Github Flavoured markdown and some GFM extensions.
 tags: docs, markdown, Common Mark, GFM
+authors: rochacbruno,karlamagueta
 extra:
   math: true
   mermaid: true
-  mermaid_theme: neutral
+  mermaid_theme: default
 ---
 
-# Writing content in Markdown
+The content on Marmite accepts any valid `CommonMark` or **Github** _Flavoured_ markdown
+and some `GFM` extensions, Marmite also does post processing of HTML to support features such as 
+back-links and Obsidian links.
 
-The content here accepts any valid `CommonMark` or **Github** _Flavoured_ markdown
-and some `GFM` extensions.
+### Paragraphs and formatting
 
 Simple paragraph and usual formatting like **bold**, __underline__, *italic*
-and also all sorts of formatting elements.
+and also all sorts of formatting elements, as follows.
+
+```markdown
+**bold**, __underline__, *italic*
+```
 
 ### Strike-through
 
diff --git a/example/marmite.yaml b/example/marmite.yaml
index 2ede3ae..c14c539 100644
--- a/example/marmite.yaml
+++ b/example/marmite.yaml
@@ -25,6 +25,21 @@ menu:
   - ["Github", "https://github.com/rochacbruno/marmite"]
 
 default_date_format: "%A, %d %B"
+
+authors:
+  rochacbruno:
+    name: Bruno Rocha
+    avatar: https://github.com/rochacbruno.png
+    bio: Marmite Maintainer
+    links:
+      - ["Fediverse", "https://go.rocha.social/@bruno"]
+      - ["Github", "https://github.com/rochacbruno"]
+      - ["Linkedin", "https://www.linkedin.com/in/rochacbruno/"]
+      - ["Links", "https://bruno.rocha.social"]
+  karlamagueta:
+    name: Karla Magueta
+    avatar: https://github.com/karlamagueta.png
+
 # extra data for template customization
 # extra:
 #  foo: bar
diff --git a/example/static/marmite.css b/example/static/marmite.css
index e6e38fc..d46de02 100644
--- a/example/static/marmite.css
+++ b/example/static/marmite.css
@@ -207,7 +207,11 @@ article footer {
 }
 
 pre:has(> code.language-mermaid) {
-  background-color: transparent;
+  background-color: #fff;
+}
+
+pre:has(> code.language-mermaid) p {
+  color: revert;
 }
 
 /* Search */
@@ -384,4 +388,226 @@ pre:has(> code.language-mermaid) {
   .search-magnifier {
     display: none;
   }
-}
\ No newline at end of file
+}
+
+.content-title {
+  margin-bottom: 10px;
+}
+.content-title h1 {
+  margin: 0;
+}
+
+.content-authors {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-left: 8px;
+}
+
+.content-authors img {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+}
+
+.content-authors p {
+  margin: 0;
+}
+
+.content-authors ul {
+  list-style: none;
+  padding: 0;
+  margin-top: revert;
+}
+
+.content-authors li {
+  display: flex;
+  align-items: center;
+}
+
+td, th {
+	padding: calc(var(--pico-spacing)/ 2) var(--pico-spacing);
+	border: var(--pico-border-width) solid var(--pico-table-border-color);
+	background-color: var(--pico-background-color);
+	color: var(--pico-color);
+	font-weight: var(--pico-font-weight);
+	/* text-align: left; */
+	text-align: start;
+}
+
+
+/* <div class="hero author-hero">
+    <article>
+    <h1>{{author.name}}</h1>
+    <img src="{{ author.avatar }}" alt="{{ author.name }}" class="avatar" align="left">
+    <p>{{author.bio}}</p>
+    {% if author.links %}
+    <ul>
+        {% for link in author.links %}
+        <li><a href="{{link.1}}">{{link.0}}</a></li>
+        {% endfor %}
+    {% endif %}
+    </article>
+</div> */
+
+/* .author-hero {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  margin: 20px 0;
+}
+
+.author-hero h1 {
+  margin-bottom: 20px;
+}
+
+.author-hero article {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.author-hero img.avatar {
+  width: 150px;
+  height: 150px;
+  border-radius: 50%;
+  margin-bottom: 20px;
+}
+
+.author-hero p {
+  margin-bottom: 20px;
+}
+
+.author-hero ul {
+  display: flex;
+  gap: 10px;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.author-hero ul li {
+  display: inline;
+}
+
+.author-hero ul li a {
+  text-decoration: none;
+  color: var(--pico-color-azure-550);
+  transition: color 0.3s ease;
+}
+
+.author-hero ul li a:hover {
+  color: var(--pico-color-azure-650);
+}
+
+@media (min-width: 768px) {
+  .author-hero article {
+    flex-direction: row;
+    align-items: flex-start;
+    text-align: left;
+  }
+
+  .author-hero img.avatar {
+    margin-right: 20px;
+    margin-bottom: 0;
+  }
+
+  .author-hero p {
+    flex: 1;
+  }
+
+  .author-hero ul {
+    justify-content: flex-start;
+  }
+} */
+
+
+
+/* 
+
+ <div class="hero author-hero">
+            <article>
+            <h1>{{author.name}}</h1>
+            <div class="author-hero-image">
+                <img src="{{ author.avatar }}" alt="{{ author.name }}" class="avatar">
+            </div>
+            <div class="author-hero-bio">
+                <p>{{author.bio}}</p>
+            </div>
+            {% if author.links %}
+            <div class="author-hero-links">
+                <ul>
+                    {% for link in author.links %}
+                    <li><a href="{{link.1}}">{{link.0}}</a></li>
+                    {% endfor %}
+                </ul>
+            </div>
+            {% endif %}
+            </article>
+        </div>
+*/
+.author-hero {
+  padding: 20px;
+}
+
+.author-hero article {
+  display: grid;
+  grid-template-areas:
+    "title title"
+    "image bio"
+    "links links";
+  gap: 20px;
+  grid-template-columns: auto 1fr;
+}
+
+.author-hero h1 {
+  grid-area: title;
+  margin: 0;
+}
+
+.author-hero-image {
+  grid-area: image;
+}
+
+.author-hero-image .avatar {
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+}
+
+.author-hero-bio {
+  grid-area: bio;
+}
+
+.author-hero-links {
+  grid-area: links;
+}
+
+.author-hero-links ul {
+  display: flex;
+  gap: 15px;
+  padding: 0;
+  list-style: none;
+}
+
+.author-hero-links ul li{
+  list-style: none;
+}
+
+.author-hero-links a {
+  color: var(--pico-color-azure-550);
+}
+
+@media (max-width: 768px) {
+  .author-hero article {
+    grid-template-areas:
+      "title"
+      "image"
+      "bio"
+      "links";
+    grid-template-columns: 1fr;
+    text-align: center;
+  }
+}
+
diff --git a/example/templates/content.html b/example/templates/content.html
index 74eb0a8..5c4fdd0 100644
--- a/example/templates/content.html
+++ b/example/templates/content.html
@@ -37,12 +37,24 @@
 
 {% endblock %}
 
+
 {% block main %}
+
+{#
+<div>
+{% if content.card_image %} <img class="content-card-image" src="{{content.card_image}}" alt="{{content.title}}"> {% endif %}
+</div>
+#}
+
 <article>
-    <div class="content-html">{{ content.html | safe }}</div>
+    
+    {% include "content_title.html" ignore missing %}
+
+    <div class="content-html">{{ content.html }}</div>
     {% if content.date %}
     <footer class="data-tags-footer">
-        <span class="content-date"> {{ content.date | date(format="%b %e, %Y") }}</span>
+        {% include "content_authors.html" ignore missing %}
+        {% include "content_date.html" ignore missing %}
         <ul class="content-tags overflow-auto">
         {% for tag in content.tags  %}
             <li><a href="./tag-{{ tag | trim | slugify }}.html">{{ tag }}</a></li>
@@ -81,7 +93,7 @@
 <script>
 var config = {
     startOnLoad:true,
-    theme: '{{content.extra.mermaid_theme | default(value="neutral") }}',
+    theme: '{{content.extra.mermaid_theme | default(value="default") }}',
     flowchart:{useMaxWidth:false, htmlLabels:true}
 };
 mermaid.initialize(config);
diff --git a/example/templates/content_authors.html b/example/templates/content_authors.html
new file mode 100644
index 0000000..803e014
--- /dev/null
+++ b/example/templates/content_authors.html
@@ -0,0 +1,15 @@
+{% if content.authors %}
+<div class="content-authors">
+    <ul>
+        {% for username in content.authors %}
+            {% set author = site.authors[username] %}
+            <li>
+                <a href="author-{{username}}.html">
+                    <img src="{{ author.avatar }}" alt="{{ author.name }}" class="avatar">
+                    {{ author.name }}
+                </a>
+            </li>
+        {% endfor %}
+    </ul>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/example/templates/content_date.html b/example/templates/content_date.html
new file mode 100644
index 0000000..b5ea737
--- /dev/null
+++ b/example/templates/content_date.html
@@ -0,0 +1,6 @@
+{# Calculate reading time #}
+{% set words = content.html | striptags | split(pat=' ') | length %}
+{% set reading_time = (words / 200) | round(method='ceil') %}
+<span class="content-date">
+    <small>{% if content.date %} {{ content.date | default_date_format }} {% endif %} - {{ reading_time }} minute{% if reading_time > 1 %}s{% endif %}</small>
+</span>
diff --git a/example/templates/content_title.html b/example/templates/content_title.html
new file mode 100644
index 0000000..09371b2
--- /dev/null
+++ b/example/templates/content_title.html
@@ -0,0 +1,8 @@
+{# Display title and date if not starting with h1, else render the content using the user given title #}
+
+{% if content.html is not starting_with("<h1>") %}
+<div class="content-title">
+    <h1>{{content.title}}</h1> 
+    {% include "content_date.html" ignore missing %}
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/example/templates/list.html b/example/templates/list.html
index dcca670..60585d8 100644
--- a/example/templates/list.html
+++ b/example/templates/list.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block main %}
 
-        {%if current_page != "index.html" %}
+        {%if current_page != "index.html" and author is not defined %}
         <div class="list-title">
             <article><strong> {{ title }} </strong></article>
         </div>
@@ -13,6 +13,28 @@
             </article>
         </div>
         {% endif %}
+        {% if author is defined %}
+        <div class="hero author-hero">
+            <article>
+            <h1>{{author.name}}</h1>
+            <div class="author-hero-image">
+                <img src="{{ author.avatar }}" alt="{{ author.name }}" class="avatar">
+            </div>
+            <div class="author-hero-bio">
+                <p>{{author.bio}}</p>
+            </div>
+            {% if author.links %}
+            <div class="author-hero-links">
+                <ul>
+                    {% for link in author.links %}
+                    <li><a href="{{link.1}}">{{link.0}}</a></li>
+                    {% endfor %}
+                </ul>
+            </div>
+            {% endif %}
+            </article>
+        </div>
+        {% endif %}
         <div class="content-list">
             {%- for content in content_list %}
             <article class="content-list-item">
diff --git a/src/config.rs b/src/config.rs
index 48195f0..d72c0ad 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -55,6 +55,17 @@ pub struct Marmite {
 
     #[serde(default = "default_extra")]
     pub extra: Option<HashMap<String, Value>>,
+
+    #[serde(default = "default_authors")]
+    pub authors: HashMap<String, Author>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct Author {
+    pub name: String,
+    pub avatar: Option<String>,
+    pub bio: Option<String>,
+    pub links: Option<Vec<(String, String)>>,
 }
 
 fn default_name() -> String {
@@ -149,3 +160,7 @@ fn default_menu() -> Option<Vec<(String, String)>> {
 fn default_extra() -> Option<HashMap<String, Value>> {
     None
 }
+
+fn default_authors() -> HashMap<String, Author> {
+    HashMap::new()
+}
diff --git a/src/content.rs b/src/content.rs
index a5e64cd..a98b55f 100644
--- a/src/content.rs
+++ b/src/content.rs
@@ -70,6 +70,7 @@ pub struct Content {
     pub links_to: Option<Vec<String>>,
     pub back_links: Vec<Self>,
     pub card_image: Option<String>,
+    pub authors: Vec<String>,
 }
 
 pub fn get_title<'a>(frontmatter: &'a Frontmatter, markdown: &'a str) -> String {
@@ -121,6 +122,23 @@ pub fn get_tags(frontmatter: &Frontmatter) -> Vec<String> {
     tags
 }
 
+pub fn get_authors(frontmatter: &Frontmatter) -> Vec<String> {
+    let authors: Vec<String> = match frontmatter.get("authors") {
+        Some(Value::Array(authors)) => authors
+            .iter()
+            .map(Value::to_string)
+            .map(|t| t.trim_matches('"').to_string())
+            .collect(),
+        Some(Value::String(authors)) => authors
+            .split(',')
+            .map(str::trim)
+            .map(String::from)
+            .collect(),
+        _ => Vec::new(),
+    };
+    authors
+}
+
 /// Tries to get `date` from the front-matter metadata, else from filename
 /// Input examples:
 ///   frontmatter = Frontmatter {date: Value("2024-10-10")}
@@ -449,6 +467,7 @@ Second Title
             links_to: None,
             back_links: vec![],
             card_image: None,
+            authors: vec![],
         };
         let content2 = Content {
             title: "Title 2".to_string(),
@@ -461,6 +480,7 @@ Second Title
             links_to: None,
             back_links: vec![],
             card_image: None,
+            authors: vec![],
         };
         let contents = vec![&content1, &content2];
         let result = check_for_duplicate_slugs(&contents);
@@ -480,6 +500,7 @@ Second Title
             links_to: None,
             back_links: vec![],
             card_image: None,
+            authors: vec![],
         };
         let content2 = Content {
             title: "Title 2".to_string(),
@@ -492,6 +513,7 @@ Second Title
             links_to: None,
             back_links: vec![],
             card_image: None,
+            authors: vec![],
         };
         let contents = vec![&content1, &content2];
 
diff --git a/src/markdown.rs b/src/markdown.rs
index bb014db..7bb4f28 100644
--- a/src/markdown.rs
+++ b/src/markdown.rs
@@ -1,4 +1,6 @@
-use crate::content::{get_date, get_description, get_slug, get_tags, get_title, Content};
+use crate::content::{
+    get_authors, get_date, get_description, get_slug, get_tags, get_title, Content,
+};
 use crate::site::Data;
 use chrono::Datelike;
 use comrak::{markdown_to_html, ComrakOptions};
@@ -48,6 +50,7 @@ pub fn get_content(path: &Path) -> Result<Content, String> {
     let links_to = get_links_to(&html);
     let back_links = Vec::new(); // will be mutated later
     let card_image = get_card_image(&frontmatter, &html);
+    let authors = get_authors(&frontmatter);
     let content = Content {
         title,
         description,
@@ -59,6 +62,7 @@ pub fn get_content(path: &Path) -> Result<Content, String> {
         links_to,
         back_links,
         card_image,
+        authors,
     };
     Ok(content)
 }
diff --git a/src/site.rs b/src/site.rs
index 34b5901..32397f3 100644
--- a/src/site.rs
+++ b/src/site.rs
@@ -328,6 +328,39 @@ fn render_templates(
     handle_tag_pages(output_dir, site_data, &global_context, tera)?;
     handle_archive_pages(output_dir, site_data, &global_context, tera)?;
 
+    // Render Author pages
+    handle_author_pages(output_dir, site_data, &global_context, tera)?;
+
+    Ok(())
+}
+
+fn handle_author_pages(
+    output_dir: &Path,
+    site_data: &Data,
+    global_context: &Context,
+    tera: &Tera,
+) -> Result<(), String> {
+    for (username, author) in &site_data.site.authors {
+        let mut author_context = global_context.clone();
+        author_context.insert("author", &author);
+        let author_slug = slugify(username);
+        let author_posts = site_data
+            .posts
+            .iter()
+            .filter(|post| post.authors.contains(username))
+            .cloned()
+            .collect::<Vec<Content>>();
+
+        handle_list_page(
+            &author_context,
+            &author.name,
+            &author_posts,
+            site_data,
+            tera,
+            output_dir,
+            format!("author-{}", &author_slug).as_ref(),
+        )?;
+    }
     Ok(())
 }
 
@@ -616,6 +649,7 @@ fn handle_404(
         links_to: None,
         back_links: vec![],
         card_image: None,
+        authors: vec![],
     };
     if input_404_path.exists() {
         let custom_content = get_content(&input_404_path)?;