components/stashes/heart.vue

@@ -3,42 +3,37 @@
 		v-if="user"
 		class="bookmarks"
 	>
-		<VDropdown
+		<VDropdown v-if="showSecondary">
-			v-if="showSecondary || (hasSecondaryStash && pageStash?.user.id !== user.id)"
-			:shown="showStashes"
-			@hide="showStashes = false"
-		>
 			<Icon
 				icon="folder-heart"
 				class="heart noselect"
 				:class="{ favorited: itemStashes.some((itemStash) => !itemStash.isPrimary) }"
-				@contextmenu.prevent="showStashes = true"
 			/>
 
 			<template #popper>
-				<StashMenu
+				<ul class="stash-menu nolist">
-					:user="user"
+					<li
-					:item-stashes="itemStashes"
+						v-for="userStash in user.stashes"
-					@stash="(stash) => stashItem(stash)"
+						:key="`stash-${userStash.id}`"
-					@unstash="(stash) => unstashItem(stash)"
+						class="menu-item"
-				/>
+					>
+						<label class="menu-stash">
+							<Checkbox
+								:checked="itemStashes.some((itemStash) => itemStash.id === userStash.id)"
+								@change="(checked) => checked ? stashItem(userStash) : unstashItem(userStash)"
+							/>{{ userStash.name }}
+						</label>
+					</li>
+				</ul>
 			</template>
 		</VDropdown>
 
-		<VDropdown
-			v-if="showSecondary || !hasSecondaryStash || pageStash?.user.id === user.id"
-			:triggers="[]"
-			:shown="showStashes"
-			:disabled="showSecondary"
-			@hide="showStashes = false"
-		>
 		<template v-if="pageStash?.user.id === user.id">
 			<Icon
 				v-if="itemStashes.some((itemStash) => itemStash.id === pageStash.id)"
 				:icon="pageStash.isPrimary ? 'heart7' : 'folder-heart'"
 				class="heart favorited noselect"
 				@click.native.stop="unstashItem(pageStash)"
-					@contextmenu.prevent="toggleShowStashes(true)"
 			/>
 
 			<Icon
@@ -46,7 +41,6 @@
 				:icon="pageStash.isPrimary ? 'heart8' : 'folder-heart'"
 				class="heart noselect"
 				@click.native.stop="stashItem(pageStash)"
-					@contextmenu.prevent="toggleShowStashes(true)"
 			/>
 		</template>
 
@@ -56,7 +50,6 @@
 				icon="heart7"
 				class="heart favorited noselect"
 				@click.native.stop="unstashItem(user.primaryStash)"
-					@contextmenu.prevent="toggleShowStashes(true)"
 			/>
 
 			<Icon
@@ -64,30 +57,19 @@
 				icon="heart8"
 				class="heart noselect"
 				@click.native.stop="stashItem(user.primaryStash)"
-					@contextmenu.prevent="toggleShowStashes(true)"
 			/>
 		</template>
-
-			<template #popper>
-				<StashMenu
-					:user="user"
-					:item-stashes="itemStashes"
-					@stash="(stash) => stashItem(stash)"
-					@unstash="(stash) => unstashItem(stash)"
-				/>
-			</template>
-		</VDropdown>
 	</div>
 </template>
 
 <script setup>
-import { ref, computed, inject } from 'vue';
+import { ref, inject } from 'vue';
 
 import { post, del } from '#/src/api.js';
 import ellipsis from '#/utils/ellipsis.js';
 
 import Icon from '#/components/icon/icon.vue';
