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 08:56:19 -07:00
parent 47ca467b88
commit 05ab78c861
No known key found for this signature in database
14 changed files with 147 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/filters/general.js
View file

@ -15,4 +15,8 @@ export default {
ellipsis: "...",
}),
shuffleArray,
pluralize: (count, string) => {
if (count === 1) return string;
return `${string}s`;
},
};

4
package-lock.json generated
View file

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

2
package.json
View file

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

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

@ -1,81 +1,56 @@
{% if artists or books or genres or movies or posts or shows %}<div class="associated-media">{% endif %}
{% comment %} render related artists {% endcomment %}
{%- if artists -%}
<p id="artists" class="music">
{% tablericon "headphones" %}
Related artist(s)
</p>
<ul>
{% for artist in artists %}
{%- capture playLabel -%}
{%- if artist.total_plays == 1 -%}
play
{%- else -%}
plays
{%- endif -%}
{%- endcapture -%}
<li><a href="{{ artist.url }}">{{ artist.name }}</a>{%- if artist.total_plays > 0 -%}: <strong class="highlight-text">{{ artist.total_plays }} {{ playLabel }}</strong>{%- endif -%}</li>
{% endfor %}
</ul>
{%- endif -%}
{% comment %} render related books {% endcomment %}
{%- if books -%}
<p id="books" class="books">
{% tablericon "books" %}
Related book(s)
</p>
<ul>
{% for book in books %}
<li><a href="{{ book.url }}">{{ book.title }}</a> by {{ book.author }}</li>
{% endfor %}
</ul>
{%- endif -%}
{% comment %} render related genres {% endcomment %}
{%- if genres -%}
<p id="genres" class="music">
{% tablericon "headphones" %}
Related genre(s)
</p>
<ul>
{% for genre in genres %}
<li><a href="{{ genre.url }}">{{ genre.name }}</a></li>
{% endfor %}
</ul>
{%- endif -%}
{% comment %} render related movies {% endcomment %}
{%- if movies -%}
<p id="movies" class="movies">
{% tablericon "movie" %}
Related movie(s)
</p>
<ul>
{% for movie in movies %}
<li><a href="{{ movie.url }}">{{ movie.title }}</a> ({{ movie.year }})</li>
{% endfor %}
</ul>
{%- endif -%}
{% comment %} render related posts {% endcomment %}
{%- if posts -%}
<p id="posts" class="article">
{% tablericon "article" %}
Related post(s)
</p>
<ul>
{% for post in posts %}
<li><a href="{{ post.url }}">{{ post.title }}</a> ({{ post.date | date: "%B %e, %Y" }})</li>
{% endfor %}
</ul>
{%- endif -%}
{% comment %} render related shows {% endcomment %}
{%- if shows -%}
<p id="tv" class="tv">
{% tablericon "device-tv-old" %}
Related show(s)
</p>
<ul>
{% for show in shows %}
<li><a href="{{ show.url }}">{{ show.title }}</a> ({{ show.year }})</li>
{% endfor %}
</ul>
{%- endif -%}
{% if artists or books or genres or movies or posts or shows %}</div>{% endif %}
{% assign media = artists | concat: books | concat: genres | concat: movies | concat: posts | concat: shows %}
{% if media.size > 0 %}
<div class="associated-media">
{% assign sections =
"artists:headphones:music:Related artist(s)," | append:
"books:books:books:Related book(s)," | append:
"genres:headphones:music:Related genre(s)," | append:
"movies:movie:movies:Related movie(s)," | append:
"posts:article:article:Related post(s)," | append:
"shows:device-tv-old:tv:Related show(s)"
| split: "," %}
{% for section in sections %}
{% assign parts = section | split: ":" %}
{% assign key = parts[0] %}
{% assign icon = parts[1] %}
{% assign css_class = parts[2] %}
{% assign label = parts[3] %}
{% case key %}
{% when "artists" %} {% assign items = artists %}
{% when "books" %} {% assign items = books %}
{% when "genres" %} {% assign items = genres %}
{% when "movies" %} {% assign items = movies %}
{% when "posts" %} {% assign items = posts %}
{% when "shows" %} {% assign items = shows %}
{% endcase %}
{% if items and items.size > 0 %}
<p id="{{ key }}" class="{{ css_class }}">
{% tablericon icon %}
{{ label }}
</p>
<ul>
{% for item in items %}
<li>
<a href="{{ item.url }}">{{ item.title | default: item.name }}</a>
{% if key == "artists" and item.total_plays > 0 %}
: <strong class="highlight-text">
{{ item.total_plays }} {{ item.total_plays | pluralize: "play" }}
</strong>
{% elsif key == "books" %}
by {{ item.author }}
{% elsif key == "movies" or key == "shows" %}
({{ item.year }})
{% elsif key == "posts" %}
({{ item.date | date: "%B %e, %Y" }})
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
{% endfor %}
</div>
{% endif %}

