Recent push

Author: nwassom

Screens/SignUp/AgeScreen.tsx

@@ -14,9 +14,10 @@ import ComponentStyle from '../../Styles/ComponentStyles';
 import SignUpStyle from '../../Styles/SignUpStyle';
 import { COLOR } from '../../Styles/Colors';
 
-const AgeScreen = ({ SignUpData }) =>
+const AgeScreen = ({ navigation, route }) =>
 {
-	const navigation = useNavigation();
+	const { SignUpData } = route.params;
+	
 	const [birthday, setBirthday] = useState(null);
 	const [isPickerVisible, setPickerVisibility] = useState(false);
 	const today = new Date();
@@ -56,9 +57,9 @@ const AgeScreen = ({ SignUpData }) =>
 	{
 		if (isValidDate(birthday))
 		{
+			const updatedSignUpData = { ...SignUpData, birthday };
 			setPickerVisibility(false);
-			SignUpData.birthday = birthday;
-			navigation.navigate('BodyInfoScreen', { SignUpData });
+			navigation.navigate('BodyInfoScreen', { SignUpData: updatedSignUpData });
 		}
 		else
 		{

Screens/SignUp/BodyInfoScreen.tsx

@@ -15,9 +15,9 @@ import ComponentStyle from '../../Styles/ComponentStyles';
 import { COLOR } from '../../Styles/Colors';
 
 
-const BodyInfoScreen = ({ SignUpData }) =>
+const BodyInfoScreen = ({ navigation, route }) =>
 {
-	const navigation = useNavigation();
+	const { SignUpData } = route.params;
 
 	const [isRulerVisible, setRulerVisibility] = useState(false);
 	const [isWeightFocused, setWeightFocus] = useState(false);
@@ -77,10 +77,8 @@ const BodyInfoScreen = ({ SignUpData }) =>
 		let isWeightValid = isValidWeight(weight);
 		if (rulerVal && isValidWeight(weight) && gender)
 		{	
-			SignUpData.height = rulerVal;
-			SignUpData.weight = weight;
-			SignUpData.gender = gender;
-			navigation.navigate('GoalScreen', SignUpData);
+			const updatedSignUpData = { ...SignUpData, heightInches: rulerVal, weight, gender };
+			navigation.navigate('GoalScreen', { SignUpData: updatedSignUpData });
 		}
 		else
 		{

Screens/SignUp/EmailScreen.tsx

@@ -16,7 +16,7 @@ interface SignUpData {
 	username: string;
 	password: string;
 	birthday: Date;
-	height: number;
+	heightInches: number;
 	weight: number;
 	gender: string;
 	goal: string;
@@ -25,19 +25,19 @@ interface SignUpData {
 const EmailScreen = () =>
 {
 	const navigation = useNavigation();
-	const [SignUpData] = useState<SignUpData>({
+
+	const [email, setEmail] = useState('');
+	const [SignUpData, setSignUpData] = useState<SignUpData>({
 		email: '',
 		username: '',
 		password: '',
 		birthday: '',
-		height: '',
-		weight: '',
+		heightInches: 0,
+		weight: 0,
 		gender: '',
 		goal: '',
 	});
 
-	const [email, setEmail] = useState('');
-
 	const returnLoginArrow = () => {
 		Alert.alert(
 			'Do you want to stop creating your account?',
@@ -56,15 +56,14 @@ const EmailScreen = () =>
 				}
 			]
 		)
-
 	};
 
 	const nextButton = () =>
 	{
 		if (isValidEmail(email))
 		{
-			SignUpData.email = email;
-			navigation.navigate('UsernameScreen', { SignUpData });
+			setSignUpData((prevSignUpData) => ({ ...prevSignUpData, email }));
+			navigation.navigate('UsernameScreen',{ SignUpData });
 		}
 		else
 		{

Screens/SignUp/GoalScreen.tsx

@@ -13,13 +13,12 @@ import ComponentStyle from '../../Styles/ComponentStyles';
 import { COLOR } from '../../Styles/Colors';
 
 
-const GoalScreen = ({ SignUpData }) =>
+const GoalScreen = ({ navigation, route }) =>
 {
-	const navigation = useNavigation();
+	const { SignUpData } = route.params;
 
 	const [goal, setGoal] = useState('');
 
-
 	// These are used to better show the users their height
 	const [feet, setFeet] = useState(0);
 	const [inches, setInches] = useState(0);
@@ -33,7 +32,9 @@ const GoalScreen = ({ SignUpData }) =>
 	};
 
 	const createAccountButton = () => {
-		console.log(SignUpData);
+
+		const updatedSignUpData = { ...SignUpData, goal };
+		console.log(updatedSignUpData);
 	};
 
 	return (

Screens/SignUp/PasswordScreen.tsx

@@ -11,9 +11,10 @@ import { isValidPassword } from '../../Utils/DataVerify';
 import Styles from '../../Styles/Styles';
 import SignUpStyle from '../../Styles/SignUpStyle';
 
-const PasswordScreen = ({ SignUpData }) =>
+const PasswordScreen = ({ navigation, route }) =>
 {
-	const navigation = useNavigation();
+	const { SignUpData } = route.params;
+
 	const [password, setPassword] = useState('');
 
 	const backArrow = () => {
@@ -26,8 +27,8 @@ const PasswordScreen = ({ SignUpData }) =>
 		let isPasswordValid = isValidPassword(password)
 		if (isPasswordValid.isValid)
 		{	
-			SignUpData.password = password;
-			navigation.navigate('AgeScreen', { SignUpData });
+			const updatedSignUpData = { ...SignUpData, password };
+			navigation.navigate('AgeScreen', { SignUpData: updatedSignUpData });
 		}
 		else
 		{
@@ -49,6 +50,7 @@ const PasswordScreen = ({ SignUpData }) =>
 							placeholder="Password"
 							value={password}
 							onChangeText={setPassword}
+							secureTextEntry={true}
 							style={{
 								container: SignUpStyle.input,
 								heading: SignUpStyle.heading,

Screens/SignUp/UsernameScreen.tsx

@@ -11,9 +11,9 @@ import { isValidUsername } from '../../Utils/DataVerify';
 import Styles from '../../Styles/Styles';
 import SignUpStyle from '../../Styles/SignUpStyle';
 
-const UsernameScreen = ({ email }) =>
-{
-	const navigation = useNavigation();
+const UsernameScreen = ({navigation, route }) => {
+	const { SignUpData } = route.params;
+
 	const [username, setUsername] = useState('');
 
 	const backArrow = () => {
@@ -24,7 +24,8 @@ const UsernameScreen = ({ email }) =>
 	{
 		if (isValidUsername(username))
 		{
-			navigation.navigate('PasswordScreen', { email, username });
+			const updatedSignUpData = { ...SignUpData, username };
+			navigation.navigate('PasswordScreen', { SignUpData: updatedSignUpData });
 		}
 		else
 		{

babel.config.js

@@ -1,9 +1,6 @@
 module.exports = function(api) {
   api.cache(true);
   return {
-    {
     "presets": ["babel-preset-expo"],
-    //"plugins": ["@babel/plugin-proposal-optional-chaining"]
-    }
   };
 };