From bf223adc5560f5c74f7070cd8c52e882b5b7ad2f Mon Sep 17 00:00:00 2001 From: Niels Simenon Date: Thu, 14 Nov 2019 05:13:38 +0100 Subject: [PATCH] Redesigned release page. Added 'single site' marker, linking directly to network page. Fixed Dogfart scraper duration. --- assets/components/home/filters.vue | 1 - assets/components/network/network.vue | 31 +- assets/components/release/banner.vue | 2 +- assets/components/release/release.vue | 407 ++++++++++++++++------- assets/components/tag/tag.vue | 10 +- assets/components/tile/actor.vue | 40 +++ assets/components/tile/release.vue | 27 +- assets/components/tile/site.vue | 1 + assets/css/_states.scss | 12 + assets/css/_theme.scss | 2 + assets/img/key.svg | 5 + assets/img/key2.svg | 5 + assets/img/key5.svg | 5 + assets/img/lock.svg | 5 + assets/img/new.svg | 5 + assets/img/price-tag2.svg | 5 + assets/img/price-tag4.svg | 5 + assets/img/price-tags3.svg | 6 + assets/img/user6.svg | 8 + assets/img/users4.svg | 7 + assets/img/vcard.svg | 5 + assets/img/video-camera2.svg | 5 + public/css/style.css | 182 +++++++--- public/img/logos/brazzers/network.png | Bin 2122 -> 13978 bytes public/img/logos/mikeadriano/network.png | Bin 0 -> 6970 bytes public/img/logos/vixen/blacked.png | Bin 59602 -> 49253 bytes public/img/logos/vixen/blackedraw.png | Bin 14753 -> 10397 bytes public/img/logos/vixen/deeper.png | Bin 5371 -> 5325 bytes public/img/logos/vixen/network.png | Bin 173586 -> 140935 bytes public/img/logos/vixen/tushy.png | Bin 14139 -> 14099 bytes public/img/logos/vixen/tushyraw.png | Bin 11615 -> 8730 bytes public/img/logos/vixen/vixen.png | Bin 173586 -> 140935 bytes seeds/01_sites.js | 2 + seeds/02_tags.js | 3 + src/networks.js | 19 +- src/releases.js | 14 +- src/scrapers/dogfart.js | 4 +- src/sites.js | 6 +- 38 files changed, 624 insertions(+), 205 deletions(-) create mode 100644 assets/components/tile/actor.vue create mode 100644 assets/img/key.svg create mode 100644 assets/img/key2.svg create mode 100644 assets/img/key5.svg create mode 100644 assets/img/lock.svg create mode 100644 assets/img/new.svg create mode 100644 assets/img/price-tag2.svg create mode 100644 assets/img/price-tag4.svg create mode 100644 assets/img/price-tags3.svg create mode 100644 assets/img/user6.svg create mode 100644 assets/img/users4.svg create mode 100644 assets/img/vcard.svg create mode 100644 assets/img/video-camera2.svg create mode 100644 public/img/logos/mikeadriano/network.png diff --git a/assets/components/home/filters.vue b/assets/components/home/filters.vue index c5ffe950..858a6704 100644 --- a/assets/components/home/filters.vue +++ b/assets/components/home/filters.vue @@ -157,7 +157,6 @@ export default { padding: .5rem; margin: 0 .25rem; border: solid 1px transparent; - border-radius: .5rem; font-size: .9rem; font-weight: bold; cursor: pointer; diff --git a/assets/components/network/network.vue b/assets/components/network/network.vue index 01c62d4c..99b0480d 100644 --- a/assets/components/network/network.vue +++ b/assets/components/network/network.vue @@ -12,11 +12,10 @@ rel="noopener noreferrer" class="title" > - + > {{ network.description }}

-

Sites

+

Latest releases

@@ -60,7 +61,9 @@ async function mounted() { [this.network] = await this.$store.dispatch('fetchNetworks', this.$route.params.networkSlug); this.releases = await this.$store.dispatch('fetchNetworkReleases', this.$route.params.networkSlug); - this.sites = this.network.sites.sort(({ name: nameA }, { name: nameB }) => nameA.localeCompare(nameB)); + this.sites = this.network.sites + .filter(site => !site.independent) + .sort(({ name: nameA }, { name: nameB }) => nameA.localeCompare(nameB)); this.pageTitle = this.network.name; } diff --git a/assets/components/release/banner.vue b/assets/components/release/banner.vue index 650515d2..cba68eeb 100644 --- a/assets/components/release/banner.vue +++ b/assets/components/release/banner.vue @@ -77,7 +77,6 @@ export default { flex-shrink: 0; white-space: nowrap; overflow-x: auto; - margin: 0 0 1rem 0; scrollbar-width: none; box-shadow: 0 0 3px $shadow; font-size: 0; @@ -97,6 +96,7 @@ export default { } .item { + height: 100%; max-height: 18rem; vertical-align: middle; } diff --git a/assets/components/release/release.vue b/assets/components/release/release.vue index b40b5aa6..8c3bbc44 100644 --- a/assets/components/release/release.vue +++ b/assets/components/release/release.vue @@ -5,117 +5,193 @@ > -

{{ release.title }}

- - + v-if="release.date" + :title="`View scene on ${release.site.name}`" + :href="release.url" + target="_blank" + rel="noopener noreferrer" + class="tidbit date link hideable" + > + + {{ formatDate(release.date, 'MMMM D, YYYY') }} + - - + + + {{ formatDate(release.date, 'MMM D, YYYY') }} + - {{ formatDate(release.date, 'MMMM D, YYYY') }} - + + + {{ release.shootId }} + - - + + + + {{ Math.floor(release.duration / 3600) }}: + {{ Math.floor((release.duration % 3600) / 60).toString().padStart(2, '0') }}: + {{ (release.duration % 60).toString().padStart(2, '0') }} + + + + + + + + + + + + + +
+

{{ release.title }}

+ +
+ + +
    +
  • + +
    • +
+
+ +
+ + + +
+ +

+ + {{ release.description }} +

+ +
+ - + class="link" + >{{ release.studio.name }} +
{{ release.network.name }}: - - {{ release.site.name }} - - -

- - - {{ Math.floor(release.duration / 3600) }}: - {{ Math.floor((release.duration % 3600) / 60).toString().padStart(2, '0') }}: - {{ (release.duration % 60).toString().padStart(2, '0') }} -

- -

- - {{ release.description }} -

- - - - - - - {{ formatDate(release.dateAdded, 'MMMM D, YYYY') }} - + class="row shoot showable" + > + {{ release.shootId }} + + +
+ + + {{ Math.floor(release.duration / 3600) }}: + {{ Math.floor((release.duration % 3600) / 60).toString().padStart(2, '0') }}: + {{ (release.duration % 60).toString().padStart(2, '0') }} +
+ + + + + {{ formatDate(release.dateAdded, 'MMMM D, YYYY') }} + +
+ + diff --git a/assets/components/tile/release.vue b/assets/components/tile/release.vue index fa077aa5..a788c89b 100644 --- a/assets/components/tile/release.vue +++ b/assets/components/tile/release.vue @@ -3,6 +3,13 @@