mirror of
https://github.com/jeffvli/feishin.git
synced 2026-05-10 04:30:25 +02:00
move settings page back into modal
This commit is contained in:
@@ -3,6 +3,7 @@ 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 {
|
||||||
@@ -36,7 +37,7 @@ export const GoToCommands = ({ handleClose, setPages, setQuery }: GoToCommandsPr
|
|||||||
</Command.Item>
|
</Command.Item>
|
||||||
<Command.Item
|
<Command.Item
|
||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
goTo(AppRoute.SETTINGS);
|
openSettingsModal();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{t('page.sidebar.settings', { postProcess: 'titleCase' })}
|
{t('page.sidebar.settings', { postProcess: 'titleCase' })}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export const SettingsHeader = ({ setSearch }: SettingsHeaderProps) => {
|
|||||||
return (
|
return (
|
||||||
<Flex>
|
<Flex>
|
||||||
<PageHeader>
|
<PageHeader>
|
||||||
<LibraryHeaderBar ignoreMaxWidth>
|
<LibraryHeaderBar>
|
||||||
<Flex align="center" justify="space-between" w="100%">
|
<Flex align="center" justify="space-between" w="100%">
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
<Icon icon="settings" size="5xl" />
|
<Icon icon="settings" size="5xl" />
|
||||||
|
|||||||
@@ -10,9 +10,8 @@ export const openSettingsModal = () => {
|
|||||||
size: '2xl',
|
size: '2xl',
|
||||||
styles: {
|
styles: {
|
||||||
content: {
|
content: {
|
||||||
height: '80%',
|
height: '100%',
|
||||||
maxWidth: '960px',
|
maxWidth: 'var(--theme-content-max-width)',
|
||||||
minHeight: '540px',
|
|
||||||
width: '100%',
|
width: '100%',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { Link, useNavigate } from 'react-router';
|
|||||||
import packageJson from '../../../../../package.json';
|
import packageJson from '../../../../../package.json';
|
||||||
|
|
||||||
import { ServerList } from '/@/renderer/features/servers/components/server-list';
|
import { ServerList } from '/@/renderer/features/servers/components/server-list';
|
||||||
import { AppRoute } from '/@/renderer/router/routes';
|
import { openSettingsModal } from '/@/renderer/features/settings/utils/open-settings-modal';
|
||||||
import { useAppStore, useAppStoreActions, useCommandPalette } from '/@/renderer/store';
|
import { useAppStore, useAppStoreActions, useCommandPalette } 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';
|
||||||
@@ -195,7 +195,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: () => navigate(AppRoute.SETTINGS),
|
onClick: () => openSettingsModal(),
|
||||||
type: 'item',
|
type: 'item',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user