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

Various cleanup/fixes

Browse source
This commit is contained in:
jeffvli 2024-03-05 14:15:32 -08:00
parent a7a5b92011
commit 613bfa7ae6
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/renderer/features/servers/components/add-server-form.tsx
View file

@ -6,7 +6,7 @@ import { useFocusTrap } from '@mantine/hooks';
import { closeAllModals } from '@mantine/modals'; import { closeAllModals } from '@mantine/modals';
import isElectron from 'is-electron'; import isElectron from 'is-electron';
import { nanoid } from 'nanoid/non-secure'; import { nanoid } from 'nanoid/non-secure';
import { AuthenticationResponse, ServerType } from '/@/renderer/api/types'; import { AuthenticationResponse } from '/@/renderer/api/types';
import { useAuthStoreActions } from '/@/renderer/store'; import { useAuthStoreActions } from '/@/renderer/store';
import { ServerType, toServerType } from '/@/renderer/types'; import { ServerType, toServerType } from '/@/renderer/types';
import { api } from '/@/renderer/api'; import { api } from '/@/renderer/api';
@ -129,13 +129,13 @@ export const AddServerForm = ({ onCancel }: AddServerFormProps) => {
> >
<SegmentedControl <SegmentedControl
data={SERVER_TYPES} data={SERVER_TYPES}
disabled={serverLock} disabled={Boolean(serverLock)}
{...form.getInputProps('type')} {...form.getInputProps('type')}
/> />
<Group grow> <Group grow>
<TextInput <TextInput
data-autofocus data-autofocus
disabled={serverLock} disabled={Boolean(serverLock)}
label={t('form.addServer.input', { label={t('form.addServer.input', {
context: 'name', context: 'name',
postProcess: 'titleCase', postProcess: 'titleCase',
@ -143,7 +143,7 @@ export const AddServerForm = ({ onCancel }: AddServerFormProps) => {
{...form.getInputProps('name')} {...form.getInputProps('name')}
/> />
<TextInput <TextInput
disabled={serverLock} disabled={Boolean(serverLock)}
label={t('form.addServer.input', { label={t('form.addServer.input', {
context: 'url', context: 'url',
postProcess: 'titleCase', postProcess: 'titleCase',

8
src/renderer/features/window-controls/components/window-controls.tsx
View file

@ -35,13 +35,13 @@ export const WindowsButton = styled.div<{ $exit?: boolean }>`
} }
`; `;
const close = () => browser.exit(); const close = () => browser?.exit();
const minimize = () => browser.minimize(); const minimize = () => browser?.minimize();
const maximize = () => browser.maximize(); const maximize = () => browser?.maximize();
const unmaximize = () => browser.unmaximize(); const unmaximize = () => browser?.unmaximize();
export const WindowControls = ({ style }: WindowControlsProps) => { export const WindowControls = ({ style }: WindowControlsProps) => {
const [max, setMax] = useState(false); const [max, setMax] = useState(false);

8
src/renderer/layouts/window-bar.tsx
View file

@ -60,10 +60,10 @@ const PlayerStatusContainer = styled.div`
`; `;
const browser = isElectron() ? window.electron.browser : null; const browser = isElectron() ? window.electron.browser : null;
const close = () => browser.exit(); const close = () => browser?.exit();
const minimize = () => browser.minimize(); const minimize = () => browser?.minimize();
const maximize = () => browser.maximize(); const maximize = () => browser?.maximize();
const unmaximize = () => browser.unmaximize(); const unmaximize = () => browser?.unmaximize();
interface WindowBarControlsProps { interface WindowBarControlsProps {
controls: { controls: {

3
src/renderer/types.ts
View file

@ -1,3 +1,4 @@
import { ServerFeatures } from '/@/renderer/api/features-types';
import { import {
Album, Album,
AlbumArtist, AlbumArtist,
@ -73,7 +74,7 @@ export const toServerType = (value?: string): ServerType | null => {
export type ServerListItem = { export type ServerListItem = {
credential: string; credential: string;
features?: Record<string, number[]>; features?: ServerFeatures;
id: string; id: string;
name: string; name: string;
ndCredential?: string; ndCredential?: string;