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

client/package.json

@@ -24,8 +24,12 @@
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
-  "nodemonConfig":{
-    "ignore":["test/*","docs/*","client/*"]
+  "nodemonConfig": {
+    "ignore": [
+      "test/*",
+      "docs/*",
+      "client/*"
+    ]
   },
   "eslintConfig": {
     "extends": [

client/src/components/Home/CreateRoom.js

@@ -27,7 +27,6 @@ const CreateRoom = () => {
         const { name, value } = event.target
         setRoom({ ...room, [name]: value })
     }
-    console.log(room)
 
     async function handleSubmit(e) {
         e.preventDefault()

client/src/components/Home/HomeProfile.js

@@ -6,7 +6,7 @@ import catchErrors from "../../context/catchError";
 const userprofile = localStorage.getItem("user");
 const INIT_USER = {
   id: userprofile,
-  name: '',
+  email: '',
   img: '',
 }
 
@@ -16,7 +16,7 @@ const HomeProfile = () => {
   async function getSetUser(userID) {
     try {
       // console.log('userID', userID)
-      const data = await userApi.getUser( userID )
+      const data = await userApi.getUser(userID)
       // console.log(data)
       setUser(data)
       // console.log(user)
@@ -43,7 +43,7 @@ const HomeProfile = () => {
             // value={user.img}
           />
         </div>
-        <h1 className="d-flex justify-content-center"> {user.name} </h1>
+        <h1 className="d-flex justify-content-center"> {user.email} </h1>
         <h2 className="d-flex justify-content-center"> #{user.id} </h2>
       </form>
       <div

client/src/components/Profile/Info.js

@@ -14,7 +14,7 @@ const Info = () => {
 
   async function getProfile(userID) {
     try {
-      const data = await userApi.getUser({id:userID});
+      const data = await userApi.getUser(userID);
       setProfile(data);
     } catch (error) {}
   }

client/src/components/Profile/InfoUpdate.js

@@ -19,7 +19,7 @@ const InfoUpdate = () => {
 
   async function getProfile(userID) {
     try {
-      const data = await userApi.getUser({ id: userID });
+      const data = await userApi.getUser(userID);
       setProfile(data);
     } catch (error) {}
   }

client/src/components/Profile/Profile.js

@@ -14,7 +14,7 @@ const Profile = () => {
 
   async function getProfile(userID) {
     try {
-      const data = await userApi.getUser({id:userID});
+      const data = await userApi.getUser(userID);
       setProfile(data.img)
       
     } catch (error) {}

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)
   res.json(user)
 };
 
@@ -45,7 +43,10 @@ const updateinfo = async (req, res) => {
 };
 const login = async (req, res) => {
   try {
+<<<<<<< HEAD
     // console.log('login= ', req.body)
+=======
+>>>>>>> origin/jaeyeoniiiiii
     const { email, password } = req.body
     const user = await User.findOne({ where: { email: email } })
     if (!user) {
@@ -67,7 +68,10 @@ const login = async (req, res) => {
       }
     }
   } catch (error) {
+<<<<<<< HEAD
     // console.log(error)
+=======
+>>>>>>> origin/jaeyeoniiiiii
     return res.status(500).send('로그인 중 에러')
   }
 };