.nvmrc

@@ -1 +1 @@
-21.2.0
+20.14.0

components/actors/actors.vue

@@ -135,7 +135,7 @@ const cupRange = ref(pageProps.cupRange);
 actors.value = pageProps.actors;
 
 const currentPage = ref(Number(routeParams.page));
-const total = ref(Number(pageProps.actorTotal || pageProps.total));
+const total = ref(Number(pageProps.total));
 const order = ref(routeParams.order || urlParsed.search.order || 'likes.desc');
 
 const filters = ref({

components/actors/tile.vue

@@ -5,6 +5,8 @@
 			unstashed: !favorited && pageStash && user && pageStash.user.id === user?.id,
 		}"
 	>
+		<span class="name">{{ actor.name }}</span>
+
 		<div class="avatar-container">
 			<Link
 				:href="`/actor/${actor.id}/${actor.slug}`"
@@ -34,6 +36,7 @@
 				@stashed="(stash) => { favorited = stash.id === currentStash.id ? true : favorited; }"
 				@unstashed="(stash) => { favorited = stash.id === currentStash.id ? false : favorited; }"
 			/>
+		</div>
 
 		<div class="details">
 			<span class="birth">
@@ -65,9 +68,6 @@
 			</span>
 		</div>
 	</div>
-
-		<span class="name">{{ actor.name }}</span>
-	</div>
 </template>
 
 <script setup>
@@ -99,8 +99,8 @@ const favorited = ref(props.actor.stashes.some((actorStash) => actorStash.id ===
 	display: flex;
 	flex-direction: column;
 	width: 100%;
+	aspect-ratio: 2/3;
 	position: relative;
-	aspect-ratio: 3/5;
 	border-radius: .25rem;
 	box-shadow: 0 0 3px var(--shadow-weak-30);
 	overflow: hidden;
@@ -108,6 +108,10 @@ const favorited = ref(props.actor.stashes.some((actorStash) => actorStash.id ===
 	&:hover {
 		box-shadow: 0 0 3px var(--shadow-weak-20);
 
+		.name {
+			color: var(--primary);
+		}
+
 		:deep(.bookmarks) .icon:not(.favorited):not(:hover) {
 			fill: var(--text-light);
 		}
@@ -120,7 +124,7 @@ const favorited = ref(props.actor.stashes.some((actorStash) => actorStash.id ===
 
 .name {
 	flex-shrink: 0;
-	padding: .35rem .5rem;
+	padding: .25rem .5rem;
 	font-weight: bold;
 	font-size: .9rem;
 	white-space: nowrap;

components/movies/tile.vue

@@ -29,7 +29,7 @@
 			</a>
 
 			<Heart
-				v-if="showDetails"
+				v-if="details"
 				domain="movies"
 				:item="movie"
 				:show-secondary="false"
@@ -40,7 +40,7 @@
 		</div>
 
 		<div
-			v-if="showDetails"
+			v-if="details"
 			class="tile-info"
 		>
 			<div class="tile-meta">
@@ -128,7 +128,7 @@ const props = defineProps({
 		type: Object,
 		default: null,
 	},
-	showDetails: {
+	details: {
 		type: Boolean,
 		default: true,
 	},

components/scenes/scenes.vue

@@ -178,7 +178,7 @@ const aggChannels = ref(pageProps.aggChannels || []);
 
 const currentPage = ref(Number(routeParams.page));
 const scope = ref(routeParams.scope || props.defaultScope);
-const total = ref(Number(pageProps.sceneTotal || pageProps.total));
+const total = ref(Number(pageProps.total));
 const loading = ref(false);
 
 const actorIds = urlParsed.search.actors?.split(',').map((identifier) => parseActorIdentifier(identifier)?.id).filter(Boolean) || [];

package-lock.json

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

package.json

@@ -77,5 +77,5 @@
     "postcss-custom-media": "^10.0.2",
     "postcss-nesting": "^12.0.2"
   },
-  "version": "0.23.0"
+  "version": "0.22.0"
 }

pages/scene/+Page.vue

@@ -181,7 +181,7 @@
 							v-for="movie in scene.movies"
 							:key="`movie-${movie.id}`"
 							:movie="movie"
-							:show-details="false"
+							:details="false"
 						/>
 					</div>
 

pages/search/+Page.vue

@@ -1,184 +1,11 @@
 <template>
-	<div class="page">
+	<div>
-		<div class="row">
+		<Scenes
-			<div
+			default-scope="results"
-				v-if="actors.length > 0"
-				class="results"
-			>
-				<span class="results-meta">
-					Found {{ actorTotal }} {{ actorTotal > 1 ? 'actors' : 'actor' }}
-
-					<a
-						:href="`/actors/?q=${query}&order=results.desc`"
-						class="link"
-					>Full actor results</a>
-				</span>
-
-				<div class="results-container">
-					<div class="actors">
-						<ActorTile
-							v-for="actor in actors"
-							:key="`actor-${actor.id}`"
-							:actor="actor"
 		/>
 	</div>
-				</div>
-			</div>
-
-			<div
-				v-if="movies.length > 0"
-				class="results"
-			>
-				<span class="results-meta">
-					Found {{ movieTotal }} {{ movieTotal > 1 ? 'movies' : 'movie' }}
-
-					<a
-						:href="`/movies/results/?q=${query}`"
-						class="link"
-					>Full movie results</a>
-				</span>
-
-				<div class="results-container">
-					<div class="movies">
-						<MovieTile
-							v-for="movie in movies"
-							:key="`movie-${movie.id}`"
-							:movie="movie"
-							:show-details="false"
-						/>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<div
-			v-if="scenes.length > 0"
-			class="results"
-		>
-			<span class="results-meta">
-				Found {{ sceneTotal }} {{ sceneTotal > 1 ? 'scenes' : 'scene' }}
-
-				<a
-					:href="`/updates/results/?q=${query}`"
-					class="link"
-				>Full scene results</a>
-			</span>
-
-			<div class="scenes">
-				<SceneTile
-					v-for="scene in scenes"
-					:key="`scene-${scene.id}`"
-					:scene="scene"
-				/>
-			</div>
-		</div>
-
-		<span
-			v-if="actors.length === 0 && scenes.length === 0"
-			class="results-meta"
-		>No results for '{{ query }}'</span>
-	</div>
 </template>
 
 <script setup>
-import { inject } from 'vue';
+import Scenes from '#/components/scenes/scenes.vue';
-
-import ActorTile from '#/components/actors/tile.vue';
-import SceneTile from '#/components/scenes/tile.vue';
-import MovieTile from '#/components/movies/tile.vue';
-
-const pageContext = inject('pageContext');
-
-const {
-	actors,
-	scenes,
-	movies,
-	actorTotal,
-	sceneTotal,
-	movieTotal,
-} = pageContext.pageProps;
-
-const query = pageContext.urlParsed.search.q;
 </script>
-
-<style scoped>
-.page {
-	display: flex;
-	flex-direction: column;
-}
-
-.row {
-	width: 100%;
-	display: flex;
-	overflow: hidden;
-}
-
-.results {
-	display: flex;
-	flex: auto;
-	flex-direction: column;
-}
-
-.results-container {
-	max-height: 19rem;
-	overflow-y: auto;
-}
-
-.actors {
-	min-width: 10rem;
-	display: grid;
-	flex-grow: 1;
-	grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr));
-	gap: .25rem;
-	padding: 1rem;
-}
-
-.movies {
-	min-width: 15rem;
-	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr));
-	gap: 1rem;
-	padding: 1rem;
-}
-
-.scenes {
-	display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
-	gap: .5rem;
-	padding: 1rem;
-}
-
-.results-meta {
-	box-sizing: border-box;
-	padding: 1rem 1rem 0 1rem;
-	color: var(--shadow);
-	font-weight: bold;
-
-	.link {
-		margin-left: .5rem;
-		font-weight: normal;
-	}
-}
-
-@media(--small-10) {
-	.row {
-		flex-direction: column;
-	}
-
-	.scenes {
-		grid-template-columns: repeat(auto-fill, minmax(18rem, 1fr));
-	}
-
-	.actors,
-	.movies {
-		display: flex;
-		overflow-x: auto;
-
-		.tile,
-		.movie-tile {
-			width: 9rem;
-			min-width: 9rem;
-		}
-	}
-}
-</style>

pages/search/+onBeforeRender.js

@@ -1,66 +1,36 @@
 import { fetchScenes } from '#/src/scenes.js';
-import { fetchActors } from '#/src/actors.js';
-import { fetchMovies } from '#/src/movies.js';
 import { curateScenesQuery } from '#/src/web/scenes.js';
-import { curateActorsQuery } from '#/src/web/actors.js';
-import { curateMoviesQuery } from '#/src/web/movies.js';
 
 export async function onBeforeRender(pageContext) {
-	const [searchScenes, searchActors, searchMovies] = await Promise.all([
+	const searchScenes = await fetchScenes(await curateScenesQuery({
-		fetchScenes(await curateScenesQuery({
 		...pageContext.urlQuery,
 		query: pageContext.urlParsed.search.q,
 		scope: pageContext.urlParsed.search.scope || 'results',
 		tagFilter: pageContext.tagFilter,
 	}), {
 		page: Number(pageContext.routeParams.page) || 1,
-			limit: Number(pageContext.urlParsed.search.limit) || 15,
+		limit: Number(pageContext.urlParsed.search.limit) || 30,
-		}, pageContext.user),
+	}, pageContext.user);
-		fetchActors(curateActorsQuery(pageContext.urlQuery), {
-			page: Number(pageContext.routeParams.page) || 1,
-			limit: Number(pageContext.urlParsed.search.limit) || 10,
-			order: ['results', 'desc'],
-		}, pageContext.user),
-		fetchMovies(await curateMoviesQuery({
-			...pageContext.urlQuery,
-			scope: pageContext.routeParams.scope || 'results',
-		}), {
-			page: Number(pageContext.routeParams.page) || 1,
-			limit: Number(pageContext.urlParsed.search.limit) || 5,
-		}, pageContext.user),
-	]);
 
 	const {
 		scenes,
 		aggActors,
 		aggTags,
 		aggChannels,
-		total: sceneTotal,
+		total,
+		limit,
 	} = searchScenes;
 
-	const {
-		actors,
-		total: actorTotal,
-	} = searchActors;
-
-	const {
-		movies,
-		total: movieTotal,
-	} = searchMovies;
-
 	return {
 		pageContext: {
 			title: `Search '${pageContext.urlParsed.search.q || ''}'`,
 			pageProps: {
-				actors,
 				scenes,
-				movies,
 				aggActors,
 				aggTags,
 				aggChannels,
-				sceneTotal,
+				limit,
-				actorTotal,
+				total,
-				movieTotal,
 			},
 		},
 	};

pages/updates/+Page.vue

@@ -1,18 +1,13 @@
 <template>
 	<div>
 		<Scenes
-			:show-filters="!!query"
+			:show-filters="false"
-			:show-meta="!!query"
+			:show-meta="false"
-			:show-scope-tabs="!query"
+			:show-scope-tabs="true"
 		/>
 	</div>
 </template>
 
 <script setup>
-import { inject } from 'vue';
-
 import Scenes from '#/components/scenes/scenes.vue';
-
-const pageContext = inject('pageContext');
-const query = Object.hasOwn(pageContext.urlParsed.search, 'q');
 </script>

pages/updates/+onBeforeRender.js

@@ -2,24 +2,15 @@ import { fetchScenes } from '#/src/scenes.js';
 import { curateScenesQuery } from '#/src/web/scenes.js';
 
 export async function onBeforeRender(pageContext) {
-	const withQuery = Object.hasOwn(pageContext.urlParsed.search, 'q');
+	const { scenes, limit, total } = await fetchScenes(await curateScenesQuery({
-
-	const {
-		scenes,
-		aggTags,
-		aggChannels,
-		aggActors,
-		limit,
-		total,
-	} = await fetchScenes(await curateScenesQuery({
 		...pageContext.urlQuery,
 		scope: pageContext.routeParams.scope || 'latest',
-		isShowcased: withQuery ? null : true,
+		isShowcased: true,
 		tagFilter: pageContext.tagFilter,
 	}), {
 		page: Number(pageContext.routeParams.page) || 1,
 		limit: Number(pageContext.urlParsed.search.limit) || 30,
-		aggregate: withQuery,
+		aggregate: false,
 	}, pageContext.user);
 
 	return {
@@ -27,9 +18,6 @@ export async function onBeforeRender(pageContext) {
 			title: pageContext.routeParams.scope,
 			pageProps: {
 				scenes,
-				aggTags,
-				aggChannels,
-				aggActors,
 				limit,
 				total,
 			},

src/actors.js

@@ -446,7 +446,6 @@ async function queryManticoreSql(filters, options, _reqUser) {
 				} else if (options.order?.[0] === 'results') {
 					builder.orderBy([
 						{ column: '_score', order: options.order[1] },
-						{ column: 'actors.stashed', order: 'desc' },
 						{ column: 'actors.slug', order: 'asc' },
 					]);
 				} else if (options.order?.[0] === 'stashed' && filters.stashId) {

src/movies.js

@@ -433,7 +433,6 @@ async function queryManticoreSql(filters, options) {
 				} else if (filters.scope === 'results') {
 					builder.orderBy([
 						{ column: '_score', order: 'desc' },
-						{ column: 'movies.stashed', order: 'desc' },
 						{ column: 'movies.effective_date', order: 'desc' },
 					]);
 				} else if (filters.scope === 'stashed' && filters.stashId) {

src/scenes.js

@@ -533,7 +533,6 @@ async function queryManticoreSql(filters, options, _reqUser) {
 				} else if (filters.scope === 'results') {
 					builder.orderBy([
 						{ column: '_score', order: 'desc' },
-						{ column: 'scenes.stashed', order: 'desc' },
 						{ column: 'scenes.effective_date', order: 'desc' },
 					]);
 				} else if (filters.scope === 'stashed' && filters.stashId) {