Refact compositions

Author: Stigmatoz

src/background.ts

@@ -1,6 +1,6 @@
 import Browser from 'webextension-polyfill';
 import { initTracker } from './tracker';
-import { logger } from './compositions/logger';
+import { logger } from './utils/logger';
 import { scheduleJobs } from './jobs/sheduler';
 import { Settings } from './compositions/settings';
 import { StorageParams } from './storage/storage-params';

src/components/ByDays.vue

@@ -76,11 +76,11 @@ import TabItem from '../components/TabItem.vue';
 import ByDaysChart from '../components/ByDaysChart.vue';
 import Expander from '../components/Expander.vue';
 import { TabListByDays } from '../dto/tabListSummary';
-import { useTabListByDays } from '../compositions/tab-list-by-days';
+import { useTabListByDays } from '../compositions/useTabListByDays';
 import { convertSummaryTimeToString } from '../utils/converter';
 import { ranges, ThisWeekRange } from '../utils/date';
-import { useImportToCsvWithData } from '../compositions/toCsv';
-import { useFile, FileType } from '../compositions/loadFile';
+import { useImportToCsvWithData } from '../compositions/useImportToCsv';
+import { useFile, FileType } from '../compositions/useFile';
 
 const { t } = useI18n();
 

src/components/ByDaysChart.vue

@@ -24,7 +24,7 @@ import {
 import { convertSummaryTimeToString } from '../utils/converter';
 import { TabListByDays } from '../dto/tabListSummary';
 import { ref, watch } from 'vue';
-import { log } from '../compositions/logger';
+import { log } from '../utils/logger';
 
 const props = defineProps<{
   data: TabListByDays;

src/components/GeneralSettings.vue

@@ -151,11 +151,11 @@ import {
   SHOW_CHANGELOG_DEFAULT,
 } from '../storage/storage-params';
 import { ranges, ThisWeekRange, todayLocalDate } from '../utils/date';
-import { useImportToCsv } from '../compositions/toCsv';
-import { FileType, useFile } from '../compositions/loadFile';
-import { removeAllData } from '../compositions/remove-all-data';
+import { useImportToCsv } from '../compositions/useImportToCsv';
+import { FileType, useFile } from '../compositions/useFile';
+import { useRemoveAllData } from '../compositions/useRemoveAllData';
 import { injectTabsRepository } from '../repository/inject-tabs-repository';
-import { restoreData } from '../compositions/restoreData';
+import { useRestoreData } from '../compositions/useRestoreData';
 
 const { t } = useI18n();
 
@@ -235,7 +235,7 @@ async function removeAll() {
 }
 
 async function removeAllConfirm() {
-  await removeAllData();
+  await useRemoveAllData();
   needToConfirmDeleteAllData.value = false;
 }
 
@@ -264,7 +264,7 @@ function restoreFileUpload() {
         if (readerEvent != null) {
           let content = readerEvent.target?.result;
           if (content != null) {
-            await restoreData(content as string);
+            await useRestoreData(content as string);
           }
         }
       };

src/components/ListWithTime.vue

@@ -48,7 +48,7 @@ import { computed, onMounted, ref } from 'vue';
 import { ListWithTime, TypeOfUrl } from '../utils/enums';
 import { StorageParams } from '../storage/storage-params';
 import { isDomainEquals } from '../utils/common';
-import { extractHostname } from '../compositions/extract-hostname';
+import { extractHostname } from '../utils/extract-hostname';
 import { convertHHMMToSeconds, convertSecondsToHHMM } from '../utils/converter';
 import { Restriction } from '../entity/restriction';
 import { BaseTimeList } from '../entity/baseTimeList';

src/components/TabList.vue

@@ -52,8 +52,8 @@ import DonutChart from '../components/DonutChart.vue';
 import OverallStatistics from '../components/OverallStatistics.vue';
 import { Tab } from '../entity/tab';
 import { SortingBy, TypeOfList } from '../utils/enums';
-import { useTodayTabListSummary } from '../compositions/today-tab-list-summary';
-import { useAllTabListSummary } from '../compositions/all-tab-list-summary';
+import { useTodayTabListSummary } from '../compositions/useTodayTabListSummary';
+import { useAllTabListSummary } from '../compositions/useAllTabListSummary';
 import { CurrentTabItem } from '../dto/currentTabItem';
 import { todayLocalDate } from '../utils/date';
 import { OverallStats } from '../dto/tabListSummary';

src/components/WhiteList.vue

@@ -42,7 +42,7 @@ import { useNotification } from '@kyvg/vue3-notification';
 import { injecStorage } from '../storage/inject-storage';
 import { StorageParams } from '../storage/storage-params';
 import { isDomainEquals } from '../utils/common';
-import { extractHostname } from '../compositions/extract-hostname';
+import { extractHostname } from '../utils/extract-hostname';
 
 const { t } = useI18n();
 

src/compositions/black-list.ts

@@ -1,6 +1,6 @@
 import { StorageParams } from '../storage/storage-params';
 import { isDomainEquals } from '../utils/common';
-import { extractHostname } from './extract-hostname';
+import { extractHostname } from '../utils/extract-hostname';
 import { Settings } from './settings';
 
 export async function isInBlackList(url: string): Promise<boolean> {

src/compositions/daily-intervals.ts

@@ -5,7 +5,7 @@ import { Settings } from './settings';
 import { Deffering } from '../entity/deffering';
 import { injecStorage } from '../storage/inject-storage';
 import { MINUTE } from '../utils/time';
-import { log } from './logger';
+import { log } from '../utils/logger';
 
 export async function isInDeferList(url: string): Promise<boolean> {
   const deferList = (await Settings.getInstance().getSetting(