diff --git a/public/img/main-category-img/main-300201.png b/public/img/main-category-img/main-300201.png new file mode 100644 index 0000000..9e99e0f Binary files /dev/null and b/public/img/main-category-img/main-300201.png differ diff --git a/public/img/main-category-img/main-300202.png b/public/img/main-category-img/main-300202.png new file mode 100644 index 0000000..aaf6a0e Binary files /dev/null and b/public/img/main-category-img/main-300202.png differ diff --git a/public/img/main-category-img/main-300203.png b/public/img/main-category-img/main-300203.png new file mode 100644 index 0000000..4d53c85 Binary files /dev/null and b/public/img/main-category-img/main-300203.png differ diff --git a/public/img/main-category-img/main-300204.png b/public/img/main-category-img/main-300204.png new file mode 100644 index 0000000..89a2bb3 Binary files /dev/null and b/public/img/main-category-img/main-300204.png differ diff --git a/public/img/mainImg/tea-cup-619268.png b/public/img/main-category-img/main-300205.png similarity index 100% rename from public/img/mainImg/tea-cup-619268.png rename to public/img/main-category-img/main-300205.png diff --git a/public/img/main-category-img/main-300206.png b/public/img/main-category-img/main-300206.png new file mode 100644 index 0000000..0b1a5c7 Binary files /dev/null and b/public/img/main-category-img/main-300206.png differ diff --git a/src/components/main/MainCalendar.vue b/src/components/main/MainCalendar.vue index 3c7f73d..9f6788d 100644 --- a/src/components/main/MainCalendar.vue +++ b/src/components/main/MainCalendar.vue @@ -2,7 +2,7 @@
-
+
- +
@@ -96,9 +98,10 @@ import { useProjectStore } from '@/stores/useProjectStore'; import CommuterBtn from '@c/commuters/CommuterBtn.vue'; import CommuterProjectList from '@c/commuters/CommuterProjectList.vue'; + import MainEventList from '@c/main/MainEventList.vue'; import BackBtn from '@c/button/BackBtn.vue'; - const baseUrl = $api.defaults.baseURL.replace(/api\/$/, ''); + const baseUrl = import.meta.env.VITE_DOMAIN; const user = ref({}); const project = ref({}); const userStore = useUserInfoStore(); @@ -165,6 +168,13 @@ } }; + // 이벤트 카테고리 데이터 로딩 + const categoryList = ref([]); + const fetchCategoryList = async () => { + const { data } = await $api.get('main/category'); + if (data) categoryList.value = [...data.data.filter(categoryInfo => categoryInfo.CMNCODODR != 0)]; + }; + // 캘린더 데이터 가져오기 const fetchData = async () => { // FullCalendar API 인스턴스 가져오기 @@ -419,5 +429,7 @@ selectedProject.value = storedProject.PROJCTSEQ; checkedInProject.value = storedProject; } + + await fetchCategoryList(); }); diff --git a/src/components/main/MainEventList.vue b/src/components/main/MainEventList.vue new file mode 100644 index 0000000..34f9dc4 --- /dev/null +++ b/src/components/main/MainEventList.vue @@ -0,0 +1,117 @@ + + +