cdransf/coryd.dev-eleventy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: dry up templates

Browse source
This commit is contained in:
Cory Dransfeldt 2024-10-26 09:04:26 -07:00
parent 05ab78c861
commit 5f60579311
No known key found for this signature in database
8 changed files with 44 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "coryd.dev", "name": "coryd.dev",
"version": "1.8.3", "version": "1.8.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "coryd.dev", "name": "coryd.dev",
"version": "1.8.3", "version": "1.8.4",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@cdransf/api-text": "^1.5.0", "@cdransf/api-text": "^1.5.0",

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "coryd.dev", "name": "coryd.dev",
"version": "1.8.3", "version": "1.8.4",
"description": "The source for my personal site. Built using 11ty (and other tools).", "description": "The source for my personal site. Built using 11ty (and other tools).",
"type": "module", "type": "module",
"engines": { "engines": {

2
src/assets/styles/components/paginator.css
View file

@ -18,7 +18,7 @@
margin: 0; margin: 0;
} }
.pagination span.disabled svg[data-tablericon-name^="arrow-"] { .pagination a.disabled svg[data-tablericon-name^="arrow-"] {
cursor: not-allowed; cursor: not-allowed;
stroke: var(--gray-medium); stroke: var(--gray-medium);
stroke-width: var(--stroke-width-default); stroke-width: var(--stroke-width-default);

14
src/includes/base.liquid
View file

@ -1,11 +1,9 @@
{%- capture updateTime -%} {%- assign updateTime = "" -%}
{%- if updated == "now" -%} {%- if updated == "now" -%}
{{ 'now' | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }} {%- assign updateTime = 'now' | date: "%B %-d, %l:%M %P", "America/Los_Angeles" -%}
{%- elsif page.updated -%} {%- elsif page.updated -%}
{{ page.updated | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }} {%- assign updateTime = page.updated | date: "%B %-d, %l:%M %P", "America/Los_Angeles" -%}
{%- endif -%} {%- endif -%}
{%- endcapture -%}
<!doctype html> <!doctype html>
<html lang="{{ globals.lang }}"> <html lang="{{ globals.lang }}">
<head> <head>

4
src/includes/partials/blocks/associated-media.liquid
View file

@ -1,5 +1,4 @@
{% assign media = artists | concat: books | concat: genres | concat: movies | concat: posts | concat: shows %} {% assign media = artists | concat: books | concat: genres | concat: movies | concat: posts | concat: shows %}
{% if media.size > 0 %} {% if media.size > 0 %}
<div class="associated-media"> <div class="associated-media">
{% assign sections = {% assign sections =
@ -10,14 +9,12 @@
"posts:article:article:Related post(s)," | append: "posts:article:article:Related post(s)," | append:
"shows:device-tv-old:tv:Related show(s)" "shows:device-tv-old:tv:Related show(s)"
| split: "," %} | split: "," %}
{% for section in sections %} {% for section in sections %}
{% assign parts = section | split: ":" %} {% assign parts = section | split: ":" %}
{% assign key = parts[0] %} {% assign key = parts[0] %}
{% assign icon = parts[1] %} {% assign icon = parts[1] %}
{% assign css_class = parts[2] %} {% assign css_class = parts[2] %}
{% assign label = parts[3] %} {% assign label = parts[3] %}
{% case key %} {% case key %}
{% when "artists" %} {% assign items = artists %} {% when "artists" %} {% assign items = artists %}
{% when "books" %} {% assign items = books %} {% when "books" %} {% assign items = books %}
@ -26,7 +23,6 @@
{% when "posts" %} {% assign items = posts %} {% when "posts" %} {% assign items = posts %}
{% when "shows" %} {% assign items = shows %} {% when "shows" %} {% assign items = shows %}
{% endcase %} {% endcase %}
{% if items and items.size > 0 %} {% if items and items.size > 0 %}
<p id="{{ key }}" class="{{ css_class }}"> <p id="{{ key }}" class="{{ css_class }}">
{% tablericon icon %} {% tablericon icon %}

6
src/includes/partials/header.liquid
View file

@ -1,9 +1,9 @@
<section class="main-title"> <section class="main-title">
<h1> <h1>
{%- if page.url != '/' -%} {%- if page.url == '/' -%}
<a href="/" tabindex="0">{{ globals.site_name }}</a>
{%- else -%}
{{ globals.site_name }} {{ globals.site_name }}
{%- else -%}
<a href="/" tabindex="0">{{ globals.site_name }}</a>
{%- endif -%} {%- endif -%}
</h1> </h1>
{% render "partials/nav/menu.liquid", page:page, nav:nav %} {% render "partials/nav/menu.liquid", page:page, nav:nav %}

29
src/includes/partials/metadata.liquid
View file

@ -1,16 +1,17 @@
{%- assign fullUrl = globals.url | append: page.url -%} {%- assign fullUrl = globals.url | append: page.url -%}
{%- assign pageTitle = globals.site_name -%} {%- assign pageTitle = title | default: globals.site_name -%}
{%- assign pageDescription = globals.site_description -%} {%- assign pageDescription = page.description | default: description | default: globals.site_description -%}
{%- assign ogImage = globals.cdn_url | append: globals.avatar -%} {%- assign ogImage = globals.cdn_url | append: globals.avatar -%}
{%- case schema -%} {%- case schema -%}
{%- when 'blog' -%} {%- when 'blog' -%}
{%- assign pageTitle = post.title -%} {%- assign pageTitle = post.title -%}
{%- assign pageDescription = post.description | markdown | strip_html | default: globals.site_description -%} {%- assign pageDescription = post.description | markdown | strip_html | default: globals.site_description -%}
{%- when 'books' or 'books-year' -%} {%- when 'books', 'books-year' -%}
{%- assign featuredBook = books.all | filterBooksByStatus: 'started' | reverse | first -%} {%- assign featuredBook = books.all | filterBooksByStatus: 'started' | reverse | first -%}
{%- assign ogImage = globals.cdn_url | append: featuredBook.grid.image -%} {%- assign ogImage = globals.cdn_url | append: featuredBook.grid.image -%}
{%- when 'books-year' -%} {%- if schema == 'books-year' -%}
{%- assign pageTitle = year.value | append: ' / Books / ' | append: globals.site_name -%} {%- assign pageTitle = year.value | append: ' / Books / ' | append: globals.site_name -%}
{%- endif -%}
{%- when 'music' -%} {%- when 'music' -%}
{%- assign ogImage = globals.cdn_url | append: page.image -%} {%- assign ogImage = globals.cdn_url | append: page.image -%}
{%- when 'music-index' -%} {%- when 'music-index' -%}
@ -20,28 +21,14 @@
{%- assign pageTitle = 'Music / ' | append: page.title | append: ' / ' | append: globals.site_name -%} {%- assign pageTitle = 'Music / ' | append: page.title | append: ' / ' | append: globals.site_name -%}
{%- when 'page' -%} {%- when 'page' -%}
{%- assign pageTitle = page.title | append: ' / ' | append: globals.site_name -%} {%- assign pageTitle = page.title | append: ' / ' | append: globals.site_name -%}
{%- when 'watching' or 'favorite-movies' -%} {%- when 'watching', 'favorite-movies' -%}
{%- assign featuredMovie = movies.recentlyWatched | first -%} {%- assign featuredMovie = movies.recentlyWatched | first -%}
{%- assign ogImage = globals.cdn_url | append: featuredMovie.grid.backdrop -%} {%- assign ogImage = globals.cdn_url | append: featuredMovie.grid.backdrop -%}
{%- when 'watching-shows' or 'favorite-shows' -%} {%- when 'watching-shows', 'favorite-shows' -%}
{%- assign featuredShow = tv.recentlyWatched | first -%} {%- assign featuredShow = tv.recentlyWatched | first -%}
{%- assign ogImage = globals.cdn_url | append: featuredShow.grid.backdrop -%} {%- assign ogImage = globals.cdn_url | append: featuredShow.grid.backdrop -%}
{%- else -%}
{%- assign pageTitle = globals.site_name -%}
{%- endcase -%} {%- endcase -%}
{% if title %}
{%- assign pageTitle = title | append: ' / ' | append: globals.site_name -%}
{% endif %}
{%- if page.description -%}
{%- assign pageDescription = page.description -%}
{%- elsif description -%}
{%- assign pageDescription = description -%}
{%- endif -%}
{%- assign escapedPageDescription = pageDescription | escape -%} {%- assign escapedPageDescription = pageDescription | escape -%}
<title data-dynamic="title">{{ pageTitle }}</title> <title data-dynamic="title">{{ pageTitle }}</title>
<link rel="canonical" href="{{ fullUrl }}" /> <link rel="canonical" href="{{ fullUrl }}" />
<meta property="og:title" content="{{ pageTitle }}" data-dynamic="og:title" /> <meta property="og:title" content="{{ pageTitle }}" data-dynamic="og:title" />

43
src/includes/partials/nav/paginator.liquid
View file

@ -1,33 +1,36 @@
<script type="module" src="/assets/scripts/components/select-pagination.js?v={% appVersion %}"></script> <script type="module" src="/assets/scripts/components/select-pagination.js?v={% appVersion %}"></script>
<nav aria-label="Pagination" class="pagination"> <nav aria-label="Pagination" class="pagination">
{%- if pagination.href.previous -%} {% assign prevHref = pagination.href.previous %}
<a href="{{ pagination.href.previous }}" aria-label="Previous page"> {% assign nextHref = pagination.href.next %}
{% tablericon "arrow-left" %} <a
</a> href="{{ prevHref }}"
{%- else -%} aria-label="Previous page"
<span class="disabled" disabled> class="{% unless prevHref %}disabled{% endunless %}"
{% tablericon "arrow-left" %} {% unless prevHref %}disabled{% endunless %}
</span> >
{%- endif -%} {% tablericon "arrow-left" %}
</a>
<select-pagination> <select-pagination>
<select class="client-side" aria-label="Page selection"> <select class="client-side" aria-label="Page selection">
{%- for pageEntry in pagination.pages -%} {%- for pageEntry in pagination.pages -%}
<option value="{{ forloop.index | minus: 1 }}">{{ forloop.index }} of {{ pagination.links.size }}</option> <option value="{{ forloop.index | minus: 1 }}">
{{ forloop.index }} of {{ pagination.links.size }}
</option>
{%- endfor -%} {%- endfor -%}
</select> </select>
<noscript> <noscript>
<p> <p>
<span aria-current="page">{{ pagination.pageNumber | plus: 1 }}</span> of {{ pagination.links.size }} <span aria-current="page">{{ pagination.pageNumber | plus: 1 }}</span>
of {{ pagination.links.size }}
</p> </p>
</noscript> </noscript>
</select-pagination> </select-pagination>
{%- if pagination.href.next -%} <a
<a href="{{ pagination.href.next }}" aria-label="Next page"> href="{{ nextHref }}"
{% tablericon "arrow-right" %} aria-label="Next page"
</a> class="{% unless nextHref %}disabled{% endunless %}"
{%- else -%} {% unless nextHref %}disabled{% endunless %}
<span class="disabled" disabled> >
{% tablericon "arrow-right" %} {% tablericon "arrow-right" %}
</span> </a>
{%- endif -%}
</nav> </nav>