Skip to content

Commit 5d80d95

Browse files
authored
Merge pull request #206 from TaskFlow-CLAP/CLAP-452
Clap-452 QA 사항 반영 Moya 4차
2 parents 7943d1e + 99d6c44 commit 5d80d95

Some content is hidden

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

41 files changed

+140
-127
lines changed

src/components/api-logs/ApiLogsFilterBar.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
</template>
2626

2727
<script setup lang="ts">
28-
import FilterDropdown from '../filters/FilterDropdown.vue'
29-
import FilterInput from '../filters/FilterInput.vue'
3028
import { API_LOGS_DIVISION_LIST } from '@/constants/admin'
31-
import FilterIpAddress from '../filters/FilterIpAddress.vue'
32-
import FilterDropdownMulti from '../filters/FilterDropdownMulti.vue'
33-
import { useLogsParamsChange } from '@/hooks/useLogsParamsChange'
3429
import { PAGE_SIZE_LIST, TERM_LIST } from '@/constants/common'
30+
import { useLogsParamsChange } from '@/hooks/useLogsParamsChange'
3531
import { useLogsParamsStore } from '@/stores/params'
32+
import FilterDropdown from '../filters/FilterDropdown.vue'
33+
import FilterDropdownMulti from '../filters/FilterDropdownMulti.vue'
34+
import FilterInput from '../filters/FilterInput.vue'
35+
import FilterIpAddress from '../filters/FilterIpAddress.vue'
3636
3737
const store = useLogsParamsStore()
3838
store.$reset()

src/components/api-logs/ApiLogsList.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
</template>
2323

