Added movies page to actors, entities and tags.

pages/entities/@entitySlug/+Page.vue

@@ -36,6 +36,13 @@
 				>{{ entity.name }}</h2>
 			</a>
 
+			<Domains
+				:domain="domain"
+				:path="`/${entity.type}/${entity.slug}`"
+				:domains="['scenes', 'movies']"
+				class="domains-header"
+			/>
+
 			<a
 				v-if="entity.parent"
 				:href="`/${entity.parent.type}/${entity.parent.slug}`"
@@ -61,6 +68,13 @@
 		</div>
 
 		<div class="content">
+			<Domains
+				:domain="domain"
+				:path="`/${entity.type}/${entity.slug}`"
+				:domains="['scenes', 'movies']"
+				class="domains-bar"
+			/>
+
 			<div class="children-container">
 				<ul
 					v-if="entity.children.length > 0"
@@ -98,7 +112,8 @@
 				</div>
 			</div>
 
-			<Scenes />
+			<Scenes v-if="domain === 'scenes'" />
+			<Movies v-if="domain === 'movies'" />
 		</div>
 	</div>
 </template>
@@ -108,14 +123,17 @@ import { ref, computed, inject } from 'vue';
 
 import EntityTile from '#/components/entities/tile.vue';
 import Scenes from '#/components/scenes/scenes.vue';
+import Movies from '#/components/movies/movies.vue';
+import Domains from '#/components/domains/domains.vue';
 
-const { pageProps } = inject('pageContext');
+const { pageProps, routeParams } = inject('pageContext');
 const { entity } = pageProps;
 
 const children = ref(null);
 const expanded = ref(false);
 
 const scrollable = computed(() => children.value?.scrollWidth > children.value?.clientWidth);
