Compare commits

...

3 Commits

Author SHA1 Message Date
DebaucheryLibrarian 1238f90268 1.158.0 2021-01-17 23:31:57 +01:00
DebaucheryLibrarian 1dea94c0cf Improved compact scene tile layout, added dark versions of entity favicons. 2021-01-17 23:31:49 +01:00
DebaucheryLibrarian dd5284c55a Fixed scroll to top. 2021-01-17 21:24:20 +01:00
222 changed files with 286 additions and 159 deletions

View File

@ -408,7 +408,7 @@ export default {
actor: null, actor: null,
releases: null, releases: null,
totalCount: 0, totalCount: 0,
limit: 15, limit: 20,
pageTitle: null, pageTitle: null,
bioExpanded: false, bioExpanded: false,
photosExpanded: false, photosExpanded: false,

View File

@ -59,6 +59,7 @@
</nav> </nav>
<Pagination <Pagination
ref="pagination"
:items-total="totalCount" :items-total="totalCount"
:items-per-page="limit" :items-per-page="limit"
/> />
@ -99,6 +100,8 @@ async function fetchActors() {
this.actors = actors; this.actors = actors;
this.totalCount = totalCount; this.totalCount = totalCount;
this.$refs.pagination.$el.scrollIntoView();
} }
function letter() { function letter() {
@ -130,7 +133,7 @@ export default {
actors: [], actors: [],
pageTitle: null, pageTitle: null,
totalCount: 0, totalCount: 0,
limit: 30, limit: 50,
letters: ['all'].concat(Array.from({ length: 26 }, (value, index) => String.fromCharCode(index + 97).toUpperCase())), letters: ['all'].concat(Array.from({ length: 26 }, (value, index) => String.fromCharCode(index + 97).toUpperCase())),
}; };
}, },

View File

@ -20,8 +20,11 @@
@show-filters="(state) => toggleFilters(state)" @show-filters="(state) => toggleFilters(state)"
/> />
<div class="content"> <div
<router-view /> ref="content"
class="content"
>
<router-view @scroll="scrollToTop" />
</div> </div>
<Filters <Filters
@ -68,6 +71,10 @@ function resize(event) {
this.events.emit('resize', event); this.events.emit('resize', event);
} }
function scrollToTop() {
this.$refs.content.scrollTop = 0;
}
function mounted() { function mounted() {
document.addEventListener('click', this.blur); document.addEventListener('click', this.blur);
window.addEventListener('resize', this.resize); window.addEventListener('resize', this.resize);
@ -100,6 +107,7 @@ export default {
setConsent, setConsent,
blur, blur,
resize, resize,
scrollToTop,
}, },
}; };
</script> </script>

View File

@ -75,10 +75,7 @@
</router-link> </router-link>
</div> </div>
<div <div class="content-inner">
ref="content"
class="content-inner"
>
<Scroll <Scroll
v-if="entity.children.length > 0" v-if="entity.children.length > 0"
v-slot="scroll" v-slot="scroll"
@ -94,6 +91,7 @@
</Scroll> </Scroll>
<FilterBar <FilterBar
ref="filter"
:fetch-releases="fetchEntity" :fetch-releases="fetchEntity"
:items-total="totalCount" :items-total="totalCount"
:items-per-page="limit" :items-per-page="limit"
@ -115,8 +113,6 @@
</template> </template>
<script> <script>
import { nextTick } from 'vue';
import FilterBar from '../filters/filter-bar.vue'; import FilterBar from '../filters/filter-bar.vue';
import Pagination from '../pagination/pagination.vue'; import Pagination from '../pagination/pagination.vue';
import Releases from '../releases/releases.vue'; import Releases from '../releases/releases.vue';
@ -137,9 +133,7 @@ async function fetchEntity() {
this.pageTitle = entity.name; this.pageTitle = entity.name;
nextTick(() => { this.$refs.filter.$el.scrollIntoView();
this.$refs.content.scrollTop = 0;
});
} }
async function mounted() { async function mounted() {

View File

@ -1,10 +1,8 @@
<template> <template>
<div class="home"> <div class="home">
<div <div class="content-inner">
ref="content"
class="content-inner"
>
<FilterBar <FilterBar
ref="filter"
:fetch-releases="fetchReleases" :fetch-releases="fetchReleases"
:is-home="true" :is-home="true"
:items-total="totalCount" :items-total="totalCount"
@ -41,7 +39,7 @@ async function fetchReleases() {
this.totalCount = totalCount; this.totalCount = totalCount;
this.releases = releases; this.releases = releases;
this.$refs.content.scrollTop = 0; this.$refs.filter.$el.scrollIntoView();
} }
async function mounted() { async function mounted() {
@ -61,7 +59,7 @@ export default {
releases: [], releases: [],
networks: [], networks: [],
pageTitle: null, pageTitle: null,
limit: 20, limit: 30,
totalCount: 0, totalCount: 0,
from: null, from: null,
}; };

View File

@ -170,6 +170,7 @@ export default {
grid-template-columns: repeat(auto-fill, minmax(25rem, 1fr)); grid-template-columns: repeat(auto-fill, minmax(25rem, 1fr));
grid-gap: 1rem; grid-gap: 1rem;
justify-content: center; justify-content: center;
padding: 1rem;
margin: 0 0 1rem 0; margin: 0 0 1rem 0;
} }
} }
@ -250,7 +251,7 @@ export default {
} }
.trailer-container { .trailer-container {
max-height: 18rem; height: 18rem;
width: 32rem; width: 32rem;
max-width: 100%; max-width: 100%;
} }

