Donghoon Kim

Merge remote-tracking branch 'origin/WebFront'

......@@ -146,4 +146,4 @@ function createMarker_rooms(place) {
infowindow.setContent(place.name);
infowindow.open(map, this);
});
}
}
\ No newline at end of file
......
......@@ -70,13 +70,6 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="Favorite.html">
<i class="fas fa-heart"></i>
<span>Favorite</span>
</a>
</li>
</ul>
<div id="content-wrapper">
......
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<title>저기어때</title>
<!-- Bootstrap core CSS-->
<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom fonts for this template-->
<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
<!-- Page level plugin CSS-->
<link href="vendor/datatables/dataTables.bootstrap4.css" rel="stylesheet">
<!-- Custom styles for this template-->
<link href="css/sb-admin.css" rel="stylesheet">
</head>
<body id="page-top">
<nav class="navbar navbar-expand navbar-dark bg-dark static-top">
<a class="navbar-brand mr-1" href="index.html">저기어때</a>
<button class="btn btn-link btn-sm text-white order-1 order-sm-0" id="sidebarToggle" href="#">
<i class="fas fa-bars"></i>
</button>
</nav>
<div id="wrapper">
<!-- Sidebar -->
<ul class="sidebar navbar-nav">
<li class="nav-item">
<a class="nav-link" href="index.html">
<i class="fas fa-map-marker"></i>
<span>Map</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="Foods.html">
<i class="fas fa-utensils" area-hidden ="true"></i>
<span>Foods</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="Entertainment.html">
<i class="fas fa-gamepad"></i>
<span>Entertainment</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="Rooms.html">
<i class="fas fa-bed"></i>
<span>Rooms</span>
</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="Favorite.html">
<i class="fas fa-heart"></i>
<span>Favorite</span>
</a>
</li>
</ul>
<div id="content-wrapper">
<div class="container-fluid">
<!-- Breadcrumbs-->
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="#">Favorite</a>
</li>
</ol>
<!-- Icon Cards-->
<div class="row">
<div class="col-xl-3 col-sm-6 mb-3">
<div class="card text-white bg-primary o-hidden h-100">
<div class="card-body">
<div class="card-body-icon">
<i class="fas fa-fw fa-comments"></i>
</div>
<div class="mr-5">26 New Messages!</div>
</div>
<a class="card-footer text-white clearfix small z-1" href="#">
<span class="float-left">View Details</span>
<span class="float-right">
<i class="fas fa-angle-right"></i>
</span>
</a>
</div>
</div>
<div class="col-xl-3 col-sm-6 mb-3">
<div class="card text-white bg-warning o-hidden h-100">
<div class="card-body">
<div class="card-body-icon">
<i class="fas fa-fw fa-list"></i>
</div>
<div class="mr-5">11 New Tasks!</div>
</div>
<a class="card-footer text-white clearfix small z-1" href="#">
<span class="float-left">View Details</span>
<span class="float-right">
<i class="fas fa-angle-right"></i>
</span>
</a>
</div>
</div>
<div class="col-xl-3 col-sm-6 mb-3">
<div class="card text-white bg-success o-hidden h-100">
<div class="card-body">
<div class="card-body-icon">
<i class="fas fa-fw fa-shopping-cart"></i>
</div>
<div class="mr-5">123 New Orders!</div>
</div>
<a class="card-footer text-white clearfix small z-1" href="#">
<span class="float-left">View Details</span>
<span class="float-right">
<i class="fas fa-angle-right"></i>
</span>
</a>
</div>
</div>
<div class="col-xl-3 col-sm-6 mb-3">
<div class="card text-white bg-danger o-hidden h-100">
<div class="card-body">
<div class="card-body-icon">
<i class="fas fa-fw fa-life-ring"></i>
</div>
<div class="mr-5">13 New Tickets!</div>
</div>
<a class="card-footer text-white clearfix small z-1" href="#">
<span class="float-left">View Details</span>
<span class="float-right">
<i class="fas fa-angle-right"></i>
</span>
</a>
</div>
</div>
</div>
<p class="small text-center text-muted my-5">
<em>More chart examples coming soon...</em>
</p>
</div>
<!-- /.container-fluid -->
<!-- Sticky Footer -->
<footer class="sticky-footer">
<div class="container my-auto">
<div class="copyright text-center my-auto">
<span>Copyright © Your Website 2018</span>
</div>
</div>
</footer>
</div>
<!-- /.content-wrapper -->
</div>
<!-- /#wrapper -->
<!-- Scroll to Top Button-->
<a class="scroll-to-top rounded" href="#page-top">
<i class="fas fa-angle-up"></i>
</a>
<!-- Bootstrap core JavaScript-->
<script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Core plugin JavaScript-->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Page level plugin JavaScript-->
<script src="vendor/chart.js/Chart.min.js"></script>
<!-- Custom scripts for all pages-->
<script src="js/sb-admin.min.js"></script>
<!-- Demo scripts for this page-->
<script src="js/demo/chart-area-demo.js"></script>
<script src="js/demo/chart-bar-demo.js"></script>
<script src="js/demo/chart-pie-demo.js"></script>
</body>
</html>
......@@ -71,14 +71,6 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="Favorite.html">
<i class="fas fa-heart"></i>
<span>Favorite</span>
</a>
</li>
</ul>
<div id="content-wrapper">
......@@ -93,71 +85,19 @@
</ol>
<!-- Icon Cards-->
<div class="row">
<div class="col-xl-3 col-sm-6 mb-3">
<div class="card text-white bg-primary o-hidden h-100">
<div class="card-body">
<div class="card-body-icon">
<i class="fas fa-fw fa-comments"></i>
</div>
<div class="mr-5">26 New Messages!</div>
</div>
<a class="card-footer text-white clearfix small z-1" href="#">
<span class="float-left">View Details</span>
<span class="float-right">
<i class="fas fa-angle-right"></i>
</span>
</a>
</div>
</div>
<div class="col-xl-3 col-sm-6 mb-3">
<div class="card text-white bg-warning o-hidden h-100">
<div class="card-body">
<div class="card-body-icon">
<i class="fas fa-fw fa-list"></i>
</div>
<div class="mr-5">11 New Tasks!</div>
</div>
<a class="card-footer text-white clearfix small z-1" href="#">
<span class="float-left">View Details</span>
<span class="float-right">
<i class="fas fa-angle-right"></i>
</span>
</a>
</div>
</div>
<div class="col-xl-3 col-sm-6 mb-3">
<div class="card text-white bg-success o-hidden h-100">
<div class="card-body">
<div class="card-body-icon">
<i class="fas fa-fw fa-shopping-cart"></i>
</div>
<div class="mr-5">123 New Orders!</div>
</div>
<a class="card-footer text-white clearfix small z-1" href="#">
<span class="float-left">View Details</span>
<span class="float-right">
<i class="fas fa-angle-right"></i>
</span>
</a>
</div>
</div>
<div class="col-xl-3 col-sm-6 mb-3">
<div class="card text-white bg-danger o-hidden h-100">
<div class="card-body">
<div class="card-body-icon">
<i class="fas fa-fw fa-life-ring"></i>
</div>
<div class="mr-5">13 New Tickets!</div>
</div>
<a class="card-footer text-white clearfix small z-1" href="#">
<span class="float-left">View Details</span>
<span class="float-right">
<i class="fas fa-angle-right"></i>
</span>
</a>
</div>
</div>
<div class="row" id="body">
<!--<script>
var queryString = decodeURIComponent(window.location.search);
queryString = queryString.substring(1);
var queries = queryString.split("&");
for (var i = 0; i < queries.length; i++)
{
document.write(queries[i] + "<br>");
}
</script>-->
<script src="js/showFood.js"></script>
</div>
<p class="small text-center text-muted my-5">
......
......@@ -10,7 +10,7 @@
<meta name="author" content="">
<title>뭐라도해</title>
<!-- Bootstrap core CSS-->
<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
......@@ -70,13 +70,6 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="Favorite.html">
<i class="fas fa-heart"></i>
<span>Favorite</span>
</a>
</li>
</ul>
<div id="content-wrapper">
......
......@@ -372,4 +372,27 @@ body.sidebar-toggled footer.sticky-footer {
body.sidebar-toggled footer.sticky-footer {
width: calc(100% - 90px);
}
#nameDiv
{
font-size: 50px;
color: #ffffff;
font-family: "Do Hyeon", sans-serif;
-webkit-text-stroke-color: #000000;
-webkit-text-stroke-width: 1.5px;
position: absolute;
top: 220px;
}
#typeDiv
{
font-size: 30px;
color: #e9ecef;
font-family: "Do Hyeon", sans-serif;
-webkit-text-stroke-color: #000000;
-webkit-text-stroke-width: 1.5px;
position: absolute;
top: 280px;
left: 22px;
}
}
......
......@@ -85,13 +85,6 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="Favorite.html">
<i class="fas fa-heart"></i>
<span>Favorite</span>
</a>
</li>
</ul>
<div id="content-wrapper">
......@@ -99,12 +92,11 @@
var result_food = [];
var result_entertainment = [];
var result_room = [];
var queryString = "?para1=" + result_food + "&para2=" + result_entertainment + "&para3=" + result_room;
window.location.href = "Foods.html" + queryString;
</script>
<script type="text/javascript" src="../api/getPlaceList.js"></script>
<script type="text/javascript" src="js/getPlaceList.js"></script>
<div id="map"></div>
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDg4CkUEEt_96n1ork1nL5t4E_SpdKrgMI&libraries=places&callback=initMap" async defer></script>
<!-- Sticky Footer -->
<footer class="sticky-footer">
<div class="container my-auto">
......
//import position from 'getPlaceList'
import foodList from 'getPlaceList'
var entName = '';
var entType = '';
var entPhoto = '';
var card = '<div class="col-xl-6 col-sm-6 mb-3">'+
'<div class="card text-white bg-light o-hidden h-100">'+
'<div class="card-body"' + ' style="height:300px; background-size: 100% 100%; background-repeat: no-repeat; background-image:url(' + "'" + entPhoto + "');" + '">' + // place photo
'<div class="mr-5" id="nameDiv">'+entName+'</div>'+ // place name
'<div class="mr-5" id="typeDiv">'+entType+'</div>'+ // place type
'</div>'+
'</div>'+
'</div>';
for(var i=0; i<entList.size(); i++){
entName = entList[i][name];
entType = entList[i][type];
if(entList[i][photo]==null){
entPhoto = "noimage.png";
}
else{
entPhoto = entList[i][photo];
}
card+=card;
}
document.getElementById("body").innerHTML=card;
\ No newline at end of file
......