Merge branch 'develop' into CLAP-186

Author: BaekJiyeon02

src/assets/styles.css

@@ -132,3 +132,13 @@ body {
 .category-management-line {
   @apply flex items-center px-4 w-full h-11 border-b border-b-border-1;
 }
+.task-detail-dropdown {
+  @apply flex w-full h-10 items-center text-sm rounded pl-4 pr-3 bg-white border border-border-1 cursor-pointer;
+}
+.task-detail-dropdown-option-list {
+  @apply absolute w-full h-40 overflow-y-auto top-11 flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2;
+}
+.task-detail-dropdown-option {
+  @apply w-full flex items-center h-10 p-2 rounded hover:bg-background-2 cursor-pointer;
+}
+

src/router/index.ts

@@ -97,41 +97,6 @@ const router = createRouter({
       name: 'UserUpdate',
       component: () => import('../views/UserUpdateView.vue')
     },
-    {
-      path: '/edit-information',
-      name: 'EditInformation',
-      component: () => import('../views/EditInformationView.vue')
-    },
-    {
-      path: '/statistics',
-      name: 'Statistics',
-      component: () => import('../views/StatisticsView.vue')
-    },
-    {
-      path: '/edit-information',
-      name: 'EditInformation',
-      component: () => import('../views/EditInformationView.vue')
-    },
-    {
-      path: '/task-management',
-      name: 'TaskManagement',
-      component: () => import('../views/TaskManagementView.vue')
-    },
-    {
-      path: '/edit-information',
-      name: 'EditInformation',
-      component: () => import('../views/EditInformationView.vue')
-    },
-    {
-      path: '/statistics',
-      name: 'Statistics',
-      component: () => import('../views/StatisticsView.vue')
-    },
-    {
-      path: '/edit-information',
-      name: 'EditInformation',
-      component: () => import('../views/EditInformationView.vue')
-    },
     {
       path: '/task-management',
       name: 'TaskManagement',

src/types/common.ts

@@ -70,4 +70,4 @@ export interface ColorSelectProps {
   devisionId: number
   selectedDivisionId: number | null
   isOpen: boolean
-}
+}

src/types/manager.ts

@@ -70,3 +70,38 @@ export interface TeamBoardCardProps {
 }
 
 export type PeriodType = 'DAY' | 'WEEK' | 'MONTH'
+
+export interface RequestApproveFormData {
+  category1: string
+  category2: string
+  processor: string
+  labeling: string
+  dueDate: string
+  dueTime: string
+}
+
+export interface MyTaskDetailDatas {
+  taskId: number
+  taskCode: string
+  requestedAt: string
+  finishedAt: string
+  taskStatus: Status
+  requesterNickName: string
+  requesterImageUrl: string
+  processorNickName: string
+  processorImageUrl: string
+  mainCategoryName: string
+  categoryName: string
+  title: string
+  description: string
+  dueDate: string
+  labelName: string
+  attachmentResponses: AttachmentResponse[]
+}
+
+export interface TaskDetailTopBarProps {
+  isManager: boolean
+  isApproved: boolean
+  closeTaskDetail: () => void
+}
+