Skip to content

Commit 9e444f4

Browse files
authored
Merge pull request #121 from TaskFlow-CLAP/CLAP-316
CLAP-316 코드 프리징 전 코드 점검
2 parents 8768d59 + aafc1c9 commit 9e444f4

File tree

111 files changed

+417
-578
lines changed

Some content is hidden

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

111 files changed

+417
-578
lines changed

src/api/user.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const changeProcessor = async (taskID: number, processorId: number) => {
3838
}
3939

4040
export const patchChangeStatus = async (taskID: number, status: Status) => {
41-
const response = await axiosInstance.patch(`/api/tasks/${taskID}/status`, status)
41+
const response = await axiosInstance.patch(`/api/tasks/${taskID}/status`, { status })
4242
return response.data
4343
}
4444

@@ -54,12 +54,15 @@ export const getHistory = async (taskID: number | null) => {
5454
}
5555

5656
export const postComment = async (taskID: number, content: string) => {
57-
const response = await axiosInstance.post(`/api/comments/${taskID}`, { content })
57+
const response = await axiosInstance.post(`/api/tasks/${taskID}/comments`, { content })
5858
return response.data
5959
}
6060

6161
export const postCommentAttachment = async (taskID: number, formdata: FormData) => {
62-
const response = await formDataAxiosInstance.post(`/api/comments/attachment/${taskID}`, formdata)
62+
const response = await formDataAxiosInstance.post(
63+
`/api/tasks/${taskID}/comments/attachment`,
64+
formdata
65+
)
6366
return response.data
6467
}
6568

@@ -82,3 +85,8 @@ export const cancelTaskUser = async (taskId: number) => {
8285
const response = await axiosInstance.patch(`/api/tasks/${taskId}/cancel`)
8386
return response.data
8487
}
88+
89+
export const getSubCategoryDetail = async (categoryId: number) => {
90+
const response = await axiosInstance.get(`/api/sub-categories/${categoryId}`)
91+
return response.data
92+
}

src/components/api-logs/ApiLogsFilterBar.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
<script setup lang="ts">
2828
import FilterDropdown from '../filters/FilterDropdown.vue'
2929
import FilterInput from '../filters/FilterInput.vue'
30-
import { useLogsParamsStore } from '@/stores/params'
31-
import { PAGE_SIZE_LIST, TERM_LIST } from '@/constants/common'
3230
import { API_LOGS_DIVISION_LIST } from '@/constants/admin'
33-
import { useLogsParamsChange } from '../hooks/useLogsParamsChange'
3431
import FilterIpAddress from '../filters/FilterIpAddress.vue'
3532
import FilterDropdownMulti from '../filters/FilterDropdownMulti.vue'
33+
import { useLogsParamsChange } from '@/hooks/useLogsParamsChange'
34+
import { PAGE_SIZE_LIST, TERM_LIST } from '@/constants/common'
35+
import { useLogsParamsStore } from '@/stores/params'
3636
3737
const store = useLogsParamsStore()
3838
store.$reset()

src/components/api-logs/ApiLogsListBar.vue

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

