Merge branch 'master' of http://khuhub.khu.ac.kr/2018102164/rest_stop_list
Showing
7 changed files
with
107 additions
and
142 deletions
README.md
0 → 100644
... | @@ -57,7 +57,6 @@ router.post('/process', function(req, res) { | ... | @@ -57,7 +57,6 @@ router.post('/process', function(req, res) { |
57 | res.write('<div><p>데이터베이스에 연결하지 못했습니다.</p></div>'); | 57 | res.write('<div><p>데이터베이스에 연결하지 못했습니다.</p></div>'); |
58 | res.end(); | 58 | res.end(); |
59 | } | 59 | } |
60 | - | ||
61 | }); | 60 | }); |
62 | 61 | ||
63 | //사용자를 인증하는 함수 : 아이디로 먼저 찾고 비밀번호를 그 다음에 비교하도록 함 | 62 | //사용자를 인증하는 함수 : 아이디로 먼저 찾고 비밀번호를 그 다음에 비교하도록 함 | ... | ... |
... | @@ -28,6 +28,18 @@ | ... | @@ -28,6 +28,18 @@ |
28 | } | 28 | } |
29 | // 고속도로 선택 함수 | 29 | // 고속도로 선택 함수 |
30 | function showline(lineNumber){ | 30 | function showline(lineNumber){ |
31 | + | ||
32 | + | ||
33 | + let highway_Area = document.getElementById('highway'); | ||
34 | + if(lineNumber==='0010'){ | ||
35 | + highway_Area.innerHTML = '경부선'; | ||
36 | + } | ||
37 | + else if(lineNumber==='0550'){ | ||
38 | + highway_Area.innerHTML = '중앙선'; | ||
39 | + } | ||
40 | + else if(lineNumber==='0500'){ | ||
41 | + highway_Area.innerHTML = '영동선'; | ||
42 | + } | ||
31 | // 이 위치에 이전에 켜져있는 map을 지우는 기능 넣어야해 ... | 43 | // 이 위치에 이전에 켜져있는 map을 지우는 기능 넣어야해 ... |
32 | var container = document.getElementById('map'); //지도를 담을 영역의 DOM 레퍼런스 | 44 | var container = document.getElementById('map'); //지도를 담을 영역의 DOM 레퍼런스 |
33 | 45 | ||
... | @@ -253,7 +265,7 @@ | ... | @@ -253,7 +265,7 @@ |
253 | <h1 class="display-5 fw-bolder text-white mb-2">고속도로선택시 경로와 휴게소가 지도에 표시됩니다.</h1> | 265 | <h1 class="display-5 fw-bolder text-white mb-2">고속도로선택시 경로와 휴게소가 지도에 표시됩니다.</h1> |
254 | <p class="lead fw-normal text-white-50 mb-4">고속도로를 선택해주세요</p> | 266 | <p class="lead fw-normal text-white-50 mb-4">고속도로를 선택해주세요</p> |
255 | <div class="dropdown"> | 267 | <div class="dropdown"> |
256 | - <button class ="btn btn-primary dropdown-toggle " data-bs-toggle="dropdown"> | 268 | + <button class ="btn btn-primary dropdown-toggle " id= "highway"data-bs-toggle="dropdown"> |
257 | 고속도로 선택 | 269 | 고속도로 선택 |
258 | </button> | 270 | </button> |
259 | <div class ="dropdown-menu"> | 271 | <div class ="dropdown-menu"> | ... | ... |
... | @@ -40,24 +40,22 @@ | ... | @@ -40,24 +40,22 @@ |
40 | <h2 class="fw-bolder">추천메뉴</h2> | 40 | <h2 class="fw-bolder">추천메뉴</h2> |
41 | <p class="lead fw-normal text-muted mb-5">Recommend the menu you can eat at the rest stop</p> | 41 | <p class="lead fw-normal text-muted mb-5">Recommend the menu you can eat at the rest stop</p> |
42 | </div> | 42 | </div> |
43 | + <center><hr style ="height:2px; width: 55%"></hr></center> | ||
43 | <div class="row gx-5 row-cols-1 row-cols-sm-2 row-cols-xl-4 justify-content-center"> | 44 | <div class="row gx-5 row-cols-1 row-cols-sm-2 row-cols-xl-4 justify-content-center"> |
44 | <div class="col mb-5 mb-5 mb-xl-0"> | 45 | <div class="col mb-5 mb-5 mb-xl-0"> |
45 | <div class="text-center"> | 46 | <div class="text-center"> |
46 | - <img class="img-fluid rounded-circle mb-4 px-4" src="https://dummyimage.com/150x150/ced4da/6c757d" alt="..." /> | ||
47 | <h5 class="fw-bolder"><recommend1></recommend1></h5> | 47 | <h5 class="fw-bolder"><recommend1></recommend1></h5> |
48 | <div class="fst-italic text-muted"><rec1></rec1></div> | 48 | <div class="fst-italic text-muted"><rec1></rec1></div> |
49 | </div> | 49 | </div> |
50 | </div> | 50 | </div> |
51 | <div class="col mb-5 mb-5 mb-xl-0"> | 51 | <div class="col mb-5 mb-5 mb-xl-0"> |
52 | <div class="text-center"> | 52 | <div class="text-center"> |
53 | - <img class="img-fluid rounded-circle mb-4 px-4" src="https://dummyimage.com/150x150/ced4da/6c757d" alt="..." /> | ||
54 | <h5 class="fw-bolder"><recommend2></recommend2></h5> | 53 | <h5 class="fw-bolder"><recommend2></recommend2></h5> |
55 | <div class="fst-italic text-muted"><rec2></rec2></div> | 54 | <div class="fst-italic text-muted"><rec2></rec2></div> |
56 | </div> | 55 | </div> |
57 | </div> | 56 | </div> |
58 | <div class="col mb-5 mb-5 mb-sm-0"> | 57 | <div class="col mb-5 mb-5 mb-sm-0"> |
59 | <div class="text-center"> | 58 | <div class="text-center"> |
60 | - <img class="img-fluid rounded-circle mb-4 px-4" src="https://dummyimage.com/150x150/ced4da/6c757d" alt="..." /> | ||
61 | <h5 class="fw-bolder"><recommend3></recommend3></h5> | 59 | <h5 class="fw-bolder"><recommend3></recommend3></h5> |
62 | <div class="fst-italic text-muted"><rec3></rec3></div> | 60 | <div class="fst-italic text-muted"><rec3></rec3></div> |
63 | </div> | 61 | </div> |
... | @@ -68,147 +66,93 @@ | ... | @@ -68,147 +66,93 @@ |
68 | </div> | 66 | </div> |
69 | </section> | 67 | </section> |
70 | 68 | ||
71 | - | ||
72 | - <!--menu1--> | ||
73 | <section class="py-3"> | 69 | <section class="py-3"> |
74 | <div class="container px-0.1 my-0.1"> | 70 | <div class="container px-0.1 my-0.1"> |
75 | - <div class="text-center"> | ||
76 | - <h4 class="fw-bolder"> <menu1></menu1></h4> | ||
77 | </div> | 71 | </div> |
78 | </section> | 72 | </section> |
79 | - | ||
80 | - <section class="py-5 bg-light" id="scroll-target"> | ||
81 | - <div class="container px-2 my-2"> | ||
82 | - <div class="text-center"> | ||
83 | - <h2 class="fw-bolder"><foodname1></foodname1></h2> | ||
84 | - <p class="lead fw-normal text-muted mb-0"><foodcost1></foodcost1></p> | ||
85 | - </div> | ||
86 | - </div> | ||
87 | - </section> | ||
88 | - | ||
89 | 73 | ||
90 | - <!--menu2--> | 74 | + <section class="py-5 bg-light"> |
91 | - <section class="py-3"> | ||
92 | - <div class="container px-0.1 my-0.1"> | ||
93 | - <div class="text-center"> | ||
94 | - <h4 class="fw-bolder"> <menu2></menu2></h4> | ||
95 | - </div> | ||
96 | - </section> | ||
97 | - | ||
98 | - <section class="py-5 bg-light" id="scroll-target"> | ||
99 | <div class="container px-2 my-2"> | 75 | <div class="container px-2 my-2"> |
100 | <div class="text-center"> | 76 | <div class="text-center"> |
101 | - <h2 class="fw-bolder"><foodname2></foodname2></h2> | 77 | + <h2 class="fw-bolder">전체메뉴</h2> |
102 | - <p class="lead fw-normal text-muted mb-0"><foodcost2></foodcost2></p> | 78 | + <p class="lead fw-normal text-muted mb-5">the menu you can eat at the rest stop</p> |
103 | - </div> | 79 | + </div> |
104 | - </div> | 80 | + <center><hr style ="height:2px; width: 55%"></hr></center> |
105 | - </section> | 81 | + <div class="row gx-5 row-cols-1 row-cols-sm-2 row-cols-xl-4 justify-content-center"> |
106 | - | 82 | + <div class="col mb-5 mb-5 mb-xl-0"> |
107 | - | 83 | + <div class="text-center"> |
108 | - <!--menu3--> | 84 | + <h5 class="fw-bolder"><foodname1></foodname1></h5> |
109 | - <section class="py-3"> | 85 | + <div class="fst-italic text-muted"><foodcost1></foodcost1></div> |
110 | - <div class="container px-0.1 my-0.1"> | 86 | + </div> |
111 | - <div class="text-center"> | 87 | + </div> |
112 | - <h4 class="fw-bolder"> <menu3></menu3> </h4> | 88 | + <div class="col mb-5 mb-5 mb-xl-0"> |
113 | - </div> | 89 | + <div class="text-center"> |
114 | - </section> | 90 | + <h5 class="fw-bolder"><foodname2></foodname2></h5> |
91 | + <div class="fst-italic text-muted"><foodcost2></foodcost2></div> | ||
92 | + </div> | ||
93 | + </div> | ||
94 | + <div class="col mb-5 mb-5 mb-xl-0"> | ||
95 | + <div class="text-center"> | ||
96 | + <h5 class="fw-bolder"><foodname3></foodname3></h5> | ||
97 | + <div class="fst-italic text-muted"><foodcost3></foodcost3></div> | ||
98 | + </div> | ||
99 | + </div> | ||
100 | + <div class="col mb-5 mb-5 mb-xl-0"> | ||
101 | + <div class="text-center"> | ||
102 | + <h5 class="fw-bolder"><foodname4></foodname4></h5> | ||
103 | + <div class="fst-italic text-muted"><foodcost4></foodcost4></div> | ||
104 | + </div> | ||
105 | + </div> | ||
115 | 106 | ||
116 | - <section class="py-5 bg-light" id="scroll-target"> | ||
117 | - <div class="container px-2 my-2"> | ||
118 | - <div class="text-center"> | ||
119 | - <h2 class="fw-bolder"><foodname3></foodname3></h2> | ||
120 | - <p class="lead fw-normal text-muted mb-0"><foodcost3></foodcost3></p> | ||
121 | - </div> | ||
122 | - </div> | ||
123 | - </section> | ||
124 | 107 | ||
108 | + <div class="col mb-5 mb-5 mb-xl-0"> | ||
109 | + <div class="text-center"> | ||
110 | + <h5 class="fw-bolder"> </h5> | ||
111 | + </div> | ||
112 | + </div> | ||
113 | + <div class="col mb-5 mb-5 mb-xl-0"> | ||
114 | + <div class="text-center"> | ||
115 | + <h5 class="fw-bolder"> </h5> | ||
116 | + </div> | ||
117 | + </div> | ||
118 | + <div class="col mb-5 mb-5 mb-xl-0"> | ||
119 | + <div class="text-center"> | ||
120 | + <h5 class="fw-bolder"> </h5> | ||
121 | + </div> | ||
122 | + </div> | ||
123 | + <div class="col mb-5 mb-5 mb-xl-0"> | ||
124 | + <div class="text-center"> | ||
125 | + <h5 class="fw-bolder"> </h5> | ||
126 | + </div> | ||
127 | + </div> | ||
125 | 128 | ||
126 | - <!--menu4--> | ||
127 | - <section class="py-3"> | ||
128 | - <div class="container px-0.1 my-0.1"> | ||
129 | - <div class="text-center"> | ||
130 | - <h4 class="fw-bolder"> <menu4></menu4></h4> | ||
131 | - </div> | ||
132 | - </section> | ||
133 | 129 | ||
134 | - <section class="py-5 bg-light" id="scroll-target"> | 130 | + <div class="col mb-5 mb-5 mb-xl-0"> |
135 | - <div class="container px-2 my-2"> | 131 | + <div class="text-center"> |
136 | - <div class="text-center"> | 132 | + <h5 class="fw-bolder"><foodname5></foodname5></h5> |
137 | - <h2 class="fw-bolder"><foodname4></foodname4></h2> | 133 | + <div class="fst-italic text-muted"><foodcost5></foodcost5></div> |
138 | - <p class="lead fw-normal text-muted mb-0"><foodcost4></foodcost4></p> | 134 | + </div> |
139 | </div> | 135 | </div> |
140 | - </div> | 136 | + <div class="col mb-5 mb-5 mb-xl-0"> |
141 | - </section> | 137 | + <div class="text-center"> |
142 | - | 138 | + <h5 class="fw-bolder"><foodname6></foodname6></h5> |
143 | - | 139 | + <div class="fst-italic text-muted"><foodcost6></foodcost6></div> |
144 | - <!--menu5--> | 140 | + </div> |
145 | - <section class="py-3"> | ||
146 | - <div class="container px-0.1 my-0.1"> | ||
147 | - <div class="text-center"> | ||
148 | - <h4 class="fw-bolder"> <menu5></menu5> </h4> | ||
149 | - </div> | ||
150 | - </section> | ||
151 | - | ||
152 | - <section class="py-5 bg-light" id="scroll-target"> | ||
153 | - <div class="container px-2 my-2"> | ||
154 | - <div class="text-center"> | ||
155 | - <h2 class="fw-bolder"><foodname5></foodname5></h2> | ||
156 | - <p class="lead fw-normal text-muted mb-0"><foodcost5></foodcost5></p> | ||
157 | </div> | 141 | </div> |
158 | - </div> | 142 | + <div class="col mb-5 mb-5 mb-xl-0"> |
159 | - </section> | 143 | + <div class="text-center"> |
160 | - | 144 | + <h5 class="fw-bolder"><foodname7></foodname7></h5> |
161 | - | 145 | + <div class="fst-italic text-muted"><foodcost7></foodcost7></div> |
162 | - <!--menu6--> | 146 | + </div> |
163 | - <section class="py-3"> | ||
164 | - <div class="container px-0.1 my-0.1"> | ||
165 | - <div class="text-center"> | ||
166 | - <h4 class="fw-bolder"> <menu6></menu6> </h4> | ||
167 | - </div> | ||
168 | - </section> | ||
169 | - | ||
170 | - <section class="py-5 bg-light" id="scroll-target"> | ||
171 | - <div class="container px-2 my-2"> | ||
172 | - <div class="text-center"> | ||
173 | - <h2 class="fw-bolder"><foodname6></foodname6></h2> | ||
174 | - <p class="lead fw-normal text-muted mb-0"><foodcost6></foodcost6></p> | ||
175 | </div> | 147 | </div> |
176 | - </div> | 148 | + <div class="col mb-5 mb-5 mb-xl-0"> |
177 | - </section> | 149 | + <div class="text-center"> |
178 | - | 150 | + <h5 class="fw-bolder"><foodname8></foodname8></h5> |
179 | - <!--menu7--> | 151 | + <div class="fst-italic text-muted"><foodcost8></foodcost8></div> |
180 | - <section class="py-3"> | 152 | + </div> |
181 | - <div class="container px-0.1 my-0.1"> | ||
182 | - <div class="text-center"> | ||
183 | - <h4 class="fw-bolder"> <menu7></menu7> </h4> | ||
184 | - </div> | ||
185 | - </section> | ||
186 | - | ||
187 | - <section class="py-5 bg-light" id="scroll-target"> | ||
188 | - <div class="container px-2 my-2"> | ||
189 | - <div class="text-center"> | ||
190 | - <h2 class="fw-bolder"><foodname7></foodname7></h2> | ||
191 | - <p class="lead fw-normal text-muted mb-0"><foodcost7></foodcost6></p> | ||
192 | </div> | 153 | </div> |
193 | - </div> | ||
194 | - </section> | ||
195 | - | ||
196 | - <!--menu8--> | ||
197 | - <section class="py-3"> | ||
198 | - <div class="container px-0.1 my-0.1"> | ||
199 | - <div class="text-center"> | ||
200 | - <h4 class="fw-bolder"> <menu8></menu8> </h4> | ||
201 | - </div> | ||
202 | - </section> | ||
203 | - | ||
204 | - <section class="py-5 bg-light" id="scroll-target"> | ||
205 | - <div class="container px-2 my-2"> | ||
206 | - <div class="text-center"> | ||
207 | - <h2 class="fw-bolder"><foodname8></foodname8></h2> | ||
208 | - <p class="lead fw-normal text-muted mb-0"><foodcost8></foodcost8></p> | ||
209 | </div> | 154 | </div> |
210 | - </div> | 155 | + </section> |
211 | - </section> | ||
212 | 156 | ||
213 | </main> | 157 | </main> |
214 | <!-- Footer--> | 158 | <!-- Footer--> |
... | @@ -370,7 +314,8 @@ | ... | @@ -370,7 +314,8 @@ |
370 | } | 314 | } |
371 | 315 | ||
372 | function Showmenu(rest_name) { | 316 | function Showmenu(rest_name) { |
373 | - | 317 | + let rest_stop = document.getElementById('rest_stop'); // 해당 줄과 바로 아랫줄은 드랍다운 버튼선택시 해당 휴게소이름을 html에 적용하기 위함입니다. |
318 | + rest_stop.innerHTML =rest_name; | ||
374 | console.log(rest_name); | 319 | console.log(rest_name); |
375 | fetch('http://data.ex.co.kr/openapi/restinfo/restBestfoodList?key=6806352377&type=json&numOfRows=1000' + '&stdRestNm='+rest_name).then(function(response){ | 320 | fetch('http://data.ex.co.kr/openapi/restinfo/restBestfoodList?key=6806352377&type=json&numOfRows=1000' + '&stdRestNm='+rest_name).then(function(response){ |
376 | method: 'GET'; | 321 | method: 'GET'; | ... | ... |
... | @@ -749,9 +749,9 @@ | ... | @@ -749,9 +749,9 @@ |
749 | } | 749 | } |
750 | }, | 750 | }, |
751 | "node_modules/mongoose": { | 751 | "node_modules/mongoose": { |
752 | - "version": "6.3.4", | 752 | + "version": "6.3.5", |
753 | - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.3.4.tgz", | 753 | + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.3.5.tgz", |
754 | - "integrity": "sha512-UP0azyGMdY+2YNbJUHeHhnVw5vPzCqs4GQDUwHkilif/rwmSZktUQhQWMp1pUgRNeF2JC30vWGLrInZxD7K/Qw==", | 754 | + "integrity": "sha512-Ho3b/MK3lFyb87NjzyVwrjCqQ5DuLsIPSMFYDuZjaIJNhZfHNPQIcUDR1RLZ0/l+uznwo0VBu3WSwdu8EfAZTA==", |
755 | "dependencies": { | 755 | "dependencies": { |
756 | "bson": "^4.6.2", | 756 | "bson": "^4.6.2", |
757 | "kareem": "2.3.5", | 757 | "kareem": "2.3.5", | ... | ... |
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | "express-session": "^1.17.3", | 19 | "express-session": "^1.17.3", |
20 | "html-entities": "^1.2.0", | 20 | "html-entities": "^1.2.0", |
21 | "http": "^0.0.1-security", | 21 | "http": "^0.0.1-security", |
22 | - "mongoose": "^6.3.4", | 22 | + "mongoose": "^6.3.5", |
23 | "mysql": "^2.18.1", | 23 | "mysql": "^2.18.1", |
24 | "path": "^0.12.7", | 24 | "path": "^0.12.7", |
25 | "serve-static": "^1.15.0" | 25 | "serve-static": "^1.15.0" |
... | @@ -770,9 +770,9 @@ | ... | @@ -770,9 +770,9 @@ |
770 | } | 770 | } |
771 | }, | 771 | }, |
772 | "node_modules/mongoose": { | 772 | "node_modules/mongoose": { |
773 | - "version": "6.3.4", | 773 | + "version": "6.3.5", |
774 | - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.3.4.tgz", | 774 | + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.3.5.tgz", |
775 | - "integrity": "sha512-UP0azyGMdY+2YNbJUHeHhnVw5vPzCqs4GQDUwHkilif/rwmSZktUQhQWMp1pUgRNeF2JC30vWGLrInZxD7K/Qw==", | 775 | + "integrity": "sha512-Ho3b/MK3lFyb87NjzyVwrjCqQ5DuLsIPSMFYDuZjaIJNhZfHNPQIcUDR1RLZ0/l+uznwo0VBu3WSwdu8EfAZTA==", |
776 | "dependencies": { | 776 | "dependencies": { |
777 | "bson": "^4.6.2", | 777 | "bson": "^4.6.2", |
778 | "kareem": "2.3.5", | 778 | "kareem": "2.3.5", |
... | @@ -1845,9 +1845,9 @@ | ... | @@ -1845,9 +1845,9 @@ |
1845 | } | 1845 | } |
1846 | }, | 1846 | }, |
1847 | "mongoose": { | 1847 | "mongoose": { |
1848 | - "version": "6.3.4", | 1848 | + "version": "6.3.5", |
1849 | - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.3.4.tgz", | 1849 | + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.3.5.tgz", |
1850 | - "integrity": "sha512-UP0azyGMdY+2YNbJUHeHhnVw5vPzCqs4GQDUwHkilif/rwmSZktUQhQWMp1pUgRNeF2JC30vWGLrInZxD7K/Qw==", | 1850 | + "integrity": "sha512-Ho3b/MK3lFyb87NjzyVwrjCqQ5DuLsIPSMFYDuZjaIJNhZfHNPQIcUDR1RLZ0/l+uznwo0VBu3WSwdu8EfAZTA==", |
1851 | "requires": { | 1851 | "requires": { |
1852 | "bson": "^4.6.2", | 1852 | "bson": "^4.6.2", |
1853 | "kareem": "2.3.5", | 1853 | "kareem": "2.3.5", | ... | ... |
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | "express-session": "^1.17.3", | 19 | "express-session": "^1.17.3", |
20 | "html-entities": "^1.2.0", | 20 | "html-entities": "^1.2.0", |
21 | "http": "^0.0.1-security", | 21 | "http": "^0.0.1-security", |
22 | - "mongoose": "^6.3.4", | 22 | + "mongoose": "^6.3.5", |
23 | "mysql": "^2.18.1", | 23 | "mysql": "^2.18.1", |
24 | "path": "^0.12.7", | 24 | "path": "^0.12.7", |
25 | "serve-static": "^1.15.0" | 25 | "serve-static": "^1.15.0" | ... | ... |
-
Please register or login to post a comment