31
src/includes/partials/blocks/index.liquid
View file

@ -1,17 +1,18 @@
{%- for block in blocks -%}
{%- if block.type == 'youtube_player' -%}
{% render "partials/blocks/youtube-player.liquid", url:block.url %}
{%- elsif block.type == 'github_banner' -%}
{% render "partials/blocks/banners/github.liquid", url:block.url %}
{%- elsif block.type == 'npm_banner' -%}
{% render "partials/blocks/banners/npm.liquid", url:block.url, command:block.command %}
{%- elsif block.type == 'rss_banner' -%}
{% render "partials/blocks/banners/rss.liquid", url:block.url, text:block.text %}
{%- elsif block.type == 'hero' -%}
{% render "partials/blocks/hero.liquid", globals:globals, image:block.image, alt:block.alt %}
{%- elsif block.type == 'markdown' -%}
{{ block.text | markdown }}
{%- elsif block.type == 'divider' -%}
{{ block.markup | markdown }}
{%- endif -%}
{%- case block.type -%}
{%- when 'youtube_player' -%}
{% render "partials/blocks/youtube-player.liquid", url: block.url %}
{%- when 'github_banner' -%}
{% render "partials/blocks/banners/github.liquid", url: block.url %}
{%- when 'npm_banner' -%}
{% render "partials/blocks/banners/npm.liquid", url: block.url, command: block.command %}
{%- when 'rss_banner' -%}
{% render "partials/blocks/banners/rss.liquid", url: block.url, text: block.text %}
{%- when 'hero' -%}
{% render "partials/blocks/hero.liquid", globals: globals, image: block.image, alt: block.alt %}
{%- when 'markdown' -%}
{{ block.text | markdown }}
{%- when 'divider' -%}
{{ block.markup | markdown }}
{%- endcase -%}
{%- endfor -%}

4
src/includes/partials/blocks/mastodon-post.liquid
View file

@ -15,9 +15,7 @@
</template>
<span class="client-side">
<mastodon-post>
<a href="{{ post }}">
Discuss on Mastodon
</a>
<a href="{{ post }}">Discuss on Mastodon</a>
</mastodon-post>
</span>
{%- endif -%}

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

@ -4,13 +4,13 @@
{%- endif -%}
<nav aria-label="Social icons" class="social">
{%- for link in nav.footer_icons -%}
{% render "partials/nav/link.liquid", page:page, title:link.title, url:link.permalink, icon:link.icon %}
{% render "partials/nav/link.liquid", page:page, link:link %}
{%- endfor -%}
</nav>
<nav aria-label="Secondary site navigation" class="sub-pages">
{%- for link in nav.footer_text -%}
{% render "partials/nav/link.liquid", page:page, title:link.title, url:link.permalink, icon:link.icon %}
{% if not forloop.last %}<span>/</span>{% endif %}
{% render "partials/nav/link.liquid", page:page, link:link %}
{% unless forloop.last %}<span>/</span>{% endunless %}
{%- endfor -%}
</nav>
</footer>

66
src/includes/partials/media/grid.liquid
View file

