Commit a8d320fd authored by seoyeon's avatar seoyeon
Browse files

0728

parent 30c69adc
...@@ -43,10 +43,6 @@ const updateinfo = async (req, res) => { ...@@ -43,10 +43,6 @@ const updateinfo = async (req, res) => {
}; };
const login = async (req, res) => { const login = async (req, res) => {
try { try {
<<<<<<< HEAD
// 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) {
...@@ -68,10 +64,6 @@ const login = async (req, res) => { ...@@ -68,10 +64,6 @@ const login = async (req, res) => {
} }
} }
} catch (error) { } catch (error) {
<<<<<<< HEAD
// console.log(error)
=======
>>>>>>> origin/jaeyeoniiiiii
return res.status(500).send('로그인 중 에러') return res.status(500).send('로그인 중 에러')
} }
}; };
......
...@@ -23,7 +23,7 @@ const UserModel = (sequelize) => { ...@@ -23,7 +23,7 @@ const UserModel = (sequelize) => {
type: DataTypes.INTEGER, type: DataTypes.INTEGER,
}, },
phone: { phone: {
type: DataTypes.INTEGER, type: DataTypes.STRING,
}, },
img: { img: {
type: DataTypes.STRING, type: DataTypes.STRING,
......
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