From cddc4b63f1a2a4c164c3080c642c88f5fe8200d9 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Thu, 10 Apr 2025 13:59:49 -0300
Subject: content, css: coverColumnContent -> artworkColumnContent, etc

---
 src/content/dependencies/generateAlbumInfoPage.js  |  2 +-
 src/content/dependencies/generatePageLayout.js     | 16 +++++++-------
 .../dependencies/generateTrackArtworkColumn.js     | 25 ++++++++++++++++++++++
 .../dependencies/generateTrackCoverArtworks.js     | 25 ----------------------
 src/content/dependencies/generateTrackInfoPage.js  | 12 +++++------
 5 files changed, 39 insertions(+), 41 deletions(-)
 create mode 100644 src/content/dependencies/generateTrackArtworkColumn.js
 delete mode 100644 src/content/dependencies/generateTrackCoverArtworks.js

(limited to 'src/content')

diff --git a/src/content/dependencies/generateAlbumInfoPage.js b/src/content/dependencies/generateAlbumInfoPage.js
index 51329450..51632c99 100644
--- a/src/content/dependencies/generateAlbumInfoPage.js
+++ b/src/content/dependencies/generateAlbumInfoPage.js
@@ -116,7 +116,7 @@ export default {
 
         additionalNames: relations.additionalNamesBox,
 
-        coverColumnContent: [
+        artworkColumnContent: [
           (relations.cover
             ? relations.cover.slots({
                 showOriginDetails: true,
diff --git a/src/content/dependencies/generatePageLayout.js b/src/content/dependencies/generatePageLayout.js
index 9348acd8..070c7c82 100644
--- a/src/content/dependencies/generatePageLayout.js
+++ b/src/content/dependencies/generatePageLayout.js
@@ -93,7 +93,7 @@ export default {
       mutable: false,
     },
 
-    coverColumnContent: {
+    artworkColumnContent: {
       type: 'html',
       mutable: false,
     },
@@ -262,15 +262,15 @@ export default {
         ? data.canonicalBase + pagePathStringFromRoot
         : null);
 
-    const firstItemInCoverColumn =
-      html.smooth(slots.coverColumnContent)
+    const firstItemInArtworkColumn =
+      html.smooth(slots.artworkColumnContent)
         .content[0];
 
     const primaryCover =
-      (firstItemInCoverColumn &&
-       html.resolve(firstItemInCoverColumn, {normalize: 'tag'})
+      (firstItemInArtworkColumn &&
+       html.resolve(firstItemInArtworkColumn, {normalize: 'tag'})
          .attributes.has('class', 'cover-artwork')
-        ? firstItemInCoverColumn
+        ? firstItemInArtworkColumn
         : null);
 
     const titleContentsHTML =
@@ -327,11 +327,11 @@ export default {
         [
           titleHTML,
 
-          html.tag('div', {id: 'cover-art-column'},
+          html.tag('div', {id: 'artwork-column'},
             {[html.onlyIfContent]: true},
             {class: 'isolate-tooltip-z-indexing'},
 
-            slots.coverColumnContent),
+            slots.artworkColumnContent),
 
           subtitleHTML,
 
diff --git a/src/content/dependencies/generateTrackArtworkColumn.js b/src/content/dependencies/generateTrackArtworkColumn.js
new file mode 100644
index 00000000..1cd5bff0
--- /dev/null
+++ b/src/content/dependencies/generateTrackArtworkColumn.js
@@ -0,0 +1,25 @@
+export default {
+  contentDependencies: ['generateTrackCoverArtwork'],
+
+  relations: (relation, track) => ({
+    albumCover:
+      (!track.hasUniqueCoverArt && track.album.hasCoverArt
+        ? relation('generateTrackCoverArtwork', track.album.coverArtworks[0])
+        : null),
+
+    trackCovers:
+      (track.hasUniqueCoverArt
+        ? track.trackArtworks.map(artwork =>
+            relation('generateTrackCoverArtwork', artwork))
+        : null),
+  }),
+
+  generate: (relations) =>
+    [relations.albumCover, ...relations.trackCovers ?? []]
+      .filter(Boolean)
+      .map(cover =>
+        cover.slots({
+          showOriginDetails: true,
+          showReferenceLinks: true,
+        })),
+};
diff --git a/src/content/dependencies/generateTrackCoverArtworks.js b/src/content/dependencies/generateTrackCoverArtworks.js
deleted file mode 100644
index 1cd5bff0..00000000
--- a/src/content/dependencies/generateTrackCoverArtworks.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export default {
-  contentDependencies: ['generateTrackCoverArtwork'],
-
-  relations: (relation, track) => ({
-    albumCover:
-      (!track.hasUniqueCoverArt && track.album.hasCoverArt
-        ? relation('generateTrackCoverArtwork', track.album.coverArtworks[0])
-        : null),
-
-    trackCovers:
-      (track.hasUniqueCoverArt
-        ? track.trackArtworks.map(artwork =>
-            relation('generateTrackCoverArtwork', artwork))
-        : null),
-  }),
-
-  generate: (relations) =>
-    [relations.albumCover, ...relations.trackCovers ?? []]
-      .filter(Boolean)
-      .map(cover =>
-        cover.slots({
-          showOriginDetails: true,
-          showReferenceLinks: true,
-        })),
-};
diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js
index d2cdf416..7d531124 100644
--- a/src/content/dependencies/generateTrackInfoPage.js
+++ b/src/content/dependencies/generateTrackInfoPage.js
@@ -11,7 +11,7 @@ export default {
     'generateContributionList',
     'generatePageLayout',
     'generateTrackArtistCommentarySection',
-    'generateTrackCoverArtworks',
+    'generateTrackArtworkColumn',
     'generateTrackInfoPageFeaturedByFlashesList',
     'generateTrackInfoPageOtherReleasesList',
     'generateTrackList',
@@ -58,10 +58,8 @@ export default {
     additionalNamesBox:
       relation('generateAdditionalNamesBox', track.additionalNames),
 
-    covers:
-      (track.hasUniqueCoverArt || track.album.hasCoverArt
-        ? relation('generateTrackCoverArtworks', track)
-        : null),
+    artworkColumn:
+      relation('generateTrackArtworkColumn', track),
 
     contentHeading:
       relation('generateContentHeading'),
@@ -141,8 +139,8 @@ export default {
         color: data.color,
         styleRules: [relations.albumStyleRules],
 
-        coverColumnContent:
-          relations.covers,
+        artworkColumnContent:
+          relations.artworkColumn,
 
         mainContent: [
           relations.releaseInfo,
-- 
cgit 1.3.0-6-gf8a5