shifting things around so that convo header is cleaner and have footer for displaying videos
This commit is contained in:
@@ -79,10 +79,17 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste
|
|||||||
<Container
|
<Container
|
||||||
maxWidth={false}
|
maxWidth={false}
|
||||||
disableGutters
|
disableGutters
|
||||||
sx={{ maxHeight: '100vh', display: 'flex', flexDirection: 'column' }}
|
sx={{ height: '100vh', display: 'flex', flexDirection: 'column' }}
|
||||||
>
|
>
|
||||||
{/* conversation header details and controls */}
|
{/* conversation header */}
|
||||||
<Box className={'titlebar'} sx={{ p: 2, boxShadow: 3, zIndex: 10 }} flexDirection={'column'}>
|
<Box
|
||||||
|
className={'titlebar'}
|
||||||
|
sx={{
|
||||||
|
p: 1,
|
||||||
|
borderBottom: `1px solid`,
|
||||||
|
borderBottomColor: blueGrey[50],
|
||||||
|
}}
|
||||||
|
>
|
||||||
<Stack direction="row" alignItems="center">
|
<Stack direction="row" alignItems="center">
|
||||||
<IconButton color="primary" size="small">
|
<IconButton color="primary" size="small">
|
||||||
<FiSun />
|
<FiSun />
|
||||||
@@ -102,20 +109,6 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste
|
|||||||
}}
|
}}
|
||||||
spacing={1}
|
spacing={1}
|
||||||
>
|
>
|
||||||
<Tooltip title="Paste image or link!">
|
|
||||||
<IconButton size="small">
|
|
||||||
<FiLink />
|
|
||||||
</IconButton>
|
|
||||||
</Tooltip>
|
|
||||||
|
|
||||||
<Tooltip title="Share screen!">
|
|
||||||
<IconButton size="small">
|
|
||||||
<FiAirplay />
|
|
||||||
</IconButton>
|
|
||||||
</Tooltip>
|
|
||||||
|
|
||||||
<Divider orientation={'vertical'} flexItem />
|
|
||||||
|
|
||||||
<Tooltip title="Add people to the conversation">
|
<Tooltip title="Add people to the conversation">
|
||||||
<IconButton size="small">
|
<IconButton size="small">
|
||||||
<FiUserPlus />
|
<FiUserPlus />
|
||||||
@@ -123,19 +116,6 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
||||||
{/* live video and screenshares */}
|
|
||||||
<Stack direction="row" alignItems={'center'}>
|
|
||||||
{masterConversation.room &&
|
|
||||||
Object.entries(masterConversation.room).map(([userId, userPeerContents]) => {
|
|
||||||
return (
|
|
||||||
<Video
|
|
||||||
key={`userPeerRenderConvoDetails-${userId}`}
|
|
||||||
stream={userPeerContents.stream}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</Stack>
|
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Stack direction={'column'} sx={{ flex: 1, overflowY: 'auto' }}>
|
<Stack direction={'column'} sx={{ flex: 1, overflowY: 'auto' }}>
|
||||||
@@ -325,6 +305,35 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste
|
|||||||
</Stack>
|
</Stack>
|
||||||
</Container>
|
</Container>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
||||||
|
<Box sx={{ p: 2, boxShadow: 3, zIndex: 10 }} flexDirection={'column'} mt={'auto'}>
|
||||||
|
{/* live video and screenshares */}
|
||||||
|
<Stack direction="row" alignItems={'center'}>
|
||||||
|
{masterConversation.room &&
|
||||||
|
Object.entries(masterConversation.room).map(([userId, userPeerContents]) => {
|
||||||
|
return (
|
||||||
|
<Video
|
||||||
|
key={`userPeerRenderConvoDetails-${userId}`}
|
||||||
|
stream={userPeerContents.stream}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
|
||||||
|
<Stack direction="row" alignItems="center" justifyContent={'flex-end'}>
|
||||||
|
<Tooltip title="Paste image or link!">
|
||||||
|
<IconButton size="small">
|
||||||
|
<FiLink />
|
||||||
|
</IconButton>
|
||||||
|
</Tooltip>
|
||||||
|
|
||||||
|
<Tooltip title="Share screen!">
|
||||||
|
<IconButton size="small">
|
||||||
|
<FiAirplay />
|
||||||
|
</IconButton>
|
||||||
|
</Tooltip>
|
||||||
|
</Stack>
|
||||||
|
</Box>
|
||||||
</Container>
|
</Container>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export default function Terminal() {
|
|||||||
item
|
item
|
||||||
xs={4}
|
xs={4}
|
||||||
sx={{
|
sx={{
|
||||||
zIndex: 2,
|
zIndex: 10,
|
||||||
backgroundColor: blueGrey[50],
|
backgroundColor: blueGrey[50],
|
||||||
boxShadow: 3,
|
boxShadow: 3,
|
||||||
borderRight: `1px solid ${blueGrey}`,
|
borderRight: `1px solid ${blueGrey}`,
|
||||||
|
|||||||
Reference in New Issue
Block a user