Skip to content

Commit 499d35b

Browse files
authored
Merge pull request #270 from SWM-FIRE/FIRE-207-study]-webrtc-세미나-준비-이하령
FIRE-207 fix bug
2 parents efb6ba0 + fc9f2de commit 499d35b

File tree

8 files changed

+13
-14
lines changed

8 files changed

+13
-14
lines changed

src/components/main/lobby/SingleParticipant.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default function SingleParticipant({ user }) {
1010
<AvatarContainer>
1111
<MyAvatar num={user?.avatar} />
1212
</AvatarContainer>
13-
<Nickname>{user.nickname}</Nickname>
13+
<Nickname>{user?.nickname}</Nickname>
1414
</User>
1515
);
1616
}

src/components/profile/friends/FriendIcon.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default function FriendIcon({ friend }: { friend: singleFriend }) {
2222
<MyAvatar num={friend?.avatar} />
2323
</AvatarContainer>
2424
<Information>
25-
<Nickname>{friend.nickname}</Nickname>
25+
<Nickname>{friend?.nickname}</Nickname>
2626
{/* <FriendStatus>
2727
<OnlineStatus isOnline={friend.state !== ''} />
2828
{friend.state !== '' ? friend.state : '오프라인'}

src/components/ready/card/Header.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default function Header({ data }) {
99
</AvatarControl>
1010
<NameTag data-cy="ready-card-name">
1111
<Moderator isModerator={1}>방장</Moderator>
12-
<Moderator isModerator={0}>{data.moderator.nickname}</Moderator>
12+
<Moderator isModerator={0}>{data?.moderator.nickname}</Moderator>
1313
</NameTag>
1414
</Container>
1515
);

src/components/room/ScreenModal.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default function ScreenModal() {
2626
videoRef.current.srcObject = newStream;
2727
videoRef.current.muted = true;
2828
}
29-
if (!isMe && user.uid === -1) {
29+
if (!isMe && user?.uid === -1) {
3030
toggleScreenModal();
3131
}
3232
}, [videoRef, userMediaStream, user]);
@@ -52,7 +52,7 @@ export default function ScreenModal() {
5252
) : (
5353
<>
5454
<MyAvatar num={user?.avatar} />
55-
<Nickname>{user.nickname}</Nickname>
55+
<Nickname>{user?.nickname}</Nickname>
5656
</>
5757
)}
5858
</ModalController>

src/components/room/screenShare/SingleScreen.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ export default function SingleScreen({ connectedUser, stream }) {
8585
<AvatarPosition>
8686
<AudioTracking stream={stream} />
8787
<MyAvatar num={Number(connectedUser?.avatar)} />
88-
<NameContainer isMe={uid === connectedUser.uid}>
89-
{connectedUser.nickname}
88+
<NameContainer isMe={uid === connectedUser?.uid}>
89+
{connectedUser?.nickname}
9090
</NameContainer>
9191
</AvatarPosition>
9292
</ControlBar>

src/components/room/sideBar/SingleParticipant.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ export default function SingleParticipant({
3737
<AvatarContainer onClick={toggleProfile}>
3838
<MyAvatar num={user?.avatar} />
3939
<MicContainer>
40-
{user.enabledAudio ? <MicOn /> : <MicOff />}
40+
{user?.enabledAudio ? <MicOn /> : <MicOff />}
4141
</MicContainer>
4242
</AvatarContainer>
43-
<NameContainer isMe={isMe} nicknameLength={user.nickname?.length}>
43+
<NameContainer isMe={isMe} nicknameLength={user?.nickname.length}>
4444
{user.nickname}
45-
{moderator === user.uid && <Crown />}
45+
{moderator === user?.uid && <Crown />}
4646
</NameContainer>
4747
</Container>
4848
</>

src/components/room/sideProfileModal/ControlVolume.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ export default function ControlVolume({ user }: { user: VideoUserInterface }) {
1313
);
1414
const onClickVolume = () => {
1515
if (userSpeaker) {
16-
setVolumeByUid(user.uid, 0);
16+
setVolumeByUid(user?.uid, 0);
1717
} else {
18-
setVolumeByUid(user.uid, newVolume);
18+
setVolumeByUid(user?.uid, newVolume);
1919
}
2020
setUserSpeaker(!userSpeaker);
2121
};
2222
const onChangeVolume = (event: React.ChangeEvent<HTMLInputElement>) => {
2323
setNewVolume(event.target.valueAsNumber);
24-
if (userSpeaker) setVolumeByUid(user.uid, event.target.valueAsNumber);
24+
if (userSpeaker) setVolumeByUid(user?.uid, event.target.valueAsNumber);
2525
};
2626

2727
useEffect(() => {

src/pages/Auth.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export default function Auth() {
1010
useEffect(() => {
1111
if (accessToken) {
1212
localStorage.setItem('access_token', accessToken);
13-
console.log(accessToken);
1413
toast.success('로그인이 완료되었습니다');
1514
navigate('/');
1615
}

0 commit comments

Comments
 (0)