diff --git a/src/App.tsx b/src/App.tsx index e51f75d9..9bf540c2 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -17,9 +17,9 @@ import CssBaseline from '@mui/material/CssBaseline'; import { createTheme, ThemeProvider, Theme, StyledEngineProvider, } from '@mui/material/styles'; -import NavBar from 'components/navbar/NavBar'; -import NavbarContext from 'context/NavbarContext'; -import DarkTheme from 'context/DarkTheme'; +import DefaultNavBar from 'components/navbar/DefaultNavBar'; +import NavbarContext from 'components/context/NavbarContext'; +import DarkTheme from 'components/context/DarkTheme'; import useLocalStorage from 'util/useLocalStorage'; import Settings from 'screens/Settings'; import About from 'screens/settings/About'; @@ -98,7 +98,7 @@ export default function App() { - + ({ root: { diff --git a/src/components/manga/MangaDetails.tsx b/src/components/MangaDetails.tsx similarity index 98% rename from src/components/manga/MangaDetails.tsx rename to src/components/MangaDetails.tsx index 3cead926..2ba6a995 100644 --- a/src/components/manga/MangaDetails.tsx +++ b/src/components/MangaDetails.tsx @@ -13,10 +13,10 @@ import FavoriteBorderIcon from '@mui/icons-material/FavoriteBorder'; import FilterListIcon from '@mui/icons-material/FilterList'; import PublicIcon from '@mui/icons-material/Public'; import React, { useContext, useEffect, useState } from 'react'; -import NavbarContext from 'context/NavbarContext'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; import useLocalStorage from 'util/useLocalStorage'; -import CategorySelect from './CategorySelect'; +import CategorySelect from './navbar/action/CategorySelect'; const useStyles = (inLibrary: string) => makeStyles((theme: Theme) => ({ root: { diff --git a/src/components/manga/MangaGrid.tsx b/src/components/MangaGrid.tsx similarity index 95% rename from src/components/manga/MangaGrid.tsx rename to src/components/MangaGrid.tsx index e6e7382f..d0ac770c 100644 --- a/src/components/manga/MangaGrid.tsx +++ b/src/components/MangaGrid.tsx @@ -7,8 +7,8 @@ import React, { useEffect, useRef } from 'react'; import Grid from '@mui/material/Grid'; -import EmptyView from 'components/EmptyView'; -import LoadingPlaceholder from 'components/LoadingPlaceholder'; +import EmptyView from 'components/util/EmptyView'; +import LoadingPlaceholder from 'components/util/LoadingPlaceholder'; import MangaCard from './MangaCard'; export interface IMangaGridProps{ diff --git a/src/components/manga/SourceCard.tsx b/src/components/SourceCard.tsx similarity index 100% rename from src/components/manga/SourceCard.tsx rename to src/components/SourceCard.tsx diff --git a/src/context/DarkTheme.tsx b/src/components/context/DarkTheme.tsx similarity index 100% rename from src/context/DarkTheme.tsx rename to src/components/context/DarkTheme.tsx diff --git a/src/context/NavbarContext.tsx b/src/components/context/NavbarContext.tsx similarity index 89% rename from src/context/NavbarContext.tsx rename to src/components/context/NavbarContext.tsx index c59b5b51..4a700a29 100644 --- a/src/context/NavbarContext.tsx +++ b/src/components/context/NavbarContext.tsx @@ -8,10 +8,15 @@ import React from 'react'; type ContextType = { + // AppBar title title: string setTitle: React.Dispatch> + + // AppBar action buttons action: any setAction: React.Dispatch> + + // Allow default navbar to be overrided override: INavbarOverride setOverride: React.Dispatch> }; diff --git a/src/components/library/LibraryMangaGrid.tsx b/src/components/library/LibraryMangaGrid.tsx index 0f2f161b..369abc5a 100644 --- a/src/components/library/LibraryMangaGrid.tsx +++ b/src/components/library/LibraryMangaGrid.tsx @@ -7,8 +7,8 @@ */ import React from 'react'; -import MangaGrid, { IMangaGridProps } from '../manga/MangaGrid'; -import useLibraryOptions, { NullAndUndefined } from '../../util/useLibraryOptions'; +import MangaGrid, { IMangaGridProps } from 'components/MangaGrid'; +import useLibraryOptions, { NullAndUndefined } from 'util/useLibraryOptions'; const FILTERED_OUT_MESSAGE = 'There are no Manga matching this filter'; diff --git a/src/components/library/LibraryOptions.tsx b/src/components/library/LibraryOptions.tsx index 53859ccb..1795dfc4 100644 --- a/src/components/library/LibraryOptions.tsx +++ b/src/components/library/LibraryOptions.tsx @@ -9,8 +9,8 @@ import React from 'react'; import FilterListIcon from '@mui/icons-material/FilterList'; import { Drawer, FormControlLabel, IconButton } from '@mui/material'; -import useLibraryOptions from '../../util/useLibraryOptions'; -import ThreeStateCheckbox from '../ThreeStateCheckbox'; +import useLibraryOptions from 'util/useLibraryOptions'; +import ThreeStateCheckbox from 'components/util/ThreeStateCheckbox'; function Options() { const { unread, setUnread } = useLibraryOptions(); diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/DefaultNavBar.tsx similarity index 89% rename from src/components/navbar/NavBar.tsx rename to src/components/navbar/DefaultNavBar.tsx index 3f0a0582..ce6a55d1 100644 --- a/src/components/navbar/NavBar.tsx +++ b/src/components/navbar/DefaultNavBar.tsx @@ -20,10 +20,10 @@ import GetAppIcon from '@mui/icons-material/GetApp'; import SettingsIcon from '@mui/icons-material/Settings'; import ArrowBack from '@mui/icons-material/ArrowBack'; import { useHistory } from 'react-router-dom'; -import NavBarContext from 'context/NavbarContext'; -import DarkTheme from 'context/DarkTheme'; -import PermanentSideBar from './PermanentSideBar'; -import BottomNavigationBar from './BottomNavigationBar'; +import NavBarContext from 'components/context/NavbarContext'; +import DarkTheme from 'components/context/DarkTheme'; +import DesktopSideBar from './navigation/DesktopSideBar'; +import MobileBottomBar from './navigation/MobileBottomBar'; const useStyles = makeStyles((theme) => ({ root: { @@ -62,26 +62,27 @@ const navbarItems: Array = [ }, ]; -export default function NavBar() { +export default function DefaultNavBar() { const classes = useStyles(); const { title, action, override } = useContext(NavBarContext); - const theme = useTheme(); - const isMobileWidth = useMediaQuery(theme.breakpoints.down('sm')); - const history = useHistory(); - const isMainRoute = navbarItems.some(({ path }) => path === history.location.pathname); - const { darkTheme } = useContext(DarkTheme); - // Allow default navbar to be overrided with `NavBarContext` + const theme = useTheme(); + const history = useHistory(); + + const isMobileWidth = useMediaQuery(theme.breakpoints.down('sm')); + const isMainRoute = navbarItems.some(({ path }) => path === history.location.pathname); + + // Allow default navbar to be overrided if (override.status) return override.value; let navbar = <>; if (isMobileWidth) { if (!isMainRoute) { - navbar = ; + navbar = ; } } else { - navbar = ; + navbar = ; } return ( diff --git a/src/components/navbar/ReaderNavBar.tsx b/src/components/navbar/ReaderNavBar.tsx index 8cc737bc..edd98996 100644 --- a/src/components/navbar/ReaderNavBar.tsx +++ b/src/components/navbar/ReaderNavBar.tsx @@ -27,7 +27,7 @@ import ListItemText from '@mui/material/ListItemText'; import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import Collapse from '@mui/material/Collapse'; import Button from '@mui/material/Button'; -import NavBarContext from '../../context/NavbarContext'; +import NavBarContext from 'components/context/NavbarContext'; const useStyles = (settings: IReaderSettings) => makeStyles((theme) => ({ // main container and root div need to change classes... diff --git a/src/components/navbar/TemporaryDrawer.tsx b/src/components/navbar/TemporaryDrawer.tsx deleted file mode 100644 index 37a29d46..00000000 --- a/src/components/navbar/TemporaryDrawer.tsx +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) Contributors to the Suwayomi project - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -import React from 'react'; -import makeStyles from '@mui/styles/makeStyles'; -import Drawer from '@mui/material/Drawer'; -import List from '@mui/material/List'; -import ListItem from '@mui/material/ListItem'; -import ListItemIcon from '@mui/material/ListItemIcon'; -import ListItemText from '@mui/material/ListItemText'; -import { Link } from 'react-router-dom'; - -const useStyles = makeStyles({ - list: { - width: 250, - }, -}); - -interface IProps { - drawerOpen: boolean - - setDrawerOpen: React.Dispatch> - navBarItems: Array -} - -export default function TemporaryDrawer({ drawerOpen, setDrawerOpen, navBarItems }: IProps) { - const classes = useStyles(); - - return ( -
- setDrawerOpen(false)} - > -
setDrawerOpen(false)} - onKeyDown={() => setDrawerOpen(false)} - > - - {navBarItems.map((({ path, title, IconComponent }: NavbarItem) => ( - - - - - - - - - )))} - -
- -
- ); -} diff --git a/src/components/manga/CategorySelect.tsx b/src/components/navbar/action/CategorySelect.tsx similarity index 100% rename from src/components/manga/CategorySelect.tsx rename to src/components/navbar/action/CategorySelect.tsx diff --git a/src/components/manga/LangSelect.tsx b/src/components/navbar/action/LangSelect.tsx similarity index 100% rename from src/components/manga/LangSelect.tsx rename to src/components/navbar/action/LangSelect.tsx diff --git a/src/components/navbar/PermanentSideBar.tsx b/src/components/navbar/navigation/DesktopSideBar.tsx similarity index 96% rename from src/components/navbar/PermanentSideBar.tsx rename to src/components/navbar/navigation/DesktopSideBar.tsx index 4b290ef7..f31eeded 100644 --- a/src/components/navbar/PermanentSideBar.tsx +++ b/src/components/navbar/navigation/DesktopSideBar.tsx @@ -26,7 +26,7 @@ interface IProps { navBarItems: Array } -export default function PermanentSideBar({ navBarItems }: IProps) { +export default function DesktopSideBar({ navBarItems }: IProps) { const location = useLocation(); return ( diff --git a/src/components/navbar/BottomNavigationBar.tsx b/src/components/navbar/navigation/MobileBottomBar.tsx similarity index 96% rename from src/components/navbar/BottomNavigationBar.tsx rename to src/components/navbar/navigation/MobileBottomBar.tsx index 0efe9a4c..325b2f17 100644 --- a/src/components/navbar/BottomNavigationBar.tsx +++ b/src/components/navbar/navigation/MobileBottomBar.tsx @@ -32,7 +32,7 @@ interface IProps { navBarItems: Array } -export default function BottomNavigationBar({ navBarItems }: IProps) { +export default function MobileBottomBar({ navBarItems }: IProps) { const location = useLocation(); return ( diff --git a/src/components/manga/reader/DoublePage.tsx b/src/components/reader/DoublePage.tsx similarity index 100% rename from src/components/manga/reader/DoublePage.tsx rename to src/components/reader/DoublePage.tsx diff --git a/src/components/manga/reader/Page.tsx b/src/components/reader/Page.tsx similarity index 98% rename from src/components/manga/reader/Page.tsx rename to src/components/reader/Page.tsx index 40af457f..df57b976 100644 --- a/src/components/manga/reader/Page.tsx +++ b/src/components/reader/Page.tsx @@ -7,7 +7,7 @@ import makeStyles from '@mui/styles/makeStyles'; import React, { useEffect, useRef } from 'react'; -import SpinnerImage from 'components/SpinnerImage'; +import SpinnerImage from 'components/util/SpinnerImage'; import useLocalStorage from 'util/useLocalStorage'; function imageStyle(settings: IReaderSettings): any { diff --git a/src/components/manga/reader/PageNumber.tsx b/src/components/reader/PageNumber.tsx similarity index 100% rename from src/components/manga/reader/PageNumber.tsx rename to src/components/reader/PageNumber.tsx diff --git a/src/components/manga/reader/pager/DoublePagedPager.tsx b/src/components/reader/pager/DoublePagedPager.tsx similarity index 100% rename from src/components/manga/reader/pager/DoublePagedPager.tsx rename to src/components/reader/pager/DoublePagedPager.tsx diff --git a/src/components/manga/reader/pager/HorizontalPager.tsx b/src/components/reader/pager/HorizontalPager.tsx similarity index 100% rename from src/components/manga/reader/pager/HorizontalPager.tsx rename to src/components/reader/pager/HorizontalPager.tsx diff --git a/src/components/manga/reader/pager/PagedPager.tsx b/src/components/reader/pager/PagedPager.tsx similarity index 100% rename from src/components/manga/reader/pager/PagedPager.tsx rename to src/components/reader/pager/PagedPager.tsx diff --git a/src/components/manga/reader/pager/VerticalPager.tsx b/src/components/reader/pager/VerticalPager.tsx similarity index 100% rename from src/components/manga/reader/pager/VerticalPager.tsx rename to src/components/reader/pager/VerticalPager.tsx diff --git a/src/components/manga/sourceConfiguration/EditTextPreference.tsx b/src/components/sourceConfiguration/EditTextPreference.tsx similarity index 100% rename from src/components/manga/sourceConfiguration/EditTextPreference.tsx rename to src/components/sourceConfiguration/EditTextPreference.tsx diff --git a/src/components/manga/sourceConfiguration/ListPreference.tsx b/src/components/sourceConfiguration/ListPreference.tsx similarity index 100% rename from src/components/manga/sourceConfiguration/ListPreference.tsx rename to src/components/sourceConfiguration/ListPreference.tsx diff --git a/src/components/manga/sourceConfiguration/TwoStatePreference.tsx b/src/components/sourceConfiguration/TwoStatePreference.tsx similarity index 100% rename from src/components/manga/sourceConfiguration/TwoStatePreference.tsx rename to src/components/sourceConfiguration/TwoStatePreference.tsx diff --git a/src/components/EmptyView.tsx b/src/components/util/EmptyView.tsx similarity index 100% rename from src/components/EmptyView.tsx rename to src/components/util/EmptyView.tsx diff --git a/src/components/LoadingPlaceholder.tsx b/src/components/util/LoadingPlaceholder.tsx similarity index 100% rename from src/components/LoadingPlaceholder.tsx rename to src/components/util/LoadingPlaceholder.tsx diff --git a/src/components/SpinnerImage.tsx b/src/components/util/SpinnerImage.tsx similarity index 100% rename from src/components/SpinnerImage.tsx rename to src/components/util/SpinnerImage.tsx diff --git a/src/components/ThreeStateCheckbox.tsx b/src/components/util/ThreeStateCheckbox.tsx similarity index 100% rename from src/components/ThreeStateCheckbox.tsx rename to src/components/util/ThreeStateCheckbox.tsx diff --git a/src/components/Toast.tsx b/src/components/util/Toast.tsx similarity index 100% rename from src/components/Toast.tsx rename to src/components/util/Toast.tsx diff --git a/src/screens/Settings.tsx b/src/screens/Settings.tsx index d02a972f..db86fef7 100644 --- a/src/screens/Settings.tsx +++ b/src/screens/Settings.tsx @@ -27,8 +27,8 @@ import DialogContent from '@mui/material/DialogContent'; import DialogContentText from '@mui/material/DialogContentText'; import TextField from '@mui/material/TextField'; import FavoriteIcon from '@mui/icons-material/Favorite'; -import NavbarContext from '../context/NavbarContext'; -import DarkTheme from '../context/DarkTheme'; +import NavbarContext from '../components/context/NavbarContext'; +import DarkTheme from '../components/context/DarkTheme'; import useLocalStorage from '../util/useLocalStorage'; import ListItemLink from '../components/util/ListItemLink'; diff --git a/src/screens/manga/DownloadQueue.tsx b/src/screens/manga/DownloadQueue.tsx index 5c36b33b..66f9e3a1 100644 --- a/src/screens/manga/DownloadQueue.tsx +++ b/src/screens/manga/DownloadQueue.tsx @@ -8,7 +8,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -import NavbarContext from 'context/NavbarContext'; +import NavbarContext from 'components/context/NavbarContext'; import React, { useContext, useEffect, useState } from 'react'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; import PauseIcon from '@mui/icons-material/Pause'; @@ -24,7 +24,7 @@ import DragHandleIcon from '@mui/icons-material/DragHandle'; import ListItem from '@mui/material/ListItem'; import { ListItemIcon } from '@mui/material'; import ListItemText from '@mui/material/ListItemText'; -import EmptyView from 'components/EmptyView'; +import EmptyView from 'components/util/EmptyView'; const baseWebsocketUrl = JSON.parse(window.localStorage.getItem('serverBaseURL')!).replace('http', 'ws'); diff --git a/src/screens/manga/Extensions.tsx b/src/screens/manga/Extensions.tsx index 60a5b850..12c990d7 100644 --- a/src/screens/manga/Extensions.tsx +++ b/src/screens/manga/Extensions.tsx @@ -9,14 +9,14 @@ import React, { useContext, useEffect, useState } from 'react'; import { fromEvent } from 'file-selector'; import IconButton from '@mui/material/IconButton'; import AddIcon from '@mui/icons-material/Add'; -import ExtensionCard from 'components/manga/ExtensionCard'; -import NavbarContext from 'context/NavbarContext'; +import ExtensionCard from 'components/ExtensionCard'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; import useLocalStorage from 'util/useLocalStorage'; -import LangSelect from 'components/manga/LangSelect'; +import LangSelect from 'components/navbar/action/LangSelect'; import { extensionDefaultLangs, langCodeToName, langSortCmp } from 'util/language'; -import { makeToaster } from 'components/Toast'; -import LoadingPlaceholder from 'components/LoadingPlaceholder'; +import { makeToaster } from 'components/util/Toast'; +import LoadingPlaceholder from 'components/util/LoadingPlaceholder'; const allLangs: string[] = []; diff --git a/src/screens/manga/Library.tsx b/src/screens/manga/Library.tsx index 42a9c79a..1244f5ad 100644 --- a/src/screens/manga/Library.tsx +++ b/src/screens/manga/Library.tsx @@ -7,11 +7,11 @@ import { Tab, Tabs } from '@mui/material'; import React, { useContext, useEffect, useState } from 'react'; -import NavbarContext from 'context/NavbarContext'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; import cloneObject from 'util/cloneObject'; -import EmptyView from 'components/EmptyView'; -import LoadingPlaceholder from 'components/LoadingPlaceholder'; +import EmptyView from 'components/util/EmptyView'; +import LoadingPlaceholder from 'components/util/LoadingPlaceholder'; import TabPanel from 'components/util/TabPanel'; import LibraryOptions from '../../components/library/LibraryOptions'; import LibraryMangaGrid from '../../components/library/LibraryMangaGrid'; diff --git a/src/screens/manga/Manga.tsx b/src/screens/manga/Manga.tsx index bd229437..c8830e87 100644 --- a/src/screens/manga/Manga.tsx +++ b/src/screens/manga/Manga.tsx @@ -10,12 +10,12 @@ import { Theme } from '@mui/material/styles'; import makeStyles from '@mui/styles/makeStyles'; import { useParams } from 'react-router-dom'; import { Virtuoso } from 'react-virtuoso'; -import ChapterCard from 'components/manga/ChapterCard'; -import MangaDetails from 'components/manga/MangaDetails'; -import NavbarContext from 'context/NavbarContext'; +import ChapterCard from 'components/ChapterCard'; +import MangaDetails from 'components/MangaDetails'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; -import LoadingPlaceholder from 'components/LoadingPlaceholder'; -import makeToast from 'components/Toast'; +import LoadingPlaceholder from 'components/util/LoadingPlaceholder'; +import makeToast from 'components/util/Toast'; const useStyles = makeStyles((theme: Theme) => ({ root: { diff --git a/src/screens/manga/Reader.tsx b/src/screens/manga/Reader.tsx index a3cb9d27..477761ae 100644 --- a/src/screens/manga/Reader.tsx +++ b/src/screens/manga/Reader.tsx @@ -9,13 +9,13 @@ import CircularProgress from '@mui/material/CircularProgress'; import makeStyles from '@mui/styles/makeStyles'; import React, { useContext, useEffect, useState } from 'react'; import { useHistory, useParams } from 'react-router-dom'; -import HorizontalPager from 'components/manga/reader/pager/HorizontalPager'; -import PageNumber from 'components/manga/reader/PageNumber'; -import PagedPager from 'components/manga/reader/pager/PagedPager'; -import DoublePagedPager from 'components/manga/reader/pager/DoublePagedPager'; -import VerticalPager from 'components/manga/reader/pager/VerticalPager'; +import HorizontalPager from 'components/reader/pager/HorizontalPager'; +import PageNumber from 'components/reader/PageNumber'; +import PagedPager from 'components/reader/pager/PagedPager'; +import DoublePagedPager from 'components/reader/pager/DoublePagedPager'; +import VerticalPager from 'components/reader/pager/VerticalPager'; import ReaderNavBar, { defaultReaderSettings } from 'components/navbar/ReaderNavBar'; -import NavbarContext from 'context/NavbarContext'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; import useLocalStorage from 'util/useLocalStorage'; import cloneObject from 'util/cloneObject'; diff --git a/src/screens/manga/SearchSingle.tsx b/src/screens/manga/SearchSingle.tsx index e415c02b..f60eed60 100644 --- a/src/screens/manga/SearchSingle.tsx +++ b/src/screens/manga/SearchSingle.tsx @@ -10,8 +10,8 @@ import makeStyles from '@mui/styles/makeStyles'; import TextField from '@mui/material/TextField'; import Button from '@mui/material/Button'; import { useParams } from 'react-router-dom'; -import MangaGrid from 'components/manga/MangaGrid'; -import NavbarContext from 'context/NavbarContext'; +import MangaGrid from 'components/MangaGrid'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; const useStyles = makeStyles((theme) => ({ diff --git a/src/screens/manga/SourceConfigure.tsx b/src/screens/manga/SourceConfigure.tsx index 90828a8e..a46163d7 100644 --- a/src/screens/manga/SourceConfigure.tsx +++ b/src/screens/manga/SourceConfigure.tsx @@ -6,12 +6,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import React, { useContext, useEffect, useState } from 'react'; -import NavbarContext from 'context/NavbarContext'; +import NavbarContext from 'components/context/NavbarContext'; import { useParams } from 'react-router-dom'; import client from 'util/client'; -import { SwitchPreferenceCompat, CheckBoxPreference } from 'components/manga/sourceConfiguration/TwoStatePreference'; -import ListPreference from 'components/manga/sourceConfiguration/ListPreference'; -import EditTextPreference from 'components/manga/sourceConfiguration/EditTextPreference'; +import { SwitchPreferenceCompat, CheckBoxPreference } from 'components/sourceConfiguration/TwoStatePreference'; +import ListPreference from 'components/sourceConfiguration/ListPreference'; +import EditTextPreference from 'components/sourceConfiguration/EditTextPreference'; import List from '@mui/material/List'; import cloneObject from 'util/cloneObject'; diff --git a/src/screens/manga/SourceMangas.tsx b/src/screens/manga/SourceMangas.tsx index 935dfcfe..73ca2581 100644 --- a/src/screens/manga/SourceMangas.tsx +++ b/src/screens/manga/SourceMangas.tsx @@ -8,8 +8,8 @@ import React, { useContext, useEffect, useState } from 'react'; import { useParams, useHistory } from 'react-router-dom'; import IconButton from '@mui/material/IconButton'; -import MangaGrid from 'components/manga/MangaGrid'; -import NavbarContext from 'context/NavbarContext'; +import MangaGrid from 'components/MangaGrid'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; import SettingsIcon from '@mui/icons-material/Settings'; diff --git a/src/screens/manga/Sources.tsx b/src/screens/manga/Sources.tsx index 8ea90525..7ea0dd70 100644 --- a/src/screens/manga/Sources.tsx +++ b/src/screens/manga/Sources.tsx @@ -6,15 +6,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import React, { useContext, useEffect, useState } from 'react'; -import LangSelect from 'components/manga/LangSelect'; -import SourceCard from 'components/manga/SourceCard'; -import NavbarContext from 'context/NavbarContext'; +import LangSelect from 'components/navbar/action/LangSelect'; +import SourceCard from 'components/SourceCard'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; import { sourceDefualtLangs, sourceForcedDefaultLangs, langCodeToName, langSortCmp, } from 'util/language'; import useLocalStorage from 'util/useLocalStorage'; -import LoadingPlaceholder from 'components/LoadingPlaceholder'; +import LoadingPlaceholder from 'components/util/LoadingPlaceholder'; function sourceToLangList(sources: ISource[]) { const result: string[] = []; diff --git a/src/screens/manga/Updates.tsx b/src/screens/manga/Updates.tsx index 3d850a85..e6f14061 100644 --- a/src/screens/manga/Updates.tsx +++ b/src/screens/manga/Updates.tsx @@ -17,7 +17,7 @@ import IconButton from '@mui/material/IconButton'; import DownloadIcon from '@mui/icons-material/Download'; import Avatar from '@mui/material/Avatar'; import Typography from '@mui/material/Typography'; -import NavbarContext from 'context/NavbarContext'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; import useLocalStorage from 'util/useLocalStorage'; diff --git a/src/screens/settings/About.tsx b/src/screens/settings/About.tsx index 37358cf7..7a35ab4c 100644 --- a/src/screens/settings/About.tsx +++ b/src/screens/settings/About.tsx @@ -6,7 +6,7 @@ import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; import client from '../../util/client'; import ListItemLink from '../../components/util/ListItemLink'; -import NavbarContext from '../../context/NavbarContext'; +import NavbarContext from '../../components/context/NavbarContext'; const useStyles = makeStyles({ loading: { diff --git a/src/screens/settings/Backup.tsx b/src/screens/settings/Backup.tsx index b1fd23f8..18ef65b1 100644 --- a/src/screens/settings/Backup.tsx +++ b/src/screens/settings/Backup.tsx @@ -10,9 +10,9 @@ import List from '@mui/material/List'; import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; import { fromEvent } from 'file-selector'; -import makeToast from 'components/Toast'; +import makeToast from 'components/util/Toast'; import ListItemLink from '../../components/util/ListItemLink'; -import NavbarContext from '../../context/NavbarContext'; +import NavbarContext from '../../components/context/NavbarContext'; import client from '../../util/client'; export default function Backup() { diff --git a/src/screens/settings/Categories.tsx b/src/screens/settings/Categories.tsx index 8eda5aff..4a432e59 100644 --- a/src/screens/settings/Categories.tsx +++ b/src/screens/settings/Categories.tsx @@ -33,7 +33,7 @@ import DialogContent from '@mui/material/DialogContent'; import DialogTitle from '@mui/material/DialogTitle'; import Checkbox from '@mui/material/Checkbox'; import FormControlLabel from '@mui/material/FormControlLabel'; -import NavbarContext from 'context/NavbarContext'; +import NavbarContext from 'components/context/NavbarContext'; import client from 'util/client'; const getItemStyle = (isDragging: boolean,