Merge pull request #5 from oslabs-beta/sonya-exploring

fixed merge errors

Author: namos2502

app/src/components/left/RoomsContainer.tsx

@@ -13,7 +13,6 @@ import { cooperativeStyle } from '../../redux/reducers/slice/styleSlice';
 // websocket front end starts here
 import { io } from 'socket.io-client';
 import store from '../../redux/store';
-import { toggleDarkMode } from '../../redux/reducers/slice/darkModeSlice';
 //pasted from navbarbuttons
 import debounce from '../../../../node_modules/lodash/debounce.js';
 
@@ -80,36 +79,36 @@ const RoomsContainer = () => {
   function handleUserEnteredRoom(roomCode) {
     initSocketConnection(roomCode);
   }
-//line 83-113 was pasted in from NavBarButtons
-let previousState = store.getState();
+  //line 83-113 was pasted in from NavBarButtons
+  let previousState = store.getState();
 
-// sending info to backend whenever the redux store changes
-const handleStoreChange = debounce(() => {
-  const newState = store.getState();
-  const roomCode = newState.roomCodeSlice.roomCode;
+  // sending info to backend whenever the redux store changes
+  const handleStoreChange = debounce(() => {
+    const newState = store.getState();
+    const roomCode = newState.roomCodeSlice.roomCode;
 
-  if (roomCode !== '') {
-    // Emit the current room code
-    socket.emit('room-code', roomCode);
-  }
+    if (roomCode !== '') {
+      // Emit the current room code
+      socket.emit('room-code', roomCode);
+    }
 
-  if (newState !== previousState) {
-    // Send the current state to the server
-    socket.emit(
-      'custom-event',
-      'sent from front-end',
-      JSON.stringify(newState),
-      roomCode
-    );
-    previousState = newState;
-  }
-}, 100);
+    if (newState !== previousState) {
+      // Send the current state to the server
+      socket.emit(
+        'custom-event',
+        'sent from front-end',
+        JSON.stringify(newState),
+        roomCode
+      );
+      previousState = newState;
+    }
+  }, 100);
 
-store.subscribe(() => {
-  if (socket) {
-    handleStoreChange();
-  }
-});
+  store.subscribe(() => {
+    if (socket) {
+      handleStoreChange();
+    }
+  });
 
   function joinRoom() {
     dispatch(changeRoom(roomCode));

app/src/components/top/NavBarButtons.tsx

@@ -87,7 +87,7 @@ const { API_BASE_URL } = config;
 // }
 
 // console.log(store.getState());
-let previousState = store.getState();
+// let previousState = store.getState();
 
 // // sending info to backend whenever the redux store changes
 // const handleStoreChange = debounce(() => {
@@ -247,13 +247,13 @@ function navbarDropDown(props) {
   //   console.log('joinedRoom: ', joinedRoom);
   // }, [joinedRoom]);
 
-  function joinRoom() {
-    dispatch(changeRoom(roomCode));
-    setConfirmRoom((confirmRoom) => roomCode);
+  // function joinRoom() {
+  //   dispatch(changeRoom(roomCode));
+  //   setConfirmRoom((confirmRoom) => roomCode);
 
-    // Call handleUserEnteredRoom when joining a room
-    handleUserEnteredRoom(roomCode);
-  }
+  //   // Call handleUserEnteredRoom when joining a room
+  //   handleUserEnteredRoom(roomCode);
+  // }
 
   let showMenu = props.dropMenu ? 'navDropDown' : 'hideNavDropDown';