From 400eadf3d91444e2bf9311493bf1d66e40760e16 Mon Sep 17 00:00:00 2001 From: yoon Date: Mon, 10 Mar 2025 21:58:23 +0900 Subject: [PATCH 01/29] =?UTF-8?q?=ED=9C=B4=EA=B0=80=EA=B4=80=EB=A6=AC=20as?= =?UTF-8?q?ide=20style=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/custom.css | 26 +----------- src/components/button/HalfDayButtons.vue | 45 +++++++++++---------- src/components/vacation/ProfileList.vue | 48 +++++++++++------------ src/views/vacation/VacationManagement.vue | 41 +++++++++---------- 4 files changed, 70 insertions(+), 90 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index 6eb5920..e367c87 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -108,7 +108,6 @@ cursor: not-allowed !important; .vac-modal-content { background: #fff; padding: 20px; - border-radius: 8px; box-shadow: 0px -4px 5px rgba(0, 0, 0, 0.1), 0px 4px 0px rgba(0, 0, 0, 0); max-width: 500px; @@ -229,21 +228,7 @@ cursor: not-allowed !important; /* 오전/오후반차,저장버튼 */ /* 버튼 기본 스타일 */ .vac-btn { - width: 60px; - height: 60px; - border-radius: 50%; - font-size: 20px; - display: flex; - align-items: center; - justify-content: center; - transition: all 0.2s ease-in-out; - display: inline-block; - font-weight: 400; - line-height: 1.53; - color: #697a8d; - text-align: center; - vertical-align: middle; - cursor: pointer; + transition: all 0.2sease-in-out; border: 1px solid transparent; } /* 마우스를 올렸을 때 */ @@ -286,17 +271,9 @@ cursor: not-allowed !important; } /* 버튼 기본 (비활성화일 때 기본 녹색) */ .vac-btn-success { - font-size: 24px; - width: 60px; - height: 60px; - border-radius: 50%; - display: flex; - align-items: center; - justify-content: center; transition: all 0.2s ease-in-out; background-color: #871919 !important; color: white; - cursor: pointer; border: 1px solid transparent; } /* 버튼 활성화 */ @@ -309,7 +286,6 @@ cursor: not-allowed !important; } /* 버튼 비활성화 */ .vac-btn-success.disabled { - border: 3px solid #e6e4e4; /* 붉은색 테두리 적용 */ background-color: #bbb8b8 !important; color: white !important; cursor: not-allowed !important; diff --git a/src/components/button/HalfDayButtons.vue b/src/components/button/HalfDayButtons.vue index 08cc241..858731f 100644 --- a/src/components/button/HalfDayButtons.vue +++ b/src/components/button/HalfDayButtons.vue @@ -1,27 +1,30 @@ diff --git a/src/components/vacation/ProfileList.vue b/src/components/vacation/ProfileList.vue index b5d5007..fdf7153 100644 --- a/src/components/vacation/ProfileList.vue +++ b/src/components/vacation/ProfileList.vue @@ -1,28 +1,30 @@ @@ -110,9 +112,7 @@ if (windowWidth.value >= 1850) { }); const getDynamicStyle = (user) => ({ -width: profileSize.value, -height: profileSize.value, -borderWidth: "4px", +borderWidth: "2px", borderColor: user.usercolor || "#ccc", borderStyle: "solid", }); diff --git a/src/views/vacation/VacationManagement.vue b/src/views/vacation/VacationManagement.vue index 3374500..9b39db8 100644 --- a/src/views/vacation/VacationManagement.vue +++ b/src/views/vacation/VacationManagement.vue @@ -3,36 +3,37 @@
-
-
-
- +
+ +
+ -
- + + /> +
From 6d1905ba03e8f7f22e8f6266f84a8c52660773c6 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Tue, 11 Mar 2025 10:21:11 +0900 Subject: [PATCH 02/29] =?UTF-8?q?=EB=B2=84=ED=8A=BC=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/voteboard/voteCard.vue | 5 +++-- src/views/wordDict/wordDict.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/voteboard/voteCard.vue b/src/components/voteboard/voteCard.vue index 44a346a..734477f 100644 --- a/src/components/voteboard/voteCard.vue +++ b/src/components/voteboard/voteCard.vue @@ -24,9 +24,10 @@ + > +

diff --git a/src/views/wordDict/wordDict.vue b/src/views/wordDict/wordDict.vue index 7d683d5..ebd0a67 100644 --- a/src/views/wordDict/wordDict.vue +++ b/src/views/wordDict/wordDict.vue @@ -9,7 +9,7 @@
- +
@@ -108,7 +108,7 @@ }); const refreshWordList = () => { - getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value); + getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value); }; //용어 목록 @@ -205,6 +205,7 @@ } getwordList(); getIndex(); + selectedCategory.value = 'all'; if(res.data.data == '2'){ const newCategory = { label: data, value: category }; cateList.value = [...cateList.value,newCategory]; From 23f39170da27fe5eadc8e939735e6fe69dac5ea2 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Tue, 11 Mar 2025 10:29:42 +0900 Subject: [PATCH 03/29] =?UTF-8?q?=EB=B2=84=ED=8A=BC=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/voteboard/voteCard.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/voteboard/voteCard.vue b/src/components/voteboard/voteCard.vue index 734477f..e0055f5 100644 --- a/src/components/voteboard/voteCard.vue +++ b/src/components/voteboard/voteCard.vue @@ -105,7 +105,6 @@ voteEndDate.setDate(voteEndDate.getDate() + 1); const isVoteEnded = computed(() => { return currentDate > voteEndDate; }); - const emit = defineEmits(['addContents','checkedNames','endVoteId','voteEnded','randomList','voteDelete','updateVote']); onMounted(() => { if (isVoteEnded.value && !props.data.localVote.LOCVOTDDT) { From 7ec6424667b4d3f7421fcc558b03393ce2d2a9bc Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Tue, 11 Mar 2025 10:34:10 +0900 Subject: [PATCH 04/29] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/board/BoardView.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue index 10d9a31..3d811df 100644 --- a/src/views/board/BoardView.vue +++ b/src/views/board/BoardView.vue @@ -677,12 +677,10 @@ if (!confirm('정말 이 댓글을 삭제하시겠습니까?')) return; const targetComment = findCommentById(comment.commentId, comments.value); - - // console.log('잘되니?',comment) - + console.log(comment.parentId, comment.commentId) try { const response = await axios.delete(`board/comment/${comment.commentId}`, { - data: { LOCCMTSEQ: comment.commentId }, + params: { LOCCMTSEQ: comment.commentId, LOCCMTPNT: comment.parentId }, }); if (response.data.code === 200) { From c5013e0ef091e69b73b535d80ac35aa8c7c22984 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Tue, 11 Mar 2025 10:35:05 +0900 Subject: [PATCH 05/29] Merge branch 'main' into board-ji From 93f6d1f3b92b3583282f651197a39817e08cc0cc Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Tue, 11 Mar 2025 10:38:12 +0900 Subject: [PATCH 06/29] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/board/BoardView.vue | 190 ++++++++++++++++------------------ 1 file changed, 89 insertions(+), 101 deletions(-) diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue index 10d9a31..844a5a1 100644 --- a/src/views/board/BoardView.vue +++ b/src/views/board/BoardView.vue @@ -157,7 +157,7 @@ const toastStore = useToastStore(); const currentBoardId = ref(Number(route.params.id)); const unknown = computed(() => profileName.value === '익명'); - const currentUserId = computed(() => userStore.user.id); // 현재 로그인한 사용자 id + const currentUserId = computed(() => userStore?.user?.id); // 현재 로그인한 사용자 id const authorId = ref(''); // 작성자 id const isAuthor = computed(() => currentUserId.value === authorId.value); @@ -233,24 +233,20 @@ }; // 게시물 상세 데이터 불러오기 const fetchBoardDetails = async () => { - try { - const response = await axios.get(`board/${currentBoardId.value}`); - const data = response.data.data; + const response = await axios.get(`board/${currentBoardId.value}`); + const data = response.data.data; - profileName.value = data.author || '익명'; - authorId.value = data.authorId; - boardTitle.value = data.title || '제목 없음'; - boardContent.value = data.content || ''; - date.value = data.date || ''; - views.value = data.cnt || 0; - likes.value = data.likeCount || 0; - dislikes.value = data.dislikeCount || 0; - attachment.value = data.hasAttachment || null; - commentNum.value = data.commentCount || 0; - attachments.value = data.attachments || []; - } catch (error) { - alert('게시물 데이터를 불러오는 중 오류가 발생했습니다.'); - } + profileName.value = data.author || '익명'; + authorId.value = data.authorId; + boardTitle.value = data.title || '제목 없음'; + boardContent.value = data.content || ''; + date.value = data.date || ''; + views.value = data.cnt || 0; + likes.value = data.likeCount || 0; + dislikes.value = data.dislikeCount || 0; + attachment.value = data.hasAttachment || null; + commentNum.value = data.commentCount || 0; + attachments.value = data.attachments || []; }; // 좋아요, 싫어요 @@ -280,97 +276,89 @@ const handleCommentReaction = async ({ boardId, commentId, isLike, isDislike }) => { if (!commentId) return; // 댓글 ID가 없으면 실행 안 함 - try { - const response = await axios.post(`/board/${boardId}/${commentId}/reaction`, { - LOCBRDSEQ: boardId, // 게시글 ID - LOCCMTSEQ: commentId, // 댓글 ID - LOCGOBGOD: isLike ? 'T' : 'F', - LOCGOBBAD: isDislike ? 'T' : 'F', - }); + const response = await axios.post(`/board/${boardId}/${commentId}/reaction`, { + LOCBRDSEQ: boardId, // 게시글 ID + LOCCMTSEQ: commentId, // 댓글 ID + LOCGOBGOD: isLike ? 'T' : 'F', + LOCGOBBAD: isDislike ? 'T' : 'F', + }); - await fetchComments(); - } catch (error) { - alert('오류가 발생했습니다.'); - } + await fetchComments(); }; // 댓글 목록 조회 const fetchComments = async (page = 1) => { - try { - // 댓글 - const response = await axios.get(`board/${currentBoardId.value}/comments`, { - params: { - LOCBRDSEQ: currentBoardId.value, - page, - }, + // 댓글 + const response = await axios.get(`board/${currentBoardId.value}/comments`, { + params: { + LOCBRDSEQ: currentBoardId.value, + page, + }, + }); + const commentsList = response.data.data.list.map(comment => ({ + commentId: comment.LOCCMTSEQ, // 댓글 ID + boardId: comment.LOCBRDSEQ, + parentId: comment.LOCCMTPNT, // 부모 ID + author: comment.author || '익명', + authorId: comment.authorId, + content: comment.LOCCMTRPY, + likeCount: comment.likeCount || 0, + dislikeCount: comment.dislikeCount || 0, + likeClicked: comment.likeClicked || false, + dislikeClicked: comment.dislikeClicked || false, + createdAtRaw: new Date(comment.LOCCMTRDT), // 정렬용 + createdAt: formattedDate(comment.LOCCMTRDT), // 표시용 + children: [], // 대댓글을 담을 배열 + updateAtRaw: comment.LOCCMTUDT, + })); + + commentsList.sort((a, b) => b.createdAtRaw - a.createdAtRaw); + + for (const comment of commentsList) { + if (!comment.commentId) continue; + + const replyResponse = await axios.get(`board/${currentBoardId.value}/reply`, { + params: { LOCCMTPNT: comment.commentId }, }); - const commentsList = response.data.data.list.map(comment => ({ - commentId: comment.LOCCMTSEQ, // 댓글 ID - boardId: comment.LOCBRDSEQ, - parentId: comment.LOCCMTPNT, // 부모 ID - author: comment.author || '익명', - authorId: comment.authorId, - content: comment.LOCCMTRPY, - likeCount: comment.likeCount || 0, - dislikeCount: comment.dislikeCount || 0, - likeClicked: comment.likeClicked || false, - dislikeClicked: comment.dislikeClicked || false, - createdAtRaw: new Date(comment.LOCCMTRDT), // 정렬용 - createdAt: formattedDate(comment.LOCCMTRDT), // 표시용 - children: [], // 대댓글을 담을 배열 - updateAtRaw: comment.LOCCMTUDT, - })); - commentsList.sort((a, b) => b.createdAtRaw - a.createdAtRaw); - - for (const comment of commentsList) { - if (!comment.commentId) continue; - - const replyResponse = await axios.get(`board/${currentBoardId.value}/reply`, { - params: { LOCCMTPNT: comment.commentId }, - }); - - if (replyResponse.data.data) { - comment.children = replyResponse.data.data.map(reply => ({ - author: reply.author || '익명', - authorId: reply.authorId, - commentId: reply.LOCCMTSEQ, - boardId: reply.LOCBRDSEQ, - parentId: reply.LOCCMTPNT, // 부모 댓글 ID - content: reply.LOCCMTRPY || '내용 없음', - createdAtRaw: new Date(reply.LOCCMTRDT), - createdAt: formattedDate(reply.LOCCMTRDT), - likeCount: reply.likeCount || 0, - dislikeCount: reply.dislikeCount || 0, - likeClicked: false, - dislikeClicked: false, - })); - } else { - comment.children = []; // 대댓글이 없으면 빈 배열로 초기화 - } + if (replyResponse.data.data) { + comment.children = replyResponse.data.data.map(reply => ({ + author: reply.author || '익명', + authorId: reply.authorId, + commentId: reply.LOCCMTSEQ, + boardId: reply.LOCBRDSEQ, + parentId: reply.LOCCMTPNT, // 부모 댓글 ID + content: reply.LOCCMTRPY || '내용 없음', + createdAtRaw: new Date(reply.LOCCMTRDT), + createdAt: formattedDate(reply.LOCCMTRDT), + likeCount: reply.likeCount || 0, + dislikeCount: reply.dislikeCount || 0, + likeClicked: false, + dislikeClicked: false, + })); + } else { + comment.children = []; // 대댓글이 없으면 빈 배열로 초기화 } - - // 최종적으로 댓글 목록 업데이트 - comments.value = commentsList; - - pagination.value = { - ...pagination.value, - currentPage: response.data.data.pageNum, // 현재 페이지 번호 - pages: response.data.data.pages, // 전체 페이지 수 - prePage: response.data.data.prePage, // 이전 페이지 - nextPage: response.data.data.nextPage, // 다음 페이지 - isFirstPage: response.data.data.isFirstPage, // 첫 페이지 여부 - isLastPage: response.data.data.isLastPage, // 마지막 페이지 여부 - hasPreviousPage: response.data.data.hasPreviousPage, // 이전 페이지 존재 여부 - hasNextPage: response.data.data.hasNextPage, // 다음 페이지 존재 여부 - navigatePages: response.data.data.navigatePages, // 몇 개의 페이지 버튼을 보여줄 것인지 - navigatepageNums: response.data.data.navigatepageNums, // 실제 페이지 번호 목록 - navigateFirstPage: response.data.data.navigateFirstPage, // 페이지네이션에서 첫 페이지 번호 - navigateLastPage: response.data.data.navigateLastPage, // 페이지네이션에서 마지막 페이지 번호 - }; - } catch (error) { - alert('오류가 발생했습니다.'); } + + // 최종적으로 댓글 목록 업데이트 + comments.value = commentsList; + + pagination.value = { + ...pagination.value, + currentPage: response.data.data.pageNum, // 현재 페이지 번호 + pages: response.data.data.pages, // 전체 페이지 수 + prePage: response.data.data.prePage, // 이전 페이지 + nextPage: response.data.data.nextPage, // 다음 페이지 + isFirstPage: response.data.data.isFirstPage, // 첫 페이지 여부 + isLastPage: response.data.data.isLastPage, // 마지막 페이지 여부 + hasPreviousPage: response.data.data.hasPreviousPage, // 이전 페이지 존재 여부 + hasNextPage: response.data.data.hasNextPage, // 다음 페이지 존재 여부 + navigatePages: response.data.data.navigatePages, // 몇 개의 페이지 버튼을 보여줄 것인지 + navigatepageNums: response.data.data.navigatepageNums, // 실제 페이지 번호 목록 + navigateFirstPage: response.data.data.navigateFirstPage, // 페이지네이션에서 첫 페이지 번호 + navigateLastPage: response.data.data.navigateLastPage, // 페이지네이션에서 마지막 페이지 번호 + }; }; // 댓글 작성 @@ -453,7 +441,7 @@ // 게시글 삭제 버튼 클릭 const deleteClick = unknown => { - if (unknown) { + if (unknown.value) { togglePassword('delete'); } else { deletePost(); From 704452628485b3137aaacc5ed5aee858a4651d49 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Tue, 11 Mar 2025 10:42:37 +0900 Subject: [PATCH 07/29] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EC=9E=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/board/BoardView.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue index 844a5a1..eccf4e9 100644 --- a/src/views/board/BoardView.vue +++ b/src/views/board/BoardView.vue @@ -441,7 +441,9 @@ // 게시글 삭제 버튼 클릭 const deleteClick = unknown => { - if (unknown.value) { + const isUnknown = unknown?.unknown ?? false; + + if (isUnknown) { togglePassword('delete'); } else { deletePost(); From e33d2b870d8e4b43c21554fa676fb1c9e5ac0dd7 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Tue, 11 Mar 2025 10:48:10 +0900 Subject: [PATCH 08/29] Merge branch 'main' into style From 5d2fd8009816563f29b70434a65eb723ae2b6880 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Tue, 11 Mar 2025 10:49:54 +0900 Subject: [PATCH 09/29] Merge branch 'style' From c3dabc4262f0e07f44a024d07be3f80875fe5823 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Tue, 11 Mar 2025 11:03:17 +0900 Subject: [PATCH 10/29] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20al?= =?UTF-8?q?ert=20=EB=85=B8=EC=B6=9C=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/board/BoardCommentArea.vue | 28 ++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/components/board/BoardCommentArea.vue b/src/components/board/BoardCommentArea.vue index 0ffbc98..d607cf6 100644 --- a/src/components/board/BoardCommentArea.vue +++ b/src/components/board/BoardCommentArea.vue @@ -34,25 +34,27 @@
-
- - - {{ passwordAlert }} - {{ passwordAlert2 }} -
+
+ {{ passwordAlert }} + {{ passwordAlert2 }}
From e04d1c65fed0e65a0da198eaabde135371820cc4 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Tue, 11 Mar 2025 11:09:26 +0900 Subject: [PATCH 11/29] =?UTF-8?q?=ED=9C=B4=EA=B0=80css=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/custom.css | 29 ++++++++++++++++++------- src/components/vacation/ProfileList.vue | 2 +- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index e367c87..cacca3f 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -229,7 +229,7 @@ cursor: not-allowed !important; /* 버튼 기본 스타일 */ .vac-btn { transition: all 0.2sease-in-out; - border: 1px solid transparent; + border: 2px solid transparent; } /* 마우스를 올렸을 때 */ .vac-btn:hover { @@ -250,8 +250,9 @@ cursor: not-allowed !important; .vac-btn-warning{ color: #fff; background-color: #ffc144; - border-color: #ffe605; + border-color: #ffc144; box-shadow: 0 0.125rem 0.25rem 0 rgba(255, 171, 0, 0.4); + font-size: 28px; } /* AM 버튼 (선택된 상태) */ .vac-btn-warning.active { @@ -263,18 +264,20 @@ cursor: not-allowed !important; background-color: #03c3ec; border-color: #03c3ec; box-shadow: 0 0.125rem 0.25rem 0 rgba(3, 195, 236, 0.4); + font-size: 28px; } /* PM 버튼 (선택된 상태) */ .vac-btn-info.active { background-color: #0b5ed7 !important; color: white; } -/* 버튼 기본 (비활성화일 때 기본 녹색) */ +/* 버튼 기본 */ .vac-btn-success { transition: all 0.2s ease-in-out; background-color: #871919 !important; color: white; - border: 1px solid transparent; + border: 2px solid transparent; + font-size: 30px; } /* 버튼 활성화 */ .vac-btn-success.active { @@ -317,17 +320,17 @@ cursor: not-allowed !important; font-size: 22px; } .vac-grant-modal-title { - font-size: 16px; + font-size: 18px; } .vac-modal-text { - font-size: 11px; + font-size: 13px; } .vac-modal-title { - font-size: 14px; + font-size: 17px; margin-bottom: 10px; } .vacation-item { - font-size: 12px; + font-size: 13px; text-align: center; margin-bottom: 5px; } @@ -343,6 +346,16 @@ cursor: not-allowed !important; } } @media (max-width: 1500px) { + .vac-grant-modal-title { + font-size: 14px; + } + .vac-modal-text { + font-size: 11px; + } + .vac-modal-title { + font-size: 13px; + margin-bottom: 10px; + } .close-btn { top: 5px; right: 5px; diff --git a/src/components/vacation/ProfileList.vue b/src/components/vacation/ProfileList.vue index fdf7153..1e5a6e6 100644 --- a/src/components/vacation/ProfileList.vue +++ b/src/components/vacation/ProfileList.vue @@ -112,7 +112,7 @@ if (windowWidth.value >= 1850) { }); const getDynamicStyle = (user) => ({ -borderWidth: "2px", +borderWidth: "3px", borderColor: user.usercolor || "#ccc", borderStyle: "solid", }); From fb8c00fd6b0a1549470817c90b56340a2ebecb16 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Tue, 11 Mar 2025 12:38:03 +0900 Subject: [PATCH 12/29] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=95=84=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EA=B2=8C=20=EC=9D=B5=EB=AA=85=EC=9D=BC=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EB=8F=84=20=EC=9D=B5=EB=AA=85=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EB=85=B8=EC=B6=9C=ED=95=98=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/board/BoardComment.vue | 1 + src/components/board/BoardProfile.vue | 17 +++++++++-------- src/views/board/BoardView.vue | 7 ++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/components/board/BoardComment.vue b/src/components/board/BoardComment.vue index 89fd3ad..8b92d38 100644 --- a/src/components/board/BoardComment.vue +++ b/src/components/board/BoardComment.vue @@ -7,6 +7,7 @@ :profileName="comment.author" :date="comment.createdAt" :comment="comment" + :profileImg="comment.profileImg" :showDetail="false" :isLike="!isLike" :isCommentPassword="isCommentPassword" diff --git a/src/components/board/BoardProfile.vue b/src/components/board/BoardProfile.vue index b183865..c4f8e54 100644 --- a/src/components/board/BoardProfile.vue +++ b/src/components/board/BoardProfile.vue @@ -1,8 +1,8 @@