mirror of
https://github.com/jeffvli/feishin.git
synced 2026-05-09 20:29:36 +02:00
revert settings to route instead of modal
This commit is contained in:
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import { useNavigate } from 'react-router';
|
import { useNavigate } from 'react-router';
|
||||||
|
|
||||||
import { Command, CommandPalettePages } from '/@/renderer/features/search/components/command';
|
import { Command, CommandPalettePages } from '/@/renderer/features/search/components/command';
|
||||||
import { openSettingsModal } from '/@/renderer/features/settings/utils/open-settings-modal';
|
|
||||||
import { AppRoute } from '/@/renderer/router/routes';
|
import { AppRoute } from '/@/renderer/router/routes';
|
||||||
|
|
||||||
interface GoToCommandsProps {
|
interface GoToCommandsProps {
|
||||||
@@ -37,10 +36,7 @@ export const GoToCommands = ({ handleClose, setPages, setQuery }: GoToCommandsPr
|
|||||||
</Command.Item>
|
</Command.Item>
|
||||||
<Command.Item
|
<Command.Item
|
||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
openSettingsModal();
|
goTo(AppRoute.SETTINGS);
|
||||||
handleClose();
|
|
||||||
setPages([CommandPalettePages.HOME]);
|
|
||||||
setQuery('');
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{t('page.sidebar.settings', { postProcess: 'titleCase' })}
|
{t('page.sidebar.settings', { postProcess: 'titleCase' })}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { Link, useNavigate } from 'react-router';
|
|||||||
|
|
||||||
import packageJson from '../../../../../package.json';
|
import packageJson from '../../../../../package.json';
|
||||||
|
|
||||||
import { openSettingsModal } from '/@/renderer/features/settings/utils/open-settings-modal';
|
import { AppRoute } from '/@/renderer/router/routes';
|
||||||
import { useAppStore, useAppStoreActions } from '/@/renderer/store';
|
import { useAppStore, useAppStoreActions } from '/@/renderer/store';
|
||||||
import { DropdownMenu, MenuItemProps } from '/@/shared/components/dropdown-menu/dropdown-menu';
|
import { DropdownMenu, MenuItemProps } from '/@/shared/components/dropdown-menu/dropdown-menu';
|
||||||
import { Icon } from '/@/shared/components/icon/icon';
|
import { Icon } from '/@/shared/components/icon/icon';
|
||||||
@@ -184,7 +184,7 @@ export const AppMenu = () => {
|
|||||||
icon: 'settings',
|
icon: 'settings',
|
||||||
id: 'settings',
|
id: 'settings',
|
||||||
label: t('page.appMenu.settings', { postProcess: 'sentenceCase' }),
|
label: t('page.appMenu.settings', { postProcess: 'sentenceCase' }),
|
||||||
onClick: openSettingsModal,
|
onClick: () => navigate(AppRoute.SETTINGS),
|
||||||
type: 'item',
|
type: 'item',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -72,6 +72,8 @@ const SearchRoute = lazy(() => import('/@/renderer/features/search/routes/search
|
|||||||
|
|
||||||
const FavoritesRoute = lazy(() => import('/@/renderer/features/favorites/routes/favorites-route'));
|
const FavoritesRoute = lazy(() => import('/@/renderer/features/favorites/routes/favorites-route'));
|
||||||
|
|
||||||
|
const SettingsRoute = lazy(() => import('/@/renderer/features/settings/routes/settings-route'));
|
||||||
|
|
||||||
export const AppRouter = () => {
|
export const AppRouter = () => {
|
||||||
const router = (
|
const router = (
|
||||||
<HashRouter>
|
<HashRouter>
|
||||||
@@ -93,6 +95,7 @@ export const AppRouter = () => {
|
|||||||
<Route element={<HomeRoute />} path={AppRoute.HOME} />
|
<Route element={<HomeRoute />} path={AppRoute.HOME} />
|
||||||
<Route element={<SearchRoute />} path={AppRoute.SEARCH} />
|
<Route element={<SearchRoute />} path={AppRoute.SEARCH} />
|
||||||
<Route element={<FavoritesRoute />} path={AppRoute.FAVORITES} />
|
<Route element={<FavoritesRoute />} path={AppRoute.FAVORITES} />
|
||||||
|
<Route element={<SettingsRoute />} path={AppRoute.SETTINGS} />
|
||||||
<Route
|
<Route
|
||||||
element={<NowPlayingRoute />}
|
element={<NowPlayingRoute />}
|
||||||
path={AppRoute.NOW_PLAYING}
|
path={AppRoute.NOW_PLAYING}
|
||||||
|
|||||||
Reference in New Issue
Block a user