From 582030fd5d8023fbca08696df8d9cff603b9759d Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Fri, 4 Apr 2025 16:04:30 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=ED=83=91=EB=B0=94=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/TheTop.vue | 52 +-----------------------------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/src/layouts/TheTop.vue b/src/layouts/TheTop.vue
index c40e4ab..8cb7c8b 100644
--- a/src/layouts/TheTop.vue
+++ b/src/layouts/TheTop.vue
@@ -33,10 +33,7 @@
                     </option>
                 </select>
 
-                <!-- <button class="btn p-1" @click="switchToLightMode"><i class="bx bxs-sun link-warning"></i></button> -->
-                <!-- <button class="btn p-1" @click="switchToDarkMode"><i class="bx bxs-moon"></i></button> -->
-
-                <i class="bx bx-bell bx-md bx-log-out cursor-pointer p-3" @click="handleLogout"></i>
+                <i class="cursor-pointer p-2"></i>
 
                 <!-- Notification -->
                 <li class="nav-item dropdown-notifications navbar-dropdown dropdown me-3 me-xl-2 p-0">
@@ -186,24 +183,6 @@
                         />
                     </a>
                     <ul class="dropdown-menu dropdown-menu-end">
-                        <li>
-                            <a class="dropdown-item" href="pages-account-settings-account.html">
-                                <div class="d-flex">
-                                    <div class="flex-shrink-0 me-3">
-                                        <div class="avatar avatar-online">
-                                            <img src="/img/avatars/1.png" class="w-px-40 h-auto rounded-circle" />
-                                        </div>
-                                    </div>
-                                    <div class="flex-grow-1">
-                                        <h6 class="mb-0">John Doe</h6>
-                                        <small class="text-muted">Admin</small>
-                                    </div>
-                                </div>
-                            </a>
-                        </li>
-                        <li>
-                            <div class="dropdown-divider my-1"></div>
-                        </li>
                         <li>
                             <a class="dropdown-item" href="javascript:void(0)" @click="goToMyPage">
                                 <i class="bx bx-user bx-md me-3"></i><span>My Page</span>
@@ -214,28 +193,6 @@
                                 <i class="bx bx-cog bx-md me-3"></i><span>Settings</span>
                             </a>
                         </li>
-                        <li>
-                            <a class="dropdown-item" href="pages-account-settings-billing.html">
-                                <span class="d-flex align-items-center align-middle">
-                                    <i class="flex-shrink-0 bx bx-credit-card bx-md me-3"></i
-                                    ><span class="flex-grow-1 align-middle">Billing Plan</span>
-                                    <span class="flex-shrink-0 badge rounded-pill bg-danger">4</span>
-                                </span>
-                            </a>
-                        </li>
-                        <li>
-                            <div class="dropdown-divider my-1"></div>
-                        </li>
-                        <li>
-                            <a class="dropdown-item" href="pages-pricing.html">
-                                <i class="bx bx-dollar bx-md me-3"></i><span>Pricing</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a class="dropdown-item" href="pages-faq.html">
-                                <i class="bx bx-help-circle bx-md me-3"></i><span>FAQ</span>
-                            </a>
-                        </li>
                         <li>
                             <div class="dropdown-divider my-1"></div>
                         </li>
@@ -246,15 +203,8 @@
                         </li>
                     </ul>
                 </li>
-                <!--/ User -->
             </ul>
         </div>
-
-        <!-- Search Small Screens -->
-        <div class="navbar-search-wrapper search-input-wrapper d-none">
-            <input type="text" class="form-control search-input container-xxl border-0" placeholder="Search..." aria-label="Search..." />
-            <i class="bx bx-x bx-md search-toggler cursor-pointer"></i>
-        </div>
     </nav>
 </template>
 <script setup>

From 080511f4280289a5c1ce2d498c1ff0e39dbb977f Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Fri, 4 Apr 2025 16:14:42 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=EB=A9=94=EC=9D=B8=EB=B3=B4=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/main/BoardMain.vue | 35 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/components/main/BoardMain.vue b/src/components/main/BoardMain.vue
index c02b99a..5e59ebc 100644
--- a/src/components/main/BoardMain.vue
+++ b/src/components/main/BoardMain.vue
@@ -1,6 +1,15 @@
 <template>
 <div class="col-md-6 col-lg-4 col-xl-4 order-0 mb-6">
     <div class="card text-center h-100">
+        <!-- 더보기 버튼 -->
+        <div class="modal-foote d-flex">
+            <router-link
+            :to="{ name: 'BoardList', query: { type: selectedBoard } }"
+            class="btn btn-primary mr-1 pe-1 ps-1 ms-auto my-auto h-50"
+            >
+            more
+            </router-link>
+        </div>
         <div class="card-body">
         <!-- 모달 본문 -->
         <div class="modal-bod">
@@ -37,12 +46,10 @@
                     <tr>
                     <!-- 익명게시판은 'nickname', 나머지는 'writer' -->
                     <th class="text-center" style="width: 20%;">
-                        {{ selectedBoard === 'anonymous' ? 'nickname' : 'writer' }}
+                        {{ selectedBoard === 'anonymous' ? '닉네임' : '작성자' }}
                     </th>
