Skip to content

Commit df94c8f

Browse files
authored
Merge pull request #239 from TUMFARSynchrony/frontend-gk-fix-meeting-room
Add ChatGPT tab to meeting room
2 parents 2c6a7c1 + 8d20e3d commit df94c8f

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

frontend/src/App.js

+4
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,10 @@ function App() {
545545
{
546546
onClick: () => toggleModal(Tabs.INSTRUCTIONS),
547547
icon: faClipboardCheck
548+
},
549+
{
550+
onClick: () => toggleModal(Tabs.CHATGPT),
551+
externalIcon: true
548552
}
549553
]}
550554
/>

frontend/src/pages/MeetingRoom/MeetingRoom.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ import ConnectionState from "../../networking/ConnectionState";
66
import { useAppSelector } from "../../redux/hooks";
77
import { selectCurrentSession } from "../../redux/slices/sessionsListSlice";
88
import { ParticipantChatTab } from "../../components/molecules/ChatTab/ParticipantChatTab";
9-
import { selectChatTab, selectInstructionsTab } from "../../redux/slices/tabsSlice";
9+
import {
10+
selectChatGptTab,
11+
selectChatTab,
12+
selectInstructionsTab
13+
} from "../../redux/slices/tabsSlice";
1014
import { InstructionsTab } from "../../components/molecules/InstructionsTab/InstructionsTab";
1115
import "./MeetingRoom.css";
16+
import { ChatGptTab } from "../../components/molecules/ChatGptTab/ChatGptTab";
1217

1318
function MeetingRoom({ localStream, connection, onGetSession, onChat }) {
1419
const videoElement = useRef(null);
@@ -19,6 +24,7 @@ function MeetingRoom({ localStream, connection, onGetSession, onChat }) {
1924
const [participantStream, setParticipantStream] = useState(null);
2025
const isChatModalActive = useAppSelector(selectChatTab);
2126
const isInstructionsModalActive = useAppSelector(selectInstructionsTab);
27+
const isChatGptModalActive = useAppSelector(selectChatGptTab);
2228
const [searchParams, setSearchParams] = useSearchParams();
2329
const sessionIdParam = searchParams.get("sessionId");
2430
const participantIdParam = searchParams.get("participantId");
@@ -116,6 +122,8 @@ function MeetingRoom({ localStream, connection, onGetSession, onChat }) {
116122
glassDetected={glassDetected}
117123
/>
118124
)}
125+
126+
{connectionState === ConnectionState.CONNECTED && isChatGptModalActive && <ChatGptTab />}
119127
</div>
120128
</div>
121129
</>

0 commit comments

Comments
 (0)