diff --git a/LICENSE.txt b/LICENSE.txt index 949c23d..6b0b127 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,21 +1,203 @@ -The MIT License (MIT) - -Copyright (c) Microsoft Corporation. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/config/site.toml b/config/site.toml index ef12be3..d6c3cbd 100644 --- a/config/site.toml +++ b/config/site.toml @@ -1,4 +1,9 @@ title = "Bartholomew" # logo = "URL to logo" base_url = "http://localhost:3000" -about = "This site is generated with Bartholomew, the Wagi micro-CMS. And this message is in site.toml." \ No newline at end of file +about = "This site is generated with Bartholomew, the Wagi micro-CMS. And this message is in site.toml." + +[extra] +copyright = "The Site Authors" +github = "https://github.com/technosophos/bartholomew" +twitter = "https://twitter.com/technosophos" \ No newline at end of file diff --git a/content/author/butcher.md b/content/author/butcher.md index 7df0e3b..2300cea 100644 --- a/content/author/butcher.md +++ b/content/author/butcher.md @@ -1,5 +1,10 @@ title = "Matt Butcher" +template = "author" +[extra] +author_image = "/static/mbutcher.jpg" --- -Hello. \ No newline at end of file +Matt Butcher is the developer who created Bartholomew. +Online, he goes by `technosophos`. +You can find more of his projects on [GitHub](https://github.com/technosophos). \ No newline at end of file diff --git a/content/blog/2021-09-01-first-post.md b/content/blog/2021-09-01-first-post.md index 5c00a85..080afcd 100644 --- a/content/blog/2021-09-01-first-post.md +++ b/content/blog/2021-09-01-first-post.md @@ -1,5 +1,9 @@ title = "First Post!" description = "An example of blogging on the Bartholomew platform" +[extra] +date = "Aug. 1, 2021" +author = "Matt Butcher" +author_page = "/author/butcher" --- This is an example of a blog post. diff --git a/content/blog/2021-09-15-what-is-markdown.md b/content/blog/2021-09-15-what-is-markdown.md index 10de021..b3179ca 100644 --- a/content/blog/2021-09-15-what-is-markdown.md +++ b/content/blog/2021-09-15-what-is-markdown.md @@ -1,5 +1,9 @@ title = "What Is Markdown?" description = "Introducing an easy-to-write document format" +[extra] +date = "Aug. 15, 2021" +author = "Matt Butcher" +author_page = "/author/butcher" --- Markdown is one of the most prevalent document formats for writing content. If you use Slack, you probably have written some Markdown. Every Slack message is a mini diff --git a/content/blog/2021-09-31-goals-of-bartholomew.md b/content/blog/2021-09-31-goals-of-bartholomew.md index 73b23b8..85f56d5 100644 --- a/content/blog/2021-09-31-goals-of-bartholomew.md +++ b/content/blog/2021-09-31-goals-of-bartholomew.md @@ -1,5 +1,10 @@ title = "The Goals of Bartholomew" description = "We have plans. Big plans. Actually, they're small plans." + +[extra] +date = "Aug. 31, 2021" +author = "Matt Butcher" +author_page = "/author/butcher" --- Bartholomew is intended to be three things: diff --git a/content/index.md b/content/index.md index 26c72e7..aa72033 100644 --- a/content/index.md +++ b/content/index.md @@ -23,6 +23,10 @@ Handlebars is a popular template format similar to Mustache. All of the template are fully customizable. You can take a look in the `templates/` directory to start customizing the look and feel of this site. +### Twitter Bootstrap + +The theme that ships with Bartholomew is just a simple [Twitter Bootstrap](https://getbootstrap.com/) theme. + ## Configuration Files Configuration files are in `config`, and are simple TOML files. Probably the only one diff --git a/scripts/blogs.rhai b/scripts/blogs.rhai new file mode 100644 index 0000000..bad9a85 --- /dev/null +++ b/scripts/blogs.rhai @@ -0,0 +1,33 @@ +// This function lists all of the blog posts, subject to the constraints. +// +// It returns an array of objects of the form: +// [ +// #{ uri: "path/to/page", page: PageObject } +// ] + +// Param 1 should be `site.pages` +let pages = params[0]; + +// Loop through them and return all of the page objects that are in +// the blog path. + +let blog_pages = []; + +// Get each blog post, assigning it to {path: object}. +let keys = pages.keys(); +for item in keys { + if item.index_of("/content/blog/") == 0 { + // Remove /content and .md + let path = item.sub_string(8); + path = path.sub_string(0, path.index_of(".md")); + blog_pages.push(#{ + uri: path, + page: pages[item], + }); + //blog_pages[path] = pages[item]; + } + +} +// Newest to oldest, assuming you put the date in the URI +blog_pages.reverse(); +blog_pages \ No newline at end of file diff --git a/src/template.rs b/src/template.rs index 0fa5e8d..2b1698b 100644 --- a/src/template.rs +++ b/src/template.rs @@ -16,6 +16,7 @@ pub struct SiteInfo { logo: Option, base_url: Option, about: Option, + extra: BTreeMap, } #[derive(Serialize)] diff --git a/static/mbutcher.jpg b/static/mbutcher.jpg new file mode 100644 index 0000000..5e5f453 Binary files /dev/null and b/static/mbutcher.jpg differ diff --git a/templates/author.hbs b/templates/author.hbs new file mode 100644 index 0000000..a3fa450 --- /dev/null +++ b/templates/author.hbs @@ -0,0 +1,25 @@ +{{> content_top}} + +
+
+
+
+ {{page.frontmatter.title}} +
+
+
+
{{page.frontmatter.title}}
+
+ {{{page.body}}} +
+

Last updated 3 mins ago

+
+
+
+
+
+ + +{{>content_sidebar}} +{{>content_bottom}} \ No newline at end of file diff --git a/templates/blog.hbs b/templates/blog.hbs new file mode 100644 index 0000000..4cff367 --- /dev/null +++ b/templates/blog.hbs @@ -0,0 +1,63 @@ +{{> content_top }} + +
+ + {{#each (blogs site.pages)}} +
+ {{#with page.frontmatter}} +

{{title}}

+

{{extra.date}} {{#if extra.author}} by {{extra.author}}{{/if}} +

+ {{/with}} + {{! Since this is HTML, we use the triple-curly }} + {{{page.body}}} +

View the Post

+
+ {{/each}} + + +

Learn More

+
+
+ Screenshot of Rust code, used purely for aesthetic purposes. +
+
Card title
+

This is a wider card with supporting text below as a natural + lead-in to + additional + content. This content is a little bit longer.

+

Last updated 3 mins ago

+
+
+
+ Screenshot of Rust code, used purely for aesthetic purposes. +
+
Card title
+

This card has supporting text below as a natural lead-in to + additional + content. +

+

Last updated 3 mins ago

+
+
+
+ Screenshot of Rust code, used purely for aesthetic purposes. +
+
Card title
+

This is a wider card with supporting text below as a natural + lead-in to + additional + content. This card has even longer content than the first to show that equal height + action. +

+

Last updated 3 mins ago

+
+
+
+
+{{> content_sidebar }} +{{> content_bottom }} \ No newline at end of file diff --git a/templates/content_bottom.hbs b/templates/content_bottom.hbs new file mode 100644 index 0000000..2b5c3f3 --- /dev/null +++ b/templates/content_bottom.hbs @@ -0,0 +1,12 @@ +{{! See content_top.hbs }} + + +
+ {{#if site.info.extra.copyright }} +

© {{site.info.extra.copyright}}

+ {{/if}} +
+ + + + \ No newline at end of file diff --git a/templates/content_sidebar.hbs b/templates/content_sidebar.hbs new file mode 100644 index 0000000..d91ddfa --- /dev/null +++ b/templates/content_sidebar.hbs @@ -0,0 +1,27 @@ +
+
+
+

About

+

{{site.info.about}}

+
+ +
+

Recent Posts

+
    + {{#each (blogs site.pages)}}
  1. {{page.frontmatter.title}}
    2. + {{/each }} +
+
+ +
+

Elsewhere

+
    + {{#with site.info.extra}} + {{#if github }}
  1. GitHub
    2. {{/if}} + {{#if twitter }}
  2. Twitter
    3. {{/if}} + {{#if facebook }}
  3. Facebook
    4. {{/if}} + {{/with}} +
+
+
+
\ No newline at end of file diff --git a/templates/content_top.hbs b/templates/content_top.hbs new file mode 100644 index 0000000..3bb745f --- /dev/null +++ b/templates/content_top.hbs @@ -0,0 +1,40 @@ + + + + + {{! Use the formatter.title and formatter.description in the head }} + {{page.frontmatter.title}} | {{site.info.title}} + {{#if page.frontmatter.description}} + {{! Only render the description if it exists }} + + {{/if}} + + + + + + + + + +
+ {{> navbar }} +
+
\ No newline at end of file diff --git a/templates/footer.hbs b/templates/footer.hbs deleted file mode 100644 index 7905985..0000000 --- a/templates/footer.hbs +++ /dev/null @@ -1,3 +0,0 @@ -
-

© 2021 The Site Authors

-
\ No newline at end of file diff --git a/templates/head.hbs b/templates/head.hbs deleted file mode 100644 index 240f308..0000000 --- a/templates/head.hbs +++ /dev/null @@ -1,9 +0,0 @@ -{{! This things all go in the HEAD section of the HTML}} - - - - - \ No newline at end of file diff --git a/templates/main.hbs b/templates/main.hbs index 4216445..ab0a337 100644 --- a/templates/main.hbs +++ b/templates/main.hbs @@ -1,177 +1,63 @@ - - - - - {{! Use the formatter.title and formatter.description in the head }} - {{page.frontmatter.title}} | {{site.info.title}} - {{#if page.frontmatter.description}} - {{! Only render the description if it exists }} - - {{/if}} - - {{! If there is a head file, include it. This is typically where global JS/CSS and stuff goes }} - {{> head }} - - - - - -
- -
-
- -
-
- {{#with page.frontmatter}} -

{{title}}

-

{{extra.date}} {{#if extra.author}} by {{extra.author}}{{/if}} -

- {{/with}} - {{! Since this is HTML, we use the triple-curly }} - {{{page.body}}} - {{ echo "world" }} -
- - -

Learn More

-
-
- Screenshot of Rust code, used purely for aesthetic purposes. -
-
Card title
-

This is a wider card with supporting text below as a natural - lead-in to - additional - content. This content is a little bit longer.

-

Last updated 3 mins ago

-
-
-
- Screenshot of Rust code, used purely for aesthetic purposes. -
-
Card title
-

This card has supporting text below as a natural lead-in to - additional - content. -

-

Last updated 3 mins ago

-
-
-
- Screenshot of Rust code, used purely for aesthetic purposes. -
-
Card title
-

This is a wider card with supporting text below as a natural - lead-in to - additional - content. This card has even longer content than the first to show that equal height - action. -

-

Last updated 3 mins ago

-
-
-
-
- -
-
-
-

About

-

{{site.info.about}}

-
- -
-

Archives

-
    -
  1. March 2021
    2. -
  2. February 2021
    3. -
  3. January 2021
    4. -
  4. December 2020
    5. -
  5. November 2020
    6. -
  6. October 2020
    7. -
  7. September 2020
    8. -
  8. August 2020
    9. -
  9. July 2020
    10. -
  10. June 2020
    11. -
  11. May 2020
    12. -
  12. April 2020
    13. -
-
- -
-

Elsewhere

-
    -
  1. GitHub
    2. -
  2. Twitter
    3. -
  3. Facebook
    4. -
-
-
-
- +
+
+ Screenshot of Rust code, used purely for aesthetic purposes. +
+
Card title
+

This card has supporting text below as a natural lead-in to + additional + content. +

+

Last updated 3 mins ago

-
- - +
+
+ Screenshot of Rust code, used purely for aesthetic purposes. +
+
Card title
+

This is a wider card with supporting text below as a natural + lead-in to + additional + content. This card has even longer content than the first to show that equal height + action. +

+

Last updated 3 mins ago

+
+
+
+
- {{> footer }} - - +{{> content_sidebar }} - \ No newline at end of file +{{> content_bottom }} \ No newline at end of file diff --git a/templates/navbar.hbs b/templates/navbar.hbs new file mode 100644 index 0000000..9eec073 --- /dev/null +++ b/templates/navbar.hbs @@ -0,0 +1,41 @@ + \ No newline at end of file