+const domain = routeParams.domain;
 
 const entityUrl = (() => {
 	if (!entity.url) {
@@ -173,7 +191,7 @@ const entityUrl = (() => {
 .logo {
 	height: 2rem;
 	max-width: 15rem;
-	padding: .75rem 1rem;
+	padding: .5rem 1rem;
 	object-fit: contain;
 }
 
@@ -184,7 +202,7 @@ const entityUrl = (() => {
 
 .favicon {
 	display: none;
-	padding: .75rem 1rem;
+	padding: .5rem 1rem;
 	height: 1.5rem;
 }
 
@@ -256,6 +274,29 @@ const entityUrl = (() => {
 	}
 }
 
+.domains-bar {
+	display: none;
+}
+
+@media(--small-20) {
+	.logo {
+		padding: .5rem 1rem;
+	}
+
+	.favicon {
+		height: 1rem;
+		padding: .5rem 1rem;
+	}
+
+	.domains-header {
+		display: none;
+	}
+
+	.domains-bar {
+		display: flex;
+	}
+}
+
 @media(--compact) {
 	.logo {
 		height: 1.25rem;
@@ -277,15 +318,4 @@ const entityUrl = (() => {
 		margin-right: 1rem;
 	}
 }
-
-@media(--small-20) {
-	.logo {
-		padding: .5rem 1rem;
-	}
-
-	.favicon {
-		height: 1rem;
-		padding: .5rem 1rem;
-	}
-}
 </style>

pages/entities/@entitySlug/+onBeforeRender.js

@@ -2,10 +2,38 @@ import { render } from 'vike/abort'; /* eslint-disable-line import/extensions */
 
 import { fetchEntitiesById } from '#/src/entities.js';
 import { fetchScenes } from '#/src/scenes.js';
+import { fetchMovies } from '#/src/movies.js';
 import { curateScenesQuery } from '#/src/web/scenes.js';
-import { getRandomCampaigns } from '#/src/campaigns.js';
+import { curateMoviesQuery } from '#/src/web/movies.js';
+import { getRandomCampaigns, getCampaignIndex } from '#/src/campaigns.js';
 import redis from '#/src//redis.js';
 
+async function fetchReleases(pageContext, entityId) {
+	if (pageContext.routeParams.domain === 'movies') {
+		return fetchMovies(await curateMoviesQuery({
+			...pageContext.urlQuery,
+			scope: pageContext.routeParams.scope || 'latest',
+			entityId: Number(entityId),
+			tagFilter: pageContext.tagFilter,
+		}), {
+			page: Number(pageContext.routeParams.page) || 1,
+			limit: Number(pageContext.urlParsed.search.limit) || 30,
+			aggregate: true,
+		}, pageContext.user);
+	}
+
+	return fetchScenes(await curateScenesQuery({
+		...pageContext.urlQuery,
+		scope: pageContext.routeParams.scope || 'latest',
+		entityId: Number(entityId),
+		tagFilter: pageContext.tagFilter,
+	}), {
+		page: Number(pageContext.routeParams.page) || 1,
+		limit: Number(pageContext.urlParsed.search.limit) || 30,
+		aggregate: true,
+	}, pageContext.user);
+}
+
 export async function onBeforeRender(pageContext) {
 	const entityId = await redis.hGet('traxxx:entities:id_by_slug', pageContext.routeParams.entityType === 'network' ? `_${pageContext.routeParams.entitySlug}` : pageContext.routeParams.entitySlug);
 
@@ -15,19 +43,10 @@ export async function onBeforeRender(pageContext) {
 
 	const [
 		[entity],
-		entityScenes,
+		entityReleases,
 	] = await Promise.all([
 		fetchEntitiesById([Number(entityId)], { includeChildren: true }),
-		fetchScenes(await curateScenesQuery({
-			...pageContext.urlQuery,
-			scope: pageContext.routeParams.scope || 'latest',
-			entityId: Number(entityId),
-			tagFilter: pageContext.tagFilter,
-		}), {
-			page: Number(pageContext.routeParams.page) || 1,
-			limit: Number(pageContext.urlParsed.search.limit) || 30,
-			aggregate: true,
-		}, pageContext.user),
+		fetchReleases(pageContext, entityId),
 	]);
 
 	const campaigns = await getRandomCampaigns([
@@ -36,37 +55,35 @@ export async function onBeforeRender(pageContext) {
 			minRatio: 1.5,
 			allowRandomFallback: false,
 		},
-		{
-			entityIds: [entity.id, entity.parent?.id].filter(Boolean),
-			minRatio: 0.75,
-			maxRatio: 1.25,
-			allowRandomFallback: false,
-		},
 		{
 			entityIds: [entity.id, entity.parent?.id].filter(Boolean),
 			minRatio: 1.5,
 			allowRandomFallback: false,
 		},
-	], { tagFilter: pageContext.tagFilter });
+		pageContext.routeParams.domain === 'scenes' ? {
+			entityIds: [entity.id, entity.parent?.id].filter(Boolean),
+			minRatio: 0.75,
+			maxRatio: 1.25,
+			allowRandomFallback: false,
+		} : null,
+	].filter(Boolean), { tagFilter: pageContext.tagFilter });
 
-	const {
-		scenes,
-	} = entityScenes;
+	const releases = entityReleases.scenes || entityReleases.movies;
 
-	const campaignIndex = Math.floor((Math.random() * (0.5 - 0.2) + 0.2) * scenes.length);
-	const [metaCampaign, sceneCampaign, paginationCampaign] = campaigns;
+	const campaignIndex = getCampaignIndex(releases.length);
+	const [metaCampaign, paginationCampaign, sceneCampaign] = campaigns;
 
 	return {
 		pageContext: {
 			title: entity.name,
 			pageProps: {
 				entity,
-				...entityScenes,
+				...entityReleases,
 			},
 			campaigns: {
 				index: campaignIndex,
 				meta: metaCampaign,
-				scenes: scenes.length > 5 && sceneCampaign,
+				scenes: releases.length > 5 && sceneCampaign,
 				pagination: paginationCampaign,
 			},
 		},

pages/entities/@entitySlug/+route.js

@@ -1,7 +1,7 @@
 import { match } from 'path-to-regexp';
 // import { resolveRoute } from 'vike/routing'; // eslint-disable-line import/extensions
 
-const path = '/:entityType(channel|network)/:entitySlug/:scope?/:page?';
+const path = '/:entityType(channel|network)/:entitySlug/:domain(scenes|movies|series)?/:scope?/:page?';
 const urlMatch = match(path, { decode: decodeURIComponent });
 
 export default (pageContext) => {
@@ -12,6 +12,7 @@ export default (pageContext) => {
 			routeParams: {
 				entityType: matched.params.entityType,
 				entitySlug: matched.params.entitySlug,
+				domain: matched.params.domain || 'scenes',
 				scope: matched.params.scope || 'latest',
 				page: matched.params.page || '1',
 				path,