From 7bbb2f3557b1d4df526a24e48f1c6e459914ebab Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Sun, 3 Jan 2021 22:53:51 +0100
Subject: [PATCH] Added tag filter dialog.

---
 assets/components/dialog/dialog.vue  | 106 +++++++++++++++++++++++++++
 assets/components/form/checkbox.vue  |  99 +++++++++++++++++++++++++
 assets/components/header/filters.vue |  69 +++++++++++++++++
 assets/components/header/header.vue  |  12 ++-
 assets/css/_forms.scss               |   5 ++
 assets/css/style.scss                |   1 +
 assets/js/entities/actions.js        |   2 +-
 assets/js/main.js                    |   8 ++
 assets/js/releases/actions.js        |   2 +-
 assets/js/tags/actions.js            |   2 +-
 assets/js/ui/actions.js              |  10 ++-
 assets/js/ui/mutations.js            |   6 +-
 assets/js/ui/state.js                |   4 +-
 public/img/icons/cross.svg           |   5 ++
 public/img/icons/cross2.svg          |   5 ++
 public/img/icons/cross3.svg          |   5 ++
 seeds/00_tags.js                     |   2 +-
 src/scrapers/kink.js                 |   2 +-
 18 files changed, 329 insertions(+), 16 deletions(-)
 create mode 100644 assets/components/dialog/dialog.vue
 create mode 100644 assets/components/form/checkbox.vue
 create mode 100644 assets/components/header/filters.vue
 create mode 100644 assets/css/_forms.scss
 create mode 100644 public/img/icons/cross.svg
 create mode 100644 public/img/icons/cross2.svg
 create mode 100644 public/img/icons/cross3.svg