@ -1,62 +1,50 @@
{%- assign pageCount = pagination.pages.size | default: 0 -%}
{%- assign hidePagination = pageCount <= 1 -%}
<div class="media-grid {% if shape == 'poster' -%}poster{%- elsif shape == 'square' -%}square{%- elsif shape == 'vertical' -%}vertical{%- endif -%}">
<div class="media-grid {{ shape }}">
{%- assign loadingStrategy = loading | default: 'lazy' -%}
{%- for item in data limit: count -%}
{%- assign alt = item.grid.alt | replaceQuotes -%}
{%- assign imageUrl = item.grid.image | default: item.grid.backdrop -%}
<a href="{{ item.grid.url }}" title="{{ alt }}">
<div class="item">
<div class="meta-text">
<div class="header">{{ item.grid.title }}</div>
<div class="subheader">{{ item.grid.subtext }}</div>
</div>
{%- assign loadingStrategy = loading | default: 'lazy' -%}
{%- if shape == 'poster' -%}
<img
srcset="
{{ globals.cdn_url }}{{ item.grid.backdrop }}?class=bannersm&type=webp 256w,
{{ globals.cdn_url }}{{ item.grid.backdrop }}?class=bannermd&type=webp 512w
"
sizes="(max-width: 450px) 256px, 512px"
src="{{ globals.cdn_url }}{{ item.grid.backdrop }}?class=bannersm&type=webp"
alt="{{ alt }}"
loading="{{ loadingStrategy }}"
decoding="async"
width="256"
height="170"
/>
{%- elsif shape == 'square' -%}
<img
srcset="
{{ globals.cdn_url }}{{ item.grid.image }}?class=squaresm&type=webp 200w,
{{ globals.cdn_url }}{{ item.grid.image }}?class=squaremd&type=webp 400w
"
sizes="(max-width: 450px) 200px, 400px"
src="{{ globals.cdn_url }}{{ item.grid.image }}?class=squaresm&type=webp"
alt="{{ alt }}"
loading="{{ loadingStrategy }}"
decoding="async"
width="200"
height="200"
/>
{%- elsif shape == 'vertical' -%}
{%- assign imageClass = '' -%}
{%- assign width = 0 -%}
{%- assign height = 0 -%}
{%- case shape -%}
{%- when 'poster' -%}
{%- assign imageClass = 'banner' -%}
{%- assign width = 256 -%}
{%- assign height = 170 -%}
{%- when 'square' -%}
{%- assign imageClass = 'square' -%}
{%- assign width = 200 -%}
{%- assign height = 200 -%}
{%- when 'vertical' -%}
{%- assign imageClass = 'vertical' -%}
{%- assign width = 200 -%}
{%- assign height = 307 -%}
{%- endcase -%}
<img
srcset="
{{ globals.cdn_url }}{{ item.grid.image }}?class=verticalsm&type=webp 200w,
{{ globals.cdn_url }}{{ item.grid.image }}?class=verticalmd&type=webp 400w
{{ globals.cdn_url }}{{ imageUrl }}?class={{ imageClass }}sm&type=webp {{ width }}w,
{{ globals.cdn_url }}{{ imageUrl }}?class={{ imageClass }}md&type=webp {{ width | times: 2 }}w
"
sizes="(max-width: 450px) 200px, 400px"
src="{{ globals.cdn_url }}{{ item.grid.image }}?class=verticalsm&type=webp"
sizes="(max-width: 450px) {{ width }}px, {{ width | times: 2 }}px"
src="{{ globals.cdn_url }}{{ imageUrl }}?class={{ imageClass }}sm&type=webp"
alt="{{ alt }}"
loading="{{ loadingStrategy }}"
decoding="async"
width="200"
height="307"
width="{{ width }}"
height="{{ height }}"
/>
{%- endif -%}
</div>
</a>
{%- endfor -%}
</div>
{%- unless hidePagination -%}
{% render "partials/nav/paginator.liquid", pagination:pagination %}
{% render "partials/nav/paginator.liquid", pagination: pagination %}
{%- endunless -%}

8
src/includes/partials/media/music/chart.liquid
View file

@ -6,13 +6,7 @@
<div class="item">
<div class="info">
<a class="title" href="{{ item.chart.url }}">{{ item.chart.title }}</a>
{%- capture playsLabel -%}
{%- if item.chart.plays > 1 -%}
plays
{%- else -%}
play
{%- endif -%}
{%- endcapture -%}
{%- assign playsLabel = item.chart.plays | pluralize:"play" -%}
<span class="subtext">{{ item.chart.artist }}</span>
<span class="subtext">{{ item.chart.plays }} {{ playsLabel }}</span>
</div>

18
src/includes/partials/media/watching/hero.liquid
View file

@ -9,22 +9,6 @@
({{ movie.year }})
</div>
</div>
<img
srcset="
{{ globals.cdn_url }}{{ movie.backdrop }}?class=bannersm 256w,
{{ globals.cdn_url }}{{ movie.backdrop }}?class=bannermd 512w,
{{ globals.cdn_url }}{{ movie.backdrop }}?class=bannerbase 1024w,
{{ globals.cdn_url }}{{ movie.backdrop }}?class=bannerlg 2048w
"
sizes="(max-width: 450px) 256px,
(max-width: 850px) 512px,
(max-width: 1000px) 1024px,
2048px"
src="{{ globals.cdn_url }}{{ movie.backdrop }}?class=bannerlg"
loading="eager"
decoding="async"
width="1080"
height="720"
/>
{% render "partials/blocks/hero.liquid", globals:globals, image:movie.backdrop, alt:movie.title %}
</div>
</a>

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

