admin/imexmobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2nd set of WIP changes.

Browse Source
This commit is contained in:
Patrick Fic
2024-02-28 08:50:51 -08:00
parent 8e9fa7f81b
commit 93f77255e2
19 changed files with 748 additions and 10814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
App.js
View File

@@ -3,7 +3,7 @@ import React from "react";
import { DefaultTheme, Provider as PaperProvider } from "react-native-paper"; import { DefaultTheme, Provider as PaperProvider } from "react-native-paper";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import { PersistGate } from "redux-persist/integration/react"; import { PersistGate } from "redux-persist/integration/react";
import * as Sentry from "sentry-expo"; import * as Sentry from '@sentry/react-native';
import ScreenMainComponent from "./components/screen-main/screen-main.component"; import ScreenMainComponent from "./components/screen-main/screen-main.component";
import { logImEXEvent } from "./firebase/firebase.analytics"; import { logImEXEvent } from "./firebase/firebase.analytics";
import { client } from "./graphql/client"; import { client } from "./graphql/client";
@@ -17,17 +17,16 @@ import { SafeAreaProvider } from "react-native-safe-area-context";
Sentry.init({ Sentry.init({
dsn: "https://8d6c3de1940a4e4f8b81cf4d2150bdea@o492140.ingest.sentry.io/5558869", dsn: "https://8d6c3de1940a4e4f8b81cf4d2150bdea@o492140.ingest.sentry.io/5558869",
enableInExpoDevelopment: true, enableInExpoDevelopment: true,
tracesSampleRate: 0.2, // tracesSampleRate: 0.2,
integrations: [ // integrations: [
new Sentry.Native.ReactNativeTracing({ // new Sentry.Native.ReactNativeTracing({
tracingOrigins: ["localhost", "imex.online", "cloudinary.com", /^\//], // tracingOrigins: ["localhost", "imex.online", "cloudinary.com", /^\//],
// ... other options // // ... other options
}), // }),
], // ],
debug: true, // Sentry will try to print out useful debugging information if something goes wrong with sending an event. Set this to `false` in production. debug: true, // Sentry will try to print out useful debugging information if something goes wrong with sending an event. Set this to `false` in production.
}); });
Sentry.Native.nativeCrash();
const theme = { const theme = {
...DefaultTheme, ...DefaultTheme,
@@ -38,7 +37,7 @@ const theme = {
}, },
}; };
export default class App extends React.Component { class App extends React.Component {
async componentDidMount() { async componentDidMount() {
logImEXEvent("imexmobile_app_start"); logImEXEvent("imexmobile_app_start");
} }
@@ -60,3 +59,4 @@ export default class App extends React.Component {
); );
} }
} }
export default Sentry.wrap(App);

30
app.json
View File

