assets/components/container/container.vue

@@ -85,8 +85,6 @@ export default {
 }
 
 .content-inner {
-	display: flex;
-	flex-direction: column;
 	flex-grow: 1;
 	overflow-y: auto;
 	overflow-x: hidden;

assets/components/pagination/pagination.vue

@@ -112,7 +112,6 @@ export default {
 .pagination {
 	display: flex;
 	justify-content: center;
-	flex-shrink: 0;
 	overflow: hidden;
 	height: 3rem;
 }

assets/components/releases/releases.vue

@@ -84,7 +84,6 @@ export default {
 }
 
 .releases {
-	flex-grow: 1;
 	border-top: solid 1px var(--crease);
 
 	&.embedded {

assets/components/tags/tag.vue

@@ -30,13 +30,7 @@
 			</Scroll>
 
 			<FilterBar :fetch-releases="fetchReleases" />
-			<Releases :releases="releases" />
+			<Releases :releases="tag.releases" />
-
-			<Pagination
-				:items-total="totalCount"
-				:items-per-page="limit"
-				class="pagination-bottom"
-			/>
 
 			<Footer />
 		</div>
@@ -52,23 +46,16 @@ import escapeHtml from '../../../src/utils/escape-html';
 import FilterBar from '../filters/filter-bar.vue';
 import Photos from './photos.vue';
 import Releases from '../releases/releases.vue';
-import Pagination from '../pagination/pagination.vue';
 import Scroll from '../scroll/scroll.vue';
 
 const converter = new Converter();
 
 async function fetchReleases() {
-	const { tag, releases, totalCount } = await this.$store.dispatch('fetchTagBySlug', {
+	this.tag = await this.$store.dispatch('fetchTagBySlug', {
 		tagSlug: this.$route.params.tagSlug,
-		pageNumber: Number(this.$route.params.pageNumber),
-		limit: this.limit,
 		range: this.$route.params.range,
 	});
 
-	this.tag = tag;
-	this.releases = releases;
-	this.totalCount = totalCount;
-
 	this.hasMedia = this.tag.poster || this.tag.photos.length > 0;
 	this.description = this.tag.description && converter.makeHtml(escapeHtml(this.tag.description));
 }
@@ -87,7 +74,6 @@ export default {
 		FilterBar,
 		Releases,
 		Photos,
-		Pagination,
 		Scroll,
 	},
 	data() {
@@ -95,8 +81,6 @@ export default {
 			tag: null,
 			description: null,
 			releases: null,
-			totalCount: 0,
-			limit: 15,
 			pageTitle: null,
 			hasMedia: false,
 			expanded: false,

assets/js/router.js

@@ -125,12 +125,11 @@ const routes = [
 			params: {
 				...from.params,
 				range: 'latest',
-				pageNumber: 1,
 			},
 		}),
 	},
 	{
-		path: '/tag/:tagSlug/:range/:pageNumber',
+		path: '/tag/:tagSlug/:range',
 		component: Tag,
 		name: 'tag',
 	},

assets/js/tags/actions.js

@@ -2,26 +2,20 @@ import { graphql, get } from '../api';
 import {
 	releaseFields,
 } from '../fragments';
-import { curateTag, curateRelease } from '../curate';
+import { curateTag } from '../curate';
 import getDateRange from '../get-date-range';
 
 function initTagsActions(store, _router) {
-	async function fetchTagBySlug({ _commit }, {
+	async function fetchTagBySlug({ _commit }, { tagSlug, limit = 100, range = 'latest' }) {
-		tagSlug,
-		pageNumber = 1,
-		limit = 100,
-		range = 'latest',
-	}) {
 		const { before, after, orderBy } = getDateRange(range);
 
 		const { tagBySlug } = await graphql(`
             query Tag(
                 $tagSlug:String!
-				$offset: Int = 0,
                 $limit:Int = 1000,
                 $after:Datetime = "1900-01-01",
                 $before:Datetime = "2100-01-01",
-                $orderBy: [ReleasesOrderBy!],
+                $orderBy: [ReleasesTagsOrderBy!],
                 $exclude: [String!]
             ) {
                 tagBySlug(slug:$tagSlug) {
@@ -63,31 +57,31 @@ function initTagsActions(store, _router) {
                             }
                         }
                     }
-                    scenesConnection(
+                    releases: releasesTags(
                         filter: {
-							date: {
+                            release: {
-								lessThan: $before,
+                                date: {
-								greaterThan: $after,
+                                    lessThan: $before,
-							},
+                                    greaterThan: $after,
-							releasesTagsConnection: {
+                                },
-								none: {
+                                releasesTagsConnection: {
-									tag: {
+                                    none: {
-										slug: {
+                                        tag: {
-											in: $exclude
+                                            slug: {
-										}
+                                                in: $exclude
-									}
+                                            }
-								}
+                                        }
-							}
+                                    }
+                                }
+                            }
                         },
                         first: $limit,
                         orderBy: $orderBy,
-						offset: $offset
                     ) {
-						releases: nodes {
+                        release {
-							${releaseFields}
+                            ${releaseFields}
-						}
+                        }
-						totalCount
+                    }
-					}
                 }
             }
         `, {
@@ -95,16 +89,11 @@ function initTagsActions(store, _router) {
 			limit,
 			after,
 			before,
-			orderBy: orderBy === 'DATE_DESC' ? 'DATE_DESC' : 'DATE_ASC',
+			orderBy: orderBy === 'DATE_DESC' ? 'RELEASE_BY_RELEASE_ID__DATE_DESC' : 'RELEASE_BY_RELEASE_ID__DATE_ASC',
-			offset: Math.max(0, (pageNumber - 1)) * limit,
 			exclude: store.state.ui.filter,
 		});
 
-		return {
+		return curateTag(tagBySlug, store);
-			tag: curateTag(tagBySlug, null, curateRelease),
-			releases: tagBySlug.scenesConnection.releases.map(release => curateRelease(release)),
-			totalCount: tagBySlug.scenesConnection.totalCount,
-		};
 	}
 
 	async function fetchTags({ _commit }, {

migrations/20190325001339_releases.js

@@ -1031,19 +1031,6 @@ exports.up = knex => Promise.resolve()
 				END;
 			$$ LANGUAGE SQL STABLE;
 
-			CREATE FUNCTION tags_scenes(tag tags, selected_tags text[], mode text DEFAULT 'all') RETURNS SETOF releases AS $$
-				SELECT releases.*
-				FROM releases
-				LEFT JOIN
-					releases_actors ON releases_actors.release_id = releases.id
-				LEFT JOIN
-					releases_tags ON releases_tags.release_id = releases.id
-				LEFT JOIN
-					tags ON tags.id = releases_tags.tag_id
-				WHERE releases_tags.tag_id = tag.id
-				GROUP BY releases.id;
-			$$ LANGUAGE SQL STABLE;
-
 			CREATE FUNCTION movies_actors(movie movies) RETURNS SETOF actors AS $$
 				SELECT actors.*
 				FROM movies_scenes
@@ -1103,8 +1090,6 @@ exports.up = knex => Promise.resolve()
 			COMMENT ON FUNCTION actors_tags IS E'@sortable';
 			COMMENT ON FUNCTION actors_channels IS E'@sortable';
 			COMMENT ON FUNCTION actors_scenes IS E'@sortable';
-
-			COMMENT ON FUNCTION tags_scenes IS E'@sortable';
 		`);
 	});
 

package-lock.json

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

package.json

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