diff --git a/package.json b/package.json index 2e35624403..19f2485eb6 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "@mui/system": "^5.0.6", "axios": "^0.21.1", "file-selector": "^0.2.4", - "p-queue": "^7.2.0", "query-string": "^7.0.1", "react": "^17.0.2", "react-beautiful-dnd": "^13.0.0", diff --git a/src/App.tsx b/src/App.tsx index f4cd6886fb..367e852a63 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -40,7 +40,6 @@ import Sources from 'screens/Sources'; import Extensions from 'screens/Extensions'; import NavBarContextProvider from 'components/navbar/NavBarContextProvider'; import LibraryOptionsContextProvider from 'components/library/LibraryOptionsProvider'; -import SearchAll from 'screens/SearchAll'; declare module '@mui/styles/defaultTheme' { // eslint-disable-next-line @typescript-eslint/no-empty-interface @@ -140,9 +139,6 @@ export default function App() { - - - diff --git a/src/components/MangaGrid.tsx b/src/components/MangaGrid.tsx index c139f32717..7917980984 100644 --- a/src/components/MangaGrid.tsx +++ b/src/components/MangaGrid.tsx @@ -9,8 +9,6 @@ import React, { useEffect, useRef } from 'react'; import Grid from '@mui/material/Grid'; import EmptyView from 'components/util/EmptyView'; import LoadingPlaceholder from 'components/util/LoadingPlaceholder'; -import { Typography } from '@mui/material'; -import { Box } from '@mui/system'; import MangaCard from './MangaCard'; export interface IMangaGridProps{ @@ -22,14 +20,12 @@ export interface IMangaGridProps{ lastPageNum: number setLastPageNum: (lastPageNum: number) => void gridLayout?: number | undefined - horisontal?: boolean | undefined - noFaces?: boolean | undefined } export default function MangaGrid(props: IMangaGridProps) { const { mangas, isLoading, message, messageExtra, - hasNextPage, lastPageNum, setLastPageNum, gridLayout, horisontal, noFaces, + hasNextPage, lastPageNum, setLastPageNum, gridLayout, } = props; let mapped; const lastManga = useRef(null); @@ -55,18 +51,7 @@ export default function MangaGrid(props: IMangaGridProps) { ); } else { - mapped = noFaces ? ( - - - {message} - - {messageExtra} - - ) : ( + mapped = ( ); } @@ -93,22 +78,7 @@ export default function MangaGrid(props: IMangaGridProps) { } return ( - + {mapped} ); diff --git a/src/components/util/AppbarSearch.tsx b/src/components/util/AppbarSearch.tsx index 8d24071050..347e0aa057 100644 --- a/src/components/util/AppbarSearch.tsx +++ b/src/components/util/AppbarSearch.tsx @@ -12,16 +12,7 @@ import { IconButton, Input } from '@mui/material'; import CancelIcon from '@mui/icons-material/Cancel'; import { useQueryParam, StringParam } from 'use-query-params'; -interface IProps { - autoOpen?: boolean -} - -const defaultProps = { - autoOpen: false, -}; - -const AppbarSearch: React.FunctionComponent = (props) => { - const { autoOpen } = props; +export default function AppbarSearch() { const [query, setQuery] = useQueryParam('query', StringParam); const [searchOpen, setSearchOpen] = useState(!!query); const inputRef = React.useRef(); @@ -49,12 +40,6 @@ const AppbarSearch: React.FunctionComponent = (props) => { } }; - useEffect(() => { - if (autoOpen) { - openSearch(); - } - }, []); - useEffect(() => { window.addEventListener('keydown', handleSearchShortcut); @@ -87,8 +72,4 @@ const AppbarSearch: React.FunctionComponent = (props) => { )} ); -}; - -AppbarSearch.defaultProps = defaultProps; - -export default AppbarSearch; +} diff --git a/src/screens/SearchAll.tsx b/src/screens/SearchAll.tsx deleted file mode 100644 index 8cb1eadcd8..0000000000 --- a/src/screens/SearchAll.tsx +++ /dev/null @@ -1,224 +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 { Card } from '@mui/material'; -import { useHistory } from 'react-router-dom'; -import NavbarContext from 'components/context/NavbarContext'; -import MangaGrid from 'components/MangaGrid'; -import LangSelect from 'components/navbar/action/LangSelect'; -import AppbarSearch from 'components/util/AppbarSearch'; -import React, { useContext, useEffect, useState } from 'react'; -import { useQueryParam, StringParam } from 'use-query-params'; -import client from 'util/client'; -import { - langCodeToName, langSortCmp, sourceDefualtLangs, sourceForcedDefaultLangs, -} from 'util/language'; -import useLocalStorage from 'util/useLocalStorage'; -import PQueue from 'p-queue/dist/index'; - -function sourceToLangList(sources: ISource[]) { - const result: string[] = []; - - sources.forEach((source) => { - if (result.indexOf(source.lang) === -1) { result.push(source.lang); } - }); - - result.sort(langSortCmp); - return result; -} - -export default function SearchAll() { - const [query] = useQueryParam('query', StringParam); - const { setTitle, setAction } = useContext(NavbarContext); - const [triggerUpdate, setTriggerUpdate] = useState(2); - const [mangas, setMangas] = useState({}); - - const [shownLangs, setShownLangs] = useLocalStorage('shownSourceLangs', sourceDefualtLangs()); - const [showNsfw] = useLocalStorage('showNsfw', true); - - const [sources, setSources] = useState([]); - const [fetched, setFetched] = useState({}); - const [FetchedSources, setFetchedSources] = useState({}); - - const [lastPageNum, setLastPageNum] = useState(1); - - const [ResetUI, setResetUI] = useState(0); - - const limit = new PQueue({ concurrency: 5 }); - - useEffect(() => { - setTitle('Global Search'); - setAction( - <> - - - , - ); - }, []); - - useEffect(() => { - client.get('/api/v1/source/list') - .then((response) => response.data) - .then((data) => { - setSources(data.sort((a: { displayName: string; }, b: { displayName: string; }) => { - if (a.displayName < b.displayName) { return -1; } - if (a.displayName > b.displayName) { return 1; } - return 0; - })); setFetchedSources(true); - }); - }, []); - - async function doIT(elem: any[]) { - elem.map((ele) => limit.add(async () => { - const response = await client.get(`/api/v1/source/${ele.id}/search?searchTerm=${query || ''}&pageNum=1`); - const data = await response.data; - const tmp = mangas; - tmp[ele.id] = data.mangaList; - setMangas(tmp); - const tmp2 = fetched; - tmp2[ele.id] = true; - setFetched(tmp2); - setResetUI(1); - })); - } - - useEffect(() => { - if (triggerUpdate === 2) { - return; - } - if (triggerUpdate === 0) { - setTriggerUpdate(1); - return; - } - setFetched({}); - setMangas({}); - // eslint-disable-next-line max-len - doIT(sources.filter(({ lang }) => shownLangs.indexOf(lang) !== -1).filter((source) => showNsfw || !source.isNsfw)); - }, [triggerUpdate]); - - useEffect(() => { - if (ResetUI === 1) { - setResetUI(0); - } - }, [ResetUI]); - - useEffect(() => { - if (query && FetchedSources) { - const delayDebounceFn = setTimeout(() => { - setTriggerUpdate(0); - }, 1000); - return () => clearTimeout(delayDebounceFn); - } - return () => {}; - }, [query, shownLangs, sources]); - - useEffect(() => { - // make sure all of forcedDefaultLangs() exists in shownLangs - sourceForcedDefaultLangs().forEach((forcedLang) => { - let hasLang = false; - shownLangs.forEach((lang) => { - if (lang === forcedLang) hasLang = true; - }); - if (!hasLang) { - setShownLangs((shownLangsCopy) => { - shownLangsCopy.push(forcedLang); - return shownLangsCopy; - }); - } - }); - }, []); - - useEffect(() => { - setTitle('Sources'); - setAction( - <> - - - , - ); - }, [shownLangs, sources]); - - const history = useHistory(); - - const redirectTo = (e: any, to: string) => { - history.push(to); - - // prevent parent tags from getting the event - e.stopPropagation(); - }; - if (query) { - return ( - <> - {/* eslint-disable-next-line max-len */} - {sources.filter(({ lang }) => shownLangs.indexOf(lang) !== -1).filter((source) => showNsfw || !source.isNsfw).sort((a, b) => { - const af = fetched[a.id]; - const bf = fetched[b.id]; - if (af && !bf) { return -1; } - if (!af && bf) { return 1; } - if (!af && !bf) { return 0; } - - const al = mangas[a.id].length === 0; - const bl = mangas[b.id].length === 0; - if (al && !bl) { return 1; } - if (bl && !al) { return -1; } - return 0; - }).map(({ lang, id, displayName }) => ( - ( - <> - redirectTo(e, `/sources/${id}/popular/?R&query=one`)} - > -

- {displayName} -

-

- {langCodeToName(lang)} -

- - - - ) - ))} - - - ); - } - return (<>); -} diff --git a/src/screens/Sources.tsx b/src/screens/Sources.tsx index 1cd005bb84..7ea0dd700d 100644 --- a/src/screens/Sources.tsx +++ b/src/screens/Sources.tsx @@ -15,9 +15,6 @@ import { } from 'util/language'; import useLocalStorage from 'util/useLocalStorage'; import LoadingPlaceholder from 'components/util/LoadingPlaceholder'; -import { IconButton } from '@mui/material'; -import TravelExploreIcon from '@mui/icons-material/TravelExplore'; -import { useHistory } from 'react-router-dom'; function sourceToLangList(sources: ISource[]) { const result: string[] = []; @@ -49,8 +46,6 @@ export default function Sources() { const [sources, setSources] = useState([]); const [fetched, setFetched] = useState(false); - const history = useHistory(); - useEffect(() => { // make sure all of forcedDefaultLangs() exists in shownLangs sourceForcedDefaultLangs().forEach((forcedLang) => { @@ -70,20 +65,12 @@ export default function Sources() { useEffect(() => { setTitle('Sources'); setAction( - <> - history.push('/sources/all/search/')} - size="large" - > - - - - , + , ); }, [shownLangs, sources]); diff --git a/yarn.lock b/yarn.lock index fb83b2cf31..7c67bab2d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5174,7 +5174,7 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -eventemitter3@^4.0.0, eventemitter3@^4.0.7: +eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== @@ -8369,14 +8369,6 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-queue@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-7.2.0.tgz#e1430e4432f09b43aa8b4913d4c2ff7fdd685479" - integrity sha512-Kvv7p13M46lTYLQ/PsZdaj/1Vj6u/8oiIJgyQyx4oVkOfHdd7M2EZvXigDvcsSzRwanCzQirV5bJPQFoSQt5MA== - dependencies: - eventemitter3 "^4.0.7" - p-timeout "^5.0.2" - p-retry@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" @@ -8384,11 +8376,6 @@ p-retry@^3.0.1: dependencies: retry "^0.12.0" -p-timeout@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.0.2.tgz#d12964c4b2f988e15f72b455c2c428d82a0ec0a0" - integrity sha512-sEmji9Yaq+Tw+STwsGAE56hf7gMy9p0tQfJojIAamB7WHJYJKf1qlsg9jqBWG8q9VCxKPhZaP/AcXwEoBcYQhQ== - p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"