Merge branch 'main' of https://github.com/calblueprint/girls-write-now …

…into marcos/fetch-reactions2
calblueprint · Apr 19, 2024 · 1901b68 · 1901b68
2 parents 05ec265 + 85549e7
commit 1901b68
Show file tree

Hide file tree

Showing 23 changed files with 507 additions and 203 deletions.
diff --git a/...mponents/ContentCard/savedStoriesIcon.png → assets/save_story.png b/...mponents/ContentCard/savedStoriesIcon.png → assets/save_story.png
diff --git a/assets/saved_story.png b/assets/saved_story.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,10 +42,13 @@
     "expo-status-bar": "~1.6.0",
     "html-entities": "^2.4.0",
     "react": "18.2.0",
+    "react-apple-emojis": "^2.2.1",
     "react-native": "0.72.10",
     "react-native-dom-parser": "^1.5.3",
     "react-native-element-dropdown": "^2.10.0",
     "react-native-elements": "^3.4.3",
+    "react-native-emoji": "^1.8.0",
+    "react-native-emojicon": "^1.0.0",
     "react-native-gesture-handler": "~2.12.0",
     "react-native-htmlview": "^0.16.0",
     "react-native-ionicons": "^4.6.5",
@@ -65,7 +68,8 @@
     "react-native-vector-icons": "^10.0.2",
     "react-scroll-to-top": "^3.0.0",
     "use-debounce": "^10.0.0",
-    "validator": "^13.11.0"
+    "validator": "^13.11.0",
+    "expo-image": "~1.3.5"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

diff --git a/src/app/(tabs)/author/index.tsx b/src/app/(tabs)/author/index.tsx
@@ -122,6 +122,7 @@ function AuthorScreen() {
           {authorStoryPreview?.map(story => (
             <PreviewCard
               key={story.title}
+              storyId={story.id}
               title={story.title}
               image={story.featured_media}
               author={story.author_name}

diff --git a/src/app/(tabs)/genre/index.tsx b/src/app/(tabs)/genre/index.tsx
@@ -272,6 +272,7 @@ function GenreScreen() {
         renderItem={({ item }) => (
           <PreviewCard
             key={item.id}
+            storyId={item.id}
             tags={item.genre_medium.concat(item.tone).concat(item.topic)}
             author={item.author_name}
             image={item.featured_media}

diff --git a/src/app/(tabs)/home/index.tsx b/src/app/(tabs)/home/index.tsx
@@ -96,6 +96,7 @@ function HomeScreen() {
               {featuredStories.map(story => (
                 <PreviewCard
                   key={story.id}
+                  storyId={story.id}
                   title={story.title}
                   image={story.featured_media}
                   author={story.author_name}
@@ -133,6 +134,7 @@ function HomeScreen() {
                   title={story.title}
                   author={story.author_name}
                   authorImage={story.author_image}
+                  storyId={story.id}
                   pressFunction={() =>
                     router.push({
                       pathname: '/story',
@@ -163,6 +165,7 @@ function HomeScreen() {
                   title={story.title}
                   author={story.author_name}
                   authorImage={story.author_image}
+                  storyId={story.id}
                   pressFunction={() =>
                     router.push({
                       pathname: '/story',

diff --git a/src/app/(tabs)/search/index.tsx b/src/app/(tabs)/search/index.tsx
@@ -306,6 +306,7 @@ function SearchScreen() {
                 {recentlyViewed.map(item => (
                   <PreviewCard
                     key={item.title}
+                    storyId={item.id}
                     title={item.title}
                     image={item.featured_media}
                     author={item.author_name}
@@ -395,7 +396,8 @@ function SearchScreen() {
             contentContainerStyle={styles.contentCotainerStories}
             renderItem={({ item }) => (
               <PreviewCard
-                key={item.title}
+                key={item.id}
+                storyId={item.id}
                 title={item.title}
                 image={item.featured_media}
                 author={item.author_name}

diff --git a/src/app/(tabs)/settings/index.tsx b/src/app/(tabs)/settings/index.tsx
@@ -259,9 +259,12 @@ function SettingsScreen() {
               options={[
                 'American Indian/Alaska Native',
                 'Asian',
+                'Hispanic/Latinx',
+                'Middle Eastern',
                 'Black or African American',
                 'Native Hawaiian or other Pacific Islander',
                 'White',
+                'Not Listed Here',
                 'Prefer Not to Disclose',
               ]}
               label="Race/Ethnicity"

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/_layout.tsx b/src/app/_layout.tsx
@@ -2,18 +2,21 @@ import { Stack } from 'expo-router';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 
 import { AuthContextProvider } from '../utils/AuthContext';
+import { BooleanPubSubProvider } from '../utils/PubSubContext';
 import ToastComponent from '../components/Toast/Toast';
 import { Keyboard, TouchableWithoutFeedback } from 'react-native';
 
 function StackLayout() {
   return (
     <SafeAreaProvider>
       <AuthContextProvider>
-        <Stack>
-          <Stack.Screen name="index" options={{ headerShown: false }} />
-          <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-          <Stack.Screen name="auth" options={{ headerShown: false }} />
-        </Stack>
+        <BooleanPubSubProvider>
+          <Stack>
+            <Stack.Screen name="index" options={{ headerShown: false }} />
+            <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+            <Stack.Screen name="auth" options={{ headerShown: false }} />
+          </Stack>
+        </BooleanPubSubProvider>
       </AuthContextProvider>
       <ToastComponent />
     </SafeAreaProvider>

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);
@@ -219,9 +221,12 @@ function OnboardingScreen() {
               options={[
                 'American Indian/Alaska Native',
                 'Asian',
+                'Hispanic/Latinx',
+                'Middle Eastern',
                 'Black or African American',
                 'Native Hawaiian or other Pacific Islander',
                 'White',
+                'Not Listed Here',
                 'Prefer Not to Disclose',
               ]}
               label="Race/Ethnicity"
@@ -232,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"
@@ -245,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,