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

Fix display of action required route

Browse source
This commit is contained in:
jeffvli 2022-12-19 16:12:43 -08:00
parent 325bf54abe
commit 2445b334eb
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/renderer/features/action-required/routes/action-required-route.tsx
View file

@ -3,7 +3,7 @@ import { Center, Group, Stack } from '@mantine/core';
import isElectron from 'is-electron'; import isElectron from 'is-electron';
import { RiCheckFill } from 'react-icons/ri'; import { RiCheckFill } from 'react-icons/ri';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { Button, Text } from '/@/renderer/components'; import { Button, PageHeader, Text } from '/@/renderer/components';
import { ActionRequiredContainer } from '/@/renderer/features/action-required/components/action-required-container'; import { ActionRequiredContainer } from '/@/renderer/features/action-required/components/action-required-container';
import { MpvRequired } from '/@/renderer/features/action-required/components/mpv-required'; import { MpvRequired } from '/@/renderer/features/action-required/components/mpv-required';
import { ServerCredentialRequired } from '/@/renderer/features/action-required/components/server-credential-required'; import { ServerCredentialRequired } from '/@/renderer/features/action-required/components/server-credential-required';
@ -18,7 +18,6 @@ const ActionRequiredRoute = () => {
const currentServer = useCurrentServer(); const currentServer = useCurrentServer();
const [isMpvRequired, setIsMpvRequired] = useState(false); const [isMpvRequired, setIsMpvRequired] = useState(false);
const isServerRequired = !currentServer; const isServerRequired = !currentServer;
// const isCredentialRequired = currentServer?.noCredential && !serverToken;
const isCredentialRequired = false; const isCredentialRequired = false;
useEffect(() => { useEffect(() => {
@ -54,6 +53,7 @@ const ActionRequiredRoute = () => {
return ( return (
<AnimatedPage> <AnimatedPage>
<PageHeader />
<Center sx={{ height: '100%', width: '100vw' }}> <Center sx={{ height: '100%', width: '100vw' }}>
<Stack <Stack
spacing="xl" spacing="xl"

4
src/renderer/layouts/default-layout.tsx
View file

@ -40,9 +40,10 @@ const MainContainer = styled.main<{
leftSidebarWidth: string; leftSidebarWidth: string;
rightExpanded?: boolean; rightExpanded?: boolean;
rightSidebarWidth?: string; rightSidebarWidth?: string;
shell?: boolean;
}>` }>`
position: relative; position: relative;
display: grid; display: ${(props) => (props.shell ? 'flex' : 'grid')};
grid-area: main; grid-area: main;
grid-template-areas: 'sidebar . right-sidebar'; grid-template-areas: 'sidebar . right-sidebar';
grid-template-rows: 1fr; grid-template-rows: 1fr;
@ -256,6 +257,7 @@ export const DefaultLayout = ({ shell }: DefaultLayoutProps) => {
leftSidebarWidth={sidebar.leftWidth} leftSidebarWidth={sidebar.leftWidth}
rightExpanded={showSideQueue && sideQueueType === 'sideQueue'} rightExpanded={showSideQueue && sideQueueType === 'sideQueue'}
rightSidebarWidth={sidebar.rightWidth} rightSidebarWidth={sidebar.rightWidth}
shell={shell}
> >
{!shell && ( {!shell && (
<> <>