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

client/src/apis/room.api.js

 import axios from "axios";
 
-const getRoom = async (payload) => {
-  const { data } = await axios.get("/api/room/getRoom", payload);
+const getRoom = async (id) => {
+  const { data } = await axios.get(`/api/room/getRoom/${id}`);
   return data;
 };
 

client/src/apis/user.api.js

 import axios from "axios";
 
-const getUser = async (payload) => {
-  const { data } = await axios.post("/api/getUser", payload);
+const getUser = async (id) => {
+  // console.log('id222:',id.userID)
+  const { data } = await axios.get(`/api/getUser/${id}`);
   return data;
 };
 

client/src/components/Home/CreateRoom.js

@@ -24,7 +24,7 @@ const CreateRoom = () => {
     }, [room]);
 
     function handleChange(event) {
-        console.log(room)
+        // console.log(room)
         const { name, value } = event.target
         setRoom({ ...room, [name]: value })
     }
@@ -32,7 +32,7 @@ const CreateRoom = () => {
 
     async function handleSubmit(e) {
         e.preventDefault()
-        console.log('룸룸', room)
+        // console.log('룸룸', room)
         try {
             const res = await roomApi.create(room)
             // console.log(res)

client/src/components/Home/HomeProfile.js

 import { Link } from "react-router-dom";
 import { useState, useEffect } from "react";
 import userApi from "../../apis/user.api";
+import catchErrors from "../../context/catchError";
 
 const userprofile = localStorage.getItem("user");
 console.log(userprofile)
@@ -15,19 +16,17 @@ const HomeProfile = () => {
 
   async function getSetUser(userID) {
     try {
-      // `/users/${userId}`랑 userId랑 같은지 확인
-      console.log('userID',userID)
-      const data = await userApi.getUser({id: userID})
-      console.log(data)
+      // console.log('userID', userID)
+      const data = await userApi.getUser( userID )
+      // console.log(data)
       setUser(data)
-      console.log(user)
+      // console.log(user)
     } catch (error) {
       // catchErrors(error, setError)
     }
   }
 
   useEffect(() => {
-    console.log('예에에에에ㅔ에에')
     getSetUser(userprofile)
   }, [userprofile])
 

client/src/components/Home/JoinRoom.js

@@ -18,7 +18,7 @@ const JoinRoom = () => {
     function handleChange(event) {
         const { value } = event.target;
         setRoomId(value);
-        console.log(roomId);
+        // console.log(roomId);
     }
 
     async function handleSubmit(e) {
@@ -26,10 +26,10 @@ const JoinRoom = () => {
         try {
             // setLoading(true);
             // setError("");
-            console.log('userId:', userId)
-            console.log('roomId:', roomId)
+            // console.log('userId:', userId)
+            // console.log('roomId:', roomId)
             const data = await roomApi.join({ userId: userId, roomId: roomId });
-            console.log(data);
+            // console.log(data);
             setSuccess(true);
         } catch (error) {
             // catchErrors(error, setError);

client/src/components/Home/RoomSingle.js

@@ -4,27 +4,29 @@ import roomApi from '../../apis/room.api';
 import userApi from '../../apis/user.api';
 
 const RoomSingle = () => {
-  const [roomNum, setRoomNum] = useState([])
+  const [roomNum, setRoomNum] = useState('')
   const [room, setRoom] = useState([])
   const id = localStorage.getItem('user');
   const channelId = 1
+  const A = []
 
-  async function getJoinRoom(Id) {
-    try {
-      console.log('id:',id)
-      const User = await userApi.getUser({id: Id})
-      console.log('User1:',User)
-      console.log('User2:',User.roomNumber)
-      setRoomNum(User.data.roomNumber)
-      const Room = await roomApi.getRoom(roomNum)
-    } catch (error) {
-      // catchErrors(error, setError)
-    }
-  }
+  // async function getJoinRoom(Id) {
+  //   try {
+  //     console.log('id:',id)
+  //     const User = await userApi.getUser({id: Id})
+  //     console.log('User1:',User)
+  //     console.log('User2:',User.roomNumber)
+  //     const RoomNumArr = User.roomNumber
+  //     console.log('setRoomNum:',RoomNumArr)
+  //     const Room = await roomApi.getRoom(RoomNumArr)
+  //   } catch (error) {
+  //     // catchErrors(error, setError)
+  //   }
+  // }
 
-  useEffect(() => {
-    getJoinRoom(id)
-  }, [id])
+  // useEffect(() => {
+  //   getJoinRoom(id)
+  // }, [id])
 
   return (
     <Link

client/src/components/KakaoShareButton.js

 import React, { useEffect } from "react";
-import kakao_login from "../kakao_login.png";
 
 const KakaoShareButton = () => {
   useEffect(() => {

client/src/pages/InvitePage.js

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

controllers/room.controller.js

@@ -10,7 +10,7 @@ const joinRoom = async (req, res) => {
   if (Boolean(room_Id)) { //roomId에 일치하는 방이 존재할때
     //roomId에 일치하는 방의 member정보에 userId 저장하기
     //member정보에 userId가 이미 저장되어 있는지 확인 -> 이미 참여된 방인지 확인
-    const includeUserId = room_Id.member.includes(parseInt(userId)); 
+    const includeUserId = room_Id.member.includes(parseInt(userId));
     // console.log('Include확인:',includeUserId) 
     if (!includeUserId) { //아직 참여되지 않은 방인경우
       room_Id.member.push(userId) //member에 userId추가
@@ -36,7 +36,7 @@ const joinRoom = async (req, res) => {
 };
 
 const createRoom = async (req, res) => {
-  console.log('룸정보', req.body)
+  // console.log('룸정보', req.body)
   const { name, owner, member, profileimg } = req.body;
   const id = nanoid()
   const Id = await Room.findOne({ where: { id: id } });
@@ -77,8 +77,8 @@ const createRoom = async (req, res) => {
   }
 }
 
-const getRoom = async(req,res) => {
-  console.log('req.body:',req.body)
+const getRoom = async (req, res) => {
+  console.log('req.body:', req.body)
 }
 
 export default {

controllers/user.controller.js

@@ -23,7 +23,9 @@ const update = async (req, res) => {
   }
 };
 const getUser = async (req, res) => {
-  const user = await User.findOne({ where: { id: req.body.id } });
+  // console.log('req.params:',req.params)
+  const user = await User.findOne({ where: { id: req.params.id } });
+  // console.log('user:',user)
   res.json(user)
 };
 
@@ -43,9 +45,9 @@ const updateinfo = async (req, res) => {
 };
 const login = async (req, res) => {
   try {
-    console.log("login= ", req.body);
-    const { email, password } = req.body;
-    const user = await User.findOne({ where: { email: email } });
+    // console.log('login= ', req.body)
+    const { email, password } = req.body
+    const user = await User.findOne({ where: { email: email } })
     if (!user) {
       return res.status(422).send(`${email} 사용자가 존재하지 않습니다.`);
     } else {
@@ -65,19 +67,19 @@ const login = async (req, res) => {
       }
     }
   } catch (error) {
-    console.log(error);
-    return res.status(500).send("로그인 중 에러");
+    // console.log(error)
+    return res.status(500).send('로그인 중 에러')
   }
 };
 
 const signup = async (req, res) => {
   try {
-    console.log("sign up= ", req.body);
-    const { name, email, password, gender, phone } = req.body;
-    const id = Math.floor(Math.random() * (9999 - 1000) + 1000);
-    console.log("id:", id);
-    const Id = await User.findOne({ where: { id: id } });
-    console.log("Id 중복확인:", Id);
+    // console.log('sign up= ', req.body)
+    const { name, email, password, gender, phone } = req.body
+    const id = Math.floor(Math.random() * (9999 - 1000) + 1000)
+    // console.log('id:', id)
+    const Id = await User.findOne({ where: { id: id } })
+    // console.log('Id 중복확인:', Id)
     while (Id) {
       const id = Math.floor(Math.random() * (9999 - 1000) + 1000);
       const Id = await User.findOne({ where: { id: id } });
@@ -101,9 +103,7 @@ const signup = async (req, res) => {
       password: password,
       gender: gender,
       phone: phone,
-    }).then((_) =>
-      console.log("회원가입 정보", id, name, email, password, gender, phone)
-    );
+    })
   } catch (error) {
     console.log(error);
     return res.status(500).send("회원가입 중 에러");

index.js

@@ -20,13 +20,22 @@ sequelize
       email: "admin",
       password: "admin!",
       gender: 0,
+      roomNumber : ["1234567abc","abc7654321"],
     });
 
     await Room.create({
-      id: "1234567890",
+      id: "1234567abc",
       name: "room",
       owner: 8888,
-      member: [8888],
+      member: [8888,9999],
+      profileimg: "C:\fakepath\스크린샷(1).png",
+    });
+
+    await Room.create({
+      id: "abc7654321",
+      name: "room1",
+      owner: 9999,
+      member: [9999],
       profileimg: "C:\fakepath\스크린샷(1).png",
     });
 

routes/room.route.js

@@ -2,7 +2,7 @@ import express from "express";
 import roomCrtl from "../controllers/room.controller.js";
 
 const router = express.Router();
-router.route("/getRoom").get(roomCrtl.getRoom);
+router.route("/getRoom").post(roomCrtl.getRoom);
 router.route("/create").post(roomCrtl.createRoom);
 router.route("/join").put(roomCrtl.joinRoom);
 

routes/user.route.js

@@ -3,7 +3,7 @@ import userCtrl from "../controllers/user.controller.js";
 
 const router = express.Router();
 
-router.route("/getUser").post(userCtrl.getUser);
+router.route("/getUser/:id").get(userCtrl.getUser);
 router.route("/login").post(userCtrl.login);
 router.route("/signup").post(userCtrl.signup);