Merge branch 'main' into board-ji

public/css/font.css

@@ -152,7 +152,7 @@ body {
 /* Consolas 폰트 */
 @font-face {
     font-family: 'Consolas';
-    src: url('/font/Consolas.woff') format('woff');
+    src: url('/font/Consolas.woff') format('font-woff');
     font-weight: normal;
     font-style: normal;
 }

src/components/list/ProjectCard.vue

@@ -63,7 +63,7 @@
                             </div>
                         </div>
                     </div>
-                    <button type="button" class="btn ms-auto text-white" :style="`background-color: ${projctColor} !important;`" @click.stop="openModal">log</button>
+                    <button type="button" class="btn ms-auto text-white" :style="`background-color: ${projctColor} !important;`" @click.stop="openModal"><i class='bx bx-child'></i></button>
                 </div>
             </div>
         </div>
@@ -71,7 +71,7 @@
 
     <!-- 로그 모달 -->
     <CenterModal :display="isModalOpen" @close="closeModal">
-        <template #title> Log </template>
+        <template #title> 등록·수정자 </template>
         <template #body>
             <div v-if="logData.length > 0">
                 <div

src/components/voteboard/voteCardCheckList.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="list-group">
-        <label class="list-group-item">
+        <label class="list-group-item" style="cursor: pointer;">
             <input
                 class="form-check-input me-1"
                 :name="data.LOCVOTSEQ"

src/views/wordDict/wordDict.vue

@@ -29,9 +29,8 @@
                     <!-- 에러 메시지 -->
                     <div v-if="error" class="fw-bold text-danger">{{ error }}</div>
                     <!-- 단어 목록 -->
-                    <ul v-if="total > 0" class="ms-3 list-unstyled">
+                    <ul v-if="total > 0" class="ms-3 list-unstyled" style="overflow-x: hidden; word-wrap: break-word;">
                         <DictCard
-                            class="DictCard"
                             v-for="item in wordList"
                             :key="item.WRDDICSEQ"
                             :item="item"
@@ -41,7 +40,8 @@
                         />
                     </ul>
                     <!-- 데이터가 없을 때 -->
-                    <div v-if="total == 0" class="text-center mt-5">용어를 선택 / 작성해 주세요</div>
+
+                    <div v-if="total == 0" class="text-center mt-5">{{ searchText ? '검색된 목록이 없습니다.':'용어를 선택 / 작성해 주세요' }}</div>
                 </div>
             </div>
         </div>
@@ -151,8 +151,20 @@
     // 검색
     const search = (e) => {
         searchText.value = e.trim();
+        if(searchText.value){
             getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
+        }else{
+            if( selectedCategory.value !== '' && selectedCategory.value !== null){
+                getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
+            }
+            else if( selectedAlphabet.value !== '' && selectedAlphabet.value !== null){
+                getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
+            }else{
+                wordList.value = [];
+                total.value = 0;
+            }
         };
+    }
 
     // 알파벳 선택
     const handleSelectedAlphabetChange = (newAlphabet) => {
@@ -280,9 +292,4 @@
     height: fit-content;
 }
 
-.DictCard {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
-    gap: 1rem;
-}
 </style>