Fixed issues for demo.

This commit is contained in:
Patrick Fic
2020-12-15 17:48:41 -08:00
parent 2efac1ed2b
commit 06dda3639f
16 changed files with 1842 additions and 1063 deletions

View File

@@ -199,6 +199,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>lines</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>nojobnotes</name> <name>nojobnotes</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -243,6 +264,625 @@
</concept_node> </concept_node>
</children> </children>
</folder_node> </folder_node>
<folder_node>
<name>lbr_types</name>
<children>
<concept_node>
<name>LA1</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LA2</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LA3</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LA4</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAA</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAB</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAD</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAE</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAF</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAG</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAM</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAR</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAS</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>LAU</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
<name>part_types</name>
<children>
<concept_node>
<name>CCC</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>CCD</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>CCDR</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>CCF</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>CCM</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAA</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAC</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAE</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAL</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAM</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAN</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAO</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAR</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PAS</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>PASL</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children> </children>
</folder_node> </folder_node>
<folder_node> <folder_node>

View File

@@ -0,0 +1,81 @@
import { Card, CardItem, Container, Content, Text } from "native-base";
import React from "react";
import { useTranslation } from "react-i18next";
import { FlatList, RefreshControl, StyleSheet } from "react-native";
import Dinero from "dinero.js";
export default function JobLines({ job, loading, refetch }) {
const { t } = useTranslation();
if (!!!job) {
<Card>
<Text>Job is not defined.</Text>
</Card>;
}
const onRefresh = async () => {
return refetch();
};
return (
<Container>
<Content
padder
refreshControl={
<RefreshControl refreshing={loading} onRefresh={onRefresh} />
}
>
<FlatList
data={job.joblines}
style={{ flex: 1 }}
contentContainerStyle={localStyles.listContentContainer}
keyExtractor={(item) => item.id}
renderItem={(object) => (
<Card>
<CardItem style={localStyles.flexRow}>
<Text style={localStyles.growWithEllipsis}>{`${
object.item.line_desc
}${
object.item.part_qty > 1 ? ` x ${object.item.part_qty}` : ""
}`}</Text>
{object.item.part_type && (
<Text style={localStyles.sideMargins}>
{t(`jobdetail.part_types.${object.item.part_type}`)}
</Text>
)}
<Text style={localStyles.sideMargins}>
{Dinero({
amount: Math.round((object.item.act_price || 0) * 100),
}).toFormat()}
</Text>
</CardItem>
<CardItem style={localStyles.flexRow}>
{object.item.mod_lbr_ty && (
<Text>
{t(`jobdetail.lbr_types.${object.item.mod_lbr_ty}`)}
</Text>
)}
</CardItem>
</Card>
)}
/>
</Content>
</Container>
);
}
const localStyles = StyleSheet.create({
listContentContainer: {
flex: 1,
},
flexRow: {
display: "flex",
flexDirection: "row",
justifyContent: "space-between",
},
sideMargins: {
marginLeft: 5,
marginRight: 5,
},
growWithEllipsis: {
flex: 1,
},
});

View File

