Added WIP campaigns. Fixed entity tiles using full logo.

This commit is contained in:
DebaucheryLibrarian 2024-06-12 02:34:13 +02:00
parent b2dadf1693
commit 50ff352067
11 changed files with 136 additions and 12 deletions

View File

@ -104,6 +104,7 @@ const favorited = ref(props.actor.stashes.some((actorStash) => actorStash.id ===
border-radius: .25rem; border-radius: .25rem;
box-shadow: 0 0 3px var(--shadow-weak-30); box-shadow: 0 0 3px var(--shadow-weak-30);
overflow: hidden; overflow: hidden;
background: var(--background);
&:hover { &:hover {
box-shadow: 0 0 3px var(--shadow-weak-20); box-shadow: 0 0 3px var(--shadow-weak-20);

View File

@ -0,0 +1,51 @@
<template>
<div class="campaign">
<a
:href="campaign.url"
target="_blank"
class="campaign-link"
>
<img
v-if="campaign.banner"
:src="getBanner(campaign)"
class="campaign-banner"
>
</a>
</div>
</template>
<script setup>
const props = defineProps({
campaign: {
type: Object,
default: null,
},
});
console.log(props.campaign?.banner);
function getBanner(campaign) {
if (campaign.banner.entity.type === 'network' || !campaign.banner.entity.parent) {
return `/banners/${campaign.banner.entity.slug}/${campaign.banner.id}.${campaign.banner.type || 'jpg'}`;
}
if (campaign.banner.entity.type === 'channel' && campaign.banner.entity.parent?.type === 'network') {
return `/banners/${campaign.banner.entity.parent.slug}/${campaign.banner.entity.slug}/${campaign.banner.id}.${campaign.banner.type || 'jpg'}`;
}
return null;
}
</script>
<style scoped>
.campaign {
height: 100%;
display: flex;
justify-content: center;
}
.campaign-banner {
max-height: 100%;
max-width: 100%;
}
</style>

View File

@ -5,7 +5,7 @@
> >
<img <img
v-if="entity.hasLogo" v-if="entity.hasLogo"
:src="entity.type === 'network' || entity.isIndependent ? `/logos/${entity.slug}/network.png` : `/logos/${entity.parent?.slug}/${entity.slug}.png`" :src="entity.type === 'network' || entity.isIndependent ? `/logos/${entity.slug}/thumbs/network.png` : `/logos/${entity.parent?.slug}/thumbs/${entity.slug}.png`"
:alt="entity.name" :alt="entity.name"
class="logo" class="logo"
> >
@ -33,7 +33,7 @@ defineProps({
box-sizing: border-box; box-sizing: border-box;
padding: 1rem; padding: 1rem;
border-radius: .5rem; border-radius: .5rem;
background: var(--shadow-strong-40); background: var(--shadow-strong-30);
color: var(--text-light); color: var(--text-light);
font-size: 1.25rem; font-size: 1.25rem;
font-weight: bold; font-weight: bold;

View File

@ -438,7 +438,7 @@ function blurSearch(event) {
width: 1.25rem; width: 1.25rem;
padding-left: 1rem; padding-left: 1rem;
height: 100%; height: 100%;
fill: var(--glass-strong-20); fill: var(--glass);
} }
.notifs-trigger { .notifs-trigger {

View File

@ -105,12 +105,21 @@
<ul <ul
class="scenes nolist" class="scenes nolist"
> >
<template v-for="item in campaignScenes">
<li <li
v-for="scene in scenes" v-if="item === 'campaign' && campaign"
:key="`scene-${scene.id}`" :key="`campaign-${item.id}`"
> >
<SceneTile :scene="scene" /> <Campaign :campaign="campaign" />
</li> </li>
<li
v-else
:key="`scene-${item.id}`"
>
<SceneTile :scene="item" />
</li>
</template>
</ul> </ul>
<Pagination <Pagination
@ -140,6 +149,7 @@ import ActorsFilter from '#/components/filters/actors.vue';
import TagsFilter from '#/components/filters/tags.vue'; import TagsFilter from '#/components/filters/tags.vue';
import ChannelsFilter from '#/components/filters/channels.vue'; import ChannelsFilter from '#/components/filters/channels.vue';
import SceneTile from '#/components/scenes/tile.vue'; import SceneTile from '#/components/scenes/tile.vue';
import Campaign from '#/components/campaigns/campaign.vue';
import Pagination from '#/components/pagination/pagination.vue'; import Pagination from '#/components/pagination/pagination.vue';
import Ellipsis from '#/components/loading/ellipsis.vue'; import Ellipsis from '#/components/loading/ellipsis.vue';
@ -196,6 +206,10 @@ const filters = ref({
actors: queryActors, actors: queryActors,
}); });
const campaign = pageProps.campaigns?.scenes;
const campaignIndex = pageProps.campaigns?.index;
const campaignScenes = scenes.value.flatMap((scene, index) => (index === campaignIndex ? ['campaign', scene] : scene));
function getPath(targetScope, preserveQuery) { function getPath(targetScope, preserveQuery) {
const path = parse(routeParams.path).map((segment) => { const path = parse(routeParams.path).map((segment) => {
if (segment.name === 'scope') { if (segment.name === 'scope') {

View File

@ -115,7 +115,7 @@ async function login() {
} }
onMounted(() => { onMounted(() => {
userInput.value.focus(); userInput.value?.focus();
}); });
</script> </script>

View File

@ -87,6 +87,7 @@ const popularNetworks = [
'hussiepass', 'hussiepass',
'julesjordan', 'julesjordan',
'kink', 'kink',
'mikeadriano',
'mofos', 'mofos',
'naughtyamerica', 'naughtyamerica',
'newsensations', 'newsensations',

View File

@ -709,6 +709,7 @@ function copySummary() {
.detail { .detail {
display: flex; display: flex;
align-items: stretch; align-items: stretch;
flex-direction: row;
} }
.input { .input {

View File

@ -1,5 +1,6 @@
import { fetchScenes } from '#/src/scenes.js'; import { fetchScenes } from '#/src/scenes.js';
import { curateScenesQuery } from '#/src/web/scenes.js'; import { curateScenesQuery } from '#/src/web/scenes.js';
import { getRandomCampaign } from '#/src/campaigns.js';
export async function onBeforeRender(pageContext) { export async function onBeforeRender(pageContext) {
const withQuery = Object.hasOwn(pageContext.urlParsed.search, 'q'); const withQuery = Object.hasOwn(pageContext.urlParsed.search, 'q');
@ -18,10 +19,14 @@ export async function onBeforeRender(pageContext) {
tagFilter: pageContext.tagFilter, tagFilter: pageContext.tagFilter,
}), { }), {
page: Number(pageContext.routeParams.page) || 1, page: Number(pageContext.routeParams.page) || 1,
limit: Number(pageContext.urlParsed.search.limit) || 30, limit: Number(pageContext.urlParsed.search.limit) || 29,
aggregate: withQuery, aggregate: withQuery,
}, pageContext.user); }, pageContext.user);
// const campaignIndex = Math.floor(Math.random() * (scenes.length - 5)) + 5;
const campaignIndex = Math.floor((Math.random() * (0.5 - 0.2) + 0.2) * scenes.length);
const sceneCampaign = await getRandomCampaign({ minRatio: 0.75, maxRatio: 1.25 });
return { return {
pageContext: { pageContext: {
title: pageContext.routeParams.scope, title: pageContext.routeParams.scope,
@ -32,6 +37,10 @@ export async function onBeforeRender(pageContext) {
aggActors, aggActors,
limit, limit,
total, total,
campaigns: {
index: campaignIndex,
scenes: sceneCampaign,
},
}, },
}, },
}; };

47
src/campaigns.js Normal file
View File

@ -0,0 +1,47 @@
import { knexOwner as knex } from './knex.js';
import { curateEntity } from './entities.js';
function curateCampaign(campaign) {
if (!campaign) {
return null;
}
return {
id: campaign.id,
url: campaign.url,
banner: campaign.banner && {
id: campaign.banner.id,
type: campaign.banner.type,
entity: campaign.banner_entity && curateEntity({ ...campaign.banner_entity, parent: campaign.banner_parent_entity }),
tags: campaign.banner_tags?.map((tag) => ({
id: tag.id,
slug: tag.slug,
name: tag.name,
})) || [],
},
affiliateId: campaign.affiliate_id,
};
}
export async function getRandomCampaign(options = {}) {
const campaign = await knex.raw(`
SELECT
campaigns.*, row_to_json(banners) as banner, row_to_json(entities) as banner_entity, row_to_json(parents) as banner_parent_entity, json_agg(tags) filter (where tags.id is not null) as banner_tags
FROM campaigns
LEFT JOIN banners ON banners.id = campaigns.banner_id
LEFT JOIN banners_tags ON banners_tags.banner_id = banners.id
LEFT JOIN tags ON tags.id = banners_tags.tag_id
LEFT JOIN entities ON entities.id = banners.entity_id
LEFT JOIN entities as parents ON parents.id = entities.parent_id
WHERE campaigns.banner_id IS NOT NULL
AND ratio >= :minRatio
AND ratio <= :maxRatio
GROUP BY campaigns.id, banners.id, entities.id, parents.id
ORDER BY RANDOM()
`, {
minRatio: options.minRatio || 0,
maxRatio: options.maxRatio || 1000,
});
return curateCampaign(campaign.rows[0]);
}

2
static

@ -1 +1 @@
Subproject commit 31759c4a58d789bf6cfa7c96cdae32af42bdf86c Subproject commit 24d11363ef7632591ec6f49240079259f777ab9e