handling overlay and making it WORK!!!!

This commit is contained in:
talksik
2022-06-20 12:40:44 -05:00
parent 8743b26d49
commit 6e68b246c8
4 changed files with 53 additions and 38 deletions
+39 -33
View File
@@ -8,6 +8,7 @@ import NewConversationDialog from './NewConversationDialog';
import OmniSearchResults from './OmniSearchResults';
import React from 'react';
import { blueGrey } from '@mui/material/colors';
import useElectron from '../providers/ElectronProvider';
import useRouter from '../providers/RouterProvider';
import useSearch from '../providers/SearchProvider';
@@ -16,6 +17,8 @@ export default function Terminal() {
const { searchQuery } = useSearch();
const { desktopMode } = useElectron();
return (
<Container
maxWidth={false}
@@ -25,44 +28,47 @@ export default function Terminal() {
flexDirection: 'row',
}}
>
<Grid container spacing={0} sx={{ flex: 1 }}>
<Grid
item
xs={4}
sx={{
zIndex: 2,
backgroundColor: blueGrey[50],
boxShadow: 3,
borderRight: `1px solid ${blueGrey}`,
{desktopMode === 'mainApp' && (
<>
{/* create chat dialog */}
<NewConversationDialog />
display: 'flex',
flexDirection: 'column',
}}
>
<Navbar />
<Grid container spacing={0} sx={{ flex: 1 }}>
<Grid
item
xs={4}
sx={{
zIndex: 2,
backgroundColor: blueGrey[50],
boxShadow: 3,
borderRight: `1px solid ${blueGrey}`,
<Box sx={{ p: 2 }}>{searchQuery ? <OmniSearchResults /> : <ConversationList />}</Box>
</Grid>
display: 'flex',
flexDirection: 'column',
}}
>
<Navbar />
<Grid
item
xs={8}
sx={{
backgroundColor: 'white',
display: 'flex',
flexDirection: 'column',
maxHeight: '100vh',
overflowY: 'auto',
}}
>
<MainPanel />
</Grid>
</Grid>
<Box sx={{ p: 2 }}>{searchQuery ? <OmniSearchResults /> : <ConversationList />}</Box>
</Grid>
<Grid
item
xs={8}
sx={{
backgroundColor: 'white',
display: 'flex',
flexDirection: 'column',
maxHeight: '100vh',
}}
>
<MainPanel />
</Grid>
</Grid>
</>
)}
<FooterControls />
{/* create chat dialog */}
<NewConversationDialog />
</Container>
);
}