From d7bcd4c3457f5097c7ef88180b7afd01f1c4f6b4 Mon Sep 17 00:00:00 2001 From: samad-yar-khan Date: Wed, 6 Apr 2022 03:19:25 +0530 Subject: [PATCH 1/6] Remove Jitsi Logs --- app/components/clientsideonly/jitsibroadcaster.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/components/clientsideonly/jitsibroadcaster.js b/app/components/clientsideonly/jitsibroadcaster.js index 606fa4e9..0f348fe7 100644 --- a/app/components/clientsideonly/jitsibroadcaster.js +++ b/app/components/clientsideonly/jitsibroadcaster.js @@ -465,7 +465,6 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { {toggleView()} {toolButton()} -
{renderLog()}
); }; From 5615e33c298dfddf98ae31f74e919dbe5f2f7c7f Mon Sep 17 00:00:00 2001 From: samad-yar-khan Date: Wed, 6 Apr 2022 04:09:55 +0530 Subject: [PATCH 2/6] Conditional Render Jitsi Logs --- app/components/clientsideonly/jitsibroadcaster.js | 9 +++++++-- app/pages/virtualconf/greenroom/index.js | 2 +- app/styles/Greenroom.module.css | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/components/clientsideonly/jitsibroadcaster.js b/app/components/clientsideonly/jitsibroadcaster.js index 0f348fe7..79130afc 100644 --- a/app/components/clientsideonly/jitsibroadcaster.js +++ b/app/components/clientsideonly/jitsibroadcaster.js @@ -39,6 +39,9 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { { speaker: "Z", hour: "50" }, ]; + //Set "showLogs" to true if you want to see logs for debugging + const showLogs = true; + const handleDisplayName = async (hr) => { const tar = dataArr.find((o) => o.hour === hr); if (!tar || tar.speaker == name) { @@ -398,7 +401,7 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { ); - const renderLog = () => + const renderLog = () =>{ logItems.map((item, index) => (
{ {item}
)); - + } + const renderSpinner = () => (
{ {toggleView()}
{toolButton()} + {showLogs &&
{renderLog()}
} ); }; diff --git a/app/pages/virtualconf/greenroom/index.js b/app/pages/virtualconf/greenroom/index.js index 0143409d..bb6a50ed 100644 --- a/app/pages/virtualconf/greenroom/index.js +++ b/app/pages/virtualconf/greenroom/index.js @@ -1,6 +1,6 @@ import { useState } from "react"; import Head from "next/head"; -import styles from "../../../styles/Mainstage.module.css"; +import styles from "../../../styles/Greenroom.module.css"; import { Container, Row, Col } from "react-bootstrap"; import Jitsibroadcaster from "../../../components/clientsideonly/jitsibroadcaster"; import InAppChat from "../../../components/inappchat/inappchat"; diff --git a/app/styles/Greenroom.module.css b/app/styles/Greenroom.module.css index b1182244..f500a82f 100644 --- a/app/styles/Greenroom.module.css +++ b/app/styles/Greenroom.module.css @@ -2,6 +2,7 @@ .main { font-family: "Roboto", sans-serif; + height: 90vh; } .topNav { From 8971a74b68e8d4975489bd99d3ba053b5c6c3d07 Mon Sep 17 00:00:00 2001 From: samad-yar-khan Date: Wed, 6 Apr 2022 04:10:59 +0530 Subject: [PATCH 3/6] Hide Jitsi Logs --- app/components/clientsideonly/jitsibroadcaster.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/clientsideonly/jitsibroadcaster.js b/app/components/clientsideonly/jitsibroadcaster.js index 79130afc..e8654051 100644 --- a/app/components/clientsideonly/jitsibroadcaster.js +++ b/app/components/clientsideonly/jitsibroadcaster.js @@ -40,7 +40,7 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { ]; //Set "showLogs" to true if you want to see logs for debugging - const showLogs = true; + const showLogs = false; const handleDisplayName = async (hr) => { const tar = dataArr.find((o) => o.hour === hr); From 23e78f2becb7dd26cce2fa4548eb6157bf5c4800 Mon Sep 17 00:00:00 2001 From: samad-yar-khan Date: Wed, 6 Apr 2022 04:16:41 +0530 Subject: [PATCH 4/6] FIx LGTM Error --- app/components/clientsideonly/jitsibroadcaster.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/clientsideonly/jitsibroadcaster.js b/app/components/clientsideonly/jitsibroadcaster.js index e8654051..5d7cdda0 100644 --- a/app/components/clientsideonly/jitsibroadcaster.js +++ b/app/components/clientsideonly/jitsibroadcaster.js @@ -401,7 +401,7 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { ); - const renderLog = () =>{ + const renderLog = () => logItems.map((item, index) => (
{ {item}
)); - } + const renderSpinner = () => (
Date: Wed, 6 Apr 2022 05:19:04 +0530 Subject: [PATCH 5/6] Add button to display logs --- app/components/clientsideonly/jitsibroadcaster.js | 12 +++++++++--- app/styles/Greenroom.module.css | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/components/clientsideonly/jitsibroadcaster.js b/app/components/clientsideonly/jitsibroadcaster.js index 5d7cdda0..62b6a748 100644 --- a/app/components/clientsideonly/jitsibroadcaster.js +++ b/app/components/clientsideonly/jitsibroadcaster.js @@ -31,6 +31,7 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { const [knockingParticipants, updateKnockingParticipants] = useState([]); const [mute, setMute] = useState(true); const [name, setName] = useState(null); + const [showLogs ,setShowLogs] = useState(false); const dataArr = [ { speaker: "A", hour: "10" }, { speaker: "B", hour: "20" }, @@ -39,9 +40,6 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { { speaker: "Z", hour: "50" }, ]; - //Set "showLogs" to true if you want to see logs for debugging - const showLogs = false; - const handleDisplayName = async (hr) => { const tar = dataArr.find((o) => o.hour === hr); if (!tar || tar.speaker == name) { @@ -397,6 +395,14 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { + + setShowLogs(!showLogs) } + > + {showLogs ? (Hide Logs) : (Show Logs) } + +
); diff --git a/app/styles/Greenroom.module.css b/app/styles/Greenroom.module.css index f500a82f..bd951db1 100644 --- a/app/styles/Greenroom.module.css +++ b/app/styles/Greenroom.module.css @@ -2,7 +2,8 @@ .main { font-family: "Roboto", sans-serif; - height: 90vh; + min-height: 90vh; + max-height: fit-content; } .topNav { From 8582571334e296c9136bdadb191855f48d02b13b Mon Sep 17 00:00:00 2001 From: samad-yar-khan Date: Wed, 6 Apr 2022 12:32:01 +0530 Subject: [PATCH 6/6] Add showlogs props to Jitsi Broadcaster --- app/components/clientsideonly/jitsibroadcaster.js | 11 +---------- app/pages/virtualconf/greenroom/index.js | 1 + 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/components/clientsideonly/jitsibroadcaster.js b/app/components/clientsideonly/jitsibroadcaster.js index 62b6a748..8166322b 100644 --- a/app/components/clientsideonly/jitsibroadcaster.js +++ b/app/components/clientsideonly/jitsibroadcaster.js @@ -25,13 +25,12 @@ const JitsiMeeting = dynamic( const rtmp = process.env.NEXT_PUBLIC_ROCKET_CHAT_GREENROOM_RTMP; -const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { +const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat, showLogs }) => { const apiRef = useRef(); const [logItems, updateLog] = useState([]); const [knockingParticipants, updateKnockingParticipants] = useState([]); const [mute, setMute] = useState(true); const [name, setName] = useState(null); - const [showLogs ,setShowLogs] = useState(false); const dataArr = [ { speaker: "A", hour: "10" }, { speaker: "B", hour: "20" }, @@ -395,14 +394,6 @@ const Jitsibroadcaster = ({ room, disName, rtmpSrc, handleChat }) => { - - setShowLogs(!showLogs) } - > - {showLogs ? (Hide Logs) : (Show Logs) } - - ); diff --git a/app/pages/virtualconf/greenroom/index.js b/app/pages/virtualconf/greenroom/index.js index bb6a50ed..7995afbb 100644 --- a/app/pages/virtualconf/greenroom/index.js +++ b/app/pages/virtualconf/greenroom/index.js @@ -29,6 +29,7 @@ const Greenroom = () => { room={"GSOC Alumnus Meet"} disName={"Speaker"} handleChat={handleOpenChat} + showLogs={false} /> {openChat && (