Skip to content

Commit 8f032bf

Browse files
authored
Merge pull request #117 from TaskFlow-CLAP/CLAP-311
CLAP-331 코드 점검
2 parents 90260ea + e594b18 commit 8f032bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+203
-179
lines changed

src/assets/deafultProfile.png

1.72 KB
Loading

src/components/EditInformation.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818

1919
<div class="profile">
2020
<p class="text-body text-xs font-bold">프로필 사진</p>
21-
<img
22-
v-if="previewUrl || info.profileImageUrl"
23-
:src="previewUrl || info.profileImageUrl"
24-
alt="프로필 이미지"
25-
class="w-24 h-24 rounded-full object-cover border mt-3" />
21+
<ImageContainer
22+
class="mt-3"
23+
:url="previewUrl || info.profileImageUrl"
24+
:size="96" />
2625

2726
<label
2827
for="fileInput"
@@ -104,6 +103,7 @@ const router = useRouter()
104103
import { useMemberStore } from '@/stores/member'
105104
import { storeToRefs } from 'pinia'
106105
import { patchEditInfo } from '@/api/common'
106+
import ImageContainer from './common/ImageContainer.vue'
107107
108108
const memberStore = useMemberStore()
109109
const { info } = storeToRefs(memberStore)

src/components/TaskCard.vue

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
@click="onTaskClick">
66
<div class="flex flex-col gap-1">
77
<div class="flex justify-between items-center gap-4">
8-
<div class="flex items-center gap-2">
8+
<div class="flex items-center gap-2 overflow-hidden">
99
<TaskLabel
1010
v-if="data.labelInfo"
1111
:color="data.labelInfo.labelColor"
1212
:content="data.labelInfo.labelName" />
13-
<span class="text-black">{{ data.title }}</span>
13+
<span class="text-black text-ellipsis overflow-hidden whitespace-nowrap">{{
14+
data.title
15+
}}</span>
1416
</div>
1517
<CommonIcons
1618
v-if="draggable"
@@ -19,13 +21,15 @@
1921
<span class="text-xs text-body">{{ data.mainCategoryName }} - {{ data.categoryName }}</span>
2022
</div>
2123
<div class="flex justify-between items-end">
22-
<span class="text-xs font-bold text-black">{{ data.taskCode }}</span>
24+
<span class="text-xs font-bold text-black whitespace-nowrap overflow-hidden text-ellipsis">{{
25+
data.taskCode
26+
}}</span>
2327
<div class="flex flex-col gap-1 items-end">
2428
<span class="text-xs font-bold text-body">{{ data.requesterDepartment }}</span>
2529
<div class="flex items-center gap-1.5">
26-
<div class="w-4 h-4 rounded-full bg-background-1 overflow-hidden">
27-
<img :src="data.requesterImageUrl" />
28-
</div>
30+
<ImageContainer
31+
:url="data.requesterImageUrl"
32+
:size="16" />
2933
<span class="text-xs font-bold text-black">{{ data.requesterNickname }}</span>
3034
</div>
3135
</div>
@@ -41,6 +45,7 @@ import type { TaskCardProps } from '@/types/manager'
4145
import CommonIcons from './common/CommonIcons.vue'
4246
import { statusAsColor } from '@/utils/statusAsColor'
4347
import TaskLabel from './common/TaskLabel.vue'
48+
import ImageContainer from './common/ImageContainer.vue'
4449
4550
const { data } = defineProps<{ data: TaskCardProps; draggable?: boolean }>()
4651

