minor fixes

This commit is contained in:
ivic00
2025-01-14 20:54:56 +01:00
parent 74c0369acf
commit 81419c0a23
3 changed files with 71 additions and 40 deletions

View File

@ -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<EventCalendarProps> = React.memo(
eventColor = profileData?.eventColor ?? colorMap.teal;
}
return {backgroundColor: eventColor, fontSize: 14}
return {backgroundColor: eventColor, fontSize: 14, color: getEventTextColor(event?.eventColor)}
},
[]
);

View File

@ -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<string>("");
const [email, setEmail] = useState<string>("");
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 (
<View padding-10 centerV height={"100%"}>
<Text text70 center>
Please enter your email and reset your password
</Text>
return (
<View padding-10 centerV height={"100%"}>
<Text text70 center>
Please enter your email and reset your password
</Text>
<TextField
placeholder="Email"
value={email}
onChangeText={setEmail}
style={styles.textfield}
/>
<Button
label="Reset Password"
onPress={handleResetPassword}
marginB-20
backgroundColor="#fd1775"
disabled={isLoading}
/>
<TextField
placeholder="Email"
value={email}
onChangeText={setEmail}
style={styles.textfield}
/>
<Button
label="Reset Password"
onPress={handleResetPassword}
marginB-20
backgroundColor="#fd1775"
disabled={isLoading}
/>
<View>
<Button
onPress={() => router.push("/(unauth)/sign_in")}
label="Back"
labelStyle={[
styles.jakartaMedium,
{ textDecorationLine: "none", color: "#fd1575" },
]}
link
size={ButtonSize.xSmall}
padding-0
margin-0
text70
left
color="#fd1775"
/>
</View>
{isError && <Text center style={{marginBottom: 20}}>{`${error}`}</Text>}
</View>
);
{isError && <Text center style={{ marginBottom: 20 }}>{`${error}`}</Text>}
</View>
);
};
const styles = StyleSheet.create({
textfield: {
backgroundColor: "white",
marginVertical: 10,
padding: 30,
height: 45,
borderRadius: 50,
},
textfield: {
backgroundColor: "white",
marginVertical: 10,
padding: 30,
height: 45,
borderRadius: 50,
},
jakartaMedium: {
fontFamily: "PlusJakartaSans_500Medium",
fontSize: 16,
color: "#919191",
textDecorationLine: "underline",
},
});

View File

@ -78,6 +78,8 @@ const UpdateUserDialog = ({ open, handleClose, profileData }: Props) => {
allowsEditing: true,
aspect: [1, 1],
quality: 1,
base64: false,
exif: false,
});
if (!result.canceled) {