From 0b8d3c39ca40018b55ce740cad3815afe9559df0 Mon Sep 17 00:00:00 2001 From: Arjun Patel Date: Sun, 16 Jan 2022 15:57:10 -0800 Subject: [PATCH] trying to take out the create room object --- components/Dashboard/Header.tsx | 4 ++-- components/Dashboard/Rooms.tsx | 2 +- components/Dashboard/TeamVoiceLine.tsx | 4 ++-- components/Modals/CreateRoom.tsx | 9 +++++-- .../{audioContext.tsx => keyboardContext.tsx} | 24 ++++++++++++------- helpers/CreateRoom.tsx | 11 +++++++++ pages/teams/[teamid].tsx | 2 +- 7 files changed, 40 insertions(+), 16 deletions(-) rename contexts/{audioContext.tsx => keyboardContext.tsx} (95%) create mode 100644 helpers/CreateRoom.tsx diff --git a/components/Dashboard/Header.tsx b/components/Dashboard/Header.tsx index 1c0fbfb..c0f6485 100644 --- a/components/Dashboard/Header.tsx +++ b/components/Dashboard/Header.tsx @@ -30,7 +30,7 @@ import { useEffect, useState } from "react"; import TeamService from "../../services/teamService"; import { Team } from "../../models/team"; import Loading from "../Loading"; -import { useAudioContext } from "../../contexts/audioContext"; +import { useKeyboardContext } from "../../contexts/keyboardContext"; import UserStatusBubble from "../UserStatusBubble"; const teamService = new TeamService(); @@ -54,7 +54,7 @@ export default function Header() { isSilenceMode, muteOrUnmute, silenceOrLivenMode, - } = useAudioContext(); + } = useKeyboardContext(); const [usersTeams, setUserTeams] = useState(null); diff --git a/components/Dashboard/Rooms.tsx b/components/Dashboard/Rooms.tsx index daacd00..924a89b 100644 --- a/components/Dashboard/Rooms.tsx +++ b/components/Dashboard/Rooms.tsx @@ -36,7 +36,7 @@ export default function DashboardRoom() { return (
{/* modal for creating room */} - + {/* header */} diff --git a/components/Dashboard/TeamVoiceLine.tsx b/components/Dashboard/TeamVoiceLine.tsx index 4a393fb..504ba79 100644 --- a/components/Dashboard/TeamVoiceLine.tsx +++ b/components/Dashboard/TeamVoiceLine.tsx @@ -23,7 +23,7 @@ import { import { Collections } from "../../services/collections"; import { KeyCode } from "../../globals/keycode"; import { Tooltip } from "antd"; -import { useAudioContext } from "../../contexts/audioContext"; +import { useKeyboardContext } from "../../contexts/keyboardContext"; import UserStatusBubble, { UserPulse } from "../UserStatusBubble"; import { useAuth } from "../../contexts/authContext"; import { Message } from "../../models/message"; @@ -40,7 +40,7 @@ export default function TeamVoiceLine() { selectTeamMember, selectedTeammate, isRecording, - } = useAudioContext(); + } = useKeyboardContext(); const router = useRouter(); const { teamid } = router.query; const { team, user, userTeamMember, teamMembers } = useTeamDashboardContext(); diff --git a/components/Modals/CreateRoom.tsx b/components/Modals/CreateRoom.tsx index eaf6883..7b47246 100644 --- a/components/Modals/CreateRoom.tsx +++ b/components/Modals/CreateRoom.tsx @@ -1,11 +1,16 @@ 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 ( this.setModal2Visible(false)} // onCancel={() => this.setModal2Visible(false)} > diff --git a/contexts/audioContext.tsx b/contexts/keyboardContext.tsx similarity index 95% rename from contexts/audioContext.tsx rename to contexts/keyboardContext.tsx index bd36c9f..e7f45a3 100644 --- a/contexts/audioContext.tsx +++ b/contexts/keyboardContext.tsx @@ -12,8 +12,9 @@ import { Message } from "../models/message"; import { useAuth } from "./authContext"; import { SendService } from "../services/sendService"; import { useTeamDashboardContext } from "./teamDashboardContext"; +import CreateRoom from "../helpers/CreateRoom"; -interface AudioContextInterface { +interface KeyboardContextInterface { selectedTeammate: string; // can only have one selected selectTeamMember: Function; @@ -43,9 +44,13 @@ interface AudioContextInterface { outputDevices: MediaDeviceInfo[]; ctrlDown: boolean; + + createRoom: CreateRoom; } -const AudioContext = React.createContext(null); +const KeyboardContext = React.createContext( + null +); function stopBothVideoAndAudio(stream) { stream.getTracks().forEach(function (track) { @@ -60,7 +65,7 @@ function stopBothVideoAndAudio(stream) { const cloudStorageService = new CloudStorageService(); const sendService = new SendService(); -export default function AudioContextProvider({ children }) { +export default function KeyboardContextProvider({ children }) { const { currUser } = useAuth(); // SECTION: set up for shortcuts and recording and such @@ -80,6 +85,8 @@ export default function AudioContextProvider({ children }) { const [isMuted, setIsMuted] = useState(false); const [isSilenceMode, setIseSilenceMode] = useState(false); + const [createRoom, setCreateRoom] = useState(new CreateRoom()); + const [recorder, setRecorder] = useState( new MicRecorder({ bitRate: 128 }) ); @@ -107,7 +114,7 @@ export default function AudioContextProvider({ children }) { } }, [allMessages]); - const value: AudioContextInterface = { + const value: KeyboardContextInterface = { selectedTeammate, selectTeamMember, addTeamShortcutBinding, @@ -130,6 +137,7 @@ export default function AudioContextProvider({ children }) { outputDevices, ctrlDown, + createRoom, }; function muteOrUnmute() { @@ -413,7 +421,7 @@ export default function AudioContextProvider({ children }) { const [playerSrc, setPlayerSrc] = useState(null); return ( - + {children} {/* mega power mode viewer */} @@ -430,10 +438,10 @@ export default function AudioContextProvider({ children }) { className="w-screen flex flex-row" /> )} - + ); } -export function useAudioContext() { - return useContext(AudioContext); +export function useKeyboardContext() { + return useContext(KeyboardContext); } diff --git a/helpers/CreateRoom.tsx b/helpers/CreateRoom.tsx new file mode 100644 index 0000000..acaa5d1 --- /dev/null +++ b/helpers/CreateRoom.tsx @@ -0,0 +1,11 @@ +export default class CreateRoom { + showModal: boolean; + + meetLink?: string; + + constructor() { + this.showModal = true; + + this.meetLink = ""; + } +} diff --git a/pages/teams/[teamid].tsx b/pages/teams/[teamid].tsx index a7607ed..80a174d 100644 --- a/pages/teams/[teamid].tsx +++ b/pages/teams/[teamid].tsx @@ -6,7 +6,7 @@ import Rooms from "../../components/Dashboard/Rooms"; import TeamVoiceLine from "../../components/Dashboard/TeamVoiceLine"; import BackgroundLayout from "../../components/Layouts/BackgroundLayout"; import Loading from "../../components/Loading"; -import AudioContextProvider from "../../contexts/audioContext"; +import AudioContextProvider from "../../contexts/keyboardContext"; import { useAuth } from "../../contexts/authContext"; import { TeamDashboardContextProvider,