Commit 69cc7a7d authored by 이재연's avatar 이재연
Browse files

a

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