Merge branch 'master' of http://khuhub.khu.ac.kr/2019102198/Tunnel

@@ -35,6 +35,9 @@ module.exports = class Post extends Sequelize.Model {
 
 
     static associate(db) {
     static associate(db) {
         db.Post.belongsTo(db.User,{foreignKey: 'userid', targetKey:'name' });
         db.Post.belongsTo(db.User,{foreignKey: 'userid', targetKey:'name' });
+<<<<<<< HEAD
         //db.Post.hasMany(db.Post,{foreignKey: 'postid', sourceKey:'id' });
         //db.Post.hasMany(db.Post,{foreignKey: 'postid', sourceKey:'id' });
+=======
+>>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
     }
     }
 };
 };
\ No newline at end of file

@@ -7,11 +7,16 @@ const {User}=require('../models'); //유저정보 db연결
 const {Post}=require('../models'); //게시물정보 db연결
 const {Post}=require('../models'); //게시물정보 db연결
 const {Comment}=require('../models');
 const {Comment}=require('../models');
 
 
+
 //현재 로그인된 사용자의 게시물 배열 응답
 //현재 로그인된 사용자의 게시물 배열 응답
-router.get('/:boardId',auth,(req,res)=>{
+router.post('/reply',auth,(req,res)=>{
 
 
     Comment.findAll({
     Comment.findAll({
+<<<<<<< HEAD
         where:{postid: req.params.id},
         where:{postid: req.params.id},
+=======
+        where:{postid: req.body.id},
+>>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
         order: [['created_at', 'ASC']],
         order: [['created_at', 'ASC']],
      })
      })
      .then((result)=>{
      .then((result)=>{
@@ -29,14 +34,17 @@ router.get('/:boardId',auth,(req,res)=>{
      })
      })
 });
 });
 
 
-
-
 //게시물 작성
 //게시물 작성
-router.post('/:boardId',auth,(req,res)=>{
+router.post('/write',auth,(req,res)=>{
+    console.log(req.params.id);
     try{
     try{
     Comment.create({
     Comment.create({
         userid : req.session.name,
         userid : req.session.name,
+<<<<<<< HEAD
         postid : req.body.id,
         postid : req.body.id,
+=======
+        postid : req.body.postid,
+>>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
         comment : req.body.comment,
         comment : req.body.comment,
     })
     })
     console.log("게시");
     console.log("게시");
@@ -56,4 +64,8 @@ router.post('/:boardId',auth,(req,res)=>{
 });
 });
 
 
      
      
+
+
+
+
 module.exports = router;
 module.exports = router;
\ No newline at end of file

@@ -8,10 +8,13 @@ const {Post}=require('../models'); //게시물정보 db연결
 
 
 //현재 로그인된 사용자의 게시물 배열 응답
 //현재 로그인된 사용자의 게시물 배열 응답
 router.get('/',auth,(req,res)=>{
 router.get('/',auth,(req,res)=>{
-
     Post.findAll({
     Post.findAll({
         // where:{userid: req.session.name},
         // where:{userid: req.session.name},
+<<<<<<< HEAD
         // order: [['created_at', 'DESC']],
         // order: [['created_at', 'DESC']],
+=======
+        order: [['created_at', 'DESC']],
+>>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
      })
      })
      .then((result)=>{
      .then((result)=>{
         //console.log(result);
         //console.log(result);

@@ -7,7 +7,7 @@ import '../style/ContentModal.scss'
 function ContentModal({element}) {
 function ContentModal({element}) {
     const [viewComment,setviewComment] = useState([]);
     const [viewComment,setviewComment] = useState([]);
     useEffect(()=>{
     useEffect(()=>{
-        Axios.get('/api/comment/'+element.id).then((response)=>{
+        Axios.post('/api/comment/reply',{id : element.id}).then((response)=>{
             setviewComment(response.data);
             setviewComment(response.data);
         })
         })
       },[viewComment])
       },[viewComment])
@@ -17,14 +17,24 @@ function ContentModal({element}) {
         setOpen(false);
         setOpen(false);
     }
     }
     const [open, setOpen] = useState(false)
     const [open, setOpen] = useState(false)
+<<<<<<< HEAD
     const [BoardComment, setBoardComment] = useState('')
     const [BoardComment, setBoardComment] = useState('')
+=======
+    const [BoardComment, setBoardComment] = useState("")
+>>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
     const onCommentHandler = (event) => {
     const onCommentHandler = (event) => {
         setBoardComment(event.currentTarget.value)
         setBoardComment(event.currentTarget.value)
         console.log(BoardComment)
         console.log(BoardComment)
     }
     }
     const onSubmitHandler = () => { 
     const onSubmitHandler = () => { 
+<<<<<<< HEAD
         Axios.post(`/api/comment${element.id}`,{
         Axios.post(`/api/comment${element.id}`,{
                     content: BoardComment
                     content: BoardComment
+=======
+        Axios.post('/api/comment/write',{
+                postid: element.id,    
+                comment: BoardComment
+>>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
                 })
                 })
                 .then((res)=>{
                 .then((res)=>{
                     if(res.status === 200){
                     if(res.status === 200){
@@ -56,7 +66,11 @@ function ContentModal({element}) {
             <Modal.Content>
             <Modal.Content>
                  {viewComment&&viewComment.map(elem =>{
                  {viewComment&&viewComment.map(elem =>{
                     return <div className="ui segment">
                     return <div className="ui segment">
+<<<<<<< HEAD
                                 <h2>{elem.id}</h2>
                                 <h2>{elem.id}</h2>
+=======
+                                <h2>{elem.userid}</h2>
+>>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
                                 <h4>{elem.comment}</h4>
                                 <h4>{elem.comment}</h4>
                             </div>}
                             </div>}
                         )} 
                         )}