Commit 30c69adc authored by seoyeon's avatar seoyeon
Browse files

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

parents fbf1334a bfb6e4f6
...@@ -24,8 +24,12 @@ ...@@ -24,8 +24,12 @@
"test": "react-scripts test", "test": "react-scripts test",
"eject": "react-scripts eject" "eject": "react-scripts eject"
}, },
"nodemonConfig":{ "nodemonConfig": {
"ignore":["test/*","docs/*","client/*"] "ignore": [
"test/*",
"docs/*",
"client/*"
]
}, },
"eslintConfig": { "eslintConfig": {
"extends": [ "extends": [
......
...@@ -27,7 +27,6 @@ const CreateRoom = () => { ...@@ -27,7 +27,6 @@ const CreateRoom = () => {
const { name, value } = event.target const { name, value } = event.target
setRoom({ ...room, [name]: value }) setRoom({ ...room, [name]: value })
} }
console.log(room)
async function handleSubmit(e) { async function handleSubmit(e) {
e.preventDefault() e.preventDefault()
......
...@@ -6,7 +6,7 @@ import catchErrors from "../../context/catchError"; ...@@ -6,7 +6,7 @@ import catchErrors from "../../context/catchError";
const userprofile = localStorage.getItem("user"); const userprofile = localStorage.getItem("user");
const INIT_USER = { const INIT_USER = {
id: userprofile, id: userprofile,
name: '', email: '',
img: '', img: '',
} }
...@@ -16,7 +16,7 @@ const HomeProfile = () => { ...@@ -16,7 +16,7 @@ const HomeProfile = () => {
async function getSetUser(userID) { async function getSetUser(userID) {
try { try {
// console.log('userID', userID) // console.log('userID', userID)
const data = await userApi.getUser( userID ) const data = await userApi.getUser(userID)
// console.log(data) // console.log(data)
setUser(data) setUser(data)
// console.log(user) // console.log(user)
...@@ -43,7 +43,7 @@ const HomeProfile = () => { ...@@ -43,7 +43,7 @@ const HomeProfile = () => {
// value={user.img} // value={user.img}
/> />
</div> </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> <h2 className="d-flex justify-content-center"> #{user.id} </h2>
</form> </form>
<div <div
......
...@@ -14,7 +14,7 @@ const Info = () => { ...@@ -14,7 +14,7 @@ const Info = () => {
async function getProfile(userID) { async function getProfile(userID) {
try { try {
const data = await userApi.getUser({id:userID}); const data = await userApi.getUser(userID);
setProfile(data); setProfile(data);
} catch (error) {} } catch (error) {}
} }
......
...@@ -19,7 +19,7 @@ const InfoUpdate = () => { ...@@ -19,7 +19,7 @@ const InfoUpdate = () => {
async function getProfile(userID) { async function getProfile(userID) {
try { try {
const data = await userApi.getUser({ id: userID }); const data = await userApi.getUser(userID);
setProfile(data); setProfile(data);
} catch (error) {} } catch (error) {}
} }
......
...@@ -14,7 +14,7 @@ const Profile = () => { ...@@ -14,7 +14,7 @@ const Profile = () => {
async function getProfile(userID) { async function getProfile(userID) {
try { try {
const data = await userApi.getUser({id:userID}); const data = await userApi.getUser(userID);
setProfile(data.img) setProfile(data.img)
} catch (error) {} } catch (error) {}
......
...@@ -34,7 +34,7 @@ const InvitePage = () => { ...@@ -34,7 +34,7 @@ const InvitePage = () => {
> >
{/* 방 부분 */} {/* 방 부분 */}
<p style={{ marginBottom: "0px", fontSize: "16px" }}>초대받은 </p> <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" }}> <p style={{ marginBottom: "0px", fontSize: "16px" }}>
id: {/*${roomid}*/} id: {/*${roomid}*/}
</p> </p>
......
...@@ -23,9 +23,7 @@ const update = async (req, res) => { ...@@ -23,9 +23,7 @@ const update = async (req, res) => {
} }
}; };
const getUser = async (req, res) => { const getUser = async (req, res) => {
// console.log('req.params:',req.params)
const user = await User.findOne({ where: { id: req.params.id } }); const user = await User.findOne({ where: { id: req.params.id } });
// console.log('user:',user)
res.json(user) res.json(user)
}; };
...@@ -45,7 +43,10 @@ const updateinfo = async (req, res) => { ...@@ -45,7 +43,10 @@ const updateinfo = async (req, res) => {
}; };
const login = async (req, res) => { const login = async (req, res) => {
try { try {
<<<<<<< HEAD
// console.log('login= ', req.body) // console.log('login= ', req.body)
=======
>>>>>>> origin/jaeyeoniiiiii
const { email, password } = req.body const { email, password } = req.body
const user = await User.findOne({ where: { email: email } }) const user = await User.findOne({ where: { email: email } })
if (!user) { if (!user) {
...@@ -67,7 +68,10 @@ const login = async (req, res) => { ...@@ -67,7 +68,10 @@ const login = async (req, res) => {
} }
} }
} catch (error) { } catch (error) {
<<<<<<< HEAD
// console.log(error) // console.log(error)
=======
>>>>>>> origin/jaeyeoniiiiii
return res.status(500).send('로그인 중 에러') return res.status(500).send('로그인 중 에러')
} }
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment