Added movie and summary to scene page.
This commit is contained in:
parent
caa6812bc2
commit
040e6c2197
|
@ -0,0 +1,4 @@
|
||||||
|
<!-- Generated by IcoMoon.io -->
|
||||||
|
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
|
||||||
|
<path d="M6 6v-4c0-1.1 0.9-2 2-2h10c1.105 0 2 0.895 2 2v0 10c0 1.105-0.895 2-2 2v0h-4v4c0 1.105-0.895 2-2 2v0h-10c-1.105 0-2-0.895-2-2v0-10c0-1.1 0.9-2 2-2h4zM8 6h4c1.105 0 2 0.895 2 2v0 4h4v-10h-10v4zM2 8v10h10v-10h-10z"></path>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 368 B |
|
@ -0,0 +1,4 @@
|
||||||
|
<!-- Generated by IcoMoon.io -->
|
||||||
|
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||||
|
<path d="M10 4v-4h-7l-3 3v9h6v4h10v-12h-6zM3 1.414v1.586h-1.586l1.586-1.586zM1 11v-7h3v-3h5v3l-3 3v4h-5zM9 5.414v1.586h-1.586l1.586-1.586zM15 15h-8v-7h3v-3h5v10z"></path>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 309 B |
|
@ -0,0 +1,4 @@
|
||||||
|
<!-- Generated by IcoMoon.io -->
|
||||||
|
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||||
|
<path d="M13 4h-3v-1l-3-3h-7v12h6v4h10v-9l-3-3zM13 5.414l1.586 1.586h-1.586v-1.586zM7 1.414l1.586 1.586h-1.586v-1.586zM1 1h5v3h3v7h-8v-10zM15 15h-8v-3h3v-7h2v3h3v7z"></path>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 312 B |
|
@ -0,0 +1,4 @@
|
||||||
|
<!-- Generated by IcoMoon.io -->
|
||||||
|
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||||
|
<path d="M11 2h-2v-1c0-0.55-0.45-1-1-1h-2c-0.55 0-1 0.45-1 1v1h-2v2h8v-2zM8 2h-2v-0.998c0.001-0.001 0.001-0.001 0.002-0.002h1.996c0.001 0.001 0.001 0.001 0.002 0.002v0.998zM13 5v-2.5c0-0.275-0.225-0.5-0.5-0.5h-1v1h0.5v2h-6v7h-4v-9h0.5v-1h-1c-0.275 0-0.5 0.225-0.5 0.5v10c0 0.275 0.225 0.5 0.5 0.5h4.5v3h7l3-3v-8h-3zM13 14.586v-1.586h1.586l-1.586 1.586zM15 12h-3v3h-5v-9h8v6z"></path>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 522 B |
|
@ -0,0 +1,4 @@
|
||||||
|
<!-- Generated by IcoMoon.io -->
|
||||||
|
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||||
|
<path d="M11 2h-2v-1c0-0.55-0.45-1-1-1h-2c-0.55 0-1 0.45-1 1v1h-2v2h8v-2zM8 2h-2v-0.998c0.001-0.001 0.001-0.001 0.002-0.002h1.996c0.001 0.001 0.001 0.001 0.002 0.002v0.998zM13 5v-2.5c0-0.275-0.225-0.5-0.5-0.5h-1v1h0.5v2h-3l-3 3v4h-4v-9h0.5v-1h-1c-0.275 0-0.5 0.225-0.5 0.5v10c0 0.275 0.225 0.5 0.5 0.5h4.5v3h10v-11h-3zM9 6.414v1.586h-1.586l1.586-1.586zM15 15h-8v-6h3v-3h5v9z"></path>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 522 B |
|
@ -0,0 +1,4 @@
|
||||||
|
<!-- Generated by IcoMoon.io -->
|
||||||
|
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||||
|
<path d="M11 5v-5h-11v11h5v5h11v-11h-5zM9 4h-5v0.125h-2v-0.25h7v0.125zM2 9v-0.125h2v0.125h-2zM2 8.625v-0.25h2v0.25h-2zM2 8.125v-0.25h2v0.25h-2zM2 7.625v-0.25h2v0.25h-2zM2 7.125v-0.25h2v0.25h-2zM2 6.625v-0.25h2v0.25h-2zM2 6.125v-0.25h2v0.25h-2zM2 5.625v-0.25h2v0.25h-2zM2 5.125v-0.25h2v0.25h-2zM2 4.625v-0.25h2v0.25h-2zM9 3.625h-7v-0.25h7v0.25zM9 3.125h-7v-0.25h7v0.25zM9 2.625h-7v-0.25h7v0.25zM9 2.125h-7v-0.125h7v0.125zM15 15h-9v-9h9v9z"></path>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 585 B |
|
@ -0,0 +1,8 @@
|
||||||
|
- ' - ':
|
||||||
|
- channel
|
||||||
|
- - movie
|
||||||
|
- scene|Scene $
|
||||||
|
- title
|
||||||
|
- ', |(|)':
|
||||||
|
- actors
|
||||||
|
- date|yyyy-MM-dd
|
|
@ -29,6 +29,7 @@
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<Heart
|
<Heart
|
||||||
|
v-if="details"
|
||||||
domain="movies"
|
domain="movies"
|
||||||
:item="movie"
|
:item="movie"
|
||||||
:show-secondary="false"
|
:show-secondary="false"
|
||||||
|
@ -38,7 +39,10 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="tile-info">
|
<div
|
||||||
|
v-if="details"
|
||||||
|
class="tile-info"
|
||||||
|
>
|
||||||
<div class="tile-meta">
|
<div class="tile-meta">
|
||||||
<div class="channel">
|
<div class="channel">
|
||||||
<Link
|
<Link
|
||||||
|
@ -101,6 +105,13 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<a
|
||||||
|
v-else
|
||||||
|
:href="`/movie/${movie.id}/${movie.slug}`"
|
||||||
|
:title="movie.title"
|
||||||
|
class="tile-info title nolink"
|
||||||
|
>{{ movie.title }}</a>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -115,6 +126,10 @@ const props = defineProps({
|
||||||
type: Object,
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
|
details: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const pageContext = inject('pageContext');
|
const pageContext = inject('pageContext');
|
||||||
|
@ -124,7 +139,7 @@ const currentStash = pageStash || user?.primaryStash;
|
||||||
|
|
||||||
const currentYear = new Date().getFullYear();
|
const currentYear = new Date().getFullYear();
|
||||||
|
|
||||||
const favorited = ref(props.movie.stashes.some((movieStash) => movieStash.id === currentStash.id));
|
const favorited = ref(props.movie.stashes?.some((movieStash) => movieStash.id === currentStash.id));
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
@ -156,10 +171,14 @@ const favorited = ref(props.movie.stashes.some((movieStash) => movieStash.id ===
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
position: relative;
|
position: relative;
|
||||||
background: var(--shadow-weak-30);
|
background: var(--shadow-weak-30);
|
||||||
aspect-ratio: 5/7;
|
aspect-ratio: 2/3;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cover-link {
|
.cover-link {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
|
@ -235,8 +254,13 @@ const favorited = ref(props.movie.stashes.some((movieStash) => movieStash.id ===
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
padding: 0 .5rem;
|
padding: 0 .5rem;
|
||||||
margin-bottom: .25rem;
|
margin-bottom: .3rem;
|
||||||
font-size: 1rem;
|
font-size: .9rem;
|
||||||
|
|
||||||
|
&.tile-info {
|
||||||
|
padding: .5rem;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.actors {
|
.actors {
|
||||||
|
@ -246,7 +270,7 @@ const favorited = ref(props.movie.stashes.some((movieStash) => movieStash.id ===
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
font-size: .9rem;
|
font-size: .9rem;
|
||||||
padding: 0 .5rem;
|
padding: 0 .5rem;
|
||||||
margin-bottom: .35rem;
|
margin-bottom: .3rem;
|
||||||
line-height: 1.35;
|
line-height: 1.35;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
"vue-virtual-scroller": "^2.0.0-beta.8",
|
"vue-virtual-scroller": "^2.0.0-beta.8",
|
||||||
"winston": "^3.11.0",
|
"winston": "^3.11.0",
|
||||||
"winston-daily-rotate-file": "^4.7.1",
|
"winston-daily-rotate-file": "^4.7.1",
|
||||||
|
"yaml": "^2.4.2",
|
||||||
"yargs": "^17.7.2"
|
"yargs": "^17.7.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
@ -67,6 +68,7 @@
|
||||||
"@babel/plugin-transform-optional-chaining": "^7.23.4",
|
"@babel/plugin-transform-optional-chaining": "^7.23.4",
|
||||||
"@babel/preset-env": "^7.23.6",
|
"@babel/preset-env": "^7.23.6",
|
||||||
"@csstools/postcss-global-data": "^2.1.1",
|
"@csstools/postcss-global-data": "^2.1.1",
|
||||||
|
"@modyfi/vite-plugin-yaml": "^1.1.0",
|
||||||
"eslint": "^8.56.0",
|
"eslint": "^8.56.0",
|
||||||
"eslint-config-airbnb-base": "^15.0.0",
|
"eslint-config-airbnb-base": "^15.0.0",
|
||||||
"eslint-import-resolver-alias": "^1.1.2",
|
"eslint-import-resolver-alias": "^1.1.2",
|
||||||
|
@ -3140,6 +3142,20 @@
|
||||||
"@jridgewell/sourcemap-codec": "^1.4.14"
|
"@jridgewell/sourcemap-codec": "^1.4.14"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@modyfi/vite-plugin-yaml": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@modyfi/vite-plugin-yaml/-/vite-plugin-yaml-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-L26xfzkSo1yamODCAtk/ipVlL6OEw2bcJ92zunyHu8zxi7+meV0zefA9xscRMDCsMY8xL3C3wi3DhMiPxcbxbw==",
|
||||||
|
"dev": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@rollup/pluginutils": "5.1.0",
|
||||||
|
"js-yaml": "4.1.0",
|
||||||
|
"tosource": "2.0.0-alpha.3"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"vite": "^3.2.7 || ^4.0.5 || ^5.0.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@nicolo-ribaudo/chokidar-2": {
|
"node_modules/@nicolo-ribaudo/chokidar-2": {
|
||||||
"version": "2.1.8-no-fsevents.3",
|
"version": "2.1.8-no-fsevents.3",
|
||||||
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
|
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
|
||||||
|
@ -3462,11 +3478,39 @@
|
||||||
"node": ">= 10"
|
"node": ">= 10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@rollup/pluginutils": {
|
||||||
|
"version": "5.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
|
||||||
|
"integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
|
||||||
|
"dev": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@types/estree": "^1.0.0",
|
||||||
|
"estree-walker": "^2.0.2",
|
||||||
|
"picomatch": "^2.3.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"rollup": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@toycode/markdown-it-class": {
|
"node_modules/@toycode/markdown-it-class": {
|
||||||
"version": "1.2.4",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@toycode/markdown-it-class/-/markdown-it-class-1.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/@toycode/markdown-it-class/-/markdown-it-class-1.2.4.tgz",
|
||||||
"integrity": "sha512-hA4gHBK8moObkOYdWTjhy1wYcYy0MJeM3JjSKbsXHRpRMvIKhk6Jm+t3bXsSScTdz/byWqQbs8YIwVYjHp+SlQ=="
|
"integrity": "sha512-hA4gHBK8moObkOYdWTjhy1wYcYy0MJeM3JjSKbsXHRpRMvIKhk6Jm+t3bXsSScTdz/byWqQbs8YIwVYjHp+SlQ=="
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/estree": {
|
||||||
|
"version": "1.0.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
|
||||||
|
"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"node_modules/@types/json-schema": {
|
"node_modules/@types/json-schema": {
|
||||||
"version": "7.0.15",
|
"version": "7.0.15",
|
||||||
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
||||||
|
@ -9342,6 +9386,15 @@
|
||||||
"node": ">=0.6"
|
"node": ">=0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/tosource": {
|
||||||
|
"version": "2.0.0-alpha.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/tosource/-/tosource-2.0.0-alpha.3.tgz",
|
||||||
|
"integrity": "sha512-KAB2lrSS48y91MzFPFuDg4hLbvDiyTjOVgaK7Erw+5AmZXNq4sFRVn8r6yxSLuNs15PaokrDRpS61ERY9uZOug==",
|
||||||
|
"dev": true,
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/totalist": {
|
"node_modules/totalist": {
|
||||||
"version": "3.0.1",
|
"version": "3.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
|
||||||
|
@ -10551,6 +10604,17 @@
|
||||||
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
|
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"node_modules/yaml": {
|
||||||
|
"version": "2.4.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz",
|
||||||
|
"integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==",
|
||||||
|
"bin": {
|
||||||
|
"yaml": "bin.mjs"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 14"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/yargs": {
|
"node_modules/yargs": {
|
||||||
"version": "17.7.2",
|
"version": "17.7.2",
|
||||||
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
|
||||||
|
@ -12519,6 +12583,17 @@
|
||||||
"@jridgewell/sourcemap-codec": "^1.4.14"
|
"@jridgewell/sourcemap-codec": "^1.4.14"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"@modyfi/vite-plugin-yaml": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@modyfi/vite-plugin-yaml/-/vite-plugin-yaml-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-L26xfzkSo1yamODCAtk/ipVlL6OEw2bcJ92zunyHu8zxi7+meV0zefA9xscRMDCsMY8xL3C3wi3DhMiPxcbxbw==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"@rollup/pluginutils": "5.1.0",
|
||||||
|
"js-yaml": "4.1.0",
|
||||||
|
"tosource": "2.0.0-alpha.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
"@nicolo-ribaudo/chokidar-2": {
|
"@nicolo-ribaudo/chokidar-2": {
|
||||||
"version": "2.1.8-no-fsevents.3",
|
"version": "2.1.8-no-fsevents.3",
|
||||||
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
|
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
|
||||||
|
@ -12707,11 +12782,28 @@
|
||||||
"integrity": "sha512-8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw==",
|
"integrity": "sha512-8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw==",
|
||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
|
"@rollup/pluginutils": {
|
||||||
|
"version": "5.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
|
||||||
|
"integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"@types/estree": "^1.0.0",
|
||||||
|
"estree-walker": "^2.0.2",
|
||||||
|
"picomatch": "^2.3.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"@toycode/markdown-it-class": {
|
"@toycode/markdown-it-class": {
|
||||||
"version": "1.2.4",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@toycode/markdown-it-class/-/markdown-it-class-1.2.4.tgz",
|
"resolved": "https://registry.npmjs.org/@toycode/markdown-it-class/-/markdown-it-class-1.2.4.tgz",
|
||||||
"integrity": "sha512-hA4gHBK8moObkOYdWTjhy1wYcYy0MJeM3JjSKbsXHRpRMvIKhk6Jm+t3bXsSScTdz/byWqQbs8YIwVYjHp+SlQ=="
|
"integrity": "sha512-hA4gHBK8moObkOYdWTjhy1wYcYy0MJeM3JjSKbsXHRpRMvIKhk6Jm+t3bXsSScTdz/byWqQbs8YIwVYjHp+SlQ=="
|
||||||
},
|
},
|
||||||
|
"@types/estree": {
|
||||||
|
"version": "1.0.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
|
||||||
|
"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"@types/json-schema": {
|
"@types/json-schema": {
|
||||||
"version": "7.0.15",
|
"version": "7.0.15",
|
||||||
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
||||||
|
@ -16967,6 +17059,12 @@
|
||||||
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
|
||||||
"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
|
"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
|
||||||
},
|
},
|
||||||
|
"tosource": {
|
||||||
|
"version": "2.0.0-alpha.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/tosource/-/tosource-2.0.0-alpha.3.tgz",
|
||||||
|
"integrity": "sha512-KAB2lrSS48y91MzFPFuDg4hLbvDiyTjOVgaK7Erw+5AmZXNq4sFRVn8r6yxSLuNs15PaokrDRpS61ERY9uZOug==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"totalist": {
|
"totalist": {
|
||||||
"version": "3.0.1",
|
"version": "3.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
|
||||||
|
@ -17703,6 +17801,11 @@
|
||||||
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
|
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"yaml": {
|
||||||
|
"version": "2.4.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz",
|
||||||
|
"integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA=="
|
||||||
|
},
|
||||||
"yargs": {
|
"yargs": {
|
||||||
"version": "17.7.2",
|
"version": "17.7.2",
|
||||||
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
"vue-virtual-scroller": "^2.0.0-beta.8",
|
"vue-virtual-scroller": "^2.0.0-beta.8",
|
||||||
"winston": "^3.11.0",
|
"winston": "^3.11.0",
|
||||||
"winston-daily-rotate-file": "^4.7.1",
|
"winston-daily-rotate-file": "^4.7.1",
|
||||||
|
"yaml": "^2.4.2",
|
||||||
"yargs": "^17.7.2"
|
"yargs": "^17.7.2"
|
||||||
},
|
},
|
||||||
"type": "module",
|
"type": "module",
|
||||||
|
@ -68,6 +69,7 @@
|
||||||
"@babel/plugin-transform-optional-chaining": "^7.23.4",
|
"@babel/plugin-transform-optional-chaining": "^7.23.4",
|
||||||
"@babel/preset-env": "^7.23.6",
|
"@babel/preset-env": "^7.23.6",
|
||||||
"@csstools/postcss-global-data": "^2.1.1",
|
"@csstools/postcss-global-data": "^2.1.1",
|
||||||
|
"@modyfi/vite-plugin-yaml": "^1.1.0",
|
||||||
"eslint": "^8.56.0",
|
"eslint": "^8.56.0",
|
||||||
"eslint-config-airbnb-base": "^15.0.0",
|
"eslint-config-airbnb-base": "^15.0.0",
|
||||||
"eslint-import-resolver-alias": "^1.1.2",
|
"eslint-import-resolver-alias": "^1.1.2",
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
<div class="poster-link">
|
<div class="poster-link">
|
||||||
<img
|
<img
|
||||||
:src="getPath(scene.poster, 'thumbnail')"
|
:src="getPath(scene.poster, 'thumbnail')"
|
||||||
:style="{ 'background-image': getPath(scene.poster, 'lazy') }"
|
:style="{ 'background-image': `url(${getPath(scene.poster, 'lazy')}` }"
|
||||||
:width="scene.poster.width"
|
:width="scene.poster.width"
|
||||||
:height="scene.poster.height"
|
:height="scene.poster.height"
|
||||||
class="poster"
|
class="poster"
|
||||||
|
@ -170,6 +170,22 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="scene.movies.length > 0"
|
||||||
|
class="section"
|
||||||
|
>
|
||||||
|
<h3 class="heading">Part of</h3>
|
||||||
|
|
||||||
|
<div class="movies">
|
||||||
|
<MovieTile
|
||||||
|
v-for="movie in scene.movies"
|
||||||
|
:key="`movie-${movie.id}`"
|
||||||
|
:movie="movie"
|
||||||
|
:details="false"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="scene.description"
|
v-if="scene.description"
|
||||||
class="section"
|
class="section"
|
||||||
|
@ -223,6 +239,28 @@
|
||||||
{{ scene.comment }}
|
{{ scene.comment }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="summary"
|
||||||
|
class="section summary"
|
||||||
|
>
|
||||||
|
<h3 class="heading">Summary</h3>
|
||||||
|
|
||||||
|
<div class="detail">
|
||||||
|
<input
|
||||||
|
class="input"
|
||||||
|
:value="summary"
|
||||||
|
@focus="$event.target.select()"
|
||||||
|
>
|
||||||
|
|
||||||
|
<Icon
|
||||||
|
v-tooltip="'Copy to clipboard'"
|
||||||
|
icon="copy"
|
||||||
|
class="copy"
|
||||||
|
@click="copySummary"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -235,15 +273,20 @@ import { formatDate, formatDuration } from '#/utils/format.js';
|
||||||
import getPath from '#/src/get-path.js';
|
import getPath from '#/src/get-path.js';
|
||||||
|
|
||||||
import ActorTile from '#/components/actors/tile.vue';
|
import ActorTile from '#/components/actors/tile.vue';
|
||||||
|
import MovieTile from '#/components/movies/tile.vue';
|
||||||
import Player from '#/components/video/player.vue';
|
import Player from '#/components/video/player.vue';
|
||||||
import Heart from '#/components/stashes/heart.vue';
|
import Heart from '#/components/stashes/heart.vue';
|
||||||
|
|
||||||
|
import summaryTemplate from '#/assets/summary.yaml';
|
||||||
|
|
||||||
const { pageProps } = inject('pageContext');
|
const { pageProps } = inject('pageContext');
|
||||||
const { scene } = pageProps;
|
const { scene } = pageProps;
|
||||||
|
|
||||||
const playing = ref(false);
|
const playing = ref(false);
|
||||||
const paused = ref(false);
|
const paused = ref(false);
|
||||||
|
|
||||||
|
console.log(scene);
|
||||||
|
|
||||||
const poster = computed(() => {
|
const poster = computed(() => {
|
||||||
if (scene.poster) {
|
if (scene.poster) {
|
||||||
return getPath(scene.poster, 'thumbnail');
|
return getPath(scene.poster, 'thumbnail');
|
||||||
|
@ -259,6 +302,64 @@ const poster = computed(() => {
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const propProcessors = {
|
||||||
|
channel: (sceneInfo) => sceneInfo.channel?.name || sceneInfo.network?.name,
|
||||||
|
network: (sceneInfo) => sceneInfo.network?.name || sceneInfo.channel?.name,
|
||||||
|
actors: (sceneInfo) => sceneInfo.actors.map((actor) => actor.name),
|
||||||
|
movie: (sceneInfo) => sceneInfo.movies[0].title,
|
||||||
|
date: (sceneInfo, format) => formatDate(sceneInfo.effectiveDate, format),
|
||||||
|
};
|
||||||
|
|
||||||
|
function processTemplate(chain, delimit = ' ', wrapOpen = '', wrapClose = '') {
|
||||||
|
const results = chain.reduce((result, item) => {
|
||||||
|
if (typeof item === 'string') {
|
||||||
|
const [prop, format] = item.split('|');
|
||||||
|
const value = propProcessors[prop]?.(scene, format) || scene[prop];
|
||||||
|
|
||||||
|
if (Array.isArray(value)) {
|
||||||
|
return result.concat(value.join(format || ', '));
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.concat(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Array.isArray(item)) {
|
||||||
|
const values = processTemplate(item, ', ');
|
||||||
|
|
||||||
|
return result.concat(values);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof item === 'object') {
|
||||||
|
const [meta, items] = Object.entries(item)[0];
|
||||||
|
const [delimiter, wrapStart, wrapEnd] = meta.split('|');
|
||||||
|
const values = processTemplate(items, delimiter, wrapStart, wrapEnd);
|
||||||
|
|
||||||
|
return result.concat(values);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (results.length > 0) {
|
||||||
|
return `${wrapOpen}${results.filter(Boolean).join(delimit)}${wrapClose}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
const summary = (() => {
|
||||||
|
try {
|
||||||
|
return processTemplate(summaryTemplate);
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Failed to process template: ${error.message}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
|
||||||
|
function copySummary() {
|
||||||
|
navigator.clipboard.writeText(summary);
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
@ -502,6 +603,13 @@ const poster = computed(() => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.movies {
|
||||||
|
display: grid;
|
||||||
|
flex-grow: 1;
|
||||||
|
grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
|
||||||
|
gap: .25rem;
|
||||||
|
}
|
||||||
|
|
||||||
.section {
|
.section {
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
@ -529,6 +637,28 @@ const poster = computed(() => {
|
||||||
margin-left: .25rem;
|
margin-left: .25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.summary {
|
||||||
|
.detail {
|
||||||
|
display: flex;
|
||||||
|
align-items: stretch;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input {
|
||||||
|
flex-grow: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon {
|
||||||
|
height: auto;
|
||||||
|
padding: 0 .5rem 0 .75rem;
|
||||||
|
fill: var(--shadow);
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
fill: var(--primary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.compact-show {
|
.compact-show {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,7 @@ function curateMedia(media) {
|
||||||
isS3: media.is_s3,
|
isS3: media.is_s3,
|
||||||
width: media.width,
|
width: media.width,
|
||||||
height: media.height,
|
height: media.height,
|
||||||
|
index: media.index,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,6 +74,12 @@ function curateScene(rawScene, assets) {
|
||||||
slug: tag.slug,
|
slug: tag.slug,
|
||||||
name: tag.name,
|
name: tag.name,
|
||||||
})),
|
})),
|
||||||
|
movies: assets.movies.map((movie) => ({
|
||||||
|
id: movie.id,
|
||||||
|
slug: movie.slug,
|
||||||
|
title: movie.title,
|
||||||
|
covers: movie.movie_covers?.map((cover) => curateMedia(cover)).toSorted((coverA, coverB) => coverA.index - coverB.index) || [],
|
||||||
|
})),
|
||||||
poster: curateMedia(assets.poster),
|
poster: curateMedia(assets.poster),
|
||||||
trailer: curateMedia(assets.trailer),
|
trailer: curateMedia(assets.trailer),
|
||||||
teaser: curateMedia(assets.teaser),
|
teaser: curateMedia(assets.teaser),
|
||||||
|
@ -91,6 +98,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
|
||||||
actors,
|
actors,
|
||||||
directors,
|
directors,
|
||||||
tags,
|
tags,
|
||||||
|
movies,
|
||||||
posters,
|
posters,
|
||||||
photos,
|
photos,
|
||||||
trailers,
|
trailers,
|
||||||
|
@ -126,6 +134,13 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
|
||||||
.whereNotNull('tags.id')
|
.whereNotNull('tags.id')
|
||||||
.whereIn('release_id', sceneIds)
|
.whereIn('release_id', sceneIds)
|
||||||
.orderBy('priority', 'desc'),
|
.orderBy('priority', 'desc'),
|
||||||
|
movies: knex('movies_scenes')
|
||||||
|
.select('movies_scenes.scene_id', 'movies.*', knex.raw('json_agg(media) as movie_covers'))
|
||||||
|
.leftJoin('movies', 'movies.id', 'movies_scenes.movie_id')
|
||||||
|
.leftJoin('movies_covers', 'movies_covers.movie_id', 'movies.id')
|
||||||
|
.leftJoin('media', 'media.id', 'movies_covers.media_id')
|
||||||
|
.whereIn('scene_id', sceneIds)
|
||||||
|
.groupBy('movies.id', 'movies_scenes.scene_id'),
|
||||||
posters: knex('releases_posters')
|
posters: knex('releases_posters')
|
||||||
.whereIn('release_id', sceneIds)
|
.whereIn('release_id', sceneIds)
|
||||||
.leftJoin('media', 'media.id', 'releases_posters.media_id'),
|
.leftJoin('media', 'media.id', 'releases_posters.media_id'),
|
||||||
|
@ -183,10 +198,13 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log(movies);
|
||||||
|
|
||||||
const sceneChannel = channels.find((entity) => entity.id === scene.entity_id);
|
const sceneChannel = channels.find((entity) => entity.id === scene.entity_id);
|
||||||
const sceneActors = actors.filter((actor) => actor.release_id === sceneId);
|
const sceneActors = actors.filter((actor) => actor.release_id === sceneId);
|
||||||
const sceneDirectors = directors.filter((director) => director.release_id === sceneId);
|
const sceneDirectors = directors.filter((director) => director.release_id === sceneId);
|
||||||
const sceneTags = tags.filter((tag) => tag.release_id === sceneId);
|
const sceneTags = tags.filter((tag) => tag.release_id === sceneId);
|
||||||
|
const sceneMovies = movies.filter((movie) => movie.scene_id === sceneId);
|
||||||
const scenePoster = posters.find((poster) => poster.release_id === sceneId);
|
const scenePoster = posters.find((poster) => poster.release_id === sceneId);
|
||||||
const scenePhotos = photos.filter((photo) => photo.release_id === sceneId);
|
const scenePhotos = photos.filter((photo) => photo.release_id === sceneId);
|
||||||
const sceneTrailers = trailers.find((trailer) => trailer.release_id === sceneId);
|
const sceneTrailers = trailers.find((trailer) => trailer.release_id === sceneId);
|
||||||
|
@ -199,6 +217,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
|
||||||
actors: sceneActors,
|
actors: sceneActors,
|
||||||
directors: sceneDirectors,
|
directors: sceneDirectors,
|
||||||
tags: sceneTags,
|
tags: sceneTags,
|
||||||
|
movies: sceneMovies,
|
||||||
poster: scenePoster,
|
poster: scenePoster,
|
||||||
photos: scenePhotos,
|
photos: scenePhotos,
|
||||||
trailer: sceneTrailers,
|
trailer: sceneTrailers,
|
||||||
|
|
|
@ -4,6 +4,7 @@ import vike from 'vike/plugin'; // eslint-disable-line import/extensions
|
||||||
import postCssGlobalData from '@csstools/postcss-global-data';
|
import postCssGlobalData from '@csstools/postcss-global-data';
|
||||||
import postCssNesting from 'postcss-nesting';
|
import postCssNesting from 'postcss-nesting';
|
||||||
import postCssCustomMedia from 'postcss-custom-media';
|
import postCssCustomMedia from 'postcss-custom-media';
|
||||||
|
import ViteYaml from '@modyfi/vite-plugin-yaml';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
plugins: [
|
plugins: [
|
||||||
|
@ -21,6 +22,7 @@ export default {
|
||||||
},
|
},
|
||||||
trailingSlash: true, // for some reason /tags breaks without this, ERR_TOO_MANY_REDIRECTS
|
trailingSlash: true, // for some reason /tags breaks without this, ERR_TOO_MANY_REDIRECTS
|
||||||
}),
|
}),
|
||||||
|
ViteYaml(),
|
||||||
],
|
],
|
||||||
css: {
|
css: {
|
||||||
postcss: {
|
postcss: {
|
||||||
|
|
Loading…
Reference in New Issue