From d7372a518e13ea4ab06beef68227a2e50b443c73 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Mon, 8 Jul 2024 05:01:13 +0200
Subject: [PATCH] Minor channel logo fixes.

---
 components/entities/tile.vue         |  2 +-
 components/scenes/scenes.vue         |  1 +
 pages/entities/+Page.vue             |  9 ++++++---
 pages/entities/@entitySlug/+Page.vue | 10 ++++++++--
 pages/scene/+Page.vue                |  8 +++++++-
 src/scenes.js                        |  3 ++-
 static                               |  2 +-
 7 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/components/entities/tile.vue b/components/entities/tile.vue
index ec289ec..07769c6 100644
--- a/components/entities/tile.vue
+++ b/components/entities/tile.vue
@@ -1,7 +1,7 @@
 <template>
 	<a
 		:href="`/${entity.type}/${entity.slug}`"
-		class="entity"
+		class="entity nolink"
 	>
 		<img
 			v-if="entity.hasLogo"
diff --git a/components/scenes/scenes.vue b/components/scenes/scenes.vue
index 8b2436a..b1f1839 100644
--- a/components/scenes/scenes.vue
+++ b/components/scenes/scenes.vue
@@ -348,6 +348,7 @@ function updateFilter(prop, value, reload = true) {
 	display: grid;
     grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
 	gap: .5rem;
+	flex-grow: 1;
 	padding: .5rem 1rem 1rem 1rem;
 
 	:deep(.campaign) .campaign-banner {
diff --git a/pages/entities/+Page.vue b/pages/entities/+Page.vue
index 6b02907..e8c9374 100644
--- a/pages/entities/+Page.vue
+++ b/pages/entities/+Page.vue
@@ -32,7 +32,7 @@
 				>
 					<a
 						:href="`/${network.type}/${network.slug}`"
-						class="network"
+						class="network nolink"
 					>
 						<img
 							v-if="network.hasLogo"
@@ -41,7 +41,10 @@
 							class="logo"
 						>
 
-						<span v-else>{{ network.name }}</span>
+						<span
+							v-else
+							class="ellipsis"
+						>{{ network.name }}</span>
 
 						<Icon
 							v-if="pageContext.urlParsed.search.q && network.type === 'network'"
@@ -167,7 +170,7 @@ async function search() {
 	border-radius: .5rem;
 	background: var(--shadow-strong-30);
 	color: var(--text-light);
-	font-size: 1.25rem;
+	font-size: 1.5rem;
 	font-weight: bold;
 	overflow: hidden;
 
diff --git a/pages/entities/@entitySlug/+Page.vue b/pages/entities/@entitySlug/+Page.vue
index 1b20278..4662bf7 100644
--- a/pages/entities/@entitySlug/+Page.vue
+++ b/pages/entities/@entitySlug/+Page.vue
@@ -5,7 +5,7 @@
 				:href="entityUrl"
 				target="_blank"
 				rel="noopener"
-				class="link link-child"
+				class="link-child nolink"
 				:data-umami-event="entity.affiliate ? 'entity-click-aff' : 'entity-click'"
 				:data-umami-event-aff-id="entity.affiliate?.id"
 				:data-umami-event-entity="entity.slug"
@@ -39,7 +39,7 @@
 			<a
 				v-if="entity.parent"
 				:href="`/${entity.parent.type}/${entity.parent.slug}`"
-				class="link link-parent"
+				class="link-parent nolink"
 			>
 				<img
 					v-if="entity.parent.hasLogo"
@@ -164,6 +164,12 @@ const entityUrl = (() => {
 	}
 }
 
+.name {
+	display: block;
+	padding: 1rem;
+	margin: 0;
+}
+
 .logo {
 	height: 2rem;
 	max-width: 15rem;
diff --git a/pages/scene/+Page.vue b/pages/scene/+Page.vue
index c67a6fb..63ff745 100644
--- a/pages/scene/+Page.vue
+++ b/pages/scene/+Page.vue
@@ -80,13 +80,18 @@
 						by
 						<Link
 							:href="`/${scene.network.type}/${scene.network.slug}`"
-							class="network-link entity-link"
+							class="network-link entity-link nolink"
 						>
 							<img
 								v-if="scene.network.hasLogo"
 								:src="`/logos/${scene.network.slug}/thumbs/network.png`"
 								class="network-logo entity-logo"
 							>
+
+							<span
+								v-else
+								class="name"
+							>{{ scene.network.name }}</span>
 						</Link>
 					</span>
 				</div>
@@ -563,6 +568,7 @@ function copySummary() {
 	box-sizing: border-box;
 	padding: .5rem 1rem;
 	height: 100%;
+	color: var(--text-light);
 }
 
 .entity-logo {
diff --git a/src/scenes.js b/src/scenes.js
index ad96013..e25b67e 100644
--- a/src/scenes.js
+++ b/src/scenes.js
@@ -76,7 +76,7 @@ function curateScene(rawScene, assets) {
 			slug: assets.channel.network_slug,
 			name: assets.channel.network_name,
 			type: assets.channel.network_type,
-			hasLogo: assets.channel.has_logo,
+			hasLogo: assets.channel.network_has_logo,
 		} : null,
 		affiliate: assets.channel.affiliate ? {
 			id: assets.channel.affiliate.id,
@@ -151,6 +151,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
 				'networks.slug as network_slug',
 				'networks.name as network_name',
 				'networks.type as network_type',
+				'networks.has_logo as network_has_logo',
 				knex.raw('row_to_json(affiliates) as affiliate'),
 			)
 			.whereIn('releases.id', sceneIds)
diff --git a/static b/static
index af96f9b..32b1ad8 160000
--- a/static
+++ b/static
@@ -1 +1 @@
-Subproject commit af96f9b932db799ec8d067d4a5c9379f8363d2b0
+Subproject commit 32b1ad8cfa8c6f3a0bcb42472f51b50273cd8866