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

Merge branch 'dev'

Browse Source 
# Conflicts:
#	components/pages/calendar/MonthCalendar.tsx
This commit is contained in:
Milan Paunovic
2025-01-17 00:26:36 +01:00
parent 60953c34bc 9c3b9b3663
commit 1d4903b609
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
components/pages/(tablet_pages)/tablet_components/UsersList.tsx
View File

@ -7,33 +7,43 @@ import { ProfileType, useAuthContext } from "@/contexts/AuthContext";
import { useAtom } from "jotai";
import { selectedUserAtom } from "@/components/pages/calendar/atoms";
type UserProfile = {
uid: string;
firstName: string;
lastName: string;
userType: string;
eventColor: string;
pfp?: string;
};
const UsersList = () => {
const { user: currentUser } = useAuthContext();
const { data: familyMembers, refetch: refetchFamilyMembers } =
useGetFamilyMembers();
const [selectedUser, setSelectedUser] = useAtom(selectedUserAtom);
const [selectedUser, setSelectedUser] = useAtom<UserProfile | null>(selectedUserAtom);
useEffect(() => {
refetchFamilyMembers();
}, []);
const sortedMembers = useMemo(() => {
const filtered = familyMembers
?.filter((member) => member.userType !== ProfileType.FAMILY_DEVICE);
const filtered = familyMembers?.filter(
(member) => member.userType !== ProfileType.FAMILY_DEVICE
) || [];
const currentUserData = filtered?.find(m => m.uid === currentUser?.uid);
const parents = filtered?.filter(m => m.userType === ProfileType.PARENT && m.uid !== currentUser?.uid) || [];
const children = filtered?.filter(m => m.userType === ProfileType.CHILD && m.uid !== currentUser?.uid) || [];
const caregivers = filtered?.filter(m => m.userType === ProfileType.CAREGIVER && m.uid !== currentUser?.uid) || [];
const familyViewOption = {
const currentUserData = filtered.find(m => m.uid === currentUser?.uid);
const parents = filtered.filter(m => m.userType === ProfileType.PARENT && m.uid !== currentUser?.uid);
const children = filtered.filter(m => m.userType === ProfileType.CHILD && m.uid !== currentUser?.uid);
const caregivers = filtered.filter(m => m.userType === ProfileType.CAREGIVER && m.uid !== currentUser?.uid);
const familyViewOption: UserProfile = {
uid: 'family-view',
firstName: 'Family',
lastName: 'View',
userType: 'Family View',
eventColor: colorMap.pink
};
return currentUserData
? [currentUserData, ...parents, ...children, familyViewOption, ...caregivers]
: [...parents, ...children, familyViewOption, ...caregivers];
@ -66,8 +76,11 @@ const UsersList = () => {
key={index}
source={{ uri: member.pfp }}
style={styles.pfp}
borderRadius={200}
imageStyle={{ borderWidth: 2, borderColor: "red" }}
imageStyle={{
borderRadius: 200,
borderWidth: 2,
borderColor: member.eventColor || colorMap.teal
}}
/>
) : (
<View
@ -77,8 +90,8 @@ const UsersList = () => {
backgroundColor={member.eventColor || colorMap.teal}
>
<Text color="white">
{member.firstName.at(0)}
{member.lastName.at(0)}
{member.firstName.charAt(0)}
{member.lastName.charAt(0)}
</Text>
</View>
)}
@ -118,4 +131,4 @@ const styles = StyleSheet.create({
},
});
export default UsersList;
export default UsersList;

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

@ -73,7 +73,7 @@ export const EventCell: React.FC<EventCellProps> = React.memo((
const styles = StyleSheet.create({
eventCell: {
flex: 1,
borderRadius: 4,
borderRadius: 5,
paddingHorizontal: 8,
paddingBottom: 8,
height: '100%',