과제)댓글기능추가

README.md

@@ -9,3 +9,7 @@ npm install
 ```
 supervisor app.js
 ```
+
+랄랄랄ㄹ랄랄
+오늘은 어려운 거를 하는구나 참으로 어렵구ㅏ 
+push 되는지 확인해야지

app.js

@@ -20,7 +20,7 @@ var mysql = require('mysql');
 var conn = mysql.createConnection({
   host     : 'localhost',
   user     : 'root',
-  password : 'mysql1234',
+  password : 'Djajsk!8520',
   database : 'news_stack',
   port: 3306  /* 8889 on Mac client */
 });
@@ -67,6 +67,8 @@ app.use('/account', account);
 var account = require('./routes/admin.js')(app, conn, upload);
 app.use('/admin', account);
 
+
+
 /* Port listening */
 app.listen(port, () => console.log(
     `Server is running... http://localhost:${port}`

routes/account.js

@@ -3,7 +3,7 @@ module.exports = function(app, conn){
   var router = express.Router();
   var md5 = require('md5');
 
-  /* Login */
+  /* Login */ /*로그인 실제 화면*/ 
   router.get('/login', (req, res) => {
     res.render('account/login', {});
   });

routes/news.js

@@ -124,11 +124,25 @@ module.exports = function(app, conn, upload) {
       }
     });
   });
+
+  /*  Delete confirmation */
+  router.get('/:id/cdelete', (req, res) => {
+    var id = req.params.id;
+    var sql = 'SELECT * FROM comments WHERE id=?';
+    conn.query(sql, [id], function(err, comments, fields){
+      if(err){
+        console.log(err);
+        res.status(500).send('Internal Server Error: ' + err);
+      } else {
+        res.render('news/cdelete', {comments:comments[0]});
+      }
+    });
+  });
+
 
   /* DELETE DB row */
   router.post('/:id/delete', (req, res) => {
     var id = req.params.id;
-
     var sql = 'DELETE FROM article WHERE id = ?';
     conn.query(sql, [id], function(err, result, fields){
       if(err){
@@ -140,6 +154,20 @@ module.exports = function(app, conn, upload) {
     });
   });
 
+  /*댓글 DELETE DB row*/
+  router.post('/:id/cdelete', (req, res) => {
+    var id = req.params.id;
+    var sql = 'DELETE FROM comments WHERE id = ?';
+    conn.query(sql, [id], function(err, result, fields){
+      if(err){
+        console.log(err);
+        res.status(500).send('Internal Server Error: ' + err);
+      } else {
+        res.redirect('/news/');
+      }
+    });
+  });
+
   /* 상세보기 */
   router.get('/:id', (req, res) => {
     var id = req.params.id;
@@ -153,12 +181,54 @@ module.exports = function(app, conn, upload) {
         console.log(err);
         res.status(500).send('Internal Server Error: ' + err);
       } else {
-        res.render('news/detail', {
-          news: news[0],
+          var sql = "SELECT `comments` FROM `comments`";
+            conn.query(sql, [], function(err, comments, fields){
+            if(err){
+              console.log(err);
+              res.status(500).send('Internal Server Error: ' + err);
+            } else {
+              var array = [];
+              for(i=0; i<comments.length; i++)
+              array.push(comments[i]);
+              res.render('news/detail', {
+              news: news[0],
+              comments: comments
+            });
+          }
         });
       }
     });
   });
+  router.post('/:id/', (req, res) => {
+    console.log(req.body);
+    var id = req.params.id;
+    var comments = req.body.comments;
+    var sql = 'INSERT INTO `comments` (`comments`) VALUES(?)';
+    conn.query(sql, [comments], function(err, result, fields){
+      if(err){
+        console.log(err);
+        res.status(500).send('Internal Server Error: ' + err);
+      } else {
+        res.redirect('/news/'+id);
+      }
+    });
+  });
+
+
+  router.post('comments/:id/delete', (req, res) => {
+    var id = req.params.id;
+
+    var sql = 'DELETE FROM comments WHERE id = ?';
+    conn.query(sql, [id], function(err, result, fields){
+      if(err){
+        console.log(err);
+        res.status(500).send('Internal Server Error: ' + err);
+      } else {
+        res.redirect('/news/');
+      }
+    });
+  });
+
 
   return router;
-};
+}; 

