mirror of
https://github.com/urosran/cally.git
synced 2025-11-26 16:34:54 +00:00
Calendar, syncing rework
This commit is contained in:
@ -39,6 +39,7 @@ import BinIcon from "@/assets/svgs/BinIcon";
|
||||
import DeleteEventDialog from "./DeleteEventDialog";
|
||||
import { useDeleteEvent } from "@/hooks/firebase/useDeleteEvent";
|
||||
import AddPersonIcon from "@/assets/svgs/AddPersonIcon";
|
||||
import {addHours, startOfHour, startOfMinute} from "date-fns";
|
||||
|
||||
const daysOfWeek = [
|
||||
{ label: "Monday", value: "monday" },
|
||||
@ -86,7 +87,6 @@ export const ManuallyAddEventModal = () => {
|
||||
if(allDayAtom === true) setIsAllDay(true);
|
||||
}, [allDayAtom])
|
||||
|
||||
|
||||
const [startTime, setStartTime] = useState(() => {
|
||||
const date = initialDate ?? new Date();
|
||||
if (
|
||||
@ -104,27 +104,11 @@ export const ManuallyAddEventModal = () => {
|
||||
|
||||
const [endTime, setEndTime] = useState(() => {
|
||||
if (editEvent?.end) {
|
||||
const date = new Date(editEvent.end);
|
||||
date.setSeconds(0, 0);
|
||||
return date;
|
||||
return new Date(editEvent.end);
|
||||
}
|
||||
|
||||
const baseDate = editEvent?.end ?? initialDate ?? new Date();
|
||||
const date = new Date(baseDate);
|
||||
|
||||
if (
|
||||
date.getMinutes() > 0 ||
|
||||
date.getSeconds() > 0 ||
|
||||
date.getMilliseconds() > 0
|
||||
) {
|
||||
date.setHours(date.getHours() + 1);
|
||||
}
|
||||
date.setMinutes(0);
|
||||
date.setSeconds(0);
|
||||
date.setMilliseconds(0);
|
||||
|
||||
date.setHours(date.getHours() + 1);
|
||||
return date;
|
||||
return addHours(startOfHour(baseDate), 1);
|
||||
});
|
||||
const [startDate, setStartDate] = useState(initialDate ?? new Date());
|
||||
const [endDate, setEndDate] = useState(
|
||||
@ -172,27 +156,11 @@ export const ManuallyAddEventModal = () => {
|
||||
|
||||
setEndTime(() => {
|
||||
if (editEvent?.end) {
|
||||
const date = new Date(editEvent.end);
|
||||
date.setSeconds(0, 0);
|
||||
return date;
|
||||
return startOfMinute(new Date(editEvent.end));
|
||||
}
|
||||
|
||||
const baseDate = editEvent?.end ?? initialDate ?? new Date();
|
||||
const date = new Date(baseDate);
|
||||
|
||||
if (
|
||||
date.getMinutes() > 0 ||
|
||||
date.getSeconds() > 0 ||
|
||||
date.getMilliseconds() > 0
|
||||
) {
|
||||
date.setHours(date.getHours() + 1);
|
||||
}
|
||||
date.setMinutes(0);
|
||||
date.setSeconds(0);
|
||||
date.setMilliseconds(0);
|
||||
|
||||
date.setHours(date.getHours() + 1);
|
||||
return date;
|
||||
return addHours(startOfHour(baseDate), 1);
|
||||
});
|
||||
|
||||
setStartDate(initialDate ?? new Date());
|
||||
@ -260,7 +228,7 @@ export const ManuallyAddEventModal = () => {
|
||||
startDate: finalStartDate,
|
||||
endDate: finalEndDate,
|
||||
allDay: isAllDay,
|
||||
attendees: selectedAttendees,
|
||||
attendees: selectedAttendees,
|
||||
notes: details,
|
||||
location: location
|
||||
};
|
||||
@ -282,10 +250,10 @@ export const ManuallyAddEventModal = () => {
|
||||
Alert.alert('Alert', 'Title field cannot be empty');
|
||||
return false;
|
||||
}
|
||||
if (!selectedAttendees || selectedAttendees?.length === 0) {
|
||||
Alert.alert('Alert', 'Cannot have an event without any attendees');
|
||||
return false;
|
||||
}
|
||||
// if (!selectedAttendees || selectedAttendees?.length === 0) {
|
||||
// Alert.alert('Alert', 'Cannot have an event without any attendees');
|
||||
// return false;
|
||||
// }
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user