Combined scene and movie components.

assets/components/releases/media.vue

@@ -1,5 +1,8 @@
 <template>
-	<div class="media">
+	<div
+		v-lazy-container
+		class="media"
+	>
 		<div
 			v-if="release.trailer || release.teaser"
 			class="trailer-container"
@@ -30,7 +33,7 @@
 
 			<img
 				v-else-if="release.teaser && /^image\//.test(release.teaser.mime)"
-				:src="sfw ? `/img/${release.teaser.sfw.thumbnail}` : `/media/${release.teaser.path}`"
+				:data-src="sfw ? `/img/${release.teaser.sfw.thumbnail}` : `/media/${release.teaser.path}`"
 				:alt="release.title"
 				class="item trailer"
 			>
@@ -62,7 +65,8 @@
 				rel="noopener noreferrer"
 			>
 				<img
-					:src="`/media/${cover.thumbnail}`"
+					:data-src="`/media/${cover.thumbnail}`"
+					:data-loading="`/media/${cover.lazy}`"
 					class="item cover"
 					@load="$parent.$emit('load')"
 				>
@@ -82,7 +86,8 @@
 				rel="noopener noreferrer"
 			>
 				<img
-					:src="sfw ? `/img/${photo.sfw.thumbnail}` : `/media/${photo.thumbnail}`"
+					:data-src="sfw ? `/img/${photo.sfw.thumbnail}` : `/media/${photo.thumbnail}`"
+					:data-loading="sfw ? `/img/${photo.sfw.lazy}` : `/media/${photo.lazy}`"
 					:alt="`Photo ${photo.index + 1}`"
 					class="item"
 					@load="$parent.$emit('load')"