@@ -9,6 +9,7 @@ import JobTombstone from "../job-tombstone/job-tombstone.component";
import LoadingDisplay from "../loading-display/loading-display.component"; import LoadingDisplay from "../loading-display/loading-display.component";
import JobNotes from "../job-notes/job-notes.component"; import JobNotes from "../job-notes/job-notes.component";
import JobDocuments from "../job-documents/job-documents.component"; import JobDocuments from "../job-documents/job-documents.component";
import JobLines from "../job-lines/job-lines.component";
export default function ScreenJobDetail({ navigation, route, ...restProps }) { export default function ScreenJobDetail({ navigation, route, ...restProps }) {
const { const {
@@ -35,6 +36,9 @@ export default function ScreenJobDetail({ navigation, route, ...restProps }) {
refetch={refetch} refetch={refetch}
/> />
</Tab> </Tab>
<Tab heading={t("jobdetail.labels.lines")}>
<JobLines job={data.jobs_by_pk} loading={loading} refetch={refetch} />
</Tab>
<Tab heading={t("jobdetail.labels.documents")}> <Tab heading={t("jobdetail.labels.documents")}>
<JobDocuments <JobDocuments
job={data.jobs_by_pk} job={data.jobs_by_pk}

View File

@@ -18,16 +18,17 @@ import {
selectBodyshop, selectBodyshop,
selectCurrentUser, selectCurrentUser,
} from "../../redux/user/user.selectors"; } from "../../redux/user/user.selectors";
import ScreenCameraJobSearch from "../screen-camera-job-search/screen-camera-job-search.component";
import ScreenCamera from "../screen-camera/screen-camera.component"; import ScreenCamera from "../screen-camera/screen-camera.component";
import ScreenJobDetail from "../screen-job-detail/screen-job-detail.component"; import ScreenJobDetail from "../screen-job-detail/screen-job-detail.component";
import ScreenJobList from "../screen-job-list/screen-job-list.component"; import ScreenJobList from "../screen-job-list/screen-job-list.component";
import ScreenMediaCache from "../screen-media-cache/screen-media-cache.component";
import ScreenMessagingConversation from "../screen-messaging-conversation/screen-messaging-conversation.component"; import ScreenMessagingConversation from "../screen-messaging-conversation/screen-messaging-conversation.component";
import ScreenMessagingList from "../screen-messaging-list/screen-messaging-list.component"; import ScreenMessagingList from "../screen-messaging-list/screen-messaging-list.component";
import ScreenSettingsComponent from "../screen-settings/screen-settings.component"; import ScreenSettingsComponent from "../screen-settings/screen-settings.component";
import ScreenSignIn from "../screen-sign-in/screen-sign-in.component"; import ScreenSignIn from "../screen-sign-in/screen-sign-in.component";
import ScreenSplash from "../screen-splash/screen-splash.component"; import ScreenSplash from "../screen-splash/screen-splash.component";
import ScreenMediaCache from "../screen-media-cache/screen-media-cache.component"; import Dinero from "dinero.js";
import ScreenCameraJobSearch from "../screen-camera-job-search/screen-camera-job-search.component";
const JobStack = createStackNavigator(); const JobStack = createStackNavigator();
const CameraStack = createStackNavigator(); const CameraStack = createStackNavigator();
@@ -48,6 +49,8 @@ const mapDispatchToProps = (dispatch) => ({
signOutStart: () => dispatch(signOutStart()), signOutStart: () => dispatch(signOutStart()),
}); });
Dinero.globalLocale = "en-CA";
const LeftDrawerButton = (props, navigation) => ( const LeftDrawerButton = (props, navigation) => (
<Ionicons <Ionicons
{...props} {...props}
@@ -127,7 +130,10 @@ const BottomTabsNavigator = () => (
iconName = "ios-camera"; iconName = "ios-camera";
} else if (route.name === "MediaCacheTab") { } else if (route.name === "MediaCacheTab") {
iconName = "ios-photos"; iconName = "ios-photos";
} else {
//iconName = "customerservice";
} }
return <Ionicons name={iconName} size={size} color={color} />; return <Ionicons name={iconName} size={size} color={color} />;
}, },
})} })}

View File