@@ -2,7 +2,7 @@
"expo": { "expo": {
"name": "ImEX Mobile", "name": "ImEX Mobile",
"slug": "imexmobile", "slug": "imexmobile",
"version": "1.4.1", "version": "1.6.0",
"extra": { "extra": {
"expover": "1", "expover": "1",
"eas": { "eas": {
@@ -11,6 +11,7 @@
}, },
"orientation": "default", "orientation": "default",
"icon": "./assets/logo192noa.png", "icon": "./assets/logo192noa.png",
"platforms": ["ios", "android"],
"ios": { "ios": {
"supportsTablet": true, "supportsTablet": true,
"bundleIdentifier": "com.imex.imexmobile", "bundleIdentifier": "com.imex.imexmobile",
@@ -23,7 +24,7 @@
}, },
"android": { "android": {
"package": "com.imex.imexmobile", "package": "com.imex.imexmobile",
"versionCode": 1100025, "versionCode": 1100026,
"googleServicesFile": "./google-services.json", "googleServicesFile": "./google-services.json",
"permissions": [ "permissions": [
"android.permission.READ_EXTERNAL_STORAGE", "android.permission.READ_EXTERNAL_STORAGE",
@@ -41,9 +42,7 @@
"updates": { "updates": {
"fallbackToCacheTimeout": 0 "fallbackToCacheTimeout": 0
}, },
"assetBundlePatterns": [ "assetBundlePatterns": ["**/*"],
"**/*"
],
"web": { "web": {
"favicon": "./assets/logo192noa.png", "favicon": "./assets/logo192noa.png",
"config": { "config": {
@@ -60,20 +59,15 @@
} }
}, },
"description": "", "description": "",
"hooks": {
"postPublish": [
{
"file": "sentry-expo/upload-sourcemaps",
"config": {
"organization": "snapt-software",
"project": "imexmobile",
"authToken": "32fed1c2d5a8440da684b624ee678874b64c51bb9b0b4b608ab4a15516d6dd02"
}
}
]
},
"plugins": [ "plugins": [
"sentry-expo", [
"@sentry/react-native/expo",
{
"url": "https://sentry.io/",
"organization": "imex",
"project": "imexmobile"
}
],
[ [
"expo-media-library", "expo-media-library",
{ {

4
components/camera-select-job/camera-select-job.component.jsx
View File

@@ -109,7 +109,7 @@ export function CameraSelectJob({
}} }}
> >
<Button onPress={() => hideModal()}> <Button onPress={() => hideModal()}>
<Ionicons name="ios-arrow-back" size={32} color="dodgerblue" /> <Ionicons name="arrow-back" size={32} color="dodgerblue" />
</Button> </Button>
<Searchbar <Searchbar
style={{ flex: 1 }} style={{ flex: 1 }}
@@ -135,7 +135,7 @@ export function CameraSelectJob({
if (object.item.id !== cameraJobId) return null; if (object.item.id !== cameraJobId) return null;
return ( return (
<Ionicons <Ionicons
name="ios-checkmark-circle" name="checkmark-circle"
size={24} size={24}
color="dodgerblue" color="dodgerblue"
style={{ alignSelf: "center" }} style={{ alignSelf: "center" }}

2
components/job-documents/job-documents-local.component.jsx
View File

@@ -8,7 +8,7 @@ import {
View, View,
} from "react-native"; } from "react-native";
import MediaCacheOverlay from "../media-cache-overlay/media-cache-overlay.component"; import MediaCacheOverlay from "../media-cache-overlay/media-cache-overlay.component";
import * as Sentry from "sentry-expo"; import * as Sentry from '@sentry/react-native';
import Toast from "react-native-toast-message"; import Toast from "react-native-toast-message";
import cleanAxios from "../../util/CleanAxios"; import cleanAxios from "../../util/CleanAxios";

2
components/job-list-item/job-list-item.component.jsx
View File

@@ -77,7 +77,7 @@ export function JobListItem({ setCameraJob, setCameraJobId, item }) {
> >
<Ionicons <Ionicons
style={[style, { alignSelf: "center" }]} style={[style, { alignSelf: "center" }]}
name="ios-add" name="add"
size={32} size={32}
color="dodgerblue" color="dodgerblue"
/> />

2
components/local-upload-progress/local-upload-progress.component.jsx
View File

@@ -18,7 +18,7 @@ import {
selectCurrentCameraJobId, selectCurrentCameraJobId,
selectDeleteAfterUpload, selectDeleteAfterUpload,
} from "../../redux/app/app.selectors"; } from "../../redux/app/app.selectors";
import * as Sentry from "sentry-expo"; import * as Sentry from '@sentry/react-native';
import { formatBytes } from "../../util/document-upload.utility"; import { formatBytes } from "../../util/document-upload.utility";
import { handleLocalUpload } from "../../util/local-document-upload.utility"; import { handleLocalUpload } from "../../util/local-document-upload.utility";

8
components/screen-main/screen-main.component.jsx
View File

@@ -74,7 +74,7 @@ const JobsTabNavigator = connect(
navigation.navigate("MediaBrowserTab"); navigation.navigate("MediaBrowserTab");
}} }}
> >
<Ionicons name="ios-add" size={32} color="dodgerblue" /> <Ionicons name="add" size={32} color="dodgerblue" />
</Button> </Button>
), ),
})} })}
@@ -111,11 +111,11 @@ const BottomTabsNavigator = () => (
tabBarIcon: ({ color, size }) => { tabBarIcon: ({ color, size }) => {
let iconName; let iconName;
if (route.name === "JobTab") { if (route.name === "JobTab") {
iconName = "ios-list"; iconName = "list";
} else if (route.name === "MoreTab") { } else if (route.name === "MoreTab") {
iconName = "ios-settings"; iconName = "settings";
} else if (route.name === "MediaBrowserTab") { } else if (route.name === "MediaBrowserTab") {
iconName = "ios-camera"; iconName = "camera";
} else { } else {
//iconName = "customerservice"; //iconName = "customerservice";
} }

4
components/screen-media-browser/screen-media-browser.component.jsx
View File

@@ -105,13 +105,13 @@ export function ImageBrowserScreen({ bodyshop, selectedCameraJobId }) {
widgetWidth: 99, widgetWidth: 99,
videoIcon: { videoIcon: {
Component: Ionicons, Component: Ionicons,
iconName: "ios-videocam", iconName: "videocam",
color: "white", color: "white",
size: 20, size: 20,
}, },
selectedIcon: { selectedIcon: {
Component: Ionicons, Component: Ionicons,
iconName: "ios-checkmark-circle-outline", iconName: "checkmark-circle-outline",
color: "white", color: "white",
bg: "rgba(35,35,35, 0.75)", bg: "rgba(35,35,35, 0.75)",
size: 32, size: 32,

2
components/screen-settings/screen-settings.component.jsx
View File

@@ -21,7 +21,7 @@ export default function ScreenSettingsComponent() {
> >
<Title> <Title>
{t("settings.labels.version", { {t("settings.labels.version", {
number: `${Constants.manifest.version}-${Constants.manifest.extra.expover}`, number: `${Constants.expoConfig.version}-${Constants.expoConfig.extra.expover}`,
})} })}
</Title> </Title>

2
components/screen-sign-in/screen-sign-in.component.jsx
View File

@@ -90,7 +90,7 @@ export function SignIn({ emailSignInStart, signingIn }) {
</View> </View>
<Text style={{ padding: 10, alignSelf: "center" }}> <Text style={{ padding: 10, alignSelf: "center" }}>
{t("settings.labels.version", { {t("settings.labels.version", {
number: Constants.manifest.version, number: Constants.expoConfig.version,
})} })}
</Text> </Text>
</View> </View>

158
components/upload-progress/upload-progress.component.jsx
View File

@@ -1,8 +1,8 @@
import { useApolloClient } from "@apollo/client"; import { useApolloClient } from '@apollo/client';
import * as FileSystem from "expo-file-system"; import * as FileSystem from 'expo-file-system';
import * as MediaLibrary from "expo-media-library"; import * as MediaLibrary from 'expo-media-library';
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from 'react';
import { useTranslation } from "react-i18next"; import { useTranslation } from 'react-i18next';
import { import {
ActivityIndicator, ActivityIndicator,
Alert, Alert,
@@ -11,23 +11,23 @@ import {
StyleSheet, StyleSheet,
Text, Text,
View, View,
} from "react-native"; } from 'react-native';
import { Divider, ProgressBar } from "react-native-paper"; import { Divider, ProgressBar } from 'react-native-paper';
import Toast from "react-native-toast-message"; import Toast from 'react-native-toast-message';
import { connect } from "react-redux"; import { connect } from 'react-redux';
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from 'reselect';
import * as Sentry from "sentry-expo"; import * as Sentry from '@sentry/react-native';
import { logImEXEvent } from "../../firebase/firebase.analytics"; import { logImEXEvent } from '../../firebase/firebase.analytics';
import { GET_DOC_SIZE_TOTALS } from "../../graphql/documents.queries"; import { GET_DOC_SIZE_TOTALS } from '../../graphql/documents.queries';
import { import {
selectCurrentCameraJobId, selectCurrentCameraJobId,
selectDeleteAfterUpload, selectDeleteAfterUpload,
} from "../../redux/app/app.selectors"; } from '../../redux/app/app.selectors';
import { import {
selectBodyshop, selectBodyshop,
selectCurrentUser, selectCurrentUser,
} from "../../redux/user/user.selectors"; } from '../../redux/user/user.selectors';
import { formatBytes, handleUpload } from "../../util/document-upload.utility"; import { formatBytes, handleUpload } from '../../util/document-upload.utility';
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser, currentUser: selectCurrentUser,
@@ -110,10 +110,10 @@ export function UploadProgress({
}); });
} }
function handleOnError(error) { function handleOnError(error) {
logImEXEvent("imexmobile_upload_documents_error", { error }); logImEXEvent('imexmobile_upload_documents_error', { error });
Toast.show({ Toast.show({
type: "error", type: 'error',
text1: "Unable to upload document.", text1: 'Unable to upload document.',
text2: error, text2: error,
autoHide: false, autoHide: false,
}); });
@@ -124,7 +124,7 @@ export function UploadProgress({
return { return {
...progress, ...progress,
uploadInProgress: true, uploadInProgress: true,
statusText: "Preparing upload...", statusText: 'Preparing upload...',
}; };
}); });
@@ -138,10 +138,10 @@ export function UploadProgress({
return (await acc) + info.size; return (await acc) + info.size;
}, 0); }, 0);
if (selectedCameraJobId !== "temp") { if (selectedCameraJobId !== 'temp') {
const queryData = await client.query({ const queryData = await client.query({
query: GET_DOC_SIZE_TOTALS, query: GET_DOC_SIZE_TOTALS,
fetchPolicy: "network-only", fetchPolicy: 'network-only',
variables: { variables: {
jobId: selectedCameraJobId, jobId: selectedCameraJobId,
}, },
@@ -161,8 +161,8 @@ export function UploadProgress({
uploadInProgress: false, uploadInProgress: false,
})); }));
Alert.alert( Alert.alert(
t("mediabrowser.labels.storageexceeded_title"), t('mediabrowser.labels.storageexceeded_title'),
t("mediabrowser.labels.storageexceeded") t('mediabrowser.labels.storageexceeded')
); );
return; return;
} }
@@ -203,56 +203,56 @@ export function UploadProgress({
//Everything is uploaded, delete the succesful ones. //Everything is uploaded, delete the succesful ones.
if (deleteAfterUpload) { if (deleteAfterUpload) {
try { try {
console.log("Trying to Delete", filesToDelete); console.log('Trying to Delete', filesToDelete);
if (Platform.OS === "android") { if (Platform.OS === 'android') {
//Create a new asset with the first file to delete. //Create a new asset with the first file to delete.
console.log("Trying new delete."); // console.log('Trying new delete.');
const delres = await MediaLibrary.removeAssetsFromAlbumAsync( // const delres = await MediaLibrary.removeAssetsFromAlbumAsync(
filesToDelete, // filesToDelete,
filesToDelete[0].albumId // filesToDelete[0].albumId
// );
// await MediaLibrary.deleteAssetsAsync(filesToDelete.map((f) => f.id));
// const res = Promise.all(filesToDelete.map(f => FileSystem.deleteAsync(f.uri, { idempotent: true })))
// console.log("🚀 ~ onDone ~ res:", res)
// console.log('🚀 ~ onDone ~ filesToDelete:', filesToDelete);
await MediaLibrary.getPermissionsAsync(false);
const album = await MediaLibrary.createAlbumAsync(
'ImEX Mobile Deleted',
filesToDelete.pop(),
false
); );
// const album = await MediaLibrary.createAlbumAsync( //Move the rest.
// "Deleted", if (filesToDelete.length > 0) {
// filesToDelete.pop(), const moveResult = await MediaLibrary.addAssetsToAlbumAsync(
// false filesToDelete,
// ); album,
// console.log( false
// "🚀 ~ file: upload-progress.component.jsx ~ line 215 ~ album", );
// album console.log(
// ); 'Were assets succesfully moved to the new album?',
// //Move the rest. moveResult
// const moveResult = await MediaLibrary.addAssetsToAlbumAsync( );
// filesToDelete, }
// album.id, //Delete the album.
// false
// );
// console.log(
// "🚀 ~ file: upload-progress.component.jsx ~ line 221 ~ moveResult",
// moveResult
// );
// //Delete the album.
// const deleteResult = await MediaLibrary.deleteAlbumsAsync( //This defaults to delete all assets in the album.
// album.id, const deleteResult = await MediaLibrary.deleteAlbumsAsync(album);
// true console.log('Did the albume delete succesfully?', deleteResult);
// );
// console.log(
// "🚀 ~ file: upload-progress.component.jsx ~ line 228 ~ deleteResult",
// deleteResult
// );
} else { } else {
await MediaLibrary.deleteAssetsAsync(filesToDelete.map((f) => f.id)); await MediaLibrary.deleteAssetsAsync(filesToDelete.map((f) => f.id));
} }
} catch (error) { } catch (error) {
console.log("Unable to delete picture.", error); console.log('Unable to delete picture.', error);
Sentry.Native.captureException(error); Sentry.Native.captureException(error);
} }
} }
filesToDelete = []; filesToDelete = [];
Toast.show({ Toast.show({
type: "success", type: 'success',
text1: ` Upload completed.`, text1: ` Upload completed.`,
// //
// text2: duration, // text2: duration,
@@ -284,7 +284,7 @@ export function UploadProgress({
}, },
{ {
bodyshop: bodyshop, bodyshop: bodyshop,
jobId: selectedCameraJobId !== "temp" ? selectedCameraJobId : null, jobId: selectedCameraJobId !== 'temp' ? selectedCameraJobId : null,
uploaded_by: currentUser.email, uploaded_by: currentUser.email,
photo: p, photo: p,
} }
@@ -294,12 +294,12 @@ export function UploadProgress({
return ( return (
<Modal <Modal
visible={progress.uploadInProgress} visible={progress.uploadInProgress}
animationType="slide" animationType='slide'
transparent={true} transparent={true}
onRequestClose={() => { onRequestClose={() => {
Alert.alert("Cancel?", "Do you want to abort the upload?", [ Alert.alert('Cancel?', 'Do you want to abort the upload?', [
{ {
text: "Yes", text: 'Yes',
onPress: () => { onPress: () => {
setUploads(null); setUploads(null);
setProgress({ setProgress({
@@ -314,7 +314,7 @@ export function UploadProgress({
}); });
}, },
}, },
{ text: "No" }, { text: 'No' },
]); ]);
}} }}
> >
@@ -329,13 +329,13 @@ export function UploadProgress({
<ProgressBar <ProgressBar
progress={progress.files[key].percent} progress={progress.files[key].percent}
style={styles.progress} style={styles.progress}
color={progress.files[key].percent === 1 ? "green" : "blue"} color={progress.files[key].percent === 1 ? 'green' : 'blue'}
/> />
<View <View
style={{ style={{
display: "flex", display: 'flex',
flexDirection: "row", flexDirection: 'row',
alignItems: "center", alignItems: 'center',
}} }}
> >
<Text>{`${formatBytes( <Text>{`${formatBytes(
@@ -377,19 +377,19 @@ export function UploadProgress({
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
modalContainer: { modalContainer: {
display: "flex", display: 'flex',
flex: 1, flex: 1,
justifyContent: "center", justifyContent: 'center',
}, },
modal: { modal: {
//flex: 1, //flex: 1,
display: "flex", display: 'flex',
marginLeft: 20, marginLeft: 20,
marginRight: 20, marginRight: 20,
backgroundColor: "white", backgroundColor: 'white',
borderRadius: 20, borderRadius: 20,
padding: 18, padding: 18,
shadowColor: "#000", shadowColor: '#000',
shadowOffset: { shadowOffset: {
width: 0, width: 0,
height: 2, height: 2,
@@ -399,14 +399,14 @@ const styles = StyleSheet.create({
elevation: 5, elevation: 5,
}, },
centeredView: { centeredView: {
justifyContent: "center", justifyContent: 'center',
alignItems: "center", alignItems: 'center',
marginTop: 22, marginTop: 22,
}, },
progressItem: { progressItem: {
display: "flex", display: 'flex',
flexDirection: "row", flexDirection: 'row',
alignItems: "center", alignItems: 'center',
marginBottom: 12, marginBottom: 12,
marginLeft: 12, marginLeft: 12,
marginRight: 12, marginRight: 12,

3
firebase/firebase.utils.js
View File

@@ -3,8 +3,7 @@ import "firebase/auth";
import env from "../env"; import env from "../env";
import { initializeApp } from "firebase/app"; import { initializeApp } from "firebase/app";
import { getAuth, initializeAuth } from "firebase/auth"; import { getAuth, initializeAuth , getReactNativePersistence} from "firebase/auth";
import { getReactNativePersistence } from "firebase/auth/react-native";
import AsyncStorage from "@react-native-async-storage/async-storage"; import AsyncStorage from "@react-native-async-storage/async-storage";
const defaultApp = initializeApp(env.firebase); const defaultApp = initializeApp(env.firebase);

13
metro.config.js
View File

@@ -1,6 +1,7 @@
const { getDefaultConfig } = require("metro-config"); // This replaces `const { getDefaultConfig } = require('expo/metro-config');`
const { resolver: defaultResolver } = getDefaultConfig.getDefaultValues(); const { getSentryExpoConfig } = require('@sentry/react-native/metro');
exports.resolver = {
...defaultResolver, // This replaces `const config = getDefaultConfig(__dirname);`
sourceExts: [...defaultResolver.sourceExts, "cjs", "jsx"], const config = getSentryExpoConfig(__dirname);
};
module.exports = config;

1717
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

107
package.json
View File

@@ -16,87 +16,86 @@
"build:production:local:android": "eas build --profile production --platform android --local" "build:production:local:android": "eas build --profile production --platform android --local"
}, },
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.0-alpha.3", "@apollo/client": "^3.9.5",
"@babel/preset-env": "7.1.6", "@babel/preset-env": "7.1.6",
"@expo/vector-icons": "^13.0.0", "@expo/vector-icons": "^14.0.0",
"@react-native-async-storage/async-storage": "1.18.2", "@react-native-async-storage/async-storage": "1.22.2",
"@react-native-community/art": "^1.2.0", "@react-native-community/art": "^1.2.0",
"@react-native-community/cli-debugger-ui": "^9.0.0", "@react-native-community/cli-debugger-ui": "^9.0.0",
"@react-native-community/datetimepicker": "7.2.0", "@react-native-community/datetimepicker": "7.6.1",
"@react-native-community/masked-view": "^0.1.11", "@react-native-community/masked-view": "^0.1.11",
"@react-navigation/bottom-tabs": "^6.3.3", "@react-navigation/bottom-tabs": "^6.3.3",
"@react-navigation/drawer": "^6.4.4", "@react-navigation/drawer": "^6.4.4",
"@react-navigation/native": "^6.0.12", "@react-navigation/native": "^6.0.12",
"@react-navigation/native-stack": "^6.8.0", "@react-navigation/native-stack": "^6.8.0",
"@react-navigation/stack": "^6.2.3", "@react-navigation/stack": "^6.2.3",
"axios": "^0.27.2", "@sentry/react-native": "5.17.0",
"axios": "^1.6.7",
"cloudinary-core": "^2.13.0", "cloudinary-core": "^2.13.0",
"dinero.js": "^1.9.1", "dinero.js": "^1.9.1",
"expo": "^49.0.0", "expo": "^50.0.7",
"expo-application": "~5.3.0", "expo-application": "~5.8.3",
"expo-av": "~13.4.1", "expo-av": "~13.10.5",
"expo-constants": "~14.4.2", "expo-constants": "~15.4.5",
"expo-dev-client": "~2.4.6", "expo-dev-client": "~3.3.8",
"expo-device": "~5.4.0", "expo-device": "~5.9.3",
"expo-file-system": "~15.4.2", "expo-file-system": "~16.0.6",
"expo-font": "~11.4.0", "expo-font": "~11.10.3",
"expo-image-manipulator": "~11.3.0", "expo-image-manipulator": "~11.8.0",
"expo-images-picker": "^2.4.1", "expo-images-picker": "^2.4.1",
"expo-localization": "~14.3.0", "expo-localization": "~14.8.3",
"expo-media-library": "~15.4.1", "expo-media-library": "~15.9.1",
"expo-permissions": "~14.2.1", "expo-status-bar": "~1.11.1",
"expo-status-bar": "~1.6.0", "expo-system-ui": "~2.9.3",
"expo-system-ui": "~2.4.0", "expo-updates": "~0.24.11",
"expo-updates": "~0.18.11", "expo-video-thumbnails": "~7.9.0",
"expo-video-thumbnails": "~7.4.0", "firebase": "^10.8.0",
"firebase": "^9.8.3", "formik": "^2.4.5",
"formik": "^2.2.9", "graphql": "^16.8.1",
"graphql": "^16.6.0",
"i18next": "^21.9.1", "i18next": "^21.9.1",
"intl": "^1.2.5", "intl": "^1.2.5",
"lodash": "^4.17.20", "lodash": "^4.17.21",
"luxon": "^3.0.3", "luxon": "^3.4.4",
"mime": "^3.0.0", "mime": "^3.0.0",
"moment": "^2.29.4", "moment": "^2.30.1",
"normalize-url": "^7.0.3", "normalize-url": "^7.0.3",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-i18next": "^11.17.2", "react-i18next": "^14.0.5",
"react-is": ">= 16.8.0", "react-is": ">=18.2.0",
"react-native": "0.72.3", "react-native": "0.73.4",
"react-native-draggable-flatlist": "^3.1.2", "react-native-draggable-flatlist": "^4.0.1",
"react-native-element-dropdown": "^2.9.0", "react-native-element-dropdown": "^2.10.1",
"react-native-gesture-handler": "~2.12.0", "react-native-gesture-handler": "~2.15.0",
"react-native-image-gallery": "^2.1.5", "react-native-image-gallery": "^2.1.5",
"react-native-image-viewing": "^0.2.2", "react-native-image-viewing": "^0.2.2",
"react-native-indicators": "^0.17.0", "react-native-indicators": "^0.17.0",
"react-native-modal-datetime-picker": "^15.0.0", "react-native-modal-datetime-picker": "^17.1.0",
"react-native-pager-view": "6.2.0", "react-native-pager-view": "6.2.3",
"react-native-paper": "^4.12.4", "react-native-paper": "^5.12.3",
"react-native-progress": "^5.0.0", "react-native-progress": "^5.0.1",
"react-native-reanimated": "~3.3.0", "react-native-reanimated": "~3.7.1",
"react-native-safe-area-context": "4.6.3", "react-native-safe-area-context": "4.9.0",
"react-native-screens": "~3.22.0", "react-native-screens": "~3.29.0",
"react-native-svg": "13.9.0", "react-native-svg": "14.1.0",
"react-native-tab-view": "3.1.1", "react-native-tab-view": "3.5.2",
"react-native-toast-message": "^2.1.5", "react-native-toast-message": "^2.2.0",
"react-native-vector-icons": "*", "react-native-vector-icons": "*",
"react-native-web": "~0.19.6", "react-native-web": "~0.19.10",
"react-redux": "^7.2.6", "react-redux": "^9.1.0",
"redux": "^4.1.2", "redux": "^5.0.1",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"redux-persist": "^6.0.0", "redux-persist": "^6.0.0",
"redux-saga": "^1.1.3", "redux-saga": "^1.3.0",
"reselect": "^4.1.6", "reselect": "^5.1.0",
"sentry-expo": "~7.0.0",
"subscriptions-transport-ws": "^0.9.18" "subscriptions-transport-ws": "^0.9.18"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.19.3", "@babel/core": "^7.23.9",
"babel-preset-expo": "^9.5.0", "babel-preset-expo": "^10.0.1",
"eslint": "^7.27.0", "eslint": "^8.57.0",
"eslint-plugin-react": "^7.24.0", "eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-native": "^3.11.0" "eslint-plugin-react-native": "^4.1.0"
}, },
"private": true "private": true
} }

4
redux/user/user.sagas.js
View File

@@ -1,7 +1,7 @@
//import * as Analytics from "expo-firebase-analytics";//JF:commenting out the firebase analytics portion //import * as Analytics from "expo-firebase-analytics";//JF:commenting out the firebase analytics portion
import { signInWithEmailAndPassword, signOut } from "firebase/auth"; import { signInWithEmailAndPassword, signOut } from "firebase/auth";
import { all, call, put, takeLatest } from "redux-saga/effects"; import { all, call, put, takeLatest } from "redux-saga/effects";
import * as Sentry from "sentry-expo"; import * as Sentry from '@sentry/react-native';
import { logImEXEvent } from "../../firebase/firebase.analytics"; import { logImEXEvent } from "../../firebase/firebase.analytics";
import { import {
auth, auth,
@@ -108,7 +108,7 @@ export function* onSignInSuccess() {
export function* signInSuccessSaga({ payload }) { export function* signInSuccessSaga({ payload }) {
try { try {
// Analytics.setUserId(payload.email);//JF:commenting out the firebase analytics portion // Analytics.setUserId(payload.email);//JF:commenting out the firebase analytics portion
Sentry.Native.setUser({ email: payload.email }); //Sentry.Native.setUser({ email: payload.email });
const shop = yield client.query({ query: QUERY_BODYSHOP }); const shop = yield client.query({ query: QUERY_BODYSHOP });
logImEXEvent("imexmobile_sign_in_success", payload); logImEXEvent("imexmobile_sign_in_success", payload);

2
util/document-upload.utility.js
View File

@@ -5,7 +5,7 @@ import { INSERT_NEW_DOCUMENT } from "../graphql/documents.queries";
import { axiosAuthInterceptorId } from "./CleanAxios"; import { axiosAuthInterceptorId } from "./CleanAxios";
import * as MediaLibrary from "expo-media-library"; import * as MediaLibrary from "expo-media-library";
import { gql } from "@apollo/client"; import { gql } from "@apollo/client";
import * as Sentry from "sentry-expo"; import * as Sentry from '@sentry/react-native';
//Context: currentUserEmail, bodyshop, jobid, invoiceid //Context: currentUserEmail, bodyshop, jobid, invoiceid

2
util/local-document-upload.utility.js
View File

@@ -2,7 +2,7 @@ import axios from "axios";
import { store } from "../redux/store"; import { store } from "../redux/store";
import mime from "mime"; import mime from "mime";
import * as MediaLibrary from "expo-media-library"; import * as MediaLibrary from "expo-media-library";
import * as Sentry from "sentry-expo"; import * as Sentry from '@sentry/react-native';
axios.interceptors.request.use( axios.interceptors.request.use(
function (config) { function (config) {

9480
yarn.lock
View File

File diff suppressed because it is too large Load Diff