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

chore: filter to query

Browse source
This commit is contained in:
Cory Dransfeldt 2024-10-13 15:10:37 -07:00
parent eec1caa321
commit ed65bb8127
No known key found for this signature in database
5 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/filters/media.js
View file

@ -49,6 +49,5 @@ export default {
} }
return `${allButLast} and ${last}` return `${allButLast} and ${last}`
}, }
formatVenue: (venue) => venue.split(',')[0].trim()
} }

4
src/pages/dynamic/music/artists/artist.html
View file

@ -78,9 +78,9 @@ schema: artist
{%- capture venue -%} {%- capture venue -%}
{% if concert.venue_name %} {% if concert.venue_name %}
{% if concert.venue_latitude and concert.venue_longitude %} {% if concert.venue_latitude and concert.venue_longitude %}
<a href="https://www.openstreetmap.org/?mlat={{ concert.venue_latitude }}&mlon={{ concert.venue_longitude }}#map=18/{{ concert.venue_latitude }}/{{ concert.venue_longitude }}">{{ concert.venue_name | formatVenue }}</a> <a href="https://www.openstreetmap.org/?mlat={{ concert.venue_latitude }}&mlon={{ concert.venue_longitude }}#map=18/{{ concert.venue_latitude }}/{{ concert.venue_longitude }}">{{ concert.venue_name_short }}</a>
{% else %} {% else %}
{{ concert.venue_name | formatVenue }} {{ concert.venue_name_short }}
{% endif %} {% endif %}
{% endif %} {% endif %}
{%- endcapture -%} {%- endcapture -%}

4
src/pages/dynamic/music/concerts.html
View file

@ -24,9 +24,9 @@ permalink: "/music/concerts/{% if pagination.pageNumber > 0 %}{{ pagination.page
{%- capture venue -%} {%- capture venue -%}
{% if concert.venue.name %} {% if concert.venue.name %}
{% if concert.venue.latitude and concert.venue.longitude %} {% if concert.venue.latitude and concert.venue.longitude %}
<a href="https://www.openstreetmap.org/?mlat={{ concert.venue.latitude }}&mlon={{ concert.venue.longitude }}#map=18/{{ concert.venue.latitude }}/{{ concert.venue.longitude }}">{{ concert.venue.name | formatVenue }}</a> <a href="https://www.openstreetmap.org/?mlat={{ concert.venue.latitude }}&mlon={{ concert.venue.longitude }}#map=18/{{ concert.venue.latitude }}/{{ concert.venue.longitude }}">{{ concert.venue.name_short }}</a>
{% else %} {% else %}
{{ concert.venue.name | formatVenue }} {{ concert.venue.name_short }}
{% endif %} {% endif %}
{% endif %} {% endif %}
{%- endcapture -%} {%- endcapture -%}

5
views/media/music/artists.psql
View file

@ -41,6 +41,7 @@ SELECT
'id', c.id, 'id', c.id,
'date', c.date, 'date', c.date,
'venue_name', v.name, 'venue_name', v.name,
'venue_name_short', trim(split_part(v.name, ',', 1)),
'venue_latitude', v.latitude, 'venue_latitude', v.latitude,
'venue_longitude', v.longitude, 'venue_longitude', v.longitude,
'notes', c.notes 'notes', c.notes
@ -65,9 +66,7 @@ SELECT
SELECT json_agg(json_build_object( SELECT json_agg(json_build_object(
'title', m.title, 'title', m.title,
'year', m.year, 'year', m.year,
'url', m.slug, 'url', m.slug
'rating', m.rating,
'favorite', m.favorite
) ORDER BY m.year DESC) ) ORDER BY m.year DESC)
FROM movies_artists ma FROM movies_artists ma
LEFT JOIN movies m ON ma.movies_id = m.id LEFT JOIN movies m ON ma.movies_id = m.id

5
views/media/music/concerts.psql
View file

@ -3,10 +3,6 @@ SELECT
c.id, c.id,
c.date, c.date,
c.notes, c.notes,
'I went to (yet another) concert!' AS description,
'concert' AS type,
CONCAT('/music/concerts?id=', c.id) AS url,
CASE CASE
WHEN c.artist IS NOT NULL THEN WHEN c.artist IS NOT NULL THEN
@ -23,6 +19,7 @@ SELECT
json_build_object( json_build_object(
'name', v.name, 'name', v.name,
'name_short', trim(split_part(v.name, ',', 1)),
'latitude', v.latitude, 'latitude', v.latitude,
'longitude', v.longitude, 'longitude', v.longitude,
'notes', v.notes 'notes', v.notes