-                    <!-- 제목 헤더는 왼쪽 정렬 -->
-                    <th class="text-start" style="width: 65%;">title</th>
-                    <th class="text-center" style="width: 15%;">views</th>
-                    </tr>
+                    <th class="text-center" style="width: 65%;">제목</th>
+                </tr>
                 </thead>
                 <tbody>
                     <tr
@@ -55,7 +62,7 @@
                         {{ selectedBoard === 'anonymous' ? post.nickname : post.author }}
                     </td>
                     <td class="text-start fs-6">
-                        <div>
+                        <div class="ms-2">
                         {{ truncateTitle(post.title) }}
                         <span v-if="post.commentCount" class="text-danger ml-1 small">
                             [{{ post.commentCount }}]
@@ -65,12 +72,15 @@
                         v-if="post.hasAttachment.length > 0"
                         class="bi bi-paperclip ml-1 small"
                         ></i>
-                        </div>
+
                         <div class="text-muted small small">
                         {{ post.date }}
+                        <span class="ms-1">
+                        <i class="fa-regular fa-eye small me-1"></i>{{post.views}}
+                        </span>
                         </div>
+                    </div>
                     </td>
-                    <td class="text-center small">{{ post.views }}</td>
                     </tr>
                     <tr v-if="currentList.length === 0">
                     <td colspan="3" class="text-center text-muted">게시물이 없습니다.</td>
@@ -79,15 +89,6 @@
                 </table>
             </div>
         </div>
-        <!-- 모달 푸터: 더보기 버튼 오른쪽 정렬 -->
-        <div class="modal-foote d-flex">
-            <router-link
-            :to="{ name: 'BoardList', query: { type: selectedBoard } }"
-            class="btn btn-primary mr-1 pe-1 ps-1 ms-auto my-auto h-50"
-            >
-            more
-            </router-link>
-        </div>
     </div>
 </div>
 </template>

From 5390988afa46d351797d5c97e42cb7c731250482 Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Fri, 4 Apr 2025 16:17:13 +0900
Subject: [PATCH 3/5] ..

---
 src/components/main/BoardMain.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/main/BoardMain.vue b/src/components/main/BoardMain.vue
index 5e59ebc..a596c62 100644
--- a/src/components/main/BoardMain.vue
+++ b/src/components/main/BoardMain.vue
@@ -2,7 +2,7 @@
 <div class="col-md-6 col-lg-4 col-xl-4 order-0 mb-6">
     <div class="card text-center h-100">
         <!-- 더보기 버튼 -->
-        <div class="modal-foote d-flex">
+        <div class="d-flex">
             <router-link
             :to="{ name: 'BoardList', query: { type: selectedBoard } }"
             class="btn btn-primary mr-1 pe-1 ps-1 ms-auto my-auto h-50"
@@ -12,7 +12,7 @@
         </div>
         <div class="card-body">
         <!-- 모달 본문 -->
-        <div class="modal-bod">
+        <div class="modal-body">
             <!-- 탭 버튼 영역 -->
             <div class="btn-group mb-5" role="group">
                 <button

From c4b40dea79bd8f689434f165c47daf831761ff83 Mon Sep 17 00:00:00 2001
From: khj0414 <khj0414@local-host.co.kr>
Date: Fri, 4 Apr 2025 16:18:35 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EC=9A=A9=EC=96=B4=EC=A7=91=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=82=AC=ED=95=AD=20=EC=97=86=EC=9D=84=EB=96=84=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/wordDict/DictWrite.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/wordDict/DictWrite.vue b/src/components/wordDict/DictWrite.vue
index 4913467..e37b52d 100644
--- a/src/components/wordDict/DictWrite.vue
+++ b/src/components/wordDict/DictWrite.vue
@@ -51,7 +51,7 @@
         <div>
             <QEditor class="" @keyup="ValidHandler('content')"  @update:data="handleContentUpdate" @update:imageUrls="imageUrls = $event"  :is-alert="wordContentAlert" :initialData="contentValue"/>
             <div class="text-end mt-5">
-                <button class="btn btn-primary" @click="saveWord" :disabled="titleValue ? !changed : false" >
+                <button class="btn btn-primary" @click="saveWord" :disabled="titleValue ? !changed : false">
                     <i class="bx bx-check"></i>
                 </button>
             </div>
@@ -150,6 +150,16 @@ const ValidHandler = (field) => {
 }
 const handleContentUpdate = (newContent) => {
     content.value = newContent;
+
+    const oldContent = typeof props.contentValue === 'string'? JSON.parse(props.contentValue) : props.contentValue;
+    const newContentOps = newContent?.ops || [];
+
+    const oldContentJson = JSON.stringify(oldContent);
+    const newContentJson = JSON.stringify(newContentOps);
+
+    // 기존 데이터와 새 데이터가 다를 경우 changed = true;
+    changed.value = oldContentJson !== newContentJson;
+
     ValidHandler("content"); // 유효성 검사 실행
 };
 

From d1aa3d3a04678641cdd15f4e805276a73e4dcc99 Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Fri, 4 Apr 2025 16:20:44 +0900
Subject: [PATCH 5/5] Merge branch 'main' into mypage