diff --git a/src/assets/css/dark.css b/src/assets/css/dark.css index 0eaa0b4..0175901 100644 --- a/src/assets/css/dark.css +++ b/src/assets/css/dark.css @@ -55,6 +55,7 @@ } .dark .settings-content{ background-color: #303030 !important; + border-left: 1px solid #494949 !important; } .dark .app-block .title{ color: black; diff --git a/src/components/TabList.vue b/src/components/TabList.vue index bde6e88..b9dfd5f 100644 --- a/src/components/TabList.vue +++ b/src/components/TabList.vue @@ -79,7 +79,7 @@ const firstDay = ref(); const countOfActiveDays = ref(); const countOfSites = computed(() => (tabs.value != undefined ? tabs.value.length : 0)); -const isLoading = ref(); +const isLoading = ref(true); const showOnlyFirst100Items = ref(); diff --git a/src/functions/deferList.ts b/src/functions/deferList.ts index 9415836..8bd60b3 100644 --- a/src/functions/deferList.ts +++ b/src/functions/deferList.ts @@ -1,4 +1,3 @@ -import { differenceInHours } from 'date-fns'; import { StorageParams } from '../storage/storage-params'; import { isDomainEquals } from '../utils/common'; import { Settings } from './settings'; @@ -6,20 +5,14 @@ import { Deffering } from '../entity/deffering'; import { injectStorage } from '../storage/inject-storage'; import { MINUTE } from '../utils/time'; import { log } from '../utils/logger'; +import { millisecondsInHour } from 'date-fns'; export async function isInDeferList(url: string): Promise { const deferList = (await Settings.getInstance().getSetting( StorageParams.BLOCK_DEFERRAL_TIME, )) as Deffering[]; - const array = Object.values(deferList); - const item = array?.find(x => isDomainEquals(x.domain, url)); - if (item != undefined) - log( - `Deferring time ${url} ${new Date(item.time)} diff ${differenceInHours( - new Date(item.time), - new Date(), - )}`, - ); + const item = deferList?.find(x => isDomainEquals(x.domain, url)); + if (item != undefined) log(`Deferring time ${url} ${new Date(item.time)}`); return item != undefined && item.time > Date.now(); } @@ -27,18 +20,11 @@ export async function canDefering(url: string): Promise { const deferList = (await Settings.getInstance().getSetting( StorageParams.BLOCK_DEFERRAL_TIME, )) as Deffering[]; - const array = Object.values(deferList); - const item = array?.find(x => isDomainEquals(x.domain, url)); - if (item != undefined) - log( - `Deferring time ${url} ${new Date(item.time)} diff ${differenceInHours( - new Date(item.time), - new Date(), - )}`, - ); + const item = deferList?.find(x => isDomainEquals(x.domain, url)); + if (item != undefined) log(`Deferring time ${url} ${new Date(item.time)}`); if (item == undefined) return true; - return item != undefined && differenceInHours(new Date(item.time), new Date()) > 24; + return item != undefined && Date.now() - new Date(item.time).getTime() > millisecondsInHour * 24; } export async function defering(url: string, timeInMinutes: number): Promise { @@ -47,10 +33,9 @@ export async function defering(url: string, timeInMinutes: number): Promise isDomainEquals(x.domain, url)); + const item = deferList?.find(x => isDomainEquals(x.domain, url)); if (item != undefined) item.time = Date.now() + timeInMinutes * MINUTE; - else array.push(new Deffering(url, 5)); + else deferList.push(new Deffering(url, 5)); - await settingsStorage.saveValue(StorageParams.BLOCK_DEFERRAL_TIME, array); + await settingsStorage.saveValue(StorageParams.BLOCK_DEFERRAL_TIME, deferList); } diff --git a/src/manifest.json b/src/manifest.json index ff5a3e3..3f9b4a6 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "__MSG_extName__", "short_name": "Web Tracker", - "version": "2.0.22", + "version": "2.0.23", "description": "__MSG_extDescription__", "options_page": "src/dashboard.html", "default_locale": "en",