diff --git a/assets/components/dialog/dialog.vue b/assets/components/dialog/dialog.vue
new file mode 100644
index 00000000..6a5b7ac7
--- /dev/null
+++ b/assets/components/dialog/dialog.vue
@@ -0,0 +1,106 @@
+<template>
+	<teleport to="body">
+		<div
+			class="container"
+			@click="$emit('close')"
+		>
+			<div
+				class="dialog"
+				@click.stop
+			>
+				<div
+					v-if="title || $slots.header"
+					class="header"
+				>
+					<slot name="header">
+						<h2 class="header-title">{{ title }}</h2>
+					</slot>
+
+					<Icon
+						icon="cross2"
+						class="close"
+						@click="$emit('close')"
+					/>
+				</div>
+
+				<div class="body">
+					<slot />
+				</div>
+			</div>
+		</div>
+	</teleport>
+</template>
+
+<script>
+export default {
+	props: {
+		title: {
+			type: String,
+			default: null,
+		},
+	},
+	emits: ['close'],
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	padding: 1rem;
+	background: var(--darken);
+	z-index: 10;
+}
+
+.dialog {
+	display: flex;
+	flex-direction: column;
+	max-width: 100%;
+	max-height: 100%;
+	background: var(--background);
+	box-shadow: 0 0 3px var(--darken-weak);
+}
+
+.header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	background: var(--primary);
+	color: var(--text-light);
+	font-size: 1.5rem;
+	font-weight: bold;
+	text-transform: capitalize;
+}
+
+.header-title {
+	padding: .5rem .5rem .5rem 1rem;
+	margin: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	font-size: 1.25rem;
+}
+
+.close {
+	height: 100%;
+	padding: 0 1rem;
+	fill: var(--lighten);
+
+	&:hover {
+		fill: var(--lighten-strong);
+		cursor: pointer;
+	}
+}
+
+.body {
+	padding: 1rem;
+	flex-grow: 1;
+	overflow: auto;
+}
+</style>
diff --git a/assets/components/form/checkbox.vue b/assets/components/form/checkbox.vue
new file mode 100644
index 00000000..8af364aa
--- /dev/null
+++ b/assets/components/form/checkbox.vue
@@ -0,0 +1,99 @@
+<template>
+	<label class="check-container noselect">
+		<span class="check-label">{{ label }}</span>
+
+		<input
+			v-show="false"
+			:id="`checkbox-${uid}`"
+			:checked="checked"
+			type="checkbox"
+			class="check-checkbox"
+			@change="$emit('change', $event.target.checked)"
+		>
+
+		<label
+			:for="`checkbox-${uid}`"
+			class="check"
+		/>
+	</label>
+</template>
+
+<script>
+export default {
+	props: {
+		checked: {
+			type: Boolean,
+			default: false,
+		},
+		label: {
+			type: String,
+			default: null,
+		},
+	},
+	emits: ['change'],
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'breakpoints';
+
+.check-container {
+    display: flex;
+    justify-content: space-between;
+    cursor: pointer;
+}
+
+.check {
+    width: 1.25rem;
+    height: 1.25rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+	flex-shrink: 0;
+	position: relative;
+	background-color: var(--shadow-hint);
+    cursor: pointer;
+    transition: background .15s ease;
+
+    &::after {
+        content: '';
+        width: .5rem;
+        height: .3rem;
+        border: solid 2px var(--text-light);
+        border-top: none;
+        border-right: none;
+        margin: -.2rem 0 0 0;
+        transform: rotateZ(-45deg) scaleX(0);
+        transition: transform .15s ease;
+    }
+}
+
+.check-cross .check::before {
+	content: '';
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	background: url('/img/icons/cross3.svg') no-repeat center/80%;
+	opacity: .15;
+	transition: transform .1s ease;
+}
+
+.check-checkbox:checked + .check {
+    background: var(--primary);
+
+    &::after {
+        transform: rotateZ(-45deg) scaleX(1);
+    }
+
+	&::before {
+        transform: scaleX(0);
+	}
+}
+
+.check-label {
+	overflow: hidden;
+	text-transform: capitalize;
+	text-overflow: ellipsis;
+	margin: 0 .5rem 0 0;
+}
+</style>
diff --git a/assets/components/header/filters.vue b/assets/components/header/filters.vue
new file mode 100644
index 00000000..68b5e6af
--- /dev/null
+++ b/assets/components/header/filters.vue
@@ -0,0 +1,69 @@
+<template>
+	<Dialog
+		title="filters"
+		@close="$emit('close')"
+	>
+		<h3 class="form-heading">Show me</h3>
+
+		<ul class="tags nolist">
+			<li
+				v-for="tag in tags"
+				:key="tag"
+				class="tags-item"
+			>
+				<Checkbox
+					:checked="!tagFilter.includes(tag)"
+					:label="tag"
+					class="tag"
+					@change="(state) => filterTag(tag, state)"
+				/>
+			</li>
+		</ul>
+	</Dialog>
+</template>
+
+<script>
+import Checkbox from '../form/checkbox.vue';
+
+function tagFilter() {
+	return this.$store.state.ui.tagFilter;
+}
+
+function filterTag(tag, isChecked) {
+	if (isChecked) {
+		this.$store.dispatch('setTagFilter', this.tagFilter.filter(filteredTag => filteredTag !== tag));
+	} else {
+		this.$store.dispatch('setTagFilter', this.tagFilter.concat(tag));
+	}
+}
+
+export default {
+	components: {
+		Checkbox,
+	},
+	data() {
+		return {
+			tags: ['anal', 'gay', 'transsexual', 'bisexual', 'pissing'],
+		};
+	},
+	computed: {
+		tagFilter,
+	},
+	emits: ['close'],
+	methods: {
+		filterTag,
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.tags-item {
+	width: 20rem;
+	max-width: 100%;
+	display: block;
+}
+
+.tag {
+	padding: .5rem 0;
+}
+</style>
diff --git a/assets/components/header/header.vue b/assets/components/header/header.vue
index bbd654a8..d3ea6d4a 100644
--- a/assets/components/header/header.vue
+++ b/assets/components/header/header.vue
@@ -147,8 +147,8 @@
 							</li>
 
 							<li
-								class="menu-item disabled"
-								@click.stop
+								class="menu-item"
+								@click="showFilters = true"
 							>
 								<Icon icon="filter" />Filters
 							</li>
@@ -157,6 +157,11 @@
 				</template>
 			</Tooltip>
 
+			<Filters
+				v-if="showFilters"
+				@close="showFilters = false"
+			/>
+
 			<Search class="search-full" />
 
 			<Tooltip
@@ -189,6 +194,7 @@
 import { mapState } from 'vuex';
 
 import Search from './search.vue';
+import Filters from './filters.vue';
 
 import logo from '../../img/logo.svg';
 
@@ -211,6 +217,7 @@ function setSfw(enabled) {
 export default {
 	components: {
 		Search,
+		Filters,
 	},
 	props: {
 		toggleSidebar: {
@@ -222,6 +229,7 @@ export default {
 		return {
 			logo,
 			searching: false,
+			showFilters: false,
 		};
 	},
 	computed: {
diff --git a/assets/css/_forms.scss b/assets/css/_forms.scss
new file mode 100644
index 00000000..becdc3e6
--- /dev/null
+++ b/assets/css/_forms.scss
@@ -0,0 +1,5 @@
+.form-heading {
+	margin: 0 0 .5rem 0;
+	font-size: 1rem;
+	font-weight: bold;
+}
diff --git a/assets/css/style.scss b/assets/css/style.scss
index 98d8825d..4381f268 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -1,4 +1,5 @@
 @import 'theme';
+@import 'forms';
 @import 'inputs';
 @import 'states';
 @import 'tooltip';
diff --git a/assets/js/entities/actions.js b/assets/js/entities/actions.js
index c7c7d59e..3b28d362 100644
--- a/assets/js/entities/actions.js
+++ b/assets/js/entities/actions.js
@@ -159,7 +159,7 @@ function initEntitiesActions(store, router) {
 			orderBy,
 			afterTime: store.getters.after,
 			beforeTime: store.getters.before,
-			exclude: store.state.ui.filter,
+			exclude: store.state.ui.tagFilter,
 		});
 
 		if (!entity) {
diff --git a/assets/js/main.js b/assets/js/main.js
index 1cd390d9..448234e3 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -15,8 +15,11 @@ import Container from '../components/container/container.vue';
 import Icon from '../components/icon/icon.vue';
 import Footer from '../components/footer/footer.vue';
 import Tooltip from '../components/tooltip/tooltip.vue';
+import Dialog from '../components/dialog/dialog.vue';
 
 async function init() {
+	let uid = 0;
+
 	const store = initStore(router);
 	const app = createApp(Container);
 	const events = mitt();
@@ -38,6 +41,7 @@ async function init() {
 			Footer,
 			Tooltip,
 			'v-popover': Tooltip,
+			Dialog,
 		},
 		data() {
 			return {
@@ -60,6 +64,10 @@ async function init() {
 			isAfter: (dateA, dateB) => dayjs(dateA).isAfter(dateB),
 			isBefore: (dateA, dateB) => dayjs(dateA).isBefore(dateB),
 		},
+		beforeCreate() {
+			this.uid = uid;
+			uid += 1;
+		},
 	});
 
 	app.directive('tooltip', {
diff --git a/assets/js/releases/actions.js b/assets/js/releases/actions.js
index f65939f2..32453f19 100644
--- a/assets/js/releases/actions.js
+++ b/assets/js/releases/actions.js
@@ -24,7 +24,7 @@ function initReleasesActions(store, router) {
 			after,
 			before,
 			orderBy,
-			exclude: store.state.ui.filter,
+			exclude: store.state.ui.tagFilter,
 		});
 
 		return {
diff --git a/assets/js/tags/actions.js b/assets/js/tags/actions.js
index 63d2113a..9ff07740 100644
--- a/assets/js/tags/actions.js
+++ b/assets/js/tags/actions.js
@@ -99,7 +99,7 @@ function initTagsActions(store, _router) {
 			before,
 			orderBy: orderBy === 'DATE_DESC' ? 'DATE_DESC' : 'DATE_ASC',
 			offset: Math.max(0, (pageNumber - 1)) * limit,
-			exclude: store.state.ui.filter,
+			exclude: store.state.ui.tagFilter.filter(tagFilter => tagFilter !== tagSlug),
 		});
 
 		return {
diff --git a/assets/js/ui/actions.js b/assets/js/ui/actions.js
index 7b7b2b37..ee8ca345 100644
--- a/assets/js/ui/actions.js
+++ b/assets/js/ui/actions.js
@@ -2,9 +2,11 @@ import { graphql } from '../api';
 import { curateRelease, curateActor } from '../curate';
 
 function initUiActions(_store, _router) {
-	function setFilter({ commit }, filter) {
-		commit('setFilter', filter);
-		localStorage.setItem('filter', filter);
+	function setTagFilter({ commit }, filter) {
+		const tagFilter = Array.from(new Set(filter));
+
+		commit('setTagFilter', tagFilter);
+		localStorage.setItem('tagFilter', tagFilter);
 	}
 
 	function setRange({ commit }, range) {
@@ -184,7 +186,7 @@ function initUiActions(_store, _router) {
 
 	return {
 		search,
-		setFilter,
+		setTagFilter,
 		setRange,
 		setBatch,
 		setSfw,
diff --git a/assets/js/ui/mutations.js b/assets/js/ui/mutations.js
index 728955ce..76184f2f 100644
--- a/assets/js/ui/mutations.js
+++ b/assets/js/ui/mutations.js
@@ -1,5 +1,5 @@
-function setFilter(state, filter) {
-	state.filter = filter;
+function setTagFilter(state, tagFilter) {
+	state.tagFilter = tagFilter;
 }
 
 function setRange(state, range) {
@@ -19,7 +19,7 @@ function setTheme(state, theme) {
 }
 
 export default {
-	setFilter,
+	setTagFilter,
 	setRange,
 	setBatch,
 	setSfw,
diff --git a/assets/js/ui/state.js b/assets/js/ui/state.js
index 363736b2..302692eb 100644
--- a/assets/js/ui/state.js
+++ b/assets/js/ui/state.js
@@ -1,10 +1,10 @@
-const storedFilter = localStorage.getItem('filter');
+const storedTagFilter = localStorage.getItem('tagFilter');
 const storedBatch = localStorage.getItem('batch');
 const storedSfw = localStorage.getItem('sfw');
 const storedTheme = localStorage.getItem('theme');
 
 export default {
-	filter: storedFilter ? storedFilter.split(',') : [],
+	tagFilter: storedTagFilter ? storedTagFilter.split(',') : [],
 	range: 'latest',
 	batch: storedBatch || 'all',
 	sfw: storedSfw === 'true' || false,
diff --git a/public/img/icons/cross.svg b/public/img/icons/cross.svg
new file mode 100644
index 00000000..9ffcb7fd
--- /dev/null
+++ b/public/img/icons/cross.svg
@@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<title>cross</title>
+<path d="M15.854 12.854c-0-0-0-0-0-0l-4.854-4.854 4.854-4.854c0-0 0-0 0-0 0.052-0.052 0.090-0.113 0.114-0.178 0.066-0.178 0.028-0.386-0.114-0.529l-2.293-2.293c-0.143-0.143-0.351-0.181-0.529-0.114-0.065 0.024-0.126 0.062-0.178 0.114 0 0-0 0-0 0l-4.854 4.854-4.854-4.854c-0-0-0-0-0-0-0.052-0.052-0.113-0.090-0.178-0.114-0.178-0.066-0.386-0.029-0.529 0.114l-2.293 2.293c-0.143 0.143-0.181 0.351-0.114 0.529 0.024 0.065 0.062 0.126 0.114 0.178 0 0 0 0 0 0l4.854 4.854-4.854 4.854c-0 0-0 0-0 0-0.052 0.052-0.090 0.113-0.114 0.178-0.066 0.178-0.029 0.386 0.114 0.529l2.293 2.293c0.143 0.143 0.351 0.181 0.529 0.114 0.065-0.024 0.126-0.062 0.178-0.114 0-0 0-0 0-0l4.854-4.854 4.854 4.854c0 0 0 0 0 0 0.052 0.052 0.113 0.090 0.178 0.114 0.178 0.066 0.386 0.029 0.529-0.114l2.293-2.293c0.143-0.143 0.181-0.351 0.114-0.529-0.024-0.065-0.062-0.126-0.114-0.178z"></path>
+</svg>
diff --git a/public/img/icons/cross2.svg b/public/img/icons/cross2.svg
new file mode 100644
index 00000000..0b03beef
--- /dev/null
+++ b/public/img/icons/cross2.svg
@@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<title>cross2</title>
+<path d="M13.957 3.457l-1.414-1.414-4.543 4.543-4.543-4.543-1.414 1.414 4.543 4.543-4.543 4.543 1.414 1.414 4.543-4.543 4.543 4.543 1.414-1.414-4.543-4.543z"></path>
+</svg>
diff --git a/public/img/icons/cross3.svg b/public/img/icons/cross3.svg
new file mode 100644
index 00000000..c45560d8
--- /dev/null
+++ b/public/img/icons/cross3.svg
@@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<title>cross3</title>
+<path d="M12.207 10.793l-1.414 1.414-2.793-2.793-2.793 2.793-1.414-1.414 2.793-2.793-2.793-2.793 1.414-1.414 2.793 2.793 2.793-2.793 1.414 1.414-2.793 2.793 2.793 2.793z"></path>
+</svg>
diff --git a/seeds/00_tags.js b/seeds/00_tags.js
index e1104c6b..b192f241 100644
--- a/seeds/00_tags.js
+++ b/seeds/00_tags.js
@@ -709,7 +709,7 @@ const tags = [
 	{
 		name: 'pissing',
 		slug: 'pissing',
-		priority: 6,
+		priority: 8,
 	},
 	{
 		name: 'POV',
diff --git a/src/scrapers/kink.js b/src/scrapers/kink.js
index 85229fd1..2f8a62b1 100644
--- a/src/scrapers/kink.js
+++ b/src/scrapers/kink.js
@@ -6,7 +6,7 @@ function scrapeAll(scenes) {
 	return scenes.map(({ query }) => {
 		const release = {};
 
-		const href = query.url('.shoot-thumb-title a');
+		const href = query.url('.shoot-thumb-info > a');
 		release.url = `https://kink.com${href}`;
 
 		release.shootId = href.split('/').slice(-1)[0];