routes/root.js

@@ -9,3 +9,5 @@ module.exports = function(app, conn){
 
   return router;
 };
+
+

views/news/cdelete.ejs

@@ -0,0 +1,16 @@
+<%- include('includes/header'); -%>
+<%- include('includes/nav'); -%>
+
+<div class="container">
+
+  <p><a href="/news">News Home</a></p>
+
+  <h1>댓글삭제하기</h1>
+  <p>Do you want to delete this comments?</p>
+
+  <form method="post" action='cdelete'>
+
+    <input type="submit" value="삭제">
+  </form>
+</div>
+<%- include('includes/footer'); -%>

views/news/delete.ejs

@@ -10,8 +10,10 @@
 
   <form method="post">
 
-    <input type="submit" value="삭제">
+    <input type="submit" action=“cdelete” value="삭제">
   </form>
 
 </div>
 <%- include('includes/footer'); -%>
+
+

views/news/detail.ejs

@@ -34,7 +34,7 @@
   </div>
 
   <div class="btn-toolbar justify-content-between" role="toolbar" aria-label="Toolbar with button groups">
-
+ 
     <div class="btn-group" role="group" aria-label="First group">
       <a href="/news/<%= news.id %>/edit" class="btn btn-outline-primary">수정</a>
       <a href="/news/<%= news.id %>/delete" class="btn btn-outline-secondary">삭제</a>
@@ -43,9 +43,14 @@
       <a href="/news/" class="btn btn-outline-info">목록</a>
     </div>
   </div>
+
+
+ <%- include('includes/comments'); -%>
+
+
 <% } else { %>
   <p>Not exist</p>
 <% } %>
+<%- include('includes/footer'); -%>
 
 </div>
-<%- include('includes/footer'); -%>

views/news/edit.ejs

@@ -41,3 +41,4 @@
   </form>
 </div>
 <%- include('includes/footer'); -%>
+

views/news/includes/comments.ejs

@@ -0,0 +1,72 @@
+<html>
+<head>
+</head>
+<body>
+<div class="container">
+<table class="table table-bordered">
+
+        <br>
+        <br>
+        <hr>
+
+
+
+<table> 
+    <div class="container">
+        <div class="row">
+            <div class="panel panel-default widget">
+                <div class="panel-heading">
+                    <span class="glyphicon glyphicon-comment"></span>
+                    <h3 class="panel-title">
+                        댓글 내용</h3>
+                </div>
+            </div>
+        </div>
+    </div>
+</table>
+
+<form method='post'>
+    <hr>
+    <% if (news) { %>
+        <% for(var i=0; i < comments.length; i++) { %>
+        <div class="panel-body">
+                    <div class="row" style="margin-left: 5px">
+                        <div class="comments_container">
+                            <div class="comments-text">
+                                    <%= comments[i].comments %>
+                            </div>
+                            <div class="action">
+                                <a href="/news.id/cedit" class="btn btn-outline-primary" >수정</a>
+                                <a href="/news/<%= news.id %>/cdelete" class="btn btn-outline-secondary" >삭제</a>
+
+                            </div>
+                        </div>
+                    </div>
+        </div>
+        <hr>
+        <% } %>
+        <% } %>
+    <tr>
+        <p style="font-size:28px;">댓글 쓰기</p>
+        <td><textarea cols="10" placeholder="내용을 입력하세요. "name="comments" class="form-control"></textarea></td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <input type='submit' value="등록" class='pull-right'></a>
+            <input type="button" value="reset" class="pull-left"/>
+        </td>
+    </tr>
+</form>
+
+
+<p><a href="/news">News Home</a></p>
+
+
+</div>
+</body>
+</html>
+
+
+
+
+

views/news/includes/nav.ejs

@@ -21,7 +21,7 @@
     <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
       <li class="nav-item">
         <a class="nav-item nav-link mr-md-2" href="#" id="bd-versions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <%= locals.user.email %>
+          <%= locals.user.email %> <!--서버측에 저장 되어있고 그것들을 가져온다. -->
         </a>
       </li>
       <li class="nav-item">

views/news/index.ejs

@@ -52,4 +52,5 @@
     </div>
   </div>
 </div>
-<%- include('includes/footer'); -%>
+
+