Merge remote-tracking branch 'origin/main' into wordDict

2025-02-18 11:15:57 +09:00 · 2025-02-18 11:15:57 +09:00 · e4c8c19d7b
commit e4c8c19d7b
parent 10d1aa4d8c ce2ccde4fd
19 changed files with 1003 additions and 395 deletions
--- a/public/css/custom.css
+++ b/public/css/custom.css
@ -80,4 +80,10 @@
  .grayscaleImg {
    filter: grayscale(100%);
  }
+  
+  
+   /* scrollbar 안보이게 */
+  .scrollbar-none {
+    scrollbar-width: none; 
+  }
  
--- a/src/components/board/BoardComment.vue
+++ b/src/components/board/BoardComment.vue
@ -1,60 +1,105 @@
 <template>
    <div>
-        <BoardProfile :profileName="comment.author" :showDetail="false" :author="true" :isChild="isChild" />
+        <BoardProfile
+            :unknown="unknown"
+            :boardId="comment.boardId"
+            :profileName="comment.author"
+            :date="comment.createdAt"
+            :comment="comment"
+            :showDetail="false"
+            :author="true"
+            :isLike="!isLike"
+            :isPassword="isPassword"
+            @editClick="editClick"
+            @deleteClick="deleteClick"
+            @submitPassword="submitPassword"
+            @updateReaction="handleUpdateReaction"
+            @toggleEdit="emit('toggleEdit', comment.commentId, true)"
+        />
+
+
        <div class="mt-6">
-            <p class="m-0">{{ comment.content }}</p>
+            <template v-if="isEditTextarea">
+                <textarea v-model="editedContent" class="form-control"></textarea>
+                <div class="mt-2 d-flex justify-content-end">
+                    <button class="btn btn-secondary me-2" @click="emit('toggleEdit', comment.commentId, false)">취소</button>
+                    <button class="btn btn-primary" @click="submitEdit">수정 완료</button>
+                </div>
+            </template>
+            <template v-else>
+                <p class="m-0">{{ comment.content }}</p>
+            </template>
        </div>
+
        <PlusButton v-if="isPlusButton" @click="toggleComment" class="mt-6"/>
-        <BoardComentArea v-if="isComment" @submit="submitComment"/>
+        <BoardCommentArea v-if="isComment" @submitComment="submitComment"/>

        <!-- 대댓글 -->
        <ul v-if="comment.children && comment.children.length" class="list-unstyled">
            <li
-                v-for="child in comment.children"
-                :key="child.id"
-                class="pt-8 ps-10"
+            v-for="child in comment.children"
+            :key="child.commentId"
+                class="mt-8 pt-6 ps-10 border-top"
            >
-                <BoardComment :comment="child" :isPlusButton="false" :isChild="true" @submitComment="addChildComment" />
+                <BoardComment
+                    :comment="child"
+                    :unknown="unknown"
+                    :isPlusButton="false"
+                    :isLike="true"
+                    @submitComment="submitComment"
+                    @updateReaction="handleUpdateReaction"
+                />
            </li>
        </ul>
        <!-- <ul class="list-unstyled twoDepth">
            <li>
                <BoardProfile profileName=곤데리2 :showDetail="false" />
                <div class="mt-2">저도 궁금합니다.</div>
-                <BoardComentArea v-if="comment" />
+                <BoardCommentArea v-if="comment" />
            </li>
        </ul> -->
        <!-- <BoardProfile profileName=곤데리 :showDetail="false" />
        <div class="mt-2">저도 궁금합니다.</div>
        <PlusButton  @click="toggleComment"/>
-        <BoardComentArea v-if="comment" /> -->
+        <BoardCommentArea v-if="comment" /> -->
    </div>
 </template>

 <script setup>
+import { defineProps, defineEmits, ref } from 'vue';
 import BoardProfile from './BoardProfile.vue';
-import BoardComentArea from './BoardComentArea.vue';
+import BoardCommentArea from './BoardComentArea.vue';
 import PlusButton from '../button/PlusBtn.vue';
