From 7a076a9f1f7f84be5b52824c135a88b3ec3df6b5 Mon Sep 17 00:00:00 2001 From: Nicola Benaglia Date: Sun, 18 May 2025 19:22:27 +0200 Subject: [PATCH] Move all hooks into src/hooks/ folder --- src/App.tsx | 10 +++++----- src/components/Apps/AppViewer.tsx | 2 +- src/components/Apps/AppsPrivate.tsx | 2 +- src/components/Apps/SortablePinnedApps.tsx | 2 +- src/{ => hooks}/useAppFullscreen.tsx | 0 src/{components/Group => hooks}/useBlockUsers.tsx | 0 .../Apps => hooks}/useHandlePrivateApps.tsx | 14 +++++++------- .../Tutorials => hooks}/useHandleTutorials.tsx | 2 +- .../Group => hooks}/useHandleUserInfo.tsx | 2 +- src/{ => hooks}/useQortalGetSaveSettings.tsx | 8 ++++---- .../Apps => hooks}/useQortalMessageListener.tsx | 10 +++++----- src/{ => hooks}/useRetrieveDataLocalStorage.tsx | 2 +- src/qortalRequests.ts | 2 +- src/qortalRequests/get.ts | 2 +- src/utils/indexedDB.ts | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) rename src/{ => hooks}/useAppFullscreen.tsx (100%) rename src/{components/Group => hooks}/useBlockUsers.tsx (100%) rename src/{components/Apps => hooks}/useHandlePrivateApps.tsx (94%) rename src/{components/Tutorials => hooks}/useHandleTutorials.tsx (98%) rename src/{components/Group => hooks}/useHandleUserInfo.tsx (94%) rename src/{ => hooks}/useQortalGetSaveSettings.tsx (94%) rename src/{components/Apps => hooks}/useQortalMessageListener.tsx (98%) rename src/{ => hooks}/useRetrieveDataLocalStorage.tsx (98%) diff --git a/src/App.tsx b/src/App.tsx index 3f7dcca..9272fa7 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -91,8 +91,8 @@ import { DrawerComponent } from './components/Drawer/Drawer'; import { AddressQRCode } from './components/AddressQRCode'; import { Settings } from './components/Group/Settings'; import { MainAvatar } from './components/MainAvatar'; -import { useRetrieveDataLocalStorage } from './useRetrieveDataLocalStorage'; -import { useQortalGetSaveSettings } from './useQortalGetSaveSettings'; +import { useRetrieveDataLocalStorage } from './hooks/useRetrieveDataLocalStorage.tsx'; +import { useQortalGetSaveSettings } from './hooks/useQortalGetSaveSettings.tsx'; import { canSaveSettingToQdnAtom, enabledDevModeAtom, @@ -121,13 +121,13 @@ import { handleGetFileFromIndexedDB } from './utils/indexedDB'; import { Wallets } from './Wallets'; import { useFetchResources } from './common/useFetchResources'; import { Tutorials } from './components/Tutorials/Tutorials'; -import { useHandleTutorials } from './components/Tutorials/useHandleTutorials'; -import { useHandleUserInfo } from './components/Group/useHandleUserInfo'; +import { useHandleTutorials } from './hooks/useHandleTutorials.tsx'; +import { useHandleUserInfo } from './hooks/useHandleUserInfo.tsx'; import { Minting } from './components/Minting/Minting'; import { isRunningGateway } from './qortalRequests'; import { QMailStatus } from './components/QMailStatus'; import { GlobalActions } from './components/GlobalActions/GlobalActions'; -import { useBlockedAddresses } from './components/Group/useBlockUsers'; +import { useBlockedAddresses } from './hooks/useBlockUsers.tsx'; import { WalletIcon } from './assets/Icons/WalletIcon'; import { UserLookup } from './components/UserLookup.tsx/UserLookup'; import { RegisterName } from './components/RegisterName'; diff --git a/src/components/Apps/AppViewer.tsx b/src/components/Apps/AppViewer.tsx index 640d062..3ca83ea 100644 --- a/src/components/Apps/AppViewer.tsx +++ b/src/components/Apps/AppViewer.tsx @@ -3,7 +3,7 @@ import { Box } from '@mui/material'; import { getBaseApiReact } from '../../App'; import { subscribeToEvent, unsubscribeFromEvent } from '../../utils/events'; import { useFrame } from 'react-frame-component'; -import { useQortalMessageListener } from './useQortalMessageListener'; +import { useQortalMessageListener } from '../../hooks/useQortalMessageListener'; import { useThemeContext } from '../Theme/ThemeContext'; import { useTranslation } from 'react-i18next'; diff --git a/src/components/Apps/AppsPrivate.tsx b/src/components/Apps/AppsPrivate.tsx index dae28a8..54c1cba 100644 --- a/src/components/Apps/AppsPrivate.tsx +++ b/src/components/Apps/AppsPrivate.tsx @@ -14,7 +14,7 @@ import { useTheme, } from '@mui/material'; import { useDropzone } from 'react-dropzone'; -import { useHandlePrivateApps } from './useHandlePrivateApps'; +import { useHandlePrivateApps } from '../../hooks/useHandlePrivateApps'; import { groupsPropertiesAtom, memberGroupsAtom, diff --git a/src/components/Apps/SortablePinnedApps.tsx b/src/components/Apps/SortablePinnedApps.tsx index 72e42df..aef692d 100644 --- a/src/components/Apps/SortablePinnedApps.tsx +++ b/src/components/Apps/SortablePinnedApps.tsx @@ -25,7 +25,7 @@ import { import { saveToLocalStorage } from './AppsNavBarDesktop'; import { ContextMenuPinnedApps } from '../ContextMenuPinnedApps'; import LockIcon from '@mui/icons-material/Lock'; -import { useHandlePrivateApps } from './useHandlePrivateApps'; +import { useHandlePrivateApps } from '../../hooks/useHandlePrivateApps'; import { useAtom, useSetAtom } from 'jotai'; const SortableItem = ({ id, name, app, isDesktop }) => { diff --git a/src/useAppFullscreen.tsx b/src/hooks/useAppFullscreen.tsx similarity index 100% rename from src/useAppFullscreen.tsx rename to src/hooks/useAppFullscreen.tsx diff --git a/src/components/Group/useBlockUsers.tsx b/src/hooks/useBlockUsers.tsx similarity index 100% rename from src/components/Group/useBlockUsers.tsx rename to src/hooks/useBlockUsers.tsx diff --git a/src/components/Apps/useHandlePrivateApps.tsx b/src/hooks/useHandlePrivateApps.tsx similarity index 94% rename from src/components/Apps/useHandlePrivateApps.tsx rename to src/hooks/useHandlePrivateApps.tsx index f8dd2a1..be79d41 100644 --- a/src/components/Apps/useHandlePrivateApps.tsx +++ b/src/hooks/useHandlePrivateApps.tsx @@ -1,14 +1,14 @@ import { useContext, useState } from 'react'; -import { executeEvent } from '../../utils/events'; -import { getBaseApiReact, MyContext } from '../../App'; -import { createEndpoint } from '../../background'; +import { executeEvent } from '../utils/events'; +import { getBaseApiReact, MyContext } from '../App'; +import { createEndpoint } from '../background'; import { settingsLocalLastUpdatedAtom, sortablePinnedAppsAtom, -} from '../../atoms/global'; -import { saveToLocalStorage } from './AppsNavBarDesktop'; -import { base64ToUint8Array } from '../../qdn/encryption/group-encryption'; -import { uint8ArrayToObject } from '../../backgroundFunctions/encryption'; +} from '../atoms/global'; +import { saveToLocalStorage } from '../components/Apps/AppsNavBarDesktop'; +import { base64ToUint8Array } from '../qdn/encryption/group-encryption'; +import { uint8ArrayToObject } from '../backgroundFunctions/encryption'; import { useSetAtom } from 'jotai'; export const useHandlePrivateApps = () => { diff --git a/src/components/Tutorials/useHandleTutorials.tsx b/src/hooks/useHandleTutorials.tsx similarity index 98% rename from src/components/Tutorials/useHandleTutorials.tsx rename to src/hooks/useHandleTutorials.tsx index 1f5ac33..8da8d4b 100644 --- a/src/components/Tutorials/useHandleTutorials.tsx +++ b/src/hooks/useHandleTutorials.tsx @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; -import { saveToLocalStorage } from '../Apps/AppsNavBarDesktop'; +import { saveToLocalStorage } from '../components/Apps/AppsNavBarDesktop'; import creationImg from './img/creation.webp'; import dashboardImg from './img/dashboard.webp'; import groupsImg from './img/groups.webp'; diff --git a/src/components/Group/useHandleUserInfo.tsx b/src/hooks/useHandleUserInfo.tsx similarity index 94% rename from src/components/Group/useHandleUserInfo.tsx rename to src/hooks/useHandleUserInfo.tsx index 8b8796f..8faf7d1 100644 --- a/src/components/Group/useHandleUserInfo.tsx +++ b/src/hooks/useHandleUserInfo.tsx @@ -1,5 +1,5 @@ import { useCallback, useRef } from 'react'; -import { getBaseApiReact } from '../../App'; +import { getBaseApiReact } from '../App'; export const useHandleUserInfo = () => { const userInfoRef = useRef({}); diff --git a/src/useQortalGetSaveSettings.tsx b/src/hooks/useQortalGetSaveSettings.tsx similarity index 94% rename from src/useQortalGetSaveSettings.tsx rename to src/hooks/useQortalGetSaveSettings.tsx index 66691b7..dc307eb 100644 --- a/src/useQortalGetSaveSettings.tsx +++ b/src/hooks/useQortalGetSaveSettings.tsx @@ -6,13 +6,13 @@ import { settingsLocalLastUpdatedAtom, settingsQDNLastUpdatedAtom, sortablePinnedAppsAtom, -} from './atoms/global'; -import { getArbitraryEndpointReact, getBaseApiReact } from './App'; -import { decryptResource } from './components/Group/Group'; +} from '../atoms/global'; +import { getArbitraryEndpointReact, getBaseApiReact } from '../App'; +import { decryptResource } from '../components/Group/Group'; import { base64ToUint8Array, uint8ArrayToObject, -} from './backgroundFunctions/encryption'; +} from '../backgroundFunctions/encryption'; import { useAtom, useSetAtom } from 'jotai'; function fetchFromLocalStorage(key) { diff --git a/src/components/Apps/useQortalMessageListener.tsx b/src/hooks/useQortalMessageListener.tsx similarity index 98% rename from src/components/Apps/useQortalMessageListener.tsx rename to src/hooks/useQortalMessageListener.tsx index e2bb3c6..a297e63 100644 --- a/src/components/Apps/useQortalMessageListener.tsx +++ b/src/hooks/useQortalMessageListener.tsx @@ -1,10 +1,10 @@ import { useCallback, useContext, useEffect, useState } from 'react'; -import { executeEvent } from '../../utils/events'; -import { navigationControllerAtom } from '../../atoms/global'; +import { executeEvent } from '../utils/events'; +import { navigationControllerAtom } from '../atoms/global'; import { Filesystem, Directory } from '@capacitor/filesystem'; -import { saveFile } from '../../qortalRequests/get'; -import { mimeToExtensionMap } from '../../utils/memeTypes'; -import { MyContext } from '../../App'; +import { saveFile } from '../qortalRequests/get'; +import { mimeToExtensionMap } from '../utils/memeTypes'; +import { MyContext } from '../App'; import FileSaver from 'file-saver'; import { useSetAtom } from 'jotai'; diff --git a/src/useRetrieveDataLocalStorage.tsx b/src/hooks/useRetrieveDataLocalStorage.tsx similarity index 98% rename from src/useRetrieveDataLocalStorage.tsx rename to src/hooks/useRetrieveDataLocalStorage.tsx index 6ddc673..4b7479c 100644 --- a/src/useRetrieveDataLocalStorage.tsx +++ b/src/hooks/useRetrieveDataLocalStorage.tsx @@ -5,7 +5,7 @@ import { settingsLocalLastUpdatedAtom, settingsQDNLastUpdatedAtom, sortablePinnedAppsAtom, -} from './atoms/global'; +} from '../atoms/global'; import { useSetAtom } from 'jotai'; function fetchFromLocalStorage(key) { diff --git a/src/qortalRequests.ts b/src/qortalRequests.ts index 2466d3d..af3c0d1 100644 --- a/src/qortalRequests.ts +++ b/src/qortalRequests.ts @@ -1,5 +1,5 @@ import { gateways, getApiKeyFromStorage } from './background'; -import { listOfAllQortalRequests } from './components/Apps/useQortalMessageListener'; +import { listOfAllQortalRequests } from './hooks/useQortalMessageListener'; import { addForeignServer, addGroupAdminRequest, diff --git a/src/qortalRequests/get.ts b/src/qortalRequests/get.ts index 3f71405..6ad9709 100644 --- a/src/qortalRequests/get.ts +++ b/src/qortalRequests/get.ts @@ -42,7 +42,7 @@ import { getNameInfo, uint8ArrayToObject, } from '../backgroundFunctions/encryption'; -import { showSaveFilePicker } from '../components/Apps/useQortalMessageListener'; +import { showSaveFilePicker } from '../hooks/useQortalMessageListener'; import { getPublishesFromAdminsAdminSpace } from '../components/Chat/AdminSpaceInner'; import { extractComponents } from '../components/Chat/MessageDisplay'; import { diff --git a/src/utils/indexedDB.ts b/src/utils/indexedDB.ts index 3066b6b..ea29e3f 100644 --- a/src/utils/indexedDB.ts +++ b/src/utils/indexedDB.ts @@ -1,4 +1,4 @@ -import { openIndexedDB } from '../components/Apps/useQortalMessageListener'; +import { openIndexedDB } from '../hooks/useQortalMessageListener'; import { fileToBase64 } from './fileReading'; export async function handleGetFileFromIndexedDB(event) {