boiii/traxxx
1
0
Fork 0
forked from DebaucheryLibrarian/traxxx
Code Issues Pull Requests Projects Releases Wiki Activity

Applying tag filters to URL.

Browse Source
This commit is contained in:
ThePendulum
2020-05-27 01:40:10 +02:00
parent 86377fec5f
commit 88a88227c4
16 changed files with 210 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
import { graphql, get } from '../api';
import {
releaseFields,
releasePosterFragment,
releaseActorsFragment,
releaseTagsFragment,
@@ -8,13 +9,19 @@ import { curateActor, curateRelease } from '../curate';
import getDateRange from '../get-date-range';
function initActorActions(store, _router) {
async function fetchActorById({ _commit }, { actorId, limit = 100, range = 'latest' }) {
async function fetchActorById({ _commit }, {
actorId,
limit = 10,
pageNumber = 1,
range = 'latest',
}) {
const { before, after, orderBy } = getDateRange(range);
const { actor } = await graphql(`
const { actor, connection: { releases, totalCount } } = await graphql(`
query Actor(
$actorId: Int!
$limit:Int = 1000,
$limit:Int = 10,
$offset:Int = 0,
$after:Date = "1900-01-01",
$before:Date = "2100-01-01",
$orderBy:[ReleasesActorsOrderBy!]
@@ -123,7 +130,7 @@ function initActorActions(store, _router) {
name
slug
}
releases: releasesActors(
releasesConnection: releasesActorsConnection(
filter: {
release: {
date: {
@@ -140,45 +147,80 @@ function initActorActions(store, _router) {
}
}
}
},
first: $limit,
}
first: $limit
offset: $offset
orderBy: $orderBy
) {
release {
id
url
title
date
slug
${releaseActorsFragment}
${releaseTagsFragment}
${releasePosterFragment}
site {
id
name
slug
url
network {
id
name
slug
url
}
}
}
releases: nodes {
release {
id
url
title
date
slug
${releaseActorsFragment}
${releaseTagsFragment}
${releasePosterFragment}
site {
id
name
slug
url
network {
id
name
slug
url
}
}
}
}
}
}
connection: releasesActorsConnection(
first: $limit
offset: $offset
orderBy: $orderBy
filter: {
actorId: {
equalTo: $actorId
}
or: [
{
release: {
date: {
lessThan: $before,
greaterThan: $after
}
}
},
]
}
) {
releases: nodes {
release {
${releaseFields}
}
}
totalCount
}
}
`, {
actorId,
limit,
offset: Math.max(0, (pageNumber - 1)) * limit,
after,
before,
orderBy: orderBy === 'DATE_DESC' ? 'RELEASE_BY_RELEASE_ID__DATE_DESC' : 'RELEASE_BY_RELEASE_ID__DATE_ASC',
exclude: store.state.ui.filter,
});
return curateActor(actor, null, curateRelease);
return {
actor: curateActor(actor, null, curateRelease),
releases: releases.map(release => curateRelease(release.release)),
totalCount,
};
}
async function fetchActors({ _commit }, {

6
assets/js/curate.js
View File

@@ -1,6 +1,6 @@
import dayjs from 'dayjs';
function curateActor(actor, release, curateActorRelease) {
function curateActor(actor, release) {
if (!actor) {
return null;
}
@@ -53,10 +53,6 @@ function curateActor(actor, release, curateActorRelease) {
curatedActor.ageThen = dayjs(release.date).diff(actor.birthdate, 'year');
}
if (actor.releases) {
curatedActor.releases = actor.releases.map(actorRelease => curateActorRelease(actorRelease.release));
}
if (actor.aliasFor) {
curatedActor.aliasFor = curateActor(curatedActor.aliasFor);
}

2
assets/js/get-date-range.js
View File

@@ -24,7 +24,7 @@ const dateRanges = {
};
function getDateRange(range) {
return dateRanges[range]();
return (dateRanges[range] || dateRanges.all)();
}
export default getDateRange;

32
assets/js/router.js
View File

@@ -19,35 +19,17 @@ const routes = [
{
path: '/',
redirect: {
name: 'latest',
name: 'home',
params: {
range: 'latest',
pageNumber: 1,
},
},
},
{
path: '/home',
redirect: {
name: 'latest',
params: {
pageNumber: 1,
},
},
},
{
path: '/latest/:pageNumber?',
path: '/:range/:pageNumber?',
component: Home,
name: 'latest',
},
{
path: '/upcoming/:pageNumber?',
component: Home,
name: 'upcoming',
},
{
path: '/new/:pageNumber?',
component: Home,
name: 'new',
name: 'home',
},
{
path: '/scene/:releaseId/:releaseSlug?',
@@ -67,11 +49,12 @@ const routes = [
params: {
...from.params,
range: 'latest',
pageNumber: 1,
},
}),
},
{
path: '/actor/:actorId/:actorSlug?/:range',
path: '/actor/:actorId/:actorSlug/:range/:pageNumber?',
component: Actor,
name: 'actorRange',
},
@@ -84,11 +67,12 @@ const routes = [
params: {
...from.params,
range: 'latest',
pageNumber: 1,
},
}),
},
{
path: '/site/:siteSlug/:range',
path: '/site/:siteSlug/:range/:pageNumber?',
component: Site,
name: 'siteRange',
},

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

@@ -1,6 +1,6 @@
import { graphql } from '../api';
import { releaseFields } from '../fragments';
import { curateSite } from '../curate';
import { curateSite, curateRelease } from '../curate';
import getDateRange from '../get-date-range';
function initSitesActions(store, _router) {
@@ -12,7 +12,7 @@ function initSitesActions(store, _router) {
}) {
const { before, after, orderBy } = getDateRange(range);
const { site } = await graphql(`
const { site, connection: { releases, totalCount } } = await graphql(`
query Site(
$siteSlug: String!,
$limit:Int = 100,
@@ -39,7 +39,7 @@ function initSitesActions(store, _router) {
slug
url
}
releases(
releasesConnection(
filter: {
date: {
lessThan: $before,
@@ -59,9 +59,42 @@ function initSitesActions(store, _router) {
offset: $offset
orderBy: $orderBy
) {
${releaseFields}
releases: nodes {
${releaseFields}
}
totalCount
}
}
connection: releasesConnection(
first: $limit
offset: $offset
orderBy: $orderBy
filter: {
site: {
slug: {
equalTo: $siteSlug
}
}
date: {
lessThan: $before,
greaterThan: $after
}
releasesTagsConnection: {
none: {
tag: {
slug: {
in: $exclude
}
}
}
}
}
) {
releases: nodes {
${releaseFields}
}
totalCount
}
}
`, {
siteSlug,
@@ -74,7 +107,11 @@ function initSitesActions(store, _router) {
exclude: store.state.ui.filter,
});
return curateSite(site);
return {
site: curateSite(site),
releases: releases.map(release => curateRelease(release)),
totalCount,
};
}
async function fetchSites({ _commit }, { limit = 100 }) {