diff --git a/src/api/user.ts b/src/api/user.ts index bfab0a85..cd736d9a 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,6 +1,5 @@ import type { Status } from '@/types/common' import type { RequestApprovePostTypes } from '@/types/manager' -import type { userInfo } from '@/types/user' import { axiosInstance, formDataAxiosInstance } from '@/utils/axios' export const postTaskRequest = async (formdata: FormData) => { @@ -48,7 +47,8 @@ export const changeLabel = async (taskID: number, labelId: number) => { return response.data } -export const getHistory = async (taskID: number) => { +export const getHistory = async (taskID: number | null) => { + if (taskID === null) return null const response = await axiosInstance.get(`/api/tasks/${taskID}/histories`) return response.data } diff --git a/src/assets/styles.css b/src/assets/styles.css index 59fb688a..a982f084 100644 --- a/src/assets/styles.css +++ b/src/assets/styles.css @@ -142,3 +142,37 @@ body { .task-detail-manager-dropdown { @apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black; } + +.modal-enter-active, +.modal-leave-active { + transition: + transform 0.25s ease-in-out, + opacity 0.25s ease-in-out; +} + +.modal-enter-from, +.modal-leave-to { + transform: translate(-50%, -40%); + opacity: 0; +} + +.modal-enter-to, +.modal-leave-from { + transform: translate(-50%, -50%); + opacity: 1; +} + +.sidebar-enter-active, +.sidebar-leave-active { + transition: transform 0.25s ease-in-out; +} + +.sidebar-enter-from, +.sidebar-leave-to { + transform: translateX(-100%); +} + +.sidebar-enter-to, +.sidebar-leave-from { + transform: translateX(0); +} diff --git a/src/components/LineChart.vue b/src/components/LineChart.vue index 16cd703f..121e6fe5 100644 --- a/src/components/LineChart.vue +++ b/src/components/LineChart.vue @@ -19,7 +19,8 @@ import { PointElement, CategoryScale, LinearScale, - Colors + Colors, + Filler } from 'chart.js' import NoContent from './lists/NoContent.vue' import type { PeriodType } from '@/types/manager' @@ -32,7 +33,8 @@ ChartJS.register( PointElement, CategoryScale, LinearScale, - Colors + Colors, + Filler ) const { labels, series, dataLabel, periodType } = defineProps<{ diff --git a/src/components/ModalView.vue b/src/components/ModalView.vue index ccdfcb9b..a75ea473 100644 --- a/src/components/ModalView.vue +++ b/src/components/ModalView.vue @@ -2,8 +2,11 @@