Suyeon Jung

Fix conflict at category.js

......@@ -9,6 +9,7 @@ let SIGUNDONG_CODE;
// 사용자가 index 페이지에서 주소를 입력하고 넘어오면
router.post('/', function(req, res) {
console.log(req.body);
let userLocation = req.body.userLocation;
// let userSi = req.body.si
// let userDong = req.body.dong;
......@@ -31,14 +32,16 @@ router.post('/', function(req, res) {
if (!err && res.statusCode == 200) {
var result = JSON.parse(body);
console.log('result', result);
xyList.push(result.documents[0].address.x);
xyList.push(result.documents[0].address.y);
console.log(xyList);
x = result.documents[0].address.x;
y = result.documents[0].address.y;
}
})
res.render('category', { userLocation: req.body.userLocation });
});
router.get('/food', function(req, res) {
// 맛집 리스트 조회
......@@ -57,7 +60,6 @@ router.get('/food', function(req, res) {
res.send(re);
}
});
});
router.get('/school', function(req, res) {
res.send('This is school');
......@@ -66,7 +68,7 @@ router.get('/park', function(req, res) {
res.send('This is park');
});
router.get('/transport', function(req, res) {
res.send('This is transport');
res.send(BusCnt);
});
router.get('/safe', function(req, res) {
res.send('This is safe');
......