2424
<script setup lang="ts">
25-
import ListPagination from '../lists/ListPagination.vue'
26-
import ListContainer from '../lists/ListContainer.vue'
25+
import { useMemberStore } from '@/stores/member'
2726
import { useLogsParamsStore } from '@/stores/params'
28-
import ApiLogsListBar from './ApiLogsListBar.vue'
29-
import ApiLogsListCard from './ApiLogsListCard.vue'
27+
import type { ApiLogsResponse } from '@/types/admin'
3028
import { axiosInstance } from '@/utils/axios'
3129
import { useQuery } from '@tanstack/vue-query'
32-
import type { ApiLogsResponse } from '@/types/admin'
33-
import { computed } from 'vue'
34-
import { useMemberStore } from '@/stores/member'
3530
import { storeToRefs } from 'pinia'
31+
import { computed } from 'vue'
32+
import ListContainer from '../lists/ListContainer.vue'
33+
import ListPagination from '../lists/ListPagination.vue'
3634
import NoContent from '../lists/NoContent.vue'
35+
import ApiLogsListBar from './ApiLogsListBar.vue'
36+
import ApiLogsListCard from './ApiLogsListCard.vue'
3737
3838
const { params } = useLogsParamsStore()
3939
const onPageChange = (value: number) => {

src/components/api-logs/ApiLogsListCard.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
</template>
1414

1515
<script setup lang="ts">
16-
import type { ListCardProps } from '@/types/common'
17-
import ListCardTab from '../lists/ListCardTab.vue'
16+
import { API_LOGS_DIVISION_LIST } from '@/constants/admin'
1817
import type { ApiLogsListData } from '@/types/admin'
18+
import type { ListCardProps } from '@/types/common'
1919
import { formatFullDateTime } from '@/utils/date'
20-
import { API_LOGS_DIVISION_LIST } from '@/constants/admin'
20+
import ListCardTab from '../lists/ListCardTab.vue'
2121
2222
const { info } = defineProps<{ info: ApiLogsListData }>()
2323
const myRequestTabList: ListCardProps[] = [

src/components/charts/LineChart.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
</template>
1010

1111
<script setup lang="ts">
12-
import { Line } from 'vue-chartjs'
12+
import type { PeriodType } from '@/types/manager'
1313
import {
14+
CategoryScale,
1415
Chart as ChartJS,
15-
Title,
16-
Tooltip,
16+
Colors,
17+
Filler,
1718
Legend,
19+
LinearScale,
1820
LineElement,
1921
PointElement,
20-
CategoryScale,
21-
LinearScale,
22-
Colors,
23-
Filler
22+
Title,
23+
Tooltip
2424
} from 'chart.js'
25-
import type { PeriodType } from '@/types/manager'
25+
import { Line } from 'vue-chartjs'
2626
import NoContent from '../lists/NoContent.vue'
2727
2828
ChartJS.register(

src/components/charts/PieChart.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
</template>
1616

1717
<script setup lang="ts">
18-
import { Pie } from 'vue-chartjs'
18+
import type { PeriodType } from '@/types/manager'
1919
import {
20+
ArcElement,
2021
Chart as ChartJS,
22+
Colors,
23+
Legend,
2124
Title,
2225
Tooltip,
23-
Legend,
24-
ArcElement,
25-
Colors,
26-
type ChartEvent,
27-
type ActiveElement
26+
type ActiveElement,
27+
type ChartEvent
2828
} from 'chart.js'
29-
import type { PeriodType } from '@/types/manager'
29+
import { Pie } from 'vue-chartjs'
3030
import NoContent from '../lists/NoContent.vue'
3131
ChartJS.register(Title, Tooltip, Legend, ArcElement, Colors)
3232

src/components/common/EditInformation.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,14 @@
132132
import { patchEditInfo } from '@/api/common'
133133
import { ALLOWED_FILE_EXTENSIONS, ALLOWED_FILE_EXTENSIONS_IMAGE } from '@/constants/common'
134134
import { useMemberStore } from '@/stores/member'
135+
import DOMPurify from 'dompurify'
135136
import { storeToRefs } from 'pinia'
136137
import { nextTick, ref, watchEffect } from 'vue'
137138
import { useRouter } from 'vue-router'
138139
import FormButtonContainer from './FormButtonContainer.vue'
139140
import FormCheckbox from './FormCheckbox.vue'
140141
import ImageContainer from './ImageContainer.vue'
141142
import ModalView from './ModalView.vue'
142-
import DOMPurify from 'dompurify'
143143
144144
const router = useRouter()
145145

src/components/common/ModalView.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
v-if="isOpen"
1010
class="bg-white rounded-lg shadow-lg px-8 py-8 fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-[99]">
1111
<div class="flex flex-col gap-8 w-[300px]">
12-
<div class="flex flex-col gap-6">
12+
<div class="flex flex-col gap-6 relative">
1313
<div class="flex flex-col items-center gap-2">
1414
<CommonIcons
1515
v-if="type == 'successType'"
@@ -40,7 +40,13 @@
4040
type === 'terminate' ? '종료 사유를 입력해주세요' : '반려 사유를 입력해주세요'
4141
"
4242
:class="{ 'border border-red-1 placeholder-red-500': isEmpty }"
43+
maxlength="40"
4344
class="flex border w-full border-border-1 px-4 py-3 focus:outline-none resize-none h-[120px]" />
45+
<p
46+
v-if="type == 'inputType' || type === 'terminate'"
47+
class="absolute text-xs top-[calc(100%+4px)] w-full flex justify-end text-body">
48+
({{ textValue.length }}/{{ 40 }})
49+
</p>
4450
</div>
4551

4652
<button
@@ -83,10 +89,10 @@
8389

8490
<script setup lang="ts">
8591
import { failIcon, successIcon, warningIcon } from '@/constants/iconPath'
92+
import { useIsOverlayOpenStore } from '@/stores/isOverlayOpen'
8693
import { onUnmounted, ref, watch } from 'vue'
8794
import CommonIcons from './CommonIcons.vue'
8895
import LoadingIcon from './LoadingIcon.vue'
89-
import { useIsOverlayOpenStore } from '@/stores/isOverlayOpen'
9096
9197
const { isOpen, type, modelValue, isEmpty } = defineProps<{
9298
isOpen: boolean

src/components/common/TaskCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
<script setup lang="ts">
4343
import { bentoIcon } from '@/constants/iconPath'
44+
import { useIsOverlayOpenStore } from '@/stores/isOverlayOpen'
4445
import { useTeamBoardParamsStore } from '@/stores/params'
4546
import type { Status } from '@/types/common'
4647
import type { TaskCardProps } from '@/types/manager'
@@ -51,7 +52,6 @@ import TaskDetail from '../task-detail/TaskDetail.vue'
5152
import CommonIcons from './CommonIcons.vue'
5253
import ImageContainer from './ImageContainer.vue'
5354
import TaskLabel from './TaskLabel.vue'
54-
import { useIsOverlayOpenStore } from '@/stores/isOverlayOpen'
5555
5656
const { data } = defineProps<{ data: TaskCardProps; draggable?: boolean }>()
5757
const emit = defineEmits(['toggleModal'])

src/components/filters/FilterCategory.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@
7676

7777
<script setup lang="ts">
7878
import { dropdownIcon } from '@/constants/iconPath'
79+
import { useOutsideClick } from '@/hooks/useOutsideClick'
7980
import type { Category, FilterCategoryProps, SubCategory } from '@/types/common'
8081
import { computed, ref, watchEffect } from 'vue'
8182
import CommonIcons from '../common/CommonIcons.vue'
82-
import { useOutsideClick } from '@/hooks/useOutsideClick'
8383
8484
const { categoryList = [], main, sub } = defineProps<FilterCategoryProps>()
8585
const emit = defineEmits(['update:main', 'update:sub'])

src/components/lists/ListCardTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
<script setup lang="ts">
2323
import type { ListCardProps, Status } from '@/types/common'
24-
import TaskStatus from '../common/TaskStatus.vue'
2524
import ImageContainer from '../common/ImageContainer.vue'
25+
import TaskStatus from '../common/TaskStatus.vue'
2626
2727
const { content, width, isTextXs, profileImg, isStatus, isStatusCode, isTextBody } =
2828
defineProps<ListCardProps>()

0 commit comments

Comments
 (0)