diff --git a/app/src/components/ChooseRoom.js b/app/src/components/ChooseRoom.js
index 15b3955..e800228 100644
--- a/app/src/components/ChooseRoom.js
+++ b/app/src/components/ChooseRoom.js
@@ -1,21 +1,15 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
import { Link } from 'react-router-dom';
-import { connect } from 'react-redux';
import { withStyles } from '@material-ui/core/styles';
-import { withRoomContext } from '../RoomContext';
import isElectron from 'is-electron';
import PropTypes from 'prop-types';
import { useIntl, FormattedMessage } from 'react-intl';
import randomString from 'random-string';
import Dialog from '@material-ui/core/Dialog';
import DialogContentText from '@material-ui/core/DialogContentText';
-import IconButton from '@material-ui/core/IconButton';
-import AccountCircle from '@material-ui/icons/AccountCircle';
-import Avatar from '@material-ui/core/Avatar';
import Typography from '@material-ui/core/Typography';
import Button from '@material-ui/core/Button';
import TextField from '@material-ui/core/TextField';
-import Tooltip from '@material-ui/core/Tooltip';
import CookieConsent from 'react-cookie-consent';
import MuiDialogTitle from '@material-ui/core/DialogTitle';
import MuiDialogContent from '@material-ui/core/DialogContent';
@@ -88,63 +82,12 @@ const styles = (theme) =>
const DialogTitle = withStyles(styles)((props) =>
{
- const [ open, setOpen ] = useState(false);
-
- const intl = useIntl();
-
- useEffect(() =>
- {
- const openTimer = setTimeout(() => setOpen(true), 1000);
- const closeTimer = setTimeout(() => setOpen(false), 4000);
-
- return () =>
- {
- clearTimeout(openTimer);
- clearTimeout(closeTimer);
- };
- }, []);
-
- const { children, classes, myPicture, onLogin, ...other } = props;
-
- const handleTooltipClose = () =>
- {
- setOpen(false);
- };
-
- const handleTooltipOpen = () =>
- {
- setOpen(true);
- };
+ const { children, classes, ...other } = props;
return (
{ window.config && window.config.logo &&
}
{children}
- { window.config && window.config.loginEnabled &&
-
-
- { myPicture ?
-
- :
-
- }
-
-
- }
);
});
@@ -165,9 +108,6 @@ const DialogActions = withStyles((theme) => ({
}))(MuiDialogActions);
const ChooseRoom = ({
- roomClient,
- loggedIn,
- myPicture,
classes
}) =>
{
@@ -184,13 +124,7 @@ const ChooseRoom = ({
paper : classes.dialogPaper
}}
>
-
- {
- loggedIn ? roomClient.logout() : roomClient.login();
- }}
- >
+
{ window.config && window.config.title ? window.config.title : 'Multiparty meeting' }
@@ -255,34 +189,7 @@ const ChooseRoom = ({
ChooseRoom.propTypes =
{
- roomClient : PropTypes.any.isRequired,
- loginEnabled : PropTypes.bool.isRequired,
- loggedIn : PropTypes.bool.isRequired,
- myPicture : PropTypes.string,
- classes : PropTypes.object.isRequired
+ classes : PropTypes.object.isRequired
};
-const mapStateToProps = (state) =>
-{
- return {
- loginEnabled : state.me.loginEnabled,
- loggedIn : state.me.loggedIn,
- myPicture : state.me.picture
- };
-};
-
-export default withRoomContext(connect(
- mapStateToProps,
- null,
- null,
- {
- areStatesEqual : (next, prev) =>
- {
- return (
- prev.me.loginEnabled === next.me.loginEnabled &&
- prev.me.loggedIn === next.me.loggedIn &&
- prev.me.picture === next.me.picture
- );
- }
- }
-)(withStyles(styles)(ChooseRoom)));
\ No newline at end of file
+export default withStyles(styles)(ChooseRoom);
\ No newline at end of file