Adding more UI code

pull/1939/head
Warrick Corfe-Tan 4 years ago
parent 5d4d63c76d
commit c65b4aef2e

@ -35,7 +35,7 @@ const CallWindowHeader = styled.div`
`; `;
// TODO: Add proper styling for this // TODO: Add proper styling for this
const VideoContainer = styled.div` const StreamContainer = styled.div`
width: 200px; width: 200px;
height: 200px; height: 200px;
`; `;
@ -80,9 +80,9 @@ export const CallContainer = () => {
// const [callWindowPosition, setCallWindowPosition] = useState<WindowPositionType>(null) // const [callWindowPosition, setCallWindowPosition] = useState<WindowPositionType>(null)
// picking a conversation at random to test with // picking a conversation at random to test with
let randConvo = _.sample(conversations) as ConversationModel; const randomConversation = _.sample(conversations) as ConversationModel;
randConvo.callState = 'incoming'; randomConversation.callState = 'incoming';
console.warn({ randConvo }); console.warn({ randConvo: randomConversation });
const firstCallingConvo = _.first(conversations.filter(convo => convo.callState !== undefined)); const firstCallingConvo = _.first(conversations.filter(convo => convo.callState !== undefined));
@ -113,6 +113,10 @@ export const CallContainer = () => {
const handleEndCall = () => { const handleEndCall = () => {
// call method to end call connection // call method to end call connection
console.warn("ending the call"); console.warn("ending the call");
if (firstCallingConvo) {
firstCallingConvo.callState = undefined;
}
setConnectionState(null);
} }
const handleMouseDown = () => { const handleMouseDown = () => {
@ -120,6 +124,10 @@ export const CallContainer = () => {
} }
//#endregion //#endregion
if (connectionState === null) {
return null;
}
return ( return (
<> <>
{connectionState === 'connecting' ? {connectionState === 'connecting' ?
@ -130,12 +138,11 @@ export const CallContainer = () => {
<CallWindow onMouseDown={handleMouseDown}> <CallWindow onMouseDown={handleMouseDown}>
<CallWindowInner> <CallWindowInner>
<CallWindowHeader> <CallWindowHeader>
{ firstCallingConvo ? firstCallingConvo.getName() : 'Group name not found'} { firstCallingConvo ? firstCallingConvo.getTitle() : 'Group name not found'}
</CallWindowHeader> </CallWindowHeader>
<VideoContainer></VideoContainer> <StreamContainer></StreamContainer>
<CallWindowControls> <CallWindowControls>
<SessionButton text={'end call'} onClick={handleEndCall} /> <SessionButton text={'end call'} onClick={handleEndCall} />
<SessionButton text={'end call'} onClick={handleEndCall} />
</CallWindowControls> </CallWindowControls>
</CallWindowInner> </CallWindowInner>
</CallWindow> </CallWindow>
@ -150,7 +157,7 @@ export const CallContainer = () => {
} }
{connectionState === 'incoming' ? {connectionState === 'incoming' ?
<SessionWrapperModal title={'incoming call'}> <SessionWrapperModal title={`incoming call from ${firstCallingConvo?.getTitle()}`}>
<div className="session-modal__button-group"> <div className="session-modal__button-group">
<SessionButton text={'decline'} onClick={handleDeclineIncomingCall} /> <SessionButton text={'decline'} onClick={handleDeclineIncomingCall} />
<SessionButton <SessionButton

Loading…
Cancel
Save