Jan 22, 2024 · Jan 20, 2024 · Jan 22, 2024 · Jan 22, 2024 · Jan 22, 2024 · Jan 22, 2024
diff --git a/pgml-dashboard/src/api/cms.rs b/pgml-dashboard/src/api/cms.rs
    utils::config,
 };
 use serde::{Deserialize, Serialize};
 use std::fmt;

 lazy_static! {
    static ref BLOG: Collection = Collection::new(
    );
 }

 #[derive(PartialEq,Debug, Serialize, Deserialize)]
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub enum DocType {
    Blog,
    Docs,
    Careers,
 }

 impl fmt::Display for DocType {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        match self {
            DocType::Blog => write!(f, "blog"),
            DocType::Docs => write!(f, "docs"),
            DocType::Careers => write!(f, "careers")
        }
    }
 }

 impl FromStr for DocType {
    type Err = ();

    pub toc_links: Vec<TocLink>,
    pub contents: String,
    pub doc_type: Option<DocType>,
    // url to thumbnail for social share
    pub thumbnail: Option<String>
 }

 // Gets document markdown
 impl Document {
    pub async fn from_path(path: &PathBuf) -> anyhow::Result<Document, std::io::Error> {
 warn!("path: {:?}", path);
 debug!("path: {:?}", path);

        let regex = regex::Regex::new(r#".*/pgml-cms/([^"]*)/(.*)\.md"#).unwrap();

            (None, contents)
        };

        let default_image = ".gitbook/assets/blog_image_placeholder.png";

        // parse meta section
        let (description, image, featured, tags) = match meta {
            Some(meta) => {
                };

                let image = if meta["image"].is_badvalue() {
                    Some(".gitbook/assets/blog_image_placeholder.png".to_string())
                    Some(format!("/{}/{}", doc_type.clone().unwrap().to_string(), default_image))
                } else {
                    Some(meta["image"].as_str().unwrap().to_string())
                    Some(format!("/{}/{}", doc_type.clone().unwrap().to_string().to_string(),meta["image"].as_str().unwrap()))
                };

                let featured = if meta["featured"].is_badvalue() {
            }
            None => (
                None,
                Some(".gitbook/assets/blog_image_placeholder.png".to_string()),
                Some(format!("/{}/{}", doc_type.clone().unwrap().to_string(), default_image)),
                false,
                Vec::new(),
            ),
        };

        let thumbnail = match &image {
            Some(image) => if image.contains(default_image) {
                None
            } else {
                Some(format!("{}{}", config::site_domain(), image))
            },
            None => None
        };

        // Parse Markdown
        let arena = Arena::new();
        let root = parse_document(&arena, &contents, &crate::utils::markdown::options());
            toc_links,
            contents,
            doc_type,
            thumbnail
        };
        Ok(document)
    }
                let index = self.open_index(&doc.path);

                let mut layout = crate::templates::Layout::new(&doc.title, Some(cluster));
                if let Some(image) = &doc.image {
                    layout.image(&config::asset_url(image.into()));
                if let Some(image) = &doc.thumbnail {
                    layout.image(&image);
                }
                if let Some(description) = &doc.description {
                    layout.description(description);
diff --git a/pgml-dashboard/src/components/layouts/head/template.html b/pgml-dashboard/src/components/layouts/head/template.html
 <% use crate::utils::config; %>
 <%
  use crate::utils::config;

  let thumbnail = image
    .unwrap_or_else(|| format!(r#"{}/static/images/homepage-social-share.webp"#, config::site_domain()));

  let description = description
    .unwrap_or_else(|| String::from("Train and deploy models to make online predictions using only SQL, with an open source Postgres extension."));
 %>

 <head>
  <meta charset="utf-8">
  <meta name="author" content="PostgresML">
  <title><%= title %> – PostgresML</title>

  <% if description.is_some() { %>
  <meta name="description" content="<%= description.clone().unwrap() %>">
  <meta property="og:description" content="<%= description.clone().unwrap() %>">
  <meta name="twitter:description" content="<%= description.clone().unwrap() %>">
  <% } else { %>
  <meta name="description" content="Train and deploy models to make online predictions using only SQL, with an open source Postgres extension.">
  <meta property="og:description" content="Train and deploy models to make online predictions using only SQL, with an open source Postgres extension.">
  <meta name="twitter:description" content="Train and deploy models to make online predictions using only SQL, with an open source Postgres extension.">
  <% } %>
  <meta name="description" content="<%- description %>">
  <meta property="og:description" content="<%- description %>">
  <meta name="twitter:description" content="<%- description %>">

  <% if image.is_some() { %>
  <meta property="og:image" content="<%= image.clone().unwrap() %>">
  <meta name="twitter:image" content="<%= image.clone().unwrap() %>">
  <% } else { %>
  <meta property="og:image" content="https://postgresml.org/dashboard/static/images/owl_gradient.png">
  <meta name="twitter:image" content="https://postgresml.org/dashboard/static/images/owl_gradient.png">
  <% } %>
  <meta property="og:image" content="<%- thumbnail %>">
  <meta name="twitter:image" content="<%- thumbnail %>">

  <meta property="og:site_name" content="PostgresML">
  <meta property="og:type" content="website">
diff --git a/pgml-dashboard/src/components/pages/blog/landing_page/mod.rs b/pgml-dashboard/src/components/pages/blog/landing_page/mod.rs
                .await
                .unwrap();

            let image = Some(format!("blog/{}", doc.image.unwrap()));

            let meta = DocMeta {
                description: doc.description,
                author: doc.author,
                author_image: doc.author_image,
                date: doc.date,
                image,
                image: doc.image,
                featured: doc.featured,
                tags: doc.tags,
                title: doc.title,
diff --git a/pgml-dashboard/src/utils/config.rs b/pgml-dashboard/src/utils/config.rs
    }
 }

 pub fn site_domain() -> String {
    String::from("https://postgresml.org")
 }

 fn env_is_set(name: &str) -> bool {
    var(name).is_ok()
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,6 +19,7 @@ use crate::{
		utils::config,
		};
		use serde::{Deserialize, Serialize};
		use std::fmt;

		lazy_static! {
		static ref BLOG: Collection = Collection::new(
Expand DownExpand Up		@@ -62,13 +63,23 @@ lazy_static! {
		);
		}

		#[derive(PartialEq,Debug, Serialize, Deserialize)]
		#[derive(Debug, Serialize, Deserialize, Clone)]
		pub enum DocType {
		Blog,
		Docs,
		Careers,
		}

		impl fmt::Display for DocType {
		fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
		match self {
		DocType::Blog => write!(f, "blog"),
		DocType::Docs => write!(f, "docs"),
		DocType::Careers => write!(f, "careers")
		}
		}
		}

		impl FromStr for DocType {
		type Err = ();

Expand DownExpand Up		@@ -97,12 +108,14 @@ pub struct Document {
		pub toc_links: Vec<TocLink>,
		pub contents: String,
		pub doc_type: Option<DocType>,
		// url to thumbnail for social share
		pub thumbnail: Option<String>
		}

		// Gets document markdown
		impl Document {
		pub async fn from_path(path: &PathBuf) -> anyhow::Result<Document, std::io::Error> {
		warn!("path: {:?}", path);
		debug!("path: {:?}", path);

		let regex = regex::Regex::new(r#"./pgml-cms/([^"])/(.*)\.md"#).unwrap();

Expand DownExpand Up		@@ -130,6 +143,8 @@ impl Document {
		(None, contents)
		};

		let default_image = ".gitbook/assets/blog_image_placeholder.png";

		// parse meta section
		let (description, image, featured, tags) = match meta {
		Some(meta) => {
Expand All		@@ -140,9 +155,9 @@ impl Document {
		};

		let image = if meta["image"].is_badvalue() {
		Some(".gitbook/assets/blog_image_placeholder.png".to_string())
		Some(format!("/{}/{}", doc_type.clone().unwrap().to_string(), default_image))
		} else {
		Some(meta["image"].as_str().unwrap().to_string())
		Some(format!("/{}/{}", doc_type.clone().unwrap().to_string().to_string(),meta["image"].as_str().unwrap()))
		};

		let featured = if meta["featured"].is_badvalue() {
Expand All		@@ -165,12 +180,21 @@ impl Document {
		}
		None => (
		None,
		Some(".gitbook/assets/blog_image_placeholder.png".to_string()),
		Some(format!("/{}/{}", doc_type.clone().unwrap().to_string(), default_image)),
		false,
		Vec::new(),
		),
		};

		let thumbnail = match &image {
		Some(image) => if image.contains(default_image) {
		None
		} else {
		Some(format!("{}{}", config::site_domain(), image))
		},
		None => None
		};

		// Parse Markdown
		let arena = Arena::new();
		let root = parse_document(&arena, &contents, &crate::utils::markdown::options());
Expand All		@@ -191,6 +215,7 @@ impl Document {
		toc_links,
		contents,
		doc_type,
		thumbnail
		};
		Ok(document)
		}
Expand DownExpand Up		@@ -419,8 +444,8 @@ impl Collection {
		let index = self.open_index(&doc.path);

		let mut layout = crate::templates::Layout::new(&doc.title, Some(cluster));
		if let Some(image) = &doc.image {
		layout.image(&config::asset_url(image.into()));
		if let Some(image) = &doc.thumbnail {
		layout.image(&image);
		}
		if let Some(description) = &doc.description {
		layout.description(description);
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,12 @@
		<% use crate::utils::config; %>
		<%
		use crate::utils::config;

		let thumbnail = image
		.unwrap_or_else(\|\| format!(r#"{}/static/images/homepage-social-share.webp"#, config::site_domain()));

		let description = description
		.unwrap_or_else(\|\| String::from("Train and deploy models to make online predictions using only SQL, with an open source Postgres extension."));
		%>

		<head>
		<meta charset="utf-8">
Expand All		@@ -7,23 +15,12 @@
		<meta name="author" content="PostgresML">
		<title><%= title %> – PostgresML</title>

		<% if description.is_some() { %>
		<meta name="description" content="<%= description.clone().unwrap() %>">
		<meta property="og:description" content="<%= description.clone().unwrap() %>">
		<meta name="twitter:description" content="<%= description.clone().unwrap() %>">
		<% } else { %>
		<meta name="description" content="Train and deploy models to make online predictions using only SQL, with an open source Postgres extension.">
		<meta property="og:description" content="Train and deploy models to make online predictions using only SQL, with an open source Postgres extension.">
		<meta name="twitter:description" content="Train and deploy models to make online predictions using only SQL, with an open source Postgres extension.">
		<% } %>
		<meta name="description" content="<%- description %>">
		<meta property="og:description" content="<%- description %>">
		<meta name="twitter:description" content="<%- description %>">

		<% if image.is_some() { %>
		<meta property="og:image" content="<%= image.clone().unwrap() %>">
		<meta name="twitter:image" content="<%= image.clone().unwrap() %>">
		<% } else { %>
		<meta property="og:image" content="https://postgresml.org/dashboard/static/images/owl_gradient.png">
		<meta name="twitter:image" content="https://postgresml.org/dashboard/static/images/owl_gradient.png">
		<% } %>
		<meta property="og:image" content="<%- thumbnail %>">
		<meta name="twitter:image" content="<%- thumbnail %>">

		<meta property="og:site_name" content="PostgresML">
		<meta property="og:type" content="website">
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,14 +37,12 @@ impl LandingPage {
		.await
		.unwrap();

		let image = Some(format!("blog/{}", doc.image.unwrap()));

		let meta = DocMeta {
		description: doc.description,
		author: doc.author,
		author_image: doc.author_image,
		date: doc.date,
		image,
		image: doc.image,
		featured: doc.featured,
		tags: doc.tags,
		title: doc.title,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -145,6 +145,10 @@ pub fn asset_url(path: Cow<str>) -> String {
		}
		}

		pub fn site_domain() -> String {
		String::from("https://postgresml.org")
		}

		fn env_is_set(name: &str) -> bool {
		var(name).is_ok()
		}
Expand Down