Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
bora-it
Commits
a8d320fd
Commit
a8d320fd
authored
Jul 28, 2021
by
seoyeon
Browse files
0728
parent
30c69adc
Changes
2
Show whitespace changes
Inline
Side-by-side
controllers/user.controller.js
View file @
a8d320fd
...
@@ -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
(
'
로그인 중 에러
'
)
}
}
};
};
...
...
models/user.model.js
View file @
a8d320fd
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment