Fix conflict

@@ -3,6 +3,10 @@ const Sequelize = require('sequelize');
 module.exports = class Comment extends Sequelize.Model {
 module.exports = class Comment extends Sequelize.Model {
     static init(sequelize) {
     static init(sequelize) {
         return super.init({
         return super.init({
+            postid:{
+                type: Sequelize.INTEGER,
+                allowNull: false,
+            },
             userid:{
             userid:{
                 type: Sequelize.STRING(30),
                 type: Sequelize.STRING(30),
                 allowNull: false,
                 allowNull: false,
@@ -31,6 +35,6 @@ module.exports = class Comment extends Sequelize.Model {
 
 
 
 
     static associate(db) {
     static associate(db) {
-        db.Comment.belongsTo(db.Post,{foreignKey: 'postid', targetKey:'id' });
+        //db.Comment.belongsTo(db.Post,{foreignKey: 'postid', targetKey:'id' });
     }
     }
 };
 };
\ No newline at end of file

@@ -35,6 +35,6 @@ 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' });
-        db.Post.hasMany(db.Post,{foreignKey: 'postid', sourceKey:'id' });
+        //db.Post.hasMany(db.Post,{foreignKey: 'postid', sourceKey:'id' });
     }
     }
 };
 };
\ No newline at end of file

@@ -11,7 +11,7 @@ const {Comment}=require('../models');
 router.get('/:boardId',auth,(req,res)=>{
 router.get('/:boardId',auth,(req,res)=>{
 
 
     Comment.findAll({
     Comment.findAll({
-        where:{postid: req.params.boardId},
+        where:{postid: req.params.id},
         order: [['created_at', 'ASC']],
         order: [['created_at', 'ASC']],
      })
      })
      .then((result)=>{
      .then((result)=>{
@@ -36,7 +36,7 @@ router.post('/:boardId',auth,(req,res)=>{
     try{
     try{
     Comment.create({
     Comment.create({
         userid : req.session.name,
         userid : req.session.name,
-        postid : req.params.boardId,
+        postid : req.body.id,
         comment : req.body.comment,
         comment : req.body.comment,
     })
     })
     console.log("게시");
     console.log("게시");

@@ -10,8 +10,8 @@ const {Post}=require('../models'); //게시물정보 db연결
 router.get('/',auth,(req,res)=>{
 router.get('/',auth,(req,res)=>{
 
 
     Post.findAll({
     Post.findAll({
-        where:{userid: req.session.name},
-        order: [['created_at', 'DESC']],
+        // where:{userid: req.session.name},
+        // order: [['created_at', 'DESC']],
      })
      })
      .then((result)=>{
      .then((result)=>{
         //console.log(result);
         //console.log(result);

 import Axios from 'axios';
 import Axios from 'axios';
 import React, { useState, useEffect} from 'react';
 import React, { useState, useEffect} from 'react';
 import '../style/Board.scss'
 import '../style/Board.scss'
-import ReactHtmlParser from 'react-html-parser';
+
 import BoardModal from "../Modal/BoardModal";
 import BoardModal from "../Modal/BoardModal";
 import ContentModal from '../Modal/ContentModal';
 import ContentModal from '../Modal/ContentModal';
 
 

@@ -4,6 +4,7 @@ import { Button, Modal } from 'semantic-ui-react'
 import {CKEditor} from "@ckeditor/ckeditor5-react";
 import {CKEditor} from "@ckeditor/ckeditor5-react";
 import ClassicEditor from "@ckeditor/ckeditor5-build-classic";
 import ClassicEditor from "@ckeditor/ckeditor5-build-classic";
 
 
+
 function BoardModal() {
 function BoardModal() {
     const handleClose = (event) => {
     const handleClose = (event) => {
         event.preventDefault();
         event.preventDefault();

@@ -17,22 +17,19 @@ function ContentModal({element}) {
         setOpen(false);
         setOpen(false);
     }
     }
     const [open, setOpen] = useState(false)
     const [open, setOpen] = useState(false)
-    const [BoardComment, setBoardComment] = useState({
-        id: null,
-        content:''
-    })
+    const [BoardComment, setBoardComment] = useState('')
     const onCommentHandler = (event) => {
     const onCommentHandler = (event) => {
         setBoardComment(event.currentTarget.value)
         setBoardComment(event.currentTarget.value)
         console.log(BoardComment)
         console.log(BoardComment)
     }
     }
-    const onSubmitHandler = () => {
-        Axios.post('/api/comment',{
-                    id: element.id,
+    const onSubmitHandler = () => { 
+        Axios.post(`/api/comment${element.id}`,{
                     content: BoardComment
                     content: BoardComment
                 })
                 })
                 .then((res)=>{
                 .then((res)=>{
                     if(res.status === 200){
                     if(res.status === 200){
                         alert("댓글 작성을 완료하였습니다.")
                         alert("댓글 작성을 완료하였습니다.")
+                        setOpen(false);
                     }
                     }
                 }).catch((error) => {
                 }).catch((error) => {
                     console.log(error.response)
                     console.log(error.response)
@@ -59,18 +56,18 @@ 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">
-                                <h2>{elem.title}</h2>
-                                <h4>{elem.created_at.slice(0,10)+" " +elem.created_at.slice(11,16)}</h4>
+                                <h2>{elem.id}</h2>
+                                <h4>{elem.comment}</h4>
                             </div>}
                             </div>}
                         )}
                         )}
             </Modal.Content>
             </Modal.Content>
             <Modal.Actions>
             <Modal.Actions>
                 <Comment>
                 <Comment>
                 <Form reply>
                 <Form reply>
-                    <Form.TextArea onChange={onCommentHandler}/>
+                    <Form.TextArea value={BoardComment} onChange={onCommentHandler}/>
                     <div onClick={handleClose}>
                     <div onClick={handleClose}>
-                        <Button content='댓글 남기기' labelPosition='left' icon='edit' primary onSubmit={onSubmitHandler}/>
-                        <Button color='black'>닫기</Button>
+                        <Button content='댓글 남기기' onClick={onSubmitHandler} labelPosition='left' icon='edit' primary />
+                        <Button onClick={handleClose} color='black'>닫기</Button>
                     </div>
                     </div>
                 </Form>
                 </Form>
                 </Comment>
                 </Comment>

@@ -9,7 +9,7 @@
     display: flex;
     display: flex;
     flex-direction: row;
     flex-direction: row;
     height: 70px;
     height: 70px;
-    width: 100%;
+    
     .title{
     .title{
       display: flex;
       display: flex;
       justify-content: center;
       justify-content: center;

@@ -43,16 +43,6 @@
       color: white;
       color: white;
       outline: none;
       outline: none;
     }
     }
-    .dropdown{
-      width: 75%;
-      padding: 15px .8em .8em;
-      background-color: transparent;
-      border: 2px solid white;
-      border-radius: 30px;
-      font-size: 18px;
-      color: white;
-      outline: none;
-    }
 
 
     label {
     label {
       position: absolute;
       position: absolute;