Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed room messages for audiocontext and room locked.

master
Håvar Aambø Fosstveit 2019-04-02 19:58:23 +02:00
parent 8d7f832270
commit 0478a44b74
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/components/Room.js
View File

@ -2,11 +2,9 @@ import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import * as appPropTypes from './appPropTypes'; import * as appPropTypes from './appPropTypes';
// import classnames from 'classnames';
import { withRoomContext } from '../RoomContext'; import { withRoomContext } from '../RoomContext';
import { withStyles } from '@material-ui/core/styles'; import { withStyles } from '@material-ui/core/styles';
import * as stateActions from '../actions/stateActions'; import * as stateActions from '../actions/stateActions';
// import Draggable from 'react-draggable';
import { idle } from '../utils'; import { idle } from '../utils';
import FullScreen from './FullScreen'; import FullScreen from './FullScreen';
import CookieConsent from 'react-cookie-consent'; import CookieConsent from 'react-cookie-consent';
@ -26,7 +24,6 @@ import Notifications from './Notifications/Notifications';
import MeetingDrawer from './MeetingDrawer/MeetingDrawer'; import MeetingDrawer from './MeetingDrawer/MeetingDrawer';
import Democratic from './MeetingViews/Democratic'; import Democratic from './MeetingViews/Democratic';
import Filmstrip from './MeetingViews/Filmstrip'; import Filmstrip from './MeetingViews/Filmstrip';
// import Me from './Containers/Me';
import AudioPeers from './PeerAudio/AudioPeers'; import AudioPeers from './PeerAudio/AudioPeers';
import FullScreenView from './VideoContainers/FullScreenView'; import FullScreenView from './VideoContainers/FullScreenView';
import VideoWindow from './VideoWindow/VideoWindow'; import VideoWindow from './VideoWindow/VideoWindow';
@ -54,12 +51,16 @@ const styles = (theme) =>
}, },
message : message :
{ {
position : 'fixed', position : 'absolute',
top : '50%', display : 'flex',
left : '50%', top : '50%',
transform : 'translateX(-50%) translateY(-50%)', left : '50%',
width : '30vw', transform : 'translateX(-50%) translateY(-50%)',
padding : 'theme.unit.spacing * 2' width : '30vw',
padding : theme.spacing.unit * 2,
flexDirection : 'column',
justifyContent : 'center',
alignItems : 'center'
}, },
menuButton : menuButton :
{ {
@ -220,7 +221,6 @@ class Room extends React.PureComponent
roomClient, roomClient,
room, room,
me, me,
// amActiveSpeaker,
setSettingsOpen, setSettingsOpen,
toolAreaOpen, toolAreaOpen,
toggleToolArea, toggleToolArea,
@ -240,7 +240,7 @@ class Room extends React.PureComponent
return ( return (
<div className={classes.root}> <div className={classes.root}>
<Paper className={classes.message}> <Paper className={classes.message}>
<Typography> <Typography variant='h2'>
This webpage required sound and video to play, please click to allow. This webpage required sound and video to play, please click to allow.
</Typography> </Typography>
<Button <Button
@ -262,7 +262,7 @@ class Room extends React.PureComponent
return ( return (
<div className={classes.root}> <div className={classes.root}>
<Paper className={classes.message}> <Paper className={classes.message}>
<Typography>This room is locked at the moment, try again later.</Typography> <Typography variant='h2'>This room is locked at the moment, try again later.</Typography>
</Paper> </Paper>
</div> </div>
); );
@ -343,7 +343,7 @@ class Room extends React.PureComponent
aria-label='Account' aria-label='Account'
color='inherit' color='inherit'
onClick={() => onClick={() =>
{ {
me.loggedIn ? roomClient.logout() : roomClient.login(); me.loggedIn ? roomClient.logout() : roomClient.login();
}} }}
> >

2
app/src/index.css
View File

@ -17,6 +17,7 @@ html
width: 100%; width: 100%;
font-family: 'Roboto'; font-family: 'Roboto';
font-weight: 300; font-weight: 300;
margin : 0;
} }
body body
@ -24,6 +25,7 @@ body
height: 100%; height: 100%;
width: 100%; width: 100%;
font-size: 16px; font-size: 16px;
margin: 0;
} }
#multiparty-meeting #multiparty-meeting