diff --git a/src/common/common.js b/src/common/common.js index d408742..2d15edf 100644 --- a/src/common/common.js +++ b/src/common/common.js @@ -76,7 +76,7 @@ const common = { formatDateTime(dateObj) { const date = new Date(dateObj); const dateCheck = date.getTime(); - if (isNaN(dateCheck)) return dateStr; + if (isNaN(dateCheck)) return dateObj; const zeroFormat = num => (num < 10 ? `0${num}` : num); return { diff --git a/src/components/main/EventModal.vue b/src/components/main/EventModal.vue new file mode 100644 index 0000000..82be55a --- /dev/null +++ b/src/components/main/EventModal.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/components/main/MainEventCalendar.vue b/src/components/main/MainEventCalendar.vue index cb2609c..ba7a195 100644 --- a/src/components/main/MainEventCalendar.vue +++ b/src/components/main/MainEventCalendar.vue @@ -15,30 +15,18 @@ {{ user.name }}

- + - @@ -60,41 +48,24 @@ - - - - - + diff --git a/src/components/main/MainEventList.vue b/src/components/main/MainEventList.vue index 7c87e96..05fcbfe 100644 --- a/src/components/main/MainEventList.vue +++ b/src/components/main/MainEventList.vue @@ -2,10 +2,17 @@
+ + + +
@@ -67,30 +106,17 @@ vacationList: { type: Array, }, + birthdayPartyList: { + type: Array, + }, + dinnerList: { + type: Array, + }, + teaTimeList: { + type: Array, + }, + workShopList: { + type: Array, + }, }); - - const emit = defineEmits(['drop', 'update:selectedProject', 'update:checkedInProject']); - - // 현재 사용자 확인 - const isCurrentUser = commuter => { - return props.user && commuter && commuter.MEMBERSEQ === props.user.id; - }; - - // 드래그 시작 이벤트 핸들러 - const dragStart = (event, project) => { - // 드래그 데이터 설정 - event.dataTransfer.setData('application/json', JSON.stringify(project)); - event.dataTransfer.effectAllowed = 'copy'; - }; - - // 드래그 오버 드롭 허용 - const allowDrop = event => { - event.preventDefault(); - }; - - // 드롭 - const handleDrop = (event, targetProject) => { - event.preventDefault(); - emit('drop', { event, targetProject }); - }; diff --git a/src/components/main/MainMemberProfile.vue b/src/components/main/MainMemberProfile.vue index 7fa8602..357b4b3 100644 --- a/src/components/main/MainMemberProfile.vue +++ b/src/components/main/MainMemberProfile.vue @@ -5,8 +5,9 @@
User Profile