From c84d8b59fe0da72ac972c88879f8509c129a2bc0 Mon Sep 17 00:00:00 2001 From: Manuel Ruwe Date: Fri, 23 Dec 2022 17:29:58 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dashboard/Mobile/Ribbon/MobileRibbon.tsx | 2 +- .../Tabs/AppereanceTab/IconSelector/IconSelector.tsx | 2 +- src/components/Dashboard/Views/DashboardView.tsx | 2 +- src/components/Dashboard/Views/ViewToggleButton.tsx | 2 +- .../header/Actions/ToggleEditMode/ToggleEditMode.tsx | 2 +- src/{tools => }/hooks/api.ts | 12 ++++++------ src/{tools => }/hooks/useRepositoryIconsQuery.ts | 2 +- src/{tools => }/hooks/useScreenLargerThan.ts | 0 src/{tools => }/hooks/useScreenSmallerThan.ts | 0 src/{tools => }/hooks/useSetSafeInterval.tsx | 0 src/widgets/date/DateTile.tsx | 2 +- .../TorrentNetworkTrafficTile.tsx | 2 +- src/widgets/useNet/UseNetTile.tsx | 2 +- src/widgets/useNet/UsenetHistoryList.tsx | 2 +- src/widgets/useNet/UsenetQueueList.tsx | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) rename src/{tools => }/hooks/api.ts (91%) rename src/{tools => }/hooks/useRepositoryIconsQuery.ts (90%) rename src/{tools => }/hooks/useScreenLargerThan.ts (100%) rename src/{tools => }/hooks/useScreenSmallerThan.ts (100%) rename src/{tools => }/hooks/useSetSafeInterval.tsx (100%) diff --git a/src/components/Dashboard/Mobile/Ribbon/MobileRibbon.tsx b/src/components/Dashboard/Mobile/Ribbon/MobileRibbon.tsx index 92d905198..3c958e5cb 100644 --- a/src/components/Dashboard/Mobile/Ribbon/MobileRibbon.tsx +++ b/src/components/Dashboard/Mobile/Ribbon/MobileRibbon.tsx @@ -2,7 +2,7 @@ import { ActionIcon, createStyles } from '@mantine/core'; import { useDisclosure } from '@mantine/hooks'; import { IconChevronLeft, IconChevronRight } from '@tabler/icons'; import { useConfigContext } from '../../../../config/provider'; -import { useScreenLargerThan } from '../../../../tools/hooks/useScreenLargerThan'; +import { useScreenLargerThan } from '../../../../hooks/useScreenLargerThan'; import { MobileRibbonSidebarDrawer } from './MobileRibbonSidebarDrawer'; export const MobileRibbons = () => { diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx index 48250ebb6..1fdab92fa 100644 --- a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx +++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx @@ -18,10 +18,10 @@ import { useDebouncedValue } from '@mantine/hooks'; import { IconSearch, IconX } from '@tabler/icons'; import { useEffect, useState } from 'react'; import { ICON_PICKER_SLICE_LIMIT } from '../../../../../../../../data/constants'; -import { useRepositoryIconsQuery } from '../../../../../../../tools/hooks/useRepositoryIconsQuery'; import { IconSelectorItem } from '../../../../../../../types/iconSelector/iconSelectorItem'; import { WalkxcodeRepositoryIcon } from '../../../../../../../types/iconSelector/repositories/walkxcodeIconRepository'; import { AppType } from '../../../../../../../types/app'; +import { useRepositoryIconsQuery } from '../../../../../../../hooks/useRepositoryIconsQuery'; interface IconSelectorProps { form: UseFormReturnType AppType>; diff --git a/src/components/Dashboard/Views/DashboardView.tsx b/src/components/Dashboard/Views/DashboardView.tsx index abd8c5351..cacb40263 100644 --- a/src/components/Dashboard/Views/DashboardView.tsx +++ b/src/components/Dashboard/Views/DashboardView.tsx @@ -1,7 +1,7 @@ import { Group, Stack } from '@mantine/core'; import { useMemo } from 'react'; import { useConfigContext } from '../../../config/provider'; -import { useScreenSmallerThan } from '../../../tools/hooks/useScreenSmallerThan'; +import { useScreenSmallerThan } from '../../../hooks/useScreenSmallerThan'; import { CategoryType } from '../../../types/category'; import { WrapperType } from '../../../types/wrapper'; import { DashboardCategory } from '../Wrappers/Category/Category'; diff --git a/src/components/Dashboard/Views/ViewToggleButton.tsx b/src/components/Dashboard/Views/ViewToggleButton.tsx index d4d1722f4..975da8235 100644 --- a/src/components/Dashboard/Views/ViewToggleButton.tsx +++ b/src/components/Dashboard/Views/ViewToggleButton.tsx @@ -1,7 +1,7 @@ import { ActionIcon, Button, Text, Tooltip } from '@mantine/core'; import { IconEdit, IconEditOff } from '@tabler/icons'; import { useTranslation } from 'next-i18next'; -import { useScreenLargerThan } from '../../../tools/hooks/useScreenLargerThan'; +import { useScreenLargerThan } from '../../../hooks/useScreenLargerThan'; import { useEditModeStore } from './useEditModeStore'; export const ViewToggleButton = () => { diff --git a/src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx b/src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx index a3e14d4e3..93a5ccde0 100644 --- a/src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx +++ b/src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx @@ -2,7 +2,7 @@ import { ActionIcon, Button, Popover, Text, Tooltip } from '@mantine/core'; import { IconEditCircle, IconEditCircleOff, IconX } from '@tabler/icons'; import { Trans, useTranslation } from 'next-i18next'; import { useState } from 'react'; -import { useScreenSmallerThan } from '../../../../../tools/hooks/useScreenSmallerThan'; +import { useScreenSmallerThan } from '../../../../../hooks/useScreenSmallerThan'; import { useEditModeStore } from '../../../../Dashboard/Views/useEditModeStore'; diff --git a/src/tools/hooks/api.ts b/src/hooks/api.ts similarity index 91% rename from src/tools/hooks/api.ts rename to src/hooks/api.ts index 3bb7315cf..77f5dba21 100644 --- a/src/tools/hooks/api.ts +++ b/src/hooks/api.ts @@ -4,15 +4,15 @@ import { Results } from 'sabnzbd-api'; import { UsenetQueueRequestParams, UsenetQueueResponse, -} from '../../pages/api/modules/usenet/queue'; +} from '../pages/api/modules/usenet/queue'; import { UsenetHistoryRequestParams, UsenetHistoryResponse, -} from '../../pages/api/modules/usenet/history'; -import { UsenetInfoRequestParams, UsenetInfoResponse } from '../../pages/api/modules/usenet'; -import { UsenetPauseRequestParams } from '../../pages/api/modules/usenet/pause'; -import { queryClient } from '../queryClient'; -import { UsenetResumeRequestParams } from '../../pages/api/modules/usenet/resume'; +} from '../pages/api/modules/usenet/history'; +import { UsenetInfoRequestParams, UsenetInfoResponse } from '../pages/api/modules/usenet'; +import { UsenetPauseRequestParams } from '../pages/api/modules/usenet/pause'; +import { queryClient } from '../tools/queryClient'; +import { UsenetResumeRequestParams } from '../pages/api/modules/usenet/resume'; const POLLING_INTERVAL = 2000; diff --git a/src/tools/hooks/useRepositoryIconsQuery.ts b/src/hooks/useRepositoryIconsQuery.ts similarity index 90% rename from src/tools/hooks/useRepositoryIconsQuery.ts rename to src/hooks/useRepositoryIconsQuery.ts index 15ce5d06e..0db02254b 100644 --- a/src/tools/hooks/useRepositoryIconsQuery.ts +++ b/src/hooks/useRepositoryIconsQuery.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { IconSelectorItem } from '../../types/iconSelector/iconSelectorItem'; +import { IconSelectorItem } from '../types/iconSelector/iconSelectorItem'; export const useRepositoryIconsQuery = ({ url, diff --git a/src/tools/hooks/useScreenLargerThan.ts b/src/hooks/useScreenLargerThan.ts similarity index 100% rename from src/tools/hooks/useScreenLargerThan.ts rename to src/hooks/useScreenLargerThan.ts diff --git a/src/tools/hooks/useScreenSmallerThan.ts b/src/hooks/useScreenSmallerThan.ts similarity index 100% rename from src/tools/hooks/useScreenSmallerThan.ts rename to src/hooks/useScreenSmallerThan.ts diff --git a/src/tools/hooks/useSetSafeInterval.tsx b/src/hooks/useSetSafeInterval.tsx similarity index 100% rename from src/tools/hooks/useSetSafeInterval.tsx rename to src/hooks/useSetSafeInterval.tsx diff --git a/src/widgets/date/DateTile.tsx b/src/widgets/date/DateTile.tsx index c47177813..42fc3725a 100644 --- a/src/widgets/date/DateTile.tsx +++ b/src/widgets/date/DateTile.tsx @@ -2,7 +2,7 @@ import { Center, Stack, Text, Title } from '@mantine/core'; import { IconClock } from '@tabler/icons'; import dayjs from 'dayjs'; import { useEffect, useRef, useState } from 'react'; -import { useSetSafeInterval } from '../../tools/hooks/useSetSafeInterval'; +import { useSetSafeInterval } from '../../hooks/useSetSafeInterval'; import { defineWidget } from '../helper'; import { IWidget } from '../widgets'; diff --git a/src/widgets/torrentNetworkTraffic/TorrentNetworkTrafficTile.tsx b/src/widgets/torrentNetworkTraffic/TorrentNetworkTrafficTile.tsx index 6b5ee7d7d..ce9f6a01b 100644 --- a/src/widgets/torrentNetworkTraffic/TorrentNetworkTrafficTile.tsx +++ b/src/widgets/torrentNetworkTraffic/TorrentNetworkTrafficTile.tsx @@ -9,7 +9,7 @@ import axios from 'axios'; import { useTranslation } from 'next-i18next'; import { useEffect, useState } from 'react'; import { useConfigContext } from '../../config/provider'; -import { useSetSafeInterval } from '../../tools/hooks/useSetSafeInterval'; +import { useSetSafeInterval } from '../../hooks/useSetSafeInterval'; import { humanFileSize } from '../../tools/humanFileSize'; import { defineWidget } from '../helper'; import { IWidget } from '../widgets'; diff --git a/src/widgets/useNet/UseNetTile.tsx b/src/widgets/useNet/UseNetTile.tsx index 744d6753d..8ce7cc6fb 100644 --- a/src/widgets/useNet/UseNetTile.tsx +++ b/src/widgets/useNet/UseNetTile.tsx @@ -17,7 +17,7 @@ import dayjs from 'dayjs'; import duration from 'dayjs/plugin/duration'; import { useTranslation } from 'next-i18next'; import { useConfigContext } from '../../config/provider'; -import { useGetUsenetInfo, usePauseUsenetQueue, useResumeUsenetQueue } from '../../tools/hooks/api'; +import { useGetUsenetInfo, usePauseUsenetQueue, useResumeUsenetQueue } from '../../hooks/api'; import { humanFileSize } from '../../tools/humanFileSize'; import { AppIntegrationType } from '../../types/app'; import { defineWidget } from '../helper'; diff --git a/src/widgets/useNet/UsenetHistoryList.tsx b/src/widgets/useNet/UsenetHistoryList.tsx index c87587a57..faab03846 100644 --- a/src/widgets/useNet/UsenetHistoryList.tsx +++ b/src/widgets/useNet/UsenetHistoryList.tsx @@ -18,7 +18,7 @@ import dayjs from 'dayjs'; import duration from 'dayjs/plugin/duration'; import { useTranslation } from 'next-i18next'; import { FunctionComponent, useState } from 'react'; -import { useGetUsenetHistory } from '../../tools/hooks/api'; +import { useGetUsenetHistory } from '../../hooks/api'; import { humanFileSize } from '../../tools/humanFileSize'; import { parseDuration } from '../../tools/parseDuration'; diff --git a/src/widgets/useNet/UsenetQueueList.tsx b/src/widgets/useNet/UsenetQueueList.tsx index 62e11756a..3e4c33dce 100644 --- a/src/widgets/useNet/UsenetQueueList.tsx +++ b/src/widgets/useNet/UsenetQueueList.tsx @@ -21,7 +21,7 @@ import dayjs from 'dayjs'; import duration from 'dayjs/plugin/duration'; import { useTranslation } from 'next-i18next'; import { FunctionComponent, useState } from 'react'; -import { useGetUsenetDownloads } from '../../tools/hooks/api'; +import { useGetUsenetDownloads } from '../../hooks/api'; import { humanFileSize } from '../../tools/humanFileSize'; dayjs.extend(duration);