From 9cd0ac5b88aeb25f784bb3cd4e5ade753461d868 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 25 Nov 2022 12:03:14 -0500 Subject: [PATCH 1/7] Super basic page rendering --- config.toml | 10 +- sass/styles/fixes/instagram.scss | 3 + sass/styles/fixes/markdown.scss | 4 + sass/styles/fixes/mermaid.scss | 4 + sass/styles/fixes/tiktok.scss | 4 + sass/styles/fixes/youtube.scss | 9 + sass/styles/layout.scss | 321 ------------------ sass/styles/project_mosaic.scss | 51 --- sass/styles/typography.scss | 44 +++ sass/styles/utils.scss | 15 + templates/base.html | 178 +++------- templates/components/footer.html | 0 .../components/metadata/advertise-rss.html | 5 + templates/components/metadata/opengraph.html | 21 ++ templates/index.html | 45 +-- templates/page.html | 120 +------ templates/section.html | 114 +------ 17 files changed, 180 insertions(+), 768 deletions(-) create mode 100644 sass/styles/fixes/instagram.scss create mode 100644 sass/styles/fixes/markdown.scss create mode 100644 sass/styles/fixes/mermaid.scss create mode 100644 sass/styles/fixes/tiktok.scss create mode 100644 sass/styles/fixes/youtube.scss delete mode 100644 sass/styles/layout.scss delete mode 100644 sass/styles/project_mosaic.scss create mode 100644 sass/styles/typography.scss create mode 100644 sass/styles/utils.scss create mode 100644 templates/components/footer.html create mode 100644 templates/components/metadata/advertise-rss.html create mode 100644 templates/components/metadata/opengraph.html diff --git a/config.toml b/config.toml index f6270e8..3add938 100644 --- a/config.toml +++ b/config.toml @@ -14,11 +14,13 @@ render_emoji = true external_links_target_blank = true [extra] +# Website +domain_name = "ewpratten.com" +# Me name = "Evan Pratten" profession = "Software Developer" -email = "contact@ewpratten.com" -twitter = "ewpratten" +profile_photo = "https://avatars.githubusercontent.com/u/21065412" +# Accounts +email = "evan@ewpratten.com" github = "ewpratten" -qrz = "va3zza" linkedin = "ewpratten" -profile_photo = "https://avatars.githubusercontent.com/u/21065412" \ No newline at end of file diff --git a/sass/styles/fixes/instagram.scss b/sass/styles/fixes/instagram.scss new file mode 100644 index 0000000..4b7360c --- /dev/null +++ b/sass/styles/fixes/instagram.scss @@ -0,0 +1,3 @@ +#instagram-embed-0 { + margin: auto !important; +} diff --git a/sass/styles/fixes/markdown.scss b/sass/styles/fixes/markdown.scss new file mode 100644 index 0000000..33d2ad1 --- /dev/null +++ b/sass/styles/fixes/markdown.scss @@ -0,0 +1,4 @@ +.markdown-body table { + margin: auto !important; + width: fit-content !important; +} diff --git a/sass/styles/fixes/mermaid.scss b/sass/styles/fixes/mermaid.scss new file mode 100644 index 0000000..186b927 --- /dev/null +++ b/sass/styles/fixes/mermaid.scss @@ -0,0 +1,4 @@ +.mermaid { + width: fit-content; + margin: auto; +} diff --git a/sass/styles/fixes/tiktok.scss b/sass/styles/fixes/tiktok.scss new file mode 100644 index 0000000..8f575b9 --- /dev/null +++ b/sass/styles/fixes/tiktok.scss @@ -0,0 +1,4 @@ +.tiktok-embed { + border: none !important; + margin: auto !important; +} diff --git a/sass/styles/fixes/youtube.scss b/sass/styles/fixes/youtube.scss new file mode 100644 index 0000000..d6be07d --- /dev/null +++ b/sass/styles/fixes/youtube.scss @@ -0,0 +1,9 @@ +.yt-embed { + width: 100%; + height: 400px; + + iframe { + width: 100%; + height: 100%; + } +} diff --git a/sass/styles/layout.scss b/sass/styles/layout.scss deleted file mode 100644 index f182fe1..0000000 --- a/sass/styles/layout.scss +++ /dev/null @@ -1,321 +0,0 @@ -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: "Urbanist", sans-serif; - font-weight: bolder; -} -p, -li, -span { - font-family: "Rubik", sans-serif; - font-weight: normal; -} -a { - text-decoration: none; - - &:visited { - color: blue; - } - - &:hover { - color: blueviolet; - } -} - -body { - // margin-bottom: 30px; - margin: 0; -} - -.mobile-hidden { - @media only screen and (max-width: 650px) { - display: none; - } -} - -.yt-embed { - width: 100%; - height: 400px; - - iframe { - width: 100%; - height: 100%; - } -} - -.container { - max-width: 700px; - margin: auto; - padding-left: 10px; - padding-right: 10px; -} - -.profile-card { - margin-top: 30px; - margin-bottom: 30px; - margin-left: auto; - margin-right: auto; - - .row { - width: max-content; - max-width: 95vw; - margin: auto; - overflow-wrap: normal; - - .headshot-container { - display: inline-block; - max-width: 150px; - @media only screen and (max-width: 399px) { - display: block; - margin: auto; - text-align: center; - } - img { - width: 100%; - } - } - .text-container { - display: inline-block; - margin-left: 20px; - h1, - p { - margin: 0px; - a { - text-decoration: none; - } - } - } - } -} - -.navigation-bar { - text-align: center; - p { - margin: 0px; - a { - text-decoration: none; - } - } -} - -.blog-post-li { - margin: 0.25em; -} - -.gray { - color: gray; -} - -ul { - padding-left: 20px; -} - -.events-list { - & > li { - color: gray; - } - & > ul { - & > li { - & > div { - display: table-row; - & > span { - display: table-cell; - - &:first-of-type { - color: gray; - width: 30px; - text-align: center; - padding-right: 8px; - - // Only Firefox supports this - // letter-spacing: -0.35em; - // text-transform: full-width; - } - } - } - } - } -} - -.mermaid { - width: fit-content; - margin: auto; -} - -.zola-github-card { - border-radius: 5px; - padding-top: 5px; - padding-bottom: 1px; - box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; - transition: all 0.1s ease 0s; - - &:hover { - box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 15px; - } -} - -#instagram-embed-0 { - margin: auto !important; -} - -.tiktok-embed { - border: none !important; - margin: auto !important; -} - -.markdown-body table { - margin: auto !important; - width: fit-content !important; -} - -.blog-post-listing-item { - color: black !important; - & > div { - border-left: solid rgb(201, 201, 201) 5px; - &:hover { - border-left: solid black 5px; - } - padding-left: 5px; - } - - h4, - h1, - p { - padding: 0; - margin: 0; - } - - h1 { - margin-bottom: 10px; - } - - &:hover { - color: rgb(85, 85, 85) !important; - } -} - -.pn-previous, -.pn-next { - border: 1px solid black; - border-radius: 5px; - padding: 5px; - color: black !important; - &:hover { - color: rgb(85, 85, 85) !important; - border: 1px solid rgb(85, 85, 85) !important; - } -} - -#footer { - margin-top: 2em; - text-align:center; -} - -.carded-section { - border: 1px solid black; - width: 100%; - - & > .header { - background-color: aliceblue; - padding-left: 30px; - padding-right: 30px; - padding-top: 15px; - padding-bottom: 15px; - - border-bottom: 1px solid rgb(201, 201, 201); - & > span { - font-size: 1.5em; - font-weight: bolder; - } - } - & > .content { - padding-left: 15px; - padding-right: 15px; - } -} - -.portfolio-sellout { - margin-top: 15px; - background-color: #afa79e; - border-radius: 5px; - text-align: center; - // color: white; - padding-top: 5px; - padding-bottom: 5px; - box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; - // & > p > a { - // color: aqua; - // } -} - -.hover-help { - &:hover { - cursor: help; - } - border-bottom: 1px double rgb(171, 167, 167); -} - -.small { - font-size: 0.5em; -} - -.hover-shadow { - &:hover { - box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; - } -} - -#main-skills { - display: flex; - flex-wrap: wrap; - width: 100%; - justify-content: space-evenly; - @media screen and (max-width: 455px) { - justify-content: left; - } - - ul { - margin:0; - } -} - - -.project { - border: 1px solid gray; - border-radius: 5px; - padding: 1em; - margin-bottom: 1em; - - p { - margin-top:0.25em; - margin-bottom:0.25em; - } - h3 { - border-bottom: 1px solid lightgrey; - margin-top:0.25em; - margin-bottom:0.5em; - padding-bottom: 0.5em; - } - ul{ - margin-bottom:0; - } -} - -.homepage-showoff { - padding-left: 1em; - padding-right: 1em; - padding-top: 0.25em; - padding-bottom: 0.25em; - - background-color: #e3e3e3; - color: black; -} - -.home-list { - &>ul>li { - padding-top:0.5em; - } -} \ No newline at end of file diff --git a/sass/styles/project_mosaic.scss b/sass/styles/project_mosaic.scss deleted file mode 100644 index acc92f8..0000000 --- a/sass/styles/project_mosaic.scss +++ /dev/null @@ -1,51 +0,0 @@ -.project-mosaic { - display: flex; - flex-wrap: wrap; - justify-content: space-evenly; - width: 100%; - - @media (min-width: 437px) { - .project-small { - max-width: 175px !important; - } - } - - .conform-height { - height: unset !important; - } - - .project { - border: 1px solid #ccc; - border-radius: 5px; - padding: 1rem; - margin-bottom: 1rem; - max-width: 300px; - height: max-content; - - img { - margin-bottom: 0.5em; - border-bottom: 1px solid #ccc; - padding-bottom: 0.75em; - width: 100%; - } - - h3 { - margin: 0; - margin-bottom: 0.25em; - } - - p { - margin-top: 0; - color: rgb(84, 84, 84); - } - - span { - display: inline-block; - border-top: 1px solid #ccc; - font-size: 2em; - width: 100%; - padding-top: 0.25em; - text-align: center; - } - } -} diff --git a/sass/styles/typography.scss b/sass/styles/typography.scss new file mode 100644 index 0000000..7a71634 --- /dev/null +++ b/sass/styles/typography.scss @@ -0,0 +1,44 @@ +@import url("https://fonts.googleapis.com/css2?family=Roboto&family=Urbanist:wght@700&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,400;0,700;1,400;1,700&display=swap"); + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: "Urbanist", sans-serif; + font-weight: bolder; +} +p, +li, +span { + font-family: "Rubik", sans-serif; + font-weight: normal; +} +a { + text-decoration: none; + + &:visited { + color: blue; + } + + &:hover { + color: blueviolet; + } +} + +body { + margin: 0; +} + +.gray { + color: gray; +} + +.hover-help { + &:hover { + cursor: help; + } + border-bottom: 1px double rgb(171, 167, 167); +} diff --git a/sass/styles/utils.scss b/sass/styles/utils.scss new file mode 100644 index 0000000..4ab5116 --- /dev/null +++ b/sass/styles/utils.scss @@ -0,0 +1,15 @@ +.mobile-hidden { + @media only screen and (max-width: 650px) { + display: none; + } +} + +.small { + font-size: 0.5em; +} + +.hover-shadow { + &:hover { + box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; + } +} diff --git a/templates/base.html b/templates/base.html index 5e1a75e..346f830 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,165 +1,73 @@ +{# Allow extenders to pass through variables #} +{% block variable_wormhole %} +{% set title = "NO TITLE SET" %} +{% set description = "" %} +{% set is_article = false %} +{% endblock variable_wormhole %} + - {% block head %} - - - - - - + {# Page metadata #} - - {% if current_url %} - - {% endif %} + {% include "components/metadata/advertise-rss.html" %} + {% include "components/metadata/opengraph.html" %} - - - - - {% block title %}{% endblock title %} | {{config.extra.name}} + {# Page title #} + {{title}} | {{config.title}} + {# Preconnects for external resources #} - - + + {# External styles #} + - - - - + {# Site-wide styles #} + + + + + + + - - - - - - - {% endblock head %} + {# Component styles #} + {% block component_styles %} + {% endblock component_styles %} -
-
- {% block profile %} -
-
- Headshot -
-
-

