From 98c25cd24ed6f73435d8f465f4cbca16015e3ec0 Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Tue, 2 Apr 2024 05:55:53 +0200 Subject: [PATCH] Implemented negative filters in back-end, added basic fixed filters settings dialog. --- components/header/header.vue | 17 ++++ components/settings/settings.vue | 78 +++++++++++++++++++ package-lock.json | 53 ++++++++----- package.json | 2 + pages/actors/@actorId/+onBeforeRender.js | 1 + pages/entities/@entitySlug/+onBeforeRender.js | 1 + pages/scene/+Page.vue | 53 +++++++++---- pages/tags/@tagId/+onBeforeRender.js | 1 + pages/updates/+onBeforeRender.js | 7 +- pages/users/@username/+Page.vue | 2 + renderer/app.js | 6 +- renderer/init-client.js | 14 ++++ src/cache.js | 4 + src/navigate.js | 4 +- src/scenes.js | 12 +++ src/web/scenes.js | 33 +++++++- src/web/server.js | 15 ++++ 17 files changed, 260 insertions(+), 43 deletions(-) create mode 100644 components/settings/settings.vue create mode 100644 renderer/init-client.js diff --git a/components/header/header.vue b/components/header/header.vue index 3ae8ccf..350cd12 100644 --- a/components/header/header.vue +++ b/components/header/header.vue @@ -124,6 +124,15 @@ +
  • + + Settings +
    • +
  • + + @@ -160,6 +174,8 @@ import { import navigate from '#/src/navigate.js'; import { del } from '#/src/api.js'; +import Settings from '#/components/settings/settings.vue'; + import logo from '../../assets/img/logo.svg?raw'; // eslint-disable-line import/no-unresolved const pageContext = inject('pageContext'); @@ -168,6 +184,7 @@ const user = pageContext.user; const query = ref(pageContext.urlParsed.search.q || ''); const allowLogin = pageContext.env.allowLogin; const searchFocused = ref(false); +const showSettings = ref(false); const activePage = computed(() => pageContext.urlParsed.pathname.split('/')[1]); const currentPath = `${pageContext.urlParsed.pathnameOriginal}${pageContext.urlParsed.searchOriginal || ''}`; diff --git a/components/settings/settings.vue b/components/settings/settings.vue new file mode 100644 index 0000000..4290a24 --- /dev/null +++ b/components/settings/settings.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/package-lock.json b/package-lock.json index e01e9f8..3304c58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "config": "^3.3.9", "connect-redis": "^7.1.1", "convert": "^4.14.1", + "cookie": "^0.6.0", "cron": "^3.1.6", "cross-env": "^7.0.3", "date-fns": "^3.0.0", @@ -34,6 +35,7 @@ "express-session": "^1.18.0", "floating-vue": "^5.2.2", "ip-cidr": "^4.0.0", + "js-cookie": "^3.0.5", "knex": "^3.1.0", "manticoresearch": "^4.0.0", "markdown-it": "^14.0.0", @@ -4627,9 +4629,9 @@ "dev": true }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "engines": { "node": ">= 0.6" } @@ -5732,14 +5734,6 @@ "node": ">= 0.8.0" } }, - "node_modules/express-session/node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/express-session/node_modules/cookie-signature": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", @@ -5764,6 +5758,14 @@ } ] }, + "node_modules/express/node_modules/cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -6833,6 +6835,14 @@ "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==" }, + "node_modules/js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", + "engines": { + "node": ">=14" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -13532,9 +13542,9 @@ "dev": true }, "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" }, "cookie-signature": { "version": "1.0.6", @@ -14348,6 +14358,11 @@ "vary": "~1.1.2" }, "dependencies": { + "cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -14390,11 +14405,6 @@ "uid-safe": "~2.1.5" }, "dependencies": { - "cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" - }, "cookie-signature": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", @@ -15149,6 +15159,11 @@ "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==" }, + "js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/package.json b/package.json index fe40f46..825c1fc 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "config": "^3.3.9", "connect-redis": "^7.1.1", "convert": "^4.14.1", + "cookie": "^0.6.0", "cron": "^3.1.6", "cross-env": "^7.0.3", "date-fns": "^3.0.0", @@ -34,6 +35,7 @@ "express-session": "^1.18.0", "floating-vue": "^5.2.2", "ip-cidr": "^4.0.0", + "js-cookie": "^3.0.5", "knex": "^3.1.0", "manticoresearch": "^4.0.0", "markdown-it": "^14.0.0", diff --git a/pages/actors/@actorId/+onBeforeRender.js b/pages/actors/@actorId/+onBeforeRender.js index 890ac26..44a8c66 100644 --- a/pages/actors/@actorId/+onBeforeRender.js +++ b/pages/actors/@actorId/+onBeforeRender.js @@ -11,6 +11,7 @@ export async function onBeforeRender(pageContext) { ...pageContext.urlQuery, scope: pageContext.routeParams.scope || 'latest', actorId: Number(pageContext.routeParams.actorId), + tagFilter: pageContext.tagFilter, }), { page: Number(pageContext.routeParams.page) || 1, limit: Number(pageContext.urlParsed.search.limit) || 30, diff --git a/pages/entities/@entitySlug/+onBeforeRender.js b/pages/entities/@entitySlug/+onBeforeRender.js index 3fc0014..3f2781e 100644 --- a/pages/entities/@entitySlug/+onBeforeRender.js +++ b/pages/entities/@entitySlug/+onBeforeRender.js @@ -18,6 +18,7 @@ export async function onBeforeRender(pageContext) { ...pageContext.urlQuery, scope: pageContext.routeParams.scope || 'latest', entityId: Number(entityId), + tagFilter: pageContext.tagFilter, }), { page: Number(pageContext.routeParams.page) || 1, limit: Number(pageContext.urlParsed.search.limit) || 30, diff --git a/pages/scene/+Page.vue b/pages/scene/+Page.vue index e1edc19..167c6ec 100644 --- a/pages/scene/+Page.vue +++ b/pages/scene/+Page.vue @@ -24,11 +24,7 @@ v-else-if="scene.poster" class="poster-container" > - +
    - +
    - +
    - +
    @@ -99,10 +91,21 @@ - + + + + +
    @@ -526,6 +529,10 @@ const poster = computed(() => { margin-left: .25rem; } +.compact-show { + display: none; +} + @media(--small) { .content { margin: 0; @@ -606,6 +613,20 @@ const poster = computed(() => { } } +@media(--small-50) { + .compact-show { + display: flex; + } + + .compact-hide { + display: none; + } + + .date { + font-size: .9rem; + } +} + @media(--small-60) { .actors { grid-template-columns: repeat(auto-fill, minmax(6.5rem, 1fr)); diff --git a/pages/tags/@tagId/+onBeforeRender.js b/pages/tags/@tagId/+onBeforeRender.js index 2a81b22..244bb17 100644 --- a/pages/tags/@tagId/+onBeforeRender.js +++ b/pages/tags/@tagId/+onBeforeRender.js @@ -14,6 +14,7 @@ export async function onBeforeRender(pageContext) { ...pageContext.urlQuery, scope: pageContext.routeParams.scope || 'latest', tagSlug: pageContext.routeParams.tagSlug, + tagFilter: pageContext.tagFilter, }), { page: Number(pageContext.routeParams.page) || 1, limit: Number(pageContext.urlParsed.search.limit) || 30, diff --git a/pages/updates/+onBeforeRender.js b/pages/updates/+onBeforeRender.js index 5505523..3fa1300 100644 --- a/pages/updates/+onBeforeRender.js +++ b/pages/updates/+onBeforeRender.js @@ -1,10 +1,13 @@ import { fetchScenes } from '#/src/scenes.js'; +import { curateScenesQuery } from '#/src/web/scenes.js'; export async function onBeforeRender(pageContext) { - const { scenes, limit, total } = await fetchScenes({ + const { scenes, limit, total } = await fetchScenes(await curateScenesQuery({ + ...pageContext.urlQuery, scope: pageContext.routeParams.scope || 'latest', isShowcased: true, - }, { + tagFilter: pageContext.tagFilter, + }), { page: Number(pageContext.routeParams.page) || 1, limit: Number(pageContext.urlParsed.search.limit) || 30, aggregate: false, diff --git a/pages/users/@username/+Page.vue b/pages/users/@username/+Page.vue index f0ee4a8..aa04ba2 100644 --- a/pages/users/@username/+Page.vue +++ b/pages/users/@username/+Page.vue @@ -20,6 +20,7 @@

    Stashes