trying to take out the create room object

This commit is contained in:
Arjun Patel
2022-01-16 15:57:10 -08:00
parent 7033c79ebb
commit 0b8d3c39ca
7 changed files with 40 additions and 16 deletions
+2 -2
View File
@@ -30,7 +30,7 @@ import { useEffect, useState } from "react";
import TeamService from "../../services/teamService"; import TeamService from "../../services/teamService";
import { Team } from "../../models/team"; import { Team } from "../../models/team";
import Loading from "../Loading"; import Loading from "../Loading";
import { useAudioContext } from "../../contexts/audioContext"; import { useKeyboardContext } from "../../contexts/keyboardContext";
import UserStatusBubble from "../UserStatusBubble"; import UserStatusBubble from "../UserStatusBubble";
const teamService = new TeamService(); const teamService = new TeamService();
@@ -54,7 +54,7 @@ export default function Header() {
isSilenceMode, isSilenceMode,
muteOrUnmute, muteOrUnmute,
silenceOrLivenMode, silenceOrLivenMode,
} = useAudioContext(); } = useKeyboardContext();
const [usersTeams, setUserTeams] = useState<Team[]>(null); const [usersTeams, setUserTeams] = useState<Team[]>(null);
+1 -1
View File
@@ -36,7 +36,7 @@ export default function DashboardRoom() {
return ( return (
<section className="p-5 flex flex-col bg-gray-100 bg-opacity-25 rounded-lg shadow-md"> <section className="p-5 flex flex-col bg-gray-100 bg-opacity-25 rounded-lg shadow-md">
{/* modal for creating room */} {/* modal for creating room */}
<CreateRoom show={true} /> <CreateRoom />
{/* header */} {/* header */}
<span className="flex flex-row justify-end space-x-3 pb-5 items-center"> <span className="flex flex-row justify-end space-x-3 pb-5 items-center">
+2 -2
View File
@@ -23,7 +23,7 @@ import {
import { Collections } from "../../services/collections"; import { Collections } from "../../services/collections";
import { KeyCode } from "../../globals/keycode"; import { KeyCode } from "../../globals/keycode";
import { Tooltip } from "antd"; import { Tooltip } from "antd";
import { useAudioContext } from "../../contexts/audioContext"; import { useKeyboardContext } from "../../contexts/keyboardContext";
import UserStatusBubble, { UserPulse } from "../UserStatusBubble"; import UserStatusBubble, { UserPulse } from "../UserStatusBubble";
import { useAuth } from "../../contexts/authContext"; import { useAuth } from "../../contexts/authContext";
import { Message } from "../../models/message"; import { Message } from "../../models/message";
@@ -40,7 +40,7 @@ export default function TeamVoiceLine() {
selectTeamMember, selectTeamMember,
selectedTeammate, selectedTeammate,
isRecording, isRecording,
} = useAudioContext(); } = useKeyboardContext();
const router = useRouter(); const router = useRouter();
const { teamid } = router.query; const { teamid } = router.query;
const { team, user, userTeamMember, teamMembers } = useTeamDashboardContext(); const { team, user, userTeamMember, teamMembers } = useTeamDashboardContext();
+7 -2
View File
@@ -1,11 +1,16 @@
import { Modal } from "antd"; import { Modal } from "antd";
import { useKeyboardContext } from "../../contexts/keyboardContext";
export default function CreateRoom() {
const { createRoom } = useKeyboardContext();
console.log(createRoom);
export default function CreateRoom({ show }) {
return ( return (
<Modal <Modal
title="Create Room" title="Create Room"
centered centered
visible={show} visible={createRoom.showModal}
// onOk={() => this.setModal2Visible(false)} // onOk={() => this.setModal2Visible(false)}
// onCancel={() => this.setModal2Visible(false)} // onCancel={() => this.setModal2Visible(false)}
> >
@@ -12,8 +12,9 @@ import { Message } from "../models/message";
import { useAuth } from "./authContext"; import { useAuth } from "./authContext";
import { SendService } from "../services/sendService"; import { SendService } from "../services/sendService";
import { useTeamDashboardContext } from "./teamDashboardContext"; import { useTeamDashboardContext } from "./teamDashboardContext";
import CreateRoom from "../helpers/CreateRoom";
interface AudioContextInterface { interface KeyboardContextInterface {
selectedTeammate: string; // can only have one selected selectedTeammate: string; // can only have one selected
selectTeamMember: Function; selectTeamMember: Function;
@@ -43,9 +44,13 @@ interface AudioContextInterface {
outputDevices: MediaDeviceInfo[]; outputDevices: MediaDeviceInfo[];
ctrlDown: boolean; ctrlDown: boolean;
createRoom: CreateRoom;
} }
const AudioContext = React.createContext<AudioContextInterface | null>(null); const KeyboardContext = React.createContext<KeyboardContextInterface | null>(
null
);
function stopBothVideoAndAudio(stream) { function stopBothVideoAndAudio(stream) {
stream.getTracks().forEach(function (track) { stream.getTracks().forEach(function (track) {
@@ -60,7 +65,7 @@ function stopBothVideoAndAudio(stream) {
const cloudStorageService = new CloudStorageService(); const cloudStorageService = new CloudStorageService();
const sendService = new SendService(); const sendService = new SendService();
export default function AudioContextProvider({ children }) { export default function KeyboardContextProvider({ children }) {
const { currUser } = useAuth(); const { currUser } = useAuth();
// SECTION: set up for shortcuts and recording and such // SECTION: set up for shortcuts and recording and such
@@ -80,6 +85,8 @@ export default function AudioContextProvider({ children }) {
const [isMuted, setIsMuted] = useState<Boolean>(false); const [isMuted, setIsMuted] = useState<Boolean>(false);
const [isSilenceMode, setIseSilenceMode] = useState<Boolean>(false); const [isSilenceMode, setIseSilenceMode] = useState<Boolean>(false);
const [createRoom, setCreateRoom] = useState<CreateRoom>(new CreateRoom());
const [recorder, setRecorder] = useState<MicRecorder>( const [recorder, setRecorder] = useState<MicRecorder>(
new MicRecorder({ bitRate: 128 }) new MicRecorder({ bitRate: 128 })
); );
@@ -107,7 +114,7 @@ export default function AudioContextProvider({ children }) {
} }
}, [allMessages]); }, [allMessages]);
const value: AudioContextInterface = { const value: KeyboardContextInterface = {
selectedTeammate, selectedTeammate,
selectTeamMember, selectTeamMember,
addTeamShortcutBinding, addTeamShortcutBinding,
@@ -130,6 +137,7 @@ export default function AudioContextProvider({ children }) {
outputDevices, outputDevices,
ctrlDown, ctrlDown,
createRoom,
}; };
function muteOrUnmute() { function muteOrUnmute() {
@@ -413,7 +421,7 @@ export default function AudioContextProvider({ children }) {
const [playerSrc, setPlayerSrc] = useState<string>(null); const [playerSrc, setPlayerSrc] = useState<string>(null);
return ( return (
<AudioContext.Provider value={value}> <KeyboardContext.Provider value={value}>
{children} {children}
{/* mega power mode viewer */} {/* mega power mode viewer */}
@@ -430,10 +438,10 @@ export default function AudioContextProvider({ children }) {
className="w-screen flex flex-row" className="w-screen flex flex-row"
/> />
)} )}
</AudioContext.Provider> </KeyboardContext.Provider>
); );
} }
export function useAudioContext() { export function useKeyboardContext() {
return useContext(AudioContext); return useContext(KeyboardContext);
} }
+11
View File
@@ -0,0 +1,11 @@
export default class CreateRoom {
showModal: boolean;
meetLink?: string;
constructor() {
this.showModal = true;
this.meetLink = "";
}
}
+1 -1
View File
@@ -6,7 +6,7 @@ import Rooms from "../../components/Dashboard/Rooms";
import TeamVoiceLine from "../../components/Dashboard/TeamVoiceLine"; import TeamVoiceLine from "../../components/Dashboard/TeamVoiceLine";
import BackgroundLayout from "../../components/Layouts/BackgroundLayout"; import BackgroundLayout from "../../components/Layouts/BackgroundLayout";
import Loading from "../../components/Loading"; import Loading from "../../components/Loading";
import AudioContextProvider from "../../contexts/audioContext"; import AudioContextProvider from "../../contexts/keyboardContext";
import { useAuth } from "../../contexts/authContext"; import { useAuth } from "../../contexts/authContext";
import { import {
TeamDashboardContextProvider, TeamDashboardContextProvider,