-import StashMenu from '#/components/stashes/menu.vue';
+import Checkbox from '#/components/form/checkbox.vue';
 
 const props = defineProps({
 	domain: {
@@ -110,10 +92,8 @@ const { user, pageProps } = inject('pageContext');
 const pageStash = pageProps.stash;
 
 const itemStashes = ref(props.item.stashes);
-const hasSecondaryStash = computed(() => itemStashes.value.some((itemStash) => !itemStash.isPrimary));
 
 const done = ref(true);
-const showStashes = ref(false);
 const feedbackCutoff = 20;
 
 const itemKeys = {
@@ -169,19 +149,6 @@ async function unstashItem(stash) {
 
 	done.value = true;
 }
-
-function toggleShowStashes(state) {
-	if (props.showSecondary) {
-		return;
-	}
-
-	if (state) {
-		showStashes.value = state;
-		return;
-	}
-
-	showStashes.value = !showStashes.value;
-}
 </script>
 
 <style scoped>
@@ -216,4 +183,23 @@ function toggleShowStashes(state) {
 		fill: var(--primary);
 	}
 }
+
+.menu-item {
+	display: block;
+}
+
+.menu-stash {
+	display: flex;
+	align-items: center;
+	padding: .5rem;
+
+	&:hover {
+		cursor: pointer;
+		color: var(--primary);
+	}
+
+	.check-container {
+		margin-right: .5rem;
+	}
+}
 </style>

components/stashes/menu.vue

@@ -1,54 +0,0 @@
-<template>
-	<ul class="stash-menu nolist noselect">
-		<li
-			v-for="userStash in user.stashes"
-			:key="`stash-${userStash.id}`"
-			class="menu-item"
-		>
-			<label class="menu-stash">
-				<Checkbox
-					:checked="itemStashes.some((itemStash) => itemStash.id === userStash.id)"
-					@change="(checked) => checked ? emit('stash', userStash) : emit('unstash', userStash)"
-				/>{{ userStash.name }}
-			</label>
-		</li>
-	</ul>
-</template>
-
-<script setup>
-import Checkbox from '#/components/form/checkbox.vue';
-
-defineProps({
-	user: {
-		type: Object,
-		default: null,
-	},
-	itemStashes: {
-		type: Array,
-		default: () => [],
-	},
-});
-
-const emit = defineEmits(['stash', 'unstash']);
-</script>
-
-<style scoped>
-.menu-item {
-	display: block;
-}
-
-.menu-stash {
-	display: flex;
-	align-items: center;
-	padding: .5rem;
-
-	&:hover {
-		cursor: pointer;
-		color: var(--primary);
-	}
-
-	.check-container {
-		margin-right: .5rem;
-	}
-}
-</style>

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.26.0",
+  "version": "0.25.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.26.0",
+      "version": "0.25.8",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -78,5 +78,5 @@
     "postcss-custom-media": "^10.0.2",
     "postcss-nesting": "^12.0.2"
   },
-  "version": "0.26.0"
+  "version": "0.25.8"
 }

pages/_error/+Page.vue

@@ -32,6 +32,5 @@ const { abortReason } = pageContext;
 .page {
 	display: flex;
 	justify-content: center;
-	flex-grow: 1;
 }
 </style>

pages/entities/@entitySlug/+onBeforeRender.js

@@ -44,6 +44,7 @@ export async function onBeforeRender(pageContext) {
 		},
 		{
 			entityIds: [entity.id, entity.parent?.id].filter(Boolean),
+			parentEntityId: entity.parent?.id,
 			minRatio: 1.5,
 			allowRandomFallback: false,
 		},

pages/scene/+Page.vue

@@ -259,15 +259,6 @@
 					</div>
 				</div>
 
-				<div
-					v-if="campaigns?.scene"
-					class="section"
-				>
-					<Campaign
-						:campaign="campaigns.scene"
-					/>
-				</div>
-
 				<div class="section details">
 					<div class="detail">
 						<h3 class="heading">Added</h3>
@@ -327,11 +318,10 @@ import MovieTile from '#/components/movies/tile.vue';
 import SerieTile from '#/components/series/tile.vue';
 import Player from '#/components/video/player.vue';
 import Heart from '#/components/stashes/heart.vue';
-import Campaign from '#/components/campaigns/campaign.vue';
 
 import summaryTemplate from '#/assets/summary.yaml';
 
-const { pageProps, campaigns } = inject('pageContext');
+const { pageProps } = inject('pageContext');
 const { scene } = pageProps;
 
 const playing = ref(false);

pages/scene/+onBeforeRender.js

@@ -1,6 +1,4 @@
-import { render } from 'vike/abort'; /* eslint-disable-line import/extensions */
 import { fetchScenesById } from '#/src/scenes.js';
-import { getRandomCampaigns } from '#/src/campaigns.js';
 
 function getTitle(scene) {
 	if (scene.title) {
@@ -22,27 +20,12 @@ export async function onBeforeRender(pageContext) {
 		actorStashes: true,
 	});
 
-	const campaigns = await getRandomCampaigns([
-		{
-			minRatio: 1.5,
-			entityIds: [scene.channel.id, scene.network?.id].filter(Boolean),
-			allowRandomFallback: false,
-		},
-	], { tagFilter: pageContext.tagFilter });
-
-	if (!scene) {
-		throw render(404, `Cannot find scene '${pageContext.routeParams.sceneId}'.`);
-	}
-
 	return {
 		pageContext: {
 			title: getTitle(scene),
 			pageProps: {
 				scene,
 			},
-			campaigns: {
-				scene: campaigns[0],
-			},
 		},
 	};
 }

src/web/graphql.js

@@ -9,14 +9,16 @@ const schema = buildSchema(`
 	${scenesSchema}
 `);
 
+const rootValue = {
+	scenes: fetchScenesGraphql,
+};
+
 export async function graphqlApi(req, res) {
 	const data = await graphql({
 		schema,
 		source: req.body.query,
 		variableValues: req.body.variables,
-		rootValue: {
+		rootValue,
-			scenes: async (query) => fetchScenesGraphql(query, req),
-		},
 	});
 
 	console.log(data);

src/web/scenes.js

@@ -76,21 +76,16 @@ export const scenesSchema = `
 export async function fetchScenesGraphql(query, req) {
 	const {
 		scenes,
-		/*
 		aggActors,
 		aggTags,
 		aggChannels,
 		limit,
 		total,
-		*/
 	} = await fetchScenes({}, {
 		page: 1,
 		limit: 30,
 	}, req.user);
 
-	return scenes;
-
-	/*
 	return {
 		scenes,
 		aggActors,
@@ -99,5 +94,4 @@ export async function fetchScenesGraphql(query, req) {
 		limit,
 		total,
 	};
-	*/
 }

static

@@ -1 +1 @@
-Subproject commit af96f9b932db799ec8d067d4a5c9379f8363d2b0
+Subproject commit 39f91b96b2bfa176a02d10c9051dd1d2f9c62b64