From bf754d47976fdf00160468a6e70b8aa65744ccd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Thu, 24 Oct 2019 09:03:30 +0200 Subject: [PATCH] Some tests. --- app/public/authCallback.html | 14 ++++++++++++++ app/src/RoomClient.js | 5 +++++ app/src/components/JoinDialog.js | 27 ++++++++++++++++----------- server/server.js | 4 ++-- 4 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 app/public/authCallback.html diff --git a/app/public/authCallback.html b/app/public/authCallback.html new file mode 100644 index 0000000..51b7574 --- /dev/null +++ b/app/public/authCallback.html @@ -0,0 +1,14 @@ + + + + + Multiparty Meeting + + + + + diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js index 99bf103..6715b2d 100644 --- a/app/src/RoomClient.js +++ b/app/src/RoomClient.js @@ -323,6 +323,11 @@ export default class RoomClient this._loginWindow.close(); } + receiveFromChildWindow(data) + { + logger.debug('receiveFromChildWindow() | [data:"%o"]', data); + } + _soundNotification() { const alertPromise = this._soundAlert.play(); diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js index e27d78e..70a2a94 100644 --- a/app/src/components/JoinDialog.js +++ b/app/src/components/JoinDialog.js @@ -54,6 +54,7 @@ const styles = (theme) => const JoinDialog = ({ roomClient, displayName, + loginEnabled, changeDisplayName, classes }) => @@ -119,16 +120,18 @@ const JoinDialog = ({ margin='normal' /> - + { loginEnabled && + + }