{{config.extra.name}}

-

- {{config.extra.profession}} -

- - {{config.extra.email}}
- - {{config.extra.github}}
- - {{config.extra.linkedin}}
- - {{config.extra.qrz}} -

-
-
- {% endblock profile %} -
-
-
-

- Home | - Blog | - {# Rabbit Hole | #} - {# My Work | #} - {# Network | #} - Contact - {# Hobbies #} - {# WHOIS #} - {# RFC #} -

-
-
-
- {% block content %} - {% endblock content %} + + {# The whole page #} +
+ + {# Actual content #} +
+
+ {% block content %}{% endblock content %} +
- + {# Footer #} + {% include "components/footer.html" %}
- - - - - - - {# URL Rewriter for retrylife.ca #} - - - {# Meta magic for mastodon verification #} - + {# External scripts #} + \ No newline at end of file diff --git a/templates/components/footer.html b/templates/components/footer.html new file mode 100644 index 0000000..e69de29 diff --git a/templates/components/metadata/advertise-rss.html b/templates/components/metadata/advertise-rss.html new file mode 100644 index 0000000..92c8697 --- /dev/null +++ b/templates/components/metadata/advertise-rss.html @@ -0,0 +1,5 @@ +{% if current_url %} + +{% endif %} + + \ No newline at end of file diff --git a/templates/components/metadata/opengraph.html b/templates/components/metadata/opengraph.html new file mode 100644 index 0000000..50302f0 --- /dev/null +++ b/templates/components/metadata/opengraph.html @@ -0,0 +1,21 @@ +{# Site info #} + + + + +{# Page image #} + + +{# Page description #} + + + + +{# Page title #} + + +{# Article-specifics #} +{% if is_article %} + +{% endif %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index af3d886..2d8af1c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,44 +1,13 @@ {% extends "base.html" %} -{% block title %} -{{section.title}} -{% endblock title %} -{% block head %} +{# Pass data through to the base template #} +{% block variable_wormhole %} {{ super() }} - - - - - - - - - - - -{# Handle flags #} - -{% endblock head %} +{% set title = section.title %} +{% set description = config.description %} +{% endblock variable_wormhole %} +{# Page content #} {% block content %} -{#
-
#} -{{section.content | safe}} -{#
#} + {{ section.content | safe }} {% endblock content %} \ No newline at end of file diff --git a/templates/page.html b/templates/page.html index 71c094b..524e817 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,118 +1,14 @@ {% extends "base.html" %} -{% block title %} -{{page.title}} -{% endblock title %} - -{% block head %} -{# #} +{# Pass data through to the base template #} +{% block variable_wormhole %} {{ super() }} +{% set title = page.title %} +{% set description = page.description %} +{% set is_article = true %} +{% endblock variable_wormhole %} -{# Disable crawling if requested #} -{% if page.extra.no_crawl %} - -{% endif %} - -{% if page.extra.uses_katex %} - - -{% endif %} - - - -{% if page.description %} - - -{% else %} - - -{% endif %} - - -{# Handle auto-centering request #} -{% if page.extra.auto_center_images %} - -{% endif %} - -{# Handle flags #} -{% if page.extra.uses_flags %} - -{% endif %} - -{# Handle loading JSONLD #} -{% if page.extra.is_rfc or page.description and page.date %} - -{% endif %} - -{# Handle redirects if needed #} -{% if page.extra.redir_to %} - -{% endif %} - -{% endblock head %} - -{% block profile %} -
-
- Headshot -
-
-

{{config.extra.name}}

-

- {{config.extra.profession}} -

-
-
-{% endblock profile %} - +{# Page content #} {% block content %} -

-
- {% if page.description %} -

{{page.title}}

-

- - /* - {{page.description}} - */ - -

- {% else %} -

{{page.title}}

- {% endif %} -
- {{page.content | safe}} -
- -
- -{% if page.extra.uses_twitter %} - -{% endif %} -{% if page.extra.uses_graphviz %} - -{% endif %} + {{ page.content | safe }} {% endblock content %} \ No newline at end of file diff --git a/templates/section.html b/templates/section.html index 2f0690a..3489058 100644 --- a/templates/section.html +++ b/templates/section.html @@ -1,113 +1,13 @@ {% extends "base.html" %} -{% block title %} -{{section.title}} -{% endblock title %} -{% block head %} +{# Pass data through to the base template #} +{% block variable_wormhole %} {{ super() }} +{% set title = section.title %} +{% set description = section.description %} +{% endblock variable_wormhole %} -{# Disable crawling if requested #} -{% if section.extra.no_crawl %} - -{% endif %} - - -{% if section.description %} - - -{% else %} - - -{% endif %} - -{# Handle listing blog posts nicely in search #} -{% if section.extra.inject_blog_posts %} - -{% endif %} -{% endblock head %} - +{# Page content #} {% block content %} -{% if section.extra.enable_gh_markdown %} -
-{% endif %} -{{section.content | safe}} -{% if section.extra.enable_gh_markdown %} -
-{% endif %} - -{# Blog posts #} -{% if section.extra.inject_blog_posts %} -
    -
    - {# Posts shall be broken down by year #} - {% set title_year = "3000" %} - {% for page in section.pages %} - {% if not page.extra.hidden %} - {% set page_year = page.date | date(format="%Y")%} - {% if page_year != title_year %} - {% set_global title_year = page_year %} -
-

{{title_year}}

-
    - {% endif %} - -
  • {{page.date}}: {{page.title}} -
    • - {% endif %} - {% endfor %} -
-

- {% endif %} - -{# RFCs #} -{% if section.extra.inject_rfcs %} -
    - {% for page in section.pages %} - {% if not page.extra.hidden %} -
  • {{page.title}} ({{page.date}}) -
    • - {% endif %} - {% endfor %} -
-{% endif %} - -{# Notes #} -{% if section.extra.inject_notes %} -
    - {% for page in section.pages %} - {% if not page.extra.hidden %} -
  • {{page.title}} -
    • - {% endif %} - {% endfor %} -
-{% endif %} - + {{ section.content | safe }} {% endblock content %} \ No newline at end of file From 0df06c44bd8a97404a926802a8f33f4b7b8b8595 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 25 Nov 2022 13:23:59 -0500 Subject: [PATCH 2/7] Add a navbar --- sass/styles/components/navbar.scss | 26 ++++++++++++++++++++++++++ sass/styles/layout.scss | 5 +++++ sass/styles/typography.scss | 1 + templates/base.html | 6 ++++++ templates/components/navbar.html | 18 ++++++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 sass/styles/components/navbar.scss create mode 100644 sass/styles/layout.scss create mode 100644 templates/components/navbar.html diff --git a/sass/styles/components/navbar.scss b/sass/styles/components/navbar.scss new file mode 100644 index 0000000..f27cfaf --- /dev/null +++ b/sass/styles/components/navbar.scss @@ -0,0 +1,26 @@ +.ewp-navbar { + margin-top: 1em; + margin-bottom: 1em; + + hr { + margin: 0; + border-top: 2px solid; + } + + .navbar-items { + width: max-content; + padding: 0; + margin-top: 0.5em; + margin-bottom: 0.5em; + margin-left: auto; + margin-right: auto; + + & > li { + display: inline-block; + } + + .separator { + content: "|"; + } + } +} diff --git a/sass/styles/layout.scss b/sass/styles/layout.scss new file mode 100644 index 0000000..6a067f1 --- /dev/null +++ b/sass/styles/layout.scss @@ -0,0 +1,5 @@ +.page { + & > .container { + max-width: 800px; + } +} diff --git a/sass/styles/typography.scss b/sass/styles/typography.scss index 7a71634..8799421 100644 --- a/sass/styles/typography.scss +++ b/sass/styles/typography.scss @@ -18,6 +18,7 @@ span { } a { text-decoration: none; + color: blue; &:visited { color: blue; diff --git a/templates/base.html b/templates/base.html index 346f830..6838adf 100644 --- a/templates/base.html +++ b/templates/base.html @@ -42,6 +42,7 @@ + {# Component styles #} {% block component_styles %} @@ -53,6 +54,11 @@ {# The whole page #}
+ {# Navbar #} +
+ {% include "components/navbar.html" %} +
+ {# Actual content #}
diff --git a/templates/components/navbar.html b/templates/components/navbar.html new file mode 100644 index 0000000..7329913 --- /dev/null +++ b/templates/components/navbar.html @@ -0,0 +1,18 @@ +{% block component_styles %} +{{ super() }} + +{% endblock component_styles %} + +
+
+ +
+
\ No newline at end of file From bdc32a55ee02e129f90296e829bc675ccc70e7dd Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 25 Nov 2022 13:33:15 -0500 Subject: [PATCH 3/7] Dropdowns --- sass/styles/components/navbar.scss | 4 ++++ templates/components/navbar.html | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sass/styles/components/navbar.scss b/sass/styles/components/navbar.scss index f27cfaf..6ba936b 100644 --- a/sass/styles/components/navbar.scss +++ b/sass/styles/components/navbar.scss @@ -17,6 +17,10 @@ & > li { display: inline-block; + + .dropdown-menu { + box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; + } } .separator { diff --git a/templates/components/navbar.html b/templates/components/navbar.html index 7329913..0b493c7 100644 --- a/templates/components/navbar.html +++ b/templates/components/navbar.html @@ -10,9 +10,18 @@
  • |
  • Blog
  • |
    • -
  • More
    • -
  • |
    • -
  • Profiles
    • + {#
  • + + +
    • +
  • |
    • #} +
  • Contact
    • \ No newline at end of file From cb2ceb0c0d6a998d3a4b30226bdf998af312dca5 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 25 Nov 2022 14:36:06 -0500 Subject: [PATCH 4/7] page heading --- sass/styles/components/about-card.scss | 57 ++++++++++++++++++++ sass/styles/components/heading-card.scss | 32 +++++++++++ templates/base.html | 6 +++ templates/components/about-card.html | 46 ++++++++++++++++ templates/components/heading-card.html | 14 +++++ templates/components/metadata/analytics.html | 9 ++++ templates/index.html | 5 +- templates/page.html | 9 +++- templates/section.html | 3 ++ 9 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 sass/styles/components/about-card.scss create mode 100644 sass/styles/components/heading-card.scss create mode 100644 templates/components/about-card.html create mode 100644 templates/components/heading-card.html create mode 100644 templates/components/metadata/analytics.html diff --git a/sass/styles/components/about-card.scss b/sass/styles/components/about-card.scss new file mode 100644 index 0000000..29238ea --- /dev/null +++ b/sass/styles/components/about-card.scss @@ -0,0 +1,57 @@ +.about-card { + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: space-around; + + width: max-content; + max-width: 95vw; + margin-left: auto; + margin-right: auto; + margin-top: 2em; + margin-bottom: 2em; + + .profile-photo-container { + max-width: 150px; + height: max-content; + margin: 0; + padding: 0; + + & > img { + width: 100%; + } + } + + .text-container { + margin-left: 1em; + height: max-content; + + .intro-text { + margin-bottom: 1em; + + h1, + p { + margin: 0; + line-height: 1em; + } + } + + .quick-links { + height: max-content; + + ul { + margin: 0; + padding: 0; + + li { + list-style-type: none; + + line-height: 1.25em; + margin: 0; + padding: 0; + } + padding: 0; + } + } + } +} diff --git a/sass/styles/components/heading-card.scss b/sass/styles/components/heading-card.scss new file mode 100644 index 0000000..721ce84 --- /dev/null +++ b/sass/styles/components/heading-card.scss @@ -0,0 +1,32 @@ +.heading-card { + display: flex; + flex-direction: row; + justify-content: space-around; + align-items: center; + + width: max-content; + max-width: 95vw; + margin-left: auto; + margin-right: auto; + margin-top: 2em; + margin-bottom: 2em; + + .profile-photo-container { + width: 50px; + + img { + width: 100%; + } + } + + .text-container { + margin-left: 1em; + height: max-content; + + h1, + p { + margin: 0; + line-height: 1em; + } + } +} diff --git a/templates/base.html b/templates/base.html index 6838adf..a1334a0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -13,6 +13,7 @@ + {% include "components/metadata/advertise-rss.html" %} {% include "components/metadata/opengraph.html" %} @@ -54,6 +55,9 @@ {# The whole page #}
    + {# Allow pages to override the content before the navbar #} + {% block page_start %}{% endblock page_start %} + {# Navbar #}
    {% include "components/navbar.html" %} @@ -74,6 +78,8 @@ + + {% include "components/metadata/analytics.html" %} \ No newline at end of file diff --git a/templates/components/about-card.html b/templates/components/about-card.html new file mode 100644 index 0000000..83b9f3f --- /dev/null +++ b/templates/components/about-card.html @@ -0,0 +1,46 @@ +{% block component_styles %} +{{ super() }} + +{% endblock component_styles %} + +
    +
    + Profile Photo +
    +
    +
    +

    {{config.extra.name}}

    +

    {{config.extra.profession}}

    +
    +
    + +
    +
    +
    + +{# Mastodon requires this to exist somewhere, so why not here #} + \ No newline at end of file diff --git a/templates/components/heading-card.html b/templates/components/heading-card.html new file mode 100644 index 0000000..f337bf7 --- /dev/null +++ b/templates/components/heading-card.html @@ -0,0 +1,14 @@ +{% block component_styles %} +{{ super() }} + +{% endblock component_styles %} + +
    +
    + Profile Photo +
    +
    +

    {{config.extra.name}}

    +

    {{config.extra.profession}}

    +
    +
    \ No newline at end of file diff --git a/templates/components/metadata/analytics.html b/templates/components/metadata/analytics.html new file mode 100644 index 0000000..4561b6f --- /dev/null +++ b/templates/components/metadata/analytics.html @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 2d8af1c..a96117a 100644 --- a/templates/index.html +++ b/templates/index.html @@ -8,6 +8,9 @@ {% endblock variable_wormhole %} {# Page content #} +{% block page_start %} +{% include "components/about-card.html" %} +{% endblock page_start %} {% block content %} - {{ section.content | safe }} +{{ section.content | safe }} {% endblock content %} \ No newline at end of file diff --git a/templates/page.html b/templates/page.html index 524e817..e90338b 100644 --- a/templates/page.html +++ b/templates/page.html @@ -9,6 +9,13 @@ {% endblock variable_wormhole %} {# Page content #} +{% block page_start %} +{% include "components/heading-card.html" %} +{% endblock page_start %} {% block content %} - {{ page.content | safe }} +

    {{page.title}}

    +{{page.description}} +

    + +{{ page.content | safe }} {% endblock content %} \ No newline at end of file diff --git a/templates/section.html b/templates/section.html index 3489058..4b583b3 100644 --- a/templates/section.html +++ b/templates/section.html @@ -8,6 +8,9 @@ {% endblock variable_wormhole %} {# Page content #} +{% block page_start %} +{% include "components/heading-card.html" %} +{% endblock page_start %} {% block content %} {{ section.content | safe }} {% endblock content %} \ No newline at end of file From d9c0478069790c884d8fc63cba841a8220cbe4da Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 25 Nov 2022 14:39:10 -0500 Subject: [PATCH 5/7] Blog post listing --- content/blog/_index.md | 2 +- templates/section.html | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/content/blog/_index.md b/content/blog/_index.md index 5a1d15d..fd8afd6 100644 --- a/content/blog/_index.md +++ b/content/blog/_index.md @@ -2,7 +2,7 @@ title: Blog sort_by: date extra: - inject_blog_posts: true + section_embed_mode: blog_posts --- ## Blog posts diff --git a/templates/section.html b/templates/section.html index 4b583b3..f0f39db 100644 --- a/templates/section.html +++ b/templates/section.html @@ -12,5 +12,35 @@ {% include "components/heading-card.html" %} {% endblock page_start %} {% block content %} - {{ section.content | safe }} +{{ section.content | safe }} + +{# Handle various embed modes #} +{% if section.extra.section_embed_mode %} + + +{% if section.extra.section_embed_mode == "blog_posts" %} +{#
      #} +
      + {# Posts shall be broken down by year #} + {% set title_year = "3000" %} + {% for page in section.pages %} + {% if not page.extra.hidden %} + {% set page_year = page.date | date(format="%Y")%} + {% if page_year != title_year %} + {% set_global title_year = page_year %} + +
    +

    {{title_year}}

    +
      + {% endif %} + +
    • {{page.date}}: + {{page.title}} +
      • + {% endif %} + {% endfor %} +
    +
    +{% endif %} +{% endif %} {% endblock content %} \ No newline at end of file From 72e6a39f40da05d33b4107da897e99bb1aaac6bd Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 25 Nov 2022 14:58:40 -0500 Subject: [PATCH 6/7] Lots of cleanup --- content/blog/2019-08-11-Setting-up-JA.md | 1 + content/blog/2019-09-11-Buildingimgfrombin.md | 2 +- content/blog/2020-04-20-LudumDare46.md | 2 +- .../blog/2020-08-03-Joystick-to-Voltage.md | 2 +- .../blog/2020-08-13-Drivetrain-navigation.md | 2 +- content/blog/2021-12-03-quaternions.md | 2 +- .../blog/2022-01-06-unfinished-projects.md | 2 +- content/blog/2022-01-19-monocular-blender.md | 2 +- content/blog/2022-02-14-personal-pbx.md | 2 +- content/blog/2022-02-26-ferris-sweep.md | 2 +- content/blog/2022-03-15-Java-cheatsheet.md | 2 +- content/blog/2022-04-06-udm-fan.md | 2 +- content/blog/2022-04-11-angle-problem.md | 2 +- content/blog/2022-05-10-album-space-time.md | 2 +- content/blog/2022-05-18-commit-sync.md | 2 +- content/blog/2022-05-21-nanovna.md | 2 +- content/blog/2022-06-08-bell-ipv6.md | 2 +- content/blog/2022-06-13-fedora-36-vp.md | 2 +- .../2022-06-23-steam-controller-switch.md | 2 +- .../2022-06-26-rickrolling-the-internet.md | 2 +- content/blog/2022-07-02-robotics-journey.md | 2 +- content/blog/2022-08-17-as398057.md | 2 +- content/blog/2022-09-09-new-domain.md | 2 +- content/blog/2022-10-02-personal-ases.md | 2 +- content/blog/2022-10-17-ampr-vultr-bgp.md | 2 +- content/blog/2022-10-30-bird-udmpro.md | 2 +- content/events/meme-month-2022.md | 2 +- content/network/plan.md | 2 +- content/products/vcvrack/a10u8r.md | 2 +- sass/styles/components/footer.scss | 3 ++ sass/styles/typography.scss | 8 ++++++ templates/base.html | 10 +++++++ templates/components/footer.html | 13 +++++++++ .../components/metadata/page-features.html | 28 +++++++++++++++++++ templates/index.html | 3 ++ templates/page.html | 6 ++++ templates/section.html | 3 ++ 37 files changed, 103 insertions(+), 28 deletions(-) create mode 100644 sass/styles/components/footer.scss create mode 100644 templates/components/metadata/page-features.html diff --git a/content/blog/2019-08-11-Setting-up-JA.md b/content/blog/2019-08-11-Setting-up-JA.md index f67e2d3..e25544f 100644 --- a/content/blog/2019-08-11-Setting-up-JA.md +++ b/content/blog/2019-08-11-Setting-up-JA.md @@ -5,6 +5,7 @@ description: "I3wm makes everything 10x harder than it should be" date: 2019-08-12 tags: notes languages aliases: [/blog/2019/08/12/setting-up-ja] +draft: true --- I am currently working with [Hiragana](https://en.wikipedia.org/wiki/Hiragana), [Katakana](https://en.wikipedia.org/wiki/Katakana), and, [Kanji](https://en.wikipedia.org/wiki/Kanji) in some projects, and needed a more reliable way to write than running some [romaji](https://en.wikipedia.org/wiki/Romanization_of_Japanese) through an online translator. So, this post will detail what I did to enable native inputs on my laptop. This guide is specifically for [i3wm](https://i3wm.org/), because it does not obey system settings for languages and inputs. diff --git a/content/blog/2019-09-11-Buildingimgfrombin.md b/content/blog/2019-09-11-Buildingimgfrombin.md index e3f146b..9182420 100644 --- a/content/blog/2019-09-11-Buildingimgfrombin.md +++ b/content/blog/2019-09-11-Buildingimgfrombin.md @@ -9,7 +9,7 @@ redirect_from: - /ef7b3166/ aliases: [/blog/2019/09/11/buildingimgfrombin] extra: - uses_twitter: true + uses: [twitter] --- During a computer science class today, we were talking about embedding code and metadata in *jpg* and *bmp* files. @exvacuum was showing off a program he wrote that watched a directory for new image files, and would display them on a canvas. He then showed us a special image. In this image, he had injected some metadata into the last few pixels, which were not rendered, but told his program where to position the image on the canvas, and it's size. diff --git a/content/blog/2020-04-20-LudumDare46.md b/content/blog/2020-04-20-LudumDare46.md index 8614702..3b907ef 100644 --- a/content/blog/2020-04-20-LudumDare46.md +++ b/content/blog/2020-04-20-LudumDare46.md @@ -9,7 +9,7 @@ redirect_from: - /ebsdjtd9/ aliases: [/blog/2020/04/20/ludumdare46] extra: - uses_twitter: true + uses: [twitter] --- Over the past weekend I teamed up with @rsninja722, @wm-c, @exvacuum, @marshmarlow, and our friends Sally and Matt to participate in the [LudumDare46](https://ldjam.com/events/ludum-dare/46) game jam. This post will outline the game development process. diff --git a/content/blog/2020-08-03-Joystick-to-Voltage.md b/content/blog/2020-08-03-Joystick-to-Voltage.md index 5f3b51b..4ddf1a7 100644 --- a/content/blog/2020-08-03-Joystick-to-Voltage.md +++ b/content/blog/2020-08-03-Joystick-to-Voltage.md @@ -6,7 +6,7 @@ tags = ["frc"] aliases = ["/blog/2020/08/03/joystick-to-voltage"] [extra] -uses_katex = true +uses = ["katex"] +++ I am starting a new little series here called "Notes from FRC". The idea is that I am going to write about what I have learned over the past three years of working (almost daily) with robots, and hopefully someone in the future will find them useful. The production source code I based this post around is available [here](https://github.com/frc5024/lib5k/blob/cd8ad407146b514cf857c1d8ac82ac8f3067812b/common_drive/src/main/java/io/github/frc5024/common_drive/calculation/DifferentialDriveCalculation.java). diff --git a/content/blog/2020-08-13-Drivetrain-navigation.md b/content/blog/2020-08-13-Drivetrain-navigation.md index 398ec5f..99eff3c 100644 --- a/content/blog/2020-08-13-Drivetrain-navigation.md +++ b/content/blog/2020-08-13-Drivetrain-navigation.md @@ -9,7 +9,7 @@ extra: This post is a continuation on my "Notes from FRC" series. This time, I cover an extremely simple, yet very effective way to get a tank-drive robot from A to B autonomously. - uses_katex: true + uses: [katex] aliases: [/blog/2020/08/13/drivetrain-navigation] --- diff --git a/content/blog/2021-12-03-quaternions.md b/content/blog/2021-12-03-quaternions.md index a089ca9..b315896 100644 --- a/content/blog/2021-12-03-quaternions.md +++ b/content/blog/2021-12-03-quaternions.md @@ -6,7 +6,7 @@ date: 2021-12-03 tags: reference draft: false extra: - uses_katex: true + uses: [katex] excerpt: This post is an overview of Quaternions for Rust programmers, and anyone willing to learn. --- diff --git a/content/blog/2022-01-06-unfinished-projects.md b/content/blog/2022-01-06-unfinished-projects.md index bb8bef5..4653f1f 100644 --- a/content/blog/2022-01-06-unfinished-projects.md +++ b/content/blog/2022-01-06-unfinished-projects.md @@ -6,7 +6,7 @@ date: 2022-01-06 tags: random draft: false extra: - uses_katex: false + excerpt: My GitHub profile is a bit like an iceberg. At the time of writing, I have made nearly 8 and a half thousand commits to nearly a thousand repositories. This post covers the hidden failed projects. --- diff --git a/content/blog/2022-01-19-monocular-blender.md b/content/blog/2022-01-19-monocular-blender.md index 833665c..dd7181e 100644 --- a/content/blog/2022-01-19-monocular-blender.md +++ b/content/blog/2022-01-19-monocular-blender.md @@ -6,7 +6,7 @@ date: 2022-01-19 tags: random 3d-pipeline draft: false extra: - uses_katex: false + excerpt: This post covers the process I went through to write a Neural-Network-assisted Blender plugin for converting monocular images into 3D textured meshes. --- diff --git a/content/blog/2022-02-14-personal-pbx.md b/content/blog/2022-02-14-personal-pbx.md index 3c277fe..9854ea1 100644 --- a/content/blog/2022-02-14-personal-pbx.md +++ b/content/blog/2022-02-14-personal-pbx.md @@ -6,7 +6,7 @@ date: 2022-02-14 tags: project pbx draft: true extra: - uses_katex: false + auto_center_images: true --- diff --git a/content/blog/2022-02-26-ferris-sweep.md b/content/blog/2022-02-26-ferris-sweep.md index c243040..a0679f3 100644 --- a/content/blog/2022-02-26-ferris-sweep.md +++ b/content/blog/2022-02-26-ferris-sweep.md @@ -6,7 +6,7 @@ date: 2022-02-26 tags: project keyboard draft: true extra: - uses_katex: false + auto_center_images: true --- diff --git a/content/blog/2022-03-15-Java-cheatsheet.md b/content/blog/2022-03-15-Java-cheatsheet.md index 0ce2a88..ebb3656 100644 --- a/content/blog/2022-03-15-Java-cheatsheet.md +++ b/content/blog/2022-03-15-Java-cheatsheet.md @@ -7,7 +7,7 @@ tags: reference draft: false extra: excerpt: This document is written for my PROG10082 classmates as a quick reference for some Java concepts that were skipped over in the course. - uses_katex: false + hidden: true auto_center_images: true --- diff --git a/content/blog/2022-04-06-udm-fan.md b/content/blog/2022-04-06-udm-fan.md index e9e19c0..f6d34df 100644 --- a/content/blog/2022-04-06-udm-fan.md +++ b/content/blog/2022-04-06-udm-fan.md @@ -6,7 +6,7 @@ date: 2022-04-06 tags: random draft: false extra: - uses_katex: false + excerpt: A project review post covering my work on remote-control for the UDM-Pro cooling system --- diff --git a/content/blog/2022-04-11-angle-problem.md b/content/blog/2022-04-11-angle-problem.md index 0cab5e3..bf7205d 100644 --- a/content/blog/2022-04-11-angle-problem.md +++ b/content/blog/2022-04-11-angle-problem.md @@ -6,7 +6,7 @@ date: 2022-04-11 tags: robotics draft: true extra: - uses_katex: true + uses: [katex] excerpt: In this post, I take a look at a mathematical problem commonly encountered with relative rotation offset calculation in robotics. --- diff --git a/content/blog/2022-05-10-album-space-time.md b/content/blog/2022-05-10-album-space-time.md index 4c15e88..7c84477 100644 --- a/content/blog/2022-05-10-album-space-time.md +++ b/content/blog/2022-05-10-album-space-time.md @@ -6,7 +6,7 @@ date: 2022-05-10 tags: music draft: true extra: - uses_katex: false + auto_center_images: true excerpt: Release notification for Space & Time Vol. 1 --- \ No newline at end of file diff --git a/content/blog/2022-05-18-commit-sync.md b/content/blog/2022-05-18-commit-sync.md index b6fb075..6cb4f65 100644 --- a/content/blog/2022-05-18-commit-sync.md +++ b/content/blog/2022-05-18-commit-sync.md @@ -6,7 +6,7 @@ date: 2022-05-18 tags: random draft: false extra: - uses_katex: false + auto_center_images: true excerpt: This post covers how to keep your commit graph alive across multiple GIT instances by syncing your commit history to magic repos. --- diff --git a/content/blog/2022-05-21-nanovna.md b/content/blog/2022-05-21-nanovna.md index 34b4d38..cda0cee 100644 --- a/content/blog/2022-05-21-nanovna.md +++ b/content/blog/2022-05-21-nanovna.md @@ -6,7 +6,7 @@ date: 2022-05-21 tags: radio random nanovna draft: false extra: - uses_katex: false + auto_center_images: true excerpt: I went out in the field and tried out my brand new NanoVNA. --- diff --git a/content/blog/2022-06-08-bell-ipv6.md b/content/blog/2022-06-08-bell-ipv6.md index 2125dc9..bdc5bab 100644 --- a/content/blog/2022-06-08-bell-ipv6.md +++ b/content/blog/2022-06-08-bell-ipv6.md @@ -6,7 +6,7 @@ date: 2022-06-08 tags: networking draft: true extra: - uses_katex: false + auto_center_images: true excerpt: I used multiple layers of IP encapsulation to evade an upstream firewall in the name of IPv6. --- diff --git a/content/blog/2022-06-13-fedora-36-vp.md b/content/blog/2022-06-13-fedora-36-vp.md index 72933f8..2040a36 100644 --- a/content/blog/2022-06-13-fedora-36-vp.md +++ b/content/blog/2022-06-13-fedora-36-vp.md @@ -6,7 +6,7 @@ date: 2022-06-13 tags: random draft: false extra: - uses_katex: false + auto_center_images: true excerpt: A quick guide on launching Visual Paradigm on Fedora 36 --- diff --git a/content/blog/2022-06-23-steam-controller-switch.md b/content/blog/2022-06-23-steam-controller-switch.md index 3de7134..6d6a8bd 100644 --- a/content/blog/2022-06-23-steam-controller-switch.md +++ b/content/blog/2022-06-23-steam-controller-switch.md @@ -6,7 +6,7 @@ date: 2022-06-23 tags: random draft: false extra: - uses_katex: false + auto_center_images: true excerpt: How to flash custom firmware to the Steam Controller, allowing it to connect to the Nintendo Switch --- diff --git a/content/blog/2022-06-26-rickrolling-the-internet.md b/content/blog/2022-06-26-rickrolling-the-internet.md index aff28ed..d7b5e2f 100644 --- a/content/blog/2022-06-26-rickrolling-the-internet.md +++ b/content/blog/2022-06-26-rickrolling-the-internet.md @@ -6,7 +6,7 @@ date: 2022-06-26 tags: random as398057 draft: false extra: - uses_katex: false + auto_center_images: true excerpt: This post covers some of the logistics behind rickrolling the internet with some clever routing tricks. --- diff --git a/content/blog/2022-07-02-robotics-journey.md b/content/blog/2022-07-02-robotics-journey.md index 15417f7..bbd6125 100644 --- a/content/blog/2022-07-02-robotics-journey.md +++ b/content/blog/2022-07-02-robotics-journey.md @@ -6,7 +6,7 @@ date: 2022-07-02 tags: story draft: true extra: - uses_katex: false + auto_center_images: true excerpt: From 2016 to 2021, I dedicated most of my time to robotics and control systems programming. This is my journey --- diff --git a/content/blog/2022-08-17-as398057.md b/content/blog/2022-08-17-as398057.md index 9d95f55..5136d87 100644 --- a/content/blog/2022-08-17-as398057.md +++ b/content/blog/2022-08-17-as398057.md @@ -6,7 +6,7 @@ date: 2022-08-17 tags: networking draft: true extra: - uses_katex: false + auto_center_images: true excerpt: I recently started AS398057, a low cost Autonomous System. This post talks about how its going --- diff --git a/content/blog/2022-09-09-new-domain.md b/content/blog/2022-09-09-new-domain.md index ecf14cd..18caf6e 100644 --- a/content/blog/2022-09-09-new-domain.md +++ b/content/blog/2022-09-09-new-domain.md @@ -6,7 +6,7 @@ date: 2022-09-09 tags: website draft: false extra: - uses_katex: false + auto_center_images: true excerpt: A small update post about some website changes --- diff --git a/content/blog/2022-10-02-personal-ases.md b/content/blog/2022-10-02-personal-ases.md index 217fc8b..fc4f71f 100644 --- a/content/blog/2022-10-02-personal-ases.md +++ b/content/blog/2022-10-02-personal-ases.md @@ -6,7 +6,7 @@ date: 2022-10-02 tags: website network draft: false extra: - uses_katex: false + auto_center_images: true excerpt: A look at the usage of personal ASNs based on freely available data --- diff --git a/content/blog/2022-10-17-ampr-vultr-bgp.md b/content/blog/2022-10-17-ampr-vultr-bgp.md index a48378d..c5a375f 100644 --- a/content/blog/2022-10-17-ampr-vultr-bgp.md +++ b/content/blog/2022-10-17-ampr-vultr-bgp.md @@ -6,7 +6,7 @@ date: 2022-10-17 tags: amprnet network draft: true extra: - uses_katex: false + auto_center_images: true excerpt: A tutorial for AMPRNet operators who are BGP announcing their first prefix to Vultr --- diff --git a/content/blog/2022-10-30-bird-udmpro.md b/content/blog/2022-10-30-bird-udmpro.md index ec5bc67..f61550b 100644 --- a/content/blog/2022-10-30-bird-udmpro.md +++ b/content/blog/2022-10-30-bird-udmpro.md @@ -6,7 +6,7 @@ date: 2022-10-17 tags: amprnet network draft: true extra: - uses_katex: false + auto_center_images: true excerpt: A tutorial for AMPRNet operators who are BGP announcing their first prefix to Vultr --- diff --git a/content/events/meme-month-2022.md b/content/events/meme-month-2022.md index e02b0ff..2333048 100644 --- a/content/events/meme-month-2022.md +++ b/content/events/meme-month-2022.md @@ -3,7 +3,7 @@ title: Meme Appreciation Month description: "Come chat with young hams, and join the meme madness!" aliases: [/yeet] extra: - uses_flags: true + uses: [flags] --- ***This event has passed. Page preserved for nostalgia.*** diff --git a/content/network/plan.md b/content/network/plan.md index 9accee2..f25dc96 100644 --- a/content/network/plan.md +++ b/content/network/plan.md @@ -1,7 +1,7 @@ --- title: IP Addressing Plan extra: - uses_graphviz: true + uses: [graphviz] --- diff --git a/content/products/vcvrack/a10u8r.md b/content/products/vcvrack/a10u8r.md index ceb4f17..a1acd33 100644 --- a/content/products/vcvrack/a10u8r.md +++ b/content/products/vcvrack/a10u8r.md @@ -2,7 +2,7 @@ title: "A10U8R: Signal Attenuator" description: "A small, but helpful module for VCV Rack 2" extra: - uses_katex: true + uses: [katex] --- [![Download Plugin](https://img.shields.io/badge/-download-darkgreen)](https://github.com/Ewpratten/A10U8R/releases/latest) diff --git a/sass/styles/components/footer.scss b/sass/styles/components/footer.scss new file mode 100644 index 0000000..b7c9cea --- /dev/null +++ b/sass/styles/components/footer.scss @@ -0,0 +1,3 @@ +.footer { + text-align: center; +} diff --git a/sass/styles/typography.scss b/sass/styles/typography.scss index 8799421..5854f14 100644 --- a/sass/styles/typography.scss +++ b/sass/styles/typography.scss @@ -43,3 +43,11 @@ body { } border-bottom: 1px double rgb(171, 167, 167); } + +.page #content { + img { + display: block; + margin-left: auto; + margin-right: auto; + } +} diff --git a/templates/base.html b/templates/base.html index a1334a0..2f8fdb8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,6 +3,8 @@ {% set title = "NO TITLE SET" %} {% set description = "" %} {% set is_article = false %} +{% set feature_flags = [] %} +{% set redirect_target = "" %} {% endblock variable_wormhole %} @@ -17,6 +19,11 @@ {% include "components/metadata/advertise-rss.html" %} {% include "components/metadata/opengraph.html" %} + {# Redirect support #} + {% if redirect_target != "" %} + + {% endif %} + {# Page title #} {{title}} | {{config.title}} @@ -48,6 +55,9 @@ {# Component styles #} {% block component_styles %} {% endblock component_styles %} + + {# Enable features #} + {% include "components/metadata/page-features.html" %} diff --git a/templates/components/footer.html b/templates/components/footer.html index e69de29..f370185 100644 --- a/templates/components/footer.html +++ b/templates/components/footer.html @@ -0,0 +1,13 @@ +{% block component_styles %} +{{ super() }} + +{% endblock component_styles %} + +
    +
    + -- EOF -- +

    + Site design & content by: Evan Pratten
    + Consider supporting my work if you like what you see
    +

    +
    \ No newline at end of file diff --git a/templates/components/metadata/page-features.html b/templates/components/metadata/page-features.html new file mode 100644 index 0000000..1ccf347 --- /dev/null +++ b/templates/components/metadata/page-features.html @@ -0,0 +1,28 @@ +{% for feature in feature_flags %} + +{# KATEX #} +{% if feature == "katex" %} + + +{% endif %} + +{# Flags #} +{% if feature == "flags" %} + +{% endif %} + +{# Twitter embed #} +{% if feature == "twitter" %} + +{% endif %} + +{# Mermaid #} +{% if feature == "mermaid" or feature == "graphviz" %} + +{% endif %} + +{% endfor %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index a96117a..b0722e2 100644 --- a/templates/index.html +++ b/templates/index.html @@ -5,6 +5,9 @@ {{ super() }} {% set title = section.title %} {% set description = config.description %} +{% if section.extra.uses %} +{% set feature_flags = section.extra.uses %} +{% endif %} {% endblock variable_wormhole %} {# Page content #} diff --git a/templates/page.html b/templates/page.html index e90338b..4ab3dfa 100644 --- a/templates/page.html +++ b/templates/page.html @@ -6,6 +6,12 @@ {% set title = page.title %} {% set description = page.description %} {% set is_article = true %} +{% if page.extra.uses %} +{% set feature_flags = page.extra.uses %} +{% endif %} +{% if page.extra.redir_to %} +{% set redirect_target = page.extra.redir_to %} +{% endif %} {% endblock variable_wormhole %} {# Page content #} diff --git a/templates/section.html b/templates/section.html index f0f39db..b2b14f7 100644 --- a/templates/section.html +++ b/templates/section.html @@ -5,6 +5,9 @@ {{ super() }} {% set title = section.title %} {% set description = section.description %} +{% if section.extra.uses %} +{% set feature_flags = section.extra.uses %} +{% endif %} {% endblock variable_wormhole %} {# Page content #} From 2fbdc5bd64a6b5f289c94ddc252d01c1b9187762 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 25 Nov 2022 15:03:42 -0500 Subject: [PATCH 7/7] Some final cleanup --- sass/styles/components/github-card.scss | 11 +++++++++++ sass/styles/layout.scss | 5 +++++ templates/base.html | 1 + templates/index.html | 22 ++++++++++++++++++++++ templates/page.html | 20 ++++++++++++++++++++ templates/shortcodes/card_section.html | 8 -------- 6 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 sass/styles/components/github-card.scss delete mode 100644 templates/shortcodes/card_section.html diff --git a/sass/styles/components/github-card.scss b/sass/styles/components/github-card.scss new file mode 100644 index 0000000..fd38595 --- /dev/null +++ b/sass/styles/components/github-card.scss @@ -0,0 +1,11 @@ +.zola-github-card { + border-radius: 5px; + padding-top: 5px; + padding-bottom: 1px; + box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; + transition: all 0.1s ease 0s; + + &:hover { + box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 15px; + } +} diff --git a/sass/styles/layout.scss b/sass/styles/layout.scss index 6a067f1..56470bc 100644 --- a/sass/styles/layout.scss +++ b/sass/styles/layout.scss @@ -3,3 +3,8 @@ max-width: 800px; } } + +.mermaid { + width: fit-content; + margin: auto; +} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 2f8fdb8..dc5aafb 100644 --- a/templates/base.html +++ b/templates/base.html @@ -51,6 +51,7 @@ + {# Component styles #} {% block component_styles %} diff --git a/templates/index.html b/templates/index.html index b0722e2..bc25d0f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,5 +1,27 @@ {% extends "base.html" %} +{# Additional metadata for Google #} +{% block head %} +{{ super() }} + + + +{% endblock head %} + {# Pass data through to the base template #} {% block variable_wormhole %} {{ super() }} diff --git a/templates/page.html b/templates/page.html index 4ab3dfa..9ca2c9d 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,5 +1,25 @@ {% extends "base.html" %} +{# Additional metadata for Google #} +{% block head %} +{{ super() }} + +{% if page.description and page.date %} + +{% endif %} +{% endblock head %} + {# Pass data through to the base template #} {% block variable_wormhole %} {{ super() }} diff --git a/templates/shortcodes/card_section.html b/templates/shortcodes/card_section.html deleted file mode 100644 index 3420710..0000000 --- a/templates/shortcodes/card_section.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -
    - {{title}} -
    -
    - {{body | safe}} -
    -
    \ No newline at end of file