feat: speed up builds; minimize things a bit
This commit is contained in:
parent
67017151d1
commit
f057962309
13 changed files with 17 additions and 164 deletions
|
|
@ -91,20 +91,7 @@ export default {
|
|||
},
|
||||
|
||||
// links
|
||||
findPost: (url, posts) => {
|
||||
if (!url || !posts || !posts[url]?.toots?.[0]?.includes('https')) return null;
|
||||
const BASE_URL = 'https://social.lol/users/cory/statuses/'
|
||||
const STATUS_URL = 'https://social.lol/@cory/'
|
||||
return posts[url]?.toots?.[0]?.replace(BASE_URL, STATUS_URL) || null;
|
||||
},
|
||||
absoluteUrl: (url) => {
|
||||
try {
|
||||
return (new URL(url, BASE_URL)).toString()
|
||||
} catch(e) {
|
||||
console.error('Error generating absoluteUrl.')
|
||||
}
|
||||
return url;
|
||||
},
|
||||
absoluteUrl: (url) => (new URL(url, BASE_URL)).toString(),
|
||||
|
||||
// feeds
|
||||
normalizeEntries: (entries) => {
|
||||
|
|
|
|||
17
package-lock.json
generated
17
package-lock.json
generated
|
|
@ -1,18 +1,17 @@
|
|||
{
|
||||
"name": "coryd.dev",
|
||||
"version": "18.8.9",
|
||||
"version": "18.8.10",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "coryd.dev",
|
||||
"version": "18.8.9",
|
||||
"version": "18.8.10",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@cdransf/api-text": "^1.4.0",
|
||||
"@cdransf/select-pagination": "^1.3.1",
|
||||
"@cdransf/theme-toggle": "^1.3.2",
|
||||
"@daviddarnes/mastodon-post": "^1.3.0",
|
||||
"minisearch": "^6.3.0",
|
||||
"youtube-video-element": "^1.1.5"
|
||||
},
|
||||
|
|
@ -288,12 +287,6 @@
|
|||
"integrity": "sha512-xjsqvMT9Ee2+IDGeLSG31I0yh2Ebd4QqRfPEVn/VLk7BPB44ONj5f600z2Lor7WHfOmRg7L/bWvwWpPmgUAZ4w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@daviddarnes/mastodon-post": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@daviddarnes/mastodon-post/-/mastodon-post-1.3.0.tgz",
|
||||
"integrity": "sha512-6AMQ/tl6uI3wXknv8exYJguym/bPHxIW5XOYg7aWCQtMbP4XUDAsWp2pv4o9wtesIF8K7CssNPR93qFOh7D8lw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@jridgewell/gen-mapping": {
|
||||
"version": "0.3.5",
|
||||
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
|
||||
|
|
@ -539,9 +532,9 @@
|
|||
"peer": true
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "20.14.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.0.tgz",
|
||||
"integrity": "sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==",
|
||||
"version": "20.14.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.1.tgz",
|
||||
"integrity": "sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "coryd.dev",
|
||||
"version": "18.8.10",
|
||||
"version": "18.9.10",
|
||||
"description": "The source for my personal site. Built using 11ty.",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
|
@ -22,7 +22,6 @@
|
|||
"@cdransf/api-text": "^1.4.0",
|
||||
"@cdransf/select-pagination": "^1.3.1",
|
||||
"@cdransf/theme-toggle": "^1.3.2",
|
||||
"@daviddarnes/mastodon-post": "^1.3.0",
|
||||
"minisearch": "^6.3.0",
|
||||
"youtube-video-element": "^1.1.5"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -33,32 +33,6 @@ const fetchDataForPeriod = async (startPeriod, fields, table) => {
|
|||
return rows
|
||||
}
|
||||
|
||||
const fetchAllTimeData = async (fields, table) => {
|
||||
const PAGE_SIZE = 1000
|
||||
let rows = []
|
||||
let rangeStart = 0
|
||||
|
||||
while (true) {
|
||||
const { data, error } = await supabase
|
||||
.from(table)
|
||||
.select(fields)
|
||||
.order('listened_at', { ascending: false })
|
||||
.range(rangeStart, rangeStart + PAGE_SIZE - 1)
|
||||
|
||||
if (error) {
|
||||
console.error(error)
|
||||
break
|
||||
}
|
||||
|
||||
rows = rows.concat(data)
|
||||
|
||||
if (data.length < PAGE_SIZE) break
|
||||
rangeStart += PAGE_SIZE
|
||||
}
|
||||
|
||||
return rows
|
||||
}
|
||||
|
||||
const fetchGenreMapping = async () => {
|
||||
const { data, error } = await supabase
|
||||
.from('genres')
|
||||
|
|
@ -162,16 +136,6 @@ export default async function() {
|
|||
}
|
||||
}
|
||||
|
||||
// Fetch and aggregate all-time data
|
||||
const allTimeData = await fetchAllTimeData(selectFields, 'listens')
|
||||
results['allTime'] = {
|
||||
artists: aggregateData(allTimeData, 'artist_name', 'artists'),
|
||||
albums: aggregateData(allTimeData, 'album_name', 'albums'),
|
||||
tracks: aggregateData(allTimeData, 'track_name', 'track'),
|
||||
genres: aggregateGenres(allTimeData),
|
||||
totalTracks: allTimeData?.length?.toLocaleString('en-US')
|
||||
}
|
||||
|
||||
const recentData = await fetchDataForPeriod(DateTime.now().minus({ days: 7 }), selectFields, 'listens')
|
||||
|
||||
results['recent'] = {
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
{%- assign shareLink = postUrl | findPost:linkPosts -%}
|
||||
{%- if shareLink %}
|
||||
<script type="module" src="/assets/scripts/components/mastodon-post.js"></script>
|
||||
<template id="mastodon-post-template">
|
||||
<div class="mastodon-post-wrapper">
|
||||
<blockquote data-key="content"></blockquote>
|
||||
<dl>
|
||||
<dt>{% tablericon "refresh" "Reposts" %}</dt>
|
||||
<dd data-key="reblogs_count"></dd>
|
||||
<dt>{% tablericon "message-circle" "Replies" %}</dt>
|
||||
<dd data-key="replies_count"></dd>
|
||||
<dt>{% tablericon "star" "Favorites" %}</dt>
|
||||
<dd data-key="favourites_count"></dd>
|
||||
</dl>
|
||||
</div>
|
||||
</template>
|
||||
<span class="client-side">
|
||||
<mastodon-post>
|
||||
<a href="{{ shareLink }}">
|
||||
Discuss on Mastodon
|
||||
</a>
|
||||
</mastodon-post>
|
||||
</span>
|
||||
{% endif -%}
|
||||
|
|
@ -379,10 +379,13 @@ main {
|
|||
|
||||
.home-status,
|
||||
article {
|
||||
border-bottom: 1px solid var(--gray-light);
|
||||
margin-bottom: var(--sizing-base);
|
||||
}
|
||||
|
||||
.home-status {
|
||||
border-bottom: 1px solid var(--gray-light);
|
||||
}
|
||||
|
||||
.home-status p:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ permalink: "/feeds/all.json"
|
|||
---
|
||||
{% render "partials/feeds/json.liquid"
|
||||
permalink:'/feeds/all.json'
|
||||
title:'Follow • Cory Dransfeldt'
|
||||
title:'All activity • Cory Dransfeldt'
|
||||
data:collections.allContent
|
||||
updated:collections.allContent[0].date
|
||||
site:site
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ permalink: "/feeds/all"
|
|||
---
|
||||
{% render "partials/feeds/rss.liquid"
|
||||
permalink:"/feeds/all"
|
||||
title:"Follow • Cory Dransfeldt"
|
||||
title:"All activity • Cory Dransfeldt"
|
||||
description:"All of the posts and activity from my site."
|
||||
data:collections.allContent
|
||||
updated:collections.allContent[0].date
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
---
|
||||
title: Albums • all time
|
||||
description: All of the albums I've listened to.
|
||||
layout: default
|
||||
pagination:
|
||||
data: music.allTime.albums
|
||||
size: 24
|
||||
permalink: "/music/albums/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html"
|
||||
schema: music
|
||||
---
|
||||
<a class="back-link-header link-icon flex-centered" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" "Go back" %} Go back</a>
|
||||
{% if pagination.pageNumber == 0 %}
|
||||
<h2 class="page-header">{{ title }}</h2>
|
||||
<p>I've listened to <strong class="highlight-text">{{ music.allTime.albums.size }} albums</strong> and most of what I listen to is {{ music.allTime.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.</p>
|
||||
<p><strong class="highlight-text">See my</strong> <a href="/music/artists/all-time/">artists</a> or <a href="/music/tracks/all-time/">tracks</a> for this period.</p>
|
||||
<hr class="large-spacing" />
|
||||
{% endif %}
|
||||
{% render "partials/media/grid.liquid" data:pagination, shape: "square" %}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
---
|
||||
title: Artists • all time
|
||||
description: All of the artists I've listened to.
|
||||
layout: default
|
||||
pagination:
|
||||
data: music.allTime.artists
|
||||
size: 24
|
||||
permalink: "/music/artists/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html"
|
||||
schema: music
|
||||
---
|
||||
<a class="back-link-header link-icon flex-centered" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" "Go back" %} Go back</a>
|
||||
{% if pagination.pageNumber == 0 %}
|
||||
<h2 class="page-header">{{ title }}</h2>
|
||||
<p>I've listened to <strong class="highlight-text">{{ music.allTime.artists.size }} artists</strong> and most of what I listen to is {{ music.allTime.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.</p>
|
||||
<p><strong class="highlight-text">See my</strong> <a href="/music/albums/all-time/">albums</a> or <a href="/music/tracks/all-time/">tracks</a> for this period.</p>
|
||||
<hr class="large-spacing" />
|
||||
{% endif %}
|
||||
{% render "partials/media/grid.liquid" data:pagination, shape: "square" %}
|
||||
|
|
@ -24,7 +24,6 @@ schema: music-index
|
|||
<button class="small active" data-toggle="artists-window">This week</button>
|
||||
<button class="small secondary" data-toggle="artists-month">This month</button>
|
||||
<button class="small secondary" data-toggle="artists-three-months">3 months</button>
|
||||
<button class="small secondary" data-toggle="artists-all-time">All time</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="artists-window">
|
||||
|
|
@ -36,10 +35,7 @@ schema: music-index
|
|||
<div class="hidden" id="artists-three-months">
|
||||
{% render "partials/media/grid.liquid", data:music.threeMonth.artists, shape: "square", count: 8 %}
|
||||
</div>
|
||||
<div class="hidden" id="artists-all-time">
|
||||
{% render "partials/media/grid.liquid", data:music.allTime.artists, shape: "square", count: 8 %}
|
||||
</div>
|
||||
<p><strong class="highlight-text">More:</strong> <a href="/music/artists/this-week/" title="Artists listened to this week">This week</a> • <a href="/music/artists/this-month/" title="Artists listened to this month">This month</a> • <a href="/music/artists/three-months/" title="Artists listened to in the last 3 months">3 months</a> • <a href="/music/artists/all-time/" title="All of the artists I've listened to">All time</a></p>
|
||||
<p><strong class="highlight-text">More:</strong> <a href="/music/artists/this-week/" title="Artists listened to this week">This week</a> • <a href="/music/artists/this-month/" title="Artists listened to this month">This month</a> • <a href="/music/artists/three-months/" title="Artists listened to in the last 3 months">3 months</a></p>
|
||||
<div class="section-header-wrapper">
|
||||
<h2 id="albums" class="section-header reduced-margin flex-centered">
|
||||
{% tablericon "vinyl" "Albums" %}
|
||||
|
|
@ -49,7 +45,6 @@ schema: music-index
|
|||
<button class="small active" data-toggle="albums-window">This week</button>
|
||||
<button class="small secondary" data-toggle="albums-month">This month</button>
|
||||
<button class="small secondary" data-toggle="albums-three-months">3 months</button>
|
||||
<button class="small secondary" data-toggle="albums-all-time">All time</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="albums-window">
|
||||
|
|
@ -61,10 +56,7 @@ schema: music-index
|
|||
<div class="hidden" id="albums-three-months">
|
||||
{% render "partials/media/grid.liquid", data:music.threeMonth.albums, shape: "square", count: 8 %}
|
||||
</div>
|
||||
<div class="hidden" id="albums-all-time">
|
||||
{% render "partials/media/grid.liquid", data:music.allTime.albums, shape: "square", count: 8 %}
|
||||
</div>
|
||||
<p><strong class="highlight-text">More:</strong> <a href="/music/albums/this-week/" title="Albums listened to this week">This week</a> • <a href="/music/albums/this-month/" title="Albums listened to this month">This month</a> • <a href="/music/albums/three-months/" title="Albums listened to in the last 3 months">3 months</a> • <a href="/music/albums/all-time/" title="All of the albums I've listened to">All time</a></p>
|
||||
<p><strong class="highlight-text">More:</strong> <a href="/music/albums/this-week/" title="Albums listened to this week">This week</a> • <a href="/music/albums/this-month/" title="Albums listened to this month">This month</a> • <a href="/music/albums/three-months/" title="Albums listened to in the last 3 months">3 months</a></p>
|
||||
<div class="section-header-wrapper">
|
||||
<h2 id="tracks" class="section-header reduced-margin flex-centered">
|
||||
{% tablericon "playlist" "Tracks" %}
|
||||
|
|
@ -75,7 +67,6 @@ schema: music-index
|
|||
<button class="small secondary" data-toggle="tracks-window">This week</button>
|
||||
<button class="small secondary" data-toggle="tracks-month">This month</button>
|
||||
<button class="small secondary" data-toggle="tracks-three-months">3 months</button>
|
||||
<button class="small secondary" data-toggle="tracks-all-time">All time</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tracks-recent">
|
||||
|
|
@ -90,8 +81,5 @@ schema: music-index
|
|||
<div class="hidden" id="tracks-three-months">
|
||||
{% render "partials/media/music/chart.liquid", data:music.threeMonth.tracks, mostPlayed:music.threeMonth.tracks[0].plays, count: 10 %}
|
||||
</div>
|
||||
<div class="hidden" id="tracks-all-time">
|
||||
{% render "partials/media/music/chart.liquid", data:music.allTime.tracks, mostPlayed:music.allTime.tracks[0].plays, count: 10 %}
|
||||
</div>
|
||||
<p><strong class="highlight-text">More:</strong> <a href="/music/tracks/this-week/" title="Tracks listened to this week">This week</a> • <a href="/music/tracks/this-month/" title="Tracks listened to this month">This month</a> • <a href="/music/tracks/three-months/" title="Tracks listened to in the last 3 months">3 months</a> • <a href="/music/tracks/all-time/" title="All of the tracks I've listened to">All time</a></p>
|
||||
<p><strong class="highlight-text">More:</strong> <a href="/music/tracks/this-week/" title="Tracks listened to this week">This week</a> • <a href="/music/tracks/this-month/" title="Tracks listened to this month">This month</a> • <a href="/music/tracks/three-months/" title="Tracks listened to in the last 3 months">3 months</a></p>
|
||||
{% render "partials/media/music/releases.liquid", albumReleases:albumReleases %}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
---
|
||||
title: Artists • all time
|
||||
description: All of the tracks I've listened to.
|
||||
layout: default
|
||||
pagination:
|
||||
data: music.allTime.tracks
|
||||
size: 50
|
||||
permalink: "/music/tracks/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html"
|
||||
schema: music
|
||||
---
|
||||
<a class="back-link-header link-icon flex-centered" href="/music" title="Go back to the music index page">{% tablericon "arrow-left" "Go back" %} Go back</a>
|
||||
{% if pagination.pageNumber == 0 %}
|
||||
<h2 class="page-header">{{ title }}</h2>
|
||||
<p>I've listened to <strong class="highlight-text">{{ music.allTime.totalTracks }} tracks</strong> and most of what I've listened to has been <strong class="highlight-text">{{ music.allTime.genres | listToString: "genre", 5 }}</strong>.</p>
|
||||
<p><strong class="highlight-text">See my</strong> <a href="/music/artists/all-time/">artists</a> or <a href="/music/albums/all-time/">albums</a> for this period.</p>
|
||||
<hr class="large-spacing" />
|
||||
{% endif %}
|
||||
{% render "partials/media/music/chart.liquid" data:pagination, playTotal: music.allTime.tracks[0].plays %}
|
||||
|
|
@ -7,7 +7,6 @@ pagination:
|
|||
permalink: "{{ post.slug }}/index.html"
|
||||
schema: blog
|
||||
---
|
||||
{%- capture postUrl %}{{ meta.url }}{{ post.slug }}/{% endcapture -%}
|
||||
<article class="h-entry">
|
||||
<div class="flex-centered gap-xs icon-small icon-light">
|
||||
{% tablericon "calendar-month" "Date" %}
|
||||
|
|
@ -24,5 +23,3 @@ schema: blog
|
|||
{% render "partials/posts/blocks.liquid", blocks:post.blocks %}
|
||||
</div>
|
||||
</article>
|
||||
{% render "partials/widgets/mastodon-post.liquid", postUrl:postUrl, linkPosts:linkPosts %}
|
||||
{% render "partials/widgets/addon-links.liquid", posts:posts, analytics:analytics, links:links %}
|
||||
Reference in a new issue