From 81419c0a23a8ede43af842c50dd3932b7c1c02a1 Mon Sep 17 00:00:00 2001 From: ivic00 <102467664+ivic00@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:54:56 +0100 Subject: [PATCH] minor fixes --- components/pages/calendar/MonthCalendar.tsx | 4 +- components/pages/main/ResetPasswordPage.tsx | 105 +++++++++++------- .../user_settings_views/UpdateUserDialog.tsx | 2 + 3 files changed, 71 insertions(+), 40 deletions(-) diff --git a/components/pages/calendar/MonthCalendar.tsx b/components/pages/calendar/MonthCalendar.tsx index 12a8182..6bbb21d 100644 --- a/components/pages/calendar/MonthCalendar.tsx +++ b/components/pages/calendar/MonthCalendar.tsx @@ -19,7 +19,7 @@ import {Text} from "react-native-ui-lib"; import {addDays, compareAsc, format, isWithinInterval, subDays} from "date-fns"; import {useCalSync} from "@/hooks/useCalSync"; import {useSyncEvents} from "@/hooks/useSyncOnScroll"; -import {colorMap} from "@/constants/colorMap"; +import {colorMap, getEventTextColor} from "@/constants/colorMap"; import {useGetFamilyMembers} from "@/hooks/firebase/useGetFamilyMembers"; import CachedImage from "expo-cached-image"; import { DeviceType } from "expo-device"; @@ -111,7 +111,7 @@ export const MonthCalendar: React.FC = React.memo( eventColor = profileData?.eventColor ?? colorMap.teal; } - return {backgroundColor: eventColor, fontSize: 14} + return {backgroundColor: eventColor, fontSize: 14, color: getEventTextColor(event?.eventColor)} }, [] ); diff --git a/components/pages/main/ResetPasswordPage.tsx b/components/pages/main/ResetPasswordPage.tsx index ef3f1b2..604ec79 100644 --- a/components/pages/main/ResetPasswordPage.tsx +++ b/components/pages/main/ResetPasswordPage.tsx @@ -1,49 +1,78 @@ -import {Button, Text, TextField, View} from "react-native-ui-lib"; -import React, {useState} from "react"; -import {StyleSheet} from "react-native"; -import {useResetPassword} from "@/hooks/firebase/useResetPassword"; +import { Button, ButtonSize, Text, TextField, View } from "react-native-ui-lib"; +import React, { useState } from "react"; +import { StyleSheet } from "react-native"; +import { useResetPassword } from "@/hooks/firebase/useResetPassword"; +import { router } from "expo-router"; export const ResetPasswordPage = () => { - const [email, setEmail] = useState(""); + const [email, setEmail] = useState(""); - const {mutateAsync: resetPassword, error, isError, isLoading} = useResetPassword(); + const { + mutateAsync: resetPassword, + error, + isError, + isLoading, + } = useResetPassword(); - const handleResetPassword = async () => { - await resetPassword({email}); - alert("Password reset, please check your email") - }; + const handleResetPassword = async () => { + await resetPassword({ email }); + alert("Password reset, please check your email"); + }; - return ( - - - Please enter your email and reset your password - + return ( + + + Please enter your email and reset your password + - -