From d81681e6983df014a405d4a3c2fb57362f19011d Mon Sep 17 00:00:00 2001 From: mitteneer Date: Sat, 31 May 2025 13:37:34 -0400 Subject: [PATCH] Move scrobble rank from firstlast partial to view. Eventually moving this to its own partial (probably) --- src/app/views/albums/get.zmpl | 6 ++++-- src/app/views/artists/get.zmpl | 9 +++++++-- src/app/views/partials/_firstlast_listens.zmpl | 4 +--- src/app/views/partials/_timescale.zmpl | 18 ++++++++++-------- src/app/views/songs/get.zmpl | 5 +++-- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/app/views/albums/get.zmpl b/src/app/views/albums/get.zmpl index 1024ec5..22f99d8 100644 --- a/src/app/views/albums/get.zmpl +++ b/src/app/views/albums/get.zmpl @@ -9,8 +9,10 @@ @partial partials/header -

{{.album}}

-@partial partials/firstlast_listens(scrobbles: .album.scrobbles, rank: .album.rank, firstlast: .firstlast) +

{{.album.name}}

+
{{.album.scrobbles}} scrobbles ({{.album.rank}} place)
+
{{.album.song_num}} songs
+@partial partials/firstlast_listens(firstlast: .firstlast)

Yearly Performance

@partial partials/timescale(range: .yearly)

Songs

diff --git a/src/app/views/artists/get.zmpl b/src/app/views/artists/get.zmpl index 69bd661..14976b5 100644 --- a/src/app/views/artists/get.zmpl +++ b/src/app/views/artists/get.zmpl @@ -10,9 +10,14 @@ @partial partials/header

{{.artist.name}}

-@partial partials/firstlast_listens(scrobbles: .artist.scrobbles, rank: .artist.rank, firstlast: .firstlast) -

Yearly Performance

+
+
{{.artist.scrobbles}} scrobbles ({{.artist.rank}} place)
+
{{.artist.song_num}} songs
+
{{.artist.album_num}} albums
+
@partial partials/timescale(range: .yearly) +
+@partial partials/firstlast_listens(firstlast: .firstlast)

Albums

@partial partials/newtable(T: ColumnChoices, table_data: .albums, columns: columns) diff --git a/src/app/views/partials/_firstlast_listens.zmpl b/src/app/views/partials/_firstlast_listens.zmpl index a21114b..3cf3ac9 100644 --- a/src/app/views/partials/_firstlast_listens.zmpl +++ b/src/app/views/partials/_firstlast_listens.zmpl @@ -1,12 +1,10 @@ -@args scrobbles: i64, rank: []const u8, firstlast: *ZmplValue +@args firstlast: *ZmplValue @zig { const songs = firstlast.items(.array); }
-{{scrobbles}} scrobbles ({{rank}} place) -
First listen: {{songs[0].song.name}} ({{songs[0].date}})
Most recent listen: {{songs[1].song.name}} ({{songs[1].date}}) diff --git a/src/app/views/partials/_timescale.zmpl b/src/app/views/partials/_timescale.zmpl index 9937ec6..24ef925 100644 --- a/src/app/views/partials/_timescale.zmpl +++ b/src/app/views/partials/_timescale.zmpl @@ -1,5 +1,6 @@ @args range: *ZmplValue +
@@ -8,11 +9,12 @@ -@for (range) |itm| { - - - - -} - -
{{itm.date}}:{{itm.scrobbles}}
\ No newline at end of file + @for (range) |itm| { + + {{itm.date}}: + {{itm.scrobbles}} + + } + + +
\ No newline at end of file diff --git a/src/app/views/songs/get.zmpl b/src/app/views/songs/get.zmpl index 0a051a4..5b68145 100644 --- a/src/app/views/songs/get.zmpl +++ b/src/app/views/songs/get.zmpl @@ -9,8 +9,9 @@ @partial partials/header -

{{.song}}

-@partial partials/firstlast_listens(scrobbles: .song.scrobbles, rank: .song.rank, firstlast: .firstlast) +

{{.song.name}}

+
{{.song.scrobbles}} scrobbles ({{.song.rank}} place)
+@partial partials/firstlast_listens(firstlast: .firstlast)

Yearly Performance

@partial partials/timescale(range: .yearly)

Scrobbles