diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx index 3f817c178..9ec15f85b 100644 --- a/src/renderer/app.tsx +++ b/src/renderer/app.tsx @@ -11,8 +11,6 @@ import { useEffect, useMemo, useRef, useState } from 'react'; import i18n from '/@/i18n/i18n'; import { useDiscordRpc } from '/@/renderer/features/discord-rpc/use-discord-rpc'; -import { AudioPlayers } from '/@/renderer/features/player/components/audio-players'; -import { PlayerProvider } from '/@/renderer/features/player/context/player-context'; import { WebAudioContext } from '/@/renderer/features/player/context/webaudio-context'; import { useServerVersion } from '/@/renderer/hooks/use-server-version'; import { IsUpdatedDialog } from '/@/renderer/is-updated-dialog'; @@ -86,10 +84,7 @@ export const App = () => { zIndex={50000} /> - - - - + diff --git a/src/renderer/router/app-router.tsx b/src/renderer/router/app-router.tsx index 60a44aebe..d4e81186a 100644 --- a/src/renderer/router/app-router.tsx +++ b/src/renderer/router/app-router.tsx @@ -2,6 +2,8 @@ import { lazy, Suspense } from 'react'; import { HashRouter, Route, Routes } from 'react-router'; import { RouterErrorBoundary } from '/@/renderer/components/error-boundary/router-error-boundary'; +import { AudioPlayers } from '/@/renderer/features/player/components/audio-players'; +import { PlayerProvider } from '/@/renderer/features/player/context/player-context'; import { AddToPlaylistContextModal } from '/@/renderer/features/playlists/components/add-to-playlist-context-modal'; import { ShareItemContextModal } from '/@/renderer/features/sharing/components/share-item-context-modal'; import { ResponsiveLayout } from '/@/renderer/layouts/responsive-layout'; @@ -74,147 +76,155 @@ export const AppRouter = () => { const router = ( - - - }> - } errorElement={}> - }> - } - errorElement={} - index - /> - } - errorElement={} - path={AppRoute.HOME} - /> - } - errorElement={} - path={AppRoute.SEARCH} - /> - } - errorElement={} - path={AppRoute.SETTINGS} - /> - } - errorElement={} - path={AppRoute.NOW_PLAYING} - /> - + + + + + }> + } + errorElement={} + > + }> } + element={} errorElement={} index /> } - path={AppRoute.LIBRARY_GENRES_ALBUMS} + element={} + errorElement={} + path={AppRoute.HOME} /> } - path={AppRoute.LIBRARY_GENRES_SONGS} - /> - - } - errorElement={} - path={AppRoute.LIBRARY_ALBUMS} - /> - } - errorElement={} - path={AppRoute.LIBRARY_ALBUMS_DETAIL} - /> - } - errorElement={} - path={AppRoute.LIBRARY_ARTISTS} - /> - - } index /> - } - path={AppRoute.LIBRARY_ARTISTS_DETAIL_DISCOGRAPHY} + element={} + errorElement={} + path={AppRoute.SEARCH} /> } - path={AppRoute.LIBRARY_ARTISTS_DETAIL_SONGS} + element={} + errorElement={} + path={AppRoute.SETTINGS} /> } - path={AppRoute.LIBRARY_ARTISTS_DETAIL_TOP_SONGS} + element={} + errorElement={} + path={AppRoute.NOW_PLAYING} /> - - } - errorElement={} - path={AppRoute.FAKE_LIBRARY_ALBUM_DETAILS} - /> - } - errorElement={} - path={AppRoute.LIBRARY_SONGS} - /> - } - errorElement={} - path={AppRoute.PLAYLISTS} - /> - } - errorElement={} - path={AppRoute.PLAYLISTS_DETAIL_SONGS} - /> - } - path={AppRoute.LIBRARY_ALBUM_ARTISTS} - > - } index /> - - } index /> + + } + errorElement={} + index + /> } - path={ - AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_DISCOGRAPHY - } + path={AppRoute.LIBRARY_GENRES_ALBUMS} /> } - path={AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_SONGS} + path={AppRoute.LIBRARY_GENRES_SONGS} + /> + + } + errorElement={} + path={AppRoute.LIBRARY_ALBUMS} + /> + } + errorElement={} + path={AppRoute.LIBRARY_ALBUMS_DETAIL} + /> + } + errorElement={} + path={AppRoute.LIBRARY_ARTISTS} + /> + + } index /> + } + path={AppRoute.LIBRARY_ARTISTS_DETAIL_DISCOGRAPHY} + /> + } + path={AppRoute.LIBRARY_ARTISTS_DETAIL_SONGS} /> } - path={ - AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_TOP_SONGS - } + path={AppRoute.LIBRARY_ARTISTS_DETAIL_TOP_SONGS} /> + } + errorElement={} + path={AppRoute.FAKE_LIBRARY_ALBUM_DETAILS} + /> + } + errorElement={} + path={AppRoute.LIBRARY_SONGS} + /> + } + errorElement={} + path={AppRoute.PLAYLISTS} + /> + } + errorElement={} + path={AppRoute.PLAYLISTS_DETAIL_SONGS} + /> + } + path={AppRoute.LIBRARY_ALBUM_ARTISTS} + > + } index /> + + } index /> + } + path={ + AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_DISCOGRAPHY + } + /> + } + path={ + AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_SONGS + } + /> + } + path={ + AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_TOP_SONGS + } + /> + + + } path="*" /> - } path="*" /> - - }> - }> - } - path={AppRoute.ACTION_REQUIRED} - /> - } path={AppRoute.LOGIN} /> + }> + }> + } + path={AppRoute.ACTION_REQUIRED} + /> + } path={AppRoute.LOGIN} /> + - - - + + + );