1414
<script setup lang="ts">
15-
import { useLogsParamsStore } from '@/stores/params'
16-
import ListBarTab from '../lists/ListBarTab.vue'
1715
import { LOGS_LIST_BAR_TAB } from '@/constants/admin'
18-
import { useLogsParamsChange } from '../hooks/useLogsParamsChange'
16+
import { useLogsParamsChange } from '@/hooks/useLogsParamsChange'
17+
import { useLogsParamsStore } from '@/stores/params'
1918
import { computed } from 'vue'
19+
import ListBarTab from '../lists/ListBarTab.vue'
2020
2121
const { params } = useLogsParamsStore()
2222
const orderRequest = computed(() => ({
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import {
2222
Colors,
2323
Filler
2424
} from 'chart.js'
25-
import NoContent from './lists/NoContent.vue'
2625
import type { PeriodType } from '@/types/manager'
26+
import NoContent from '../lists/NoContent.vue'
2727
2828
ChartJS.register(
2929
Title,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import {
2222
type ChartEvent,
2323
type ActiveElement
2424
} from 'chart.js'
25-
import NoContent from './lists/NoContent.vue'
2625
import type { PeriodType } from '@/types/manager'
26+
import NoContent from '../lists/NoContent.vue'
2727
ChartJS.register(Title, Tooltip, Legend, ArcElement, Colors)
2828
2929
const { labels, series, periodType, content } = defineProps<{
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<div>
102102
<p class="text-body text-xs font-bold">비밀번호 재설정</p>
103103
<button
104+
type="button"
104105
class="button-medium-secondary mt-2"
105106
@click="handlePwChange">
106107
재설정하기
@@ -116,16 +117,16 @@
116117
</template>
117118

118119
<script lang="ts" setup>
120+
import { useMemberStore } from '@/stores/member'
121+
import { storeToRefs } from 'pinia'
119122
import { nextTick, ref, watchEffect } from 'vue'
120123
import { useRouter } from 'vue-router'
121124
import ModalView from './ModalView.vue'
122-
import FormButtonContainer from './common/FormButtonContainer.vue'
123-
import FormCheckbox from './common/FormCheckbox.vue'
124-
const router = useRouter()
125-
import { useMemberStore } from '@/stores/member'
126-
import { storeToRefs } from 'pinia'
127125
import { patchEditInfo } from '@/api/common'
128-
import ImageContainer from './common/ImageContainer.vue'
126+
import FormButtonContainer from './FormButtonContainer.vue'
127+
import FormCheckbox from './FormCheckbox.vue'
128+
import ImageContainer from './ImageContainer.vue'
129+
const router = useRouter()
129130
130131
const memberStore = useMemberStore()
131132
const { info } = storeToRefs(memberStore)

src/components/common/FormButtonContainer.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<div class="w-full mt-4 flex justify-center">
33
<div class="w-[400px] flex gap-6">
44
<button
5+
type="button"
56
class="button-large-default"
67
@click="handleCancel">
78
{{ cancelText }}
89
</button>
910
<button
11+
type="button"
1012
class="button-large-primary"
1113
@click="handleSubmit">
1214
{{ submitText }}
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,15 @@
3939
</div>
4040

4141
<button
42+
type="button"
4243
class="button-large-primary"
4344
v-if="type == 'successType'"
4445
@click="closeModal">
4546
확인
4647
</button>
4748

4849
<button
50+
type="button"
4951
class="button-large-default"
5052
v-if="type == 'failType'"
5153
@click="closeModal">
@@ -56,11 +58,13 @@
5658
class="flex items-center gap-6"
5759
v-if="type == 'warningType' || type == 'inputType'">
5860
<button
61+
type="button"
5962
class="button-large-default"
6063
@click="closeModal">
6164
취소
6265
</button>
6366
<button
67+
type="button"
6468
class="button-large-red"
6569
@click="confirmModal">
6670
{{ type === 'inputType' ? '거부' : '삭제' }}
@@ -72,9 +76,8 @@
7276
</template>
7377

7478
<script setup lang="ts">
79+
import { failIcon, successIcon, warningIcon } from '@/constants/iconPath'
7580
import { ref, watch } from 'vue'
76-
import CommonIcons from './common/CommonIcons.vue'
77-
import { successIcon, failIcon, warningIcon } from '../constants/iconPath'
7881
7982
const props = defineProps<{
8083
isOpen: boolean

src/components/common/ResultModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</template>
99

1010
<script setup lang="ts">
11-
import ModalView from '../ModalView.vue'
11+
import ModalView from './ModalView.vue'
1212
1313
const { type, isOpen, message } = defineProps<{
1414
type: string

0 commit comments

Comments
 (0)