-import { ref } from 'vue';
-import { defineEmits } from 'vue';

 const props = defineProps({
  comment: {
    type: Object,
    required: true,
  },
+  unknown: {
+        type: Boolean,
+        default: true,
+    },
  isPlusButton: {
    type: Boolean,
    default: true,
  },
-  isChild: {
+  isLike: {
    type: Boolean,
    default: false,
  },
+  isEditTextarea: {
+    type: Boolean,
+    default: false
+  },
+  isPassword: {
+    type: Boolean,
+    default: false,
+},
 });

 // emits 정의
-const emit = defineEmits(['submitComment']);
+const emit = defineEmits(['submitComment', 'updateReaction', 'toggleEdit', 'editClick']);

 // 댓글 입력 창 토글
 const isComment = ref(false);
@ -63,29 +108,31 @@ const toggleComment = () => {
 };

 // 부모 컴포넌트에 대댓글 추가 요청
-const addChildComment = (parentId, newComment) => {
-  emit('submitComment', parentId, newComment);
+const submitComment = (newComment) => {
+    emit('submitComment', { parentId: props.comment.commentId, ...newComment });
+
+    isComment.value = false;
 };

+// 좋아요, 싫어요
+const handleUpdateReaction = (reactionData) => {
+    emit('updateReaction', {
+        boardId: props.comment.boardId,
+        commentId: props.comment.commentId,
+        ...reactionData
+    });
+};
+
+// 수정
+const editClick = (data) => {
+    emit('editClick', data);
+};
+
+// 수정
+const editedContent = ref(props.comment.content);
+const submitEdit = () => {
+  emit('submitComment', { commentId: props.comment.commentId, content: editedContent.value });
+  emit('toggleEdit', props.comment.commentId, false); // 수정 모드 종료
+};

 </script>
-
-<style scoped>
-    /* .twoDepth {
-        margin-top: 10px;
-        padding-left: 40px;
-    }
-
-    .list-unstyled > li ~ li {
-        margin-top: 10px;
-    }
-
-    .btn-text-primary {
-        padding-left: 0;
-    }
-    .btn-text-primary:hover,
-    .btn-text-primary:active,
-    .btn-text-primary:focus {
-        background-color: transparent
-    } */
-</style>
--- a/src/components/board/BoardCommentList.vue
+++ b/src/components/board/BoardCommentList.vue
@ -2,47 +2,66 @@
    <ul class="list-unstyled mt-10">
        <li
            v-for="comment in comments"
-            :key="comment.id"
-            class="mt-8"
+            :key="comment.commentId"
+            class="mt-6 border-bottom pb-6"
        >
-            <BoardComment :comment="comment" @submitComment="addComment" />
+            <BoardComment
+                :unknown="unknown"
+                :comment="comment"
+                :isPassword="isPassword"
+                @editClick="editClick"
+                @deleteClick="deleteClick"
+                @submitPassword="submitPassword"
+                @submitComment="submitComment"
+                @updateReaction="(reactionData) => handleUpdateReaction(reactionData, comment.commentId)"
+            />
+                <!-- @updateReaction="handleUpdateReaction" -->
        </li>
    </ul>
 </template>

 <script setup>
-import { ref } from 'vue';
+import { defineProps, defineEmits } from 'vue';
 import BoardComment from './BoardComment.vue'

-const comments = ref([
-  {
-    id: 1,
-    author: '홍길동',
-    content: '저도 궁금합니다.',
-    children: [
-      {
-        id: 2,
-        author: '사용자1',
-        content: '저도요!',
-      },
-      {
-        id: 3,
-        author: '사용자2',
-        content: '저도..',
-      },
-    ],
-  },
-  {
-    id: 4,
-    author: '사용자4',
-    content: '흥미로운 주제네요.',
-    children: [],
-  },
-  {
-    id: 5,
-    author: '사용자5',
-    content: '우오아아아아아앙',
-    children: [],
-  },
-]);
+const props = defineProps({
+    comments: {
+        type: Array,
+        required: true,
+        default: () => []
+    },
+    unknown: {
+        type: Boolean,
+        default: true,
+    },
+    isPassword: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['submitComment', 'updateReaction', 'editClick']);
+
+const submitComment = (replyData) => {
+    emit('submitComment', replyData);
+};
+
+const handleUpdateReaction = (reactionData, commentId) => {
+    // console.log('📢 BoardCommentList에서 이벤트 수신:', reactionData);
+    // console.log('📌 전달할 댓글 ID>>>>:', commentId);
+
+    const updatedReactionData = {
+        ...reactionData,
+        commentId: commentId
+    };
+
+    // console.log('🚀 최종 전달할 데이터:', updatedReactionData);
+
+    emit('updateReaction', updatedReactionData);
+}
+
+const editClick = (data) => {
+    emit('editClick', data);
+};
+
 </script>
--- a/src/components/board/BoardProfile.vue
+++ b/src/components/board/BoardProfile.vue
@ -1,7 +1,7 @@
 <template>
    <div class="d-flex align-items-center flex-wrap">
        <div class="d-flex align-items-center">
-            <div class="avatar me-2" v-if="unknown">
+            <div v-if="!unknown" class="avatar me-2">
                <img src="/img/avatars/2.png" alt="Avatar" class="rounded-circle" />
            </div>
            <div class="me-2">
@ -13,73 +13,71 @@
                            <i class="fa-regular fa-eye"></i> {{ views }}
                        </span>
                        <span>
-                            <i class="bx bx-comment"></i> {{ comments }}
+                            <i class="bx bx-comment"></i> {{ commentNum }}
                        </span>
                    </template>
                </div>
            </div>
        </div>
-        <div class="ms-auto btn-area">
-            <template v-if="showDetail">
-                <div class="text-end">
-                    <EditButton @click="handleEdit" />
-                    <DeleteButton @click="handleDelete" />
+        <!-- 버튼 영역 -->
+        <div class="ms-auto text-end">
+            <!-- 수정, 삭제 버튼 -->
+            <template v-if="author || showDetail">
+                <EditButton @click.stop="editClick" />
+                <DeleteButton @click.stop="deleteClick" />
+            </template>

-                    <div class="mt-3" v-if="isPassword && unknown">
-                        <div class="input-group">
-                            <input
-                                type="password"
-                                class="form-control"
-                                v-model="password"
-                                placeholder="비밀번호 입력"
-                            />
-                            <button class="btn btn-primary" type="button" @click="handleSubmit">확인</button>
-                        </div>
-                        <span v-if="passwordAlert" class="invalid-feedback d-block text-start">{{ passwordAlert }}</span>
-                    </div>
+            <!-- 좋아요, 싫어요 버튼 (댓글에서만 표시) -->
+            <BoardRecommendBtn
+                v-if="isLike"
+                :boardId="boardId"
+                :comment="props.comment"
+                @updateReaction="handleUpdateReaction"
+            />
+
+             <!-- 비밀번호 입력창 (익명일 경우) -->
+             <div v-if="isPassword && unknown" class="mt-3">
+                <div class="input-group">
+                    <input
+                        type="password"
+                        class="form-control"
+                        v-model="password"
+                        placeholder="비밀번호 입력"
+                    />
+                    <button class="btn btn-primary" @click="$emit('submitPassword', password)">확인</button>
                </div>
-            </template>
-            <template v-else>
-                <template v-if="author">
-                    <EditButton />
-                    <DeleteButton />
-                    <!-- <button class="btn author btn-label-primary btn-icon" @click="handleEdit">
-                        <i class='bx bx-edit-alt'></i>
-                    </button>
-                    <button class="btn author btn-label-primary btn-icon" @click="handleDelete">
-                        <i class='bx bx-trash'></i>
-                    </button> -->
-                </template>
-                <BoardRecommendBtn v-if="!isChild" :isRecommend="false" />
-            </template>
+                <span v-if="props.passwordAlert" class="invalid-feedback d-block text-start">{{ props.passwordAlert }}</span>
+            </div>
        </div>
    </div>
 </template>

 <script setup>
-import { ref, onMounted, defineProps } from 'vue';
-import { useRouter } from 'vue-router';
-import axios from '@api';
+import { ref, defineProps, defineEmits } from 'vue';
 import DeleteButton from '../button/DeleteBtn.vue';
 import EditButton from '../button/EditBtn.vue';
 import BoardRecommendBtn from '../button/BoardRecommendBtn.vue';

 // Vue Router 인스턴스
-const router = useRouter();
-const isPassword = ref(false);
 const password = ref('');
-const passwordAlert = ref(false);
-const lastClickedButton = ref('');

 // Props 정의
 const props = defineProps({
+    comment: {
+        type: Object,
+        required: true,
+    },
    boardId: {
        type: Number,
-        required: true
+        required: false
+    },
+    commentId: {
+        type: Number,
+        required: false,
    },
    profileName: {
        type: String,
-        default: '익명',
+        default: '익명 사용자',
    },
    unknown: {
        type: Boolean,
@ -89,6 +87,7 @@ const props = defineProps({
        type: Boolean,
        default: true,
    },
+    // 게시글의 작성자 여부를 확인 : 현재 로그인한 사용자가 이 게시글의 작성자인지 여부
    author: {
        type: Boolean,
        default: false,
@ -101,113 +100,49 @@ const props = defineProps({
        type: Number,
        default: 0,
    },
-    comments: {
+    commentNum: {
        type: Number,
        default: 0,
    },
-    isChild: {
+    isLike: {
        type: Boolean,
        default: false,
+    },
+    isPassword: {
+        type: Boolean,
+        default: false,
+    },
+    passwordAlert: {
+        type: String,
+        default: false,
    }
 });

-const emit = defineEmits(['togglePasswordInput']);
+const emit = defineEmits(['togglePasswordInput', 'updateReaction', 'editClick', 'deleteClick', 'updatePasswordAlert']);

-// 수정 버튼
-const handleEdit = () => {
-    if (props.unknown) {
-        togglePassword('edit');
-    } else {
-        router.push({ name: 'BoardEdit', params: { id: props.boardId } });
-    }
+// 수정
+const editClick = () => {
+    emit('editClick', props.unknown);
 };

-// 삭제 버튼
-const handleDelete = () => {
-    if (props.unknown) {
-        togglePassword('delete');
-    } else {
-        deletePost();
-    }
+// 삭제
+const deleteClick = () => {
+    emit('deleteClick', props.unknown);
 };

-// 비밀번호 입력 토글
-const togglePassword = (button) => {
-    if (lastClickedButton.value === button) {
-        isPassword.value = !isPassword.value;
-    } else {
-        isPassword.value = true;
-    }
-    lastClickedButton.value = button;
+const handleUpdateReaction = (reactionData) => {
+    // console.log("🔥 BoardProfile에서 좋아요/싫어요 이벤트 발생");
+    // console.log("📌 게시글 ID:", props.boardId);
+    // console.log("📌 댓글 ID (수정 후):", props.comment?.commentId);
+    // console.log("📌 reactionData:", reactionData);
+
+    emit("updateReaction", {
+        boardId: props.boardId,
+        commentId:  props.comment?.commentId,
+        ...reactionData,
+    });
 };

-// 비밀번호 확인
-const handleSubmit = async () => {
-    if (!password.value) {
-        passwordAlert.value = '비밀번호를 입력해주세요.';
-        return;
-    }
-
-    try {
-        const requestData = {
-            LOCBRDPWD: password.value,
-            LOCBRDSEQ: 288
-        }
-
-        const postResponse = await axios.post(`board/${props.boardId}/password`, requestData);
-
-        if (postResponse.data.code === 200) {
-            if (postResponse.data.data === true) {
-                isPassword.value = false;
-                
-
-                if (lastClickedButton.value === 'edit') {
-                    router.push({ name: 'BoardEdit', params: { id: props.boardId } });
-                } else if (lastClickedButton.value === 'delete') {
-                    await deletePost();
-                }
-
-                lastClickedButton.value = null;
-            } else {
-                passwordAlert.value = '비밀번호가 일치하지 않습니다.';
-            }
-        } else {
-            passwordAlert.value = '비밀번호가 일치하지 않습니다.';
-        }
-    } catch (error) {
-       // 401 오류
-       if (error.response && error.response.status === 401) {
-            passwordAlert.value = '비밀번호가 일치하지 않습니다.';
-        } else if (error.response) {
-            alert(`오류 발생: ${error.response.data.message || '서버 오류'}`);
-        } else {
-            alert('네트워크 오류가 발생했습니다. 다시 시도해주세요.');
-        }
-    }
-};
-
-const deletePost = async () => {
-    if (confirm('정말 삭제하시겠습니까?')) {
-        try {
-            const response = await axios.delete(`board/${props.boardId}`, {
-                data: { LOCBRDSEQ: props.boardId }
-            });
-
-            if (response.data.code === 200) {
-                alert('게시물이 삭제되었습니다.');
-                router.push({ name: 'BoardList' });
-            } else {
-                alert('삭제 실패: ' + response.data.message);
-            }
-        } catch (error) {
-            if (error.response) {
-                alert(`삭제 실패: ${error.response.data.message || '서버 오류'}`);
-            } else {
-                alert('네트워크 오류가 발생했습니다. 다시 시도해주세요.');
-            }
-        }
-    }
-};

 </script>

--- a/src/components/category/CategoryBtn.vue
+++ b/src/components/category/CategoryBtn.vue
@ -1,6 +1,6 @@
 <template>
    <ul class="cate-list list-unstyled d-flex flex-wrap mb-0">
-        <li v-for="category in lists" :key="category.value" class="mt-2 mx-1">
+        <li v-for="category in lists" :key="category.value" class="mt-2 me-2">
            <button
                type="button"
                class="btn"
@ -39,9 +39,7 @@ const selectCategory = (cate) => {


 <style scoped>
-.cate-list {
-    margin-left: -0.25rem;
-}
+

@media (max-width: 768px) {
    .cate-list {
--- a/src/components/input/ArrInput.vue
+++ b/src/components/input/ArrInput.vue
@ -1,14 +1,16 @@
 <template>
-    <div class="mb-2">
-        <div class="d-flex align-items-center">
+    <div class="mb-2 row" >
+        <div class="d-flex">
            <label :for="name" class="col-md-2 col-form-label">
                {{ title }}
                <span :class="isEssential ? 'link-danger' : 'd-none'">*</span>
            </label>
-            <button type="button" class="btn btn-sm btn-primary" @click="openAddressSearch">주소찾기</button>
+            <div class="align-content-center col-md-10 text-end ms-auto">
+                <button type="button" class="btn btn-sm btn-primary" :class="isRow ? '' : 'ms-auto'" @click="openAddressSearch">주소찾기</button>
+            </div>
        </div>

-        <div class="col-md-12">
+        <div :class="isRow ? 'col-md-10 ms-auto' : 'col-md-12'">
            <div class="d-flex mb-3">
                <input
                    :id="name"
@ -48,6 +50,10 @@
 <script setup>
 import { ref, watch } from 'vue';

+const postcode = ref('');
+const address = ref('');
+const detailAddress = ref('');
+
 const props = defineProps({
    title: {
        type: String,
@ -69,19 +75,33 @@ const props = defineProps({
        default: 30,
        required: false,
    },
+    isRow: {
+        type: Boolean,
+        default: false,
+        required: false,
+    },
    isAlert: {
        type: Boolean,
        default: false,
        required: false,
    },
+    modelValue: {
+        type: Object,
+        default: () => ({}),
+        required: false
+    }
 });

-const emits = defineEmits(['update:data', 'update:alert']);
+// watch 설정 수정
+watch(() => props.modelValue, (newValue) => {
+    if (newValue) {
+        postcode.value = newValue.PROJCTZIP || '';
+        address.value = newValue.PROJCTARR || '';
+        detailAddress.value = newValue.PROJCTDTL || '';
+    }
+}, { immediate: true });

-// 주소 관련 상태 관리
-const postcode = ref('');
-const address = ref('');
-const detailAddress = ref('');
+const emits = defineEmits(['update:data', 'update:alert']);

 // 주소 검색 팝업 열기
 const openAddressSearch = () => {
--- a/src/components/list/ProjectCard.vue
+++ b/src/components/list/ProjectCard.vue
@ -1,63 +1,126 @@
 <template>
    <div class="card mb-3 shadow-sm border">
        <div class="row g-0">
-            <!-- 게시물 내용 섹션 -->
-            <div>
-                <div class="card-body">
-                    <!-- 제목 -->
-                    <h5 class="card-title">
-                        {{ title }}
-                        <span class="text-muted me-3" v-if="attachment">
-                            <i class="fa-solid fa-paperclip"></i>
-                        </span>
-                    </h5>
-                    <!-- 본문 -->
-                    <div class="card-text line-clamp-2 my-5">{{ content }}</div>
-                    <!-- 날짜 -->
-                    <div class="d-flex flex-column flex-sm-row justify-content-between align-items-start">
-                        <small class="text-muted">{{ formattedDate }}</small>
-                    </div>
+            <div class="card-body">
+                <!-- 제목 -->
+                <h5 class="card-title">
+                    {{ title }}
+                </h5>
+                <!-- 날짜 -->
+                <div class="d-flex flex-column flex-sm-row align-items-center pb-2">
+                    <i class="bx bx-calendar"></i>
+                    <div class="ms-2">날짜</div>
+                    <div class="ms-12">{{ strdate }} ~ {{ enddate }}</div>
+                </div>
+                <!-- 참여자 -->
+                <div class="d-flex flex-column flex-sm-row align-items-center pb-2">
+                    <i class="bx bxs-user"></i>
+                    <div class="ms-2">참여자</div>
+                    <UserList :projctSeq="projctSeq" class="ms-8 mb-0" />
+                </div>
+                <!-- 설명 -->
+                <div class="d-flex flex-column flex-sm-row align-items-center pb-2">
+                    <i class="bx bx-detail"></i>
+                    <div class="ms-2">설명</div>
+                    <div class="ms-12">{{ description }}</div>
+                </div>
+                <!-- 주소 -->
+                <div class="d-flex flex-column flex-sm-row align-items-center pb-2">
+                    <i class="bx bxs-map"></i>
+                    <div class="ms-2">주소</div>
+                    <div class="ms-12">{{ address }}</div>
+                    <button type="button" class="btn ms-auto text-white" :style="`background-color: ${projctCol} !important;`" @click.stop="openModal">log</button>
                </div>
            </div>
        </div>
    </div>
+    <CenterModal :display="isModalOpen" @close="closeModal">
+        <template #title> Log </template>
+        <template #body>
+            <div class="ms-4 mt-2" v-if="logData">
+                <p class="mb-1">{{ logData.createDate }}</p>
+                <strong class="">[{{ logData.creator }}] 프로젝트 등록</strong>
+            </div>
+
+            <div class="log-item" v-if="logData?.updateDate">
+                <div class="d-flex align-items-center">
+                    <i class="bx bx-edit me-2"></i>
+                    <strong>수정 정보</strong>
+                </div>
+                <div class="ms-4 mt-2">
+                    <p class="mb-1">{{ logData.updateDate }}</p>
+                    <p class="mb-0 text-muted">[{{ logData.updater }}] 프로젝트 수정</p>
+                </div>
+            </div>
+
+        </template>
+        <template #footer>
+            <button type="button" class="btn btn-secondary" @click="closeModal">닫기</button>
+        </template>
+    </CenterModal>
 </template>

 <script setup>
-import { computed } from 'vue';
-import { defineProps } from 'vue';
+import { defineProps, ref } from 'vue';
+import UserList from '@c/user/UserList.vue';
+import CenterModal from '../modal/CenterModal.vue';
+import $api from '@api';

 // Props 정의
 const props = defineProps({
-    category: {
-        type: String,
-        required: false,
-    },
    title: {
        type: String,
        required: true,
    },
-    content: {
+    strdate: {
        type: String,
        required: true,
    },
-    date: {
+    enddate: {
+        type: String,
+        required: true,
+        default: "",
+    },
+    description: {
+        type: String,
+        required: false,
+    },
+    address: {
        type: String,
        required: true,
    },
-    attachment: {
-        type: Boolean,
-        default: false,
-    }
+    projctSeq: {
+        type: Number,
+        required: false
+    },
+    projctCol: {
+        type: String,
+        required: false
+    },
 });

-// formattedDate을 computed로 정의
-const formattedDate = computed(() => {
-    const date = new Date(props.date);
-    return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(
-        date.getDate()
-    ).padStart(2, "0")} ${String(date.getHours()).padStart(2, "0")}:${String(
-        date.getMinutes()
-    ).padStart(2, "0")}`;
-});
+defineEmits(['click']);
+
+const isModalOpen = ref(false);
+const logData = ref(null);
+
+const fetchLogData = async () => {
+    try {
+        const response = await $api.get(`project/log/${props.projctSeq}`);
+        logData.value = response.data.data.length > 0 ? response.data.data[0] : {};
+    } catch (error) {
+        console.error('로그 정보 조회 실패:', error);
+    }
+};
+
+const openModal = async () => {
+    await fetchLogData();
+    isModalOpen.value = true;
+};
+
+const closeModal = () => {
+    isModalOpen.value = false;
+};
+
 </script>
+
--- a/src/components/list/ProjectCardList.vue
+++ b/src/components/list/ProjectCardList.vue
@ -1,49 +1,181 @@
 <template>
    <div class="mt-4">
-        <div v-if="posts.length === 0" class="text-center">
+        <div v-if="projectList.length === 0" class="text-center">
            <p class="text-muted mt-4">게시물이 없습니다.</p>
        </div>

-        <div v-for="post in posts" :key="post.id" @click="goDetail(post.id)">
+        <div v-for="post in projectList" :key="post.PROJCTSEQ" @click="openModal(post)" class="cursor-pointer">
            <ProjectCard
-                :title="post.title"
-                :content="post.content"
-                :date="post.date"
-                :attachment="post.attachment || false"
+                :title="post.PROJCTNAM"
+                :description="post.PROJCTDES"
+                :strdate="post.PROJCTSTR"
+                :enddate="post.PROJCTEND"
+                :address="post.PROJCTARR + ' ' + post.PROJCTDTL"
+                :projctSeq="post.PROJCTSEQ"
+                :projctCol="post.projctcolor"
            />
        </div>
+
+        <CenterModal :display="isModalOpen" @close="closeModal">
+            <template #title> 프로젝트 수정 </template>
+            <template #body>
+                <FormInput
+                    title="이름"
+                    name="name"
+                    :is-essential="true"
+                    :is-alert="nameAlert"
+                    v-model="selectedProject.PROJCTNAM"
+                />
+
+                <FormSelect
+                    title="컬러"
+                    name="color"
+                    :is-essential="true"
+                    :is-label="true"
+                    :is-common="true"
+                    :data="allColors"
+                    v-model="selectedProject.projctcolor"
+                />
+
+                <FormInput
+                    title="시작일"
+                    type="date"
+                    name="startDay"
+                    v-model="selectedProject.PROJCTSTR"
+                    :is-essential="true"
+                />
+
+                <FormInput
+                    title="종료일"
+                    type="date"
+                    name="endDay"
+                    v-model="selectedProject.PROJCTEND"
+                />
+
+                <FormInput
+                    title="설명"
+                    name="description"
+                    v-model="selectedProject.PROJCTDES"
+                />
+
+                <ArrInput
+                    title="주소"
+                    name="address"
+                    :is-essential="true"
+                    :is-row="true"
+                    v-model="selectedProject"
+                    @update:data="updateAddress"
+                />
+
+            </template>
+            <template #footer>
+                <button class="btn btn-secondary" @click="closeModal">Close</button>
+                <button class="btn btn-primary" @click="handleSubmit">Save</button>
+            </template>
+        </CenterModal>
    </div>
 </template>

 <script setup>
-import { ref, defineEmits } from 'vue';
-import ProjectCard from './ProjectCard.vue';
+    import { computed, ref } from 'vue';
+    import ProjectCard from './ProjectCard.vue';
+    import { onMounted } from 'vue';
+    import $api from '@api';
+    import CenterModal from '@c/modal/CenterModal.vue';
+    import FormInput from '@c/input/FormInput.vue';
+    import FormSelect from '@c/input/FormSelect.vue';
+    import commonApi from '@/common/commonApi';
+    import ArrInput from '../input/ArrInput.vue';
+    import { useUserInfoStore } from '@/stores/useUserInfoStore';

-// 테스트용 데이터
-const posts = ref([
-    {
-        id: 1,
-        title: 'Vue 3 Composition API 소개',
-        content: 'Composition API를 사용하여 Vue 3에서 효율적으로 개발하는 방법을 알아봅니다. Composition API를 사용하여 Vue 3에서 효율적으로 개발하는 방법을 알아봅니다. Composition API를 사용하여 Vue 3에서 효율적으로 개발하는 방법을 알아봅니다. Composition API를 사용하여 Vue 3에서 효율적으로 개발하는 방법을 알아봅니다. Composition API를 사용하여 Vue 3에서 효율적으로 개발하는 방법을 알아봅니다. Composition API를 사용하여 Vue 3에서 효율적으로 개발하는 방법을 알아봅니다.',
-        date: '2025-02-10',
-        comments: 4,
-        attachment: true
-    },
-    {
-        id: 2,
-        title: 'Spring Boot로 REST API 만들기',
-        content: 'Spring Boot를 사용하여 간단한 RESTful API를 구현하는 방법을 다룹니다.',
-        date: '2025-02-09',
-        comments: 2,
-        attachment: false
-    }
-]);
+    const projectList = ref([]);
+    const isModalOpen = ref(false);

-const emit = defineEmits(['click']);
+    const userStore = useUserInfoStore();
+    const user = ref(null);

-// 상세 페이지 이동
-const goDetail = (id) => {
-    emit('click', id);
+    const nameAlert = ref(false);
+    const selectedProject = ref({
+        PROJCTNAM: '',
+        projctcolor: '',
+        PROJCTSTR: '',
+        PROJCTEND: '',
+        PROJCTZIP: '',
+        PROJCTARR: '',
+        PROJCTDTL: '',
+        PROJCTDES: '',
+        PROJCTCOL: '',
+    });
+
+    const { colorList } = commonApi({
+        loadColor: true,
+        colorType: 'YNP',
+    });
+
+
+    onMounted(async () => {
+        getProjectList();
+
+        await userStore.userInfo(); // 로그인한 사용자 정보
+        user.value = userStore.user;
+    });
+
+    // 프로젝트 목록 불러오기
+    const getProjectList = () => {
+        $api.get('project/select').then(res => {
+            projectList.value = res.data.data.projectList;
+            console.log(projectList.value);
+        });
 };

+
+    const openModal = (post) => {
+        isModalOpen.value = true;
+        selectedProject.value = { ...post };
+    };
+
+    const closeModal = () => {
+        isModalOpen.value = false;
+    };
+
+    // 현재 프로젝트 색상 + 사용하지 않은 색상
+    const allColors = computed(() => {
+        // 기존 색상 추가
+        const existingColor = { value: selectedProject.value.PROJCTCOL, label: selectedProject.value.projctcolor };
+
+        // colorList에 기존 색상을 추가
+        return [existingColor, ...colorList.value];
+    });
+
+    const updateAddress = (addressData) => {
+        selectedProject.value = {
+            ...selectedProject.value,
+            PROJCTZIP: addressData.postcode,
+            PROJCTARR: addressData.address,
+            PROJCTDTL: addressData.detailAddress
+        };
+    };
+
+    console.log(projectList.PROJCTSEQ)
+
+    const handleSubmit = () => {
+        $api.patch('project/update', {
+            projctSeq: projectList.PROJCTSEQ,
+            projctNam: selectedProject.value.PROJCTNAM,
+            projctCol: selectedProject.value.projctcolor,
+            projctArr: selectedProject.value.PROJCTARR,
+            projctDtl: selectedProject.value.PROJCTDTL,
+            projctZip: selectedProject.value.PROJCTZIP,
+            projctStr: selectedProject.value.PROJCTSTR,
+            projctEnd: selectedProject.value.PROJCTEND,
+            projctDes: selectedProject.value.PROJCTDES,
+            projctUmb: user.value.name,
+        }).then(res => {
+            if (res.status === 200) {
+                toastStore.onToast('수정이 완료 되었습니다.', 's');
+                closeModal();
+                location.reload();
+            }
+        })
+    };
 </script>
--- a/src/components/modal/CenterModal.vue
+++ b/src/components/modal/CenterModal.vue
@ -1,10 +1,10 @@

 <template>
-    <div @click="closeModal" class="modal fade" :class="{ 'show': display, 'display-block': display , 'modal-back' : display  }"  id="modalCenter" tabindex="-1" aria-modal="true" role="dialog">
+    <div @click="closeModal" class="modal fade scrollbar-none" :class="{ 'show': display, 'display-block': display , 'modal-back' : display  }"  id="modalCenter" tabindex="-1" aria-modal="true" role="dialog">
        <div @click.stop class="modal-dialog modal-dialog-centered" role="document">
            <div class="modal-content">
                <div class="modal-header">
-                    <h5 class="modal-title" id="modalCenterTitle">
+                    <h5 class="modal-title m-auto fw-bold" id="modalCenterTitle">
                        <slot name="title">Modal Title</slot>
                    </h5>
                    <button type="button" class="btn-close" @click="closeModal" aria-label="Close"></button>
--- a/src/components/projectlist/ProjectList.vue
+++ b/src/components/projectlist/ProjectList.vue
@ -1,19 +1,163 @@
 <template>
    <SearchBar />
-    <CategoryBtn :lists="yearCategory" />
+    <div class="d-flex align-items-center">
+        <CategoryBtn :lists="yearCategory" v-model:selectedCategory="selectedCategory" />
+        <WriteBtn class="mt-2 ms-auto" @click="openModal" />
+        <CenterModal :display="isModalOpen" @close="closeModal">
+            <template #title> 프로젝트 등록 </template>
+            <template #body>
+                <FormInput
+                    title="이름"
+                    name="name"
+                    :is-essential="true"
+                    :is-alert="nameAlert"
+                    @update:modelValue="name = $event"
+                />
+
+                <FormSelect
+                    title="컬러"
+                    name="color"
+                    :is-essential="true"
+                    :is-label="true"
+                    :is-common="true"
+                    :data="colorList"
+                    @update:data="color = $event"
+                />
+
+                <FormInput
+                    title="시작 일"
+                    type="date"
+                    name="startDay"
+                    v-model="startDay"
+                    :is-essential="true"
+                />
+
+                <FormInput
+                    title="종료 일"
+                    name="endDay"
+                    :type="'date'"
+                    @update:modelValue="endDay = $event"
+                />
+
+                <FormInput
+                    title="설명"
+                    name="description"
+                    @update:modelValue="description = $event"
+                />
+
+                <ArrInput
+                    title="주소"
+                    name="address"
+                    :isEssential="true"
+                    :is-row="true"
+                    :is-alert="addressAlert"
+                    @update:data="handleAddressUpdate"
+                    @update:alert="addressAlert = $event"
+                />
+            </template>
+            <template #footer>
+                <button class="btn btn-secondary" @click="closeModal">Close</button>
+                <button class="btn btn-primary" @click="handleSubmit">Save</button>
+            </template>
+        </CenterModal>
+    </div>
    <ProjectCardList :category="selectedCategory" />
 </template>

 <script setup>
-import SearchBar from '@c/search/SearchBar.vue';
-import ProjectCardList from '@c/list/ProjectCardList.vue';
-import CategoryBtn from '@c/category/CategoryBtn.vue';
-import commonApi from '@/common/commonApi'
-import { ref } from 'vue';
+    import SearchBar from '@c/search/SearchBar.vue';
+    import ProjectCardList from '@c/list/ProjectCardList.vue';
+    import CategoryBtn from '@c/category/CategoryBtn.vue';
+    import commonApi from '@/common/commonApi';
+    import { inject, onMounted, ref } from 'vue';
+    import WriteBtn from '@c/button/WriteBtn.vue';
+    import CenterModal from '@c/modal/CenterModal.vue';
+    import FormSelect from '@c/input/FormSelect.vue';
+    import FormInput from '@c/input/FormInput.vue';
+    import ArrInput from '@c/input/ArrInput.vue';
+    import { useToastStore } from '@s/toastStore';
+    import $api from '@api';
+    import { useUserInfoStore } from '@/stores/useUserInfoStore';

-const selectedCategory = ref(null);
+    const dayjs = inject('dayjs');

-const { yearCategory } = commonApi();
+    const today = dayjs().format('YYYY-MM-DD');

+    const toastStore = useToastStore();
+    const userStore = useUserInfoStore();
+
+    const user = ref(null);
+
+    const name = ref('');
+    const color = ref('');
+    const address = ref('');
+    const detailAddress = ref('');
+    const postcode = ref('');
+    const startDay = ref(today);
+    const endDay = ref('');
+    const description = ref('');
+
+    const isModalOpen = ref(false);
+    const nameAlert = ref(false);
+    const addressAlert = ref(false);
+
+    const openModal = () => {
+        isModalOpen.value = true;
+    };
+
+    const closeModal = () => {
+        isModalOpen.value = false;
+    };
+
+
+    const selectedCategory = ref(null);
+
+    const { yearCategory, colorList } = commonApi({
+        loadColor: true,
+        colorType: 'YNP',
+        loadYearCategory: true,
+    });
+
+    // 주소 업데이트 핸들러
+    const handleAddressUpdate = addressData => {
+        address.value = addressData.address;
+        detailAddress.value = addressData.detailAddress;
+        postcode.value = addressData.postcode;
+    };
+
+
+    onMounted(async () => {
+        await userStore.userInfo(); // 로그인한 사용자 정보
+        user.value = userStore.user;
+    });
+
+    const handleSubmit = async () => {
+
+        nameAlert.value = name.value.trim() === '';
+        addressAlert.value = address.value.trim() === '';
+
+        if (nameAlert.value ||  addressAlert.value ) {
+            return;
+        }
+
+        $api.post('project/insert', {
+            projctNam: name.value,
+            projctCol: color.value,
+            projctStr: startDay.value,
+            projctEnd: endDay.value || null,
+            projctDes: description.value || null,
+            projctArr: address.value,
+            projctDtl: detailAddress.value,
+            projctZip: postcode.value,
+            projctCmb: user.value.name,
+        })
+        .then(res => {
+            if (res.status === 200) {
+                toastStore.onToast('프로젝트가 등록되었습니다.', 's');
+                closeModal();
+                location.reload();
+            }
+        })
+    };

 </script>
--- a/src/components/user/LoginForm.vue
+++ b/src/components/user/LoginForm.vue
@ -1,5 +1,4 @@
 <template>
-    <form @submit.prevent="handleSubmit">
        <div class="col-xl-12">
            <UserFormInput title="아이디" name="id" :is-alert="idAlert" :useInputGroup="true" @update:data="handleIdChange" :value="id" />

@ -13,7 +12,7 @@
            />

            <div class="d-grid gap-2 mt-7 mb-5">
-                <button type="submit" class="btn btn-primary">로그인</button>
+                <button type="submit" @click="handleSubmit" class="btn btn-primary">로그인</button>
            </div>

            <div class="mb-3 d-flex justify-content-around">
@ -25,7 +24,6 @@
                <RouterLink class="text-dark fw-bold" to="/pw">비밀번호 찾기</RouterLink>
            </div>
        </div>
-    </form>
 </template>

 <script setup>
@ -34,7 +32,7 @@
    import { useRoute } from 'vue-router';
    import { ref } from 'vue';
    import UserFormInput from '@c/input/UserFormInput.vue';
-    import { useUserStore } from '@s/useUserStore';
+    import { useUserInfoStore } from '@/stores/useUserInfoStore';

    const id = ref('');
    const password = ref('');
@ -42,7 +40,7 @@
    const passwordAlert = ref(false);
    const remember = ref(false);

-    const userStore = useUserStore();
+    const userStore = useUserInfoStore();
    const route = useRoute();

    const handleIdChange = value => {
@ -55,21 +53,21 @@
        passwordAlert.value = false;
    };

-    const handleSubmit = async () => {
-        $api.post(
-            'user/login',
-            {
-                loginId: id.value,
-                password: password.value,
-                remember: remember.value,
-            },
-            { headers: { 'X-Page-Route': route.path } },
-        ).then(res => {
-            if (res.status === 200) {
-                // const sessionCookie = res.data.data;
-                // document.cookie = `JSESSIONID=${sessionCookie};path=/;expires=-1;`;
-                // document.cookie = `JSESSIONID=${sessionCookie};path=/;HttpOnly=true;samesite=lax`;
+const handleSubmit = async () => {
+        idAlert.value = id.value.trim() === '';
+        passwordAlert.value = password.value.trim() === '';

+        if (idAlert.value || passwordAlert.value) {
+            return;
+        }
+
+        $api.post('user/login', {
+            loginId: id.value,
+            password: password.value,
+            remember: remember.value,
+        }, { headers: { 'X-Page-Route': route.path } })
+        .then(res => {
+            if (res.status === 200) {
                userStore.userInfo();
                router.push('/');
            }
--- a/src/components/user/RegisterForm.vue
+++ b/src/components/user/RegisterForm.vue
@ -252,7 +252,11 @@
    };

    // 컬러, mbti, 비밀번호 힌트 목록 불러오기
-    const { colorList, mbtiList, pwhintList } = commonApi();
+    const { colorList, mbtiList, pwhintList } = commonApi({
+        loadColor: true, colorType: 'YON',
+        loadMbti: true,
+        loadPwhint: true,
+    });

    // 주소 업데이트 핸들러
    const handleAddressUpdate = (addressData) => {
--- a/src/components/user/UserList.vue
+++ b/src/components/user/UserList.vue
@ -4,23 +4,22 @@
            v-for="(user, index) in userList"
            :key="index"
            class="avatar pull-up"
-            :class="{ 'opacity-100': user.disabled }"
+            :class="{ 'opacity-100': isUserDisabled(user) }"
            @click="toggleDisable(index)"
            data-bs-toggle="tooltip"
            data-popup="tooltip-custom"
            data-bs-placement="top"
            :aria-label="user.MEMBERSEQ"
            :data-bs-original-title="getTooltipTitle(user)"
-            >
+        >
            <img
                class="rounded-circle user-avatar border border-3"
-                :class="{ 'grayscaleImg': user.disabled }"
+                :class="{ 'grayscaleImg': isUserDisabled(user) }"
                :src="`${baseUrl}upload/img/profile/${user.MEMBERPRF}`"
                :style="`border-color: ${user.usercolor} !important;`"
                alt="user"
            />
        </li>
-
    </ul>
 </template>

@ -29,38 +28,83 @@ import { onMounted, ref, nextTick } from 'vue';
 import { useUserStore } from '@s/userList';
 import $api from '@api';

-const emit = defineEmits();
+const emit = defineEmits(['user-list-update']);
 const userStore = useUserStore();
 const userList = ref([]);
 const baseUrl = $api.defaults.baseURL.replace(/api\/$/, '');

+const props = defineProps({
+    projctSeq: {
+        type: Number,
+        required: false,
+    }
+});
+
+// 사용자의 프로젝트 참여 상태 확인
+const fetchProjectParticipation = async () => {
+    if (props.projctSeq) {
+        const response = await $api.get(`project/members/${props.projctSeq}`);
+        if (response.status === 200) {
+            const projectMembers = response.data.data;
+            userList.value = userList.value.map(user => ({
+                ...user,
+                PROJCTYON: projectMembers.find(pm => pm.MEMBERSEQ === user.MEMBERSEQ)?.PROJCTYON ?? '1'
+            }));
+        }
+    }
+};
+
 // 사용자 목록 호출
 onMounted(async () => {
    await userStore.fetchUserList();
    userList.value = userStore.userList;

+    if (props.projctSeq) {
+        await fetchProjectParticipation();
+    }
+
    nextTick(() => {
        const tooltips = document.querySelectorAll('[data-bs-toggle="tooltip"]');
        tooltips.forEach((tooltip) => {
-        new bootstrap.Tooltip(tooltip);
+            new bootstrap.Tooltip(tooltip);
        });
    });
 });

-// 클릭 시 활성화/비활성화
-const toggleDisable = (index) => {
+// 사용자 비활성화 상태 확인
+const isUserDisabled = (user) => {
+    return props.projctSeq ? user.PROJCTYON === '0' : user.disabled;
+};
+
+// 클릭 시 활성화/비활성화 및 DB 업데이트
+const toggleDisable = async (index) => {
    const user = userList.value[index];
    if (user) {
-        user.disabled = !user.disabled;
-        emitUserListUpdate();
+        const newParticipationStatus = props.projctSeq
+            ? user.PROJCTYON === '1'
+            : !user.disabled;
+
+        if (props.projctSeq) {
+            const response = await $api.patch('project/updateYon', {
+                memberSeq: user.MEMBERSEQ,
+                projctSeq: props.projctSeq,
+                projctYon: newParticipationStatus ? '0' : '1'
+            });
+
+            if (response.status === 200) {
+                user.PROJCTYON = newParticipationStatus ? '0' : '1';
+            }
+        } else {
+            user.disabled = newParticipationStatus;
+            emitUserListUpdate();
+        }
    }
 };

 // emit
 const emitUserListUpdate = () => {
-    const activeUsers = userList.value.filter((user) => !user.disabled);
-    const disabledUsers = userList.value.filter((user) => user.disabled);
-
+    const activeUsers = userList.value.filter(user => !isUserDisabled(user));
+    const disabledUsers = userList.value.filter(user => isUserDisabled(user));
    emit('user-list-update', { activeUsers, disabledUsers });
 };

@ -68,6 +112,3 @@ const getTooltipTitle = (user) => {
    return user.MEMBERSEQ === userStore.userInfo.id ? '나' : user.MEMBERNAM;
 };
 </script>
-
-<style scoped>
-</style>
--- a/src/components/vacation/ProfileList.vue
+++ b/src/components/vacation/ProfileList.vue
@ -27,8 +27,8 @@

  <script setup>
  import { onMounted, ref, computed, nextTick } from "vue";
-  import { useUserStore } from "@s/useUserStore";
-  import { useUserStore as useUserListStore } from "@s/userList";
+  import { useUserInfoStore } from "@s/useUserInfoStore";
+  import { useUserStore } from "@s/userList";
  import $api from "@api";

  defineEmits(["profileClick"]);
@ -37,8 +37,8 @@
  remainingVacationData: Object,
 });

-  const userStore = useUserStore();
-  const userListStore = useUserListStore();
+  const userStore = useUserInfoStore();
+  const userListStore = useUserStore();

  const userList = ref([]);
  const baseUrl = $api.defaults.baseURL.replace(/api\/$/, "");
--- a/src/components/wordDict/DictAlphabetFilter.vue
+++ b/src/components/wordDict/DictAlphabetFilter.vue
@ -1,7 +1,7 @@
 <template>
    <div>
        <ul class="alphabet-list list-unstyled d-flex flex-wrap mb-0">
-            <li v-for="char in koreanChars" :key="char" class="mt-2 mx-1">
+            <li v-for="char in koreanChars" :key="char" class="mt-2 me-2">
                <button
                    type="button"
                    class="btn"
@ -13,7 +13,7 @@
            </li>
        </ul>
        <ul class="alphabet-list list-unstyled d-flex flex-wrap mb-0">
-            <li v-for="char in englishChars" :key="char" class="mt-2 mx-1">
+            <li v-for="char in englishChars" :key="char" class="mt-2 me-2">
                <button
                    type="button"
                    class="btn"
@ -43,9 +43,6 @@ const selectAlphabet = (alphabet) => {
 </script>

 <style scoped>
-.alphabet-list {
-    margin-left: -0.25rem;
-}

@media (max-width: 768px) {
    .alphabet-list {
--- a/src/layouts/TheTop.vue
+++ b/src/layouts/TheTop.vue
@ -228,7 +228,7 @@
 </template>
 <script setup>
 import { useAuthStore } from '@s/useAuthStore';
-import { useUserStore } from '@s/useUserStore';
+import { useUserInfoStore } from '@/stores/useUserInfoStore';
 import { useRouter } from 'vue-router';
 import { useThemeStore } from '@s/darkmode';
 import { onMounted, ref } from 'vue';
@ -236,7 +236,7 @@ import { onMounted, ref } from 'vue';
 const user = ref(null);

 const authStore = useAuthStore();
-const userStore = useUserStore();
+const userStore = useUserInfoStore();
 const router = useRouter();

 const { isDarkMode, switchToDarkMode, switchToLightMode } = useThemeStore();
--- a/src/stores/useUserInfoStore.js
+++ b/src/stores/useUserInfoStore.js
@ -1,8 +1,16 @@
+/*
+    작성자 : 박지윤
+    작성일 : 2025-02-04
+    수정자 :
+    수정일 :
+    설명   : 로그인 한 사용자 정보
+*/
+
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 import $api from "@api";

-export const useUserStore = defineStore('userInfo', () => {
+export const useUserInfoStore = defineStore('userInfo', () => {
    const user = ref(null);

    // 사용자 정보 가져오기
--- a/src/views/board/BoardView.vue
+++ b/src/views/board/BoardView.vue
@ -8,9 +8,17 @@
                        <BoardProfile
                            :boardId="currentBoardId"
                            :profileName="profileName"
+                            :unknown="unknown"
+                            :author="isAuthor"
                            :views="views"
-                            :comments="comments"
+                            :commentNum="commentNum"
                            :date="formattedBoardDate"
+                            :isLike="false"
+                            :isPassword="isPassword"
+                            :passwordAlert="passwordAlert"
+                            @editClick="editClick"
+                            @deleteClick="deleteClick"
+                            @submitPassword="submitPassword"
                            class="pb-6 border-bottom"
                        />
                    </div>
@ -64,17 +72,28 @@
                            </li>
                        </ul> -->

-                        <!-- 댓글 영역 -->
-                        <BoardComentArea />
-
-                        <!-- 수정 버튼 -->
-                        <!-- <button class="btn btn-primary" @click="goToEditPage">
-                            글 수정
-                        </button> -->
+                        <!-- 댓글 입력 영역 -->
+                        <BoardCommentArea
+                            :profileName="profileName"
+                            :unknown="unknown"
+                            @submitComment="handleCommentSubmit"
+                        />
+                        <!-- <BoardCommentArea :profileName="profileName" :unknown="unknown" /> -->
                    </div>
-                    <div class="card-footer">
-                        <BoardCommentList/>

+                    <!-- 댓글 목록 -->
+                    <div class="card-footer">
+                        <BoardCommentList
+                            :unknown="unknown"
+                            :comments="comments"
+                            :isEditTextarea="isEditTextarea"
+                            :isPassword="isPassword"
+                            @editClick="editClick"
+                            @deleteClick="deleteClick"
+                            @submitPassword="submitPassword"
+                            @updateReaction="handleUpdateReaction"
+                            @submitComment="handleCommentReply"
+                        />
                        <Pagination/>
                    </div>
                </div>
@ -84,17 +103,17 @@
 </template>

 <script setup>
-import BoardComentArea from '@c/board/BoardComentArea.vue';
+import BoardCommentArea from '@c/board/BoardComentArea.vue';
 import BoardProfile from '@c/board/BoardProfile.vue';
-import BoardCommentList from '@/components/board/BoardCommentList.vue';
-import BoardRecommendBtn from '@/components/button/BoardRecommendBtn.vue';
-import Pagination from '@/components/pagination/Pagination.vue';
+import BoardCommentList from '@c/board/BoardCommentList.vue';
+import BoardRecommendBtn from '@c/button/BoardRecommendBtn.vue';
+import Pagination from '@c/pagination/Pagination.vue';
 import { ref, onMounted, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import axios from '@api';

 // 게시물 데이터 상태
-const profileName = ref('익명 사용자');
+const profileName = ref('');
 const boardTitle = ref('제목 없음');
 const boardContent = ref('');
 const date = ref('');
@ -103,17 +122,25 @@ const likes = ref(0);
 const dislikes = ref(0);
 const likeClicked = ref(false);
 const dislikeClicked = ref(false);
-const comments = ref(0);
+const commentNum = ref(0);
 const attachment = ref(false);
+const comments = ref([]);

-// 라우트에서 ID 가져오기
 const route = useRoute();
+const router = useRouter();
 const currentBoardId = ref(Number(route.params.id));
+const unknown = computed(() => profileName.value === '익명 사용자');
+const currentUserId = ref('김자바'); // 현재 로그인한 사용자 id
+const authorId = ref(null); // 작성자 id
+
+const isAuthor = computed(() => currentUserId.value === authorId.value);
+
+const isEditTextarea = ref({});
+
+const passwordAlert = ref("");
+const isPassword = ref(false);
+const lastClickedButton = ref("");

-// 글 수정 페이지로 이동
-const goToEditPage = () => {
-    router.push({ name: 'BoardEdit', params: { id: currentBoardId.value } });
-};

 // 게시물 상세 데이터 불러오기
 const fetchBoardDetails = async () => {
@ -125,6 +152,13 @@ const fetchBoardDetails = async () => {
        // const boardDetail = data.boardDetail || {};

        profileName.value = data.author || '익명 사용자';
+
+        // 익명확인하고 싶을때
+        profileName.value = '익명 사용자';
+
+        // 게시글의 작성자 여부를 확인 : 현재 로그인한 사용자가 이 게시글의 작성자인지 여부
+        authorId.value = data.author;
+
        boardTitle.value = data.title || '제목 없음';
        boardContent.value = data.content || '';
        date.value = data.date || '';
@ -132,10 +166,7 @@ const fetchBoardDetails = async () => {
        likes.value = data.likeCount || 0;
        dislikes.value = data.dislikeCount || 0;
        attachment.value = data.hasAttachment || null;
-        comments.value = data.commentCount || 0;
-
-        // const response2 = await axios.post(`board/${currentBoardId.value}/password`);
-        // console.log(response2)
+        commentNum.value = data.commentCount || 0;

    } catch (error) {
        alert('게시물 데이터를 불러오는 중 오류가 발생했습니다.');
@ -144,50 +175,215 @@ const fetchBoardDetails = async () => {

 // 좋아요, 싫어요
 const handleUpdateReaction = async ({ boardId, commentId, isLike, isDislike }) => {
-    // console.log(type, boardId)
    try {
-
-        const requestData = {
-            LOCBRDSEQ: boardId,
-            LOCCMTSEQ: commentId,
-            MEMBERSEQ: 1, // 멤버아이디 지금은 1 나중에 수정해야함
+        const aa = await axios.post(`/board/${boardId}/${commentId}/reaction`, {
+            LOCBRDSEQ: boardId, // 게시글 id
+            LOCCMTSEQ: commentId, //댓글 id
+            // MEMBERSEQ: 1, // 멤버아이디 지금은 1 나중에 수정해야함
            LOCGOBGOD: isLike ? 'T' : 'F',
            LOCGOBBAD: isDislike ? 'T' : 'F'
-        };
+        });
+        console.log("좋아요 API 응답 데이터:", aa.data);

-        console.log(requestData)
-
-        const postResponse = await axios.post(`/board/${boardId}/${commentId}/reaction`, requestData);
-        // await axios.post(`board/${boardId}/${commentId}/reaction`, { type });

        const response = await axios.get(`board/${boardId}`);
        const updatedData = response.data.data;

-        console.log('post요청 결과:', postResponse.data);
-        console.log('get요청 결과(좋아요):', response.data.data.likeCount);
-
        likes.value = updatedData.likeCount;
        dislikes.value = updatedData.dislikeCount;

        likeClicked.value = isLike;
        dislikeClicked.value = isDislike;
-
-        console.log('반응 결과:', postResponse.data);
+        // console.log(updatedData)

    } catch (error) {
        alert('반응을 업데이트하는 중 오류 발생');
    }
 };

-// 날짜
-const formattedBoardDate = computed(() => {
-    const dateObj = new Date(date.value);
-    return `${dateObj.getFullYear()}-${String(dateObj.getMonth() + 1).padStart(2, '0')}-${String(dateObj.getDate()).padStart(2, '0')} ${String(dateObj.getHours()).padStart(2, '0')}:${String(dateObj.getMinutes()).padStart(2, '0')}`;
-});
+// 댓글 목록 조회
+const fetchComments = async () => {
+    try {
+        const response = await axios.get(`board/${currentBoardId.value}/comments`, {
+            params: { LOCBRDSEQ: currentBoardId.value }
+        });
+        console.log("목록 API 응답 데이터:", response.data);

+        let allComments = response.data.data.list.map(comment => ({
+            commentId: comment.LOCCMTSEQ, // 댓글 id
+            boardId: comment.LOCBRDSEQ,
+            parentId: comment.LOCCMTPNT, // 부모 id
+            author: comment.author || "익명 사용자", // 작성자
+            content: comment.LOCCMTRPY, // 댓글 내용
+            createdAt: formattedDate(comment.LOCCMTRDT), // 생성 날짜
+            children: []
+        }));
+
+        allComments.sort((a, b) => b.commentId - a.commentId);
+
+        let commentMap = {};
+        let rootComments = [];
+
+        allComments.forEach(comment => {
+            commentMap[comment.commentId] = comment;
+        });
+
+        allComments.forEach(comment => {
+            if (comment.parentId && commentMap[comment.parentId]) {
+                commentMap[comment.parentId].children.push(comment);
+            } else {
+                rootComments.push(comment);
+            }
+        });
+
+        comments.value = rootComments;
+
+        // console.log("변환된 comments 데이터:", comments.value);
+
+    } catch (error) {
+        console.error('댓글 목록 불러오기 오류:', error);
+    }
+};
+
+// 댓글 작성
+const handleCommentSubmit = async ({ comment, password }) => {
+    try {
+        const response = await axios.post(`board/${currentBoardId.value}/comment`, {
+            LOCBRDSEQ: currentBoardId.value,
+            LOCCMTRPY: comment,
+            LOCCMTPWD: password || null,
+            LOCCMTPNT: 1
+        });
+        // console.log('📥 서버 응답 전체:', response.data);
+
+        if (response.status === 200) {
+            console.log('댓글 작성 성공:', response.data.message);
+            await fetchComments();
+        } else {
+            console.error('댓글 작성 실패:', response.data.message);
+        }
+    } catch (error) {
+        console.error('댓글 작성 중 오류 발생:', error);
+    }
+};
+
+const handleCommentReply = async (reply) => {
+    const response = await axios.post(`board/${currentBoardId.value}/comment`, {
+        LOCBRDSEQ: currentBoardId.value,
+        LOCCMTRPY: reply.comment,
+        LOCCMTPWD: reply.password || null,
+        LOCCMTPNT: reply.parentId
+    });
+
+    if (response.status === 200) {
+        console.log('대댓글 작성 성공:', response.data.message);
+        await fetchComments();
+    } else {
+        console.error('대댓글 작성 실패:', response.data.message);
+    }
+}
+
+const editClick = (unknown) => {
+
+    if (unknown) {
+        togglePassword("edit");
+    } else {
+        router.push({ name: "BoardEdit", params: { id: currentBoardId.value } });
+    }
+};
+
+const deleteClick = (unknown) => {
+    if (unknown) {
+        togglePassword("delete");
+    } else {
+        deletePost();
+    }
+};
+
+const togglePassword = (button) => {
+    if (lastClickedButton.value === button) {
+        isPassword.value = !isPassword.value;
+    } else {
+        isPassword.value = true;
+    }
+    lastClickedButton.value = button;
+};
+
+
+const submitPassword = async (inputPassword) => {
+    console.log(inputPassword)
+    if (!inputPassword) {
+        passwordAlert.value = "비밀번호를 입력해주세요.";
+        return;
+    }
+
+    try {
+        const requestData = {
+            LOCBRDPWD: inputPassword,
+            LOCBRDSEQ: 288
+        };
+
+        const postResponse = await axios.post(`board/${currentBoardId.value}/password`, requestData);
+
+        if (postResponse.data.code === 200 && postResponse.data.data === true) {
+            isPassword.value = false;
+            passwordAlert.value = "";
+
+            if (lastClickedButton.value === "edit") {
+                router.push({ name: "BoardEdit", params: { id: currentBoardId.value } });
+            } else if (lastClickedButton.value === "delete") {
+                await deletePost();
+            }
+            lastClickedButton.value = null;
+        } else {
+            passwordAlert.value = "비밀번호가 일치하지 않습니다.";
+        }
+    } catch (error) {
+        if (error.response && error.response.status === 401) {
+            passwordAlert.value = "비밀번호가 일치하지 않습니다.";
+        } else if (error.response) {
+            alert(`오류 발생: ${error.response.data.message || "서버 오류"}`);
+        } else {
+            alert("네트워크 오류가 발생했습니다. 다시 시도해주세요.");
+        }
+    }
+};
+
+const deletePost = async () => {
+    if (confirm("정말 삭제하시겠습니까?")) {
+        try {
+            const response = await axios.delete(`board/${currentBoardId.value}`, {
+                data: { LOCBRDSEQ: currentBoardId.value }
+            });
+
+            if (response.data.code === 200) {
+                alert("게시물이 삭제되었습니다.");
+                router.push({ name: "BoardList" });
+            } else {
+                alert("삭제 실패: " + response.data.message);
+            }
+        } catch (error) {
+            if (error.response) {
+                alert(`삭제 실패: ${error.response.data.message || "서버 오류"}`);
+            } else {
+                alert("네트워크 오류가 발생했습니다. 다시 시도해주세요.");
+            }
+        }
+    }
+};
+
+// 날짜
+const formattedDate = (dateString) => {
+    if (!dateString) return "날짜 없음";
+    const dateObj = new Date(dateString);
+    return `${dateObj.getFullYear()}-${String(dateObj.getMonth() + 1).padStart(2, '0')}-${String(dateObj.getDate()).padStart(2, '0')} ${String(dateObj.getHours()).padStart(2, '0')}:${String(dateObj.getMinutes()).padStart(2, '0')}`;
+};
+
+const formattedBoardDate = computed(() => formattedDate(date.value));

 // 컴포넌트 마운트 시 데이터 로드
 onMounted(() => {
-    fetchBoardDetails();
+    fetchBoardDetails()
+    fetchComments()
 });
 </script>
--- a/src/views/vacation/VacationManagement.vue
+++ b/src/views/vacation/VacationManagement.vue
@ -56,13 +56,13 @@ import axios from "@api";
 import "bootstrap-icons/font/bootstrap-icons.css";
 import HalfDayButtons from "@c/button/HalfDayButtons.vue";
 import ProfileList from "@c/vacation/ProfileList.vue";
-import { useUserStore as useUserListStore } from "@s/userList";
+import { useUserStore } from "@s/userList";
 import VacationModal from "@c/modal/VacationModal.vue"
-import { useUserStore } from "@s/useUserStore";
+import { useUserInfoStore } from "@s/useUserInfoStore";
 import VacationGrantModal from "@c/modal/VacationGrantModal.vue";

-const userStore = useUserStore();
-const userListStore = useUserListStore();
+const userStore = useUserInfoStore();
+const userListStore = useUserStore();
 const userList = ref([]);
 const userColors = ref({});
 const myVacations = ref([]); // 내가 사용한 연차 목록