ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-07-17 02:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Milan Paunovic
2024-12-24 16:12:36 +01:00
parent 10f6616cd0 5c6915c23d
commit 609d01b81c
13 changed files with 230 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/pages/brain_dump/AddBrainDump.tsx
View File

@ -73,7 +73,7 @@ const AddBrainDump = ({
onPress={() => {
addBrainDump({
id: 99,
id: '99',
title: dumpTitle.trimEnd().trimStart(),

2
components/pages/calendar/DetailedCalendar.tsx
View File

@ -100,7 +100,7 @@ export const DetailedCalendar: React.FC<EventCalendarProps> = React.memo(({calen
{...bodyProps}
renderEvent={renderEvent}
/>
<View marginB-45/>
<View marginB-0/>
</CalendarContainer>
);
});

3
components/pages/calendar/EventCell.tsx
View File

@ -74,7 +74,8 @@ const styles = StyleSheet.create({
eventCell: {
flex: 1,
borderRadius: 4,
padding: 8,
paddingHorizontal: 8,
paddingBottom: 8,
height: '100%',
},
eventTitle: {

2
components/pages/calendar/InnerCalendar.tsx
View File

@ -28,7 +28,7 @@ export const InnerCalendar = () => {
style={{flex: 1, backgroundColor: "#fff", borderRadius: 0, marginBottom: 0, overflow: "hidden"}}
ref={calendarContainerRef}
onLayout={onLayout}
paddingB-15
paddingB-0
>
{calendarHeight > 0 && (
<EventCalendar

28
components/pages/calendar/ManuallyAddEventModal.tsx
View File

@ -567,18 +567,10 @@ export const ManuallyAddEventModal = () => {
Save
</Text>
</TouchableOpacity>
{editEvent && (
<Button
style={styles.topBtn}
marginL-5
iconSource={() => <BinIcon/>}
onPress={showDeleteEventModal}
/>
)}
</View>
</View>
{/*)}*/}
<ScrollView style={{minHeight: "85%"}}>
<ScrollView style={{minHeight: "81%"}}>
<TextField
placeholder="Add event title"
ref={titleRef}
@ -788,7 +780,6 @@ export const ManuallyAddEventModal = () => {
<Button
disabled
marginH-30
marginB-30
label="Create event from image"
text70
style={{height: 47}}
@ -800,6 +791,23 @@ export const ManuallyAddEventModal = () => {
</View>
)}
/>
{editEvent && (
<TouchableOpacity
onPress={showDeleteEventModal}
style={{ marginTop: 15, marginBottom: 40, alignSelf: "center" }}
hitSlop={{left: 30, right: 30, top: 10, bottom: 10}}
>
<Text
style={{
color: "#ff1637",
fontFamily: "PlusJakartaSans_500Medium",
fontSize: 15,
}}
>
Delete Event
</Text>
</TouchableOpacity>
)}
</View>
{editEvent && (
<DeleteEventDialog

4
components/pages/calendar/MonthCalendar.tsx
View File

@ -652,7 +652,7 @@ export const MonthCalendar: React.FC<EventCalendarProps> = React.memo(
ampm
// renderCustomDateForMonth={renderCustomDateForMonth}
/>
<View style={{backgroundColor: 'white', height: 50, width: '100%'}}/>
{/*<View style={{backgroundColor: 'white', height: 50, width: '100%'}}/>*/}
</>
);
@ -666,7 +666,7 @@ const styles = StyleSheet.create({
},
calHeader: {
borderWidth: 0,
paddingBottom: 60,
paddingBottom: 0,
},
dayModeHeader: {
alignSelf: "flex-start",

30
components/pages/todos/ToDoItem.tsx
View File

@ -26,7 +26,7 @@ const ToDoItem = (props: {
isSettings?: boolean;
is7Days?: boolean;
localTodos: Array<IToDo>;
setLocalTodos: Function
setLocalTodos: Function;
}) => {
const { updateToDo } = useToDosContext();
const { data: members } = useGetFamilyMembers();
@ -38,13 +38,15 @@ const ToDoItem = (props: {
const [visible, setVisible] = useState<boolean>(false);
const [points, setPoints] = useState(props.item.points);
const [pointsModalVisible, setPointsModalVisible] = useState<boolean>(false);
const [creator, setCreator] = useState('');
const [creator, setCreator] = useState("");
useEffect(() => {
let creatorMember = members?.find((member) => member?.uid === props.item.creatorId);
let creatorMember = members?.find(
(member) => member?.uid === props.item.creatorId
);
const fullName = `${creatorMember?.firstName ?? ""}`;
setCreator(fullName);
}, [])
}, []);
const handlePointsChange = (text: string) => {
const numericValue = parseInt(text, 10);
@ -111,6 +113,12 @@ const ToDoItem = (props: {
/>
)}
<View paddingB-8 row spread>
<TouchableOpacity
onPress={() => {
isTodoEditable ? setVisible(true) : null;
}}
hitSlop={{right: 150, top:10}}
>
<Text
text70
style={{
@ -119,12 +127,10 @@ const ToDoItem = (props: {
color: props.item.done ? "#a09f9f" : "black",
fontSize: 15,
}}
onPress={() => {
isTodoEditable ? setVisible(true) : null;
}}
>
{props.item.title}
</Text>
</TouchableOpacity>
<Checkbox
value={props.item.done}
containerStyle={[styles.checkbox, { borderRadius: 50 }]}
@ -133,7 +139,11 @@ const ToDoItem = (props: {
borderRadius={50}
color="#fd1575"
onValueChange={() => {
const updatedTodos = props.localTodos?.map((item) => item.id === props.item.id ? { ...item, done: !props.item.done } : item);
const updatedTodos = props.localTodos?.map((item) =>
item.id === props.item.id
? { ...item, done: !props.item.done }
: item
);
props.setLocalTodos(updatedTodos);
updateToDo({ id: props.item.id, done: !props.item.done });
if (!props.item.done && isChild) {
@ -231,7 +241,7 @@ const ToDoItem = (props: {
borderRadius: 22,
overflow: "hidden",
borderWidth: 2,
borderColor: member.eventColor || 'transparent'
borderColor: member.eventColor || "transparent",
}}
/>
) : (
@ -242,7 +252,7 @@ const ToDoItem = (props: {
aspectRatio: 1,
borderWidth: 2,
borderRadius: 100,
borderColor: member.eventColor || '#ccc',
borderColor: member.eventColor || "#ccc",
}}
>
<View

6
contexts/DumpContext.tsx
View File

@ -3,11 +3,15 @@ import { useDeleteNote } from "@/hooks/firebase/useDeleteNote";
import { useGetNotes } from "@/hooks/firebase/useGetNotes";
import { useUpdateNote } from "@/hooks/firebase/useUpdateNote";
import { createContext, useContext, useState } from "react";
import firestore, { FirebaseFirestoreTypes } from '@react-native-firebase/firestore';
export interface IBrainDump {
id: number;
id: string;
title: string;
description: string;
createdAt?: FirebaseFirestoreTypes.Timestamp;
updatedAt?: FirebaseFirestoreTypes.Timestamp;
creatorId?: string;
}
interface IBrainDumpContext {

2
hooks/firebase/types/profileTypes.ts
View File

@ -43,4 +43,6 @@ export interface UserProfile {
googleAccounts?: { [email: string]: GoogleAccount };
microsoftAccounts?: { [email: string]: MicrosoftAccount };
appleAccounts?: { [email: string]: AppleAccount };
weeklyPoints?: number;
allTimePoints?: number;
}

14
hooks/firebase/useCreateNote.ts
View File

@ -12,6 +12,8 @@ export const useCreateNote = () => {
mutationKey: ["createNote"],
mutationFn: async (note: Partial<IBrainDump>) => {
try {
const timestamp = firestore.FieldValue.serverTimestamp();
if (note.id) {
const snapshot = await firestore()
.collection("BrainDumps")
@ -27,16 +29,22 @@ export const useCreateNote = () => {
{
...note,
creatorId: currentUser?.uid,
updatedAt: timestamp
},
{ merge: true }
);
return;
}
}
const newDoc = firestore().collection("BrainDumps").doc();
await firestore()
.collection("BrainDumps")
.add({ ...note, id: newDoc.id, creatorId: currentUser?.uid });
await newDoc.set({
...note,
id: newDoc.id,
creatorId: currentUser?.uid,
updatedAt: timestamp,
createdAt: timestamp
});
} catch (e) {
console.error(e);
}

25
hooks/firebase/useCreateTodo.ts
View File

@ -14,16 +14,21 @@ export const daysOfWeek = [
DAYS_OF_WEEK_ENUM.SATURDAY,
DAYS_OF_WEEK_ENUM.SUNDAY];
export const getNextDailyDates = (date) => {
export const getNextDailyDates = (date, includeToday) => {
const today = new Date();
const dates = [];
for (let weekOffset = 0; weekOffset < 52; weekOffset++) {
const targetDate = addWeeks(date, weekOffset);
if (includeToday) {
dates.push(targetDate);
} else {
if (targetDate > today) {
dates.push(targetDate);
}
}
}
return dates;
};
@ -46,30 +51,38 @@ export const getNextWeeklyDates = (selectedDays, date) => {
return dates;
};
export const getNextMonthlyDates = (date) => {
export const getNextMonthlyDates = (date, includeToday) => {
const today = new Date();
const dates = [];
for (let monthOffset = 0; monthOffset < 12; monthOffset++) {
const targetDate = addMonths(date, monthOffset);
if (includeToday) {
dates.push(targetDate);
} else {
if (targetDate > today) {
dates.push(targetDate);
}
}
}
return dates;
};
export const getNextYearlyDates = (date) => {
export const getNextYearlyDates = (date, includeToday) => {
const today = new Date();
const dates = [];
for (let yearOffset = 0; yearOffset < 5; yearOffset++) {
const nextYear = addYears(date, yearOffset);
if (includeToday) {
dates.push(nextYear);
} else {
if (nextYear > today) {
dates.push(nextYear);
}
}
}
return dates;
};
@ -92,13 +105,13 @@ export const useCreateTodo = () => {
let nextDates;
if (todoData.repeatType === REPEAT_TYPE.DAILY) {
nextDates = getNextDailyDates(todoData.date);
nextDates = getNextDailyDates(todoData.date, false);
} else if (todoData.repeatType === REPEAT_TYPE.EVERY_WEEK) {
nextDates = getNextWeeklyDates(todoData.repeatDays, todoData.date);
} else if (todoData.repeatType === REPEAT_TYPE.ONCE_A_MONTH) {
nextDates = getNextMonthlyDates(todoData.date);
nextDates = getNextMonthlyDates(todoData.date, false);
} else if (todoData.repeatType === REPEAT_TYPE.ONCE_A_YEAR) {
nextDates = getNextYearlyDates(todoData.date);
nextDates = getNextYearlyDates(todoData.date, false);
}
const todosRef = firestore().collection("Todos");

3
hooks/firebase/useGetNotes.ts
View File

@ -18,6 +18,9 @@ export const useGetNotes = () => {
return snapshot.docs.map((doc) => ({
...doc.data(),
id: doc.id,
createdAt: doc.data().createdAt,
updatedAt: doc.data().updatedAt,
})) as IBrainDump[];
} catch (error) {
console.error("Error fetching braindumps:", error);

275
hooks/firebase/useUpdateTodo.ts
View File

@ -1,9 +1,15 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import firestore from "@react-native-firebase/firestore";
import { IToDo, REPEAT_TYPE } from "@/hooks/firebase/types/todoData";
import {addDays, addMonths, addWeeks, addYears, compareAsc, format, subDays} from "date-fns";
import {daysOfWeek, resolveTodoAlternatingAssignees} from "@/hooks/firebase/useCreateTodo";
import { compareAsc, format } from "date-fns";
import {
getNextDailyDates,
getNextMonthlyDates,
getNextWeeklyDates,
getNextYearlyDates
} from "@/hooks/firebase/useCreateTodo";
import { useAuthContext } from "@/contexts/AuthContext";
import {UserProfile} from "@/hooks/firebase/types/profileTypes";
export const useUpdateTodo = () => {
const { user: currentUser, profileData } = useAuthContext();
@ -14,9 +20,22 @@ export const useUpdateTodo = () => {
mutationFn: async (todoData: Partial<IToDo>) => {
try {
if (todoData.connectedTodoId) {
console.log("CONNECTED")
const snapshot = await firestore()
.collection("Todos")
let nextDates;
if (todoData.repeatType === REPEAT_TYPE.DAILY) {
nextDates = getNextDailyDates(todoData.date, true);
} else if (todoData.repeatType === REPEAT_TYPE.EVERY_WEEK) {
nextDates = getNextWeeklyDates(todoData.repeatDays, todoData.date);
} else if (todoData.repeatType === REPEAT_TYPE.ONCE_A_MONTH) {
nextDates = getNextMonthlyDates(todoData.date, true);
} else if (todoData.repeatType === REPEAT_TYPE.ONCE_A_YEAR) {
nextDates = getNextYearlyDates(todoData.date, true);
}
const todosRef = firestore().collection("Todos");
const batch = firestore().batch();
const snapshot = await todosRef
.where("connectedTodoId", "==", todoData.connectedTodoId)
.get();
const connectedTodos = snapshot.docs.map((doc) => {
@ -30,135 +49,109 @@ export const useUpdateTodo = () => {
};
}) as IToDo[];
console.log("CONNECTED TODO");
let filteredTodos = connectedTodos?.filter((item) => compareAsc(format(item.date, 'yyyy-MM-dd'), format(todoData.date, 'yyyy-MM-dd')) === 1 ||
compareAsc(format(item.date, 'yyyy-MM-dd'), format(todoData.date, 'yyyy-MM-dd')) === 0).sort((a,b) =>{
return b.date?.getSeconds() - a.date?.getSeconds();
});
let firstTodo = filteredTodos?.[0];
const batch = firestore().batch();
if (compareAsc(format(firstTodo?.date, 'yyyy-MM-dd'), format(todoData.date, 'yyyy-MM-dd')) !== 0 || firstTodo?.repeatType !== todoData.repeatType) {
// Update existing todos or create new ones
filteredTodos?.map((todo, index) => {
const newDate = nextDates[index];
let assignee;
if (todoData.assignees && todoData.rotate && todoData?.assignees?.length !== 0) {
assignee = todoData.assignees[index % todoData.assignees.length];
}
console.log("DELETE");
filteredTodos?.forEach((item) => {
batch.delete(item.ref);
if (newDate) {
const nextTodo = {
...todoData,
date: newDate,
assignees: assignee ? [assignee] : todoData.assignees
}
let docRef = todo.ref;
batch.update(docRef, nextTodo)
} else {
return null;
}
});
if (todoData.repeatType === REPEAT_TYPE.NONE) {
const existingDates = filteredTodos?.map((todo) => todo.date);
nextDates
.filter((date) => !existingDates.includes(date))
.map((date, index) => {
const newDocRef = todosRef.doc();
console.log("NONE");
const newDoc = firestore().collection('Todos').doc();
let originalTodo = {...todoData, id: newDoc.id, familyId: profileData?.familyId, creatorId: currentUser?.uid}
batch.set(newDoc, originalTodo);
} else if (todoData.repeatType === REPEAT_TYPE.DAILY) {
console.log("DAILY");
// for the next 52 weeks
for (let i = 0; i < 52; i++) {
let date = todoData?.date;
const nextWeek = addWeeks(date, i);
let docRef = firestore().collection("Todos").doc();
let newTodo = { ...todoData, id: docRef.id, date: nextWeek, connectedTodoId: firstTodo?.connectedTodoId };
newTodo = resolveTodoAlternatingAssignees(todoData, newTodo, i);
batch.set(docRef, newTodo);
let assignee;
if (todoData.assignees && todoData.rotate && todoData?.assignees?.length !== 0) {
assignee = todoData.assignees[index % todoData.assignees.length];
}
} else if (todoData.repeatType === REPEAT_TYPE.EVERY_WEEK) {
console.log("EVERY WEEK");
let date = todoData?.date;
let repeatDays = todoData?.repeatDays;
const dates = [];
const originalDateDay = format(date, 'EEEE');
const originalNumber = daysOfWeek.indexOf(originalDateDay);
repeatDays?.forEach((day) => {
let number = daysOfWeek.indexOf(day);
let newDate;
if (originalNumber > number) {
let diff = originalNumber - number;
newDate = subDays(date, diff);
} else {
let diff = number - originalNumber;
newDate = addDays(date, diff);
const nextTodo = {
...todoData,
date: date,
id: newDocRef.id,
familyId: profileData?.familyId,
creatorId: currentUser?.uid,
connectedTodoId: todoData.connectedTodoId,
assignees: assignee ? [assignee] : todoData.assignees
}
dates.push(newDate);
batch.set(newDocRef, nextTodo)
});
let todosToAddCycles = 52;
if (firstTodo?.repeatType === REPEAT_TYPE.EVERY_WEEK) {
todosToAddCycles = filteredTodos?.length / firstTodo?.repeatDays?.length;
}
console.log(todosToAddCycles);
let newDoc = firestore().collection("Todos").doc();
let originalTodo = { ...todoData, id: newDoc.id, date: todoData.date, connectedTodoId: newDoc?.id };
originalTodo = resolveTodoAlternatingAssignees(todoData, originalTodo, 0);
batch.set(newDoc, originalTodo);
console.log(dates);
let index = 1;
for (let i = 0; i <= todosToAddCycles; i++) {
dates?.forEach((dateToAdd) => {
index++;
let newTodoDate = addWeeks(dateToAdd, i);
if (compareAsc(newTodoDate, originalTodo.date) !== 0) {
let docRef = firestore().collection("Todos").doc();
let newTodo = { ...todoData, id: docRef.id, date: newTodoDate, connectedTodoId: newDoc?.id };
newTodo = resolveTodoAlternatingAssignees(todoData, newTodo, index);
batch.set(docRef, newTodo);
}
})
}
} else if (todoData.repeatType === REPEAT_TYPE.ONCE_A_MONTH) {
console.log("ONCE A MONTH");
// for the next 12 months
for (let i = 0; i < 12; i++) {
let date = todoData?.date;
const nextMonth = addMonths(date, i);
let docRef = firestore().collection("Todos").doc();
let newTodo = { ...todoData, id: docRef.id, date: nextMonth, connectedTodoId: firstTodo?.connectedTodoId };
newTodo = resolveTodoAlternatingAssignees(todoData, newTodo, i);
batch.set(docRef, newTodo);
}
} else if (todoData.repeatType === REPEAT_TYPE.ONCE_A_YEAR) {
console.log("ONCE A YEAR");
// for the next 5 years
for (let i = 0; i < 5; i++) {
let date = todoData?.date;
const nextMonth = addYears(date, i);
let docRef = firestore().collection("Todos").doc();
let newTodo = { ...todoData, id: docRef.id, date: nextMonth, connectedTodoId: firstTodo?.connectedTodoId };
newTodo = resolveTodoAlternatingAssignees(todoData, newTodo, i);
batch.set(docRef, newTodo);
}
}
// Remove unmatched todos
const unmatchedTodos = filteredTodos?.filter(
(item) => !nextDates.includes(item.date)
);
unmatchedTodos.map((item) =>
batch.delete(item.ref)
);
await batch.commit();
} else if (firstTodo?.repeatDays !== todoData.repeatDays) {
console.log("UPDATE REPEAT DAYS");
await updateRepeatDaysTodos(batch, todoData, firstTodo, filteredTodos)
} else {
filteredTodos?.forEach((item) => {
console.log("UPDATE");
batch.update(item.ref, {...todoData, date: item.date});
})
await batch.commit();
let documentSnapshot = await firestore().collection("Todos").doc(todoData.id).get();
if (documentSnapshot.exists) {
let todoUpdate = documentSnapshot.data() as IToDo;
const userBatch = firestore().batch();
if (todoUpdate.done !== todoData.done) {
todoUpdate.assignees?.map(async (userId) => {
const userRef = firestore().collection("Profiles").doc(userId);
let userSnapshot = await userRef.get();
let userData = userSnapshot.data() as UserProfile;
if (!userData) return;
// Calculate new points
let userWeeklyPoints = userData.weeklyPoints ?? 0;
const weeklyPoints = todoData.done
? userWeeklyPoints + todoUpdate.points
: userWeeklyPoints - todoUpdate.points;
let userAllTimePoints = userData.allTimePoints ?? 0;
const allTimePoints = todoData.done
? userAllTimePoints + todoUpdate.points
: userAllTimePoints - todoUpdate.points;
// Update the user's points in Firestore
userData = {
...userData,
weeklyPoints: weeklyPoints >= 0 ? weeklyPoints : 0,
allTimePoints: allTimePoints >= 0 ? allTimePoints : 0
}
} else {
console.log("REGULAR UPDATE");
console.log(todoData);
userBatch.update(userRef, userData);
});
}
await firestore()
.collection("Todos")
.doc(todoData.id)
.update(todoData);
await userBatch.commit();
}
}
} catch (e) {
console.error(e)
@ -168,62 +161,4 @@ export const useUpdateTodo = () => {
queryClients.invalidateQueries({queryKey: ["todos"]})
}
})
}
const updateRepeatDaysTodos = async (batch: any, todoData: IToDo, firstTodo: IToDo, filteredTodos: IToDo[]) => {
const todosToAddCycles = filteredTodos?.length / firstTodo?.repeatDays?.length;
console.log(todosToAddCycles);
filteredTodos?.forEach((item) => {
batch.update(item.ref, {...todoData, date: item.date});
})
let newRepeatDays = todoData.repeatDays?.filter((element) => firstTodo?.repeatDays?.indexOf(element) === -1);
let removeRepeatDays = firstTodo?.repeatDays?.filter((element) => todoData?.repeatDays?.indexOf(element) === -1);
const dates = [];
let date = firstTodo?.date;
const originalDateDay = format(date, 'EEEE');
const originalNumber = daysOfWeek.indexOf(originalDateDay);
newRepeatDays?.forEach((day) => {
let number = daysOfWeek.indexOf(day);
let newDate;
if (originalNumber > number) {
let diff = originalNumber - number;
newDate = subDays(date, diff);
} else {
let diff = number - originalNumber;
newDate = addDays(date, diff);
}
dates.push(newDate);
});
let index = 0;
for (let i = 0; i < todosToAddCycles; i++) {
dates?.forEach((dateToAdd) => {
index ++;
let newTodoDate = addWeeks(dateToAdd, i);
if (compareAsc(newTodoDate, firstTodo?.date) !== 0) {
let newTodo = {...todoData, date: newTodoDate};
newTodo = resolveTodoAlternatingAssignees(todoData, newTodo, index);
let docRef = firestore().collection("Todos").doc();
batch.set(docRef, newTodo);
}
})
}
removeRepeatDays?.forEach((removeDay) => {
filteredTodos?.forEach((item) => {
let todoDate = item.date;
const todoDateDay = format(todoDate, 'EEEE');
if (todoDateDay === removeDay) {
batch.delete(item.ref);
}
})
})
await batch.commit();
}
};