Merge branch 'main' into vacation

src/components/main/MainMemberProfile.vue

@@ -4,7 +4,7 @@
             <li class="col-4 me-0" v-for="(member, index) in members" :key="index">
                 <div class="ratio ratio-1x1 mb-0 profile-list">
                     <img
-                        :src="`${baseUrl}upload/img/profile/${member.MEMBERPRF}`"
+                        :src="`${profileImgUrl}profile/${member.MEMBERPRF}`"
                         :style="`border-color: ${member.usercolor} !important;`"
                         alt="User Profile"
                         class="rounded-circle border border-2"
@@ -16,9 +16,8 @@
     </div>
 </template>
 
-<script>
+<script setup>
-    export default {
+    const props = defineProps({
-        props: {
         members: {
             type: Array,
             required: true,
@@ -27,6 +26,7 @@
             type: String,
             required: true,
         },
-        },
+    });
-    };
+
+    const profileImgUrl = import.meta.env.VITE_SERVER_IMG_URL;
 </script>

src/components/main/MainWordDict.vue

@@ -8,7 +8,6 @@
         </div>
         <div class="card-body">
             <ul class="p-0 m-0" v-for="item in wordList" :key="item.WRDDICSEQ">
-                <small class="card-subtitle">{{$common.dateFormatter(item.lastEditor.updatedAt)}}</small>
                 <li class="d-flex  mb-1">
                     <div class="avatar flex-shrink-0 me-1" >
                         <img
@@ -25,6 +24,7 @@
                         <small class="text-primary text-uppercase">{{ item.category }}</small>
                         </div>
                         <h6 class="my-50"> {{truncateTitle(item.WRDDICTTL) }}</h6>
+                        <p class="text-body mb-0"><small>{{$common.dateFormatter(item.lastEditor.updatedAt)}}</small></p>
                     </div>
                 </li>
             </ul>