From a38546208a19b244565364513c06420cad88ae7c Mon Sep 17 00:00:00 2001 From: stillday Date: Wed, 9 Mar 2022 20:33:56 +0100 Subject: [PATCH 1/3] HOTFIX 1.0.0.1 unknown user fix and toLowerCase fix --- src/app.css | 2 +- src/lib/cookie.ts | 1 + src/lib/filter.ts | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app.css b/src/app.css index 4c246d6..00805a1 100644 --- a/src/app.css +++ b/src/app.css @@ -533,7 +533,7 @@ footer a:hover { .filter-btn-checkbox:checked + .filter-btn-text{ - background-color: var(--nav-color); + background-color: var(--ddb-red); } /* screenreader class */ diff --git a/src/lib/cookie.ts b/src/lib/cookie.ts index 45c91d4..6b5e164 100644 --- a/src/lib/cookie.ts +++ b/src/lib/cookie.ts @@ -13,6 +13,7 @@ export function setCookie(cname, cvalue, exdays) { export function readCookie(request) { const cookies = {}; + if (!request.headers.cookie) return ''; request.headers.cookie.split(';').forEach(function(cookie) { const parts = cookie.match(/(.*?)=(.*)$/) cookies[ parts[1].trim() ] = (parts[2] || '').trim(); diff --git a/src/lib/filter.ts b/src/lib/filter.ts index 1362cda..06d389d 100644 --- a/src/lib/filter.ts +++ b/src/lib/filter.ts @@ -8,11 +8,11 @@ export function filterDescription({item, hideTranslated, searchQuerry}) { && ((material?.length ?? 1) > 0) && ((source?.length ?? 0) > 0); + searchQuerry = searchQuerry || ''; + const searchShow = (name ?? '').toLowerCase().includes(searchQuerry.toLowerCase()) || id.toLowerCase().includes(searchQuerry.toLowerCase()) - // console.log('trans', translatedHidden); - // console.log('search', !searchShow) return translatedHidden || !searchShow; } From 4e4cc80577969a8fa0c49b6da3734ab667b1f62b Mon Sep 17 00:00:00 2001 From: stillday Date: Thu, 10 Mar 2022 09:37:12 +0100 Subject: [PATCH 2/3] remove not use code --- src/lib/components/translater.svelte | 12 ++++++++++-- src/lib/cookie.ts | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/lib/components/translater.svelte b/src/lib/components/translater.svelte index a46e8f0..a0ac16a 100644 --- a/src/lib/components/translater.svelte +++ b/src/lib/components/translater.svelte @@ -15,7 +15,6 @@ import Search from "$lib/components/Search.svelte"; import { hideTranslated, searchQuerry } from "$lib/stores/filter"; import { filterDescription } from "$lib/filter"; -import type { log } from 'util'; // import type { } from "tinymce"; export let file; @@ -220,7 +219,16 @@ import type { log } from 'util'; let _hideTranslated = $hideTranslated; $: { - if (loaded && (_hideTranslated !== $hideTranslated || _searchQuerry !== $searchQuerry)) { + + if(_searchQuerry === '') console.log('null'); + console.log('_search', _searchQuerry); + console.log('$search', $searchQuerry); + + console.log('##################################'); + + if (loaded && (_hideTranslated !== $hideTranslated || _searchQuerry !== $searchQuerry || _searchQuerry === '')) { + console.log('intern', _searchQuerry); + _hideTranslated = $hideTranslated items = items.map((item) => { item.hidden = filterDescription({ diff --git a/src/lib/cookie.ts b/src/lib/cookie.ts index abdb854..9df165f 100644 --- a/src/lib/cookie.ts +++ b/src/lib/cookie.ts @@ -14,7 +14,6 @@ export function setCookie(cname, cvalue, exdays) { export function readCookie(request) { try { const cookies = {}; - if (!request.headers.cookie) return ''; request.headers.cookie.split(';').forEach(function(cookie) { const parts = cookie.match(/(.*?)=(.*)$/) cookies[ parts[1].trim() ] = (parts[2] || '').trim(); From a06ff0de90d62755c065363f51c4091f00464817 Mon Sep 17 00:00:00 2001 From: stillday Date: Thu, 10 Mar 2022 09:48:56 +0100 Subject: [PATCH 3/3] not activ logs --- src/lib/components/translater.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/components/translater.svelte b/src/lib/components/translater.svelte index a0ac16a..a3947a4 100644 --- a/src/lib/components/translater.svelte +++ b/src/lib/components/translater.svelte @@ -220,14 +220,14 @@ let _hideTranslated = $hideTranslated; $: { - if(_searchQuerry === '') console.log('null'); - console.log('_search', _searchQuerry); - console.log('$search', $searchQuerry); + // if(_searchQuerry === '') console.log('null'); + // console.log('_search', _searchQuerry); + // console.log('$search', $searchQuerry); - console.log('##################################'); + // console.log('##################################'); if (loaded && (_hideTranslated !== $hideTranslated || _searchQuerry !== $searchQuerry || _searchQuerry === '')) { - console.log('intern', _searchQuerry); + // console.log('intern', _searchQuerry); _hideTranslated = $hideTranslated items = items.map((item) => {