김동훈 / OpenSource_Project

Go to a project
Toggle navigation Toggle navigation pinning
Donghoon Kim
946a519e 2 parents b82ae0a9 9f0dcc29

Merge remote-tracking branch 'origin/WebFront'

Inline Side-by-side
Showing 8 changed files with 66 additions and 311 deletions
...@@ -146,4 +146,4 @@ function createMarker_rooms(place) { ...@@ -146,4 +146,4 @@ function createMarker_rooms(place) {
146 infowindow.setContent(place.name); 146 infowindow.setContent(place.name);
147 infowindow.open(map, this); 147 infowindow.open(map, this);
148 }); 148 });
149 -} 149 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -70,13 +70,6 @@ ...@@ -70,13 +70,6 @@
70 </a> 70 </a>
71 </li> 71 </li>
72 72
73 - <li class="nav-item">
74 - <a class="nav-link" href="Favorite.html">
75 - <i class="fas fa-heart"></i>
76 - <span>Favorite</span>
77 - </a>
78 - </li>
79 -
80 73
81 </ul> 74 </ul>
82 <div id="content-wrapper"> 75 <div id="content-wrapper">
......
1 -<!DOCTYPE html>
2 -<html lang="en">
3 -
4 - <head>
5 -
6 - <meta charset="utf-8">
7 - <meta http-equiv="X-UA-Compatible" content="IE=edge">
8 - <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
9 - <meta name="description" content="">
10 - <meta name="author" content="">
11 -
12 - <title>저기어때</title>
13 -
14 - <!-- Bootstrap core CSS-->
15 - <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
16 -
17 - <!-- Custom fonts for this template-->
18 - <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
19 -
20 - <!-- Page level plugin CSS-->
21 - <link href="vendor/datatables/dataTables.bootstrap4.css" rel="stylesheet">
22 -
23 - <!-- Custom styles for this template-->
24 - <link href="css/sb-admin.css" rel="stylesheet">
25 -
26 - </head>
27 -
28 - <body id="page-top">
29 -
30 - <nav class="navbar navbar-expand navbar-dark bg-dark static-top">
31 -
32 - <a class="navbar-brand mr-1" href="index.html">저기어때</a>
33 -
34 - <button class="btn btn-link btn-sm text-white order-1 order-sm-0" id="sidebarToggle" href="#">
35 - <i class="fas fa-bars"></i>
36 - </button>
37 -
38 - </nav>
39 -
40 - <div id="wrapper">
41 -
42 - <!-- Sidebar -->
43 - <ul class="sidebar navbar-nav">
44 -
45 - <li class="nav-item">
46 - <a class="nav-link" href="index.html">
47 - <i class="fas fa-map-marker"></i>
48 - <span>Map</span>
49 - </a>
50 - </li>
51 -
52 - <li class="nav-item">
53 - <a class="nav-link" href="Foods.html">
54 - <i class="fas fa-utensils" area-hidden ="true"></i>
55 - <span>Foods</span>
56 - </a>
57 - </li>
58 -
59 - <li class="nav-item">
60 - <a class="nav-link" href="Entertainment.html">
61 - <i class="fas fa-gamepad"></i>
62 - <span>Entertainment</span>
63 - </a>
64 - </li>
65 -
66 - <li class="nav-item">
67 - <a class="nav-link" href="Rooms.html">
68 - <i class="fas fa-bed"></i>
69 - <span>Rooms</span>
70 - </a>
71 - </li>
72 -
73 - <li class="nav-item active">
74 - <a class="nav-link" href="Favorite.html">
75 - <i class="fas fa-heart"></i>
76 - <span>Favorite</span>
77 - </a>
78 - </li>
79 -
80 -
81 - </ul>
82 - <div id="content-wrapper">
83 -
84 - <div class="container-fluid">
85 -
86 - <!-- Breadcrumbs-->
87 - <ol class="breadcrumb">
88 - <li class="breadcrumb-item">
89 - <a href="#">Favorite</a>
90 - </li>
91 -
92 - </ol>
93 -
94 - <!-- Icon Cards-->
95 - <div class="row">
96 - <div class="col-xl-3 col-sm-6 mb-3">
97 - <div class="card text-white bg-primary o-hidden h-100">
98 - <div class="card-body">
99 - <div class="card-body-icon">
100 - <i class="fas fa-fw fa-comments"></i>
101 - </div>
102 - <div class="mr-5">26 New Messages!</div>
103 - </div>
104 - <a class="card-footer text-white clearfix small z-1" href="#">
105 - <span class="float-left">View Details</span>
106 - <span class="float-right">
107 - <i class="fas fa-angle-right"></i>
108 - </span>
109 - </a>
110 - </div>
111 - </div>
112 - <div class="col-xl-3 col-sm-6 mb-3">
113 - <div class="card text-white bg-warning o-hidden h-100">
114 - <div class="card-body">
115 - <div class="card-body-icon">
116 - <i class="fas fa-fw fa-list"></i>
117 - </div>
118 - <div class="mr-5">11 New Tasks!</div>
119 - </div>
120 - <a class="card-footer text-white clearfix small z-1" href="#">
121 - <span class="float-left">View Details</span>
122 - <span class="float-right">
123 - <i class="fas fa-angle-right"></i>
124 - </span>
125 - </a>
126 - </div>
127 - </div>
128 - <div class="col-xl-3 col-sm-6 mb-3">
129 - <div class="card text-white bg-success o-hidden h-100">
130 - <div class="card-body">
131 - <div class="card-body-icon">
132 - <i class="fas fa-fw fa-shopping-cart"></i>
133 - </div>
134 - <div class="mr-5">123 New Orders!</div>
135 - </div>
136 - <a class="card-footer text-white clearfix small z-1" href="#">
137 - <span class="float-left">View Details</span>
138 - <span class="float-right">
139 - <i class="fas fa-angle-right"></i>
140 - </span>
141 - </a>
142 - </div>
143 - </div>
144 - <div class="col-xl-3 col-sm-6 mb-3">
145 - <div class="card text-white bg-danger o-hidden h-100">
146 - <div class="card-body">
147 - <div class="card-body-icon">
148 - <i class="fas fa-fw fa-life-ring"></i>
149 - </div>
150 - <div class="mr-5">13 New Tickets!</div>
151 - </div>
152 - <a class="card-footer text-white clearfix small z-1" href="#">
153 - <span class="float-left">View Details</span>
154 - <span class="float-right">
155 - <i class="fas fa-angle-right"></i>
156 - </span>
157 - </a>
158 - </div>
159 - </div>
160 - </div>
161 -
162 - <p class="small text-center text-muted my-5">
163 - <em>More chart examples coming soon...</em>
164 - </p>
165 -
166 - </div>
167 - <!-- /.container-fluid -->
168 -
169 - <!-- Sticky Footer -->
170 - <footer class="sticky-footer">
171 - <div class="container my-auto">
172 - <div class="copyright text-center my-auto">
173 - <span>Copyright © Your Website 2018</span>
174 - </div>
175 - </div>
176 - </footer>
177 -
178 - </div>
179 - <!-- /.content-wrapper -->
180 -
181 - </div>
182 - <!-- /#wrapper -->
183 -
184 - <!-- Scroll to Top Button-->
185 - <a class="scroll-to-top rounded" href="#page-top">
186 - <i class="fas fa-angle-up"></i>
187 - </a>
188 -
189 -
190 -
191 - <!-- Bootstrap core JavaScript-->
192 - <script src="vendor/jquery/jquery.min.js"></script>
193 - <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
194 -
195 - <!-- Core plugin JavaScript-->
196 - <script src="vendor/jquery-easing/jquery.easing.min.js"></script>
197 -
198 - <!-- Page level plugin JavaScript-->
199 - <script src="vendor/chart.js/Chart.min.js"></script>
200 -
201 - <!-- Custom scripts for all pages-->
202 - <script src="js/sb-admin.min.js"></script>
203 -
204 - <!-- Demo scripts for this page-->
205 - <script src="js/demo/chart-area-demo.js"></script>
206 - <script src="js/demo/chart-bar-demo.js"></script>
207 - <script src="js/demo/chart-pie-demo.js"></script>
208 -
209 - </body>
210 -
211 -</html>
...@@ -71,14 +71,6 @@ ...@@ -71,14 +71,6 @@
71 </a> 71 </a>
72 </li> 72 </li>
73 73
74 - <li class="nav-item">
75 - <a class="nav-link" href="Favorite.html">
76 - <i class="fas fa-heart"></i>
77 - <span>Favorite</span>
78 - </a>
79 - </li>
80 -
81 -
82 </ul> 74 </ul>
83 <div id="content-wrapper"> 75 <div id="content-wrapper">
84 76
...@@ -93,71 +85,19 @@ ...@@ -93,71 +85,19 @@
93 </ol> 85 </ol>
94 86
95 <!-- Icon Cards--> 87 <!-- Icon Cards-->
96 - <div class="row"> 88 + <div class="row" id="body">
97 - <div class="col-xl-3 col-sm-6 mb-3"> 89 + <!--<script>
98 - <div class="card text-white bg-primary o-hidden h-100"> 90 +
99 - <div class="card-body"> 91 + var queryString = decodeURIComponent(window.location.search);
100 - <div class="card-body-icon"> 92 + queryString = queryString.substring(1);
101 - <i class="fas fa-fw fa-comments"></i> 93 + var queries = queryString.split("&");
102 - </div> 94 + for (var i = 0; i < queries.length; i++)
103 - <div class="mr-5">26 New Messages!</div> 95 + {
104 - </div> 96 + document.write(queries[i] + "<br>");
105 - <a class="card-footer text-white clearfix small z-1" href="#"> 97 + }
106 - <span class="float-left">View Details</span> 98 +
107 - <span class="float-right"> 99 + </script>-->
108 - <i class="fas fa-angle-right"></i> 100 + <script src="js/showFood.js"></script>
109 - </span>
110 - </a>
111 - </div>
112 - </div>
113 - <div class="col-xl-3 col-sm-6 mb-3">
114 - <div class="card text-white bg-warning o-hidden h-100">
115 - <div class="card-body">
116 - <div class="card-body-icon">
117 - <i class="fas fa-fw fa-list"></i>
118 - </div>
119 - <div class="mr-5">11 New Tasks!</div>
120 - </div>
121 - <a class="card-footer text-white clearfix small z-1" href="#">
122 - <span class="float-left">View Details</span>
123 - <span class="float-right">
124 - <i class="fas fa-angle-right"></i>
125 - </span>
126 - </a>
127 - </div>
128 - </div>
129 - <div class="col-xl-3 col-sm-6 mb-3">
130 - <div class="card text-white bg-success o-hidden h-100">
131 - <div class="card-body">
132 - <div class="card-body-icon">
133 - <i class="fas fa-fw fa-shopping-cart"></i>
134 - </div>
135 - <div class="mr-5">123 New Orders!</div>
136 - </div>
137 - <a class="card-footer text-white clearfix small z-1" href="#">
138 - <span class="float-left">View Details</span>
139 - <span class="float-right">
140 - <i class="fas fa-angle-right"></i>
141 - </span>
142 - </a>
143 - </div>
144 - </div>
145 - <div class="col-xl-3 col-sm-6 mb-3">
146 - <div class="card text-white bg-danger o-hidden h-100">
147 - <div class="card-body">
148 - <div class="card-body-icon">
149 - <i class="fas fa-fw fa-life-ring"></i>
150 - </div>
151 - <div class="mr-5">13 New Tickets!</div>
152 - </div>
153 - <a class="card-footer text-white clearfix small z-1" href="#">
154 - <span class="float-left">View Details</span>
155 - <span class="float-right">
156 - <i class="fas fa-angle-right"></i>
157 - </span>
158 - </a>
159 - </div>
160 - </div>
161 </div> 101 </div>
162 102
163 <p class="small text-center text-muted my-5"> 103 <p class="small text-center text-muted my-5">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <meta name="author" content=""> 10 <meta name="author" content="">
11 11
12 <title>뭐라도해</title> 12 <title>뭐라도해</title>
13 - 13 +
14 <!-- Bootstrap core CSS--> 14 <!-- Bootstrap core CSS-->
15 <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet"> 15 <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
16 16
...@@ -70,13 +70,6 @@ ...@@ -70,13 +70,6 @@
70 </a> 70 </a>
71 </li> 71 </li>
72 72
73 - <li class="nav-item">
74 - <a class="nav-link" href="Favorite.html">
75 - <i class="fas fa-heart"></i>
76 - <span>Favorite</span>
77 - </a>
78 - </li>
79 -
80 73
81 </ul> 74 </ul>
82 <div id="content-wrapper"> 75 <div id="content-wrapper">
......
...@@ -372,4 +372,27 @@ body.sidebar-toggled footer.sticky-footer { ...@@ -372,4 +372,27 @@ body.sidebar-toggled footer.sticky-footer {
372 body.sidebar-toggled footer.sticky-footer { 372 body.sidebar-toggled footer.sticky-footer {
373 width: calc(100% - 90px); 373 width: calc(100% - 90px);
374 } 374 }
375 +
376 +#nameDiv
377 +{
378 + font-size: 50px;
379 + color: #ffffff;
380 + font-family: "Do Hyeon", sans-serif;
381 + -webkit-text-stroke-color: #000000;
382 + -webkit-text-stroke-width: 1.5px;
383 + position: absolute;
384 + top: 220px;
385 +}
386 +
387 +#typeDiv
388 +{
389 + font-size: 30px;
390 + color: #e9ecef;
391 + font-family: "Do Hyeon", sans-serif;
392 + -webkit-text-stroke-color: #000000;
393 + -webkit-text-stroke-width: 1.5px;
394 + position: absolute;
395 + top: 280px;
396 + left: 22px;
397 +}
375 } 398 }
......
...@@ -85,13 +85,6 @@ ...@@ -85,13 +85,6 @@
85 </a> 85 </a>
86 </li> 86 </li>
87 87
88 - <li class="nav-item">
89 - <a class="nav-link" href="Favorite.html">
90 - <i class="fas fa-heart"></i>
91 - <span>Favorite</span>
92 - </a>
93 - </li>
94 -
95 </ul> 88 </ul>
96 89
97 <div id="content-wrapper"> 90 <div id="content-wrapper">
...@@ -99,12 +92,11 @@ ...@@ -99,12 +92,11 @@
99 var result_food = []; 92 var result_food = [];
100 var result_entertainment = []; 93 var result_entertainment = [];
101 var result_room = []; 94 var result_room = [];
102 - var queryString = "?para1=" + result_food + "&para2=" + result_entertainment + "&para3=" + result_room;
103 - window.location.href = "Foods.html" + queryString;
104 </script> 95 </script>
105 - <script type="text/javascript" src="../api/getPlaceList.js"></script> 96 + <script type="text/javascript" src="js/getPlaceList.js"></script>
106 <div id="map"></div> 97 <div id="map"></div>
107 <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDg4CkUEEt_96n1ork1nL5t4E_SpdKrgMI&libraries=places&callback=initMap" async defer></script> 98 <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDg4CkUEEt_96n1ork1nL5t4E_SpdKrgMI&libraries=places&callback=initMap" async defer></script>
99 +
108 <!-- Sticky Footer --> 100 <!-- Sticky Footer -->
109 <footer class="sticky-footer"> 101 <footer class="sticky-footer">
110 <div class="container my-auto"> 102 <div class="container my-auto">
......
1 //import position from 'getPlaceList' 1 //import position from 'getPlaceList'
2 -import foodList from 'getPlaceList' 2 +
3 +var entName = '';
4 +var entType = '';
5 +var entPhoto = '';
6 +var card = '<div class="col-xl-6 col-sm-6 mb-3">'+
7 +'<div class="card text-white bg-light o-hidden h-100">'+
8 +'<div class="card-body"' + ' style="height:300px; background-size: 100% 100%; background-repeat: no-repeat; background-image:url(' + "'" + entPhoto + "');" + '">' + // place photo
9 +'<div class="mr-5" id="nameDiv">'+entName+'</div>'+ // place name
10 +'<div class="mr-5" id="typeDiv">'+entType+'</div>'+ // place type
11 +'</div>'+
12 +'</div>'+
13 +'</div>';
14 +
15 +
16 +for(var i=0; i<entList.size(); i++){
17 + entName = entList[i][name];
18 + entType = entList[i][type];
19 + if(entList[i][photo]==null){
20 + entPhoto = "noimage.png";
21 + }
22 + else{
23 + entPhoto = entList[i][photo];
24 + }
25 + card+=card;
26 +}
27 +document.getElementById("body").innerHTML=card;
...\ No newline at end of file ...\ No newline at end of file
......