@@ -1,13 +1,14 @@
import * as FileSystem from "expo-file-system"; import * as FileSystem from "expo-file-system";
import { Button, Text as NBText, Thumbnail, View } from "native-base";
import React, { useEffect, useState } from "react";
import { import {
FlatList, Button,
SafeAreaView, Container,
StyleSheet, Content,
Text, Text as NBText,
TouchableOpacity, Thumbnail,
} from "react-native"; View,
} from "native-base";
import React, { useEffect, useState } from "react";
import { FlatList, StyleSheet, Text, TouchableOpacity } from "react-native";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { import {
@@ -43,50 +44,47 @@ export function ScreenMediaCache({ photos, removeAllPhotos, uploadAllphotos }) {
}, [photos]); }, [photos]);
return ( return (
<SafeAreaView style={styles.container}> <Container>
<FlatList <Content>
data={photos} <View style={styles.actions}>
style={{ flex: 5 }} <Button onPress={() => removeAllPhotos()}>
contentContainerStyle={styles.listContentContainer} <NBText>Delete all</NBText>
keyExtractor={(item) => item.id} </Button>
numColumns={5} <Button onPress={() => uploadAllphotos()}>
renderItem={(object) => <NBText>Upload all</NBText>
object.item.video ? ( </Button>
<Text>Video</Text> </View>
) : ( <Text>{`${photos.length} Photos`}</Text>
<TouchableOpacity <FlatList
onPress={() => { data={photos}
setImgIndex(object.index); style={{ flex: 5 }}
setPreviewVisible(true); contentContainerStyle={styles.listContentContainer}
}} keyExtractor={(item) => item.id}
> numColumns={5}
<Thumbnail square large source={{ uri: object.item.uri }} /> renderItem={(object) =>
</TouchableOpacity> object.item.video ? (
) <Text>Video</Text>
} ) : (
/> <TouchableOpacity
<FlatList onPress={() => {
data={imagesInDir} setImgIndex(object.index);
style={{ flex: 1, backgroundColor: "tomato" }} setPreviewVisible(true);
keyExtractor={(item) => item.id} }}
renderItem={(object) => <Text>{object.item}</Text>} >
/> <Thumbnail square large source={{ uri: object.item.uri }} />
<Text>{`${photos.length} Photos`}</Text> </TouchableOpacity>
<View style={styles.actions}> )
<Button onPress={() => removeAllPhotos()}> }
<NBText>Delete all</NBText> />
</Button>
<Button onPress={() => uploadAllphotos()}> <MediaCacheOverlay
<NBText>Upload all</NBText> imgIndex={imgIndex}
</Button> setImgIndex={setImgIndex}
</View> previewVisible={previewVisible}
<MediaCacheOverlay setPreviewVisible={setPreviewVisible}
imgIndex={imgIndex} />
setImgIndex={setImgIndex} </Content>
previewVisible={previewVisible} </Container>
setPreviewVisible={setPreviewVisible}
/>
</SafeAreaView>
); );
} }
@@ -105,8 +103,15 @@ const styles = StyleSheet.create({
thumbnail: { thumbnail: {
width: 10, width: 10,
height: 10, height: 10,
backgroundColor: "tomato", // backgroundColor: "tomato",
}, },
}); });
export default connect(mapStateToProps, mapDispatchToProps)(ScreenMediaCache); export default connect(mapStateToProps, mapDispatchToProps)(ScreenMediaCache);
// <FlatList
// data={imagesInDir}
// style={{}}
// keyExtractor={(item) => item.id}
// renderItem={(object) => <Text>{object.item}</Text>}
// />;

View File

@@ -4,7 +4,7 @@ import { View, Text } from "react-native";
export default function ScreenMessagingConversation({ navigation }) { export default function ScreenMessagingConversation({ navigation }) {
return ( return (
<View> <View>
<Text>The detailed conversation</Text> <Text></Text>
</View> </View>
); );
} }

30
env.js
View File

