Merge branch 'main' into board-view-content

This commit is contained in:
yoon 2025-02-06 09:25:12 +09:00
commit 4329d9febd

View File

@ -51,7 +51,7 @@
</tr>
</thead>
<tbody>
<!-- 공지사항 ( 페이지에서만 표시, showNotices가 false일 때만 보임) -->
<!-- 공지사항 -->
<template v-if="pagination.currentPage === 1 && !showNotices">
<tr v-for="(notice, index) in noticeList"
:key="'notice-' + index"
@ -60,6 +60,7 @@
<td>공지</td>
<td>
📌 {{ notice.title }}
<i v-if="notice.img" class="bi bi-image me-1"></i>
<i v-if="notice.hasAttachment" class="bi bi-paperclip"></i>
<span v-if="isNewPost(notice.date)" class="badge bg-danger text-white ms-2 new-badge">N</span>
</td>
@ -76,6 +77,7 @@
<td>{{ post.id }}</td>
<td>
{{ post.title }}
<i v-if="post.img" class="bi bi-image me-1"></i>
<i v-if="post.hasAttachment" class="bi bi-paperclip"></i>
<span v-if="isNewPost(post.date)" class="badge bg-danger text-white ms-2 new-badge">N</span>
</td>
@ -112,7 +114,7 @@ import isYesterday from 'dayjs/plugin/isYesterday';
import 'bootstrap-icons/font/bootstrap-icons.css';
dayjs.extend(isToday); //
dayjs.extend(isToday);
dayjs.extend(isYesterday);
//
@ -155,13 +157,13 @@ const isNewPost = (dateString) => {
return date.isToday() || date.isYesterday();
};
// ( )
//
const search = (e) => {
searchText.value = e.trim();
fetchGeneralPosts(1);
};
// ( )
//
const handleSortChange = () => {
fetchGeneralPosts(1);
};
@ -184,13 +186,17 @@ const fetchGeneralPosts = async (page = 1) => {
});
if (data?.data) {
generalList.value = data.data.list.map(post => ({
id: post.id,
console.log(data)
const totalPosts = data.data.total; // (API )
generalList.value = data.data.list.map((post, index) => ({
id: totalPosts - ((page - 1) * selectedSize.value) - index,
title: post.title,
author: post.author || '익명',
date: formatDate(post.date), //
views: post.cnt || 0,
hasAttachment: post.hasAttachment || false
hasAttachment: post.hasAttachment || false,
img: post.firstImageUrl || null
}));
pagination.value = {
@ -226,9 +232,10 @@ const fetchNoticePosts = async () => {
id: post.id,
title: post.title,
author: post.author || '관리자',
date: formatDate(post.date), //
date: formatDate(post.date),
views: post.cnt || 0,
hasAttachment: post.hasAttachment || false
hasAttachment: post.hasAttachment || false,
img: post.firstImageUrl || null
}));
}
} catch (error) {
@ -255,7 +262,6 @@ onMounted(() => {
.notice-row {
background-color: #f8f9fa;
}
.notice-row td {
color: #DC3545 !important;
}