From be8b56085199cb3c735033ba02c74e71db84b897 Mon Sep 17 00:00:00 2001 From: talksik Date: Mon, 30 May 2022 06:01:55 -0500 Subject: [PATCH] set up for dialog for creating convo --- packages/desktop/src/components/MainPanel.tsx | 22 ++----------- .../src/components/NewConversationDialog.tsx | 33 +++++++++++++++++++ packages/desktop/src/components/Terminal.tsx | 9 ++++- 3 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 packages/desktop/src/components/NewConversationDialog.tsx diff --git a/packages/desktop/src/components/MainPanel.tsx b/packages/desktop/src/components/MainPanel.tsx index fc5acb4..933ccc2 100644 --- a/packages/desktop/src/components/MainPanel.tsx +++ b/packages/desktop/src/components/MainPanel.tsx @@ -9,7 +9,7 @@ import { useRendersCount } from 'react-use'; export default function MainPanel() { const { user } = useAuth(); - const { selectedConversation, createConversationMode } = useTerminal(); + const { selectedConversation } = useTerminal(); // if selected conversation, show details // do all fetching necessary to paint things here @@ -23,24 +23,6 @@ export default function MainPanel() { const pageContent = useMemo(() => { if (selectedConversation) return ; - if (createConversationMode) - return ( - - creating group conversation - - ); - return ( ); - }, [createConversationMode, selectedConversation, user]); + }, [selectedConversation, user]); return ( void; +}) { + return ( + + + + + + + + ); +} diff --git a/packages/desktop/src/components/Terminal.tsx b/packages/desktop/src/components/Terminal.tsx index 9d17b95..53effe9 100644 --- a/packages/desktop/src/components/Terminal.tsx +++ b/packages/desktop/src/components/Terminal.tsx @@ -22,6 +22,7 @@ import { ListItemIcon, Fab, Switch, + Dialog, } from '@mui/material'; import { blueGrey } from '@mui/material/colors'; import { FiZap, FiHeadphones, FiLogOut, FiMonitor, FiSun } from 'react-icons/fi'; @@ -48,6 +49,7 @@ import { ContentBlock, ContentType } from '@nirvana/core/src/models/content.mode import Navbar from './Navbar'; import MainPanel from './MainPanel'; import { ConversationList } from './ConversationList'; +import NewConversationDialog from './NewConversationDialog'; type ConversationMap = { [conversationId: string]: Conversation; }; @@ -378,6 +380,8 @@ export function TerminalProvider({ children }: { children?: React.ReactNode }) { navigator.mediaDevices .getUserMedia({ audio: true }) .then((localUserMedia: MediaStream) => { + localUserMedia.getTracks().forEach((track) => track.stop()); + setUserAudioStream(localUserMedia); const userMediaRecoder = new MediaRecorder(localUserMedia); @@ -496,7 +500,7 @@ export function TerminalProvider({ children }: { children?: React.ReactNode }) { // }, []) - const [createConversationMode, setCreateConversationMode] = useState(false); + const [createConversationMode, setCreateConversationMode] = useState(true); const handleShowCreateConvoForm = useCallback(() => { setSelectedConversationId(undefined); @@ -687,6 +691,9 @@ export function TerminalProvider({ children }: { children?: React.ReactNode }) { {children} + + {/* create chat dialog */} + ); }