@@ -10,6 +10,16 @@ const ENV = {
"https://res.cloudinary.com/bodyshop/image/upload", "https://res.cloudinary.com/bodyshop/image/upload",
REACT_APP_CLOUDINARY_API_KEY: "473322739956866", REACT_APP_CLOUDINARY_API_KEY: "473322739956866",
REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: "h_200,w_200,c_thumb", REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: "h_200,w_200,c_thumb",
firebase: {
apiKey: "AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc",
authDomain: "imex-dev.firebaseapp.com",
databaseURL: "https://imex-dev.firebaseio.com",
projectId: "imex-dev",
storageBucket: "imex-dev.appspot.com",
messagingSenderId: "759548147434",
appId: "1:759548147434:web:e8239868a48ceb36700993",
measurementId: "G-K5XRBVVB4S",
},
}, },
staging: { staging: {
REACT_APP_CLOUDINARY_ENDPOINT: REACT_APP_CLOUDINARY_ENDPOINT:
@@ -18,6 +28,16 @@ const ENV = {
"https://res.cloudinary.com/bodyshop/image/upload", "https://res.cloudinary.com/bodyshop/image/upload",
REACT_APP_CLOUDINARY_API_KEY: "473322739956866", REACT_APP_CLOUDINARY_API_KEY: "473322739956866",
REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: "h_200,w_200,c_thumb", REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: "h_200,w_200,c_thumb",
firebase: {
apiKey: "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU",
authDomain: "imex-prod.firebaseapp.com",
databaseURL: "https://imex-prod.firebaseio.com",
projectId: "imex-prod",
storageBucket: "imex-prod.appspot.com",
messagingSenderId: "253497221485",
appId: "1:253497221485:web:3c81c483b94db84b227a64",
measurementId: "G-NTWBKG2L0M",
},
}, },
prod: { prod: {
REACT_APP_CLOUDINARY_ENDPOINT: REACT_APP_CLOUDINARY_ENDPOINT:
@@ -26,6 +46,16 @@ const ENV = {
"https://res.cloudinary.com/bodyshop/image/upload", "https://res.cloudinary.com/bodyshop/image/upload",
REACT_APP_CLOUDINARY_API_KEY: "473322739956866", REACT_APP_CLOUDINARY_API_KEY: "473322739956866",
REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: "h_200,w_200,c_thumb", REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: "h_200,w_200,c_thumb",
firebase: {
apiKey: "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU",
authDomain: "imex-prod.firebaseapp.com",
databaseURL: "https://imex-prod.firebaseio.com",
projectId: "imex-prod",
storageBucket: "imex-prod.appspot.com",
messagingSenderId: "253497221485",
appId: "1:253497221485:web:3c81c483b94db84b227a64",
measurementId: "G-NTWBKG2L0M",
},
}, },
}; };

View File

