styling fixes

TritonSE · Mar 7, 2024 · fc6d2ae · fc6d2ae
1 parent 9bfda63
commit fc6d2ae
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 40 deletions.
diff --git a/backend/tsconfig.json b/backend/tsconfig.json
@@ -104,6 +104,6 @@
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true /* Skip type checking all .d.ts files. */
-  }
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */,
+  },
 }
diff --git a/dfm-sideline-sidekick-app/App.tsx b/dfm-sideline-sidekick-app/App.tsx
@@ -13,6 +13,7 @@ import BookmarkPage from "./pages/BookmarkPage";
 import ConditionsSection from "./pages/ConditionsSection";
 import SearchPage from "./pages/SearchPage";
 import TabPage from "./pages/TabPage";
+import GeneralPrinciples from "./pages/generalPrinciples";
 
 type DocumentBase = {
   _id: string;
@@ -28,6 +29,7 @@ type RootStackParamList = {
   Search: undefined;
   Tab: undefined;
   MedicalConditions: { emergency: DocumentBase };
+  GeneralPrinciples: { contentProp: DocumentBase };
 };
 
 type StackNavigation = StackNavigationProp<RootStackParamList>;
@@ -77,6 +79,11 @@ export default function App() {
             component={ConditionsSection}
             options={{ headerShown: false }}
           />
+          <Stack.Screen
+            name="GeneralPrinciples"
+            component={GeneralPrinciples}
+            options={{ headerShown: false }}
+          />
         </Stack.Navigator>
         <BottomNavBarComponent />
         <StatusBar style="auto" />

diff --git a/dfm-sideline-sidekick-app/AppInitializer.tsx b/dfm-sideline-sidekick-app/AppInitializer.tsx
@@ -26,7 +26,9 @@ function AppInitializer() {
       connected = await checkConnection();
       // if also connected, attempt to redownload
       if (connected && !attempted) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const jsonData = await downloadJSON("data.json", deviceType);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         updateJsonData(jsonData);
 
         attempted = true; // latches

diff --git a/dfm-sideline-sidekick-app/HandleSearch.tsx b/dfm-sideline-sidekick-app/HandleSearch.tsx
@@ -1,12 +1,3 @@
-// type Document = {
-//   id: string;
-//   title: string;
-//   subtitle?: string;
-//   [key: string]: any;
-//   // overview?: {},
-//   // treatment?: {},
-//   // content?: {},
-// };
 type Document = {
   _id?: string;
   title: string;
@@ -49,5 +40,5 @@ export const searchDocuments = (documents: Document[], searchText: string): Docu
 
   const sortedDocs = filteredDocs.sort((a, b) => b.score - a.score);
 
-  return sortedDocs.map(({ score, ...doc }) => doc);
+  return sortedDocs.map(({ score: _score, ...doc }) => doc);
 };
diff --git a/dfm-sideline-sidekick-app/components/ArrayPage.tsx b/dfm-sideline-sidekick-app/components/ArrayPage.tsx
@@ -26,7 +26,6 @@ type ArrayProps = {
 
 const temp = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor.";
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const ArrayPage: React.FC<ArrayProps> = ({ arrayProp, title }) => {
   const navigation = useNavigation<StackNavigationProp<RootStackParamList>>();
 

diff --git a/dfm-sideline-sidekick-app/download/downloadFromAPI.ts b/dfm-sideline-sidekick-app/download/downloadFromAPI.ts
@@ -113,6 +113,7 @@ export const downloadJSON = async (fileName: string, OS: string) => {
     console.log("GENERAL PRINCIPLES JSON:");
     console.log(jsonOutput.generalPrinciples);
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return jsonOutput;
   } catch (err) {
     console.log("ERROR:", err);

diff --git a/dfm-sideline-sidekick-app/pages/GlobalSearchStyles.tsx b/dfm-sideline-sidekick-app/pages/GlobalSearchStyles.tsx
@@ -76,5 +76,8 @@ const styles = StyleSheet.create({
   highlightedText: {
     color: "#00629B",
   },
+  resultList: {
+    paddingBottom: 350,
+  },
 });
 export default styles;
diff --git a/dfm-sideline-sidekick-app/pages/SearchPage.tsx b/dfm-sideline-sidekick-app/pages/SearchPage.tsx
@@ -108,7 +108,8 @@ const SearchPage: React.FC = () => {
             <Text>Home Screen Cards...</Text>
           )
         ) : (
-          <FlatList
+          <View style={styles.resultList}>
+            <FlatList
               data={filteredDocuments}
               keyExtractor={(item) => item._id}
               ItemSeparatorComponent={() => <View style={styles.divider} />}
@@ -117,8 +118,8 @@ const SearchPage: React.FC = () => {
                   style={styles.listItemContainer}
                   onPress={() => {
                     if (item.content !== undefined) {
-                      // navigation.navigate("General")
-                      console.log(item.content)
+                      navigation.navigate("GeneralPrinciples", { contentProp: item });
+                      console.log(item.content);
                     } else {
                       navigation.navigate("MedicalConditions", { emergency: item });
                     }
@@ -132,6 +133,7 @@ const SearchPage: React.FC = () => {
                 </TouchableOpacity>
               )}
             />
+          </View>
         )}
       </View>
     </View>

diff --git a/dfm-sideline-sidekick-app/pages/generalPrinciples.tsx b/dfm-sideline-sidekick-app/pages/generalPrinciples.tsx
@@ -3,7 +3,7 @@ import { RouteProp } from "@react-navigation/native"; // Import RouteProp
 import { StackNavigationProp } from "@react-navigation/stack"; // Import StackNavigationProp
 import { useFonts } from "expo-font";
 import React from "react";
-import { Text, TouchableOpacity, View } from "react-native";
+import { ScrollView, Text, TouchableOpacity, View } from "react-native";
 import AntIcon from "react-native-vector-icons/AntDesign";
 
 import ArrayPage from "../components/ArrayPage";
@@ -27,20 +27,8 @@ type GeneralProps = {
   navigation: StackNavigationProp<RootStackParamList, "GeneralPrinciples">;
 };
 
-// type GeneralProps = {
-//   route: {
-//     params: {
-//       titleProp: string;
-//       overviewProp?: object;
-//       contentProp: Content | Content[];
-//     };
-//   };
-//   navigation: any;
-// };
-
 const GeneralPrinciples: React.FC<GeneralProps> = ({ route, navigation }) => {
   const { params } = route; // Destructure params from the route object
-  //const { titleProp, contentProp } = route.params;
 
   const [fontsLoaded] = useFonts({
     "Roboto-Regular": Roboto_400Regular,
@@ -49,7 +37,6 @@ const GeneralPrinciples: React.FC<GeneralProps> = ({ route, navigation }) => {
   if (!fontsLoaded) {
     return <Text>Loading...</Text>;
   }
-  // const { title, content } = contentProp;
 
   if (Array.isArray(params.contentProp)) {
     return (
@@ -60,16 +47,18 @@ const GeneralPrinciples: React.FC<GeneralProps> = ({ route, navigation }) => {
   } else {
     return (
       <View style={styles.container}>
-        <TouchableOpacity
-          onPress={() => {
-            navigation.goBack();
-          }}
-        >
-          <AntIcon name="close" style={styles.button} />
-        </TouchableOpacity>
-        <Text style={styles.title}>{params.titleProp}</Text>
-        <Text style={styles.subTitle}>{params.contentProp.title}</Text>
-        <BulletPoint content={params.contentProp.content} />
+        <ScrollView alwaysBounceHorizontal={false} contentContainerStyle={{ flexGrow: 1 }}>
+          <TouchableOpacity
+            onPress={() => {
+              navigation.goBack();
+            }}
+          >
+            <AntIcon name="close" style={styles.button} />
+          </TouchableOpacity>
+          <Text style={styles.title}>{params.titleProp}</Text>
+          <Text style={styles.subTitle}>{params.contentProp.title}</Text>
+          <BulletPoint content={params.contentProp.content} />
+        </ScrollView>
       </View>
     );
   }

diff --git a/dfm-sideline-sidekick-app/pages/generalPrinciplesStyles.tsx b/dfm-sideline-sidekick-app/pages/generalPrinciplesStyles.tsx
@@ -8,6 +8,7 @@ const styles = StyleSheet.create({
     textAlign: "left",
     alignSelf: "stretch",
     paddingLeft: 25,
+    paddingBottom: 100,
   },
   title: {
     color: "#182B49",