Removed views in favor of PostGraphile filter and sort plugins. Updated site modules to GraphQL. Added tag posters.

2020-01-04 02:51:58 +01:00
parent 70e27a6cd9
commit 72b175e9e2
46 changed files with 232 additions and 52 deletions
--- a/assets/components/actors/actor.vue
+++ b/assets/components/actors/actor.vue
@@ -3,7 +3,7 @@
        v-if="actor"
        class="content actor"
    >
-        <FilterBar :fetch-releases="fetchReleases" />
+        <FilterBar :fetch-releases="fetchActor" />

        <div class="actor-inner">
            <div class="profile">
@@ -243,8 +243,8 @@ import Photos from './photos.vue';
 import FilterBar from '../header/filter-bar.vue';
 import Releases from '../releases/releases.vue';

-async function fetchReleases() {
-    this.releases = await this.$store.dispatch('fetchActorReleases', this.$route.params.actorSlug);
+async function fetchActor() {
+    this.actor = await this.$store.dispatch('fetchActors', { actorSlug: this.$route.params.actorSlug });
 }

 function scrollPhotos(event) {
@@ -252,7 +252,7 @@ function scrollPhotos(event) {
 }

 async function mounted() {
-    this.actor = await this.$store.dispatch('fetchActors', { actorSlug: this.$route.params.actorSlug });
+    this.fetchActor();

    if (this.actor) {
        this.pageTitle = this.actor.name;
@@ -275,7 +275,7 @@ export default {
    },
    mounted,
    methods: {
-        fetchReleases,
+        fetchActor,
        scrollPhotos,
    },
 };
--- a/assets/components/site/site.vue
+++ b/assets/components/site/site.vue
@@ -3,7 +3,7 @@
        v-if="site"
        class="content site"
    >
-        <FilterBar :fetch-releases="fetchReleases" />
+        <FilterBar :fetch-releases="fetchSite" />

        <div class="content-inner">
            <div class="header">
@@ -59,15 +59,13 @@
 import FilterBar from '../header/filter-bar.vue';
 import Releases from '../releases/releases.vue';

-async function fetchReleases() {
-    this.releases = await this.$store.dispatch('fetchSiteReleases', this.$route.params.siteSlug);
+async function fetchSite() {
+    this.site = await this.$store.dispatch('fetchSites', { siteSlug: this.$route.params.siteSlug });
+    this.releases = this.site.releases;
 }

 async function mounted() {
-    [[this.site]] = await Promise.all([
-        this.$store.dispatch('fetchSites', this.$route.params.siteSlug),
-        this.fetchReleases(),
-    ]);
+    await this.fetchSite();

    this.pageTitle = this.site.name;
 }
@@ -86,7 +84,7 @@ export default {
    },
    mounted,
    methods: {
-        fetchReleases,
+        fetchSite,
    },
 };
 </script>
--- a/assets/components/tags/tags.vue
+++ b/assets/components/tags/tags.vue
@@ -1,5 +1,15 @@
 <template>
    <div class="tags">
+        <h3>Oral Sex</h3>
+
+        <div class="tiles">
+            <Tag
+                v-for="tag in tags.oral"
+                :key="`tag-${tag.id}`"
+                :tag="tag"
+            />
+        </div>
+
        <h3>Ethnicity</h3>

        <div class="tiles">
@@ -39,6 +49,16 @@
                :tag="tag"
            />
        </div>
+
+        <h3>Misc</h3>
+
+        <div class="tiles">
+            <Tag
+                v-for="tag in tags.misc.concat(tags.body)"
+                :key="`tag-${tag.id}`"
+                :tag="tag"
+            />
+        </div>
    </div>
 </template>

@@ -50,40 +70,52 @@ async function mounted() {
        slugs: [
            'airtight',
            'anal',
+            'anal-creampie',
+            'asian',
+            'ass-eating',
+            'ass-to-mouth',
+            'blowbang',
+            'blowjob',
+            'bukkake',
+            'caucasian',
+            'creampie',
+            'da-tp',
+            'deepthroat',
            'double-anal',
+            'double-blowjob',
            'double-penetration',
            'double-vaginal',
-            'da-tp',
            'dv-tp',
-            'triple-anal',
-            'blowbang',
-            'gangbang',
-            'mff',
-            'mfm',
-            'orgy',
-            'asian',
-            'caucasian',
            'ebony',
+            'facefuck',
+            'facial',
+            'gangbang',
+            'gapes',
            'interracial',
            'latina',
-            'anal-creampie',
-            'bukkake',
-            'creampie',
-            'facial',
+            'mff',
+            'mfm',
            'oral-creampie',
+            'orgy',
+            'pussy-eating',
            'swallowing',
+            'tattoo',
+            'trainbang',
+            'triple-anal',
        ],
    });

-    console.log(tags);
-
    this.tags = tags.reduce((acc, tag) => {
+        if (!tag.group) {
+            return { ...acc, misc: [...acc.misc, tag] };
+        }
+
        if (acc[tag.group.slug]) {
            return { ...acc, [tag.group.slug]: [...acc[tag.group.slug], tag] };
        }

        return { ...acc, [tag.group.slug]: [tag] };
-    }, {});
+    }, { misc: [] });
 }

 export default {
--- a/assets/components/tile/tag.vue
+++ b/assets/components/tile/tag.vue
@@ -4,14 +4,14 @@
        :title="tag.name"
        class="tile"
    >
-        <span class="title">{{ tag.name }}</span>
-
        <img
            v-if="tag.poster"
            :src="`/img/${tag.poster.thumbnail}`"
            :alt="tag.name"
            class="poster"
        >
+
+        <span class="title">{{ tag.name }}</span>
    </a>
 </template>

--- a/assets/js/actors/actions.js
+++ b/assets/js/actors/actions.js
@@ -45,10 +45,15 @@ function curateActor(actor) {
 }

 function initActorActions(store, _router) {
-    async function fetchActorBySlug(actorSlug) {
+    async function fetchActorBySlug(actorSlug, limit = 100) {
        const { actor } = await graphql(`
-            query Actor($actorSlug:String!) {
-                actor: actorBySlug(slug:$actorSlug) {
+            query Actor(
+                $actorSlug: String!
+                $limit:Int = 1000,
+                $after:Date = "1900-01-01",
+                $before:Date = "2100-01-01",
+            ) {
+                actor: actorBySlug(slug: $actorSlug) {
                    id
                    name
                    slug
@@ -105,7 +110,18 @@ function initActorActions(store, _router) {
                        name
                        slug
                    }
-                    releases: releasesActors {
+                    releases: releasesActors(
+                        filter: {
+                            release: {
+                                date: {
+                                    lessThan: $before,
+                                    greaterThan: $after,
+                                }
+                            }
+                        },
+                        first: $limit,
+                        orderBy: RELEASE_BY_RELEASE_ID__DATE_DESC,
+                    ) {
                        release {
                            id
                            url
@@ -132,6 +148,9 @@ function initActorActions(store, _router) {
            }
        `, {
            actorSlug,
+            limit,
+            after: store.getters.after,
+            before: store.getters.before,
        });

        return curateActor(actor);
--- a/assets/js/fragments.js
+++ b/assets/js/fragments.js
@@ -29,7 +29,7 @@ const sitesFragment = `
 `;

 const releaseActorsFragment = `
-    actors: releasesActorsSortables(orderBy: GENDER_ASC) {
+    actors: releasesActors(orderBy: ACTOR_BY_ACTOR_ID__GENDER_ASC) {
      actor {
        id
        name
@@ -51,7 +51,7 @@ const releaseActorsFragment = `
 `;

 const releaseTagsFragment = `
-    tags: releasesTagsSortables(orderBy: PRIORITY_DESC) {
+    tags: releasesTags(orderBy: TAG_BY_TAG_ID__PRIORITY_DESC) {
      tag {
        name
        priority
--- a/assets/js/sites/actions.js
+++ b/assets/js/sites/actions.js
@@ -1,12 +1,69 @@
-import { get } from '../api';
+import { graphql } from '../api';
+import { releasesFragment } from '../fragments';
+import { curateSite } from '../curate';

 function initSitesActions(store, _router) {
-    async function fetchSites({ _commit }, siteId) {
-        const sites = await get(`/sites/${siteId || ''}`);
+    async function fetchSiteBySlug(siteSlug, limit = 100) {
+        const { site } = await graphql(`
+            query Site(
+                $siteSlug: String!,
+                $limit:Int = 100,
+                $after:Date = "1900-01-01",
+                $before:Date = "2100-01-01",
+            ) {
+                site: siteBySlug(slug: $siteSlug) {
+                    name
+                    slug
+                    url
+                    network {
+                        id
+                        name
+                        slug
+                        url
+                    }
+                    ${releasesFragment}
+                }
+            }
+        `, {
+            siteSlug,
+            limit,
+            after: store.getters.after,
+            before: store.getters.before,
+        });
+
+        console.log(site);
+
+        return curateSite(site);
+    }
+
+    async function fetchSites({ _commit }, { siteSlug, limit = 100 }) {
+        if (siteSlug) {
+            return fetchSiteBySlug(siteSlug, limit);
+        }
+
+        const { sites } = await graphql(`
+            query Sites(
+                $actorSlug: String!
+                $limit:Int = 100,
+                $after:Date = "1900-01-01",
+                $before:Date = "2100-01-01",
+            ) {
+                site {
+                    name
+                    slug
+                    url
+                }
+            }
+        `, {
+            limit,
+            after: store.getters.after,
+            before: store.getters.before,
+        });

        return sites;
    }

+    /*
    async function fetchSiteReleases({ _commit }, siteId) {
        const releases = await get(`/sites/${siteId}/releases`, {
            filter: store.state.ui.filter,
@@ -16,10 +73,11 @@ function initSitesActions(store, _router) {

        return releases;
    }
+    */

    return {
        fetchSites,
-        fetchSiteReleases,
+        // fetchSiteReleases,
    };
 }