@@ -2,15 +2,26 @@ import * as firebase from "firebase/app";
import "firebase/auth"; import "firebase/auth";
//const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG); //const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG);
// const config = {
// apiKey: "AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc",
// authDomain: "imex-dev.firebaseapp.com",
// databaseURL: "https://imex-dev.firebaseio.com",
// projectId: "imex-dev",
// storageBucket: "imex-dev.appspot.com",
// messagingSenderId: "759548147434",
// appId: "1:759548147434:web:e8239868a48ceb36700993",
// measurementId: "G-K5XRBVVB4S",
// };
const config = { const config = {
apiKey: "AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc", apiKey: "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU",
authDomain: "imex-dev.firebaseapp.com", authDomain: "imex-prod.firebaseapp.com",
databaseURL: "https://imex-dev.firebaseio.com", databaseURL: "https://imex-prod.firebaseio.com",
projectId: "imex-dev", projectId: "imex-prod",
storageBucket: "imex-dev.appspot.com", storageBucket: "imex-prod.appspot.com",
messagingSenderId: "759548147434", messagingSenderId: "253497221485",
appId: "1:759548147434:web:e8239868a48ceb36700993", appId: "1:253497221485:web:3c81c483b94db84b227a64",
measurementId: "G-K5XRBVVB4S", measurementId: "G-NTWBKG2L0M",
}; };
if (!firebase.apps.length) { if (!firebase.apps.length) {

View File

@@ -16,11 +16,13 @@ import { onError } from "@apollo/client/link/error";
import { getMainDefinition } from "@apollo/client/utilities"; import { getMainDefinition } from "@apollo/client/utilities";
const httpLink = new HttpLink({ const httpLink = new HttpLink({
uri: "https://bodyshop-dev-db.herokuapp.com/v1/graphql", // uri: "https://bodyshop-dev-db.herokuapp.com/v1/graphql",
uri: "https://db.imex.online/v1/graphql",
}); });
const wsLink = new WebSocketLink({ const wsLink = new WebSocketLink({
uri: "wss://bodyshop-dev-db.herokuapp.com/v1/graphql", //uri: "wss://bodyshop-dev-db.herokuapp.com/v1/graphql",
uri: "wss://db.imex.online/v1/graphql",
options: { options: {
lazy: true, lazy: true,
reconnect: true, reconnect: true,

View File

@@ -2,7 +2,10 @@ import gql from "graphql-tag";
export const QUERY_ALL_ACTIVE_JOBS = gql` export const QUERY_ALL_ACTIVE_JOBS = gql`
query QUERY_ALL_ACTIVE_JOBS($statuses: [String!]!) { query QUERY_ALL_ACTIVE_JOBS($statuses: [String!]!) {
jobs(where: { status: { _in: $statuses } }) { jobs(
where: { status: { _in: $statuses } }
order_by: { est_number: desc }
) {
ownr_fn ownr_fn
ownr_ln ownr_ln
ownr_ph1 ownr_ph1
@@ -116,102 +119,6 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
} }
`; `;
export const QUERY_JOB_COSTING_DETAILS = gql`
query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
jobs_by_pk(id: $id) {
est_number
ro_number
clm_total
id
ded_amt
ded_status
depreciation_taxes
other_amount_payable
towing_payable
storage_payable
adjustment_bottom_line
federal_tax_rate
state_tax_rate
local_tax_rate
tax_tow_rt
tax_str_rt
tax_paint_mat_rt
tax_sub_rt
tax_lbr_rt
tax_levies_rt
parts_tax_rates
job_totals
labor_rate_desc
rate_la1
rate_la2
rate_la3
rate_la4
rate_laa
rate_lab
rate_lad
rate_lae
rate_laf
rate_lag
rate_lam
rate_lar
rate_las
rate_lau
rate_ma2s
rate_ma2t
rate_ma3s
rate_mabl
rate_macs
rate_mahw
rate_mapa
rate_mash
rate_matd
actual_in
status
joblines {
id
unq_seq
line_ind
tax_part
line_desc
prt_dsmk_p
prt_dsmk_m
part_type
oem_partno
db_price
act_price
part_qty
mod_lbr_ty
db_hrs
mod_lb_hrs
lbr_op
lbr_amt
op_code_desc
}
invoices {
id
federal_tax_rate
local_tax_rate
state_tax_rate
is_credit_memo
invoicelines {
actual_cost
cost_center
id
quantity
}
}
timetickets {
id
rate
cost_center
actualhrs
}
}
}
`;
export const GET_JOB_BY_PK = gql` export const GET_JOB_BY_PK = gql`
query GET_JOB_BY_PK($id: uuid!) { query GET_JOB_BY_PK($id: uuid!) {
jobs_by_pk(id: $id) { jobs_by_pk(id: $id) {

View File

@@ -9,6 +9,7 @@
}, },
"dependencies": { "dependencies": {
"@apollo/client": "^3.3.4", "@apollo/client": "^3.3.4",
"@expo/vector-icons": "^10.2.0",
"@react-native-community/async-storage": "~1.12.0", "@react-native-community/async-storage": "~1.12.0",
"@react-native-community/masked-view": "0.1.10", "@react-native-community/masked-view": "0.1.10",
"@react-navigation/bottom-tabs": "^5.11.2", "@react-navigation/bottom-tabs": "^5.11.2",
@@ -43,7 +44,7 @@
"react-native-gesture-handler": "~1.8.0", "react-native-gesture-handler": "~1.8.0",
"react-native-image-zoom-viewer": "^3.0.1", "react-native-image-zoom-viewer": "^3.0.1",
"react-native-indicators": "^0.17.0", "react-native-indicators": "^0.17.0",
"react-native-reanimated": "^1.13.2", "react-native-reanimated": "~1.13.0",
"react-native-safe-area-context": "3.1.9", "react-native-safe-area-context": "3.1.9",
"react-native-screens": "~2.15.0", "react-native-screens": "~2.15.0",
"react-native-web": "~0.13.12", "react-native-web": "~0.13.12",

View File

@@ -19,8 +19,42 @@
"documents": "Documents", "documents": "Documents",
"employeeassignments": "Employee Assignments", "employeeassignments": "Employee Assignments",
"job": "Job", "job": "Job",
"lines": "Lines",
"nojobnotes": "There are no notes.", "nojobnotes": "There are no notes.",
"notes": "Notes" "notes": "Notes"
},
"lbr_types": {
"LA1": "LA1",
"LA2": "LA2",
"LA3": "LA3",
"LA4": "LA4",
"LAA": "Aluminum",
"LAB": "Body",
"LAD": "Diagnostic",
"LAE": "Electrical",
"LAF": "Frame",
"LAG": "Glass",
"LAM": "Mechanical",
"LAR": "Refinish",
"LAS": "Structural",
"LAU": "User Defined"
},
"part_types": {
"CCC": "CC Cleaning",
"CCD": "CC Damage Waiver",
"CCDR": "CC Daily Rate",
"CCF": "CC Refuel",
"CCM": "CC Mileage",
"PAA": "Aftermarket",
"PAC": "Rechromed",
"PAE": "Existing",
"PAL": "LKQ",
"PAM": "Remanufactured",
"PAN": "New/OEM",
"PAO": "Other",
"PAR": "Recored",
"PAS": "Sublet",
"PASL": "Sublet"
} }
}, },
"joblist": { "joblist": {

View File

@@ -19,8 +19,42 @@
"documents": "", "documents": "",
"employeeassignments": "", "employeeassignments": "",
"job": "", "job": "",
"lines": "",
"nojobnotes": "", "nojobnotes": "",
"notes": "" "notes": ""
},
"lbr_types": {
"LA1": "",
"LA2": "",
"LA3": "",
"LA4": "",
"LAA": "",
"LAB": "",
"LAD": "",
"LAE": "",
"LAF": "",
"LAG": "",
"LAM": "",
"LAR": "",
"LAS": "",
"LAU": ""
},
"part_types": {
"CCC": "",
"CCD": "",
"CCDR": "",
"CCF": "",
"CCM": "",
"PAA": "",
"PAC": "",
"PAE": "",
"PAL": "",
"PAM": "",
"PAN": "",
"PAO": "",
"PAR": "",
"PAS": "",
"PASL": ""
} }
}, },
"joblist": { "joblist": {

View File

@@ -19,8 +19,42 @@
"documents": "", "documents": "",
"employeeassignments": "", "employeeassignments": "",
"job": "", "job": "",
"lines": "",
"nojobnotes": "", "nojobnotes": "",
"notes": "" "notes": ""
},
"lbr_types": {
"LA1": "",
"LA2": "",
"LA3": "",
"LA4": "",
"LAA": "",
"LAB": "",
"LAD": "",
"LAE": "",
"LAF": "",
"LAG": "",
"LAM": "",
"LAR": "",
"LAS": "",
"LAU": ""
},
"part_types": {
"CCC": "",
"CCD": "",
"CCDR": "",
"CCF": "",
"CCM": "",
"PAA": "",
"PAC": "",
"PAE": "",
"PAL": "",
"PAM": "",
"PAN": "",
"PAO": "",
"PAR": "",
"PAS": "",
"PASL": ""
} }
}, },
"joblist": { "joblist": {

View File

@@ -59,15 +59,12 @@ export const uploadToCloudinary = async (
//Get the signed url. //Get the signed url.
let signedURLResponse; let signedURLResponse;
try { try {
signedURLResponse = await axios.post( signedURLResponse = await axios.post("https://api.imex.online/media/sign", {
"https://d2ea3cff6920.ngrok.io/media/sign", public_id: public_id,
{ tags: tags,
public_id: public_id, timestamp: timestamp,
tags: tags, upload_preset: "incoming_upload",
timestamp: timestamp, });
upload_preset: "incoming_upload",
}
);
} catch (error) { } catch (error) {
console.log("ERROR GETTING SIGNED URL", error); console.log("ERROR GETTING SIGNED URL", error);
return { success: false, error: error }; return { success: false, error: error };

1773
yarn.lock

File diff suppressed because it is too large Load Diff