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

Missing Icon, and added tooltip to icons.

master
Håvar Aambø Fosstveit 2019-11-04 23:36:03 +01:00
parent 5604ba20bb
commit c7e40598f7
1 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,11 @@ import FullScreenExitIcon from '@material-ui/icons/FullscreenExit';
import SettingsIcon from '@material-ui/icons/Settings'; import SettingsIcon from '@material-ui/icons/Settings';
import SecurityIcon from '@material-ui/icons/Security'; import SecurityIcon from '@material-ui/icons/Security';
import LockDialog from './AccessControl/LockDialog/LockDialog'; import LockDialog from './AccessControl/LockDialog/LockDialog';
import LockIcon from '@material-ui/icons/Lock';
import LockOpenIcon from '@material-ui/icons/LockOpen';
import Button from '@material-ui/core/Button'; import Button from '@material-ui/core/Button';
import Settings from './Settings/Settings'; import Settings from './Settings/Settings';
import Tooltip from '@material-ui/core/Tooltip';
const TIMEOUT = 10 * 1000; const TIMEOUT = 10 * 1000;
@ -366,43 +369,49 @@ class Room extends React.PureComponent
</Tooltip> </Tooltip>
} }
{ this.fullscreen.fullscreenEnabled && { this.fullscreen.fullscreenEnabled &&
<IconButton <Tooltip title={`${this.state.fullscreen ? 'Leave' : 'Enter'} fullscreen`}>
aria-label='Fullscreen' <IconButton
className={classes.actionButton} aria-label='Fullscreen'
color='inherit' className={classes.actionButton}
onClick={this.handleToggleFullscreen} color='inherit'
> onClick={this.handleToggleFullscreen}
{ this.state.fullscreen ? >
<FullScreenExitIcon /> { this.state.fullscreen ?
: <FullScreenExitIcon />
<FullScreenIcon /> :
} <FullScreenIcon />
</IconButton> }
</IconButton>
</Tooltip>
} }
<IconButton <Tooltip title='Show settings'>
aria-label='Settings'
className={classes.actionButton}
color='inherit'
onClick={() => setSettingsOpen(!room.settingsOpen)}
>
<SettingsIcon />
</IconButton>
{ loginEnabled &&
<IconButton <IconButton
aria-label='Account' aria-label='Settings'
className={classes.actionButton} className={classes.actionButton}
color='inherit' color='inherit'
onClick={() => onClick={() => setSettingsOpen(!room.settingsOpen)}
{
loggedIn ? roomClient.logout() : roomClient.login();
}}
> >
{ myPicture ? <SettingsIcon />
<Avatar src={myPicture} />
:
<AccountCircle />
}
</IconButton> </IconButton>
</Tooltip>
{ loginEnabled &&
<Tooltip title={`Log ${loggedIn ? 'out' : 'in'}`}>
<IconButton
aria-label='Account'
className={classes.actionButton}
color='inherit'
onClick={() =>
{
loggedIn ? roomClient.logout() : roomClient.login();
}}
>
{ myPicture ?
<Avatar src={myPicture} />
:
<AccountCircle />
}
</IconButton>
</Tooltip>
} }
<Button <Button
aria-label='Leave meeting' aria-label='Leave meeting'