From e7e1fbbc4e42f03666ab2826969935319dbabdf6 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sat, 5 Oct 2024 23:22:42 +0200 Subject: [PATCH] Move more core logic to new folder --- src/lib/requests/client/BaseClient.ts | 2 +- src/lib/requests/requests/RequestManager.ts | 2 +- src/lib/{ => storage}/AppStorage.ts | 0 src/lib/{ => storage}/CustomCache.ts | 0 src/modules/app-updates/components/WebUIUpdateChecker.tsx | 2 +- src/modules/backup/screens/Backup.tsx | 2 +- src/modules/browse/screens/BrowseSettings.tsx | 2 +- .../category/components/CategoriesInclusionSetting.tsx | 2 +- src/modules/category/components/CategorySelect.tsx | 2 +- src/modules/chapter/components/ChapterList.tsx | 2 +- src/modules/chapter/services/Chapters.ts | 2 +- src/{lib => modules/core}/IsoLanguages.ts | 0 src/modules/core/components/UpdateChecker.tsx | 4 ++-- src/modules/core/components/menu/NestedMenuItem.tsx | 2 +- .../core/components/settings/MutableListSetting.tsx | 2 +- src/modules/core/contexts/AppContext.tsx | 2 +- src/modules/core/hooks/useStorage.tsx | 2 +- src/{lib/ui => modules/core/utils}/AwaitableDialog.tsx | 0 src/{lib/Languages.tsx => modules/core/utils/Languages.ts} | 2 +- src/{lib/ui => modules/core/utils}/MediaQuery.tsx | 2 +- src/{lib/ui => modules/core/utils}/Toast.ts | 0 src/modules/device/screens/DeviceSetting.tsx | 2 +- src/modules/downloads/components/DownloadAheadSetting.tsx | 2 +- src/modules/downloads/screens/DownloadQueue.tsx | 2 +- src/modules/downloads/screens/DownloadSettings.tsx | 2 +- src/modules/extension/components/ExtensionCard.tsx | 2 +- src/modules/extension/screens/Extensions.tsx | 4 ++-- src/modules/extension/services/Extensions.ts | 2 +- src/modules/global-search/screens/SearchAll.tsx | 2 +- src/modules/library/components/LibraryOptionsPanel.tsx | 2 +- src/modules/library/hooks/useGetVisibleLibraryMangas.ts | 2 +- src/modules/library/screens/LibraryDuplicates.tsx | 2 +- src/modules/library/screens/LibrarySettings.tsx | 2 +- src/modules/manga/components/MangaBadges.tsx | 2 +- src/modules/manga/components/MangaDetails.tsx | 2 +- src/modules/manga/components/MangaGrid.tsx | 2 +- src/modules/manga/components/MangaOptionButton.tsx | 2 +- src/modules/manga/components/TrackMangaButton.tsx | 2 +- src/modules/manga/hooks/useManageMangaLibraryState.tsx | 4 ++-- src/modules/manga/hooks/useRefreshManga.ts | 2 +- src/modules/manga/services/Mangas.ts | 2 +- src/modules/migration/components/MigrateDialog.tsx | 2 +- src/modules/migration/screens/Migration.tsx | 2 +- src/modules/navigation-bar/components/DefaultNavBar.tsx | 2 +- src/modules/reader/components/page/Page.tsx | 2 +- src/modules/reader/screens/DefaultReaderSettings.tsx | 2 +- src/modules/reader/screens/Reader.tsx | 4 ++-- .../components/globalUpdate/GlobalUpdateSettings.tsx | 2 +- .../globalUpdate/GlobalUpdateSettingsEntries.tsx | 2 +- src/modules/settings/screens/Appearance.tsx | 6 +++--- src/modules/settings/screens/ServerSettings.tsx | 2 +- src/modules/settings/screens/Settings.tsx | 2 +- src/modules/settings/screens/WebUISettings.tsx | 2 +- src/modules/source/components/SourceCard.tsx | 2 +- src/modules/source/components/SourceOptions.tsx | 2 +- src/modules/source/screens/SourceConfigure.tsx | 2 +- src/modules/source/screens/SourceMangas.tsx | 4 ++-- src/modules/source/screens/Sources.tsx | 7 ++++++- src/modules/theme/components/CreateThemeDialog.tsx | 2 +- src/modules/theme/components/ThemeList.tsx | 2 +- src/modules/theme/components/ThemePreview.tsx | 2 +- src/modules/tracker/components/TrackManga.tsx | 2 +- src/modules/tracker/components/TrackerSearch.tsx | 2 +- .../tracker/components/cards/SettingsTrackerCard.tsx | 2 +- src/modules/tracker/components/cards/TrackerActiveCard.tsx | 2 +- src/modules/tracker/components/cards/TrackerMangaCard.tsx | 2 +- src/modules/tracker/screens/TrackerOAuthLogin.tsx | 2 +- src/modules/tracker/screens/TrackingSettings.tsx | 2 +- src/modules/updates/screens/Updates.tsx | 2 +- src/theme.tsx | 2 +- src/{lib/data => util}/Strings.ts | 0 71 files changed, 77 insertions(+), 72 deletions(-) rename src/lib/{ => storage}/AppStorage.ts (100%) rename src/lib/{ => storage}/CustomCache.ts (100%) rename src/{lib => modules/core}/IsoLanguages.ts (100%) rename src/{lib/ui => modules/core/utils}/AwaitableDialog.tsx (100%) rename src/{lib/Languages.tsx => modules/core/utils/Languages.ts} (96%) rename src/{lib/ui => modules/core/utils}/MediaQuery.tsx (97%) rename src/{lib/ui => modules/core/utils}/Toast.ts (100%) rename src/{lib/data => util}/Strings.ts (100%) diff --git a/src/lib/requests/client/BaseClient.ts b/src/lib/requests/client/BaseClient.ts index d56e05e3..2929f8a4 100644 --- a/src/lib/requests/client/BaseClient.ts +++ b/src/lib/requests/client/BaseClient.ts @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -import { AppStorage } from '@/lib/AppStorage.ts'; +import { AppStorage } from '@/lib/storage/AppStorage.ts'; export abstract class BaseClient { protected abstract client: Client; diff --git a/src/lib/requests/requests/RequestManager.ts b/src/lib/requests/requests/RequestManager.ts index 987072f0..5a24ea22 100644 --- a/src/lib/requests/requests/RequestManager.ts +++ b/src/lib/requests/requests/RequestManager.ts @@ -276,7 +276,7 @@ import { UPDATE_LIBRARY_MANGAS, } from '@/lib/graphql/mutations/UpdaterMutation.ts'; import { GET_LAST_UPDATE_TIMESTAMP, GET_UPDATE_STATUS } from '@/lib/graphql/queries/UpdaterQuery.ts'; -import { CustomCache } from '@/lib/CustomCache.ts'; +import { CustomCache } from '@/lib/storage/CustomCache.ts'; import { RESTORE_BACKUP } from '@/lib/graphql/mutations/BackupMutation.ts'; import { GET_RESTORE_STATUS, VALIDATE_BACKUP } from '@/lib/graphql/queries/BackupQuery.ts'; import { DOWNLOAD_STATUS_SUBSCRIPTION } from '@/lib/graphql/subscriptions/DownloaderSubscription.ts'; diff --git a/src/lib/AppStorage.ts b/src/lib/storage/AppStorage.ts similarity index 100% rename from src/lib/AppStorage.ts rename to src/lib/storage/AppStorage.ts diff --git a/src/lib/CustomCache.ts b/src/lib/storage/CustomCache.ts similarity index 100% rename from src/lib/CustomCache.ts rename to src/lib/storage/CustomCache.ts diff --git a/src/modules/app-updates/components/WebUIUpdateChecker.tsx b/src/modules/app-updates/components/WebUIUpdateChecker.tsx index 3af63380..df79df93 100644 --- a/src/modules/app-updates/components/WebUIUpdateChecker.tsx +++ b/src/modules/app-updates/components/WebUIUpdateChecker.tsx @@ -18,7 +18,7 @@ import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts' import { UpdateState, WebUiChannel, WebUiUpdateStatus } from '@/lib/graphql/generated/graphql.ts'; import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { ABOUT_WEBUI, WEBUI_UPDATE_CHECK } from '@/lib/graphql/fragments/InfoFragments.ts'; import { VersionUpdateInfoDialog } from '@/modules/app-updates/components/VersionUpdateInfoDialog.tsx'; import { useUpdateChecker } from '@/modules/app-updates/hooks/useUpdateChecker.tsx'; diff --git a/src/modules/backup/screens/Backup.tsx b/src/modules/backup/screens/Backup.tsx index b287ad09..dff51f6b 100644 --- a/src/modules/backup/screens/Backup.tsx +++ b/src/modules/backup/screens/Backup.tsx @@ -24,7 +24,7 @@ import ListItem from '@mui/material/ListItem'; import { Link } from 'react-router-dom'; import Stack from '@mui/material/Stack'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { BackupRestoreState, ValidateBackupQuery } from '@/lib/graphql/generated/graphql.ts'; import { Progress } from '@/modules/core/components/Progress.tsx'; diff --git a/src/modules/browse/screens/BrowseSettings.tsx b/src/modules/browse/screens/BrowseSettings.tsx index 46c23963..87550c91 100644 --- a/src/modules/browse/screens/BrowseSettings.tsx +++ b/src/modules/browse/screens/BrowseSettings.tsx @@ -25,7 +25,7 @@ import { import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { MetadataBrowseSettings } from '@/modules/browse/Browse.types.ts'; import { ServerSettings as GqlServerSettings } from '@/modules/settings/Settings.types.ts'; diff --git a/src/modules/category/components/CategoriesInclusionSetting.tsx b/src/modules/category/components/CategoriesInclusionSetting.tsx index 49a734df..18105984 100644 --- a/src/modules/category/components/CategoriesInclusionSetting.tsx +++ b/src/modules/category/components/CategoriesInclusionSetting.tsx @@ -18,7 +18,7 @@ import DialogActions from '@mui/material/DialogActions'; import Button from '@mui/material/Button'; import { t as translate } from 'i18next'; import { ThreeStateCheckboxInput } from '@/modules/core/components/inputs/ThreeStateCheckboxInput.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { IncludeOrExclude } from '@/lib/graphql/generated/graphql.ts'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; import { CheckboxContainer } from '@/modules/core/components/inputs/CheckboxContainer.ts'; diff --git a/src/modules/category/components/CategorySelect.tsx b/src/modules/category/components/CategorySelect.tsx index 8cb664fb..0abb17ce 100644 --- a/src/modules/category/components/CategorySelect.tsx +++ b/src/modules/category/components/CategorySelect.tsx @@ -22,7 +22,7 @@ import { useSelectableCollection } from '@/modules/collection/hooks/useSelectabl import { ThreeStateCheckboxInput } from '@/modules/core/components/inputs/ThreeStateCheckboxInput.tsx'; import { Categories } from '@/modules/category/services/Categories.ts'; import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { updateMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts'; import { diff --git a/src/modules/chapter/components/ChapterList.tsx b/src/modules/chapter/components/ChapterList.tsx index 03791ceb..87ead753 100644 --- a/src/modules/chapter/components/ChapterList.tsx +++ b/src/modules/chapter/components/ChapterList.tsx @@ -44,7 +44,7 @@ import { GET_CHAPTERS_MANGA } from '@/lib/graphql/queries/ChapterQuery.ts'; import { Mangas } from '@/modules/manga/services/Mangas.ts'; import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { shouldForwardProp } from '@/modules/core/utils/ShouldForwardProp.ts'; import { useChapterOptions } from '@/modules/chapter/hooks/useChapterOptions.tsx'; diff --git a/src/modules/chapter/services/Chapters.ts b/src/modules/chapter/services/Chapters.ts index 012379c6..ffbf48aa 100644 --- a/src/modules/chapter/services/Chapters.ts +++ b/src/modules/chapter/services/Chapters.ts @@ -9,7 +9,7 @@ import { t as translate } from 'i18next'; import gql from 'graphql-tag'; import { DocumentNode } from '@apollo/client'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; import { getMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts'; import { diff --git a/src/lib/IsoLanguages.ts b/src/modules/core/IsoLanguages.ts similarity index 100% rename from src/lib/IsoLanguages.ts rename to src/modules/core/IsoLanguages.ts diff --git a/src/modules/core/components/UpdateChecker.tsx b/src/modules/core/components/UpdateChecker.tsx index de32ed1a..85934581 100644 --- a/src/modules/core/components/UpdateChecker.tsx +++ b/src/modules/core/components/UpdateChecker.tsx @@ -17,12 +17,12 @@ import MenuItem from '@mui/material/MenuItem'; import ClearIcon from '@mui/icons-material/Clear'; import Stack from '@mui/material/Stack'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { UpdaterSubscription } from '@/lib/graphql/generated/graphql.ts'; import { Progress } from '@/modules/core/components/Progress.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { dateTimeFormatter } from '@/util/DateHelper.ts'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { CategoryIdInfo } from '@/modules/category/Category.types.ts'; diff --git a/src/modules/core/components/menu/NestedMenuItem.tsx b/src/modules/core/components/menu/NestedMenuItem.tsx index 8d313b95..9f2de0bd 100644 --- a/src/modules/core/components/menu/NestedMenuItem.tsx +++ b/src/modules/core/components/menu/NestedMenuItem.tsx @@ -36,7 +36,7 @@ import { OverridableComponent } from '@mui/material/OverridableComponent'; import { SvgIconTypeMap } from '@mui/material/SvgIcon'; import { IconMenuItem } from '@/modules/core/components/menu/IconMenuItem.tsx'; import { getOptionForDirection } from '@/theme.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; export type NestedMenuItemProps = Omit & { parentMenuOpen: boolean; diff --git a/src/modules/core/components/settings/MutableListSetting.tsx b/src/modules/core/components/settings/MutableListSetting.tsx index b5d9863c..54b538ce 100644 --- a/src/modules/core/components/settings/MutableListSetting.tsx +++ b/src/modules/core/components/settings/MutableListSetting.tsx @@ -26,7 +26,7 @@ import DialogContentText from '@mui/material/DialogContentText'; import InfoIcon from '@mui/icons-material/Info'; import { TextSetting, TextSettingProps } from '@/modules/core/components/settings/text/TextSetting.tsx'; import { TextSettingDialog } from '@/modules/core/components/settings/text/TextSettingDialog.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; const MutableListItem = ({ handleDelete, diff --git a/src/modules/core/contexts/AppContext.tsx b/src/modules/core/contexts/AppContext.tsx index e6b17cd5..019a183e 100644 --- a/src/modules/core/contexts/AppContext.tsx +++ b/src/modules/core/contexts/AppContext.tsx @@ -23,7 +23,7 @@ import { ThemeMode, ThemeModeContext } from '@/modules/theme/contexts/ThemeModeC import { NavBarContextProvider } from '@/modules/navigation-bar/contexts/NavBarContextProvider.tsx'; import { LibraryOptionsContextProvider } from '@/modules/library/contexts/LibraryOptionsProvider.tsx'; import { ActiveDeviceContextProvider } from '@/modules/device/contexts/DeviceContext.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { AppThemes, getTheme } from '@/modules/theme/services/AppThemes.ts'; import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts'; diff --git a/src/modules/core/hooks/useStorage.tsx b/src/modules/core/hooks/useStorage.tsx index 744a2ea3..5e3b29c2 100644 --- a/src/modules/core/hooks/useStorage.tsx +++ b/src/modules/core/hooks/useStorage.tsx @@ -7,7 +7,7 @@ */ import { Dispatch, Reducer, SetStateAction, useCallback, useMemo, useReducer, useSyncExternalStore } from 'react'; -import { AppStorage, Storage } from '@/lib/AppStorage.ts'; +import { AppStorage, Storage } from '@/lib/storage/AppStorage.ts'; const subscribeToStorageUpdates = (callback: () => void) => { window.addEventListener('storage', callback); diff --git a/src/lib/ui/AwaitableDialog.tsx b/src/modules/core/utils/AwaitableDialog.tsx similarity index 100% rename from src/lib/ui/AwaitableDialog.tsx rename to src/modules/core/utils/AwaitableDialog.tsx diff --git a/src/lib/Languages.tsx b/src/modules/core/utils/Languages.ts similarity index 96% rename from src/lib/Languages.tsx rename to src/modules/core/utils/Languages.ts index 69877648..c60b0464 100644 --- a/src/lib/Languages.tsx +++ b/src/modules/core/utils/Languages.ts @@ -7,7 +7,7 @@ */ import { t } from 'i18next'; -import { ISOLanguage, IsoLanguages } from '@/lib/IsoLanguages.ts'; +import { ISOLanguage, IsoLanguages } from '@/modules/core/IsoLanguages.ts'; export enum DefaultLanguage { ALL = 'all', diff --git a/src/lib/ui/MediaQuery.tsx b/src/modules/core/utils/MediaQuery.tsx similarity index 97% rename from src/lib/ui/MediaQuery.tsx rename to src/modules/core/utils/MediaQuery.tsx index 554d4bb6..f481b03d 100644 --- a/src/lib/ui/MediaQuery.tsx +++ b/src/modules/core/utils/MediaQuery.tsx @@ -11,7 +11,7 @@ import { Breakpoint } from '@mui/material/styles'; import { useCallback, useState } from 'react'; import { getCurrentTheme } from '@/theme.tsx'; import { ThemeMode } from '@/modules/theme/contexts/ThemeModeContext.tsx'; -import { AppStorage } from '@/lib/AppStorage.ts'; +import { AppStorage } from '@/lib/storage/AppStorage.ts'; import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx'; export class MediaQuery { diff --git a/src/lib/ui/Toast.ts b/src/modules/core/utils/Toast.ts similarity index 100% rename from src/lib/ui/Toast.ts rename to src/modules/core/utils/Toast.ts diff --git a/src/modules/device/screens/DeviceSetting.tsx b/src/modules/device/screens/DeviceSetting.tsx index f51388e1..3158f583 100644 --- a/src/modules/device/screens/DeviceSetting.tsx +++ b/src/modules/device/screens/DeviceSetting.tsx @@ -16,7 +16,7 @@ import { updateMetadataServerSettings, useMetadataServerSettings, } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { MutableListSetting } from '@/modules/core/components/settings/MutableListSetting.tsx'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { DeviceContext } from '@/modules/device/contexts/DeviceContext.tsx'; diff --git a/src/modules/downloads/components/DownloadAheadSetting.tsx b/src/modules/downloads/components/DownloadAheadSetting.tsx index 64c549b6..75ed8e45 100644 --- a/src/modules/downloads/components/DownloadAheadSetting.tsx +++ b/src/modules/downloads/components/DownloadAheadSetting.tsx @@ -14,7 +14,7 @@ import Switch from '@mui/material/Switch'; import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx'; import { getPersistedServerSetting, usePersistedValue } from '@/modules/core/hooks/usePersistedValue.tsx'; import { updateMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { MetadataDownloadSettings } from '@/modules/downloads/Downloads.types.ts'; import { MetadataServerSettings } from '@/modules/settings/Settings.types.ts'; diff --git a/src/modules/downloads/screens/DownloadQueue.tsx b/src/modules/downloads/screens/DownloadQueue.tsx index 8569ff17..a67e8f66 100644 --- a/src/modules/downloads/screens/DownloadQueue.tsx +++ b/src/modules/downloads/screens/DownloadQueue.tsx @@ -27,7 +27,7 @@ import CardContent from '@mui/material/CardContent'; import Refresh from '@mui/icons-material/Refresh'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; import { StrictModeDroppable } from '@/modules/core/components/StrictModeDroppable.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { DownloadStateIndicator } from '@/modules/core/components/DownloadStateIndicator.tsx'; import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; diff --git a/src/modules/downloads/screens/DownloadSettings.tsx b/src/modules/downloads/screens/DownloadSettings.tsx index 3055f3a4..9d0ad24e 100644 --- a/src/modules/downloads/screens/DownloadSettings.tsx +++ b/src/modules/downloads/screens/DownloadSettings.tsx @@ -21,7 +21,7 @@ import { createUpdateMetadataServerSettings, useMetadataServerSettings, } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { DeleteChaptersWhileReadingSetting } from '@/modules/downloads/components/DeleteChaptersWhileReadingSetting.tsx'; import { CategoriesInclusionSetting } from '@/modules/category/components/CategoriesInclusionSetting.tsx'; import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx'; diff --git a/src/modules/extension/components/ExtensionCard.tsx b/src/modules/extension/components/ExtensionCard.tsx index f29f0322..ef9a00bf 100644 --- a/src/modules/extension/components/ExtensionCard.tsx +++ b/src/modules/extension/components/ExtensionCard.tsx @@ -16,7 +16,7 @@ import Box from '@mui/material/Box'; import { useTranslation } from 'react-i18next'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx'; import { TExtension } from '@/modules/extension/services/Extensions.ts'; import { TranslationKey } from '@/Base.types.ts'; diff --git a/src/modules/extension/screens/Extensions.tsx b/src/modules/extension/screens/Extensions.tsx index 5a03e703..79016067 100644 --- a/src/modules/extension/screens/Extensions.tsx +++ b/src/modules/extension/screens/Extensions.tsx @@ -18,7 +18,7 @@ import Typography from '@mui/material/Typography'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { extensionDefaultLangs, DefaultLanguage, langSortCmp } from '@/lib/Languages.tsx'; +import { extensionDefaultLangs, DefaultLanguage, langSortCmp } from '@/modules/core/utils/Languages.ts'; import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; import { ExtensionState, @@ -30,7 +30,7 @@ import { } from '@/modules/extension/services/Extensions.ts'; import { AppbarSearch } from '@/modules/core/components/AppbarSearch.tsx'; import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { LangSelect } from '@/modules/core/components/inputs/LangSelect.tsx'; import { ExtensionCard } from '@/modules/extension/components/ExtensionCard.tsx'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; diff --git a/src/modules/extension/services/Extensions.ts b/src/modules/extension/services/Extensions.ts index 32afaa08..b90592ec 100644 --- a/src/modules/extension/services/Extensions.ts +++ b/src/modules/extension/services/Extensions.ts @@ -7,7 +7,7 @@ */ import { t } from 'i18next'; -import { DefaultLanguage, langCodeToName } from '@/lib/Languages.tsx'; +import { DefaultLanguage, langCodeToName } from '@/modules/core/utils/Languages.ts'; import { ExtensionType } from '@/lib/graphql/generated/graphql.ts'; import { TranslationKey } from '@/Base.types.ts'; diff --git a/src/modules/global-search/screens/SearchAll.tsx b/src/modules/global-search/screens/SearchAll.tsx index 5b718f40..576a246a 100644 --- a/src/modules/global-search/screens/SearchAll.tsx +++ b/src/modules/global-search/screens/SearchAll.tsx @@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next'; import Box from '@mui/material/Box'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; -import { langSortCmp, sourceDefualtLangs, sourceForcedDefaultLangs } from '@/lib/Languages.tsx'; +import { langSortCmp, sourceDefualtLangs, sourceForcedDefaultLangs } from '@/modules/core/utils/Languages.ts'; import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts'; import { AppbarSearch } from '@/modules/core/components/AppbarSearch.tsx'; import { LangSelect } from '@/modules/core/components/inputs/LangSelect.tsx'; diff --git a/src/modules/library/components/LibraryOptionsPanel.tsx b/src/modules/library/components/LibraryOptionsPanel.tsx index 74dbbc87..34df5b15 100644 --- a/src/modules/library/components/LibraryOptionsPanel.tsx +++ b/src/modules/library/components/LibraryOptionsPanel.tsx @@ -22,7 +22,7 @@ import { GetTrackersSettingsQuery, MangaStatus } from '@/lib/graphql/generated/g import { GET_TRACKERS_SETTINGS } from '@/lib/graphql/queries/TrackerQuery.ts'; import { statusToTranslationKey } from '@/modules/manga/services/Mangas.ts'; import { createUpdateCategoryMetadata, getCategoryMetadata } from '@/modules/category/services/CategoryMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { createUpdateMetadataServerSettings, useMetadataServerSettings, diff --git a/src/modules/library/hooks/useGetVisibleLibraryMangas.ts b/src/modules/library/hooks/useGetVisibleLibraryMangas.ts index eb87a092..76683636 100644 --- a/src/modules/library/hooks/useGetVisibleLibraryMangas.ts +++ b/src/modules/library/hooks/useGetVisibleLibraryMangas.ts @@ -11,7 +11,7 @@ import { useMemo } from 'react'; import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts'; import { ChapterType, MangaType, SourceType, TrackRecordType } from '@/lib/graphql/generated/graphql.ts'; import { MangaChapterCountInfo, MangaIdInfo } from '@/modules/manga/services/Mangas.ts'; -import { enhancedCleanup } from '@/lib/data/Strings.ts'; +import { enhancedCleanup } from '@/util/Strings.ts'; import { getCategoryMetadata } from '@/modules/category/services/CategoryMetadata.ts'; import { NullAndUndefined } from '@/Base.types.ts'; import { LibraryOptions, LibrarySortMode } from '@/modules/library/Library.types.ts'; diff --git a/src/modules/library/screens/LibraryDuplicates.tsx b/src/modules/library/screens/LibraryDuplicates.tsx index 176cca22..5c21eb64 100644 --- a/src/modules/library/screens/LibraryDuplicates.tsx +++ b/src/modules/library/screens/LibraryDuplicates.tsx @@ -35,7 +35,7 @@ import { GET_MANGAS_DUPLICATES } from '@/lib/graphql/queries/MangaQuery.ts'; import { BaseMangaGrid } from '@/modules/manga/components/BaseMangaGrid.tsx'; import { IMangaGridProps } from '@/modules/manga/components/MangaGrid.tsx'; import { StyledGroupItemWrapper } from '@/modules/core/components/virtuoso/StyledGroupItemWrapper.tsx'; -import { enhancedCleanup } from '@/lib/data/Strings.ts'; +import { enhancedCleanup } from '@/util/Strings.ts'; const findDuplicatesByTitle = >( libraryMangas: Manga[], diff --git a/src/modules/library/screens/LibrarySettings.tsx b/src/modules/library/screens/LibrarySettings.tsx index 407d82a8..4b5ad261 100644 --- a/src/modules/library/screens/LibrarySettings.tsx +++ b/src/modules/library/screens/LibrarySettings.tsx @@ -17,7 +17,7 @@ import ListSubheader from '@mui/material/ListSubheader'; import { t as translate } from 'i18next'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { GlobalUpdateSettings } from '@/modules/settings/components/globalUpdate/GlobalUpdateSettings.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { createUpdateMetadataServerSettings, useMetadataServerSettings, diff --git a/src/modules/manga/components/MangaBadges.tsx b/src/modules/manga/components/MangaBadges.tsx index 2556f072..91da6111 100644 --- a/src/modules/manga/components/MangaBadges.tsx +++ b/src/modules/manga/components/MangaBadges.tsx @@ -11,7 +11,7 @@ import { useTranslation } from 'react-i18next'; import Button from '@mui/material/Button'; import Typography from '@mui/material/Typography'; import { MangaCardMode } from '@/modules/manga/MangaCard.types.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { useLibraryOptionsContext } from '@/modules/library/contexts/LibraryOptionsContext.tsx'; const BadgeContainer = styled('div')(({ theme }) => ({ diff --git a/src/modules/manga/components/MangaDetails.tsx b/src/modules/manga/components/MangaDetails.tsx index e07889f1..b0c03c97 100644 --- a/src/modules/manga/components/MangaDetails.tsx +++ b/src/modules/manga/components/MangaDetails.tsx @@ -26,7 +26,7 @@ import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; import OpenInFullIcon from '@mui/icons-material/OpenInFull'; import Modal from '@mui/material/Modal'; import { bindPopover, bindTrigger, usePopupState } from 'material-ui-popup-state/hooks'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { Mangas, MangaThumbnailInfo, diff --git a/src/modules/manga/components/MangaGrid.tsx b/src/modules/manga/components/MangaGrid.tsx index 13a85dda..9b46909d 100644 --- a/src/modules/manga/components/MangaGrid.tsx +++ b/src/modules/manga/components/MangaGrid.tsx @@ -28,7 +28,7 @@ import { GridLayout } from '@/modules/library/contexts/LibraryOptionsContext.tsx import { useLocalStorage, useSessionStorage } from '@/modules/core/hooks/useStorage.tsx'; import { SelectableCollectionReturnType } from '@/modules/collection/hooks/useSelectableCollection.ts'; import { DEFAULT_FULL_FAB_HEIGHT } from '@/modules/core/components/buttons/StyledFab.tsx'; -import { AppStorage } from '@/lib/AppStorage.ts'; +import { AppStorage } from '@/lib/storage/AppStorage.ts'; import { MangaCardProps } from '@/modules/manga/MangaCard.types.tsx'; import { MangaType } from '@/lib/graphql/generated/graphql.ts'; import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx'; diff --git a/src/modules/manga/components/MangaOptionButton.tsx b/src/modules/manga/components/MangaOptionButton.tsx index 5045f209..bad25b64 100644 --- a/src/modules/manga/components/MangaOptionButton.tsx +++ b/src/modules/manga/components/MangaOptionButton.tsx @@ -16,7 +16,7 @@ import MoreVertIcon from '@mui/icons-material/MoreVert'; import { PopupState } from 'material-ui-popup-state/hooks'; import { bindTrigger } from 'material-ui-popup-state'; import { SelectableCollectionReturnType } from '@/modules/collection/hooks/useSelectableCollection.ts'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { MangaType } from '@/lib/graphql/generated/graphql.ts'; export const MangaOptionButton = forwardRef( diff --git a/src/modules/manga/components/TrackMangaButton.tsx b/src/modules/manga/components/TrackMangaButton.tsx index cb5dd97e..967cd616 100644 --- a/src/modules/manga/components/TrackMangaButton.tsx +++ b/src/modules/manga/components/TrackMangaButton.tsx @@ -13,7 +13,7 @@ import PopupState, { bindDialog, bindTrigger } from 'material-ui-popup-state'; import Dialog from '@mui/material/Dialog'; import CheckIcon from '@mui/icons-material/Check'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { TrackManga } from '@/modules/tracker/components/TrackManga.tsx'; import { Trackers } from '@/modules/tracker/services/Trackers.ts'; import { CustomIconButton } from '@/modules/core/components/buttons/CustomIconButton.tsx'; diff --git a/src/modules/manga/hooks/useManageMangaLibraryState.tsx b/src/modules/manga/hooks/useManageMangaLibraryState.tsx index de23e560..53616302 100644 --- a/src/modules/manga/hooks/useManageMangaLibraryState.tsx +++ b/src/modules/manga/hooks/useManageMangaLibraryState.tsx @@ -12,12 +12,12 @@ import { useNavigate } from 'react-router-dom'; import gql from 'graphql-tag'; import { useCategorySelect } from '@/modules/category/hooks/useCategorySelect.tsx'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { getMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts'; import { Categories } from '@/modules/category/services/Categories.ts'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { Mangas } from '@/modules/manga/services/Mangas.ts'; -import { awaitConfirmation } from '@/lib/ui/AwaitableDialog.tsx'; +import { awaitConfirmation } from '@/modules/core/utils/AwaitableDialog.tsx'; import { GetCategoriesBaseQuery, GetCategoriesBaseQueryVariables, MangaType } from '@/lib/graphql/generated/graphql.ts'; import { GET_CATEGORIES_BASE } from '@/lib/graphql/queries/CategoryQuery.ts'; diff --git a/src/modules/manga/hooks/useRefreshManga.ts b/src/modules/manga/hooks/useRefreshManga.ts index 796889db..bcc11764 100644 --- a/src/modules/manga/hooks/useRefreshManga.ts +++ b/src/modules/manga/hooks/useRefreshManga.ts @@ -9,7 +9,7 @@ import { useCallback, useState } from 'react'; import { ApolloError } from '@apollo/client'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { baseCleanup } from '@/lib/data/Strings.ts'; +import { baseCleanup } from '@/util/Strings.ts'; export const useRefreshManga = (mangaId: string) => { const [fetchingOnline, setFetchingOnline] = useState(false); diff --git a/src/modules/manga/services/Mangas.ts b/src/modules/manga/services/Mangas.ts index b4c4106c..9991f44e 100644 --- a/src/modules/manga/services/Mangas.ts +++ b/src/modules/manga/services/Mangas.ts @@ -24,7 +24,7 @@ import { UpdateMangaCategoriesPatchInput, } from '@/lib/graphql/generated/graphql.ts'; import { Chapters } from '@/modules/chapter/services/Chapters.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { getMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts'; import { GET_MANGAS_BASE } from '@/lib/graphql/queries/MangaQuery.ts'; import { MANGA_BASE_FIELDS } from '@/lib/graphql/fragments/MangaFragments.ts'; diff --git a/src/modules/migration/components/MigrateDialog.tsx b/src/modules/migration/components/MigrateDialog.tsx index 515c5eaf..a4667829 100644 --- a/src/modules/migration/components/MigrateDialog.tsx +++ b/src/modules/migration/components/MigrateDialog.tsx @@ -18,7 +18,7 @@ import { useState } from 'react'; import FormGroup from '@mui/material/FormGroup'; import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx'; import { Mangas, MigrateMode } from '@/modules/manga/services/Mangas.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { createUpdateMetadataServerSettings, useMetadataServerSettings, diff --git a/src/modules/migration/screens/Migration.tsx b/src/modules/migration/screens/Migration.tsx index 735dd90c..ea619146 100644 --- a/src/modules/migration/screens/Migration.tsx +++ b/src/modules/migration/screens/Migration.tsx @@ -28,7 +28,7 @@ import { createUpdateMetadataServerSettings, useMetadataServerSettings, } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; const getMigratableSources = ( diff --git a/src/modules/navigation-bar/components/DefaultNavBar.tsx b/src/modules/navigation-bar/components/DefaultNavBar.tsx index 875c6efa..81ff54b5 100644 --- a/src/modules/navigation-bar/components/DefaultNavBar.tsx +++ b/src/modules/navigation-bar/components/DefaultNavBar.tsx @@ -29,7 +29,7 @@ import { useTheme } from '@mui/material/styles'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { useBackButton } from '@/modules/core/hooks/useBackButton.ts'; import { useGetOptionForDirection } from '@/theme.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { DesktopSideBar } from '@/modules/navigation-bar/components/DesktopSideBar.tsx'; import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx'; import { MobileBottomBar } from '@/modules/navigation-bar/components/MobileBottomBar.tsx'; diff --git a/src/modules/reader/components/page/Page.tsx b/src/modules/reader/components/page/Page.tsx index e33afd38..1f7397c8 100644 --- a/src/modules/reader/components/page/Page.tsx +++ b/src/modules/reader/components/page/Page.tsx @@ -11,7 +11,7 @@ import Box from '@mui/material/Box'; import { useTheme } from '@mui/material/styles'; import useMediaQuery from '@mui/material/useMediaQuery'; import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { IReaderSettings, ReaderType } from '@/modules/reader/Reader.types.ts'; export const isHorizontalReaderType = (readerType: ReaderType): boolean => diff --git a/src/modules/reader/screens/DefaultReaderSettings.tsx b/src/modules/reader/screens/DefaultReaderSettings.tsx index 77566c8d..4b131fe7 100644 --- a/src/modules/reader/screens/DefaultReaderSettings.tsx +++ b/src/modules/reader/screens/DefaultReaderSettings.tsx @@ -14,7 +14,7 @@ import { useDefaultReaderSettings, } from '@/modules/reader/services/ReaderSettingsMetadata.ts'; import { ReaderSettingsOptions } from '@/modules/reader/components/ReaderSettingsOptions.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx'; diff --git a/src/modules/reader/screens/Reader.tsx b/src/modules/reader/screens/Reader.tsx index 10fb8a4b..690705ba 100644 --- a/src/modules/reader/screens/Reader.tsx +++ b/src/modules/reader/screens/Reader.tsx @@ -24,7 +24,7 @@ import { PagedPager } from '@/modules/reader/components/pager/PagedPager.tsx'; import { DoublePagedPager } from '@/modules/reader/components/pager/DoublePagedPager.tsx'; import { VerticalPager } from '@/modules/reader/components/pager/VerticalPager.tsx'; import { ReaderNavBar } from '@/modules/reader/components/ReaderNavBar.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { useDebounce } from '@/modules/core/hooks/useDebounce.ts'; import { @@ -41,7 +41,7 @@ import { GET_CHAPTERS_READER } from '@/lib/graphql/queries/ChapterQuery.ts'; import { GET_MANGA_READER } from '@/lib/graphql/queries/MangaQuery.ts'; import { TMangaReader } from '@/modules/manga/services/Mangas.ts'; import { CHAPTER_READER_FIELDS } from '@/lib/graphql/fragments/ChapterFragments.ts'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { IReaderSettings, ReaderType } from '@/modules/reader/Reader.types.ts'; import { DirectionOffset } from '@/Base.types.ts'; import { AllowedMetadataValueTypes } from '@/modules/metadata/Metadata.types.ts'; diff --git a/src/modules/settings/components/globalUpdate/GlobalUpdateSettings.tsx b/src/modules/settings/components/globalUpdate/GlobalUpdateSettings.tsx index 05b96a7c..13f04e53 100644 --- a/src/modules/settings/components/globalUpdate/GlobalUpdateSettings.tsx +++ b/src/modules/settings/components/globalUpdate/GlobalUpdateSettings.tsx @@ -19,7 +19,7 @@ import { import { GlobalUpdateSettingsEntries } from '@/modules/settings/components/globalUpdate/GlobalUpdateSettingsEntries.tsx'; import { GlobalUpdateSettingsInterval } from '@/modules/settings/components/globalUpdate/GlobalUpdateSettingsInterval.tsx'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { ServerSettings } from '@/modules/settings/Settings.types.ts'; type LibrarySettingsType = Pick; diff --git a/src/modules/settings/components/globalUpdate/GlobalUpdateSettingsEntries.tsx b/src/modules/settings/components/globalUpdate/GlobalUpdateSettingsEntries.tsx index 061db750..e97cf408 100644 --- a/src/modules/settings/components/globalUpdate/GlobalUpdateSettingsEntries.tsx +++ b/src/modules/settings/components/globalUpdate/GlobalUpdateSettingsEntries.tsx @@ -17,7 +17,7 @@ import DialogActions from '@mui/material/DialogActions'; import DialogContent from '@mui/material/DialogContent'; import DialogTitle from '@mui/material/DialogTitle'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { CheckboxContainer } from '@/modules/core/components/inputs/CheckboxContainer.ts'; import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx'; import { TranslationKey } from '@/Base.types.ts'; diff --git a/src/modules/settings/screens/Appearance.tsx b/src/modules/settings/screens/Appearance.tsx index a58fe488..6c3d3f72 100644 --- a/src/modules/settings/screens/Appearance.tsx +++ b/src/modules/settings/screens/Appearance.tsx @@ -18,11 +18,11 @@ import Link from '@mui/material/Link'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { ThemeMode, ThemeModeContext } from '@/modules/theme/contexts/ThemeModeContext.tsx'; import { Select } from '@/modules/core/components/inputs/Select.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx'; import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; import { I18nResourceCode, i18nResources } from '@/i18n'; -import { langCodeToName } from '@/lib/Languages.tsx'; +import { langCodeToName } from '@/modules/core/utils/Languages.ts'; import { getTheme } from '@/modules/theme/services/AppThemes.ts'; import { ThemeList } from '@/modules/theme/components/ThemeList.tsx'; import { @@ -32,7 +32,7 @@ import { import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { MetadataThemeSettings } from '@/modules/theme/AppTheme.types.ts'; export const Appearance = () => { diff --git a/src/modules/settings/screens/ServerSettings.tsx b/src/modules/settings/screens/ServerSettings.tsx index 4fbb2f41..469b9578 100644 --- a/src/modules/settings/screens/ServerSettings.tsx +++ b/src/modules/settings/screens/ServerSettings.tsx @@ -28,7 +28,7 @@ import { createUpdateMetadataServerSettings, useMetadataServerSettings, } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { MetadataUpdateSettings } from '@/modules/app-updates/AppUpdateChecker.types.ts'; import { ServerSettings as GqlServerSettings } from '@/modules/settings/Settings.types.ts'; diff --git a/src/modules/settings/screens/Settings.tsx b/src/modules/settings/screens/Settings.tsx index c6d93f65..4c7ad24c 100644 --- a/src/modules/settings/screens/Settings.tsx +++ b/src/modules/settings/screens/Settings.tsx @@ -28,7 +28,7 @@ import PaletteIcon from '@mui/icons-material/Palette'; import { ListItemLink } from '@/modules/core/components/ListItemLink.tsx'; import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; export function Settings() { const { t } = useTranslation(); diff --git a/src/modules/settings/screens/WebUISettings.tsx b/src/modules/settings/screens/WebUISettings.tsx index 7ac4aa21..e28483b0 100644 --- a/src/modules/settings/screens/WebUISettings.tsx +++ b/src/modules/settings/screens/WebUISettings.tsx @@ -29,7 +29,7 @@ import { createUpdateMetadataServerSettings, useMetadataServerSettings, } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { MetadataUpdateSettings } from '@/modules/app-updates/AppUpdateChecker.types.ts'; import { ServerSettings } from '@/modules/settings/Settings.types.ts'; diff --git a/src/modules/source/components/SourceCard.tsx b/src/modules/source/components/SourceCard.tsx index 1ae7300f..9e5fb575 100644 --- a/src/modules/source/components/SourceCard.tsx +++ b/src/modules/source/components/SourceCard.tsx @@ -22,7 +22,7 @@ import { translateExtensionLanguage } from '@/modules/extension/services/Extensi import { SourceContentType } from '@/modules/source/screens/SourceMangas.tsx'; import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx'; import { GetSourcesListQuery } from '@/lib/graphql/generated/graphql.ts'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; interface IProps { source: GetSourcesListQuery['sources']['nodes'][number]; diff --git a/src/modules/source/components/SourceOptions.tsx b/src/modules/source/components/SourceOptions.tsx index 2c7a24cb..93c8c095 100644 --- a/src/modules/source/components/SourceOptions.tsx +++ b/src/modules/source/components/SourceOptions.tsx @@ -36,7 +36,7 @@ import { TriStateFilter } from '@/modules/source/components/filters/TriStateFilt import { GroupFilter } from '@/modules/source/components/filters/GroupFilter.tsx'; import { SeparatorFilter } from '@/modules/source/components/filters/SeparatorFilter.tsx'; import { StyledFab } from '@/modules/core/components/buttons/StyledFab.tsx'; -import { awaitConfirmation } from '@/lib/ui/AwaitableDialog.tsx'; +import { awaitConfirmation } from '@/modules/core/utils/AwaitableDialog.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { ISourceMetadata, SourceFilters } from '@/modules/source/Source.types.ts'; diff --git a/src/modules/source/screens/SourceConfigure.tsx b/src/modules/source/screens/SourceConfigure.tsx index 615af35f..332cebcc 100644 --- a/src/modules/source/screens/SourceConfigure.tsx +++ b/src/modules/source/screens/SourceConfigure.tsx @@ -25,7 +25,7 @@ import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { GetCategoriesSettingsQueryVariables, GetSourceSettingsQuery } from '@/lib/graphql/generated/graphql.ts'; import { GET_SOURCE_SETTINGS } from '@/lib/graphql/queries/SourceQuery.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { PreferenceProps } from '@/modules/source/Source.types.ts'; function getPrefComponent(type: string) { diff --git a/src/modules/source/screens/SourceMangas.tsx b/src/modules/source/screens/SourceMangas.tsx index 5d7b861f..3686a090 100644 --- a/src/modules/source/screens/SourceMangas.tsx +++ b/src/modules/source/screens/SourceMangas.tsx @@ -39,10 +39,10 @@ import { import { NavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx'; import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts'; import { useLocalStorage, useSessionStorage } from '@/modules/core/hooks/useStorage.tsx'; -import { AppStorage } from '@/lib/AppStorage.ts'; +import { AppStorage } from '@/lib/storage/AppStorage.ts'; import { getGridSnapshotKey } from '@/modules/manga/components/MangaGrid.tsx'; import { createUpdateSourceMetadata, getSourceMetadata } from '@/modules/source/services/SourceMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { GET_SOURCE_BROWSE } from '@/lib/graphql/queries/SourceQuery.ts'; import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts'; import { TranslationKey } from '@/Base.types.ts'; diff --git a/src/modules/source/screens/Sources.tsx b/src/modules/source/screens/Sources.tsx index c3d5d7ee..66ad1abe 100644 --- a/src/modules/source/screens/Sources.tsx +++ b/src/modules/source/screens/Sources.tsx @@ -15,7 +15,12 @@ import { useNavigate } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; -import { sourceDefualtLangs, sourceForcedDefaultLangs, langSortCmp, DefaultLanguage } from '@/lib/Languages.tsx'; +import { + sourceDefualtLangs, + sourceForcedDefaultLangs, + langSortCmp, + DefaultLanguage, +} from '@/modules/core/utils/Languages.ts'; import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts'; import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; import { SourceCard } from '@/modules/source/components/SourceCard.tsx'; diff --git a/src/modules/theme/components/CreateThemeDialog.tsx b/src/modules/theme/components/CreateThemeDialog.tsx index a87f1822..51aa36f9 100644 --- a/src/modules/theme/components/CreateThemeDialog.tsx +++ b/src/modules/theme/components/CreateThemeDialog.tsx @@ -25,7 +25,7 @@ import { createUpdateMetadataServerSettings, useMetadataServerSettings, } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { EmptyView } from '@/modules/core/components/placeholder/EmptyView.tsx'; import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; diff --git a/src/modules/theme/components/ThemeList.tsx b/src/modules/theme/components/ThemeList.tsx index d04dda4c..79149be2 100644 --- a/src/modules/theme/components/ThemeList.tsx +++ b/src/modules/theme/components/ThemeList.tsx @@ -14,7 +14,7 @@ import { createUpdateMetadataServerSettings, useMetadataServerSettings, } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { EmptyView } from '@/modules/core/components/placeholder/EmptyView.tsx'; import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; diff --git a/src/modules/theme/components/ThemePreview.tsx b/src/modules/theme/components/ThemePreview.tsx index 09f93c0d..6451a013 100644 --- a/src/modules/theme/components/ThemePreview.tsx +++ b/src/modules/theme/components/ThemePreview.tsx @@ -23,7 +23,7 @@ import { ThemeModeContext } from '@/modules/theme/contexts/ThemeModeContext.tsx' import { AppTheme, hasMissingFonts, loadThemeFonts } from '@/modules/theme/services/AppThemes.ts'; import { createTheme } from '@/theme.tsx'; import { ThemeCreationDialog } from '@/modules/theme/components/CreateThemeDialog.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx'; const ThemePreviewBadge = styled(Box)(() => ({ diff --git a/src/modules/tracker/components/TrackManga.tsx b/src/modules/tracker/components/TrackManga.tsx index 5c85735d..ae34bd55 100644 --- a/src/modules/tracker/components/TrackManga.tsx +++ b/src/modules/tracker/components/TrackManga.tsx @@ -16,7 +16,7 @@ import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; import { Trackers } from '@/modules/tracker/services/Trackers.ts'; import { TrackerCard, TrackerMode } from '@/modules/tracker/components/cards/TrackerCard.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { GetMangaTrackRecordsQuery, GetTrackersBindQuery, MangaType } from '@/lib/graphql/generated/graphql.ts'; import { GET_TRACKERS_BIND } from '@/lib/graphql/queries/TrackerQuery.ts'; diff --git a/src/modules/tracker/components/TrackerSearch.tsx b/src/modules/tracker/components/TrackerSearch.tsx index 9a4ac555..028374d0 100644 --- a/src/modules/tracker/components/TrackerSearch.tsx +++ b/src/modules/tracker/components/TrackerSearch.tsx @@ -26,7 +26,7 @@ import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx'; import { Tracker, TTrackerBase } from '@/modules/tracker/services/Trackers.ts'; import { SearchTextField } from '@/modules/core/components/inputs/SearchTextField.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { TrackerMangaCard } from '@/modules/tracker/components/cards/TrackerMangaCard.tsx'; import { DIALOG_PADDING } from '@/modules/tracker/Tracker.constants.ts'; import { useGetOptionForDirection } from '@/theme.tsx'; diff --git a/src/modules/tracker/components/cards/SettingsTrackerCard.tsx b/src/modules/tracker/components/cards/SettingsTrackerCard.tsx index ac29b3c6..04684db3 100644 --- a/src/modules/tracker/components/cards/SettingsTrackerCard.tsx +++ b/src/modules/tracker/components/cards/SettingsTrackerCard.tsx @@ -22,7 +22,7 @@ import TextField from '@mui/material/TextField'; import DialogActions from '@mui/material/DialogActions'; import Button from '@mui/material/Button'; import { PasswordTextField } from '@/modules/core/components/inputs/PasswordTextField.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; import { Trackers, TTrackerSearch } from '@/modules/tracker/services/Trackers.ts'; diff --git a/src/modules/tracker/components/cards/TrackerActiveCard.tsx b/src/modules/tracker/components/cards/TrackerActiveCard.tsx index 742887ca..e4e65081 100644 --- a/src/modules/tracker/components/cards/TrackerActiveCard.tsx +++ b/src/modules/tracker/components/cards/TrackerActiveCard.tsx @@ -33,7 +33,7 @@ import { Trackers, TTrackerBind, TTrackRecordBind, UNSET_DATE } from '@/modules/ import { ListPreference } from '@/modules/source/components/sourceConfiguration/ListPreference.tsx'; import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx'; import { DateSetting } from '@/modules/core/components/settings/DateSetting.tsx'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { Menu } from '@/modules/core/components/menu/Menu.tsx'; import { CARD_STYLING } from '@/modules/tracker/Tracker.constants.ts'; import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx'; diff --git a/src/modules/tracker/components/cards/TrackerMangaCard.tsx b/src/modules/tracker/components/cards/TrackerMangaCard.tsx index 4cc03656..a0fa676e 100644 --- a/src/modules/tracker/components/cards/TrackerMangaCard.tsx +++ b/src/modules/tracker/components/cards/TrackerMangaCard.tsx @@ -25,7 +25,7 @@ import sanitizeHtml from 'sanitize-html'; import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx'; import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx'; import { Metadata } from '@/modules/core/components/Metadata.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { TTrackerManga } from '@/modules/tracker/services/Trackers.ts'; const TrackerMangaCardTitle = ({ title, selected }: { title: string; selected: boolean }) => ( diff --git a/src/modules/tracker/screens/TrackerOAuthLogin.tsx b/src/modules/tracker/screens/TrackerOAuthLogin.tsx index cfd8ad04..808f9f95 100644 --- a/src/modules/tracker/screens/TrackerOAuthLogin.tsx +++ b/src/modules/tracker/screens/TrackerOAuthLogin.tsx @@ -10,7 +10,7 @@ import { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; import { requestManager } from '@/lib/requests/requests/RequestManager.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; export const TrackerOAuthLogin = () => { const { t } = useTranslation(); diff --git a/src/modules/tracker/screens/TrackingSettings.tsx b/src/modules/tracker/screens/TrackingSettings.tsx index e30d8061..0c8f1b41 100644 --- a/src/modules/tracker/screens/TrackingSettings.tsx +++ b/src/modules/tracker/screens/TrackingSettings.tsx @@ -23,7 +23,7 @@ import { createUpdateMetadataServerSettings, useMetadataServerSettings, } from '@/modules/settings/services/ServerSettingsMetadata.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { GET_TRACKERS_SETTINGS } from '@/lib/graphql/queries/TrackerQuery.ts'; import { GetTrackersSettingsQuery } from '@/lib/graphql/generated/graphql.ts'; diff --git a/src/modules/updates/screens/Updates.tsx b/src/modules/updates/screens/Updates.tsx index e6debf7a..eb10cab8 100644 --- a/src/modules/updates/screens/Updates.tsx +++ b/src/modules/updates/screens/Updates.tsx @@ -35,7 +35,7 @@ import { dateTimeFormatter, epochToDate, getDateString } from '@/util/DateHelper import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx'; import { ChapterIdInfo, ChapterMangaInfo } from '@/modules/chapter/services/Chapters.ts'; -import { makeToast } from '@/lib/ui/Toast.ts'; +import { makeToast } from '@/modules/core/utils/Toast.ts'; const groupByDate = (updates: Pick[]): [date: string, items: number][] => { if (!updates.length) { diff --git a/src/theme.tsx b/src/theme.tsx index 932b60dc..10915c09 100644 --- a/src/theme.tsx +++ b/src/theme.tsx @@ -18,7 +18,7 @@ import { } from '@mui/material/styles'; import { useCallback } from 'react'; import { ThemeMode } from '@/modules/theme/contexts/ThemeModeContext.tsx'; -import { MediaQuery } from '@/lib/ui/MediaQuery.tsx'; +import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx'; import { AppTheme, loadThemeFonts } from '@/modules/theme/services/AppThemes.ts'; import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts'; diff --git a/src/lib/data/Strings.ts b/src/util/Strings.ts similarity index 100% rename from src/lib/data/Strings.ts rename to src/util/Strings.ts