정지윤 / project_opensource

Go to a project
Toggle navigation Toggle navigation pinning
정지윤
51a00ddc 1 parent c099e225

예약화면 css 수정

Inline Side-by-side
Showing 19 changed files with 80 additions and 58 deletions
......@@ -12,4 +12,6 @@
url('/fonts/나눔손글씨 붓.svg#나눔손글씨 붓') format('svg')
src:local(※), url('/fonts/나눔손글씨 붓.woff') format('woff');
}
body{font-family:Lora,'Helvetica Neue',Helvetica,Arial,sans-serif;position:relative;width:100%;height:100%;color:#fff;background-color:#000}html{width:100%;height:100%}h1,h2,h3,h4,h5,h6{font-family:나눔손글씨 붓 ,'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:0 0 35px;letter-spacing:1px;text-transform:uppercase}p{font-size:16px;line-height:1.5;margin:0 0 25px}@media (min-width:768px){p{font-size:18px;line-height:1.6;margin:0 0 35px}}a{-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;transition:all .2s ease-in-out;color:#42dca3}a:focus,a:hover{text-decoration:none;color:#1d9b6c}#mainNav{font-family:Cabin,'Helvetica Neue',Helvetica,Arial,sans-serif;margin-bottom:0;text-transform:uppercase;border-bottom:1px solid rgba(255,255,255,.3);background-color:#000}#mainNav .navbar-toggler{font-size:14px;padding:11px;color:#fff;border:1px solid #fff}#mainNav .navbar-brand{font-weight:700}#mainNav a{color:#fff}#mainNav .navbar-nav .nav-item{-webkit-transition:background .3s ease-in-out;-moz-transition:background .3s ease-in-out;transition:background .3s ease-in-out}#mainNav .navbar-nav .nav-item:hover{color:fade(white,80%);outline:0;background-color:transparent}#mainNav .navbar-nav .nav-item:active,#mainNav .navbar-nav .nav-item:focus{outline:0;background-color:transparent}@media (min-width:992px){#mainNav{padding-top:20px;padding-bottom:20px;-webkit-transition:background .3s ease-in-out,padding-top .3s ease-in-out,padding-bottom .3s;-moz-transition:background .3s ease-in-out,padding-top .3s ease-in-out,padding-bottom .3s;transition:background .3s ease-in-out,padding-top .3s ease-in-out,padding-bottom .3s;letter-spacing:1px;border-bottom:none;background:0 0}#mainNav.navbar-shrink{padding-top:10px;padding-bottom:10px;border-bottom:1px solid rgba(255,255,255,.3);background:#000}#mainNav .nav-link.active{outline:0;background-color:rgba(255,255,255,.3)}#mainNav .nav-link.active:hover{color:#fff}}.masthead{display:table;width:100%;height:auto;padding:200px 0;text-align:center;color:#fff;background:url(../img/intro-bg.jpg) no-repeat bottom center scroll; background-color:#000;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.masthead .intro-body{display:table-cell;vertical-align:middle}.masthead .intro-body .brand-heading{font-size:50px}.masthead .intro-body .intro-text{font-size:18px}@media (min-width:768px){.masthead{height:100%;padding:0}.masthead .intro-body .brand-heading{font-size:100px}.masthead .intro-body .intro-text{font-size:22px}}.btn-circle{font-size:26px;width:55px;height:55px;margin-top:15px;line-height:45px;-webkit-transition:background .3s ease-in-out;-moz-transition:background .3s ease-in-out;transition:background .3s ease-in-out;color:#fff;border:2px solid #fff;border-radius:100%!important;background:0 0}.btn-circle:focus,.btn-circle:hover{color:#fff;outline:0;background:rgba(255,255,255,.1)}.content-section{padding-top:150px;padding-bottom:150px}.download-section{color:#fff;background:url(../img/downloads-bg.jpg) no-repeat center center scroll;background-color:#000;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}#map{width:100%;height:300px}@media (min-width:992px){.content-section{padding-top:200px;padding-bottom:200px}#map{height:350px}}.btn{font-family:Cabin,'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;-webkit-transition:all .3s ease-in-out;-moz-transition:all .3s ease-in-out;transition:all .3s ease-in-out;text-transform:uppercase;border-radius:0}.btn-default{color:#42dca3;border:1px solid #42dca3;background-color:transparent}.btn-default:focus,.btn-default:hover{color:#000;border:1px solid #42dca3;outline:0;background-color:#42dca3}ul.banner-social-buttons{margin-top:0}@media (max-width:1199px){ul.banner-social-buttons{margin-top:15px}}@media (max-width:767px){ul.banner-social-buttons li{display:block;margin-bottom:20px;padding:0}ul.banner-social-buttons li:last-child{margin-bottom:0}}footer{padding:50px 0}footer p{font-size:14px;margin:0}::-moz-selection{background:#fcfcfc;background:rgba(255,255,255,.2);text-shadow:none}::selection{background:#fcfcfc;background:rgba(255,255,255,.2);text-shadow:none}img::selection{background:0 0}img::-moz-selection{background:0 0}body{-webkit-tap-highlight-color:rgba(255,255,255,.2)}
body{font-family:Lora,'Helvetica Neue',Helvetica,Arial,sans-serif;position:relative;width:100%;height:100%;color:#fff;background-color:#000}
html{width:100%;height:100%}
h1,h2,h3,h4,h5,h6{font-family:나눔손글씨 붓 ,'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:0 0 35px;letter-spacing:1px;text-transform:uppercase}p{font-size:16px;line-height:1.5;margin:0 0 25px;font-family:나눔스퀘어}@media (min-width:768px){p{font-size:18px;line-height:1.6;margin:0 0 35px}}a{-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;transition:all .2s ease-in-out;color:#42dca3}a:focus,a:hover{text-decoration:none;color:#1d9b6c}#mainNav{font-family:Cabin,'Helvetica Neue',Helvetica,Arial,sans-serif;margin-bottom:0;text-transform:uppercase;border-bottom:1px solid rgba(255,255,255,.3);background-color:#000}#mainNav .navbar-toggler{font-size:14px;padding:11px;color:#fff;border:1px solid #fff}#mainNav .navbar-brand{font-weight:700}#mainNav a{color:#fff}#mainNav .navbar-nav .nav-item{-webkit-transition:background .3s ease-in-out;-moz-transition:background .3s ease-in-out;transition:background .3s ease-in-out}#mainNav .navbar-nav .nav-item:hover{color:fade(white,80%);outline:0;background-color:transparent}#mainNav .navbar-nav .nav-item:active,#mainNav .navbar-nav .nav-item:focus{outline:0;background-color:transparent}@media (min-width:992px){#mainNav{padding-top:20px;padding-bottom:20px;-webkit-transition:background .3s ease-in-out,padding-top .3s ease-in-out,padding-bottom .3s;-moz-transition:background .3s ease-in-out,padding-top .3s ease-in-out,padding-bottom .3s;transition:background .3s ease-in-out,padding-top .3s ease-in-out,padding-bottom .3s;letter-spacing:1px;border-bottom:none;background:0 0}#mainNav.navbar-shrink{padding-top:10px;padding-bottom:10px;border-bottom:1px solid rgba(255,255,255,.3);background:#000}#mainNav .nav-link.active{outline:0;background-color:rgba(255,255,255,.3)}#mainNav .nav-link.active:hover{color:#fff}}.masthead{display:table;width:100%;height:auto;padding:200px 0;text-align:center;color:#fff;background:url(../img/intro-bg.jpg) no-repeat bottom center scroll; background-color:#000;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.masthead .intro-body{display:table-cell;vertical-align:middle}.masthead .intro-body .brand-heading{font-size:50px}.masthead .intro-body .intro-text{font-size:18px}@media (min-width:768px){.masthead{height:100%;padding:0}.masthead .intro-body .brand-heading{font-size:100px}.masthead .intro-body .intro-text{font-size:22px}}.btn-circle{font-size:26px;width:55px;height:55px;margin-top:15px;line-height:45px;-webkit-transition:background .3s ease-in-out;-moz-transition:background .3s ease-in-out;transition:background .3s ease-in-out;color:#fff;border:2px solid #fff;border-radius:100%!important;background:0 0}.btn-circle:focus,.btn-circle:hover{color:#fff;outline:0;background:rgba(255,255,255,.1)}.content-section{padding-top:150px;padding-bottom:150px}.download-section{color:#fff;background:url(../img/sushi.jpg) no-repeat center center scroll;background-color:#000;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}#map{width:100%;height:300px}@media (min-width:992px){.content-section{padding-top:200px;padding-bottom:200px}#map{height:350px}}.btn{font-family:Cabin,'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;-webkit-transition:all .3s ease-in-out;-moz-transition:all .3s ease-in-out;transition:all .3s ease-in-out;text-transform:uppercase;border-radius:0}.btn-default{color:#42dca3;border:1px solid #42dca3;background-color:transparent}.btn-default:focus,.btn-default:hover{color:#000;border:1px solid #42dca3;outline:0;background-color:#42dca3}ul.banner-social-buttons{margin-top:0}@media (max-width:1199px){ul.banner-social-buttons{margin-top:15px}}@media (max-width:767px){ul.banner-social-buttons li{display:block;margin-bottom:20px;padding:0}ul.banner-social-buttons li:last-child{margin-bottom:0}}footer{padding:50px 0}footer p{font-size:14px;margin:0}::-moz-selection{background:#fcfcfc;background:rgba(255,255,255,.2);text-shadow:none}::selection{background:#fcfcfc;background:rgba(255,255,255,.2);text-shadow:none}img::selection{background:0 0}img::-moz-selection{background:0 0}body{-webkit-tap-highlight-color:rgba(255,255,255,.2)}
......
No preview for this file type
This file is too large to display.
......@@ -40,7 +40,6 @@ router.post('/reservation',function(req, res){
connection.query(sqlForInsertBoard, function (err, rows) {
if (err) console.error("err : " + err);
console.log("rows : " + JSON.stringify(rows));
res.redirect('/resconfirm');
connection.release();
// Don't use the connection here, it has been returned to the pool.
});
......
......@@ -38,11 +38,9 @@
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#about">About</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#menu">Menu</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#download">Reservation</a>
</li>
......@@ -50,7 +48,7 @@
<a class="nav-link js-scroll-trigger" href="#contact">Contact</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#map">Map</a>
<a class="nav-link js-scroll-trigger" href="#Map">Map</a>
</li>
</ul>
</div>
......@@ -76,20 +74,20 @@
</header>
<!-- About Section -->
<section id="about" class=" content-section text-center">
<section id="about" class=" content-section text-center" >
<div class="container">
<div class="row">
<div class="col-lg-8 mx-auto">
<h2>About 별빛바다 달빛초원</h2>
<h1>About</h1>
<p>
<a href="http://startbootstrap.com/template-overviews/grayscale/">01</a>.
<br>건강한 식재료와 제철 음식을 지향합니다.</p>
<a href="https://www.facebook.com/starbada/">01</a>
<br>노량진수산시장보다 싱싱하다! 푸짐하다! 싸다!</p>
<p>
<a href="http://gratisography.com/">02</a>
<a href="https://www.facebook.com/starbada/">02</a>
<br>활어회/신선한 초밥/해산물 잔뜩 요리전문점</p>
<p>
<a href="http://snazzymaps.com/">03</a>.
<a href="https://www.facebook.com/starbada/">03</a>
<br>수원에서 가장 깔끔하고 싱싱한 횟집</p>
</div>
</div>
......@@ -100,11 +98,10 @@
<!-- Menu Section -->
<section id="menu" class=" content-section text-center">
<div class="container">
<section id="menu" class="download-section content-section text-center">
<div class="row">
<div class="col-lg-8 mx-auto">
<h2>Menu</h2>
<div class="col-lg-8 mx-auto" >
<h1>Menu</h1>
<p>별빛바다 달빛초원은 항상 싱싱한 생선만 손질합니다.</p>
<a href="/menu" class="btn btn-default btn-lg">메뉴 보러가기</a>
</div>
......@@ -115,24 +112,25 @@
<!-- Download Section -->
<section id="download" class="download-section content-section text-center">
<section id="download" class=" content-section text-center">
<div class="container">
<div class="col-lg-8 mx-auto">
<h2>Reservation</h2>
<h1>Reservation</h1>
<p>예약은 1주일 안에만 가능합니다.</p>
<a href="/reservation" class="btn btn-default btn-lg">예약하기</a>
</div>
</div>
</section>
<!-- Contact Section -->
<section id="contact" class="content-section text-center">
<section id="contact" class="download-section content-section text-center">
<div class="container">
<div class="row">
<div class="col-lg-8 mx-auto">
<h2>Contact 별빛바다 달빛초원</h2>
<p>전화번호 : 031-205-7220</p>
<p>영업시간 : 매일 10:00 - 23:30 (Last Order 22:00)</p>
<h1>Contact</h1>
<p>전화번호 : 031-203-7220
<br>영업시간 : 매일 오전 11:00~ 오후 11:30 (Last Order 22:00)</p>
<ul class="list-inline banner-social-buttons">
<li class="list-inline-item">
<a href="https://www.facebook.com/starbada/" class="btn btn-default btn-lg">
......@@ -155,20 +153,18 @@
<!-- Map Section -->
<section id="contact" class="content-section text-center">
<div class="container">
<div class="row">
<div class="col-lg-8 mx-auto">
<h2>찾아오시는 길</h2>
</div>
</div>
</div>
<div id="map"></div>
<!-- Google Maps API Key - Use your own API key to enable the map feature. More information on the Google Maps API can be found at https://developers.google.com/maps/ -->
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCRngKslUGJTlibkQ3FkfTxj3Xss1UlZDA&sensor=false"></script>
<section id="Map" class="content-section text-center">
<div class="row">
<div class="col-lg-8 mx-auto text-center">
<h1>찾아오시는 길</h1>
<p>경기도 수원시 영통구 영통동 1025-1(경기도 수원시 영통구 청명로 28) 1층 별빛바다 달빛초원</p>
<section id="map" class="content-section text-center">
<style>
#map {
height: 400px;
......@@ -176,16 +172,6 @@
}
</style>
<body>
<p>경기도 수원시 영통구 영통동 1025-1(경기도 수원시 영통구 청명로 28) 1층 별빛바다 달빛초원</p>
<section id="contact" class="content-section text-center">
<div class="container">
<div class="row">
<div class="col-lg-8 mx-auto">
</div>
</div>
</div>
</section>
<div id="map"></div>
<script>
function initMap() {
......@@ -204,6 +190,9 @@
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAQobMFr9MjpbzdMVmL8qgTHLko3S00DGk&callback=initMap">
</script>
</body>
</div>
</div>
</div>
<script>
function initMap() {
......@@ -222,12 +211,14 @@
});
}
</script>
</section>
</div>
</div>
</section>
<!-- Footer -->
<footer>
<div class="container text-center">
<image src = "/img/수정됨_로고2.jpg">
<p>Copyright &copy;정지윤 오픈소스 프로젝트</p>
</div>
</footer>
......
......@@ -34,7 +34,7 @@
<section id="about" class="reservationTheme content-section ">
<div class="container">
<br><br>
<h2>Reservation</h2>
<h2>Reservation <br>예약하기</h2>
<br><br>
<form class="well form-horizontal" action=" " method="post" id="contact_form">
<fieldset>
......@@ -254,7 +254,9 @@
<div class="form-group">
<label class="col-md-4 control-label"></label>
<div class="col-md-4">
<button type="submit" class="btn btn-default btn-lg" >예약하기 <span class="glyphicon glyphicon-send "></span></button>
잠깐! No Show 문제를 방지하기 위해 예약 전, 선금 2000원을 입금해야 합니다!
<a href="/pay" class="btn btn-default btn-lg">입금하기</a>
<a href="/first" class="btn btn-default btn-lg">돌아가기</a>
</div>
</div>
......@@ -265,7 +267,6 @@
</div>
</script>
<script type="text/javascript" src="/mail"></script>
<script>
function onWriteSubmit()
......
<!DOCTYPE html>
<html lang="en">
<html>
<head>
<title><%= title %></title>
<meta charset="utf-8">
<!-- Bootstrap core CSS -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom fonts for this template -->
<link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet" type="text/css">
<link href='https://fonts.googleapis.com/css?family=Cabin:700' rel='stylesheet' type='text/css'>
<!-- Custom styles for this template -->
<link href="css/grayscale.min.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<link rel="stylesheet" href="https://jqueryui.com/resources/demos/style.css">
<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<title>결제창</title>
<link rel='stylesheet' href='/stylesheets/style.css' />
<script type="text/javascript" src="https://code.jquery.com/jquery-1.12.4.min.js" ></script>
<script type="text/javascript" src="https://service.iamport.kr/js/iamport.payment-1.1.5.js"></script>
......@@ -17,14 +37,14 @@
pg : 'kakao', // version 1.1.0부터 지원.
pay_method : 'card',
merchant_uid : 'merchant_' + new Date().getTime(),
name : '주문명:결제테스트',
amount : 100,
name : '별빛바다 달빛초원 선금',
amount : 2000,
buyer_email : 'jju0807@naver.com',
buyer_name : '정지윤',
buyer_tel : '010-8762-3073',
buyer_addr : '서울특별시 강남구 삼성동',
buyer_postcode : '123-456',
m_redirect_url : 'https://localhost:3000'
m_redirect_url : 'https://localhost:3000/resconfirm'
}, function(rsp) {
if ( rsp.success ) {
var msg = '결제가 완료되었습니다.';
......
File mode changed
......@@ -27,14 +27,18 @@
<style type="text/css">
.reservationTheme{
background:url('/img/res2.jpg') no-repeat;
background:url('/img/12.jpg') no-repeat center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}
</style>
<section id="about" class="reservationTheme content-section ">
<div class="container">
<br><br>
<h2>Thank you!</h2>
<h5>예약이 성공적으로 완료되었습니다</h5>
<h1>Thank you!</h1>
<h2>감사합니다! <br>예약이 성공적으로 완료되었습니다</h2>
<div class="form-group">
<label class="col-md-4 control-label"></label>
......
......@@ -27,14 +27,18 @@
<style type="text/css">
.reservationTheme{
background:url('/img/res2.jpg') no-repeat;
background:url('/img/diapo1.jpg') no-repeat center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}
</style>
<section id="about" class="reservationTheme content-section ">
<div class="container">
<br><br>
<h2>Reservation</h2>
<h2>Reservation <br>예약하기</h2>
<br><br>
<form class="well form-horizontal" action=" " method="post" id="contact_form">
<fieldset>
......@@ -254,7 +258,9 @@
<div class="form-group">
<label class="col-md-4 control-label"></label>
<div class="col-md-4">
<button type="submit" class="btn btn-default btn-lg" >예약하기 <span class="glyphicon glyphicon-send "></span></button>
잠깐! No Show 문제를 방지하기 위해 예약 전, 선금 2000원을 입금해야 합니다!
<a href="/pay" class="btn btn-default btn-lg">입금하기</a>
<a href="/first" class="btn btn-default btn-lg">돌아가기</a>
</div>
</div>
......@@ -265,7 +271,6 @@
</div>
</script>
<script type="text/javascript" src="/mail"></script>
<script>
function onWriteSubmit()
......