Skip to content

Commit 7229185

Browse files
committed
Complete all basic styling for video meeting section
1 parent dac05a3 commit 7229185

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

app/src/components/bottom/VideoMeeting.tsx

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ import {
1515
import ReactPlayer from 'react-player';
1616
import Button from '@mui/material/Button';
1717
import AccountCircleIcon from '@mui/icons-material/AccountCircle';
18+
import MicOffIcon from '@mui/icons-material/MicOff';
19+
import MicIcon from '@mui/icons-material/Mic';
20+
import VideocamIcon from '@mui/icons-material/Videocam';
21+
import VideocamOffIcon from '@mui/icons-material/VideocamOff';
1822
import VideoMeetingControl from './VideoMeetingControl';
1923

2024
const Videomeeting = (props): JSX.Element => {
@@ -59,8 +63,8 @@ const Videomeeting = (props): JSX.Element => {
5963
};
6064

6165
const handleUserInfoStyle = (isLocalParticipant: boolean) => {
62-
if (isLocalParticipant) return { color: '#0671E3', alignSelf: 'center' };
63-
else return { color: 'white' };
66+
if (isLocalParticipant) return { color: '#0671E3', alignItems: 'center' };
67+
else return { color: 'white', alignItems: 'center' };
6468
};
6569

6670
const ParticipantView = ({ participantId, isLocalParticipant }) => {
@@ -101,17 +105,15 @@ const Videomeeting = (props): JSX.Element => {
101105
<div
102106
key={participantId}
103107
style={{
104-
justifyContent: 'center',
105-
alignItems: 'center',
106-
display: 'column',
108+
display: 'flex',
109+
flexDirection: 'column',
110+
// justifyContent: 'center',
111+
// alignItems: 'center',
107112
paddingLeft: '5px',
108113
paddingRight: '5px'
109114
}}
110115
>
111-
<p style={handleUserInfoStyle(isLocalParticipant)}>
112-
Participant: {isLocalParticipant ? 'You' : displayName} |
113-
Video: {webcamOn ? 'ON' : 'OFF'} | Mic: {micOn ? 'ON' : 'OFF'}
114-
</p>
116+
115117
<audio ref={micRef} autoPlay muted={isLocal} />
116118
{!webcamOn && <TurnOffCameraDisplay />}
117119
{webcamOn && (
@@ -130,6 +132,10 @@ const Videomeeting = (props): JSX.Element => {
130132
}}
131133
/>
132134
)}
135+
<div style={{...handleUserInfoStyle(isLocalParticipant), display: 'flex', marginTop: '-50px', marginLeft: '15px'}}>
136+
<span>{displayName}</span>
137+
{webcamOn ? <VideocamIcon style={{marginLeft: '14.5px'}}/> : <VideocamOffIcon style={{marginLeft: '14.5px'}}/>} {micOn ? <MicIcon style={{marginLeft: '10px'}}/> : <MicOffIcon style={{marginLeft: '10px'}}/>}
138+
</div>
133139
</div>
134140
</>
135141
)}
@@ -178,10 +184,11 @@ const Videomeeting = (props): JSX.Element => {
178184
flexDirection: 'column',
179185
justifyContent: 'center',
180186
alignItems: 'center',
181-
width: '80%',
187+
width: '60%',
182188
height: '100%',
183189
position: 'relative',
184-
overflow: 'auto'
190+
overflow: 'auto',
191+
paddingBottom: '68px'
185192
}}
186193
>
187194
<div className="video-scrollable" style={{ overflow: 'auto' }}>

app/src/components/bottom/VideoMeetingControl.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ const VideoMeetingControl: React.FC<VideoMeetingControlProps> = () => {
7070
{/* Mic Button */}
7171
<div
7272
style={{
73-
// backgroundColor: micHovered ? '#dddddd' : 'transparent',
7473
transition: 'background-color 0.3s',
7574
borderRadius: '5px',
7675
padding: '5px'
@@ -107,7 +106,6 @@ const VideoMeetingControl: React.FC<VideoMeetingControlProps> = () => {
107106
{/* Webcam Button */}
108107
<div
109108
style={{
110-
// backgroundColor: webcamHovered ? '#dddddd' : 'transparent',
111109
transition: 'background-color 0.3s',
112110
borderRadius: '5px',
113111
padding: '5px'
@@ -144,7 +142,6 @@ const VideoMeetingControl: React.FC<VideoMeetingControlProps> = () => {
144142
{/* Call End Button */}
145143
<div
146144
style={{
147-
// backgroundColor: callEndHovered ? '#dddddd' : 'transparent',
148145
transition: 'background-color 0.3s',
149146
borderRadius: '5px',
150147
padding: '5px'

app/src/public/styles/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ BOTTOM PANEL
608608
transition: 0.3s ease all;
609609
border-color: transparent;
610610
background-color: #1e2024;
611-
background-image: linear-gradient(180deg, #1e2024 15%, grey 15%, grey 85%, #1e2024 85%);
611+
background-image: linear-gradient(180deg, #1e2024 15%, #31343A 15%, #31343A 85%, #1e2024 85%);
612612
border-radius: 10px;
613613
z-index: 40;
614614
overflow-y: hidden;

0 commit comments

Comments
 (0)