assets/components/container/warning.vue

@@ -1,20 +1,15 @@
 <template>
 	<div class="warning-container">
 		<div class="warning">
-			<div
-				class="logo"
-				v-html="logo"
-			/>
-
 			<strong class="title">This website contains sexually explicit content</strong>
 
 			<span class="copy">By entering, you agree to the following</span>
 
 			<ul class="rules">
-				<li class="rule">You are at least 18 years old, and have the legal right to consume adult material in your jurisdiction.</li>
+				<li class="rule">You are at least 18 years old, and a legal adult in your jurisdiction.</li>
-				<li class="rule">You are prepared see, hear and read erotic and sexual material, and do not regard such content as obscene or offensive.</li>
+				<li class="rule">You are prepared see, hear and read erotic and sexual material, some of which could be considered obscene or offensive by some.</li>
-				<li class="rule">You understand that most sexual acts on this website depict fictional scenarios, performed by professional actors for entertainment purposes, and are not representative of real-life interactions.</li>
+				<li class="rule">You understand that the majority of sexual acts on this website are fictional, performed by professional actors for entertainment purposes, and not representative of real-life interactions.</li>
-				<li class="rule">Respect your sexual partners, communicate about each other's desires and limits, and take precautions to prevent sexually transmitted infections and unintended pregnancies.</li>
+				<li class="rule">Respect your sexual partners, communicate about each other's fantasies and limits, and take precautions to prevent sexually transmitted infections and unintended pregnancies.</li>
 			</ul>
 
 			<div class="actions">
@@ -32,18 +27,6 @@
 	</div>
 </template>
 
-<script>
-import logo from '../../img/logo.svg';
-
-export default {
-	data() {
-		return {
-			logo,
-		};
-	},
-};
-</script>
-
 <style lang="scss" scoped>
 @import 'breakpoints';
 
@@ -134,12 +117,6 @@ export default {
 	}
 }
 
-.logo {
-	fill: var(--primary);
-	text-align: center;
-	width: 2rem;
-}
-
 @media(max-width: $breakpoint) {
 	.title {
 		font-size: 1.5rem;

package-lock.json

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

package.json

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

seeds/01_networks.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 const upsert = require('../src/utils/upsert');
 
-const grandParentNetworks = [
+const parentNetworks = [
 	{
 		slug: 'gamma',
 		name: 'Gamma Entertainment',
@@ -36,7 +36,7 @@ const grandParentNetworks = [
 	},
 ];
 
-const parentNetworks = [
+const networks = [
 	{
 		slug: '21sextury',
 		name: '21Sextury',
@@ -47,9 +47,6 @@ const parentNetworks = [
 		},
 		parent: 'gamma',
 	},
-];
-
-const networks = [
 	{
 		slug: '21sextreme',
 		name: '21Sextreme',
@@ -58,7 +55,7 @@ const networks = [
 		parameters: {
 			mobile: 'https://m.dpfanatics.com/en/video',
 		},
-		parent: '21sextury',
+		parent: 'gamma',
 	},
 	{
 		slug: '21naturals',
@@ -68,7 +65,7 @@ const networks = [
 		parameters: {
 			mobile: 'https://m.dpfanatics.com/en/video',
 		},
-		parent: '21sextury',
+		parent: 'gamma',
 	},
 	{
 		slug: 'adulttime',
@@ -515,21 +512,7 @@ const networks = [
 
 exports.seed = knex => Promise.resolve()
 	.then(async () => {
-		const grandParentNetworkEntries = await upsert('entities', grandParentNetworks.map(network => ({ ...network, type: 'network' })), ['slug', 'type'], knex);
+		const parentNetworkEntries = await upsert('entities', parentNetworks.map(network => ({ ...network, type: 'network' })), ['slug', 'type'], knex);
-		const grandParentNetworksBySlug = [].concat(grandParentNetworkEntries.inserted, grandParentNetworkEntries.updated).reduce((acc, network) => ({ ...acc, [network.slug]: network.id }), {});
-
-		const parentNetworksWithGrandParent = parentNetworks.map(network => ({
-			slug: network.slug,
-			name: network.name,
-			type: network.type || 'network',
-			alias: network.alias,
-			url: network.url,
-			description: network.description,
-			parameters: network.parameters,
-			parent_id: grandParentNetworksBySlug[network.parent] || null,
-		}));
-
-		const parentNetworkEntries = await upsert('entities', parentNetworksWithGrandParent, ['slug', 'type'], knex);
 		const parentNetworksBySlug = [].concat(parentNetworkEntries.inserted, parentNetworkEntries.updated).reduce((acc, network) => ({ ...acc, [network.slug]: network.id }), {});
 
 		const networksWithParent = networks.map(network => ({
@@ -545,15 +528,7 @@ exports.seed = knex => Promise.resolve()
 
 		const networkEntries = await upsert('entities', networksWithParent, ['slug', 'type'], knex);
 
-		const networkIdsBySlug = [].concat(
+		const networkIdsBySlug = [].concat(networkEntries.inserted, networkEntries.updated).reduce((acc, network) => ({ ...acc, [network.slug]: network.id }), {});
-			grandParentNetworkEntries.inserted,
-			grandParentNetworkEntries.updated,
-			parentNetworkEntries.inserted,
-			parentNetworkEntries.updated,
-			networkEntries.inserted,
-			networkEntries.updated,
-		).reduce((acc, network) => ({ ...acc, [network.slug]: network.id }), {});
-
 		const tagSlugs = networks.map(network => network.tags).flat().filter(Boolean);
 
 		const tagEntries = await knex('tags').whereIn('slug', tagSlugs);