Resolved conflict

atlp-rwanda · May 6, 2024 · a6804ef · a6804ef
2 parents 04653d8 + 5f5ae27
commit a6804ef
Show file tree

Hide file tree

Showing 27 changed files with 941 additions and 134 deletions.
diff --git a/README.md b/README.md
@@ -4,14 +4,22 @@ Online Doctor Appointment & Consultation App
 
 ## Table Of Content
 
- - [Description](#description)
-
- - [Documentation](#documentation)
- - [Setup](#setup)
- - [Testing](#testing)
- - [Contribute](#contribute)
- - [Contact](#contact)
- - [License](#license)
+- [Medica App](#medica-app)
+  - [Table Of Content](#table-of-content)
+  - [Description](#description)
+  - [Overview;](#overview)
+  - [Overview;](#overview-1)
+  - [Documentation](#documentation)
+    - [Endpoints](#endpoints)
+  - [Setup](#setup)
+    - [Dependencies](#dependencies)
+    - [Getting Started](#getting-started)
+    - [Run The Service](#run-the-service)
+  - [Testing](#testing)
+  - [Contribute](#contribute)
+  - [Contact](#contact)
+  - [Contact](#contact-1)
+  - [License](#license)
 
 
 ## Description
@@ -21,6 +29,9 @@ Medica is a mobile application designed to facilitate online doctor appointments
 ## Overview;
 None at the moment!!
 
+## Overview;
+None at the moment!!
+
 ## Documentation
 
 ### Endpoints
@@ -58,7 +69,7 @@ git clone https://github.com/atlp-rwanda/matadors-rn-medica.git
 ```bash
 npm install 
 ```
-5. Set up environment variables:
+1. Set up environment variables:
 - Create a `.env` file based on `.env.example` and fill in necessary values.
 
 ### Run The Service
@@ -67,6 +78,16 @@ npm install
 ```bash
 npm start
 ```
+1. Use the Expo client on your mobile device or simulator to run the app.
+
+## Testing
+
+To run tests, use the following command:
+```bash
+npm test
+```
+npm start
+```
 2. Use the Expo client on your mobile device or simulator to run the app.
 
 ## Testing
@@ -84,14 +105,23 @@ Contributions are welcome! To contribute to this repository, please follow these
 4. Push to the branch (`git push origin feature/my-feature`).
 5. Create a new Pull Request.
 
+## Contact
+
+Feel free to reach out to us:
+[Nkbtemmy](https://github.com/Nkbtemmy)
+[mukunzidd](https://github.com/mukunzidd)
 
-  ## Contact
+## Contact
 
-  Feel free to reach out to us:
-  [Nkbtemmy](https://github.com/Nkbtemmy)
-  [mukunzidd](https://github.com/mukunzidd)
+Feel free to reach out to me on my email:
+example@gmail.com  
+[GitHub](https://github.com/Nkbtemmy)
+[GitHub](https://github.com/mukunzidd)
+Feel free to reach out to us:
+[Nkbtemmy](https://github.com/Nkbtemmy)
+[mukunzidd](https://github.com/mukunzidd)
 
-  ## License
+## License
 
   None At the moment !!
 #  Test coverage

diff --git a/SpashScreen/Splash.tsx b/SpashScreen/Splash.tsx
@@ -1,56 +1,50 @@
 import Loading from "@/app/spinner/Loading";
 import { Image, StyleSheet, Text, View } from "react-native";
 
-
-
-export default function SplashScreen(){
-    return (
-        <>
-        <View style={styles.container}>
-            <View style={styles.splash}>
-                <View>
-                <View>
-                <Image source={require('../assets/images/icon.png')}/>
-                </View>
-                </View>
-
-       <View>
-       <Text style={styles.text}>Medica</Text>
-       </View>
-    <View style={styles.spin}>
-    <Loading/>
-    </View>
-
-
+export default function SplashScreen() {
+  return (
+    <>
+      <View style={styles.container}>
+        <View style={styles.splash}>
+          <View>
+            <View>
+              <Image source={require("../assets/images/icon.png")} />
             </View>
-
+          </View>
+
+          <View>
+            <Text style={styles.text}>Medica</Text>
+          </View>
+          <View style={styles.spin}>
+            <Loading />
+          </View>
         </View>
-        </>
-    )
+      </View>
+    </>
+  );
 }
 
 const styles = StyleSheet.create({
-    container:{
-flex:1,
-justifyContent:'center',
-alignItems:'center',
-backgroundColor:'#ffff'
-    },
-    splash:{
-        flex:1,
-        flexDirection:'row',
-        justifyContent:'center',
-        alignItems:'center',
-        backgroundColor:'white',
-        gap:20,
-        width:'100%'
-    },
-    text:{
-        fontSize:30
-    },
-    spin:{
-        position:'absolute',
-        bottom: 50
-
-    }
-})
+  container: {
+    flex: 1,
+    justifyContent: "center",
+    alignItems: "center",
+    backgroundColor: "#ffff",
+  },
+  splash: {
+    flex: 1,
+    flexDirection: "row",
+    justifyContent: "center",
+    alignItems: "center",
+    backgroundColor: "white",
+    gap: 20,
+    width: "100%",
+  },
+  text: {
+    fontSize: 30,
+  },
+  spin: {
+    position: "absolute",
+    bottom: 50,
+  },
+});
diff --git a/app.json b/app.json
@@ -16,8 +16,8 @@
     ],
     "ios": {
       "supportsTablet": true,
-      "config": {
-        "usesNonExemptEncryption": false
+      "infoPlist": {
+        "NSFaceIDUsageDescription": "This app uses Face ID and Touch ID for some features"
       },
       "bundleIdentifier": "medical.app"
     },
@@ -35,7 +35,12 @@
     },
     "plugins": [
       "expo-router",
-      "expo-secure-store"
+      [
+        "expo-local-authentication",
+        {
+          "faceIDPermission": "Allow $(PRODUCT_NAME) to use Face ID."
+        }
+      ]
     ],
     "experiments": {
       "typedRoutes": true

diff --git a/app/(app)/HomeScreen.tsx b/app/(app)/HomeScreen.tsx
@@ -3,7 +3,6 @@ import Typography from "@/constants/Typography";
 import Colors from "@/constants/Colors";
 
 
-
 export default function HomeScreen(){
     return (
         <>