Feb 29, 2024 · Feb 27, 2024 · Feb 28, 2024 · Feb 28, 2024 · Feb 28, 2024 · Feb 29, 2024
diff --git a/pgml-dashboard/src/api/cms.rs b/pgml-dashboard/src/api/cms.rs
 use std::fmt;

 lazy_static! {
    static ref BLOG: Collection = Collection::new(
 pubstatic ref BLOG: Collection = Collection::new(
        "Blog",
        true,
        HashMap::from([
    }
 }

 #[derive(Debug, Serialize, Deserialize)]
 #[derive(Debug, Serialize, Deserialize, Default)]
 pub struct Document {
    /// The absolute path on disk
    pub path: PathBuf,
    pub doc_type: Option<DocType>,
    // url to thumbnail for social share
    pub thumbnail: Option<String>,
    pub url: String,
 }

 // Gets document markdown
 impl Document {
    pub fn new() -> Document {
        Document { ..Default::default() }
    }

    pub async fn from_path(path: &PathBuf) -> anyhow::Result<Document, std::io::Error> {
        let doc_type = match path.strip_prefix(config::cms_dir()) {
            Ok(path) => match path.into_iter().next() {
            (None, contents)
        };

        let default_image_path = BLOG
            .asset_url_root
            .join("blog_image_placeholder.png")
            .display()
            .to_string();
        let default_image_path = match doc_type {
            Some(DocType::Blog) => BLOG
                .asset_url_root
                .join("blog_image_placeholder.png")
                .display()
                .to_string(),
            _ => String::from("/dashboard/static/images/careers_article_default.png"),
        };

        // parse meta section
        let (description, image, featured, tags) = match meta {
                    Some(meta["description"].as_str().unwrap().to_string())
                };

                // For now the only images shown are blog images TODO: use doc_type to set asset path when working.
                let image = if meta["image"].is_badvalue() {
                    Some(default_image_path.clone())
                } else {
                    match PathBuf::from_str(meta["image"].as_str().unwrap()) {
                        Ok(image_path) => match image_path.file_name() {
                            Some(file_name) => {
                                let file = PathBuf::from(file_name).display().to_string();
                                Some(BLOG.asset_url_root.join(file).display().to_string())
                                match doc_type {
                                    Some(DocType::Docs) => Some(DOCS.asset_url_root.join(file).display().to_string()),
                                    Some(DocType::Careers) => {
                                        Some(CAREERS.asset_url_root.join(file).display().to_string())
                                    }
                                    _ => Some(BLOG.asset_url_root.join(file).display().to_string()),
                                }
                            }
                            _ => Some(default_image_path.clone()),
                        },
        let toc_links = crate::utils::markdown::get_toc(root).unwrap();
        let (author, date, author_image) = crate::utils::markdown::get_author(root);

        // convert author image relative url path to absolute url path
        let author_image = if author_image.is_some() {
            let image = author_image.clone().unwrap();
            let image = PathBuf::from(image);
            let image = image.file_name().unwrap();
            match &doc_type {
                Some(DocType::Blog) => Some(BLOG.asset_url_root.join(image.to_str().unwrap()).display().to_string()),
                Some(DocType::Docs) => Some(DOCS.asset_url_root.join(image.to_str().unwrap()).display().to_string()),
                Some(DocType::Careers) => Some(
                    CAREERS
                        .asset_url_root
                        .join(PathBuf::from(image.to_str().unwrap()))
                        .display()
                        .to_string(),
                ),
                _ => None,
            }
        } else {
            None
        };

        let url = match doc_type {
            Some(DocType::Blog) => BLOG.path_to_url(&path),
            Some(DocType::Docs) => DOCS.path_to_url(&path),
            Some(DocType::Careers) => CAREERS.path_to_url(&path),
            _ => String::new(),
        };

        let document = Document {
            path: path.to_owned(),
            description,
            contents,
            doc_type,
            thumbnail,
            url,
        };
        Ok(document)
    }
        self.root_dir.join(path_pb)
    }

    // Convert a file path to a url
    pub fn path_to_url(&self, path: &PathBuf) -> String {
        let url = path.strip_prefix(config::cms_dir()).unwrap();
        let url = format!("/{}", url.display().to_string());

        let url = if url.ends_with("README.md") {
            url.replace("README.md", "")
        } else {
            url
        };

        let url = if url.ends_with(".md") {
            url.replace(".md", "")
        } else {
            url
        };
        url
    }

    // get all urls in the collection and preserve order.
    pub fn get_all_urls(&self) -> Vec<String> {
        let mut urls: Vec<String> = Vec::new();
    ) -> Result<ResponseOk, crate::responses::NotFound> {
        match Document::from_path(&path).await {
            Ok(doc) => {
                let mut layout = crate::templates::Layout::new(&doc.title, Some(cluster));
                if let Some(image) = &doc.thumbnail {
                    layout.image(&image);
                }
                if let Some(description) = &doc.description {
                    layout.description(description);
                }
                let head = crate::components::layouts::Head::new()
                    .title(&doc.title)
                    .description(&doc.description.clone().unwrap_or_else(|| String::new()))
                    .image(&doc.thumbnail.clone().unwrap_or_else(|| String::new()))
                    .canonical(&canonical);

                let layout =layout.canonical(canonical).toc_links(&doc.toc_links);
                let layout =Base::from_head(head, Some(cluster)).theme(Theme::Docs);

                Ok(ResponseOk(
                    layout.render(crate::templates::Article { content: doc.html() }),
                ))
                let mut article = crate::components::pages::article::Index::new(&cluster)
                    .document(doc)
                    .await;

                article = if self.name == "Blog" {
                    article.is_blog()
                } else {
                    article.is_careers()
                };

                Ok(ResponseOk(layout.render(article)))
            }
            // Return page not found on bad path
            _ => {
                let mut layout = crate::templates::Layout::new("404", Some(cluster));

                let doc = String::from(
                    r#"
                <div style='height: 80vh'>
                    <h2>Oops, document not found!</h2>
                    <p>The document you are searching for may have been moved or replaced with better content.</p>
                </div>"#,
                );

                Err(crate::responses::NotFound(
                    layout.render(crate::templates::Article { content: doc }).into(),
                ))
                let layout = Base::new("404", Some(cluster)).theme(Theme::Docs);

                let mut article = crate::components::pages::article::Index::new(&cluster).document_not_found();

                article = if self.name == "Blog" {
                    article.is_blog()
                } else {
                    article.is_careers()
                };

                Err(crate::responses::NotFound(layout.render(article)))
            }
        }
    }
diff --git a/pgml-dashboard/src/components/cards/blog/article_preview/mod.rs b/pgml-dashboard/src/components/cards/blog/article_preview/mod.rs
 use crate::api::cms::Document;
 use chrono::NaiveDate;
 use pgml_components::component;
 use sailfish::TemplateOnce;
 use std::path::PathBuf;

 #[derive(Clone)]
 pub struct DocMeta {
        self.card_type = card_type.to_owned();
        self
    }

    pub async fn from_path(path: &str) -> ArticlePreview {
        let doc = Document::from_path(&PathBuf::from(path)).await.unwrap();

        let meta = DocMeta {
            description: doc.description,
            author: doc.author,
            author_image: doc.author_image,
            featured: false,
            date: doc.date,
            tags: doc.tags,
            image: doc.image,
            title: doc.title,
            path: doc.url,
        };
        ArticlePreview::new(&meta)
    }
 }

 component!(ArticlePreview);
diff --git a/pgml-dashboard/src/components/cards/blog/article_preview/template.html b/pgml-dashboard/src/components/cards/blog/article_preview/template.html
 "#,
 if meta.author_image.is_some() {
  format!(r#"
    <img src="blog/{}"class="rounded-circle me-1 author-image" style="height: 3rem;" alt="Author">
    <img src="{}"class="rounded-circle me-1 author-image" style="height: 3rem;" alt="Author">
  "#, meta.author_image.clone().unwrap())} else {String::new() },

 if meta.author.is_some() {
diff --git a/pgml-dashboard/src/components/layouts/head/mod.rs b/pgml-dashboard/src/components/layouts/head/mod.rs
    }

    pub fn description(mut self, description: &str) -> Head {
        self.description = Some(description.to_owned());
        self.description = if description.len() == 0 {
            None
        } else {
            Some(description.to_owned())
        };
        self
    }

    pub fn canonical(mut self, canonical: &str) -> Head {
        self.canonical = Some(canonical.to_owned());
        self.canonical = if canonical.len() == 0 {
            None
        } else {
            Some(canonical.to_owned())
        };
        self
    }

    pub fn image(mut self, image: &str) -> Head {
        self.image = Some(image.to_owned());
        self.image =if image.len() == 0 { None } else {Some(image.to_owned()) };
        self
    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize};
		use std::fmt;

		lazy_static! {
		static ref BLOG: Collection = Collection::new(
		pubstatic ref BLOG: Collection = Collection::new(
		"Blog",
		true,
		HashMap::from([
Expand DownExpand Up		@@ -93,7 +93,7 @@ impl FromStr for DocType {
		}
		}

		#[derive(Debug, Serialize, Deserialize)]
		#[derive(Debug, Serialize, Deserialize, Default)]
		pub struct Document {
		/// The absolute path on disk
		pub path: PathBuf,
Expand All		@@ -110,10 +110,15 @@ pub struct Document {
		pub doc_type: Option<DocType>,
		// url to thumbnail for social share
		pub thumbnail: Option<String>,
		pub url: String,
		}

		// Gets document markdown
		impl Document {
		pub fn new() -> Document {
		Document { ..Default::default() }
		}

		pub async fn from_path(path: &PathBuf) -> anyhow::Result<Document, std::io::Error> {
		let doc_type = match path.strip_prefix(config::cms_dir()) {
		Ok(path) => match path.into_iter().next() {
Expand DownExpand Up		@@ -151,11 +156,14 @@ impl Document {
		(None, contents)
		};

		let default_image_path = BLOG
		.asset_url_root
		.join("blog_image_placeholder.png")
		.display()
		.to_string();
		let default_image_path = match doc_type {
		Some(DocType::Blog) => BLOG
		.asset_url_root
		.join("blog_image_placeholder.png")
		.display()
		.to_string(),
		_ => String::from("/dashboard/static/images/careers_article_default.png"),
		};

		// parse meta section
		let (description, image, featured, tags) = match meta {
Expand All		@@ -166,15 +174,20 @@ impl Document {
		Some(meta["description"].as_str().unwrap().to_string())
		};

		// For now the only images shown are blog images TODO: use doc_type to set asset path when working.
		let image = if meta["image"].is_badvalue() {
		Some(default_image_path.clone())
		} else {
		match PathBuf::from_str(meta["image"].as_str().unwrap()) {
		Ok(image_path) => match image_path.file_name() {
		Some(file_name) => {
		let file = PathBuf::from(file_name).display().to_string();
		Some(BLOG.asset_url_root.join(file).display().to_string())
		match doc_type {
		Some(DocType::Docs) => Some(DOCS.asset_url_root.join(file).display().to_string()),
		Some(DocType::Careers) => {
		Some(CAREERS.asset_url_root.join(file).display().to_string())
		}
		_ => Some(BLOG.asset_url_root.join(file).display().to_string()),
		}
		}
		_ => Some(default_image_path.clone()),
		},
Expand DownExpand Up		@@ -221,6 +234,34 @@ impl Document {
		let toc_links = crate::utils::markdown::get_toc(root).unwrap();
		let (author, date, author_image) = crate::utils::markdown::get_author(root);

		// convert author image relative url path to absolute url path
		let author_image = if author_image.is_some() {
		let image = author_image.clone().unwrap();
		let image = PathBuf::from(image);
		let image = image.file_name().unwrap();
		match &doc_type {
		Some(DocType::Blog) => Some(BLOG.asset_url_root.join(image.to_str().unwrap()).display().to_string()),
		Some(DocType::Docs) => Some(DOCS.asset_url_root.join(image.to_str().unwrap()).display().to_string()),
		Some(DocType::Careers) => Some(
		CAREERS
		.asset_url_root
		.join(PathBuf::from(image.to_str().unwrap()))
		.display()
		.to_string(),
		),
		_ => None,
		}
		} else {
		None
		};

		let url = match doc_type {
		Some(DocType::Blog) => BLOG.path_to_url(&path),
		Some(DocType::Docs) => DOCS.path_to_url(&path),
		Some(DocType::Careers) => CAREERS.path_to_url(&path),
		_ => String::new(),
		};

		let document = Document {
		path: path.to_owned(),
		description,
Expand All		@@ -235,6 +276,7 @@ impl Document {
		contents,
		doc_type,
		thumbnail,
		url,
		};
		Ok(document)
		}
Expand DownExpand Up		@@ -478,6 +520,25 @@ impl Collection {
		self.root_dir.join(path_pb)
		}

		// Convert a file path to a url
		pub fn path_to_url(&self, path: &PathBuf) -> String {
		let url = path.strip_prefix(config::cms_dir()).unwrap();
		let url = format!("/{}", url.display().to_string());

		let url = if url.ends_with("README.md") {
		url.replace("README.md", "")
		} else {
		url
		};

		let url = if url.ends_with(".md") {
		url.replace(".md", "")
		} else {
		url
		};
		url
		}

		// get all urls in the collection and preserve order.
		pub fn get_all_urls(&self) -> Vec<String> {
		let mut urls: Vec<String> = Vec::new();
Expand DownExpand Up		@@ -524,35 +585,39 @@ impl Collection {
		) -> Result<ResponseOk, crate::responses::NotFound> {
		match Document::from_path(&path).await {
		Ok(doc) => {
		let mut layout = crate::templates::Layout::new(&doc.title, Some(cluster));
		if let Some(image) = &doc.thumbnail {
		layout.image(&image);
		}
		if let Some(description) = &doc.description {
		layout.description(description);
		}
		let head = crate::components::layouts::Head::new()
		.title(&doc.title)
		.description(&doc.description.clone().unwrap_or_else(\|\| String::new()))
		.image(&doc.thumbnail.clone().unwrap_or_else(\|\| String::new()))
		.canonical(&canonical);

		let layout =layout.canonical(canonical).toc_links(&doc.toc_links);
		let layout =Base::from_head(head, Some(cluster)).theme(Theme::Docs);

		Ok(ResponseOk(
		layout.render(crate::templates::Article { content: doc.html() }),
		))
		let mut article = crate::components::pages::article::Index::new(&cluster)
		.document(doc)
		.await;

		article = if self.name == "Blog" {
		article.is_blog()
		} else {
		article.is_careers()
		};

		Ok(ResponseOk(layout.render(article)))
		}
		// Return page not found on bad path
		_ => {
		let mut layout = crate::templates::Layout::new("404", Some(cluster));

		let doc = String::from(
		r#"
		<div style='height: 80vh'>
		<h2>Oops, document not found!</h2>
		<p>The document you are searching for may have been moved or replaced with better content.</p>
		</div>"#,
		);

		Err(crate::responses::NotFound(
		layout.render(crate::templates::Article { content: doc }).into(),
		))
		let layout = Base::new("404", Some(cluster)).theme(Theme::Docs);

		let mut article = crate::components::pages::article::Index::new(&cluster).document_not_found();

		article = if self.name == "Blog" {
		article.is_blog()
		} else {
		article.is_careers()
		};

		Err(crate::responses::NotFound(layout.render(article)))
		}
		}
		}
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,8 @@
		use crate::api::cms::Document;
		use chrono::NaiveDate;
		use pgml_components::component;
		use sailfish::TemplateOnce;
		use std::path::PathBuf;

		#[derive(Clone)]
		pub struct DocMeta {
Expand DownExpand Up		@@ -54,6 +56,23 @@ impl ArticlePreview {
		self.card_type = card_type.to_owned();
		self
		}

		pub async fn from_path(path: &str) -> ArticlePreview {
		let doc = Document::from_path(&PathBuf::from(path)).await.unwrap();

		let meta = DocMeta {
		description: doc.description,
		author: doc.author,
		author_image: doc.author_image,
		featured: false,
		date: doc.date,
		tags: doc.tags,
		image: doc.image,
		title: doc.title,
		path: doc.url,
		};
		ArticlePreview::new(&meta)
		}
		}

		component!(ArticlePreview);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,7 @@
		"#,
		if meta.author_image.is_some() {
		format!(r#"
		<img src="blog/{}"class="rounded-circle me-1 author-image" style="height: 3rem;" alt="Author">
		<img src="{}"class="rounded-circle me-1 author-image" style="height: 3rem;" alt="Author">
		"#, meta.author_image.clone().unwrap())} else {String::new() },

		if meta.author.is_some() {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,17 +28,25 @@ impl Head {
		}

		pub fn description(mut self, description: &str) -> Head {
		self.description = Some(description.to_owned());
		self.description = if description.len() == 0 {
		None
		} else {
		Some(description.to_owned())
		};
		self
		}

		pub fn canonical(mut self, canonical: &str) -> Head {
		self.canonical = Some(canonical.to_owned());
		self.canonical = if canonical.len() == 0 {
		None
		} else {
		Some(canonical.to_owned())
		};
		self
		}

		pub fn image(mut self, image: &str) -> Head {
		self.image = Some(image.to_owned());
		self.image =if image.len() == 0 { None } else {Some(image.to_owned()) };
		self
		}

Expand Down