chore: cleanup
This commit is contained in:
parent
56c9a128f0
commit
e327e44f1d
38 changed files with 93 additions and 106 deletions
|
|
@ -1,66 +1,33 @@
|
|||
{%- assign fullUrl = globals.url | append: page.url -%}
|
||||
{%- assign pageTitle = globals.site_name -%}
|
||||
{%- assign pageDescription = globals.site_description -%}
|
||||
|
||||
{%- case schema -%}
|
||||
{%- 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-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 -%}
|
||||
|
||||
{%- if page.description -%}
|
||||
{%- assign pageDescription = page.description -%}
|
||||
{%- elsif description -%}
|
||||
{%- assign pageDescription = description -%}
|
||||
{%- endif -%}
|
||||
|
||||
{%- assign ogImage = globals.cdn_url | append: globals.avatar -%}
|
||||
|
||||
{%- case schema -%}
|
||||
{%- when 'music' -%}
|
||||
{%- assign ogImage = globals.cdn_url | append: page.image -%}
|
||||
{%- when 'music-index' -%}
|
||||
{%- assign ogImage = globals.cdn_url | append: music.week.artists[0].grid.image -%}
|
||||
{%- 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 -%}
|
||||
{%- endcase -%}
|
||||
|
||||
{%- assign escapedPageDescription = pageDescription | escape -%}
|
||||
{%- capture updateTime -%}
|
||||
{%- if updated == "now" -%}
|
||||
{{ 'now' | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }}
|
||||
{%- elsif page.updated -%}
|
||||
{{ page.updated | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }}
|
||||
{%- endif -%}
|
||||
{%- endcapture -%}
|
||||
|
||||
<!doctype html>
|
||||
<html lang="{{ globals.lang }}">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title data-dynamic="title">{{ pageTitle }}</title>
|
||||
<meta name="color-scheme" content="light dark">
|
||||
<link rel="preload" href="/assets/fonts/ml.woff2" as="font" type="font/woff2" crossorigin="anonymous">
|
||||
<link rel="preload" href="/assets/fonts/mlb.woff2" as="font" type="font/woff2" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="/assets/styles/index.css?v={% appVersion %}" type="text/css" />
|
||||
<link rel="canonical" href="{{ fullUrl }}" />
|
||||
<meta name="color-scheme" content="light dark">
|
||||
<meta property="og:title" content="{{ pageTitle }}" data-dynamic="og:title" />
|
||||
<meta name="description" content="{{ escapedPageDescription }}" data-dynamic="description" />
|
||||
<meta property="og:description" content="{{ escapedPageDescription }}" data-dynamic="og:description" />
|
||||
<meta property="og:type" content="article" />
|
||||
<meta property="og:url" content="{{ fullUrl }}" data-dynamic="og:url" />
|
||||
<meta property="og:image" content="{{ ogImage }}?class=w800" data-dynamic="og:image" />
|
||||
{% render "partials/metadata.liquid",
|
||||
globals:globals,
|
||||
schema:schema,
|
||||
title:title,
|
||||
page:page,
|
||||
post:post,
|
||||
year:year,
|
||||
music:music,
|
||||
books:books,
|
||||
featuredMovie:featuredMovie,
|
||||
featuredShow:featuredShow,
|
||||
featuredBook:featuredBook,
|
||||
%}
|
||||
<meta name="theme-color" content="{{ globals.theme_color }}" />
|
||||
<meta name="fediverse:creator" content="{{ globals.mastodon }}" />
|
||||
<meta name="generator" content="Eleventy">
|
||||
|
|
@ -92,6 +59,14 @@
|
|||
metaColorScheme.setAttribute('content', themeToSet);
|
||||
})();
|
||||
</script>
|
||||
{{ content }}
|
||||
<div class="main-wrapper">
|
||||
<main>
|
||||
{% render "partials/header.liquid", globals:globals, page:page, nav:nav %}
|
||||
<div class="default-wrapper" data-dynamic="page">
|
||||
{{ content }}
|
||||
</div>
|
||||
</main>
|
||||
{% render "partials/footer.liquid", page:page, nav:nav, updated:updateTime %}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
---
|
||||
layout: main
|
||||
---
|
||||
{% render "partials/header.liquid", globals: globals, page: page, nav: nav %}
|
||||
<div class="default-wrapper" data-dynamic="page">
|
||||
{{ content }}
|
||||
</div>
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
---
|
||||
layout: base
|
||||
---
|
||||
{%- capture updateTime -%}
|
||||
{%- if updated == "now" -%}
|
||||
{{ 'now' | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }}
|
||||
{%- elsif page.updated -%}
|
||||
{{ page.updated | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }}
|
||||
{%- endif -%}
|
||||
{%- endcapture -%}
|
||||
<div class="main-wrapper">
|
||||
<main>{{ content }}</main>
|
||||
{% render "partials/footer.liquid", page:page, nav:nav, updated:updateTime %}
|
||||
</div>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
layout: default
|
||||
---
|
||||
{{ content | markdown }}
|
||||
53
src/includes/partials/metadata.liquid
Normal file
53
src/includes/partials/metadata.liquid
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{%- assign fullUrl = globals.url | append: page.url -%}
|
||||
{%- assign pageTitle = globals.site_name -%}
|
||||
{%- assign pageDescription = globals.site_description -%}
|
||||
{%- assign ogImage = globals.cdn_url | append: globals.avatar -%}
|
||||
{%- case schema -%}
|
||||
{%- 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 'music' -%}
|
||||
{%- assign ogImage = globals.cdn_url | append: page.image -%}
|
||||
{%- when 'music-index' -%}
|
||||
{%- assign ogImage = globals.cdn_url | append: music.week.artists[0].grid.image -%}
|
||||
{%- 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 -%}
|
||||
|
||||
{% 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 -%}
|
||||
|
||||
<title data-dynamic="title">{{ pageTitle }}</title>
|
||||
<link rel="canonical" href="{{ fullUrl }}" />
|
||||
<meta property="og:title" content="{{ pageTitle }}" data-dynamic="og:title" />
|
||||
<meta name="description" content="{{ escapedPageDescription }}" data-dynamic="description" />
|
||||
<meta property="og:description" content="{{ escapedPageDescription }}" data-dynamic="og:description" />
|
||||
<meta property="og:type" content="article" />
|
||||
<meta property="og:url" content="{{ fullUrl }}" data-dynamic="og:url" />
|
||||
<meta property="og:image" content="{{ ogImage }}?class=w800" data-dynamic="og:image" />
|
||||
Reference in a new issue