DebaucheryLibrarian
/
traxxx
2
1
Fork 1
Code Issues 39 Pull Requests 1 Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:a0db2677ed5bab87ecf971dd39f51da597dad624
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental
..
compare: DebaucheryLibrarian:58f01a2f7504ea85661eb47584987ceb96e2cfc0
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental

No commits in common. "a0db2677ed5bab87ecf971dd39f51da597dad624" and "58f01a2f7504ea85661eb47584987ceb96e2cfc0" have entirely different histories.
a0db2677ed ... 58f01a2f75

10 changed files with 70 additions and 105 deletions
Show Stats Expand all files Collapse all files

2
assets/components/networks/network.vue
View File

@ -89,7 +89,7 @@ async function fetchNetwork() {
// .concat(this.studios)
.sort(({ name: nameA }, { name: nameB }) => nameA.localeCompare(nameB));
this.releases = this.network.releases;
this.releases = this.network.sites.map(site => site.releases).flat();
}
async function mounted() {

4
assets/js/actors/actions.js
View File

@ -52,7 +52,6 @@ function initActorActions(store, _router) {
$limit:Int = 1000,
$after:Date = "1900-01-01",
$before:Date = "2100-01-01",
$orderBy:[ReleasesActorsOrderBy!]
) {
actor: actorBySlug(slug: $actorSlug) {
id
@ -121,7 +120,7 @@ function initActorActions(store, _router) {
}
},
first: $limit,
orderBy: $orderBy
orderBy: RELEASE_BY_RELEASE_ID__DATE_DESC,
) {
release {
id
@ -152,7 +151,6 @@ function initActorActions(store, _router) {
limit,
after: store.getters.after,
before: store.getters.before,
orderBy: store.state.ui.range === 'upcoming' ? 'RELEASE_BY_RELEASE_ID__DATE_ASC' : 'RELEASE_BY_RELEASE_ID__DATE_DESC',
});
return curateActor(actor);

12
assets/js/curate.js
View File

@ -48,7 +48,7 @@ function curateSite(site, network) {
return curatedSite;
}
function curateNetwork(network, releases) {
function curateNetwork(network) {
const curatedNetwork = {
id: network.id,
name: network.name,
@ -56,9 +56,13 @@ function curateNetwork(network, releases) {
url: network.url,
};
if (network.sites) curatedNetwork.sites = network.sites.map(site => curateSite(site, curatedNetwork));
if (network.studios) curatedNetwork.studios = network.studios;
if (releases) curatedNetwork.releases = releases.map(release => curateRelease(release));
if (network.sites) {
curatedNetwork.sites = network.sites.map(site => curateSite(site, curatedNetwork));
}
if (network.studios) {
curatedNetwork.studios = network.studios;
}
return curatedNetwork;
}

37
assets/js/fragments.js
View File

@ -95,24 +95,6 @@ const releaseTrailerFragment = `
}
`;
const releaseFields = `
id
title
date
createdAt
url
${releaseActorsFragment}
${releaseTagsFragment}
${releasePosterFragment}
${siteFragment}
studio {
id
name
slug
url
}
`;
const releasesFragment = `
releases(
filter: {
@ -122,9 +104,23 @@ const releasesFragment = `
}
},
first: $limit,
orderBy: $orderBy,
orderBy: DATE_DESC,
) {
${releaseFields}
id
title
date
createdAt
url
${releaseActorsFragment}
${releaseTagsFragment}
${releasePosterFragment}
${siteFragment}
studio {
id
name
slug
url
}
}
`;
@ -155,7 +151,6 @@ const releaseFragment = `
export {
releaseActorsFragment,
releaseFields,
releaseTagsFragment,
releasePosterFragment,
releasePhotosFragment,

36
assets/js/networks/actions.js
View File

@ -1,16 +1,15 @@
import { graphql } from '../api';
import { sitesFragment, releaseFields } from '../fragments';
import { sitesFragment, releasesFragment } from '../fragments';
import { curateNetwork } from '../curate';
function initNetworksActions(store, _router) {
async function fetchNetworkBySlug(networkSlug, limit = 100) {
const { network, releases } = await graphql(`
const { network } = await graphql(`
query Network(
$networkSlug: String!
$limit:Int = 1000,
$after:Date = "1900-01-01",
$before:Date = "2100-01-01",
$orderBy: [ReleasesOrderBy!]
) {
network: networkBySlug(slug: $networkSlug) {
id
@ -18,17 +17,18 @@ function initNetworksActions(store, _router) {
slug
url
sites {
id
name
slug
url
independent
${releasesFragment}
network {
id
name
slug
url
independent
network {
id
name
slug
url
}
}
}
studios {
id
@ -37,29 +37,15 @@ function initNetworksActions(store, _router) {
url
}
}
releases(
first: $limit,
orderBy: $orderBy,
filter: {
site: { network: { slug: { equalTo: $networkSlug } } }
date: {
lessThan: $before,
greaterThan: $after,
}
}
) {
${releaseFields}
}
}
`, {
networkSlug,
limit,
after: store.getters.after,
before: store.getters.before,
orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
});
return curateNetwork(network, releases);
return curateNetwork(network);
}
async function fetchNetworks({ _commit }, networkSlug) {

2
assets/js/releases/actions.js
View File

@ -11,7 +11,6 @@ function initReleasesActions(store, _router) {
$limit:Int = 1000,
$after:Date = "1900-01-01",
$before:Date = "2100-01-01",
$orderBy:[ReleasesOrderBy!]
) {
${releasesFragment}
}
@ -19,7 +18,6 @@ function initReleasesActions(store, _router) {
limit,
after: store.getters.after,
before: store.getters.before,
orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
});
return releases.map(release => curateRelease(release));

4
assets/js/sites/actions.js
View File

@ -10,7 +10,6 @@ function initSitesActions(store, _router) {
$limit:Int = 100,
$after:Date = "1900-01-01",
$before:Date = "2100-01-01",
$orderBy:[ReleasesOrderBy!]
) {
site: siteBySlug(slug: $siteSlug) {
name
@ -30,9 +29,10 @@ function initSitesActions(store, _router) {
limit,
after: store.getters.after,
before: store.getters.before,
orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
});
console.log(site);
return curateSite(site);
}

74
assets/js/tags/actions.js
View File

@ -1,19 +1,16 @@
import { graphql, get } from '../api';
import {
releaseFields,
releasePosterFragment,
releaseActorsFragment,
releaseTagsFragment,
siteFragment,
} from '../fragments';
import { curateTag } from '../curate';
function initTagsActions(store, _router) {
async function fetchTagBySlug(tagSlug, limit = 100) {
async function fetchTagBySlug(tagSlug) {
const { tagBySlug } = await graphql(`
query Tag(
$tagSlug:String!
$limit:Int = 1000,
$after:Date = "1900-01-01",
$before:Date = "2100-01-01",
$orderBy: [ReleasesTagsOrderBy!]
) {
query Tag($tagSlug:String!) {
tagBySlug(slug:$tagSlug) {
id
name
@ -39,30 +36,23 @@ function initTagsActions(store, _router) {
comment
}
}
releases: releasesTags(
filter: {
release: {
date: {
lessThan: $before,
greaterThan: $after,
}
}
},
first: $limit,
orderBy: $orderBy,
) {
releases: releasesTags {
release {
${releaseFields}
id
title
date
createdAt
url
${releaseActorsFragment}
${releaseTagsFragment}
${releasePosterFragment}
${siteFragment}
}
}
}
}
`, {
tagSlug,
limit,
after: store.getters.after,
before: store.getters.before,
orderBy: store.state.ui.range === 'upcoming' ? 'RELEASE_BY_RELEASE_ID__DATE_ASC' : 'RELEASE_BY_RELEASE_ID__DATE_DESC',
});
return curateTag(tagBySlug);
@ -80,27 +70,21 @@ function initTagsActions(store, _router) {
}
const { tags } = await graphql(`
query Tags(
$slugs: [String!] = [],
$limit: Int = 100
) {
tags(
filter: { slug: { in: $slugs } },
first: $limit
) {
id
name
slug
poster: tagsPosterByTagId {
media {
thumbnail
}
}
group {
name
slug
query Tags($slugs: [String!] = [], $limit: Int = 100) {
tags(filter: {slug: {in: $slugs}}, first: $limit) {
id
name
slug
poster: tagsPosterByTagId {
media {
thumbnail
}
}
group {
name
slug
}
}
}
`, {
slugs,

2
package-lock.json generated
View File

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

2
package.json
View File

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