mirror of
https://github.com/jeffvli/feishin.git
synced 2026-06-20 11:03:06 +02:00
move player context and audioplayers inside of router
This commit is contained in:
@@ -11,8 +11,6 @@ import { useEffect, useMemo, useRef, useState } from 'react';
|
|||||||
|
|
||||||
import i18n from '/@/i18n/i18n';
|
import i18n from '/@/i18n/i18n';
|
||||||
import { useDiscordRpc } from '/@/renderer/features/discord-rpc/use-discord-rpc';
|
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 { WebAudioContext } from '/@/renderer/features/player/context/webaudio-context';
|
||||||
import { useServerVersion } from '/@/renderer/hooks/use-server-version';
|
import { useServerVersion } from '/@/renderer/hooks/use-server-version';
|
||||||
import { IsUpdatedDialog } from '/@/renderer/is-updated-dialog';
|
import { IsUpdatedDialog } from '/@/renderer/is-updated-dialog';
|
||||||
@@ -86,10 +84,7 @@ export const App = () => {
|
|||||||
zIndex={50000}
|
zIndex={50000}
|
||||||
/>
|
/>
|
||||||
<WebAudioContext.Provider value={webAudioProvider}>
|
<WebAudioContext.Provider value={webAudioProvider}>
|
||||||
<PlayerProvider>
|
|
||||||
<AppRouter />
|
<AppRouter />
|
||||||
<AudioPlayers />
|
|
||||||
</PlayerProvider>
|
|
||||||
</WebAudioContext.Provider>
|
</WebAudioContext.Provider>
|
||||||
<IsUpdatedDialog />
|
<IsUpdatedDialog />
|
||||||
</MantineProvider>
|
</MantineProvider>
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import { lazy, Suspense } from 'react';
|
|||||||
import { HashRouter, Route, Routes } from 'react-router';
|
import { HashRouter, Route, Routes } from 'react-router';
|
||||||
|
|
||||||
import { RouterErrorBoundary } from '/@/renderer/components/error-boundary/router-error-boundary';
|
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 { AddToPlaylistContextModal } from '/@/renderer/features/playlists/components/add-to-playlist-context-modal';
|
||||||
import { ShareItemContextModal } from '/@/renderer/features/sharing/components/share-item-context-modal';
|
import { ShareItemContextModal } from '/@/renderer/features/sharing/components/share-item-context-modal';
|
||||||
import { ResponsiveLayout } from '/@/renderer/layouts/responsive-layout';
|
import { ResponsiveLayout } from '/@/renderer/layouts/responsive-layout';
|
||||||
@@ -74,6 +76,8 @@ export const AppRouter = () => {
|
|||||||
const router = (
|
const router = (
|
||||||
<HashRouter>
|
<HashRouter>
|
||||||
<RouterErrorBoundary>
|
<RouterErrorBoundary>
|
||||||
|
<PlayerProvider>
|
||||||
|
<AudioPlayers />
|
||||||
<ModalsProvider
|
<ModalsProvider
|
||||||
modals={{
|
modals={{
|
||||||
addToPlaylist: AddToPlaylistContextModal,
|
addToPlaylist: AddToPlaylistContextModal,
|
||||||
@@ -83,7 +87,10 @@ export const AppRouter = () => {
|
|||||||
>
|
>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route element={<TitlebarOutlet />}>
|
<Route element={<TitlebarOutlet />}>
|
||||||
<Route element={<AppOutlet />} errorElement={<RouteErrorBoundary />}>
|
<Route
|
||||||
|
element={<AppOutlet />}
|
||||||
|
errorElement={<RouteErrorBoundary />}
|
||||||
|
>
|
||||||
<Route element={<ResponsiveLayout />}>
|
<Route element={<ResponsiveLayout />}>
|
||||||
<Route
|
<Route
|
||||||
element={<HomeRoute />}
|
element={<HomeRoute />}
|
||||||
@@ -190,7 +197,9 @@ export const AppRouter = () => {
|
|||||||
/>
|
/>
|
||||||
<Route
|
<Route
|
||||||
element={<SongListRoute />}
|
element={<SongListRoute />}
|
||||||
path={AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_SONGS}
|
path={
|
||||||
|
AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_SONGS
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
<Route
|
<Route
|
||||||
element={<AlbumArtistDetailTopSongsListRoute />}
|
element={<AlbumArtistDetailTopSongsListRoute />}
|
||||||
@@ -215,6 +224,7 @@ export const AppRouter = () => {
|
|||||||
</Route>
|
</Route>
|
||||||
</Routes>
|
</Routes>
|
||||||
</ModalsProvider>
|
</ModalsProvider>
|
||||||
|
</PlayerProvider>
|
||||||
</RouterErrorBoundary>
|
</RouterErrorBoundary>
|
||||||
</HashRouter>
|
</HashRouter>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user