@ -6,27 +6,26 @@
{%- when 'blog' -%}
{%- assign pageTitle = post.title -%}
{%- assign pageDescription = post.description | markdown | strip_html | default: globals.site_description -%}
{%- when 'music-index' -%}
{%- assign pageTitle = 'Music / ' | append: globals.site_name -%}
{%- when 'music-period' -%}
{%- assign pageTitle = 'Music / ' | append: page.title | append: ' / ' | append: globals.site_name -%}
{%- when 'books' or 'books-year' -%}
{%- assign featuredBook = books.all | filterBooksByStatus: 'started' | reverse | first -%}
{%- assign ogImage = globals.cdn_url | append: featuredBook.grid.image -%}
{%- when 'books-year' -%}
{%- assign pageTitle = year.value | append: ' / Books / ' | append: globals.site_name -%}
{%- when 'music' -%}
{%- assign ogImage = globals.cdn_url | append: page.image -%}
{%- when 'music-index' -%}
{%- assign pageTitle = 'Music / ' | append: globals.site_name -%}
{%- assign ogImage = globals.cdn_url | append: music.week.artists[0].grid.image -%}
{%- when 'music-period' -%}
{%- assign pageTitle = 'Music / ' | append: page.title | append: ' / ' | append: globals.site_name -%}
{%- when 'page' -%}
{%- assign pageTitle = page.title | append: ' / ' | append: globals.site_name -%}
{%- when 'watching' or 'favorite-movies' -%}
{%- assign featuredMovie = movies.recentlyWatched | first -%}
{%- assign ogImage = globals.cdn_url | append: featuredMovie.grid.backdrop -%}
{%- when 'watching-shows' or 'favorite-shows' -%}
{%- assign featuredShow = tv.recentlyWatched | first -%}
{%- assign ogImage = globals.cdn_url | append: featuredShow.grid.backdrop -%}
{%- when 'books' or 'books-year' -%}
{%- assign featuredBook = books.all | filterBooksByStatus: 'started' | reverse | first -%}
{%- assign ogImage = globals.cdn_url | append: featuredBook.grid.image -%}
{%- when 'books-year' -%}
{%- assign pageTitle = year.value | append: ' / Books / ' | append: globals.site_name -%}
{%- when 'page' -%}
{%- assign pageTitle = page.title | append: ' / ' | append: globals.site_name -%}
{%- else -%}
{%- assign pageTitle = globals.site_name -%}
{%- endcase -%}

27
src/includes/partials/nav/link.liquid
View file

@ -1,21 +1,26 @@
{%- assign categoryUrl = url | downcase -%}
{%- assign categoryUrl = link.permalink | downcase -%}
{%- assign isHttp = categoryUrl contains "http" -%}
{%- if categoryUrl | isLinkActive: page.url -%}
<span class="active {{ class }}" aria-current="page">
{%- if icon -%}
{% tablericon icon %}
<span>{{ title }}</span>
<span class="active {{ link.class }}" aria-current="page">
{%- if link.icon -%}
{% tablericon link.icon %}
<span>{{ link.title }}</span>
{%- else -%}
{{ title }}
{{ link.title }}
{%- endif -%}
</span>
{%- else -%}
<a class="{% if icon %}{{ icon | downcase }} icon {% endif %}{{ class }}" href="{{ categoryUrl }}" {% if isHttp -%} rel="me" {%- endif %} aria-label="{{ title }}">
{%- if icon -%}
{% tablericon icon %}
<span>{{ title }}</span>
<a
class="{% if link.icon %}{{ link.icon | downcase }} icon {% endif %}{{ link.class }}"
href="{{ categoryUrl }}"
{% if isHttp -%} rel="me" {%- endif %}
aria-label="{{ link.title }}"
>
{%- if link.icon -%}
{% tablericon link.icon %}
<span>{{ link.title }}</span>
{%- else -%}
{{ title }}
{{ link.title }}
{%- endif -%}
</a>
{%- endif -%}

2
src/includes/partials/nav/menu.liquid
View file

@ -6,7 +6,7 @@
</label>
<ul class="menu-primary" aria-label="Primary site navigation" id="primary-navigation">
{%- for link in nav.primary -%}
<li>{% render "partials/nav/link.liquid", page:page, title:link.title, url:link.permalink, icon:link.icon %}</li>
<li>{% render "partials/nav/link.liquid", page:page, link:link %}</li>
{%- endfor -%}
</ul>
{% render "partials/nav/theme-toggle.liquid" %}

13
src/pages/posts/post.html
View file

@ -42,11 +42,14 @@ schema: blog
{{ post.content | markdown }}
{% render "partials/blocks/index.liquid", blocks:post.blocks %}
{% render "partials/blocks/mastodon-post.liquid", post:post.mastodon_url %}
{% render "partials/blocks/associated-media.liquid", artists:post.artists %}
{% render "partials/blocks/associated-media.liquid", books:post.books %}
{% render "partials/blocks/associated-media.liquid", genres:post.genres %}
{% render "partials/blocks/associated-media.liquid", movie:post.movies %}
{% render "partials/blocks/associated-media.liquid", shows:post.shows %}
{% render "partials/blocks/associated-media.liquid",
artists: post.artists,
books: post.books,
genres: post.genres,
movies: post.movies,
posts: post.posts,
shows: post.shows
%}
{% render "partials/blocks/banners/coffee.liquid" %}
</div>
</article>