[fix] resolve merge conflicts.

calblueprint · Apr 23, 2024 · b57e3d0 · b57e3d0
2 parents 1c55ad7 + dde750d
commit b57e3d0
Show file tree

Hide file tree

Showing 16 changed files with 197 additions and 185 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,3 @@
 # Ignore the PR template
-/.github
+/.github
+/ios
diff --git a/assets/grey-notification-bell.svg b/assets/grey-notification-bell.svg
diff --git a/assets/notification-bell.svg b/assets/notification-bell.svg
diff --git a/assets/red-notification-bell.svg b/assets/red-notification-bell.svg
diff --git a/src/Components/CaseSummaryCard/CaseSummaryCard.tsx b/src/Components/CaseSummaryCard/CaseSummaryCard.tsx
@@ -11,7 +11,7 @@ import { CaseSummaryProps } from '../../types/types';
 export default function CaseSummaryCard({
   id,
   imageUrl,
-  blurb,
+  briefSummary,
   lawFirm,
   date,
 }: CaseSummaryProps) {
@@ -38,7 +38,7 @@ export default function CaseSummaryCard({
               • {formatDate(date)}
             </Text>
           </View>
-          <Text style={styles.blurbText}>{blurb}</Text>
+          <Text style={styles.blurbText}>{briefSummary}</Text>
         </View>
         <View style={styles.bottomContainer}>
           <Text style={styles.bottomText}>Read full case summary</Text>

diff --git a/src/Components/CaseSummaryContent/CaseSummaryContent.tsx b/src/Components/CaseSummaryContent/CaseSummaryContent.tsx
@@ -8,10 +8,10 @@ import { CaseSummaryProps } from '../../types/types';
 
 export default function CaseSummaryContent({
   imageUrl,
-  blurb,
+  briefSummary,
   lawFirm,
   date,
-  summary,
+  description,
 }: CaseSummaryProps) {
   return (
     <View style={styles.container}>
@@ -26,7 +26,7 @@ export default function CaseSummaryContent({
           transition={300}
         />
         <View style={styles.blurbContainer}>
-          <Text style={styles.blurbText}>{blurb}</Text>
+          <Text style={styles.blurbText}>{briefSummary}</Text>
           <View style={styles.inLineSubInfo}>
             <Text style={[styles.subText, styles.lawFirmText]}>{lawFirm}</Text>
             <Text style={[styles.subText, styles.dateText]}>
@@ -35,7 +35,7 @@ export default function CaseSummaryContent({
             </Text>
           </View>
         </View>
-        <Text style={styles.summaryText}>{summary}</Text>
+        <Text style={styles.summaryText}>{description}</Text>
       </ScrollView>
     </View>
   );

diff --git a/src/Components/UpdateItem/UpdateItem.tsx b/src/Components/UpdateItem/UpdateItem.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { View, Text, TouchableOpacity } from 'react-native';
 
 import styles from './styles';
-import NotificationBell from '../../../assets/notification-bell.svg';
+import NotificationBell from '../../../assets/grey-notification-bell.svg';
 import { formatDate } from '../../app/(BottomTabNavigation)/AllCases/utils';
 import { Update } from '../../types/types';
 
@@ -19,14 +19,14 @@ export default function UpdateItem(updateData: Update) {
     >
       <NotificationBell />
       <View style={styles.contentContainer}>
+        <Text style={styles.categoryText}>
+          {updateData.category.toUpperCase()}
+        </Text>
         <View style={styles.titleContainer}>
           <Text style={styles.titleText} numberOfLines={2}>
             {updateData.title}
           </Text>
         </View>
-        <View style={styles.instructionContainer}>
-          <Text style={styles.updateText}>VIEW UPDATE</Text>
-        </View>
         <Text style={styles.bottomText}>
           {formatDate(updateData.date)} • {updateData.lawFirm}
         </Text>

diff --git a/src/Components/UpdateItem/styles.ts b/src/Components/UpdateItem/styles.ts
@@ -16,32 +16,20 @@ export default StyleSheet.create({
     height: '100%',
   },
   titleContainer: {
-    height: 41,
-  },
-  instructionContainer: {
-    width: 130,
-    justifyContent: 'center',
-    alignItems: 'center',
-    paddingHorizontal: 10,
-    paddingVertical: 3,
-
-    borderRadius: 20,
-    borderWidth: 1,
-    borderColor: colors.midGrey,
-
-    marginTop: 20,
-    marginBottom: 11,
+    height: 40,
+    marginTop: 5,
+    marginBottom: 20,
   },
   titleText: {
     fontSize: 16,
     fontStyle: 'normal',
-    fontWeight: '600',
+    fontWeight: '500',
     lineHeight: 18,
     color: colors.midnightBlack,
     overflow: 'hidden',
   },
   bottomText: {
-    fontSize: 10,
+    fontSize: 12,
     fontStyle: 'normal',
     fontWeight: '300',
     lineHeight: 21,
@@ -53,4 +41,10 @@ export default StyleSheet.create({
     fontWeight: '300',
     color: colors.darkGrey,
   },
+  categoryText: {
+    fontSize: 12,
+    fontStyle: 'normal',
+    fontWeight: '700',
+    color: colors.midGrey,
+  },
 });
diff --git a/src/app/(BottomTabNavigation)/AllCases/CaseScreen/[caseUid].tsx b/src/app/(BottomTabNavigation)/AllCases/CaseScreen/[caseUid].tsx
@@ -1,6 +1,6 @@
-import { router, useLocalSearchParams, useNavigation } from 'expo-router';
+import { useLocalSearchParams, useNavigation } from 'expo-router';
 import React, { useEffect, useState } from 'react';
-import { View, ScrollView, Text, TouchableOpacity } from 'react-native';
+import { View, ScrollView, Text } from 'react-native';
 
 import styles from './styles';
 // eslint-disable-next-line import/namespace

diff --git a/src/app/(BottomTabNavigation)/AllCases/Updates/UpdateView/[updateUid].tsx b/src/app/(BottomTabNavigation)/AllCases/Updates/UpdateView/[updateUid].tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { View, Text, ScrollView } from 'react-native';
 
 import styles from './styles';
-import NotificationBell from '../../../../../../assets/notification-bell.svg';
+import NotificationBell from '../../../../../../assets/red-notification-bell.svg';
 import { getUpdateById } from '../../../../../supabase/queries/updates';
 import { Update, UpdateUid } from '../../../../../types/types';
 import { formatDate } from '../../utils';
@@ -33,23 +33,29 @@ export default function UpdateView() {
         <>
           <ScrollView
             style={styles.outerScroll}
-            contentContainerStyle={styles.innerScroll}
             showsVerticalScrollIndicator={false}
           >
-            <View style={styles.titleContainer}>
-              <NotificationBell />
-              <Text style={styles.titleText}>{update.title}</Text>
+            <View style={styles.innerScroll}>
+              <View style={styles.titleContainer}>
+                <NotificationBell />
+                <View style={styles.headerText}>
+                  <Text style={styles.categoryText}>
+                    {update.category.toUpperCase()}
+                  </Text>
+                  <Text style={styles.titleText}>{update.title}</Text>
+                </View>
+              </View>
+              <View style={styles.inLineSubInfo}>
+                <Text style={[styles.subText, styles.lawFirmText]}>
+                  {update.lawFirm}
+                </Text>
+                <Text style={[styles.subText, styles.dateText]}>
+                  {' '}
+                  • {formatDate(update.date)}
+                </Text>
+              </View>
+              <Text style={styles.bodyText}>{update.summary}</Text>
             </View>
-            <View style={styles.inLineSubInfo}>
-              <Text style={[styles.subText, styles.lawFirmText]}>
-                {update.lawFirm}
-              </Text>
-              <Text style={[styles.subText, styles.dateText]}>
-                {' '}
-                • {formatDate(update.date)}
-              </Text>
-            </View>
-            <Text style={styles.bodyText}>{update.summary}</Text>
           </ScrollView>
         </>
       )}

diff --git a/src/app/(BottomTabNavigation)/AllCases/Updates/UpdateView/styles.ts b/src/app/(BottomTabNavigation)/AllCases/Updates/UpdateView/styles.ts
@@ -11,11 +11,11 @@ export default StyleSheet.create({
   },
   outerScroll: {
     width: '93%',
-    paddingVertical: 20,
   },
   innerScroll: {
     paddingVertical: 32,
     paddingHorizontal: 23,
+    marginVertical: 20,
     rowGap: 20,
     backgroundColor: colors.white,
 
@@ -34,6 +34,10 @@ export default StyleSheet.create({
     flexDirection: 'row',
     columnGap: 13,
   },
+  headerText: {
+    flex: 1,
+    flexDirection: 'column',
+  },
   inLineSubInfo: {
     flexDirection: 'row',
     height: 30,
@@ -47,7 +51,6 @@ export default StyleSheet.create({
     fontWeight: '600',
     fontStyle: 'normal',
     color: colors.black,
-    flex: 1,
   },
   bodyText: {
     fontSize: 16,
@@ -69,4 +72,11 @@ export default StyleSheet.create({
     color: colors.darkGrey,
     fontWeight: '300',
   },
+  categoryText: {
+    fontSize: 12,
+    lineHeight: 18,
+    fontStyle: 'normal',
+    fontWeight: '700',
+    color: colors.midGrey,
+  },
 });
diff --git a/src/app/(BottomTabNavigation)/AllCases/Updates/styles.ts b/src/app/(BottomTabNavigation)/AllCases/Updates/styles.ts
@@ -10,6 +10,7 @@ export default StyleSheet.create({
     backgroundColor: colors.white,
   },
   contentContainer: {
+    height: '100%',
     width: '84%',
   },
   innerScroll: {