From ef71066d582cce078ac7d4dc66f613ee9bedc2d2 Mon Sep 17 00:00:00 2001 From: talksik Date: Mon, 20 Jun 2022 08:58:31 -0500 Subject: [PATCH] top bar for conversation details --- packages/desktop/src/tree/FooterControls.tsx | 20 ++----- packages/desktop/src/tree/MainPanel.tsx | 63 ++++++++++++++++---- 2 files changed, 56 insertions(+), 27 deletions(-) diff --git a/packages/desktop/src/tree/FooterControls.tsx b/packages/desktop/src/tree/FooterControls.tsx index 23defc3..d0cbacc 100644 --- a/packages/desktop/src/tree/FooterControls.tsx +++ b/packages/desktop/src/tree/FooterControls.tsx @@ -123,17 +123,6 @@ export default function FooterControls() { ))} - - - - - - + + + + + @@ -195,10 +189,6 @@ export default function FooterControls() { - - - - diff --git a/packages/desktop/src/tree/MainPanel.tsx b/packages/desktop/src/tree/MainPanel.tsx index 7c77ebc..8a5af0e 100644 --- a/packages/desktop/src/tree/MainPanel.tsx +++ b/packages/desktop/src/tree/MainPanel.tsx @@ -1,7 +1,9 @@ -import { CardMedia, Container, Grid, Typography } from '@mui/material'; +import { CardMedia, Container, Grid, IconButton, Stack, Tooltip, Typography } from '@mui/material'; +import { FiSun, FiUserPlus, FiZap } from 'react-icons/fi'; import React, { useEffect, useMemo, useRef } from 'react'; import { Box } from '@mui/system'; +import ConversationLabel from '../subcomponents/ConversationLabel'; import { MasterConversation } from '../util/types'; // import ConversationDetails from './ConversationDetails'; import { blueGrey } from '@mui/material/colors'; @@ -47,17 +49,54 @@ export default function MainPanel() { function ConversationDetails({ masterConversation }: { masterConversation: MasterConversation }) { return ( - - - {masterConversation.room && - Object.entries(masterConversation.room).map(([userId, userPeerContents]) => { - return ( - - - ); - })} - + + + + + + + + + + {/* conversation controls */} + + + + + + + + + + + + + + + + + + {masterConversation.room && + Object.entries(masterConversation.room).map(([userId, userPeerContents]) => { + return ( + + + ); + })} + + ); }