diff --git a/public/css/custom.css b/public/css/custom.css index 2e21bd5..d2e01a7 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -580,13 +580,18 @@ } /* project list end */ -/* commuters project list */ +/* commuters */ .commuter-list { max-height: 358px; overflow-y: auto; scrollbar-width: none; } -/* commuters project list end */ + +.fc-daygrid-day[data-has-commuters="true"] { + cursor: pointer; +} + +/* commuters end */ /* Scroll Button */ diff --git a/src/components/board/BoardComment.vue b/src/components/board/BoardComment.vue index fa13318..200704f 100644 --- a/src/components/board/BoardComment.vue +++ b/src/components/board/BoardComment.vue @@ -38,7 +38,7 @@ {{ editCommentAlert }}
- +
@@ -142,6 +142,8 @@ }; const localEditedContent = ref(props.comment.content); + const isModifyContent = ref(props.comment.content); + const disabled = ref(false); // 댓글 입력 창 토글 const isComment = ref(false); @@ -182,6 +184,11 @@ watch( () => localEditedContent.value, newVal => { + if (JSON.stringify(isModifyContent.value) == JSON.stringify(newVal)) { + disabled.value = false; + return; + } + disabled.value = true; emit('inputDetector'); }, ); diff --git a/src/components/button/SaveBtn.vue b/src/components/button/SaveBtn.vue index 7c8068a..51fcd48 100644 --- a/src/components/button/SaveBtn.vue +++ b/src/components/button/SaveBtn.vue @@ -1,23 +1,18 @@ diff --git a/src/components/commuters/CommuterBtn.vue b/src/components/commuters/CommuterBtn.vue index 6cc5f68..026cf08 100644 --- a/src/components/commuters/CommuterBtn.vue +++ b/src/components/commuters/CommuterBtn.vue @@ -60,15 +60,12 @@ const { coords, isSupported, error } = useGeolocation({ const getAddress = (lat, lng) => { return new Promise((resolve, reject) => { const geocoder = new kakao.maps.services.Geocoder(); - const coord = new kakao.maps.LatLng(lat, lng); - - geocoder.coord2Address(coord.getLng(), coord.getLat(), (result, status) => { + geocoder.coord2Address(lat, lng, (result, status) => { if (status === kakao.maps.services.Status.OK) { const address = result[0].address.address_name; resolve(address); } else { reject('주소를 가져올 수 없습니다.'); - return; } }); }); @@ -86,22 +83,22 @@ const getLocation = async () => { return null; } - if (coords.value) { - userLocation.value = { - lat: coords.value.latitude, - lng: coords.value.longitude, - }; - - try { - const address = await getAddress(coords.value.latitude, coords.value.longitude); - return address; - } catch (error) { - alert(error); - return null; - } + if (!coords.value) { + return null; } - return null; + userLocation.value = { + lat: coords.value.latitude, + lng: coords.value.longitude, + }; + + try { + const address = await getAddress(coords.value.latitude, coords.value.longitude); + return address; + } catch (error) { + alert(error); + return null; + } }; // 오늘 사용자의 출근 정보 조회 diff --git a/src/components/commuters/CommuterCalendar.vue b/src/components/commuters/CommuterCalendar.vue index b64883f..1f62ebf 100644 --- a/src/components/commuters/CommuterCalendar.vue +++ b/src/components/commuters/CommuterCalendar.vue @@ -144,17 +144,6 @@ const handleLeaveTimeUpdate = () => { todaysCommuter(); }; -const handleResetProjectState = () => { - // 이전에 체크인했던 프로젝트로 복귀 - const storedProject = projectStore.getSelectedProject(); - if (storedProject) { - checkedInProject.value = storedProject; - selectedProject.value = storedProject.PROJCTSEQ; - projectStore.setSelectedProject(storedProject); - pendingProjectChange.value = null; - } -}; - // 프로젝트 드롭 이벤트 핸들러 (ProjectList 컴포넌트에서 전달받음) const handleProjectDrop = ({ event, targetProject }) => { const draggedProjectData = JSON.parse(event.dataTransfer.getData('application/json')); @@ -335,6 +324,7 @@ const loadCommuters = async () => { if (dateCell) { const dayEvents = dateCell.querySelector('.fc-daygrid-day-events'); if (dayEvents) { + dateCell.setAttribute('data-has-commuters', 'true'); dayEvents.classList.add('text-center'); // 프로필 이미지 생성 const profileImg = document.createElement('img'); @@ -442,3 +432,8 @@ onMounted(async () => { }); + diff --git a/src/components/commuters/CommuterProjectList.vue b/src/components/commuters/CommuterProjectList.vue index c61abd5..1f46232 100644 --- a/src/components/commuters/CommuterProjectList.vue +++ b/src/components/commuters/CommuterProjectList.vue @@ -1,9 +1,9 @@