Move manga files into new folder

src/App.tsx

@@ -25,7 +25,7 @@ import { useNavBarContext } from '@/components/context/NavbarContext.tsx';
 const { Browse } = loadable(() => import('@/screens/Browse'), lazyLoadFallback);
 const { DownloadQueue } = loadable(() => import('@/screens/DownloadQueue'), lazyLoadFallback);
 const { Library } = loadable(() => import('@/screens/Library'), lazyLoadFallback);
-const { Manga } = loadable(() => import('@/screens/Manga'), lazyLoadFallback);
+const { Manga } = loadable(() => import('@/modules/manga/screens/Manga.tsx'), lazyLoadFallback);
 const { Reader } = loadable(() => import('@/screens/Reader'), lazyLoadFallback);
 const { SearchAll } = loadable(() => import('@/screens/SearchAll'), lazyLoadFallback);
 const { Settings } = loadable(() => import('@/screens/Settings'), lazyLoadFallback);

src/components/MigrateDialog.tsx

@@ -17,7 +17,7 @@ import { Link, useNavigate, useParams } from 'react-router-dom';
 import { useState } from 'react';
 import FormGroup from '@mui/material/FormGroup';
 import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx';
-import { Mangas, MigrateMode } from '@/lib/data/Mangas.ts';
+import { Mangas, MigrateMode } from '@/modules/manga/services/Mangas.ts';
 import { makeToast } from '@/lib/ui/Toast.ts';
 import {
     createUpdateMetadataServerSettings,

src/components/library/LibraryMangaGrid.tsx

@@ -9,7 +9,7 @@
 import React, { useLayoutEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { GridLayout, useLibraryOptionsContext } from '@/components/context/LibraryOptionsContext';
-import { IMangaGridProps, MangaGrid } from '@/components/MangaGrid';
+import { IMangaGridProps, MangaGrid } from '@/modules/manga/components/MangaGrid';
 
 interface LibraryMangaGridProps
     extends Required<Pick<IMangaGridProps, 'isSelectModeActive' | 'selectedMangaIds' | 'handleSelection' | 'mangas'>>,

src/components/library/LibraryOptionsPanel.tsx

@@ -21,7 +21,7 @@ import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { Trackers } from '@/lib/data/Trackers.ts';
 import { GetTrackersSettingsQuery, MangaStatus } from '@/lib/graphql/generated/graphql.ts';
 import { GET_TRACKERS_SETTINGS } from '@/lib/graphql/queries/TrackerQuery.ts';
-import { statusToTranslationKey } from '@/lib/data/Mangas.ts';
+import { statusToTranslationKey } from '@/modules/manga/services/Mangas.ts';
 import { CategoryMetadataInfo } from '@/lib/data/Categories.ts';
 import { createUpdateCategoryMetadata, getCategoryMetadata } from '@/lib/metadata/categoryMetadata.ts';
 import { makeToast } from '@/lib/ui/Toast.ts';

src/components/library/useGetVisibleLibraryMangas.ts

@@ -11,7 +11,7 @@ import { useMemo } from 'react';
 import { LibraryOptions, LibrarySortMode } from '@/typings.ts';
 import { useMetadataServerSettings } from '@/lib/metadata/metadataServerSettings.ts';
 import { ChapterType, MangaType, SourceType, TrackRecordType } from '@/lib/graphql/generated/graphql.ts';
-import { MangaChapterCountInfo, MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaChapterCountInfo, MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 import { enhancedCleanup } from '@/lib/data/Strings.ts';
 import { CategoryMetadataInfo } from '@/lib/data/Categories.ts';
 import { getCategoryMetadata } from '@/lib/metadata/categoryMetadata.ts';

src/components/navbar/ReaderNavBar.tsx

@@ -33,7 +33,7 @@ import { useBackButton } from '@/modules/core/hooks/useBackButton.ts';
 import { Select } from '@/modules/core/components/inputs/Select.tsx';
 import { useGetOptionForDirection } from '@/theme.tsx';
 import { ChapterType } from '@/lib/graphql/generated/graphql.ts';
-import { MangaChapterCountInfo, MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaChapterCountInfo, MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 import { useNavBarContext } from '@/components/context/NavbarContext.tsx';
 import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
 import { CustomIconButton } from '@/modules/core/components/buttons/CustomIconButton.tsx';

src/components/navbar/action/CategorySelect.tsx

@@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import Stack from '@mui/material/Stack';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { Mangas } from '@/lib/data/Mangas.ts';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
 import { useSelectableCollection } from '@/components/collection/useSelectableCollection.ts';
 import { ThreeStateCheckboxInput } from '@/modules/core/components/inputs/ThreeStateCheckboxInput.tsx';
 import { Categories } from '@/lib/data/Categories.ts';

src/components/source/BaseMangaGrid.tsx

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { MangaGrid, IMangaGridProps } from '@/components/MangaGrid';
+import { MangaGrid, IMangaGridProps } from '@/modules/manga/components/MangaGrid.tsx';
 
 type TMangaBaseGrid = Omit<IMangaGridProps['mangas'][number], 'downloadCount' | 'unreadCount' | 'chapters'>;
 

src/components/tracker/TrackManga.tsx

@@ -20,7 +20,7 @@ import { makeToast } from '@/lib/ui/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';
-import { MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 import { GET_MANGA_TRACK_RECORDS } from '@/lib/graphql/queries/MangaQuery.ts';
 
 const getTrackerMode = (id: number, trackersInUse: number[], searchModeForTracker?: number): TrackerMode => {

src/components/tracker/TrackerCard.tsx

@@ -11,7 +11,7 @@ import { TrackerSearch } from '@/components/tracker/TrackerSearch.tsx';
 import { TrackerActiveCard } from '@/components/tracker/TrackerActiveCard.tsx';
 import { TTrackerBind, TTrackRecordBind } from '@/lib/data/Trackers.ts';
 import { MangaType } from '@/lib/graphql/generated/graphql.ts';
-import { MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 
 export enum TrackerMode {
     UNTRACKED,

src/components/tracker/TrackerSearch.tsx

@@ -32,7 +32,7 @@ import { DIALOG_PADDING } from '@/components/tracker/constants.ts';
 import { useGetOptionForDirection } from '@/theme.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { MangaType } from '@/lib/graphql/generated/graphql.ts';
-import { MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 
 export const TrackerSearch = ({
     manga,

src/lib/metadata/metadata.ts

@@ -20,7 +20,7 @@ import { MetaType, SourceType } from '@/lib/graphql/generated/graphql.ts';
 import { DEFAULT_DEVICE, getActiveDevice } from '@/util/device.ts';
 import { CategoryIdInfo } from '@/lib/data/Categories.ts';
 import { ChapterIdInfo } from '@/modules/chapter/services/Chapters.ts';
-import { MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 
 const APP_METADATA_KEY_PREFIX = 'webUI_';
 

src/lib/metadata/readerSettings.ts

@@ -15,7 +15,7 @@ import {
     requestUpdateServerMetadata,
 } from '@/lib/metadata/metadata.ts';
 import { MetaType } from '@/lib/graphql/generated/graphql.ts';
-import { MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 
 type UndefinedReaderSettings = {
     [setting in keyof IReaderSettings]: IReaderSettings[setting] | undefined;

src/lib/requests/requests/RequestManager.ts

@@ -304,7 +304,7 @@ import { MetadataMigrationSettings } from '@/typings.ts';
 import { DOWNLOAD_STATUS_FIELDS } from '@/lib/graphql/fragments/DownloadFragments.ts';
 import { EXTENSION_LIST_FIELDS } from '@/lib/graphql/fragments/ExtensionFragments.ts';
 import { MANGA_BASE_FIELDS, MANGA_META_FIELDS } from '@/lib/graphql/fragments/MangaFragments.ts';
-import { MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 import { GLOBAL_METADATA } from '@/lib/graphql/fragments/Fragments.ts';
 import { CATEGORY_META_FIELDS } from '@/lib/graphql/fragments/CategoryFragments.ts';
 import { SOURCE_META_FIELDS } from '@/lib/graphql/fragments/SourceFragments.ts';

src/modules/chapter/components/ChapterList.tsx

@@ -21,7 +21,7 @@ import PopupState, { bindMenu, bindTrigger } from 'material-ui-popup-state';
 import Menu from '@mui/material/Menu';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { ChapterCard } from '@/modules/chapter/components/cards/ChapterCard.tsx';
-import { ResumeFab } from '@/components/manga/ResumeFAB.tsx';
+import { ResumeFab } from '@/modules/manga/components/ResumeFAB.tsx';
 import { filterAndSortChapters } from '@/modules/chapter/utils/ChapterList.util.tsx';
 import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';
 import { ChaptersToolbarMenu } from '@/modules/chapter/components/ChaptersToolbarMenu.tsx';
@@ -41,7 +41,7 @@ import { ChaptersDownloadActionMenuItems } from '@/modules/chapter/components/ac
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { GET_CHAPTERS_MANGA } from '@/lib/graphql/queries/ChapterQuery.ts';
-import { Mangas } from '@/lib/data/Mangas.ts';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
 import { useNavBarContext } from '@/components/context/NavbarContext.tsx';
 import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
 import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';

src/modules/chapter/components/actions/ChaptersDownloadActionMenuItems.tsx

@@ -9,7 +9,7 @@
 import MenuItem from '@mui/material/MenuItem';
 import { useTranslation } from 'react-i18next';
 import { useMetadataServerSettings } from '@/lib/metadata/metadataServerSettings.ts';
-import { Mangas } from '@/lib/data/Mangas.ts';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { MangaType } from '@/lib/graphql/generated/graphql.ts';
 

src/modules/chapter/services/Chapters.ts

@@ -18,7 +18,7 @@ import {
     DownloadStatusFieldsFragment,
 } from '@/lib/graphql/generated/graphql.ts';
 import { CHAPTER_LIST_FIELDS } from '@/lib/graphql/fragments/ChapterFragments.ts';
-import { MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 
 import { DirectionOffset, TranslationKey } from '@/Base.types.ts';
 

src/modules/manga/MangaCard.types.tsx

@@ -10,10 +10,11 @@ import { LongPressPointerHandlers, LongPressResult } from 'use-long-press/lib/us
 import { PopupState } from 'material-ui-popup-state/hooks';
 import { GridLayout } from '@/components/context/LibraryOptionsContext.tsx';
 import { SelectableCollectionReturnType } from '@/components/collection/useSelectableCollection.ts';
-import { useManageMangaLibraryState } from '@/components/manga/useManageMangaLibraryState.tsx';
-import { MangaThumbnailInfo } from '@/lib/data/Mangas.ts';
+import { useManageMangaLibraryState } from '@/modules/manga/hooks/useManageMangaLibraryState.tsx';
+import { MangaThumbnailInfo } from '@/modules/manga/services/Mangas.ts';
 import { ChapterType, MangaType } from '@/lib/graphql/generated/graphql.ts';
-import { SingleModeProps } from '@/components/manga/MangaActionMenuItems.tsx';
+import { SingleModeProps } from '@/modules/manga/components/MangaActionMenuItems.tsx';
+import { IReaderSettings } from '@/typings';
 
 export type MangaCardMode = 'default' | 'source' | 'migrate.search' | 'migrate.select' | 'duplicate';
 
@@ -44,3 +45,5 @@ export type SpecificMangaCardProps = Omit<MangaCardProps, 'manga'> &
         continueReadingButton: JSX.Element;
         mangaBadges: JSX.Element;
     };
+
+export type MangaMetadataKeys = keyof IReaderSettings;

src/modules/manga/components/MangaActionMenuItems.tsx

@@ -26,7 +26,7 @@ import {
     MangaIdInfo,
     Mangas,
     MangaUnreadInfo,
-} from '@/lib/data/Mangas.ts';
+} from '@/modules/manga/services/Mangas.ts';
 import { SelectableCollectionReturnType } from '@/components/collection/useSelectableCollection.ts';
 import { MenuItem } from '@/modules/core/components/menu/MenuItem.tsx';
 import {

src/modules/manga/components/MangaBadges.tsx

@@ -10,7 +10,7 @@ import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
 import Button from '@mui/material/Button';
 import Typography from '@mui/material/Typography';
-import { MangaCardMode } from '@/components/manga/MangaCard.types.tsx';
+import { MangaCardMode } from '@/modules/manga/MangaCard.types.tsx';
 import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
 import { useLibraryOptionsContext } from '@/components/context/LibraryOptionsContext.tsx';
 

src/modules/manga/components/MangaDetails.tsx

@@ -27,11 +27,16 @@ 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 { Mangas, MangaThumbnailInfo, MangaTrackRecordInfo, statusToTranslationKey } from '@/lib/data/Mangas.ts';
+import {
+    Mangas,
+    MangaThumbnailInfo,
+    MangaTrackRecordInfo,
+    statusToTranslationKey,
+} from '@/modules/manga/services/Mangas.ts';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
 import { CustomIconButton } from '@/modules/core/components/buttons/CustomIconButton.tsx';
-import { TrackMangaButton } from '@/components/manga/TrackMangaButton.tsx';
-import { useManageMangaLibraryState } from '@/components/manga/useManageMangaLibraryState.tsx';
+import { TrackMangaButton } from '@/modules/manga/components/TrackMangaButton.tsx';
+import { useManageMangaLibraryState } from '@/modules/manga/hooks/useManageMangaLibraryState.tsx';
 import { Metadata as BaseMetadata } from '@/modules/core/components/Metadata.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { MangaType, SourceType } from '@/lib/graphql/generated/graphql.ts';

src/modules/manga/components/MangaGrid.tsx

@@ -23,13 +23,13 @@ import { useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
-import { MangaCard } from '@/components/MangaCard';
+import { MangaCard } from '@/modules/manga/components/cards/MangaCard.tsx';
 import { GridLayout } from '@/components/context/LibraryOptionsContext';
 import { useLocalStorage, useSessionStorage } from '@/modules/core/hooks/useStorage.tsx';
 import { SelectableCollectionReturnType } from '@/components/collection/useSelectableCollection.ts';
 import { DEFAULT_FULL_FAB_HEIGHT } from '@/modules/core/components/buttons/StyledFab.tsx';
 import { AppStorage } from '@/lib/AppStorage.ts';
-import { MangaCardProps } from '@/components/manga/MangaCard.types.tsx';
+import { MangaCardProps } from '@/modules/manga/MangaCard.types.tsx';
 import { MangaType } from '@/lib/graphql/generated/graphql.ts';
 import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
 import { useNavBarContext } from '@/components/context/NavbarContext.tsx';

src/modules/manga/components/TrackMangaButton.tsx

@@ -19,7 +19,7 @@ import { Trackers } from '@/lib/data/Trackers.ts';
 import { CustomIconButton } from '@/modules/core/components/buttons/CustomIconButton.tsx';
 import { GetTrackersSettingsQuery, MangaType } from '@/lib/graphql/generated/graphql.ts';
 import { GET_TRACKERS_SETTINGS } from '@/lib/graphql/queries/TrackerQuery.ts';
-import { MangaTrackRecordInfo } from '@/lib/data/Mangas.ts';
+import { MangaTrackRecordInfo } from '@/modules/manga/services/Mangas.ts';
 
 export const TrackMangaButton = ({ manga }: { manga: MangaTrackRecordInfo & Pick<MangaType, 'title'> }) => {
     const { t } = useTranslation();

src/modules/manga/components/cards/MangaCard.tsx

@@ -10,15 +10,15 @@ import PopupState, { bindMenu } from 'material-ui-popup-state';
 import { useMemo, useState } from 'react';
 import { useLongPress } from 'use-long-press';
 import { GridLayout, useLibraryOptionsContext } from '@/components/context/LibraryOptionsContext';
-import { MangaActionMenuItems, SingleModeProps } from '@/components/manga/MangaActionMenuItems.tsx';
+import { MangaActionMenuItems, SingleModeProps } from '@/modules/manga/components/MangaActionMenuItems.tsx';
 import { Menu } from '@/modules/core/components/menu/Menu.tsx';
 import { MigrateDialog } from '@/components/MigrateDialog.tsx';
-import { useManageMangaLibraryState } from '@/components/manga/useManageMangaLibraryState.tsx';
-import { MangaGridCard } from '@/components/manga/MangaGridCard.tsx';
-import { MangaListCard } from '@/components/manga/MangaListCard.tsx';
-import { MangaCardMode, MangaCardProps } from '@/components/manga/MangaCard.types';
-import { ContinueReadingButton } from '@/components/manga/ContinueReadingButton.tsx';
-import { MangaBadges } from '@/components/manga/MangaBadges.tsx';
+import { useManageMangaLibraryState } from '@/modules/manga/hooks/useManageMangaLibraryState.tsx';
+import { MangaGridCard } from '@/modules/manga/components/cards/MangaGridCard.tsx';
+import { MangaListCard } from '@/modules/manga/components/cards/MangaListCard.tsx';
+import { MangaCardMode, MangaCardProps } from '@/modules/manga/MangaCard.types.tsx';
+import { ContinueReadingButton } from '@/modules/manga/components/ContinueReadingButton.tsx';
+import { MangaBadges } from '@/modules/manga/components/MangaBadges.tsx';
 
 const getMangaLinkTo = (
     mode: MangaCardMode,

src/modules/manga/components/cards/MangaGridCard.tsx

@@ -16,10 +16,10 @@ import Tooltip from '@mui/material/Tooltip';
 import { styled } from '@mui/material/styles';
 import { useRef } from 'react';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
-import { MangaOptionButton } from '@/components/manga/MangaOptionButton.tsx';
+import { MangaOptionButton } from '@/modules/manga/components/MangaOptionButton.tsx';
 import { GridLayout } from '@/components/context/LibraryOptionsContext.tsx';
-import { Mangas } from '@/lib/data/Mangas.ts';
-import { SpecificMangaCardProps } from '@/components/manga/MangaCard.types.tsx';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
+import { SpecificMangaCardProps } from '@/modules/manga/MangaCard.types.tsx';
 import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx';
 
 const BottomGradient = styled('div')({

src/modules/manga/components/cards/MangaListCard.tsx

@@ -17,9 +17,9 @@ import { Link as RouterLink } from 'react-router-dom';
 import { useRef } from 'react';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
 import { TypographyMaxLines } from '@/modules/core/components/TypographyMaxLines.tsx';
-import { SpecificMangaCardProps } from '@/components/manga/MangaCard.types.tsx';
-import { Mangas } from '@/lib/data/Mangas.ts';
-import { MangaOptionButton } from '@/components/manga/MangaOptionButton.tsx';
+import { SpecificMangaCardProps } from '@/modules/manga/MangaCard.types.tsx';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
+import { MangaOptionButton } from '@/modules/manga/components/MangaOptionButton.tsx';
 
 export const MangaListCard = ({
     manga,

src/modules/manga/hooks/useManageMangaLibraryState.tsx

@@ -16,7 +16,7 @@ import { makeToast } from '@/lib/ui/Toast.ts';
 import { getMetadataServerSettings } from '@/lib/metadata/metadataServerSettings.ts';
 import { Categories } from '@/lib/data/Categories.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { Mangas } from '@/lib/data/Mangas.ts';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
 import { awaitConfirmation } from '@/lib/ui/AwaitableDialog.tsx';
 import { GetCategoriesBaseQuery, GetCategoriesBaseQueryVariables, MangaType } from '@/lib/graphql/generated/graphql.ts';
 import { GET_CATEGORIES_BASE } from '@/lib/graphql/queries/CategoryQuery.ts';

src/modules/manga/screens/Manga.tsx

@@ -17,11 +17,11 @@ import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import { isNetworkRequestInFlight } from '@apollo/client/core/networkStatus';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { NavBarContext } from '@/components/context/NavbarContext';
+import { NavBarContext } from '@/components/context/NavbarContext.tsx';
 import { ChapterList } from '@/modules/chapter/components/ChapterList.tsx';
-import { useRefreshManga } from '@/components/manga/useRefreshManga.ts';
-import { MangaDetails } from '@/components/manga/MangaDetails';
-import { MangaToolbarMenu } from '@/components/manga/MangaToolbarMenu';
+import { useRefreshManga } from '@/modules/manga/hooks/useRefreshManga.ts';
+import { MangaDetails } from '@/modules/manga/components/MangaDetails.tsx';
+import { MangaToolbarMenu } from '@/modules/manga/components/MangaToolbarMenu.tsx';
 import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { GetMangaScreenQuery } from '@/lib/graphql/generated/graphql.ts';

src/screens/Library.tsx

@@ -25,7 +25,7 @@ import { useSelectableCollection } from '@/components/collection/useSelectableCo
 import { SelectableCollectionSelectMode } from '@/components/collection/SelectableCollectionSelectMode.tsx';
 import { useGetVisibleLibraryMangas } from '@/components/library/useGetVisibleLibraryMangas.ts';
 import { SelectionFAB } from '@/components/collection/SelectionFAB.tsx';
-import { MangaActionMenuItems } from '@/components/manga/MangaActionMenuItems.tsx';
+import { MangaActionMenuItems } from '@/modules/manga/components/MangaActionMenuItems.tsx';
 import { TabsMenu } from '@/modules/core/components/tabs/TabsMenu.tsx';
 import { TabsWrapper } from '@/modules/core/components/tabs/TabsWrapper.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
@@ -36,7 +36,7 @@ import {
     MangaType,
 } from '@/lib/graphql/generated/graphql.ts';
 import { GET_CATEGORIES_LIBRARY } from '@/lib/graphql/queries/CategoryQuery.ts';
-import { Mangas } from '@/lib/data/Mangas.ts';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
 import { MANGA_CHAPTER_STAT_FIELDS } from '@/lib/graphql/fragments/MangaFragments.ts';
 import { useLibraryOptionsContext } from '@/components/context/LibraryOptionsContext.tsx';
 import { useMetadataServerSettings } from '@/lib/metadata/metadataServerSettings.ts';

src/screens/Reader.tsx

@@ -40,7 +40,7 @@ import { ChapterIdInfo, Chapters } from '@/modules/chapter/services/Chapters.ts'
 import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';
 import { GET_CHAPTERS_READER } from '@/lib/graphql/queries/ChapterQuery.ts';
 import { GET_MANGA_READER } from '@/lib/graphql/queries/MangaQuery.ts';
-import { TMangaReader } from '@/lib/data/Mangas.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 { DirectionOffset } from '@/Base.types.ts';

src/screens/SearchAll.tsx

@@ -22,7 +22,7 @@ import { AppbarSearch } from '@/modules/core/components/AppbarSearch.tsx';
 import { LangSelect } from '@/modules/core/components/inputs/LangSelect.tsx';
 import { useDebounce } from '@/modules/core/hooks/useDebounce.ts';
 import { NavBarContext } from '@/components/context/NavbarContext.tsx';
-import { MangaCardProps } from '@/components/manga/MangaCard.types.tsx';
+import { MangaCardProps } from '@/modules/manga/MangaCard.types.tsx';
 import { EmptyView } from '@/modules/core/components/placeholder/EmptyView.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';

src/screens/SourceMangas.tsx

@@ -41,11 +41,11 @@ import { NavBarContext } from '@/components/context/NavbarContext.tsx';
 import { useMetadataServerSettings } from '@/lib/metadata/metadataServerSettings.ts';
 import { useLocalStorage, useSessionStorage } from '@/modules/core/hooks/useStorage.tsx';
 import { AppStorage } from '@/lib/AppStorage.ts';
-import { getGridSnapshotKey } from '@/components/MangaGrid.tsx';
+import { getGridSnapshotKey } from '@/modules/manga/components/MangaGrid.tsx';
 import { createUpdateSourceMetadata, getSourceMetadata } from '@/lib/metadata/sourceMetadata.ts';
 import { makeToast } from '@/lib/ui/Toast.ts';
 import { GET_SOURCE_BROWSE } from '@/lib/graphql/queries/SourceQuery.ts';
-import { MangaIdInfo } from '@/lib/data/Mangas.ts';
+import { MangaIdInfo } from '@/modules/manga/services/Mangas.ts';
 import { TranslationKey } from '@/Base.types.ts';
 
 const ContentTypeMenu = styled('div')(({ theme }) => ({

src/screens/Updates.tsx

@@ -29,7 +29,7 @@ import { UpdateChecker } from '@/modules/core/components/UpdateChecker.tsx';
 import { StyledGroupedVirtuoso } from '@/modules/core/components/virtuoso/StyledGroupedVirtuoso.tsx';
 import { StyledGroupHeader } from '@/modules/core/components/virtuoso/StyledGroupHeader.tsx';
 import { StyledGroupItemWrapper } from '@/modules/core/components/virtuoso/StyledGroupItemWrapper.tsx';
-import { Mangas } from '@/lib/data/Mangas.ts';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
 import { dateTimeFormatter, epochToDate, getDateString } from '@/util/DateHelper.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';

src/screens/settings/LibraryDuplicates.tsx

@@ -23,7 +23,7 @@ import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.ts
 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 { MangaCard } from '@/components/MangaCard.tsx';
+import { MangaCard } from '@/modules/manga/components/cards/MangaCard.tsx';
 import { StyledGroupedVirtuoso } from '@/modules/core/components/virtuoso/StyledGroupedVirtuoso.tsx';
 import { StyledGroupHeader } from '@/modules/core/components/virtuoso/StyledGroupHeader.tsx';
 import {
@@ -33,7 +33,7 @@ import {
 } from '@/lib/graphql/generated/graphql.ts';
 import { GET_MANGAS_DUPLICATES } from '@/lib/graphql/queries/MangaQuery.ts';
 import { BaseMangaGrid } from '@/components/source/BaseMangaGrid.tsx';
-import { IMangaGridProps } from '@/components/MangaGrid.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';
 

src/screens/settings/LibrarySettings.tsx

@@ -24,7 +24,7 @@ import {
     useMetadataServerSettings,
 } from '@/lib/metadata/metadataServerSettings.ts';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { Mangas } from '@/lib/data/Mangas.ts';
+import { Mangas } from '@/modules/manga/services/Mangas.ts';
 import { EmptyViewAbsoluteCentered } from '@/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';

src/typings.ts

@@ -22,6 +22,7 @@ import {
 import { AppTheme } from '@/lib/ui/AppThemes.ts';
 import { SortSettings } from '@/screens/Migration.types.ts';
 import { NullAndUndefined, TranslationKey } from '@/Base.types.ts';
+import { MangaMetadataKeys } from '@/modules/manga/MangaCard.types.tsx';
 
 export interface IPos {
     type: 'selectState' | 'textState' | 'checkBoxState' | 'triState' | 'sortState';
@@ -68,8 +69,6 @@ export type AllowedMetadataValueTypes = string | boolean | number | undefined |
 
 export type MetadataServerSettingKeys = keyof MetadataServerSettings;
 
-export type MangaMetadataKeys = keyof IReaderSettings;
-
 export type SearchMetadataKeys = keyof ISearchSettings;
 
 export type SourceMetadataKeys = keyof ISourceMetadata;