Merge branch 'main' into justin/signup-bug

calblueprint · Apr 19, 2024 · f8d8670 · f8d8670
2 parents e14aa52 + 9cc1b1a
commit f8d8670
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 16 deletions.
diff --git a/src/app/(tabs)/story/index.tsx b/src/app/(tabs)/story/index.tsx
@@ -89,7 +89,12 @@ function StoryScreen() {
                 style={styles.authorImage}
                 source={{ uri: story.author_image ? story.author_image : '' }}
               />
-              <Text style={globalStyles.subHeading1Bold}>
+              <Text
+                style={[
+                  globalStyles.subHeading1Bold,
+                  { textDecorationLine: 'underline' },
+                ]}
+              >
                 By {story.author_name}
               </Text>
             </View>
@@ -161,15 +166,29 @@ function StoryScreen() {
             systemFonts={fonts}
           />
 
-          <View style={styles.author}>
-            <Image
-              style={styles.authorImage}
-              source={{ uri: story.author_image }}
-            />
-            <Text style={globalStyles.subHeading1Bold}>
-              By {story.author_name}
-            </Text>
-          </View>
+          <TouchableOpacity
+            onPress={() => {
+              router.push({
+                pathname: '/author',
+                params: { author: story.author_id.toString() },
+              });
+            }}
+          >
+            <View style={styles.author}>
+              <Image
+                style={styles.authorImage}
+                source={{ uri: story.author_image ? story.author_image : '' }}
+              />
+              <Text
+                style={[
+                  globalStyles.subHeading1Bold,
+                  { textDecorationLine: 'underline' },
+                ]}
+              >
+                By {story.author_name}
+              </Text>
+            </View>
+          </TouchableOpacity>
 
           <Button
             textColor="black"

diff --git a/src/app/auth/onboarding/index.tsx b/src/app/auth/onboarding/index.tsx
@@ -30,6 +30,7 @@ function OnboardingScreen() {
   const [pronouns, setPronouns] = useState('');
   const [birthday, setBirthday] = useState('');
   const [birthdayExists, setBirthdayExists] = useState(false);
+  const [birthdayChanged, setBirthdayChanged] = useState(false);
   const [gender, setGender] = useState('');
   const [raceEthnicity, setRaceEthnicity] = useState('');
   const [showDatePicker, setShowDatePicker] = useState(false);
@@ -142,6 +143,7 @@ function OnboardingScreen() {
   };
 
   const onConfirmDate = (date: Date) => {
+    setBirthdayChanged(true);
     setShowDatePicker(false);
     setBirthday(date.toLocaleDateString());
     setDisplayDate(date);
@@ -235,6 +237,16 @@ function OnboardingScreen() {
         </View>
 
         <View>
+          {birthdayChanged && (
+            <View style={[styles.info, styles.warning]}>
+              <Icon type="material" name="info-outline" color="#797979" />
+              <Text style={[globalStyles.subtext, styles.subtext]}>
+                You can only input your birthday once. Please make sure the date
+                is correct before saving as you will not be able to change your
+                birthday in the future.
+              </Text>
+            </View>
+          )}
           <View style={styles.updateProfileButton}>
             <StyledButton
               text="Update profile"
@@ -248,6 +260,7 @@ function OnboardingScreen() {
               }
             />
           </View>
+
           <Link
             style={[globalStyles.bodyBoldUnderline, styles.skipButton]}
             href="/(tabs)/home"

diff --git a/src/app/auth/onboarding/styles.tsx b/src/app/auth/onboarding/styles.tsx
@@ -26,6 +26,10 @@ export default StyleSheet.create({
   body1: {
     marginTop: 26,
   },
+  warning: {
+    marginTop: 40,
+    marginBottom: 24,
+  },
   info: {
     flexDirection: 'row',
     marginTop: 12,

diff --git a/src/app/auth/signup/index.tsx b/src/app/auth/signup/index.tsx
@@ -154,12 +154,56 @@ function SignUpScreen() {
               {'Read stories from \nyoung creators'}
             </Text>
 
-            <UserStringInput
-              placeholder="Username"
-              label="Username"
-              placeholderTextColor={colors.darkGrey}
-              onChange={setAndCheckUsername}
-              value={username}
+          <UserStringInput
+            placeholder="First Name"
+            label="First Name"
+            placeholderTextColor={colors.darkGrey}
+            onChange={text => setFirstName(text.replaceAll(/[^a-zA-Z]/g, ''))}
+            value={firstName}
+          />
+          <UserStringInput
+            placeholder="Last Name"
+            label="Last Name"
+            placeholderTextColor={colors.darkGrey}
+            onChange={text => setLastName(text.replaceAll(/[^a-zA-Z]/g, ''))}
+            value={lastName}
+          />
+          <UserStringInput
+            placeholder="Email"
+            label="Email"
+            placeholderTextColor={colors.darkGrey}
+            onChange={setAndCheckEmail}
+            value={email}
+            attributes={{
+              textContentType: 'emailAddress',
+              secureTextEntry: false,
+            }}
+          />
+          {emailError && (
+            <Text style={[globalStyles.errorMessage, styles.inputError]}>
+              {emailError}
+            </Text>
+          )}
+
+          <UserStringInput
+            placeholder="Password"
+            label="Password"
+            placeholderTextColor={colors.darkGrey}
+            onChange={text => {
+              setPassword(text);
+              checkPassword(text);
+            }}
+            value={password}
+            attributes={{
+              textContentType: 'password',
+              secureTextEntry: passwordTextHidden,
+            }}
+          >
+            <RNEIcon
+              name={passwordTextHidden ? 'visibility-off' : 'visibility'}
+              type="material"
+              style={styles.icon}
+              onPress={() => setPasswordTextHidden(!passwordTextHidden)}
             />
             {usernameError && (
               <Text style={[globalStyles.errorMessage, styles.inputError]}>