From a5e83e49879679488cc1b35e51a428cc3d5bc911 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 2 Sep 2022 10:28:43 -0700
Subject: [PATCH] Added Drawer navigator & version numbers.

---
 app.json                                      |  8 ++--
 .../media-cache-overlay.component.jsx         |  6 +--
 .../screen-main/screen-main.component.jsx     | 43 +++++++++++--------
 .../upload-progress.component.jsx             |  5 +--
 redux/user/user.sagas.js                      |  2 +-
 5 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/app.json b/app.json
index 2f8d336..ed209b3 100644
--- a/app.json
+++ b/app.json
@@ -2,21 +2,21 @@
   "expo": {
     "name": "ImEX Mobile",
     "slug": "imexmobile",
-    "version": "1.3.8",
+    "version": "1.4.0",
     "extra": {
-      "expover": "2"
+      "expover": "1"
     },
     "orientation": "default",
     "icon": "./assets/logo192noa.png",
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "com.imex.imexmobile",
-      "buildNumber": "2",
+      "buildNumber": "1",
       "googleServicesFile": "./GoogleService-Info.plist"
     },
     "android": {
       "package": "com.imex.imexmobile",
-      "versionCode": 1100021,
+      "versionCode": 1100022,
       "googleServicesFile": "./google-services.json"
     },
     "splash": {
diff --git a/components/media-cache-overlay/media-cache-overlay.component.jsx b/components/media-cache-overlay/media-cache-overlay.component.jsx
index 3489dc5..2a090c1 100644
--- a/components/media-cache-overlay/media-cache-overlay.component.jsx
+++ b/components/media-cache-overlay/media-cache-overlay.component.jsx
@@ -19,9 +19,9 @@ export default function MediaCacheOverlay({
         visible={previewVisible}
         images={photos}
         imageIndex={imgIndex}
-        onImageIndexChange={(...props) => {
-          console.log(props);
-        }}
+        // onImageIndexChange={(...props) => {
+        //  // console.log(props);
+        // }}
       />
     </SafeAreaView>
   );
diff --git a/components/screen-main/screen-main.component.jsx b/components/screen-main/screen-main.component.jsx
index 789e3b4..221212c 100644
--- a/components/screen-main/screen-main.component.jsx
+++ b/components/screen-main/screen-main.component.jsx
@@ -1,11 +1,13 @@
 import { Ionicons } from "@expo/vector-icons";
 import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
+import { createDrawerNavigator } from "@react-navigation/drawer";
 import { NavigationContainer } from "@react-navigation/native";
 import { createStackNavigator } from "@react-navigation/stack";
 import i18n from "i18next";
 import moment from "moment";
 import React, { useEffect } from "react";
-import { Button } from "react-native-paper";
+import { View } from "react-native";
+import { Button, Text } from "react-native-paper";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.analytics";
@@ -26,7 +28,8 @@ import ScreenSettingsComponent from "../screen-settings/screen-settings.componen
 import ScreenSignIn from "../screen-sign-in/screen-sign-in.component";
 import ScreenSplash from "../screen-splash/screen-splash.component";
 
-const JobStack = createStackNavigator();
+const JobsTab = createDrawerNavigator();
+const ActiveJobStack = createStackNavigator();
 const MoreStack = createStackNavigator();
 const BottomTabs = createBottomTabNavigator();
 const MediaBrowserStack = createStackNavigator();
@@ -45,19 +48,33 @@ const mapDispatchToProps = (dispatch) => ({
   setCameraJob: (job) => dispatch(setCameraJob(job)),
 });
 
-const JobStackNavigator = connect(
+const JobsTabNavigator = () => (
+  <JobsTab.Navigator initialRouteName="Home">
+    <JobsTab.Screen name="Home" component={ActiveJobStackNavigator} />
+    <JobsTab.Screen
+      name="Home2"
+      component={() => (
+        <View>
+          <Text>2</Text>
+        </View>
+      )}
+    />
+  </JobsTab.Navigator>
+);
+
+const ActiveJobStackNavigator = connect(
   mapStateToProps,
   mapDispatchToProps
 )(({ setCameraJobId, setCameraJob }) => (
-  <JobStack.Navigator initialRouteName="JobList">
-    <JobStack.Screen
+  <ActiveJobStack.Navigator initialRouteName="JobList">
+    <ActiveJobStack.Screen
       name="JobList"
       options={() => ({
         title: i18n.t("joblist.labels.activejobs"),
       })}
       component={ScreenJobList}
     />
-    <JobStack.Screen
+    <ActiveJobStack.Screen
       name="JobDetail"
       component={ScreenJobDetail}
       options={({ navigation, route }) => ({
@@ -79,7 +96,7 @@ const JobStackNavigator = connect(
         ),
       })}
     />
-  </JobStack.Navigator>
+  </ActiveJobStack.Navigator>
 ));
 
 const MediaBrowserStackNavigator = () => (
@@ -107,15 +124,6 @@ const MoreStackNavigator = () => (
 const BottomTabsNavigator = () => (
   <BottomTabs.Navigator
     screenOptions={({ route }) => ({
-      // tabBarActiveTintColor: "dodgerblue",
-      // tabBarInactiveTintColor: "slategrey",
-      // tabBarStyle: [
-      //   {
-      //     display: "flex",
-      //   },
-      //   null,
-      // ],
-
       // eslint-disable-next-line react/display-name
       tabBarIcon: ({ color, size }) => {
         let iconName;
@@ -137,10 +145,9 @@ const BottomTabsNavigator = () => (
       name="JobTab"
       options={{
         title: i18n.t("joblist.titles.jobtab"),
-
         headerShown: false,
       }}
-      component={JobStackNavigator}
+      component={JobsTabNavigator}
     />
     <BottomTabs.Screen
       name="MediaBrowserTab"
diff --git a/components/upload-progress/upload-progress.component.jsx b/components/upload-progress/upload-progress.component.jsx
index f6b1c84..836742f 100644
--- a/components/upload-progress/upload-progress.component.jsx
+++ b/components/upload-progress/upload-progress.component.jsx
@@ -212,10 +212,7 @@ export function UploadProgress({
             filesToDelete,
             filesToDelete[0].albumId
           );
-          console.log(
-            "🚀  ~ file: upload-progress.component.jsx  ~ line 220  ~ delres",
-            delres
-          );
+
           // const album = await MediaLibrary.createAlbumAsync(
           //   "Deleted",
           //   filesToDelete.pop(),
diff --git a/redux/user/user.sagas.js b/redux/user/user.sagas.js
index 0bc1479..d089445 100644
--- a/redux/user/user.sagas.js
+++ b/redux/user/user.sagas.js
@@ -112,7 +112,7 @@ export function* signInSuccessSaga({ payload }) {
 
     const shop = yield client.query({ query: QUERY_BODYSHOP });
     logImEXEvent("imexmobile_sign_in_success", payload);
-    console.log(shop);
+
     yield put(setBodyshop(shop.data.bodyshops[0]));
     // yield put(
     //   setBodyshop({