localnet/localhost-front
10
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into vacation

Browse Source
This commit is contained in:
dyhj625 2025-04-03 10:35:11 +09:00
commit 4cd2ddb102
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/main/MainMemberProfile.vue
View File

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

22
src/components/main/MainWordDict.vue
View File

@ -8,23 +8,23 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<ul class="p-0 m-0" v-for="item in wordList" :key="item.WRDDICSEQ"> <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"> <li class="d-flex mb-1">
<div class="avatar flex-shrink-0 me-1" > <div class="avatar flex-shrink-0 me-1" >
<img <img
style="cursor: auto;" style="cursor: auto;"
class="rounded-circle user-avatar" class="rounded-circle user-avatar"
:src="getProfileImage(item.lastEditor.profileImage)" :src="getProfileImage(item.lastEditor.profileImage)"
alt="최종 작성자" alt="최종 작성자"
:style="{ borderColor: item.lastEditor.color }" :style="{ borderColor: item.lastEditor.color }"
@error="setDefaultImage" @error="setDefaultImage"
/> />
</div> </div>
<div class="timeline-event ps-1" style="cursor: pointer;" @click="goWordList(item.WRDDICCAT,item.WRDDICTTL)"> <div class="timeline-event ps-1" style="cursor: pointer;" @click="goWordList(item.WRDDICCAT,item.WRDDICTTL)">
<div class="timeline-header"> <div class="timeline-header">
<small class="text-primary text-uppercase">{{ item.category }}</small> <small class="text-primary text-uppercase">{{ item.category }}</small>
</div> </div>
<h6 class="my-50">{{truncateTitle(item.WRDDICTTL) }}</h6> <h6 class="my-50"> {{truncateTitle(item.WRDDICTTL) }}</h6>
<p class="text-body mb-0"><small>{{$common.dateFormatter(item.lastEditor.updatedAt)}}</small></p>
</div> </div>
</li> </li>
</ul> </ul>