Fix/remove deprecated routes (#747)

* Route to "/" in case path is unknown

* Remove deprecated routes

"sources" and "extensions" were merged into "browse" but the routes were never removed, thus, the paths still matched and opened the components
This commit is contained in:
schroda
2024-04-14 18:08:15 +02:00
committed by GitHub
parent 6276da42cf
commit 8178574815
3 changed files with 4 additions and 6 deletions

View File

@@ -14,7 +14,6 @@ import { loadErrorMessages, loadDevMessages } from '@apollo/client/dev';
import { AppContext } from '@/components/context/AppContext'; import { AppContext } from '@/components/context/AppContext';
import { Browse } from '@/screens/Browse'; import { Browse } from '@/screens/Browse';
import { DownloadQueue } from '@/screens/DownloadQueue'; import { DownloadQueue } from '@/screens/DownloadQueue';
import { Extensions } from '@/screens/Extensions';
import { Library } from '@/screens/Library'; import { Library } from '@/screens/Library';
import { Manga } from '@/screens/Manga'; import { Manga } from '@/screens/Manga';
import { Reader } from '@/screens/Reader'; import { Reader } from '@/screens/Reader';
@@ -26,7 +25,6 @@ import { Categories } from '@/screens/settings/Categories';
import { DefaultReaderSettings } from '@/screens/settings/DefaultReaderSettings'; import { DefaultReaderSettings } from '@/screens/settings/DefaultReaderSettings';
import { SourceConfigure } from '@/screens/SourceConfigure'; import { SourceConfigure } from '@/screens/SourceConfigure';
import { SourceMangas } from '@/screens/SourceMangas'; import { SourceMangas } from '@/screens/SourceMangas';
import { Sources } from '@/screens/Sources';
import { Updates } from '@/screens/Updates'; import { Updates } from '@/screens/Updates';
import '@/i18n'; import '@/i18n';
import { LibrarySettings } from '@/screens/settings/LibrarySettings'; import { LibrarySettings } from '@/screens/settings/LibrarySettings';
@@ -94,6 +92,7 @@ export const App: React.FC = () => (
<Routes> <Routes>
{/* General Routes */} {/* General Routes */}
<Route path="/" element={<Navigate to="/library" replace />} /> <Route path="/" element={<Navigate to="/library" replace />} />
<Route path="*" element={<Navigate to="/" replace />} />
<Route path="settings"> <Route path="settings">
<Route index element={<Settings />} /> <Route index element={<Settings />} />
<Route path="about" element={<About />} /> <Route path="about" element={<About />} />
@@ -112,7 +111,7 @@ export const App: React.FC = () => (
{/* Manga Routes */} {/* Manga Routes */}
<Route path="sources"> <Route path="sources">
<Route index element={<Sources />} /> <Route index element={<Navigate to="/" replace />} />
<Route path=":sourceId" element={<SourceMangas />} /> <Route path=":sourceId" element={<SourceMangas />} />
<Route path=":sourceId/configure/" element={<SourceConfigure />} /> <Route path=":sourceId/configure/" element={<SourceConfigure />} />
<Route path="all/search/" element={<SearchAll />} /> <Route path="all/search/" element={<SearchAll />} />
@@ -124,7 +123,6 @@ export const App: React.FC = () => (
</Route> </Route>
<Route path="library" element={<Library />} /> <Route path="library" element={<Library />} />
<Route path="updates" element={<Updates />} /> <Route path="updates" element={<Updates />} />
<Route path="extensions" element={<Extensions />} />
<Route path="browse" element={<Browse />} /> <Route path="browse" element={<Browse />} />
<Route path="migrate/source/:sourceId"> <Route path="migrate/source/:sourceId">
<Route index element={<Migrate />} /> <Route index element={<Migrate />} />

View File

@@ -166,7 +166,7 @@ export const SearchAll: React.FC = () => {
const { setTitle, setAction } = useContext(NavBarContext); const { setTitle, setAction } = useContext(NavBarContext);
useSetDefaultBackTo('sources'); useSetDefaultBackTo('browse');
const { pathname, state } = useLocation<{ mangaTitle?: string }>(); const { pathname, state } = useLocation<{ mangaTitle?: string }>();
const isMigrateMode = pathname.startsWith('/migrate/source'); const isMigrateMode = pathname.startsWith('/migrate/source');

View File

@@ -225,7 +225,7 @@ export function SourceMangas() {
clearCache: boolean; clearCache: boolean;
}>().state ?? {}; }>().state ?? {};
useSetDefaultBackTo('sources'); useSetDefaultBackTo('browse');
const [isFirstRender, setIsFirstRender] = useState(true); const [isFirstRender, setIsFirstRender] = useState(true);