join room

Author: r-mcgrath

app/src/components/left/RoomsContainer.tsx

@@ -114,10 +114,10 @@ const RoomsContainer = () => {
   });
 
   function joinRoom() {
-    dispatch(changeRoom(roomCode));
-    setConfirmRoom((confirmRoom) => roomCode);
     // Call handleUserEnteredRoom when joining a room
     handleUserEnteredRoom(roomCode);
+    dispatch(changeRoom(roomCode));
+    setConfirmRoom((confirmRoom) => roomCode);
     setUserJoined(true); //setting joined room to true for rendering leave room button
   }
 

server/server.ts

@@ -120,8 +120,9 @@ io.on('connection', (socket) => {
 
 app.get('/', userController.getUsername, (req, res) =>{
   const username = req.body.username
-  console.log(username)
-  usersInRoom.push(username)
+  console.log('username: ', username)
+  usersInRoom.push({username: username})
+  console.log(usersInRoom)
   return res.status(200).json({username: username})
 });
 /*