From c7e40598f7ded3a8d503b095b31f80ed2692bc17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Mon, 4 Nov 2019 23:36:03 +0100 Subject: [PATCH] Missing Icon, and added tooltip to icons. --- app/src/components/Room.js | 71 +++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/app/src/components/Room.js b/app/src/components/Room.js index 7b59484..6ae0152 100644 --- a/app/src/components/Room.js +++ b/app/src/components/Room.js @@ -34,8 +34,11 @@ import FullScreenExitIcon from '@material-ui/icons/FullscreenExit'; import SettingsIcon from '@material-ui/icons/Settings'; import SecurityIcon from '@material-ui/icons/Security'; 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 Settings from './Settings/Settings'; +import Tooltip from '@material-ui/core/Tooltip'; const TIMEOUT = 10 * 1000; @@ -366,43 +369,49 @@ class Room extends React.PureComponent } { this.fullscreen.fullscreenEnabled && - - { this.state.fullscreen ? - - : - - } - + + + { this.state.fullscreen ? + + : + + } + + } - setSettingsOpen(!room.settingsOpen)} - > - - - { loginEnabled && + - { - loggedIn ? roomClient.logout() : roomClient.login(); - }} + onClick={() => setSettingsOpen(!room.settingsOpen)} > - { myPicture ? - - : - - } + + + { loginEnabled && + + + { + loggedIn ? roomClient.logout() : roomClient.login(); + }} + > + { myPicture ? + + : + + } + + }