src/components/api-logs/ApiLogsList.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { axiosInstance } from '@/utils/axios'
3030
import { useQuery } from '@tanstack/vue-query'
3131
import type { ApiLogsResponse } from '@/types/admin'
3232
import { computed } from 'vue'
33+
import { useMemberStore } from '@/stores/member'
3334
3435
const { params } = useLogsParamsStore()
3536
const onPageChange = (value: number) => {
@@ -46,9 +47,11 @@ const fetchApiLogsList = async () => {
4647
return response.data
4748
}
4849
50+
const { isLogined } = useMemberStore()
4951
const { data } = useQuery<ApiLogsResponse>({
5052
queryKey: ['apiLogs', params],
51-
queryFn: fetchApiLogsList
53+
queryFn: fetchApiLogsList,
54+
enabled: !!isLogined
5255
})
5356
5457
const totalPage = computed(() => {
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<template>
2+
<div
3+
:style="{ width: `${size}px`, height: `${size}px` }"
4+
class="rounded-full overflow-hidden flex justify-center items-center shrink-0">
5+
<img
6+
:src="url || defaultProfile"
7+
alt="프로필 이미지"
8+
class="w-full h-full object-cover" />
9+
</div>
10+
</template>
11+
12+
<script setup lang="ts">
13+
import defaultProfile from '@/assets/deafultProfile.png'
14+
15+
const { url, size } = defineProps<{ url?: string; size: number }>()
16+
</script>

src/components/login-logs/LoginLogsList.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { useQuery } from '@tanstack/vue-query'
3232
import { computed } from 'vue'
3333
import type { LoginLogsResponse } from '@/types/admin'
3434
import NoContent from '../lists/NoContent.vue'
35+
import { useMemberStore } from '@/stores/member'
3536
3637
const { params } = useLogsParamsStore()
3738
const onPageChange = (value: number) => {
@@ -48,9 +49,11 @@ const fetchLoginLogsList = async () => {
4849
return response.data
4950
}
5051
52+
const { isLogined } = useMemberStore()
5153
const { data } = useQuery<LoginLogsResponse>({
5254
queryKey: ['loginLogs', params],
53-
queryFn: fetchLoginLogsList
55+
queryFn: fetchLoginLogsList,
56+
enabled: isLogined
5457
})
5558
5659
const totalPage = computed(() => {

src/components/member-management/MemberManagementList.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import ListPagination from '../lists/ListPagination.vue'
3232
import NoContent from '../lists/NoContent.vue'
3333
import MemberManagementListBar from './MemberManagementListBar.vue'
3434
import MemberManagementListCard from './MemberManagementListCard.vue'
35+
import { useMemberStore } from '@/stores/member'
3536
3637
const { params } = useMemberManagementParamsStore()
3738
const onPageChange = (value: number) => {
@@ -42,9 +43,11 @@ const fetchMemberList = async () => {
4243
return response.data
4344
}
4445
46+
const { isLogined } = useMemberStore()
4547
const { data } = useQuery<MemberManagementResponse>({
4648
queryKey: ['member', params],
47-
queryFn: fetchMemberList
49+
queryFn: fetchMemberList,
50+
enabled: isLogined
4851
})
4952
5053
const totalPage = computed(() => {

src/components/my-request/MyRequestFilterBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ const { isLogined } = useMemberStore()
5353
const { data } = useQuery({
5454
queryKey: ['category'],
5555
queryFn: getCategory,
56-
enabled: !!isLogined
56+
enabled: isLogined
5757
})
5858
</script>

src/components/my-request/MyRequestList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const { isLogined } = useMemberStore()
5151
const { data } = useQuery<MyRequestResponse>({
5252
queryKey: ['myRequest', params],
5353
queryFn: fetchMyRequestList,
54-
enabled: !!isLogined
54+
enabled: isLogined
5555
})
5656
5757
const totalPage = computed(() => {

src/components/my-request/MyRequestListCard.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
:is-status="tab.isStatus" />
1313
</div>
1414
<TaskDetail
15+
v-if="selectedID"
1516
:is-approved="info.taskStatus !== 'REQUESTED'"
1617
:selected-id="selectedID"
1718
:close-task-detail="() => handleModal(null)" />

0 commit comments

Comments
 (0)