diff --git a/assets/components/entities/entity.vue b/assets/components/entities/entity.vue index 3000cc62..ea752bfe 100644 --- a/assets/components/entities/entity.vue +++ b/assets/components/entities/entity.vue @@ -222,7 +222,6 @@ export default { padding: 1rem; background: var(--profile); border-bottom: solid 1px var(--lighten-hint); - box-shadow: inset 0 0 3px var(--darken); .link { display: flex; diff --git a/assets/components/tags/tags.vue b/assets/components/tags/tags.vue index 4c300fe3..1c310d71 100644 --- a/assets/components/tags/tags.vue +++ b/assets/components/tags/tags.vue @@ -147,7 +147,7 @@ export default { .tiles { display: grid; grid-template-columns: repeat(auto-fill, minmax(23rem, .33fr)); - grid-gap: 1rem; + grid-gap: .5rem; margin: 0 0 1.5rem 0; } @@ -170,7 +170,7 @@ export default { @media(max-width: $breakpoint0) { .tiles { - grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(11rem, 1fr)); } } diff --git a/assets/components/tags/tile.vue b/assets/components/tags/tile.vue index ddea41a1..382ef6d6 100644 --- a/assets/components/tags/tile.vue +++ b/assets/components/tags/tile.vue @@ -4,8 +4,6 @@ :title="tag.name" class="tile" > - {{ tag.name }} - + + {{ tag.name }} @@ -71,12 +71,12 @@ export default { .tile { color: var(--text-light); - background: var(--profile); display: flex; flex-direction: column; justify-content: flex-end; box-sizing: border-box; position: relative; + text-decoration: none; box-shadow: 0 0 3px var(--darken-weak); overflow: hidden; } @@ -104,4 +104,17 @@ export default { text-shadow: 0 0 3px var(--darken-strong); text-overflow: ellipsis; } + +@media(max-width: $breakpoint) { + .tile { + position: initial; + } + + .title { + position: initial; + color: var(--text); + background: var(--background); + text-shadow: none; + } +} diff --git a/assets/js/fragments.js b/assets/js/fragments.js index 16db0748..9dd0228c 100644 --- a/assets/js/fragments.js +++ b/assets/js/fragments.js @@ -56,7 +56,7 @@ const actorFields = ` name slug } - originCountry: countryByBirthCountryAlpha2 { + birthCountry: countryByBirthCountryAlpha2 { alpha2 name alias diff --git a/public/img/tags/atm/thumbs/0.jpeg b/public/img/tags/atm/thumbs/0.jpeg index bfac366b..91aeb5b3 100644 Binary files a/public/img/tags/atm/thumbs/0.jpeg and b/public/img/tags/atm/thumbs/0.jpeg differ diff --git a/public/img/tags/atm/thumbs/1.jpeg b/public/img/tags/atm/thumbs/1.jpeg index 0e0101ee..fa328950 100644 Binary files a/public/img/tags/atm/thumbs/1.jpeg and b/public/img/tags/atm/thumbs/1.jpeg differ diff --git a/public/img/tags/atm/thumbs/2.jpeg b/public/img/tags/atm/thumbs/2.jpeg index dec9df92..86beb429 100644 Binary files a/public/img/tags/atm/thumbs/2.jpeg and b/public/img/tags/atm/thumbs/2.jpeg differ diff --git a/public/img/tags/atm/thumbs/3.jpeg b/public/img/tags/atm/thumbs/3.jpeg index 3e6fa2cf..4ac8f4fa 100644 Binary files a/public/img/tags/atm/thumbs/3.jpeg and b/public/img/tags/atm/thumbs/3.jpeg differ diff --git a/public/img/tags/atm/thumbs/4.jpeg b/public/img/tags/atm/thumbs/4.jpeg index 26da88fd..f8a4d568 100644 Binary files a/public/img/tags/atm/thumbs/4.jpeg and b/public/img/tags/atm/thumbs/4.jpeg differ diff --git a/public/img/tags/atm/thumbs/5.jpeg b/public/img/tags/atm/thumbs/5.jpeg index ce30fbcb..4212c721 100644 Binary files a/public/img/tags/atm/thumbs/5.jpeg and b/public/img/tags/atm/thumbs/5.jpeg differ diff --git a/public/img/tags/atm/thumbs/6.jpeg b/public/img/tags/atm/thumbs/6.jpeg index 95ec9e87..2b8208a7 100644 Binary files a/public/img/tags/atm/thumbs/6.jpeg and b/public/img/tags/atm/thumbs/6.jpeg differ diff --git a/public/img/tags/blowbang/thumbs/0.jpeg b/public/img/tags/blowbang/thumbs/0.jpeg index 45a65efb..56309ffa 100644 Binary files a/public/img/tags/blowbang/thumbs/0.jpeg and b/public/img/tags/blowbang/thumbs/0.jpeg differ diff --git a/public/img/tags/blowbang/thumbs/poster.jpeg b/public/img/tags/blowbang/thumbs/poster.jpeg index 0b426b0e..8432a855 100644 Binary files a/public/img/tags/blowbang/thumbs/poster.jpeg and b/public/img/tags/blowbang/thumbs/poster.jpeg differ diff --git a/public/img/tags/da-tp/thumbs/0.jpeg b/public/img/tags/da-tp/thumbs/0.jpeg index 186e079a..f961c752 100644 Binary files a/public/img/tags/da-tp/thumbs/0.jpeg and b/public/img/tags/da-tp/thumbs/0.jpeg differ diff --git a/public/img/tags/da-tp/thumbs/1.jpeg b/public/img/tags/da-tp/thumbs/1.jpeg index cc4d8063..070d9230 100644 Binary files a/public/img/tags/da-tp/thumbs/1.jpeg and b/public/img/tags/da-tp/thumbs/1.jpeg differ diff --git a/public/img/tags/da-tp/thumbs/2.jpeg b/public/img/tags/da-tp/thumbs/2.jpeg index 06cdf8d8..c3d3a816 100644 Binary files a/public/img/tags/da-tp/thumbs/2.jpeg and b/public/img/tags/da-tp/thumbs/2.jpeg differ diff --git a/public/img/tags/da-tp/thumbs/3.jpeg b/public/img/tags/da-tp/thumbs/3.jpeg index bae35573..c1392a75 100644 Binary files a/public/img/tags/da-tp/thumbs/3.jpeg and b/public/img/tags/da-tp/thumbs/3.jpeg differ diff --git a/public/img/tags/da-tp/thumbs/4.jpeg b/public/img/tags/da-tp/thumbs/4.jpeg index 50db217d..7cca0031 100644 Binary files a/public/img/tags/da-tp/thumbs/4.jpeg and b/public/img/tags/da-tp/thumbs/4.jpeg differ diff --git a/public/img/tags/da-tp/thumbs/5.jpeg b/public/img/tags/da-tp/thumbs/5.jpeg index f6bb83b1..b6b0d9a9 100644 Binary files a/public/img/tags/da-tp/thumbs/5.jpeg and b/public/img/tags/da-tp/thumbs/5.jpeg differ diff --git a/public/img/tags/double-vaginal/thumbs/0.jpeg b/public/img/tags/double-vaginal/thumbs/0.jpeg index 03ba8a4a..7e806c10 100644 Binary files a/public/img/tags/double-vaginal/thumbs/0.jpeg and b/public/img/tags/double-vaginal/thumbs/0.jpeg differ diff --git a/public/img/tags/double-vaginal/thumbs/poster.jpeg b/public/img/tags/double-vaginal/thumbs/poster.jpeg index d645d54c..615ced5f 100644 Binary files a/public/img/tags/double-vaginal/thumbs/poster.jpeg and b/public/img/tags/double-vaginal/thumbs/poster.jpeg differ diff --git a/public/img/tags/mfm/thumbs/0.jpeg b/public/img/tags/mfm/thumbs/0.jpeg index 7c480532..b2ed8114 100644 Binary files a/public/img/tags/mfm/thumbs/0.jpeg and b/public/img/tags/mfm/thumbs/0.jpeg differ diff --git a/public/img/tags/mfm/thumbs/1.jpeg b/public/img/tags/mfm/thumbs/1.jpeg index 485c526f..5e545d2e 100644 Binary files a/public/img/tags/mfm/thumbs/1.jpeg and b/public/img/tags/mfm/thumbs/1.jpeg differ diff --git a/public/img/tags/mfm/thumbs/2.jpeg b/public/img/tags/mfm/thumbs/2.jpeg index 00580c50..553093db 100644 Binary files a/public/img/tags/mfm/thumbs/2.jpeg and b/public/img/tags/mfm/thumbs/2.jpeg differ diff --git a/public/img/tags/mfm/thumbs/3.jpeg b/public/img/tags/mfm/thumbs/3.jpeg index 3b241699..8a60def1 100644 Binary files a/public/img/tags/mfm/thumbs/3.jpeg and b/public/img/tags/mfm/thumbs/3.jpeg differ diff --git a/public/img/tags/mfm/thumbs/4.jpeg b/public/img/tags/mfm/thumbs/4.jpeg index 31478339..18256787 100644 Binary files a/public/img/tags/mfm/thumbs/4.jpeg and b/public/img/tags/mfm/thumbs/4.jpeg differ diff --git a/public/img/tags/mfm/thumbs/6.jpeg b/public/img/tags/mfm/thumbs/6.jpeg index a69935f3..2a5ac920 100644 Binary files a/public/img/tags/mfm/thumbs/6.jpeg and b/public/img/tags/mfm/thumbs/6.jpeg differ diff --git a/public/img/tags/pussy-eating/thumbs/0.jpeg b/public/img/tags/pussy-eating/thumbs/0.jpeg index 7f78147f..9ce333dc 100644 Binary files a/public/img/tags/pussy-eating/thumbs/0.jpeg and b/public/img/tags/pussy-eating/thumbs/0.jpeg differ diff --git a/public/img/tags/squirting/thumbs/0.jpeg b/public/img/tags/squirting/thumbs/0.jpeg index 248a9332..5bff2563 100644 Binary files a/public/img/tags/squirting/thumbs/0.jpeg and b/public/img/tags/squirting/thumbs/0.jpeg differ diff --git a/src/argv.js b/src/argv.js index 632ce9eb..906d3119 100644 --- a/src/argv.js +++ b/src/argv.js @@ -46,10 +46,10 @@ const { argv } = yargs type: 'boolean', default: true, }) - .option('profiles', { + .option('scene-actors', { describe: 'Scrape profiles for new actors after fetching scenes', type: 'boolean', - alias: 'with-actors', + alias: 'with-profiles', default: false, }) .option('scene', { diff --git a/src/scrapers/mindgeek.js b/src/scrapers/mindgeek.js index 270ed5b8..f237a9b4 100644 --- a/src/scrapers/mindgeek.js +++ b/src/scrapers/mindgeek.js @@ -43,7 +43,7 @@ function scrapeLatestX(data, site) { description: data.description, }; - const hostname = site.parameters?.native ? site.url : site.network.url; + const hostname = site.parameters?.native ? site.url : site.parent.url; release.url = `${hostname}/scene/${release.entryId}/`; release.date = new Date(data.dateReleased); @@ -121,7 +121,7 @@ function getUrl(site) { } if (site.parameters?.siteId) { - return `${site.network.url}/scenes?site=${site.parameters.siteId}`; + return `${site.parent.url}/scenes?site=${site.parameters.siteId}`; } throw new Error(`Mind Geek site '${site.name}' (${site.url}) not supported`); diff --git a/src/store-releases.js b/src/store-releases.js index fe92785d..1d5aafe3 100644 --- a/src/store-releases.js +++ b/src/store-releases.js @@ -236,7 +236,7 @@ async function storeReleases(releases) { // media is more error-prone, associate separately await associateReleaseMedia(releasesWithId); - if (argv.withActors) { + if (argv.sceneActors) { await scrapeActors(actors.map(actor => actor.name)); }