View File

@ -71,7 +71,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import 'theme'; @import 'breakpoints';
.heading { .heading {
padding: 0; padding: 0;
@ -111,15 +111,9 @@ export default {
font-weight: bold; font-weight: bold;
} }
@media(max-width: $breakpoint3) { @media(max-width: $breakpoint-kilo) {
.tiles { .tiles {
grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr)); grid-gap: .5rem;
}
}
@media(max-width: $breakpoint2) {
.tiles {
grid-template-columns: repeat(auto-fill, minmax(18rem, 1fr));
} }
} }
</style> </style>

View File

@ -4,6 +4,7 @@
:class="{ new: release.isNew }" :class="{ new: release.isNew }"
class="tile" class="tile"
> >
<div class="tile-body">
<span class="poster"> <span class="poster">
<a <a
:href="`/scene/${release.id}/${release.slug || ''}`" :href="`/scene/${release.id}/${release.slug || ''}`"
@ -41,11 +42,14 @@
class="thumbnail" class="thumbnail"
>No thumbnail available</div> >No thumbnail available</div>
</a> </a>
<Details :release="release" />
</span> </span>
<div class="info"> <div class="info">
<Details
:release="release"
class="details-wide"
/>
<a <a
:href="`/scene/${release.id}/${release.slug || ''}`" :href="`/scene/${release.id}/${release.slug || ''}`"
target="_blank" target="_blank"
@ -121,6 +125,12 @@
</div> </div>
</div> </div>
</div> </div>
<Details
:release="release"
class="details-compact"
/>
</div>
</template> </template>
<script> <script>
@ -147,7 +157,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import 'theme'; @import 'breakpoints';
.tile { .tile {
background: var(--background); background: var(--background);
@ -172,9 +182,13 @@ export default {
} }
} }
.tile-body {
display: flex;
flex-direction: column;
}
.poster { .poster {
position: relative; position: relative;
margin: 0 0 .6rem 0;
} }
.covers { .covers {
@ -213,6 +227,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-grow: 1; flex-grow: 1;
overflow: hidden;
} }
.link { .link {
@ -298,4 +313,53 @@ export default {
color: var(--primary); color: var(--primary);
} }
} }
.details-wide {
margin: 0 0 .5rem 0;
}
.details-compact {
display: none;
}
@media(max-width: $breakpoint-kilo) {
.tile-body {
flex-direction: row;
}
.poster {
margin: 0;
}
.thumbnail {
width: 9rem;
height: 100%;
}
.info {
padding: .5rem .25rem 0 .25rem;
}
.row {
margin: 0 0 .15rem 0;
}
.title,
.actor-link {
font-size: .9rem;
}
.details-wide {
display: none;
}
.details-compact {
display: flex;
border-top: solid 1px var(--shadow-hint);
}
.shoot {
display: none;
}
}
</style> </style>

View File

