데이터베이스 오류 수정

정지윤
Commit e96c4ab2706ef3b0ab6b5f1a74a3de36b87bc21b e96c4ab2 1 parent 6f12697e
Showing 5 changed files with 46 additions and 32 deletions
public/img/그림1.jpg
routes/index.js
views/first.ejs
views/pay.ejs
views/reservation.ejs
--- a/public/img/그림1.jpg 0 → 100644
View file @e96c4ab
+++ b/public/img/그림1.jpg 0 → 100644
View file @e96c4ab
--- a/routes/index.js
View file @e96c4ab
+++ b/routes/index.js
View file @e96c4ab
@@ -30,9 +30,8 @@ router.post('/reservation',function(req, res){
   var restime = req.body.restime;
   var resmin = req.body.resmin;
   var date = req.body.date;
-
-  var content = req.body.content;
   var food = req.body.food;
+  var content = req.body.content;
   pool.getConnection(function (err, connection)
      {
          // Use the connection
@@ -40,6 +39,7 @@ 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.
          });
@@ -75,6 +75,7 @@ router.get('/db', function(req, res){
 /* GET home page. */
 router.get('/pay', function(req, res, next) {
   res.render('pay', { title: '결제' });
+     res.render('first');
 });
 module.exports = router;
--- a/views/first.ejs
View file @e96c4ab
+++ b/views/first.ejs
View file @e96c4ab
@@ -63,7 +63,7 @@
             <div class="col-lg-8 mx-auto">
               <h1 class="brand-heading" style="background-color: rgba( 0, 0, 0, 0.7 );">별빛바다 달빛초원</h1>
               <p class="intro-text">
-                <br>정지윤</p>
+                <br>아래로 내리세요</p>
               <a href="#about" class="btn btn-circle js-scroll-trigger">
                 <i class="fa fa-angle-double-down animated"></i>
               </a>
--- a/views/pay.ejs
View file @e96c4ab
+++ b/views/pay.ejs
View file @e96c4ab
@@ -44,7 +44,7 @@
       buyer_tel : '010-8762-3073',
       buyer_addr : '서울특별시 강남구 삼성동',
       buyer_postcode : '123-456',
-      m_redirect_url : 'https://localhost:3000/resconfirm'
+      m_redirect_url : 'http://localhost:3000/reservation'
     }, function(rsp) {
       if ( rsp.success ) {
           var msg = '결제가 완료되었습니다.';
@@ -52,11 +52,17 @@
           msg += '상점 거래ID : ' + rsp.merchant_uid;
           msg += '결제 금액 : ' + rsp.paid_amount;
           msg += '카드 승인번호 : ' + rsp.apply_num;
-      } else {
+
+          alert(msg);
+          document.location.href="/reservation";
+      }
+
+      else {
           var msg = '결제에 실패하였습니다.';
           msg += '에러내용 : ' + rsp.error_msg;
-      }
           alert(msg);
+          document.location.href="/first";
+      }
     });
   </script>
 </html>
--- a/views/reservation.ejs
View file @e96c4ab
+++ b/views/reservation.ejs
View file @e96c4ab
@@ -35,19 +35,35 @@
     }
     </style>
-      <section id="about" class="reservationTheme content-section ">
+
-        <div class="container">
+<div class="container">
           <br><br>
         <h2>Reservation <br>예약하기</h2>
           <br><br>
   <form class="well form-horizontal" action=" " method="post"  id="contact_form">
     <fieldset>
+      <form method="POST" action="/reservation">    <!-- Text input-->
-          <form method="POST" action="/reservation">
+          <!-- Button -->
-          <!-- Form Name -->
+          <div class="form-group">
+            <div class="inputGroupContainer ">
+            <label class="col-md-4 control-label"></label>
+            <div class="col-md-4">
+              잠깐! No Show 문제를 방지하기 위해 예약 전, 선금 2000원을 입금해야 합니다!
+                <a href="/pay" class="btn btn-default btn-lg">입금하기</a>
+                &nbsp;
+                <a href="/first" class="btn btn-default btn-lg">돌아가기</a>
+            </div>
+            </div>
+          </div>
-          <!-- Text input-->
+                <br>ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ
+                <br>
+                <br>
+                <br>
+
+              <!-- 이름-->
               <div class="form-group">
                   <div class="col-md-4 inputGroupContainer ">
                   <div class="input-group">
@@ -58,7 +74,6 @@
                   </div>
                 </div>
-
               <!-- 휴대전화-->
               <div class="form-group">
                 <div class="col-md-4 inputGroupContainer">
@@ -70,14 +85,11 @@
                 </div>
               </div>
-
+              <!-- 이메일주소-->
-
-        <!-- Text input-->
               <div class="form-group">
                 <div class="col-md-4 inputGroupContainer">
                 <div class="input-group">
                 <label class="col-md-4 control-label">이메일주소</label>
-
                     <i class="glyphicon glyphicon-envelope"></i>
                 <input name="email" placeholder="E-Mail Address" class="form-control"  type="text">
                   </div>
@@ -101,8 +113,6 @@
               </div>
               </div>
-
-
               <!--예약시간-->
               <div class="form-group">
                 <div class="col-md-4 selectContainer">
@@ -136,6 +146,7 @@
               </div>
               </div>
+              <!--달력-->
               <div class="form-group">
                 <div class="col-md-4 selectContainer">
                   <div class="input-group">
@@ -152,7 +163,7 @@
               </div>
               </div>
-
+              <!--예약날짜-->
               <div class="form-group">
                 <div class="col-md-4 selectContainer">
                 <div class="input-group">
@@ -206,12 +217,11 @@
                 </div>
               </div>
-    <!-- radio checks-->
+              <!-- 메뉴체크-->
               <div class="form-group">
              <div class="col-md-4 selectContainer">
                <div class="input-group">
               <label class="col-md-4 control-label">메뉴</label>
-
                     <div class="checkbox">
                         <label>
                            <image src = "/img/pizza.jpg" width=100 height=100>
@@ -227,7 +237,6 @@
                             <br><input type="checkbox" name="food" value="pasta" /> 파스타
                         </label>
                     </div>
-
                     &nbsp;
                     &nbsp;
                     &nbsp;
@@ -241,8 +250,9 @@
             </div>
               </div>
-
             <br>
+
+              <!-- 요청사항-->
               <div class="form-group">
                 <div class="col-md-4 selectContainer">
                 <div class="input-group">
@@ -251,25 +261,23 @@
                     <textarea class="form-control" name="content" placeholder="요청 사항을 적어주세요." style="width:310px; height:100px;"></textarea>
                 </div>
                 </div>
+              </div>
+              <br>ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ
-
+              <!-- 예약완료 버튼-->
-        <!-- Button -->
               <div class="form-group">
                 <label class="col-md-4 control-label"></label>
                 <div class="col-md-4">
-            잠깐! No Show 문제를 방지하기 위해 예약 전, 선금 2000원을 입금해야 합니다!
+                  <button type="submit" class="btn btn-warning" >예약 <span class="glyphicon glyphicon-send"></span></button>
-              <a href="/pay" class="btn btn-default btn-lg">입금하기</a>
-              <a href="/first" class="btn btn-default btn-lg">돌아가기</a>
                 </div>
-
               </div>
+
+
           </form>
           </fieldset>
       </form>
     </div>
-            </div>
-</script>
             <script>
@@ -347,7 +355,6 @@
                         return false;
                     }
-
                 }
             </script>