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
69cc7a7d
Commit
69cc7a7d
authored
Jul 27, 2021
by
이재연
Browse files
a
parent
63618602
Changes
2
Hide whitespace changes
Inline
Side-by-side
controllers/user.controller.js
View file @
69cc7a7d
...
...
@@ -4,7 +4,6 @@ import config from '../config/app.config.js'
import
isLength
from
'
validator/lib/isLength.js
'
import
bcrypt
from
"
bcryptjs
"
;
<<<<<<<
HEAD
const
multer
=
require
(
'
multer
'
);
const
uploadimg
=
multer
({
dest
:
'
uploads/
'
});
...
...
@@ -25,7 +24,6 @@ const update = async (req, res) => {
res
.
status
(
500
).
send
(
'
이미지 업데이트 실패
'
)
}
}
=======
const
getUser
=
async
(
req
,
res
)
=>
{
console
.
log
(
'
유저가져왔다아아아ㅏㅇ:
'
,
req
.
body
)
console
.
log
(
'
id:
'
,
req
.
body
.
id
)
...
...
@@ -34,7 +32,6 @@ const getUser = async (req, res) => {
console
.
log
(
'
user:
'
,
user
)
req
.
json
(
user
)
};
>>>>>>>
origin
/
seoyeon2
const
login
=
async
(
req
,
res
)
=>
{
try
{
...
...
@@ -115,4 +112,5 @@ export default {
login
,
signup
,
logout
,
imgUpload
,
update
}
package.json
View file @
69cc7a7d
...
...
@@ -9,7 +9,11 @@
"build"
:
"tsc -p ."
},
"nodemonConfig"
:
{
"ignore"
:
[
"test/*"
,
"docs/*"
,
"client/*"
]
"ignore"
:
[
"test/*"
,
"docs/*"
,
"client/*"
]
},
"repository"
:
{
"type"
:
"git"
,
...
...
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