From 9f6f47967ab9e7c66ae3c663c0224cfea668ccfc Mon Sep 17 00:00:00 2001 From: Sebastien Rousseau Date: Thu, 7 Sep 2023 18:28:14 +0100 Subject: [PATCH] feat(shokunin): v0.0.17 --- Cargo.lock | 13 +------------ Cargo.toml | 4 ++-- README.md | 4 ++-- TEMPLATE.md | 4 ++-- content/404.md | 2 +- content/contact.md | 2 +- content/features.md | 2 +- content/index.md | 2 +- content/offline.md | 2 +- content/privacy.md | 2 +- content/tags.md | 2 +- content/terms.md | 2 +- src/cli.rs | 4 ++-- src/lib.rs | 4 ++-- template/contact.html | 38 ++++++++++++++++++++++++++++++++------ template/index.html | 36 +++++++++++++++++++++++++++++++----- template/page.html | 36 +++++++++++++++++++++++++++++++----- 17 files changed, 113 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d2b3494..55d1353b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1259,15 +1259,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.1.3+3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.93" @@ -1276,7 +1267,6 @@ checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -1805,7 +1795,7 @@ dependencies = [ [[package]] name = "ssg" -version = "0.0.16" +version = "0.0.17" dependencies = [ "assert_cmd", "clap 4.4.2", @@ -1814,7 +1804,6 @@ dependencies = [ "dtt", "log", "minify-html", - "openssl", "quick-xml 0.30.0", "regex", "reqwest", diff --git a/Cargo.toml b/Cargo.toml index dcf50040..7bae028b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ name = "ssg" readme = "README.md" repository = "https://github.com/sebastienrousseau/shokunin" rust-version = "1.71.1" -version = "0.0.16" +version = "0.0.17" include = [ "/CONTRIBUTING.md", "/LICENSE-APACHE", @@ -49,7 +49,7 @@ comrak = "0.18.0" dtt = "0.0.4" log = {version="0.4.20", features = ["std"] } minify-html = "0.11.1" -openssl = { version = "0.10.57", features = ["vendored"] } +# openssl = { version = "0.10.57", features = ["vendored"] } quick-xml = "0.30.0" regex = "1.9.5" reqwest = { version = "0.11.20", features = ["blocking", "json"] } diff --git a/README.md b/README.md index 183d6109..2c0292c9 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ To use the `Shokunin Static Site Generator` library in your project, add the fol ```toml [dependencies] -shokunin = "0.0.16" +shokunin = "0.0.17" ``` Add the following to your `main.rs` file: @@ -283,6 +283,6 @@ A special thank you goes to the [Rust Reddit][13] community for providing a lot [crates-badge]: https://img.shields.io/crates/v/ssg.svg?style=for-the-badge 'Crates.io badge' [divider]: https://kura.pro/common/images/elements/divider.svg "divider" [docs-badge]: https://img.shields.io/docsrs/ssg.svg?style=for-the-badge 'Docs.rs badge' -[libs-badge]: https://img.shields.io/badge/lib.rs-v0.0.16-orange.svg?style=for-the-badge 'Lib.rs badge' +[libs-badge]: https://img.shields.io/badge/lib.rs-v0.0.17-orange.svg?style=for-the-badge 'Lib.rs badge' [license-badge]: https://img.shields.io/crates/l/ssg.svg?style=for-the-badge 'License badge' [made-with-rust-badge]: https://img.shields.io/badge/rust-f04041?style=for-the-badge&labelColor=c0282d&logo=rust 'Made With Rust badge' diff --git a/TEMPLATE.md b/TEMPLATE.md index f33dda3d..f54ac9e1 100644 --- a/TEMPLATE.md +++ b/TEMPLATE.md @@ -10,7 +10,7 @@ -# Shokunin Static Site Generator v0.0.16 🦀 +# Shokunin Static Site Generator v0.0.17 🦀 A Fast and Flexible open-source static site generator (ssg) written in Rust 🦀 @@ -70,7 +70,7 @@ The library extracts metadata and content to generate static HTML files from Mar [crates-badge]: https://img.shields.io/crates/v/ssg.svg?style=for-the-badge 'Crates.io badge' [divider]: https://kura.pro/common/images/elements/divider.svg "divider" [docs-badge]: https://img.shields.io/docsrs/ssg.svg?style=for-the-badge 'Docs.rs badge' -[libs-badge]: https://img.shields.io/badge/lib.rs-v0.0.16-orange.svg?style=for-the-badge 'Lib.rs badge' +[libs-badge]: https://img.shields.io/badge/lib.rs-v0.0.17-orange.svg?style=for-the-badge 'Lib.rs badge' [license-badge]: https://img.shields.io/crates/l/ssg.svg?style=for-the-badge 'License badge' [made-with-rust-badge]: https://img.shields.io/badge/rust-f04041?style=for-the-badge&labelColor=c0282d&logo=rust 'Made With Rust badge' diff --git a/content/404.md b/content/404.md index 66d8d163..972e41ff 100644 --- a/content/404.md +++ b/content/404.md @@ -48,7 +48,7 @@ viewport: "width=device-width, initial-scale=1, shrink-to-fit=no" atom_link: "https://kaishi.one/404/rss.xml" category: "Technology" docs: "https://validator.w3.org/feed/docs/rss2.html" -generator: "Shokunin 🦀 (version 0.0.16)" +generator: "Shokunin 🦀 (version 0.0.17)" item_description: "The page may have been removed or renamed. Please visit our homepage for more information." item_guid: "https://kaishi.one/404/rss.xml" item_link: "https://kaishi.one/404/rss.xml" diff --git a/content/contact.md b/content/contact.md index ea5fca9f..f4b064c1 100644 --- a/content/contact.md +++ b/content/contact.md @@ -49,7 +49,7 @@ viewport: "width=device-width, initial-scale=1, shrink-to-fit=no" ## The viewpor atom_link: https://kaishi.one/contact/rss.xml category: "Technology" docs: https://validator.w3.org/feed/docs/rss2.html -generator: "Shokunin 🦀 (version 0.0.16)" +generator: "Shokunin 🦀 (version 0.0.17)" item_description: RSS feed for the contact page of the Kaishi website. item_guid: https://kaishi.one/contact/rss.xml item_link: https://kaishi.one/contact/rss.xml diff --git a/content/features.md b/content/features.md index 588c0d45..f98299fc 100644 --- a/content/features.md +++ b/content/features.md @@ -48,7 +48,7 @@ viewport: "width=device-width, initial-scale=1, shrink-to-fit=no" ## The viewpor atom_link: https://kaishi.one/rss.xml category: "Technology" docs: https://validator.w3.org/feed/docs/rss2.html -generator: "Shokunin 🦀 (version 0.0.16)" +generator: "Shokunin 🦀 (version 0.0.17)" item_description: RSS feed for the site item_guid: https://kaishi.one/rss.xml item_link: https://kaishi.one/rss.xml diff --git a/content/index.md b/content/index.md index f507ff83..0be96b29 100644 --- a/content/index.md +++ b/content/index.md @@ -48,7 +48,7 @@ viewport: "width=device-width, initial-scale=1, shrink-to-fit=no" ## The viewpor atom_link: https://kaishi.one/rss.xml category: "Technology" docs: https://validator.w3.org/feed/docs/rss2.html -generator: "Shokunin 🦀 (version 0.0.16)" +generator: "Shokunin 🦀 (version 0.0.17)" item_description: RSS feed for the site item_guid: https://kaishi.one/rss.xml item_link: https://kaishi.one/rss.xml diff --git a/content/offline.md b/content/offline.md index 9868fde0..c5325953 100644 --- a/content/offline.md +++ b/content/offline.md @@ -48,7 +48,7 @@ viewport: "width=device-width, initial-scale=1, shrink-to-fit=no" ## The viewpor atom_link: https://kaishi.one/rss.xml category: "Technology" docs: https://validator.w3.org/feed/docs/rss2.html -generator: "Shokunin 🦀 (version 0.0.16)" +generator: "Shokunin 🦀 (version 0.0.17)" item_description: RSS feed for the site item_guid: https://kaishi.one/rss.xml item_link: https://kaishi.one/rss.xml diff --git a/content/privacy.md b/content/privacy.md index 79fb144a..cf7a769c 100644 --- a/content/privacy.md +++ b/content/privacy.md @@ -48,7 +48,7 @@ viewport: "width=device-width, initial-scale=1, shrink-to-fit=no" ## The viewpor atom_link: https://kaishi.one/rss.xml category: "Technology" docs: https://validator.w3.org/feed/docs/rss2.html -generator: "Shokunin 🦀 (version 0.0.16)" +generator: "Shokunin 🦀 (version 0.0.17)" item_description: RSS feed for the site item_guid: https://kaishi.one/rss.xml item_link: https://kaishi.one/rss.xml diff --git a/content/tags.md b/content/tags.md index b17b8ec9..8d98eab8 100644 --- a/content/tags.md +++ b/content/tags.md @@ -48,7 +48,7 @@ viewport: "width=device-width, initial-scale=1, shrink-to-fit=no" ## The viewpor atom_link: https://kaishi.one/rss.xml category: "Technology" docs: https://validator.w3.org/feed/docs/rss2.html -generator: "Shokunin 🦀 (version 0.0.16)" +generator: "Shokunin 🦀 (version 0.0.17)" item_description: RSS feed for the site item_guid: https://kaishi.one/rss.xml item_link: https://kaishi.one/rss.xml diff --git a/content/terms.md b/content/terms.md index 3e89474c..ea30ce25 100644 --- a/content/terms.md +++ b/content/terms.md @@ -48,7 +48,7 @@ viewport: "width=device-width, initial-scale=1, shrink-to-fit=no" ## The viewpor atom_link: https://kaishi.one/rss.xml category: "Technology" docs: https://validator.w3.org/feed/docs/rss2.html -generator: "Shokunin 🦀 (version 0.0.16)" +generator: "Shokunin 🦀 (version 0.0.17)" item_description: RSS feed for the site item_guid: https://kaishi.one/rss.xml item_link: https://kaishi.one/rss.xml diff --git a/src/cli.rs b/src/cli.rs index 7fcc6234..f75d50c3 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -44,7 +44,7 @@ pub fn build() -> Result { .author("Sebastien Rousseau") .about("") .bin_name("ssg") - .version("0.0.16") + .version("0.0.17") .arg( Arg::new("new") .help("Create a new project.") @@ -109,7 +109,7 @@ pub fn build() -> Result { /// ``` pub fn print_banner() { // Set the title and description for the CLI - let title = "Shokunin 🦀 (v0.0.16)"; + let title = "Shokunin 🦀 (v0.0.17)"; let description = "A Fast and Flexible Static Site Generator written in Rust"; diff --git a/src/lib.rs b/src/lib.rs index 9fe1a5f2..b854543f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,7 +10,7 @@ //! *Part of the [Mini Functions][0] family of libraries.* //! //! [![Crates.io](https://img.shields.io/crates/v/ssg.svg?style=for-the-badge&color=success&labelColor=27A006)](https://crates.io/crates/ssg "Crates.io") -//! [![Lib.rs](https://img.shields.io/badge/lib.rs-v0.0.16-success.svg?style=for-the-badge&color=8A48FF&labelColor=6F36E4)](https://lib.rs/crates/ssg "Lib.rs") +//! [![Lib.rs](https://img.shields.io/badge/lib.rs-v0.0.17-success.svg?style=for-the-badge&color=8A48FF&labelColor=6F36E4)](https://lib.rs/crates/ssg "Lib.rs") //! [![License](https://img.shields.io/crates/l/ssg.svg?style=for-the-badge&color=007EC6&labelColor=03589B)](https://opensource.org/license/apache-2-0/ "MIT or Apache License, Version 2.0") //! [![Rust](https://img.shields.io/badge/rust-f04041?style=for-the-badge&labelColor=c0282d&logo=rust)](https://www.rust-lang.org "Rust") //! @@ -68,7 +68,7 @@ //! //! ```toml //! [dependencies] -//! shokunin = "0.0.16" +//! shokunin = "0.0.17" //! ``` //! //! Add the following to your `main.rs` file: diff --git a/template/contact.html b/template/contact.html index cb8fd66c..5b6577df 100644 --- a/template/contact.html +++ b/template/contact.html @@ -269,17 +269,43 @@ + integrity="sha512-ToL6UYWePxjhDQKNioSi4AyJ5KkRxY+F1+Fi7Jgh0Hp5Kk2/s8FD7zusJDdonfe5B00Qw+B8taXxF6CFLnqNCw==" + src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"> + + + +