Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-FE into CLAP-223

Author: BaekJiyeon02

Dockerfile

@@ -1,5 +1,5 @@
 FROM nginx
-COPY nginx.conf /etc/nginx/sites-available/default
+COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY dist/. /usr/share/nginx/html/
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

src/components/my-request/MyRequestList.vue

@@ -26,13 +26,13 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
+import { computed } from 'vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {

src/components/request-task/RequestTask.vue

@@ -73,23 +73,6 @@ watch(category1, async newValue => {
   )
 })
 
-const mainCategoryArr = ref<MainCategoryTypes[]>([])
-const subCategoryArr = ref<SubCategoryTypes[]>([])
-const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
-
-onMounted(async () => {
-  mainCategoryArr.value = await getMainCategory()
-  subCategoryArr.value = await getSubCategory()
-  afterSubCategoryArr.value = await getSubCategory()
-})
-
-watch(category1, async newValue => {
-  category2.value = null
-  afterSubCategoryArr.value = subCategoryArr.value.filter(
-    subCategory => subCategory.mainCategoryId === newValue?.id
-  )
-})
-
 const router = useRouter()
 
 const handleCancel = () => {
@@ -112,7 +95,8 @@ const handleSubmit = async () => {
   }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: category2.value.id,
+
     title: title.value,
     description: description.value
   }

src/components/top-bar/SideBar.vue

@@ -79,10 +79,9 @@ const { info } = storeToRefs(memberStore)
 
 const route = useRoute()
 
-// 회원 역할, 닉네임 필요
-const role = ref('admin')
-const name = ref('백지연')
-const nickname = ref('Chloe.yeon')
+const role = computed(() => info.value.memberRole)
+const name = computed(() => info.value.memberName)
+const nickname = computed(() => info.value.nickname)
 
 const filteredMenu = computed(() => {
   return role.value === 'ROLE_USER'

src/types/common.ts

@@ -76,18 +76,7 @@ export interface FormCheckboxProps {
 
 export interface ColorSelectProps {
   isOpen: boolean
-}
-
-export interface LabelDataTypes {
-  labelId: number
-  labelName: string
-  labelColor: string
-}
-
-export interface CategoryForm {
-  name: string
-  code: string
-  mainCategoryId?: number
+  newLabel: LabelDataTypes
 }
 
 export interface CategoryForm {
@@ -97,9 +86,9 @@ export interface CategoryForm {
 }
 
 export interface CategoryDropdownProps {
-  options: CategoryForm
+  options: Category[] | SubCategory[]
   labelName: string
-  modelValue?: CategoryForm
+  modelValue: Category | SubCategory | null
   isLabel?: boolean
   isDisabled?: boolean
   isInvalidate?: string

src/utils/axios.ts

@@ -11,7 +11,6 @@ const setInterceptors = (instance: AxiosInstance) => {
         if (token) {
           config.headers.Authorization = `Bearer ${token}`
         }
-        console.log(token, '으로 요청 중')
       }
       return config
     },