pogmommy/feishin
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-order app menu

Browse source 
- Move version number to menu
- Add link to github
This commit is contained in:
jeffvli 2023-05-14 02:01:37 -07:00
parent 2399105f6c
commit 684ba13175
2 changed files with 50 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/features/settings/components/settings-header.tsx
View file

@ -3,7 +3,6 @@ import { closeAllModals, openModal } from '@mantine/modals';
import { RiSettings2Fill } from 'react-icons/ri';
import { Button, ConfirmModal, PageHeader } from '/@/renderer/components';
import { LibraryHeaderBar } from '/@/renderer/features/shared';
import packageJson from '../../../../../package.json';
import { useSettingsStoreActions } from '../../../store/settings.store';
export const SettingsHeader = () => {
@ -33,7 +32,6 @@ export const SettingsHeader = () => {
<Group noWrap>
<RiSettings2Fill size="2rem" />
<LibraryHeaderBar.Title>Settings</LibraryHeaderBar.Title>
<LibraryHeaderBar.Badge>v{packageJson.version}</LibraryHeaderBar.Badge>
</Group>
<Button
compact

86
src/renderer/features/titlebar/components/app-menu.tsx
View file

@ -11,6 +11,8 @@ import {
RiEdit2Line,
RiSettings3Line,
RiServerLine,
RiGithubLine,
RiExternalLinkLine,
} from 'react-icons/ri';
import { useNavigate } from 'react-router';
import { Link } from 'react-router-dom';
@ -26,6 +28,7 @@ import {
useAppStoreActions,
} from '/@/renderer/store';
import { ServerListItem, ServerType } from '/@/renderer/types';
import packageJson from '../../../../../package.json';
const browser = isElectron() ? window.electron.browser : null;
@ -79,42 +82,6 @@ export const AppMenu = () => {
return (
<>
<DropdownMenu.Label>Select a server</DropdownMenu.Label>
{Object.keys(serverList).map((serverId) => {
const server = serverList[serverId];
const isNavidromeExpired = server.type === ServerType.NAVIDROME && !server.ndCredential;
const isJellyfinExpired = false;
const isSessionExpired = isNavidromeExpired || isJellyfinExpired;
return (
<DropdownMenu.Item
key={`server-${server.id}`}
$isActive={server.id === currentServer?.id}
icon={isSessionExpired ? <RiLockLine color="var(--danger-color)" /> : <RiServerLine />}
onClick={() => {
if (!isSessionExpired) return handleSetCurrentServer(server);
return handleCredentialsModal(server);
}}
>
<Group>{server.name}</Group>
</DropdownMenu.Item>
);
})}
<DropdownMenu.Divider />
<DropdownMenu.Item
icon={<RiEdit2Line />}
onClick={handleManageServersModal}
>
Manage servers
</DropdownMenu.Item>
<DropdownMenu.Item
component={Link}
icon={<RiSettings3Line />}
to={AppRoute.SETTINGS}
>
Settings
</DropdownMenu.Item>
<DropdownMenu.Divider />
<DropdownMenu.Item
icon={<RiArrowLeftSLine />}
onClick={() => navigate(-1)}
@ -142,6 +109,53 @@ export const AppMenu = () => {
Collapse sidebar
</DropdownMenu.Item>
)}
<DropdownMenu.Divider />
<DropdownMenu.Item
component={Link}
icon={<RiSettings3Line />}
to={AppRoute.SETTINGS}
>
Settings
</DropdownMenu.Item>
<DropdownMenu.Item
icon={<RiEdit2Line />}
onClick={handleManageServersModal}
>
Manage servers
</DropdownMenu.Item>
<DropdownMenu.Divider />
<DropdownMenu.Label>Select a server</DropdownMenu.Label>
{Object.keys(serverList).map((serverId) => {
const server = serverList[serverId];
const isNavidromeExpired = server.type === ServerType.NAVIDROME && !server.ndCredential;
const isJellyfinExpired = false;
const isSessionExpired = isNavidromeExpired || isJellyfinExpired;
return (
<DropdownMenu.Item
key={`server-${server.id}`}
$isActive={server.id === currentServer?.id}
icon={isSessionExpired ? <RiLockLine color="var(--danger-color)" /> : <RiServerLine />}
onClick={() => {
if (!isSessionExpired) return handleSetCurrentServer(server);
return handleCredentialsModal(server);
}}
>
<Group>{server.name}</Group>
</DropdownMenu.Item>
);
})}
<DropdownMenu.Divider />
<DropdownMenu.Item
component="a"
href="https://github.com/jeffvli/feishin/releases"
icon={<RiGithubLine />}
rightSection={<RiExternalLinkLine />}
target="_blank"
>
Version {packageJson.version}
</DropdownMenu.Item>
{showBrowserDevToolsButton && (
<>
<DropdownMenu.Divider />