Added movies page to actors, entities and tags.
This commit is contained in:
@@ -11,7 +11,15 @@
|
||||
v-html="description"
|
||||
/>
|
||||
|
||||
<Scenes />
|
||||
<Domains
|
||||
:path="`/tag/${tag.slug}`"
|
||||
:domains="['scenes', 'movies']"
|
||||
:domain="domain"
|
||||
class="domains-bar"
|
||||
/>
|
||||
|
||||
<Scenes v-if="domain === 'scenes'" />
|
||||
<Movies v-if="domain === 'movies'" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -20,9 +28,13 @@
|
||||
import { inject } from 'vue';
|
||||
|
||||
import Scenes from '#/components/scenes/scenes.vue';
|
||||
import Movies from '#/components/movies/movies.vue';
|
||||
import Domains from '#/components/domains/domains.vue';
|
||||
|
||||
const pageContext = inject('pageContext');
|
||||
const { tag, description } = pageContext.pageProps;
|
||||
|
||||
const domain = pageContext.routeParams.domain;
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@@ -34,11 +46,14 @@ const { tag, description } = pageContext.pageProps;
|
||||
<style scoped>
|
||||
.page {
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-grow: 1;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
@@ -3,17 +3,16 @@ import markdownItClass from '@toycode/markdown-it-class';
|
||||
|
||||
import { fetchTagsById } from '#/src/tags.js';
|
||||
import { fetchScenes } from '#/src/scenes.js';
|
||||
import { fetchMovies } from '#/src/movies.js';
|
||||
import { curateScenesQuery } from '#/src/web/scenes.js';
|
||||
import { curateMoviesQuery } from '#/src/web/movies.js';
|
||||
import { getRandomCampaigns, getCampaignIndex } from '#/src/campaigns.js';
|
||||
|
||||
const md = markdownIt().use(markdownItClass, { a: 'link' });
|
||||
|
||||
export async function onBeforeRender(pageContext) {
|
||||
const tagSlug = pageContext.routeParams.tagSlug;
|
||||
|
||||
const [[tag], tagScenes, campaigns] = await Promise.all([
|
||||
fetchTagsById([tagSlug]),
|
||||
fetchScenes(await curateScenesQuery({
|
||||
async function fetchReleases(pageContext) {
|
||||
if (pageContext.routeParams.domain === 'movies') {
|
||||
return fetchMovies(await curateMoviesQuery({
|
||||
...pageContext.urlQuery,
|
||||
scope: pageContext.routeParams.scope || 'latest',
|
||||
tagSlug: pageContext.routeParams.tagSlug,
|
||||
@@ -22,22 +21,41 @@ export async function onBeforeRender(pageContext) {
|
||||
page: Number(pageContext.routeParams.page) || 1,
|
||||
limit: Number(pageContext.urlParsed.search.limit) || 30,
|
||||
aggregate: true,
|
||||
}, pageContext.user),
|
||||
}, pageContext.user);
|
||||
}
|
||||
|
||||
return fetchScenes(await curateScenesQuery({
|
||||
...pageContext.urlQuery,
|
||||
scope: pageContext.routeParams.scope || 'latest',
|
||||
tagSlug: pageContext.routeParams.tagSlug,
|
||||
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 tagSlug = pageContext.routeParams.tagSlug;
|
||||
|
||||
const [[tag], tagReleases, campaigns] = await Promise.all([
|
||||
fetchTagsById([tagSlug]),
|
||||
fetchReleases(pageContext),
|
||||
getRandomCampaigns([
|
||||
{ tagSlugs: [tagSlug], minRatio: 1.5 },
|
||||
{ tagSlugs: [tagSlug], minRatio: 0.75, maxRatio: 1.25 },
|
||||
{ tagSlugs: [tagSlug], minRatio: 1.5 },
|
||||
], { tagFilter: pageContext.tagFilter }),
|
||||
pageContext.routeParams.domain === 'scenes'
|
||||
? { tagSlugs: [tagSlug], minRatio: 0.75, maxRatio: 1.25 }
|
||||
: null,
|
||||
].filter(Boolean), { tagFilter: pageContext.tagFilter }),
|
||||
]);
|
||||
|
||||
const {
|
||||
scenes,
|
||||
} = tagScenes;
|
||||
|
||||
const releases = tagReleases.scenes || tagReleases.movies;
|
||||
const description = tag.description && md.renderInline(tag.description);
|
||||
|
||||
const campaignIndex = getCampaignIndex(scenes.length);
|
||||
const [metaCampaign, sceneCampaign, paginationCampaign] = campaigns;
|
||||
const campaignIndex = getCampaignIndex(releases.length);
|
||||
const [metaCampaign, paginationCampaign, sceneCampaign] = campaigns;
|
||||
|
||||
return {
|
||||
pageContext: {
|
||||
@@ -45,12 +63,12 @@ export async function onBeforeRender(pageContext) {
|
||||
pageProps: {
|
||||
tag,
|
||||
description,
|
||||
...tagScenes,
|
||||
...tagReleases,
|
||||
},
|
||||
campaigns: {
|
||||
index: campaignIndex,
|
||||
meta: metaCampaign,
|
||||
scenes: scenes.length > 5 && sceneCampaign,
|
||||
scenes: releases.length > 5 && sceneCampaign,
|
||||
pagination: paginationCampaign,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { match } from 'path-to-regexp';
|
||||
// import { resolveRoute } from 'vike/routing'; // eslint-disable-line import/extensions
|
||||
|
||||
const path = '/tag/:tagSlug?/:scope?/:page?';
|
||||
const path = '/tag/:tagSlug?/:domain(scenes|movies)?/:scope?/:page?';
|
||||
const urlMatch = match(path, { decode: decodeURIComponent });
|
||||
|
||||
export default (pageContext) => {
|
||||
@@ -11,6 +11,7 @@ export default (pageContext) => {
|
||||
return {
|
||||
routeParams: {
|
||||
tagSlug: matched.params.tagSlug,
|
||||
domain: matched.params.domain || 'scenes',
|
||||
scope: matched.params.scope || 'latest',
|
||||
page: matched.params.page || '1',
|
||||
path,
|
||||
|
||||
Reference in New Issue
Block a user