Skip to content

Daegyu #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daegyu-jeong merged 2 commits into from
Jul 27, 2022
Merged

Daegyu #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b068088
.
daegyu-jeong Jul 27, 2022
5bb4fc5
Merge branch 'develop' of https://github.com/Blog-Paper-Project/FE in…
daegyu-jeong Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/Context.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,21 @@ const ContextProvider = ({ children }) => {
connectionRef.current = peer;
};

// 오디오 온오프
const audioHandler = () => {
myVideo.current.srcObject
.getAudioTracks()
.forEach((track) => (track.enabled = !track.enabled));
setAudioOn(!audioOn);
};
// // 오디오 온오프
// const audioHandler = () => {
// myVideo.current.srcObject
// .getAudioTracks()
// .forEach((track) => (track.enabled = !track.enabled));
// setAudioOn(!audioOn);
// };

// 비디오 온오프
const videoHandler = () => {
myVideo.current.srcObject
.getVideoTracks()
.forEach((track) => (track.enabled = !track.enabled));
setVideoOn(!videoOn);
};
// // 비디오 온오프
// const videoHandler = () => {
// myVideo.current.srcObject
// .getVideoTracks()
// .forEach((track) => (track.enabled = !track.enabled));
// setVideoOn(!videoOn);
// };

// // 화면 공유
// const shareScreen = () => {
Expand Down Expand Up @@ -203,11 +203,11 @@ const ContextProvider = ({ children }) => {
nickname,
callToUser,
setCallToUser,
audioHandler,
videoHandler,
// audioHandler,
// videoHandler,
// shareScreen,
audioOn,
videoOn,
// audioOn,
// videoOn,
}}
>
{children}
Expand Down
16 changes: 8 additions & 8 deletions src/components/chat/Sidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ const Sidebar = ({ children }) => {
callAccepted,
callEnded,
idToCall,
audioOn,
videoOn,
audioHandler,
videoHandler,
// audioOn,
// videoOn,
// audioHandler,
// videoHandler,
// shareScreen,
leaveCall,
callUser,
Expand All @@ -68,7 +68,7 @@ const Sidebar = ({ children }) => {
<Paper elevation={10} className={classes.paper}>
<form className={classes.root} noValidate autoComplete="off">
<Grid container className={classes.gridContainer}>
<ButtonList>
{/* <ButtonList>
<div>
{audioOn ? (
<button size={25} onClick={audioHandler}>
Expand All @@ -91,12 +91,12 @@ const Sidebar = ({ children }) => {
</button>
)}
</div>
{/* <div>
<div>
<button size={25} onClick={shareScreen}>
<img src={ShareScreen} />
</button>
</div> */}
</ButtonList>
</div>
</ButtonList> */}
{callAccepted && !callEnded ? (
<Button
variant="contained"
Expand Down