@@ -105,8 +110,9 @@ function sfw() {
 }
 
 function photos() {
-	const clipPostersById = (this.release.clips || []).reduce((acc, clip) => ({ ...acc, [clip.poster.id]: clip.poster }), {});
+	const clips = this.release.clips || [];
-	const uniqueClipPosters = Array.from(new Set(this.release.clips.map(clip => clip.poster.id) || [])).map(posterId => clipPostersById[posterId]);
+	const clipPostersById = clips.reduce((acc, clip) => ({ ...acc, [clip.poster.id]: clip.poster }), {});
+	const uniqueClipPosters = Array.from(new Set(clips.map(clip => clip.poster.id) || [])).map(posterId => clipPostersById[posterId]);
 	const photosWithClipPosters = (this.release.photos || []).concat(uniqueClipPosters);
 
 	if (this.release.trailer || this.release.teaser) {

assets/components/releases/movie-tile.vue

@@ -2,7 +2,7 @@
 	<div class="tile">
 		<div class="movie">
 			<router-link
-				:to="{ name: 'movie', params: { movieId: movie.id, movieSlug: movie.slug } }"
+				:to="{ name: 'movie', params: { releaseId: movie.id, releaseSlug: movie.slug } }"
 				class="cover"
 			>
 				<img
@@ -13,7 +13,7 @@
 
 			<div class="info">
 				<router-link
-					:to="{ name: 'movie', params: { movieId: movie.id, movieSlug: movie.slug } }"
+					:to="{ name: 'movie', params: { releaseId: movie.id, releaseSlug: movie.slug } }"
 					class="title-link"
 				>
 					<h3 class="title">{{ movie.title }}</h3>

assets/components/releases/movie.vue

@@ -1,107 +0,0 @@
-<template>
-	<div
-		v-if="movie"
-		class="movie"
-	>
-		<Media
-			:release="movie"
-		/>
-
-		<Details :release="movie" />
-
-		<div class="column">
-			<h2 class="title">{{ movie.title }}</h2>
-
-			<p>{{ movie.description }}</p>
-
-			<div
-				v-lazy-container="{ selector: '.lazy' }"
-				class="actors"
-			>
-				<ActorTile
-					v-for="actor in movie.actors"
-					:key="`actor-${actor.id}`"
-					:actor="actor"
-				/>
-			</div>
-
-			<Tags
-				v-if="movie.tags && movie.tags.length > 0"
-				:tags="movie.tags"
-			/>
-
-			<Releases
-				:releases="movie.scenes"
-			/>
-		</div>
-	</div>
-</template>
-
-<script>
-import Media from './media.vue';
-import Details from './details.vue';
-import Tags from './tags.vue';
-import Releases from './releases.vue';
-import ActorTile from '../actors/tile.vue';
-
-async function mounted() {
-	this.movie = await this.$store.dispatch('fetchMovieById', this.$route.params.movieId);
-}
-
-export default {
-	components: {
-		Details,
-		Tags,
-		Media,
-		ActorTile,
-		Releases,
-	},
-	data() {
-		return {
-			movie: null,
-		};
-	},
-	mounted,
-};
-</script>
-
-<style lang="scss" scoped>
-.title {
-	padding: .5rem 0;
-	margin: 0 0 1rem 0;
-	color: var(--shadow-strong);
-}
-
-.covers {
-	display: inline-block;
-	margin: 0 0 1rem 0;
-}
-
-.cover {
-	height: 20rem;
-	margin: 0 1rem 0 0;
-	box-shadow: 0 0 3px var(--shadow-weak);
-}
-
-.trailer {
-	height: 20rem;
-}
-
-.date {
-	display: inline-block;
-	padding: 1rem;
-}
-
-.content-inner {
-	padding: 1rem;
-}
-
-.actors {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
-    grid-gap: .5rem;
-    flex-grow: 1;
-    flex-wrap: wrap;
-	margin: 0 0 1rem 0;
-}
-</style>

assets/components/releases/release.vue

@@ -23,7 +23,7 @@
 		<Details :release="release" />
 
 		<Expand
-			v-if="release.photos.length > 0"
+			v-if="release.photos && release.photos.length > 0"
 			class="expand-bottom"
 			:expanded="expanded"
 			@expand="(state) => expanded = state"
@@ -91,6 +91,11 @@
 				</div>
 			</div>
 
+			<Releases
+				v-if="release.scenes && release.scenes.length > 0"
+				:releases="release.scenes"
+			/>
+
 			<div
 				v-if="release.description"
 				class="row"
@@ -200,6 +205,7 @@ import Details from './details.vue';
 import Tags from './tags.vue';
 import Clips from './clips.vue';
 import Actor from '../actors/tile.vue';
+import Releases from './releases.vue';
 import Scroll from '../scroll/scroll.vue';
 import Expand from '../expand/expand.vue';
 
@@ -210,7 +216,13 @@ function pageTitle() {
 }
 
 async function mounted() {
-	this.release = await this.$store.dispatch('fetchReleaseById', this.$route.params.releaseId);
+	if (this.$route.name === 'scene') {
+		this.release = await this.$store.dispatch('fetchReleaseById', this.$route.params.releaseId);
+	}
+
+	if (this.$route.name === 'movie') {
+		this.release = await this.$store.dispatch('fetchMovieById', this.$route.params.releaseId);
+	}
 }
 
 export default {
@@ -220,6 +232,7 @@ export default {
 		Media,
 		Scroll,
 		Expand,
+		Releases,
 		Clips,
 		Tags,
 	},

assets/js/curate.js

@@ -70,7 +70,7 @@ function curateRelease(release) {
 	if (release.scenes) curatedRelease.scenes = release.scenes.map(({ scene }) => curateRelease(scene));
 	if (release.movies) curatedRelease.movies = release.movies.map(({ movie }) => curateRelease(movie));
 	if (release.clips) curatedRelease.clips = release.clips.map(clip => curateRelease(clip));
-	if (release.photos) curatedRelease.photos = release.photos.map(({ media }) => media);
+	if (release.photos) curatedRelease.photos = release.photos.map(photo => photo.media || photo);
 	if (release.covers) curatedRelease.covers = release.covers.map(({ media }) => media);
 	if (release.trailer) curatedRelease.trailer = release.trailer.media;
 	if (release.teaser) curatedRelease.teaser = release.teaser.media;

assets/js/releases/actions.js

@@ -92,6 +92,7 @@ function initReleasesActions(store, _router) {
 								id
 								path
 								thumbnail
+								lazy
 							}
 						}
 					}
@@ -123,6 +124,7 @@ function initReleasesActions(store, _router) {
 					actors {
 						id
 						name
+						slug
 						age
 						dateOfBirth
 						birthCountry: countryByBirthCountryAlpha2 {
@@ -142,6 +144,7 @@ function initReleasesActions(store, _router) {
 							id
 							path
 							thumbnail
+							lazy
 						}
 					}
 					trailer: moviesTrailerByMovieId {
@@ -160,6 +163,21 @@ function initReleasesActions(store, _router) {
 						slug
 						name
 					}
+					photos {
+						id
+						index
+						path
+						thumbnail
+						lazy
+						comment
+						sfw: sfwMedia {
+							id
+							thumbnail
+							lazy
+							path
+							comment
+						}
+					}
 					entity {
 						id
 						name

assets/js/router.js

@@ -2,8 +2,7 @@ import Vue from 'vue';
 import VueRouter from 'vue-router';
 
 import Home from '../components/home/home.vue';
-import Scene from '../components/releases/scene.vue';
+import Release from '../components/releases/release.vue';
-import Movie from '../components/releases/movie.vue';
 import Entity from '../components/entities/entity.vue';
 import Networks from '../components/networks/networks.vue';
 import Actor from '../components/actors/actor.vue';
@@ -46,12 +45,12 @@ const routes = [
 	},
 	{
 		path: '/scene/:releaseId/:releaseSlug?',
-		component: Scene,
+		component: Release,
 		name: 'scene',
 	},
 	{
-		path: '/movie/:movieId/:movieSlug?',
+		path: '/movie/:releaseId/:releaseSlug?',
-		component: Movie,
+		component: Release,
 		name: 'movie',
 	},
 	{

migrations/20190325001339_releases.js

@@ -1061,6 +1061,20 @@ exports.up = knex => Promise.resolve()
 				ORDER BY tags.priority DESC
 			$$ LANGUAGE SQL STABLE;
 
+			CREATE FUNCTION movies_photos(movie movies) RETURNS SETOF media AS $$
+				SELECT media.*
+				FROM movies_scenes
+				LEFT JOIN
+					releases ON releases.id = movies_scenes.scene_id
+				LEFT JOIN
+					releases_photos ON releases_photos.release_id = releases.id
+				LEFT JOIN
+					media ON media.id = releases_photos.media_id
+				WHERE movies_scenes.movie_id = movie.id
+				GROUP BY media.id
+				ORDER BY media.index ASC
+			$$ LANGUAGE SQL STABLE;
+
 			CREATE FUNCTION releases_is_new(release releases) RETURNS boolean AS $$
 				SELECT EXISTS(SELECT true WHERE (SELECT id FROM batches ORDER BY created_at DESC LIMIT 1) = release.created_batch_id);
 			$$ LANGUAGE sql STABLE;
@@ -1148,6 +1162,7 @@ exports.down = (knex) => { // eslint-disable-line arrow-body-style
 
 		DROP FUNCTION IF EXISTS movies_actors;
 		DROP FUNCTION IF EXISTS movies_tags;
+		DROP FUNCTION IF EXISTS movies_photos;
 
 		DROP TEXT SEARCH CONFIGURATION IF EXISTS traxxx;
 		DROP TEXT SEARCH DICTIONARY IF EXISTS traxxx_dict;