김동진 / HealthProtector

Go to a project
Toggle navigation Toggle navigation pinning
김동진
d25d6386 2 parents d1a81e0c 28f1586d

카카오맵 api 사용하여 헬스장 검색 기능 구현

Expand all
Inline Side-by-side
Showing 4 changed files with 2 additions and 29 deletions
This diff is collapsed. Click to expand it.
...@@ -10,12 +10,6 @@ module.exports = { ...@@ -10,12 +10,6 @@ module.exports = {
10 <meta charset="utf-8" /> 10 <meta charset="utf-8" />
11 </head> 11 </head>
12 <body> 12 <body>
13 -<<<<<<< HEAD
14 -=======
15 -
16 -
17 -
18 ->>>>>>> origin/master
19 <style type="text/css"> 13 <style type="text/css">
20 div{ 14 div{
21 @import url('https://fonts.googleapis.com/css2?family=Jua&family=Noto+Sans+KR&display=swap'); 15 @import url('https://fonts.googleapis.com/css2?family=Jua&family=Noto+Sans+KR&display=swap');
...@@ -44,37 +38,23 @@ module.exports = { ...@@ -44,37 +38,23 @@ module.exports = {
44 <h1 style="font-family: 'Jua', sans-serif;"><a href="/"><font color="white">HealthProtector</font></a></h1> 38 <h1 style="font-family: 'Jua', sans-serif;"><a href="/"><font color="white">HealthProtector</font></a></h1>
45 </div> 39 </div>
46 <br> 40 <br>
41 +
47 <div style= width:31%;"font-family:'Jua',sans-serif";float:left;padding:5px;> 42 <div style= width:31%;"font-family:'Jua',sans-serif";float:left;padding:5px;>
48 <h2 style="font-family: 'Jua', sans-serif;"><a href="/countKcal"><font color="black">칼로리 계산</a></h2> 43 <h2 style="font-family: 'Jua', sans-serif;"><a href="/countKcal"><font color="black">칼로리 계산</a></h2>
49 <h4 style="font-family: 'Jua', sans-serif;"><font color="gray">나에게 맞는 일일 권장 섭취량(kcal)을 계산해보세요!</h4> 44 <h4 style="font-family: 'Jua', sans-serif;"><font color="gray">나에게 맞는 일일 권장 섭취량(kcal)을 계산해보세요!</h4>
50 </div> 45 </div>
51 -<<<<<<< HEAD
52 <div style= width:36%;float:right;padding:0px;> 46 <div style= width:36%;float:right;padding:0px;>
53 -=======
54 - <div style= width:36%;float:left;padding:0px;>
55 ->>>>>>> origin/master
56 <h2 style="font-family: 'Jua', sans-serif;"><a href="/foodInfo"><font color="black">음식별 영양정보</a></h2> 47 <h2 style="font-family: 'Jua', sans-serif;"><a href="/foodInfo"><font color="black">음식별 영양정보</a></h2>
57 <h4 style="font-family: 'Jua', sans-serif;"><font color="gray">음식별 식품 영양정보에 대해 알려드립니다!</h4> 48 <h4 style="font-family: 'Jua', sans-serif;"><font color="gray">음식별 식품 영양정보에 대해 알려드립니다!</h4>
58 </div> 49 </div>
59 50
60 <div style= width:31%;float:right;padding:0px;> 51 <div style= width:31%;float:right;padding:0px;>
61 -<<<<<<< HEAD
62 -
63 <h2 style="font-family: 'Jua', sans-serif;"><a href="/searchGym"><font color="black">헬스장 찾기</a></h2> 52 <h2 style="font-family: 'Jua', sans-serif;"><a href="/searchGym"><font color="black">헬스장 찾기</a></h2>
64 - <h4 style="font-family: 'Jua', sans-serif;"><font color="gray">위치를 입력하면 그 주위의 헬스장을 찾아드립니다!</h4>
65 -=======
66 - <h2 style="font-family: 'Jua', sans-serif;"><a href="/foodInfo"><font color="black">헬스장 찾기</a></h2>
67 <h4 style="font-family: 'Jua', sans-serif;"><font color="gray">원하는 위치에 있는 헬스장을 알려드립니다.</h4> 53 <h4 style="font-family: 'Jua', sans-serif;"><font color="gray">원하는 위치에 있는 헬스장을 알려드립니다.</h4>
68 ->>>>>>> origin/master
69 </div> 54 </div>
70 55
71 56
72 <br><br><br><br><br> 57 <br><br><br><br><br>
73 -
74 -<<<<<<< HEAD
75 -
76 -=======
77 ->>>>>>> origin/master
78 ${body} 58 ${body}
79 59
80 <div style= width:100%;font-size:10px;position:fixed;bottom:0;float:left;padding:0px;background-color:#0B610B;> 60 <div style= width:100%;font-size:10px;position:fixed;bottom:0;float:left;padding:0px;background-color:#0B610B;>
......
1 var http = require('http'); 1 var http = require('http');
2 -<<<<<<< HEAD
3 -=======
4 -var db = require('./lib/db.js')
5 ->>>>>>> origin/master
6 var url = require('url'); 2 var url = require('url');
7 -
8 var home = require('./lib/home.js'); 3 var home = require('./lib/home.js');
9 var searchGym = require('./lib/searchGym.js'); 4 var searchGym = require('./lib/searchGym.js');
10 var foodInfo = require('./lib/foodInfo.js'); 5 var foodInfo = require('./lib/foodInfo.js');
...@@ -15,7 +10,6 @@ const style={ ...@@ -15,7 +10,6 @@ const style={
15 border:'1px solid border' 10 border:'1px solid border'
16 11
17 }*/ 12 }*/
18 -
19 var app = http.createServer(function(request,response){ 13 var app = http.createServer(function(request,response){
20 var _url = request.url; 14 var _url = request.url;
21 var queryData = url.parse(_url, true).query; 15 var queryData = url.parse(_url, true).query;
......
...@@ -15,11 +15,10 @@ ...@@ -15,11 +15,10 @@
15 "type": "git", 15 "type": "git",
16 "url": "http://khuhub.khu.ac.kr/2019102154/HealthProtector.git" 16 "url": "http://khuhub.khu.ac.kr/2019102154/HealthProtector.git"
17 }, 17 },
18 -
19 "dependencies": { 18 "dependencies": {
20 "mysql": "^2.18.1", 19 "mysql": "^2.18.1",
21 "pm2": "^4.5.0", 20 "pm2": "^4.5.0",
22 "react": "^17.0.1", 21 "react": "^17.0.1",
23 "react-dom": "^17.0.1" 22 "react-dom": "^17.0.1"
24 } 23 }
25 -} 24 +}
...\ No newline at end of file ...\ No newline at end of file
......