final. todo: clean up

Coding-For-Good-UWC · Jul 22, 2023 · 8183647 · 8183647
1 parent a4713f4
commit 8183647
Show file tree

Hide file tree

Showing 5 changed files with 215 additions and 184 deletions.
diff --git a/frontend/app/screens/LoginScreen.js b/frontend/app/screens/LoginScreen.js
@@ -36,6 +36,7 @@ function LoginScreen({ navigation }) {
             const auth = getAuth();
 
 			      await signInWithEmailAndPassword(auth, email, password);
+            // await signInWithEmailAndPassword(auth, "[email protected]", "Supersecret1");
 
             const idToken = await auth.currentUser.getIdToken();
 

diff --git a/frontend/app/screens/PatientRegistration.js b/frontend/app/screens/PatientRegistration.js
@@ -239,40 +239,22 @@ const PatientRegistration = ({ route, navigation }) => {
         language: "",
     });
 
-    const ethnicityRef = useRef();
-    const birthplaceRef = useRef();
-    const languageRef = useRef();
-
-    const [pickerVisible, setPickerVisible] = useState(false);
-
-    const renderPickerSelect = (selectedValue, onValueChange, items, pickerRef) => (
+    const renderPickerSelect = (selectedValue, onValueChange, items) => (
         <View style={styles.inputContainer}>
-            {pickerVisible && (
-                <Picker
-                    selectedValue={selectedValue}
-                    onValueChange={(itemValue, itemIndex) => {
-                        onValueChange(itemValue);
-                        setPickerVisible(false);
-                    }}
-                    style={styles.pickerSelectStyles}
-                >
-                    <Picker.Item label="Select" value={null} />
-                    {items.map((item) => (
-                        <Picker.Item key={item} label={item} value={item} />
-                    ))}
-                </Picker>
-            )}
-            {!pickerVisible && (
-                <TouchableOpacity style={styles.pickerPlaceholderContainer} onPress={() => setPickerVisible(true)}>
-                    <Text style={styles.pickerPlaceholderText}>
-                        {selectedValue || "Select"}
-                    </Text>
-                </TouchableOpacity>
-            )}
+            <Picker
+                selectedValue={selectedValue}
+                onValueChange={(itemValue, itemIndex) => {
+                    onValueChange(itemValue);
+                }}
+                style={styles.pickerSelectStyles}
+            >
+                <Picker.Item label="Select" value={null} />
+                {items.map((item) => (
+                    <Picker.Item key={item} label={item} value={item} />
+                ))}
+            </Picker>
         </View>
-    );
-
-
+    );    
 
     const [datePickerModalActive, setDatePickerModalActive] = useState(false);
 
@@ -349,28 +331,26 @@ const PatientRegistration = ({ route, navigation }) => {
                         {renderPickerSelect(
                             formData.ethnicity,
                             (value) => handleChange(value, "ethnicity"),
-                            ethnicities,
-                            ethnicityRef
+                            ethnicities
                         )}
                     </View>
 
                     <View style={styles.inputContainer}>
                         {renderPickerSelect(
                             formData.birthplace,
                             (value) => handleChange(value, "birthplace"),
-                            countries,
-                            birthplaceRef
+                            countries
                         )}
                     </View>
 
                     <View style={styles.inputContainer}>
                         {renderPickerSelect(
                             formData.language,
                             (value) => handleChange(value, "language"),
-                            languages,
-                            languageRef
+                            languages
                         )}
                     </View>
+
                     <StyledButton
                         text="Next"
                         onPress={handleSubmit}
@@ -424,6 +404,9 @@ const styles = StyleSheet.create({
         width: 250,
         height: 50,
         marginBottom: 10,
+        // center
+        justifyContent: "center",
+        // alignItems: "center",
     },
     input: {
         flex: 1,
@@ -435,12 +418,17 @@ const styles = StyleSheet.create({
     },
     pickerSelectStyles: {
         textAlign: "center",
-        marginTop: 13,
-        inputIOS: {
-            color: colours.primaryText,
-            textAlign: "center",
-            marginTop: 13,
-        }
+        marginTop: 4,
+        // inputIOS: {
+        //     color: colours.primaryText,
+        //     textAlign: "center",
+        //     marginTop: 13,
+        // },
+        // inputAndroid: {
+        //     color: colours.primaryText,
+        //     textAlign: "center",
+        //     marginTop: 13,
+        // }
     },
     pickerPlaceholderContainer: {
         flex: 1,