Merge pull request #34 from Endurance-Soft/develop

Develop

.env

@@ -1,7 +1,7 @@
-API_KEY=AIzaSyBiWzVuJjqL3N6zkzB2UbBaFPDWeZ1aMc0
-AUTH_DOMAIN=avi-pro-mobile.firebaseapp.com
-PROJECT_ID=avi-pro-mobile
-STORAGE_BUCKET=avi-pro-mobile.appspot.com
-MESSAGING_SENDER_ID=714379198452
-APP_ID=1:714379198452:web:53e907ba46c524e06403a1
-MEASUREMENT_ID=G-XVHVGNEVGE
+API_KEY="AIzaSyCscvgW17XsqgoTSwvBO9ZPetnhPZHuH58"
+AUTH_DOMAIN="avi-pro-mobile.firebaseapp.com"
+PROJECT_ID="avi-pro-mobile"
+STORAGE_BUCKET="avi-pro-mobile.appspot.com"
+MESSAGING_SENDER_ID="714379198452",
+APP_ID="1:714379198452:web:6fa537e74641a61f6403a1",
+MEASUREMENT_ID="G-B3QX0N2YZG"

App.js

@@ -1,20 +1,15 @@
-import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, Text, View } from 'react-native';
+import React, { useEffect } from 'react';
+import { Button, View } from 'react-native';
+import { MenuProvider } from 'react-native-popup-menu';
+import AppNavigator from './src/navigation/AppNavigator';
+import AsyncStorage from '@react-native-async-storage/async-storage';
 
-export default function App() {
+const App = () => {
   return (
-    <View style={styles.container}>
-      <Text>Open up App.js to start working on your app!</Text>
-      <StatusBar style="auto" />
-    </View>
+    <MenuProvider>
+      <AppNavigator />
+    </MenuProvider>
   );
-}
+};
 
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-});
+export default App;

app.config.js

@@ -1,5 +1,3 @@
-import "dotenv/config";
-
 export default{
   expo: {
     name: "avi-pro-mobile",
@@ -35,8 +33,13 @@ export default{
         foregroundImage: "./assets/adaptive-icon.png",
         backgroundColor: "#ffffff"
       },
-      package: "com.endurancesoft.avipromobile"
+      package: "com.endurancesoft.avipromobile",
+      googleServicesFile: "./google-services.json",
     },
+    plugins: [
+      "@react-native-firebase/app",
+      "@react-native-firebase/auth",
+    ],
     web: {
       favicon: "./assets/favicon.png"
     },
@@ -45,13 +48,6 @@ export default{
         projectId: "68722059-896d-4f90-9039-57984284a8d6",
         owner: "endurancesoft",
       },
-      apiKey: process.env.API_KEY,
-      authDomain: process.env.AUTH_DOMAIN,
-      projectId: process.env.PROJECT_ID,
-      storageBucket: process.env.STORAGE_BUCKET,
-      messagingSenderId: process.env.MESSAGING_SENDER_ID,
-      appId: process.env.APP_ID,
-      measurementId: process.env.MEASUREMENT_ID,
       }
   },
 };

config.js

@@ -0,0 +1,2 @@
+// config.js
+export const BASE_URL = "http://192.168.1.2:3000"; // Will

config/firebase.js

@@ -1,21 +1,23 @@
+// Import the functions you need from the SDKs you need
 import { initializeApp } from "firebase/app";
 import { getAuth } from "firebase/auth";
 import { getFirestore } from "firebase/firestore";
-import Constants from "expo-constants";
 import { getAnalytics } from "firebase/analytics";
-import 'dotenv/config';
 
+// Your web app's Firebase configuration
+// For Firebase JS SDK v7.20.0 and later, measurementId is optional
 const firebaseConfig = {
-    apiKey: process.env.API_KEY,
-    authDomain: process.env.AUTH_DOMAIN,
-    projectId: process.env.PROJECT_ID,
-    storageBucket: process.env.STORAGE_BUCKET,
-    messagingSenderId: process.env.MESSAGING_SENDER_ID,
-    appId: process.env.APP_ID,
-    measurementId: process.env.MEASUREMENT_ID,
-  };
+  apiKey: "AIzaSyCscvgW17XsqgoTSwvBO9ZPetnhPZHuH58",
+  authDomain: "avi-pro-mobile.firebaseapp.com",
+  projectId: "avi-pro-mobile",
+  storageBucket: "avi-pro-mobile.appspot.com",
+  messagingSenderId: "714379198452",
+  appId: "1:714379198452:web:6fa537e74641a61f6403a1",
+  measurementId: "G-B3QX0N2YZG"
+};
 
 const app = initializeApp(firebaseConfig);
-export const auth = getAuth();
-export const database = getFirestore();
-export const analytics = getAnalytics(app);
+const db = getFirestore(app);
+const auth = getAuth(app);
+
+export { db, app, auth };

google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "714379198452",
+    "project_id": "avi-pro-mobile",
+    "storage_bucket": "avi-pro-mobile.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:714379198452:android:fb8d46745102402e6403a1",
+        "android_client_info": {
+          "package_name": "com.endurancesoft.avipromobile"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA86gikXHOAuuN1LpS6snEjqFqz5Q6cuUE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}