Merge remote-tracking branch 'origin/seoyeon2' into jaeyeoniiiiii

client/src/components/Home/RoomSingle.js

@@ -3,7 +3,6 @@ import { Link } from 'react-router-dom'
 import roomApi from '../../apis/room.api';
 import userApi from '../../apis/user.api';
 
-
 const RoomSingle = () => {
   const [roomNum, setRoomNum] = useState('')
   const [room, setRoom] = useState([])

client/src/pages/InvitePage.js

@@ -34,7 +34,7 @@ const InvitePage = () => {
         >
           {/* 방 부분 */}
           <p style={{ marginBottom: "0px", fontSize: "16px" }}>초대받은 방</p>
-          {/* <img src={RoomImage} style={{ width: "90px", height: "90px" }}></img> */}
+          <img style={{ width: "90px", height: "90px" }}></img>
           <p style={{ marginBottom: "0px", fontSize: "16px" }}>
             방 id: {/*${roomid}*/}
           </p>

controllers/user.controller.js

@@ -23,9 +23,7 @@ const update = async (req, res) => {
   }
 };
 const getUser = async (req, res) => {
-  // console.log('req.params:',req.params)
-  const user = await User.findOne({ where: { id: req.params.id } });
-  // console.log('user:',user)
+  const user = await User.findOne({ where: { id: req.body.id } });
   res.json(user)
 };