@ -12,10 +12,17 @@
:title="`Part of ${release.entity.parent.name}`" :title="`Part of ${release.entity.parent.name}`"
:to="`/${release.entity.parent.type}/${release.entity.parent.slug}`" :to="`/${release.entity.parent.type}/${release.entity.parent.slug}`"
class="site-link" class="site-link"
><img >
:src="`/img/logos/${release.entity.parent.slug}/favicon.png`" <img
class="favicon" :src="`/img/logos/${release.entity.parent.slug}/favicon_light.png`"
></router-link> class="favicon favicon-light"
>
<img
:src="`/img/logos/${release.entity.parent.slug}/favicon_dark.png`"
class="favicon favicon-dark"
>
</router-link>
<router-link <router-link
v-tooltip.bottom="`More from ${release.entity.name}`" v-tooltip.bottom="`More from ${release.entity.name}`"
@ -29,10 +36,17 @@
v-else v-else
:to="`/${release.entity.type}/${release.entity.slug}`" :to="`/${release.entity.type}/${release.entity.slug}`"
class="site site-link" class="site site-link"
><img >
:src="`/img/logos/${release.entity.slug}/favicon.png`" <img
class="favicon" :src="`/img/logos/${release.entity.slug}/favicon_light.png`"
>{{ release.entity.name }}</router-link> class="favicon favicon-light"
>
<img
:src="`/img/logos/${release.entity.slug}/favicon_dark.png`"
class="favicon favicon-dark"
>{{ release.entity.name }}
</router-link>
<a <a
v-if="release.date" v-if="release.date"
@ -68,6 +82,8 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import 'breakpoints';
.details { .details {
width: 100%; width: 100%;
display: flex; display: flex;
@ -79,8 +95,9 @@ export default {
box-shadow: 0 0 3px var(--darken); box-shadow: 0 0 3px var(--darken);
.favicon { .favicon {
width: 1rem; height: 2rem;
margin: 0 .25rem 0 0; box-sizing: border-box;
padding: .5rem;
} }
/* /*
@ -115,9 +132,43 @@ export default {
} }
} }
.site {
padding: 0 .5rem 0 0;
}
.site-link { .site-link {
display: flex; display: flex;
color: var(--text-light); color: var(--text-light);
text-decoration: none; text-decoration: none;
} }
.favicon-dark {
display: none;
}
@media(max-width: $breakpoint-kilo) {
/* light details bar
.details {
background: var(--background);
box-shadow: none;
.favicon-dark {
display: inline-block;
}
.favicon-light {
display: none;
}
}
.site-link,
.date {
color: var(--text);
}
*/
.site {
padding: 0 .5rem 0 0;
}
}
</style> </style>

View File

@ -210,17 +210,21 @@ export default {
padding: 1rem .5rem 1rem 2rem; padding: 1rem .5rem 1rem 2rem;
} }
.scroll-light .expand-dark { .scroll .expand-light {
display: none; display: none;
} }
.scroll-light {
.expand-light {
display: block;
}
.expand-dark {
display: none;
}
}
.scroll-dark .expand-light { .scroll-dark .expand-light {
display: none; display: none;
} }
@media(max-width: $breakpoint) {
.scroll-button {
display: none;
}
}
</style> </style>

View File

@ -31,7 +31,11 @@
/> />
</Scroll> </Scroll>
<FilterBar :fetch-releases="fetchReleases" /> <FilterBar
ref="filter"
:fetch-releases="fetchReleases"
/>
<Releases :releases="releases" /> <Releases :releases="releases" />
<Pagination <Pagination
@ -73,6 +77,8 @@ async function fetchReleases() {
this.hasMedia = this.tag.poster || this.tag.photos.length > 0; this.hasMedia = this.tag.poster || this.tag.photos.length > 0;
this.description = this.tag.description && converter.makeHtml(escapeHtml(this.tag.description)); this.description = this.tag.description && converter.makeHtml(escapeHtml(this.tag.description));
this.$refs.filter.$el.scrollIntoView();
} }
async function mounted() { async function mounted() {
@ -94,7 +100,7 @@ export default {
description: null, description: null,
releases: null, releases: null,
totalCount: 0, totalCount: 0,
limit: 15, limit: 20,
pageTitle: null, pageTitle: null,
hasMedia: false, hasMedia: false,
expanded: false, expanded: false,

View File

@ -191,6 +191,9 @@ const routes = [
const router = createRouter({ const router = createRouter({
history: createWebHistory(), history: createWebHistory(),
routes, routes,
scrollBehavior(to, from, savedPosition) {
console.log(to, from, savedPosition);
},
}); });
export default router; export default router;

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.157.0", "version": "1.158.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.157.0", "version": "1.158.0",
"description": "All the latest porn releases in one place", "description": "All the latest porn releases in one place",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1018 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 923 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1006 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1012 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 988 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 931 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Some files were not shown because too many files have changed in this diff Show More