Skip to content

Commit d1de5d0

Browse files
authored
Merge pull request #94 from SWM-FIRE/FIRE-407-fe-socket으로-join-room-emit-보내고-처리하기
FIRE-407 add alert message
2 parents 513b19a + 90ff640 commit d1de5d0

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

src/adapters/roomConnection.ts

+8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { useEffect } from 'react';
22
import axios from 'axios';
3+
import { useNavigate } from 'react-router-dom';
34
import connectedUsersStore from '../stores/connectedUsersStore';
45
import roomSocket from './roomSocket';
56
import messageStore from '../stores/messagesStore';
67
import userPcStore from '../stores/userPcStore';
78
import { API } from '../config';
89

910
export const roomConnection = (roomId) => {
11+
const navigate = useNavigate();
1012
const { connectedUsers, appendUser, removeUser, findUser } =
1113
connectedUsersStore();
1214
const { appendMessages } = messageStore();
@@ -40,6 +42,12 @@ export const roomConnection = (roomId) => {
4042
console.log('[roomConnection] joinedRoom', room);
4143
});
4244

45+
roomSocket.off('roomFull').on('roomFull', (room) => {
46+
alert(`해당 방이 꽉 찼습니다.`);
47+
console.log(room);
48+
navigate('/main');
49+
});
50+
4351
roomSocket
4452
.off('existingRoomUsers')
4553
.on('existingRoomUsers', ({ users, current }) => {

src/components/main/Block.tsx

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import blockInterface from '../../interface/block.interface';
66
import MyAvatar from '../../assets/avatar/MyAvatar';
77
import ThemeImage from '../atoms/ThemeImages';
88
import { ReactComponent as Bar } from '../../assets/svg/Room/Bar.svg';
9-
import useRoom from '../../hooks/useRoom';
109

1110
export default function Block({
1211
isMain,
@@ -21,17 +20,15 @@ export default function Block({
2120
}: blockInterface) {
2221
const navigate = useNavigate();
2322
const { nickname } = UserStore();
24-
const { data } = useRoom(itemId);
2523

2624
const enterRoom = (event: React.MouseEvent<HTMLButtonElement>) => {
2725
event.preventDefault();
2826
if (!nickname) {
2927
alert('로그인이 필요합니다.');
3028
return;
3129
}
32-
33-
if (data.current === data.total) {
34-
alert('방이 이미 초과되었습니다.');
30+
if (current === total) {
31+
alert(`해당 방이 꽉 찼습니다.`);
3532
return;
3633
}
3734

src/components/main/CreateRoomForm.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ export default function CreateRoomForm() {
5353
setTags(tags.filter((_, i) => i !== index));
5454
};
5555

56-
const onSubmit = () => {
56+
const onSubmit = (e) => {
57+
e.preventDefault();
5758
axios
5859
.post(API.ROOM, {
5960
moderator: {

0 commit comments

Comments
 (0)