steve
/
grocery-app
mirror of https://github.com/ninjas-code-official/food-delivery-singlevendor
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from Ninjas-Code-official/staging 

Staging
This commit is contained in:
Sharan 2023-03-29 13:07:49 +05:00 committed by GitHub
parent 2f45f293a7 49c7b36a7b
commit 244f669f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
346 changed files with 45592 additions and 12844 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
CustomerApp/node_modules
RiderApp/node_modules

1
Customer App/.npmrc Normal file
View File

@ -0,0 +1 @@
legacy-peer-deps=true

12
Customer App/app.json
View File

@ -2,6 +2,7 @@
"expo": {
"name": "Enatega",
"version": "1.0.16",
"scheme": "enategasinglevendor",
"description": "Enatega is a starter kit food ordering app built in React Native using Expo for IOS and Android. It's made keeping good aesthetics in mind as well keeping the best coding practices in mind. Its fully customisable to easily help you in your next food delivery project. https://market.nativebase.io/view/react-native-food-delivery-backend-app",
"slug": "enategasinglevendor",
"privacy": "public",
@ -33,7 +34,8 @@
},
"usesAppleSignIn": true,
"infoPlist": {
"NSLocationWhenInUseUsageDescription": "This app uses the location to determine the delivery address for your orders."
"NSLocationWhenInUseUsageDescription": "This app uses the location to determine the delivery address for your orders.",
"NSUserTrackingUsageDescription": "Allow this app to collect app-related data that can be used for tracking you or your device."
}
},
"notification": {
@ -47,7 +49,6 @@
"versionCode": 22,
"package": "com.enatega.vendor",
"googleServicesFile": "./google-services-prod.json",
"config": {
"googleMaps": {
"apiKey": ""
@ -72,6 +73,11 @@
],
"facebookScheme": "fb3017447961609878",
"facebookAppId": "3017447961609878",
"facebookDisplayName": "Food delivery"
"facebookDisplayName": "Food delivery",
"extra": {
"eas": {
"projectId": "0b51ea6b-d9fd-48e2-9480-54149ca73a7a"
}
}
}
}

13
Customer App/babel.config.js
View File

@ -1,7 +1,10 @@
module.exports = function (api) {
api.cache(true)
api.cache(true);
return {
presets: ['babel-preset-expo'],
plugins: ['react-native-reanimated/plugin']
}
}
presets: ["babel-preset-expo"],
plugins: [
"react-native-reanimated/plugin",
"@babel/plugin-syntax-dynamic-import",
],
};
};

36
Customer App/eas.json Normal file
View File

@ -0,0 +1,36 @@
{
"cli": {
"version": ">= 3.8.0"
},
"build": {
"development": {
"developmentClient": true,
"distribution": "internal",
"android": {
"buildType": "apk"
},
"ios": {
"resourceClass": "m-medium"
}
},
"preview": {
"distribution": "internal",
"ios": {
"resourceClass": "m-medium"
}
},
"production": {
"developmentClient": false,
"releaseChannel": "production",
"android": {
"buildType": "apk"
},
"ios": {
"resourceClass": "m-medium"
}
}
},
"submit": {
"production": {}
}
}

8
Customer App/index.js Normal file
View File

@ -0,0 +1,8 @@
import { registerRootComponent } from 'expo';
import App from './App';
// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
// It also ensures that whether you load the app in Expo Go or in a native build,
// the environment is set up appropriately
registerRootComponent(App);

4
Customer App/metro.config.js Normal file
View File

@ -0,0 +1,4 @@
// Learn more https://docs.expo.io/guides/customizing-metro
const { getDefaultConfig } = require('expo/metro-config');
module.exports = getDefaultConfig(__dirname);

2106
Customer App/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
Customer App/package.json
View File

@ -1,7 +1,6 @@
{
"name": "enatega-full-app",
"version": "5.0.0",
"main": "node_modules/expo/AppEntry.js",
"scripts": {
"start": "expo start",
"android": "expo start --android",
@ -24,6 +23,7 @@
]
},
"dependencies": {
"@amplitude/analytics-react-native": "^1.1.1",
"@apollo/react-hooks": "^3.1.3",
"@expo/vector-icons": "^13.0.0",
"@ptomasroos/react-native-multi-slider": "^2.2.2",
@ -44,18 +44,17 @@
"apollo-upload-client": "^10.0.0",
"apollo-utilities": "^1.3.4",
"deprecated-react-native-prop-types": "^4.0.0",
"expo": "^47.0.0",
"expo-analytics-amplitude": "~11.3.0",
"expo": "~47.0.12",
"expo-app-auth": "~11.1.0",
"expo-app-loading": "~2.1.1",
"expo-apple-authentication": "~5.0.1",
"expo-application": "~5.0.1",
"expo-asset": "~8.7.0",
"expo-auth-session": "~3.8.0",
"expo-camera": "~13.1.0",
"expo-constants": "~14.0.2",
"expo-contacts": "~11.0.1",
"expo-device": "~5.0.0",
"expo-facebook": "~12.2.0",
"expo-font": "~11.0.1",
"expo-google-app-auth": "^8.3.0",
"expo-image-picker": "~14.0.2",
@ -63,8 +62,10 @@
"expo-localization": "~14.0.0",
"expo-location": "~15.0.1",
"expo-notifications": "~0.17.0",
"expo-random": "~13.0.0",
"expo-sensors": "~12.0.1",
"expo-splash-screen": "~0.17.5",
"expo-status-bar": "~1.4.2",
"expo-tracking-transparency": "~3.0.1",
"expo-updates": "~0.15.6",
"graphql": "^16.6.0",
@ -80,7 +81,6 @@
"react-native-flatlist-slider": "^1.0.5",
"react-native-gesture-handler": "~2.8.0",
"react-native-gifted-chat": "^1.1.1",
"react-native-i18n": "1.0.0",
"react-native-maps": "1.3.2",
"react-native-material-textfield": "^0.16.1",
"react-native-modal": "^13.0.1",
@ -97,6 +97,7 @@
"validate.js": "^0.13.1"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"babel-jest": "^29.4.3",
"babel-preset-expo": "~9.2.1",
"babel-preset-react-native": "^4.0.1",
@ -117,10 +118,7 @@
"react-test-renderer": "^18.2.0"
},
"jest": {
"preset": "react-native",
"transformIgnorePatterns": [
"node_modules/(?!(react-native|expo|@expo|apollo-boost|apollo-cache-inmemory|apollo-client|apollo-link-context|apollo-link-http|apollo-link-state|apollo-upload-client|graphql|graphql-tag|react-apollo|react-native-animatable|react-native-material-buttons|react-native-material-ripple|react-native-material-textfield|react-native-ratings|react-native-swiper-flatlist|react-native-timeline-listview|react-navigation|validate.js)/)"
]
"preset": "react-native"
},
"private": true
}

34
Customer App/patches/react-native-star-rating++react-native-button+2.4.0.patch Normal file
View File

@ -0,0 +1,34 @@
diff --git a/node_modules/react-native-star-rating/node_modules/react-native-button/Button.js b/node_modules/react-native-star-rating/node_modules/react-native-button/Button.js
index fb7cf46..8e4c522 100644
--- a/node_modules/react-native-star-rating/node_modules/react-native-button/Button.js
+++ b/node_modules/react-native-star-rating/node_modules/react-native-button/Button.js
@@ -1,11 +1,12 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
+import {TextPropTypes,ViewPropTypes} from 'deprecated-react-native-prop-types'
import {
StyleSheet,
Text,
TouchableOpacity,
View,
- ViewPropTypes,
+ //ViewPropTypes,
} from 'react-native';
import coalesceNonElementChildren from './coalesceNonElementChildren';
@@ -16,12 +17,12 @@ export default class Button extends Component {
static propTypes = {
...TouchableOpacity.propTypes,
accessibilityLabel: PropTypes.string,
- allowFontScaling: Text.propTypes.allowFontScaling,
+ allowFontScaling: TextPropTypes.allowFontScaling,
containerStyle: ViewPropTypes.style,
disabledContainerStyle: ViewPropTypes.style,
disabled: PropTypes.bool,
- style: Text.propTypes.style,
- styleDisabled: Text.propTypes.style,
+ style: TextPropTypes.style,
+ styleDisabled: TextPropTypes.style,
childGroupStyle: ViewPropTypes.style,
};

BIN
Customer App/src/assets/images/foodPlaceholder.jpeg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 MiB

BIN
Customer App/src/assets/images/food_placeholder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 10 KiB

44
Customer App/src/components/FdSocialBtn/FdFacebookBtn/FdFacebookBtn.js
View File

@ -1,44 +0,0 @@
import { FontAwesome } from '@expo/vector-icons'
import { useTheme } from '@react-navigation/native'
import PropTypes from 'prop-types'
import React from 'react'
import { TouchableOpacity } from 'react-native'
import Spinner from '../../../components/Spinner/Spinner'
import TextDefault from '../../../components/Text/TextDefault/TextDefault'
import { alignment } from '../../../utils/alignment'
import { scale } from '../../../utils/scaling'
import useStyle from './styles'
const FdFacebookBtn = props => {
const styles = useStyle()
const { colors } = useTheme()
return (
<TouchableOpacity
activeOpacity={0.7}
style={styles.mainContainer}
onPressIn={props.onPressIn}
onPress={props.onPress}>
{props.loadingIcon ? (
<Spinner backColor="rgba(0,0,0,0.1)" spinnerColor={colors.tagColor} />
) : (
<>
<FontAwesome
style={styles.marginLeft5}
name="facebook"
size={scale(19)}
color="#3b5998"
/>
<TextDefault style={alignment.MLsmall} bold>
Signup with Facebook
</TextDefault>
</>
)}
</TouchableOpacity>
)
}
FdFacebookBtn.propTypes = {
onPress: PropTypes.func,
loadingIcon: PropTypes.bool,
onPressIn: PropTypes.func
}
export default FdFacebookBtn

27
Customer App/src/components/FdSocialBtn/FdGoogleBtn/styles.js
View File

@ -1,27 +0,0 @@
import { useTheme } from '@react-navigation/native'
import { Dimensions, StyleSheet } from 'react-native'
import { alignment } from '../../../utils/alignment'
import { moderateScale } from '../../../utils/scaling'
const { height } = Dimensions.get('window')
const useStyle = () => {
const { colors } = useTheme()
return StyleSheet.create({
mainContainer: {
width: '100%',
height: height * 0.07,
backgroundColor: colors.buttonBackgroundLight,
flexDirection: 'row',
alignItems: 'center',
borderRadius: moderateScale(20)
},
marginLeft5: {
...alignment.Pmedium
},
marginLeft10: {
...alignment.MLmedium
}
})
}
export default useStyle

8
Customer App/src/components/FdSocialBtn/index.js
View File

@ -1,5 +1,5 @@
import FdEmailBtn from './FdEmailBtn/FdEmailBtn'
import FdFacebookBtn from './FdFacebookBtn/FdFacebookBtn'
import FdGoogleBtn from './FdGoogleBtn/FdGoogleBtn'
import FdEmailBtn from "./FdEmailBtn/FdEmailBtn";
export { FdEmailBtn, FdFacebookBtn, FdGoogleBtn }
import FdGoogleBtn from "./FdGoogleBtn/FdGoogleBtn";
export { FdEmailBtn, FdGoogleBtn };

96
Customer App/src/components/Menu/StatusCard/StatusCard.js
View File

@ -1,67 +1,67 @@
import { useNavigation, useTheme } from '@react-navigation/native'
import React, { useContext } from 'react'
import { FlatList, TouchableOpacity, View } from 'react-native'
import ConfigurationContext from '../../../context/Configuration'
import UserContext from '../../../context/User'
import { alignment } from '../../../utils/alignment'
import { NAVIGATION_SCREEN } from '../../../utils/constant'
import Spinner from '../../Spinner/Spinner'
import TextDefault from '../../Text/TextDefault/TextDefault'
import TextError from '../../Text/TextError/TextError'
import useStyle from './styles'
import { useNavigation, useTheme } from "@react-navigation/native";
import React, { useContext } from "react";
import { FlatList, TouchableOpacity, View } from "react-native";
import ConfigurationContext from "../../../context/Configuration";
import UserContext from "../../../context/User";
import { alignment } from "../../../utils/alignment";
import { NAVIGATION_SCREEN } from "../../../utils/constant";
import Spinner from "../../Spinner/Spinner";
import TextDefault from "../../Text/TextDefault/TextDefault";
import TextError from "../../Text/TextError/TextError";
import useStyle from "./styles";
export const orderStatuses = [
{
key: 'PENDING',
key: "PENDING",
status: 1,
statusText: 'Your order is still pending.'
statusText: "Your order is still pending.",
},
{
key: 'ACCEPTED',
key: "ACCEPTED",
status: 2,
statusText: 'Restaurant is preparing Food.'
statusText: "Restaurant is preparing Food.",
},
{
key: 'PICKED',
key: "PICKED",
status: 3,
statusText: 'Rider is on the way.'
statusText: "Rider is on the way.",
},
{
key: 'DELIVERED',
key: "DELIVERED",
status: 4,
statusText: 'Order is delivered.'
statusText: "Order is delivered.",
},
{
key: 'COMPLETED',
key: "COMPLETED",
status: 5,
statusText: 'Order is completed.'
}
]
statusText: "Order is completed.",
},
];
const orderStatusActive = ['PENDING', 'PICKED', 'ACCEPTED']
const orderStatusActive = ["PENDING", "PICKED", "ACCEPTED"];
const StatusCard = () => {
const { colors } = useTheme()
const styles = useStyle()
const navigation = useNavigation()
const { colors } = useTheme();
const styles = useStyle();
const navigation = useNavigation();
const {
loadingOrders,
errorOrders,
orders,
networkStatusOrders,
fetchOrders
} = useContext(UserContext)
const configuration = useContext(ConfigurationContext)
fetchOrders,
} = useContext(UserContext);
const configuration = useContext(ConfigurationContext);
const checkStatus = status => {
const obj = orderStatuses.filter(x => {
return x.key === status
})
return obj[0]
}
const checkStatus = (status) => {
const obj = orderStatuses.filter((x) => {
return x.key === status;
});
return obj[0];
};
if (loadingOrders) return <Spinner />
if (errorOrders) return <TextError>{errorOrders.message}</TextError>
if (loadingOrders) return <Spinner />;
if (errorOrders) return <TextError>{errorOrders.message}</TextError>;
return (
<FlatList
@ -71,8 +71,9 @@ const StatusCard = () => {
horizontal={true}
refreshing={networkStatusOrders === 4}
onRefresh={() => networkStatusOrders === 7 && fetchOrders()}
data={orders.filter(o => orderStatusActive.includes(o.order_status))}
keyExtractor={item => item._id}
data={orders.filter((o) => orderStatusActive.includes(o.order_status))}
//keyExtractor={(item) => item._id}
keyExtractor={(item, index) => String(index)}
renderItem={({ item, index }) => (
<TouchableOpacity
activeOpacity={0.8}
@ -80,9 +81,10 @@ const StatusCard = () => {
onPress={() =>
navigation.navigate(NAVIGATION_SCREEN.OrderDetail, {
_id: item._id,
currency_symbol: configuration.currency_symbol
currency_symbol: configuration.currency_symbol,
})
}>
}
>
<View key={index} style={styles.statusContainer}>
<View style={styles.textContainer}>
<TextDefault H5 medium textColor={styles.lightText.color}>
@ -95,8 +97,8 @@ const StatusCard = () => {
Status
</TextDefault>
<TextDefault textColor={'#00b9c6'} H5 medium>
{item.order_status}{' '}
<TextDefault textColor={"#00b9c6"} H5 medium>
{item.order_status}{" "}
<TextDefault numberOfLines={2} medium>
{/* {checkStatus(item.order_status).status}.{' '} */}(
{checkStatus(item.order_status).statusText})
@ -107,7 +109,7 @@ const StatusCard = () => {
</TouchableOpacity>
)}
/>
)
}
);
};
export default StatusCard
export default StatusCard;

47
Customer App/src/components/index.js
View File

@ -1,34 +1,34 @@
import CartItem from './CartItem/CartItem'
import CartItem from "./CartItem/CartItem";
import {
CartComponent,
CheckComponent,
HeadingComponent,
ImageHeader,
RadioComponent,
TitleComponent
} from './CustomizeComponents'
import { DrawerProfile } from './Drawer'
import CheckboxBtn from './FdCheckbox/CheckboxBtn'
import RadioBtn from './FdRadioBtn/RadioBtn'
import { FdEmailBtn, FdFacebookBtn, FdGoogleBtn } from './FdSocialBtn'
import { FlashMessage } from './FlashMessage/FlashMessage'
TitleComponent,
} from "./CustomizeComponents";
import { DrawerProfile } from "./Drawer";
import CheckboxBtn from "./FdCheckbox/CheckboxBtn";
import RadioBtn from "./FdRadioBtn/RadioBtn";
import { FdEmailBtn, FdGoogleBtn } from "./FdSocialBtn";
import { FlashMessage } from "./FlashMessage/FlashMessage";
import {
BackButton,
LeftButton,
RightButton,
RegistrationHeader
} from './Header'
import { MenuCard, StatusCard } from './Menu'
import { FilterModal } from './Modals'
import ActiveOrders from './MyOrders/ActiveOrders'
import { TrackingRider } from './OrderDetail'
import Sidebar from './Sidebar/Sidebar'
import Spinner from './Spinner/Spinner'
import { TextDefault, TextError, TextLine } from './Text'
import Triangle from './Triangle/Triangle'
import EnategaImage from './EnategaImage/EnategaImage'
import WrapperView from './WrapperView/WrapperView'
import { CustomIcon } from './CustomIcon'
RegistrationHeader,
} from "./Header";
import { MenuCard, StatusCard } from "./Menu";
import { FilterModal } from "./Modals";
import ActiveOrders from "./MyOrders/ActiveOrders";
import { TrackingRider } from "./OrderDetail";
import Sidebar from "./Sidebar/Sidebar";
import Spinner from "./Spinner/Spinner";
import { TextDefault, TextError, TextLine } from "./Text";
import Triangle from "./Triangle/Triangle";
import EnategaImage from "./EnategaImage/EnategaImage";
import WrapperView from "./WrapperView/WrapperView";
import { CustomIcon } from "./CustomIcon";
export {
WrapperView,
@ -45,7 +45,6 @@ export {
RadioBtn,
CheckboxBtn,
FdEmailBtn,
FdFacebookBtn,
FdGoogleBtn,
FlashMessage,
BackButton,
@ -62,5 +61,5 @@ export {
TextError,
TextLine,
Spinner,
TrackingRider
}
TrackingRider,
};

113
Customer App/src/screens/Addresses/Addresses.js
View File

@ -1,59 +1,59 @@
import { useMutation } from '@apollo/react-hooks'
import { useNavigation, useTheme } from '@react-navigation/native'
import gql from 'graphql-tag'
import React, { useContext, useLayoutEffect } from 'react'
import { FlatList, TouchableOpacity, View } from 'react-native'
import i18n from '../../../i18n'
import { deleteAddress } from '../../apollo/server'
import EmptyAddress from '../../assets/images/SVG/imageComponents/EmptyAddress'
import { useMutation } from "@apollo/react-hooks";
import { useNavigation, useTheme } from "@react-navigation/native";
import gql from "graphql-tag";
import React, { useContext, useLayoutEffect } from "react";
import { FlatList, TouchableOpacity, View } from "react-native";
import i18n from "../../../i18n";
import { deleteAddress } from "../../apollo/server";
import EmptyAddress from "../../assets/images/SVG/imageComponents/EmptyAddress";
import {
CustomIcon,
RightButton,
TextDefault,
WrapperView
} from '../../components'
import UserContext from '../../context/User'
import { COLORS } from '../../Theme'
import { alignment } from '../../utils/alignment'
import { ICONS_NAME, NAVIGATION_SCREEN } from '../../utils/constant'
import { scale } from '../../utils/scaling'
import useStyle from './styles'
WrapperView,
} from "../../components";
import UserContext from "../../context/User";
import { COLORS } from "../../Theme";
import { alignment } from "../../utils/alignment";
import { ICONS_NAME, NAVIGATION_SCREEN } from "../../utils/constant";
import { scale } from "../../utils/scaling";
import useStyle from "./styles";
const DELETE_ADDRESS = gql`
${deleteAddress}
`
`;
function Addresses() {
const styles = useStyle()
const { colors } = useTheme()
const navigation = useNavigation()
const { profile } = useContext(UserContext)
const [mutate, { loading: loadingMutation }] = useMutation(DELETE_ADDRESS)
const styles = useStyle();
const { colors } = useTheme();
const navigation = useNavigation();
const { profile } = useContext(UserContext);
const [mutate, { loading: loadingMutation }] = useMutation(DELETE_ADDRESS);
useLayoutEffect(() => {
navigation.setOptions({
title: i18n.t('myAddresses'),
title: i18n.t("myAddresses"),
headerRight: () => (
<RightButton
icon={ICONS_NAME.Plus}
iconSize={scale(18)}
onPress={() => navigation.navigate(NAVIGATION_SCREEN.NewAddress)}
/>
)
})
}, [navigation])
),
});
}, [navigation]);
const addressIcons = {
Home: ICONS_NAME.Home,
Work: ICONS_NAME.Cart,
Other: ICONS_NAME.Location
}
Other: ICONS_NAME.Location,
};
const colorIcons = {
Other: COLORS.primary,
Home: COLORS.redishPink,
Work: COLORS.primaryLightBlue
}
Work: COLORS.primaryLightBlue,
};
const emptyView = React.memo(() => {
return (
@ -66,28 +66,30 @@ function Addresses() {
textColor={colors.fontMainColor}
bold
H5
style={alignment.Msmall}>
style={alignment.Msmall}
>
No Addresses found.
</TextDefault>
<View>
<TextDefault textColor={colors.fontSecondColor}>
You haven&#39;t saved any address yet.
{'\n'}
{"\n"}
Click Add New Address to get started
</TextDefault>
</View>
<TouchableOpacity
activeOpacity={0.8}
style={styles.adressBtn}
onPress={() => navigation.navigate(NAVIGATION_SCREEN.NewAddress)}>
onPress={() => navigation.navigate(NAVIGATION_SCREEN.NewAddress)}
>
<TextDefault textColor={colors.white} H5 bold>
Add New Address
</TextDefault>
</TouchableOpacity>
</View>
</View>
)
})
);
});
return (
<WrapperView>
<View style={styles.containerInfo}>
@ -101,7 +103,8 @@ function Addresses() {
: { flexGrow: 1 }
}
ListEmptyComponent={emptyView}
keyExtractor={item => item._id}
// keyExtractor={(item) => item._id}
keyExtractor={(item, index) => String(index)}
ItemSeparatorComponent={() => <View style={styles.line} />}
ListHeaderComponent={() => <View style={alignment.MTmedium} />}
renderItem={({ item: address }) => (
@ -110,16 +113,18 @@ function Addresses() {
style={styles.width100}
onPress={() => {
navigation.navigate(NAVIGATION_SCREEN.EditAddress, {
...address
})
}}>
...address,
});
}}
>
<View style={[styles.titleAddress, styles.width100]}>
<View
style={{
alignItems: 'center',
flexDirection: 'row',
flex: 1
}}>
alignItems: "center",
flexDirection: "row",
flex: 1,
}}
>
<CustomIcon
name={addressIcons[address.label]}
size={scale(20)}
@ -128,7 +133,8 @@ function Addresses() {
<TextDefault
bold
H5
style={[alignment.MTxSmall, alignment.MLsmall]}>
style={[alignment.MTxSmall, alignment.MLsmall]}
>
{address.label}
</TextDefault>
</View>
@ -139,9 +145,10 @@ function Addresses() {
style={[styles.iconButton, alignment.MRsmall]}
onPress={() => {
navigation.navigate(NAVIGATION_SCREEN.EditAddress, {
...address
})
}}>
...address,
});
}}
>
<CustomIcon
name={ICONS_NAME.Pencil}
size={scale(20)}
@ -154,8 +161,9 @@ function Addresses() {
disabled={loadingMutation}
style={styles.iconButton}
onPress={() => {
mutate({ variables: { id: address._id } })
}}>
mutate({ variables: { id: address._id } });
}}
>
<CustomIcon
name={ICONS_NAME.Trash}
size={scale(20)}
@ -175,11 +183,12 @@ function Addresses() {
/>
<TextDefault
textColor={colors.fontSecondColor}
style={alignment.MBsmall}>
style={alignment.MBsmall}
>
All rights are reserved by Enatega
</TextDefault>
</View>
</WrapperView>
)
);
}
export default React.memo(Addresses)
export default React.memo(Addresses);

88
Customer App/src/screens/CartAddress/CartAddress.js
View File

@ -1,56 +1,56 @@
import { useMutation } from '@apollo/react-hooks'
import { useNavigation, useTheme } from '@react-navigation/native'
import gql from 'graphql-tag'
import React, { useContext, useLayoutEffect } from 'react'
import { FlatList, TouchableOpacity, View } from 'react-native'
import i18n from '../../../i18n'
import { selectAddress } from '../../apollo/server'
import { useMutation } from "@apollo/react-hooks";
import { useNavigation, useTheme } from "@react-navigation/native";
import gql from "graphql-tag";
import React, { useContext, useLayoutEffect } from "react";
import { FlatList, TouchableOpacity, View } from "react-native";
import i18n from "../../../i18n";
import { selectAddress } from "../../apollo/server";
import {
CustomIcon,
RightButton,
TextDefault,
WrapperView
} from '../../components'
import RadioButton from '../../components/FdRadioBtn/RadioBtn'
import UserContext from '../../context/User'
import { alignment } from '../../utils/alignment'
import { ICONS_NAME, NAVIGATION_SCREEN } from '../../utils/constant'
import { scale } from '../../utils/scaling'
import useStyle from './styles'
WrapperView,
} from "../../components";
import RadioButton from "../../components/FdRadioBtn/RadioBtn";
import UserContext from "../../context/User";
import { alignment } from "../../utils/alignment";
import { ICONS_NAME, NAVIGATION_SCREEN } from "../../utils/constant";
import { scale } from "../../utils/scaling";
import useStyle from "./styles";
const SELECT_ADDRESS = gql`
${selectAddress}
`
`;
function CartAddresses() {
const { colors } = useTheme()
const styles = useStyle()
const navigation = useNavigation()
const { profile } = useContext(UserContext)
const { colors } = useTheme();
const styles = useStyle();
const navigation = useNavigation();
const { profile } = useContext(UserContext);
const [mutate] = useMutation(SELECT_ADDRESS, { onError })
const [mutate] = useMutation(SELECT_ADDRESS, { onError });
useLayoutEffect(() => {
navigation.setOptions({
title: i18n.t('myAddresses'),
title: i18n.t("myAddresses"),
headerRight: () => (
<RightButton
icon={ICONS_NAME.Plus}
iconSize={scale(18)}
onPress={() => navigation.navigate(NAVIGATION_SCREEN.NewAddress)}
/>
)
})
}, [navigation])
),
});
}, [navigation]);
function onError(error) {
console.log(error)
console.log(error);
}
const onSelectAddress = address => {
mutate({ variables: { id: address._id } })
navigation.goBack()
}
const onSelectAddress = (address) => {
mutate({ variables: { id: address._id } });
navigation.goBack();
};
return (
<WrapperView>
@ -59,7 +59,7 @@ function CartAddresses() {
showsVerticalScrollIndicator={false}
style={styles.flex}
data={profile.addresses}
keyExtractor={item => item._id}
keyExtractor={(item, index) => String(index)}
contentContainerStyle={styles.contentContainer}
ItemSeparatorComponent={() => <View style={styles.line} />}
ListHeaderComponent={() => <View style={{ ...alignment.MTmedium }} />}
@ -69,8 +69,9 @@ function CartAddresses() {
activeOpacity={0.7}
style={styles.width100}
onPress={() => {
onSelectAddress(address)
}}>
onSelectAddress(address);
}}
>
<View style={styles.width100}>
<View style={[styles.titleAddress, styles.width100]}>
<View style={[styles.homeIcon]}>
@ -78,14 +79,14 @@ function CartAddresses() {
size={10}
outerColor={colors.radioOuterColor}
innerColor={colors.radioColor}
animation={'bounceIn'}
animation={"bounceIn"}
isSelected={address.selected}
onPress={() => {
onSelectAddress(address)
onSelectAddress(address);
}}
/>
</View>
<TextDefault style={{ width: '70%' }} H5 bold>
<TextDefault style={{ width: "70%" }} H5 bold>
{address.label}
</TextDefault>
<TouchableOpacity
@ -93,9 +94,10 @@ function CartAddresses() {
style={styles.editButton}
onPress={() =>
navigation.navigate(NAVIGATION_SCREEN.EditAddress, {
...address
...address,
})
}>
}
>
<CustomIcon
name={ICONS_NAME.Pencil}
size={scale(20)}
@ -108,13 +110,15 @@ function CartAddresses() {
<TextDefault
line={4}
textColor={colors.fontSecondColor}
bold>
bold
>
{address.delivery_address}
</TextDefault>
<TextDefault
line={3}
textColor={colors.fontSecondColor}
bold>
bold
>
{address.details}
</TextDefault>
</View>
@ -125,7 +129,7 @@ function CartAddresses() {
/>
</View>
</WrapperView>
)
);
}
export default CartAddresses
export default CartAddresses;

138
Customer App/src/screens/Chat/Chat.js
View File

@ -1,90 +1,90 @@
import { Feather, FontAwesome } from '@expo/vector-icons'
import { useNavigation, useTheme } from '@react-navigation/native'
import React, { useCallback, useEffect, useState } from 'react'
import { Keyboard, View } from 'react-native'
import { Feather, FontAwesome } from "@expo/vector-icons";
import { useNavigation, useTheme } from "@react-navigation/native";
import React, { useCallback, useEffect, useState } from "react";
import { Keyboard, View } from "react-native";
import {
Bubble,
GiftedChat,
InputToolbar,
Send
} from 'react-native-gifted-chat'
import { TextDefault, WrapperView } from '../../components'
import { alignment } from '../../utils/alignment'
import { scale } from '../../utils/scaling'
import useStyle from './styles'
Send,
} from "react-native-gifted-chat";
import { TextDefault, WrapperView } from "../../components";
import { alignment } from "../../utils/alignment";
import { scale } from "../../utils/scaling";
import useStyle from "./styles";
const UserInfo = {
_id: 1,
name: 'Jason',
active: true
}
name: "Jason",
active: true,
};
function Chat() {
const styles = useStyle()
const { colors } = useTheme()
const navigation = useNavigation()
const [messages, setMessages] = useState([])
const [isTyping, setIsTyping] = useState(false)
const styles = useStyle();
const { colors } = useTheme();
const navigation = useNavigation();
const [messages, setMessages] = useState([]);
const [isTyping, setIsTyping] = useState(false);
useEffect(() => {
Keyboard.addListener('keyboardDidShow', _keyboardDidShow)
Keyboard.addListener('keyboardDidHide', _keyboardDidHide)
Keyboard.addListener("keyboardDidShow", _keyboardDidShow);
Keyboard.addListener("keyboardDidHide", _keyboardDidHide);
// cleanup function
return () => {
Keyboard.removeListener('keyboardDidShow', _keyboardDidShow)
Keyboard.removeListener('keyboardDidHide', _keyboardDidHide)
}
}, [])
Keyboard.remove("keyboardDidShow", _keyboardDidShow);
Keyboard.remove("keyboardDidHide", _keyboardDidHide);
};
}, []);
const _keyboardDidShow = () => setIsTyping(true)
const _keyboardDidHide = () => setIsTyping(false)
const _keyboardDidShow = () => setIsTyping(true);
const _keyboardDidHide = () => setIsTyping(false);
useEffect(() => {
navigation.setOptions({
title: 'Chat'
})
title: "Chat",
});
setMessages([
{
_id: 1,
text: 'How can I help you?',
text: "How can I help you?",
sent: true,
received: true,
createdAt: new Date(),
user: {
_id: 2,
name: 'React Native',
avatar: 'https://placeimg.com/140/140/any'
}
}
])
}, [navigation])
name: "React Native",
avatar: "https://placeimg.com/140/140/any",
},
},
]);
}, [navigation]);
const onSend = useCallback((messages = []) => {
setMessages(previousMessages =>
setMessages((previousMessages) =>
GiftedChat.append(previousMessages, messages)
)
}, [])
);
}, []);
const renderBubble = props => {
const renderBubble = (props) => {
return (
<Bubble
{...props}
textStyle={{
right: {
color: colors.fontMainColor
color: colors.fontMainColor,
},
left: {
color: colors.fontMainColor
}
color: colors.fontMainColor,
},
}}
bottomContainerStyle={{
right: {
...alignment.PTxSmall
...alignment.PTxSmall,
},
left: {
...alignment.PTxSmall
}
...alignment.PTxSmall,
},
}}
wrapperStyle={{
right: {
@ -99,11 +99,11 @@ function Chat() {
shadowColor: colors.shadowColor,
shadowOffset: {
width: 0,
height: 1
height: 1,
},
shadowOpacity: 0.2,
shadowRadius: 2,
elevation: 3
elevation: 3,
},
left: {
minWidth: 150,
@ -117,36 +117,36 @@ function Chat() {
shadowColor: colors.shadowColor,
shadowOffset: {
width: 0,
height: 1
height: 1,
},
shadowOpacity: 0.2,
shadowRadius: 2,
elevation: 3
}
elevation: 3,
},
}}
/>
)
}
);
};
const renderSend = props => (
const renderSend = (props) => (
<Send {...props} containerStyle={styles.sendBtn}>
<View style={styles.rightBtn}>
<Feather
name={'send'}
name={"send"}
color={colors.buttonText}
size={scale(17)}
style={{
transform: [
{ rotateZ: '45deg' },
{ rotateZ: "45deg" },
{ translateY: 2 },
{ translateX: -1 }
]
{ translateX: -1 },
],
}}
/>
</View>
</Send>
)
const customtInputToolbar = props => {
);
const customtInputToolbar = (props) => {
return (
<InputToolbar
{...props}
@ -154,8 +154,8 @@ function Chat() {
renderSend={renderSend}
render
/>
)
}
);
};
return (
<WrapperView>
@ -166,7 +166,7 @@ function Chat() {
color={UserInfo.active ? colors.active : colors.fontSecondColor}
/>
<TextDefault medium H5 style={alignment.PLsmall}>
{UserInfo.active ? UserInfo.name : 'Offline'}
{UserInfo.active ? UserInfo.name : "Offline"}
</TextDefault>
</View>
<GiftedChat
@ -175,7 +175,7 @@ function Chat() {
user={UserInfo}
isTyping={isTyping}
messages={messages}
onSend={messages => onSend(messages)}
onSend={(messages) => onSend(messages)}
renderAvatar={() => null}
renderBubble={renderBubble}
renderInputToolbar={customtInputToolbar}
@ -192,20 +192,20 @@ function Chat() {
// }
timeTextStyle={{
left: {
width: '100%',
width: "100%",
color: colors.fontMainColor,
fontSize: 11,
textAlign: 'right'
textAlign: "right",
},
right: {
color: colors.fontMainColor,
fontSize: 11
}
fontSize: 11,
},
}}
/>
</View>
</WrapperView>
)
);
}
export default Chat
export default Chat;

294
Customer App/src/screens/CreateAccount/CreateAccount.js
View File

@ -1,113 +1,117 @@
import { useMutation } from '@apollo/react-hooks'
import { FontAwesome } from '@expo/vector-icons'
import { useNavigation, useTheme } from '@react-navigation/native'
import * as AppAuth from 'expo-app-auth'
import * as AppleAuthentication from 'expo-apple-authentication'
import Constants from 'expo-constants'
import * as Facebook from 'expo-facebook'
import * as Google from 'expo-google-app-auth'
import * as Notifications from 'expo-notifications'
import gql from 'graphql-tag'
import React, { useContext, useEffect, useState } from 'react'
import { Platform, TouchableOpacity, View } from 'react-native'
import getEnvVars from '../../../environment'
import { login } from '../../apollo/server'
import { useMutation } from "@apollo/react-hooks";
import { FontAwesome } from "@expo/vector-icons";
import { useNavigation, useTheme } from "@react-navigation/native";
import * as AppleAuthentication from "expo-apple-authentication";
import Constants from "expo-constants";
//import * as Google from 'expo-google-app-auth'
import * as Google from "expo-auth-session/providers/google";
import * as Notifications from "expo-notifications";
import gql from "graphql-tag";
import React, { useContext, useEffect, useState } from "react";
import { Platform, TouchableOpacity, View } from "react-native";
import getEnvVars from "../../../environment";
import { login } from "../../apollo/server";
import {
EnategaImage,
FdEmailBtn,
FdFacebookBtn,
FdGoogleBtn,
FlashMessage,
RegistrationHeader,
Spinner,
TextDefault,
WrapperView
} from '../../components'
import UserContext from '../../context/User'
import { alignment } from '../../utils/alignment'
import Analytics from '../../utils/analytics'
import { NAVIGATION_SCREEN } from '../../utils/constant'
import { scale } from '../../utils/scaling'
import useStyle from './styles'
WrapperView,
} from "../../components";
import UserContext from "../../context/User";
import { alignment } from "../../utils/alignment";
import Analytics from "../../utils/analytics";
import { NAVIGATION_SCREEN } from "../../utils/constant";
import { scale } from "../../utils/scaling";
import useStyle from "./styles";
import ApolloClient from "apollo-client";
const { IOS_CLIENT_ID_GOOGLE, ANDROID_CLIENT_ID_GOOGLE, FACEBOOK_APP_ID } =
getEnvVars()
const {
IOS_CLIENT_ID_GOOGLE,
ANDROID_CLIENT_ID_GOOGLE,
Expo_CLIENT_ID_GOOGLE,
} = getEnvVars();
const LOGIN = gql`
${login}
`
`;
const Logo = require('../../../assets/logo.png')
const Logo = require("../../../assets/logo.png");
const CreateAccount = () => {
const styles = useStyle()
const { colors } = useTheme()
const navigation = useNavigation()
const [enableApple, setEnableApple] = useState(false)
const [loginButton, loginButtonSetter] = useState(null)
const [loading, setLoading] = useState(false)
const styles = useStyle();
const { colors } = useTheme();
const navigation = useNavigation();
const [enableApple, setEnableApple] = useState(false);
const [loginButton, loginButtonSetter] = useState(null);
const [loading, setLoading] = useState(false);
const { setTokenAsync } = useContext(UserContext)
const { setTokenAsync } = useContext(UserContext);
useEffect(() => {
checkIfSupportsAppleAuthentication()
}, [])
checkIfSupportsAppleAuthentication();
}, []);
const [mutate] = useMutation(LOGIN, { onCompleted, onError })
const [mutate] = useMutation(LOGIN, { onCompleted, onError });
async function checkIfSupportsAppleAuthentication() {
setEnableApple(await AppleAuthentication.isAvailableAsync())
setEnableApple(await AppleAuthentication.isAvailableAsync());
}
async function onCompleted(data) {
try {
const trackingOpts = {
id: data.login.userId,
usernameOrEmail: data.login.email
}
Analytics.identify(data.login.userId, trackingOpts)
Analytics.track(Analytics.events.USER_CREATED_ACCOUNT, trackingOpts)
setTokenAsync(data.login.token)
navigation.navigate(NAVIGATION_SCREEN.Menu)
usernameOrEmail: data.login.email,
};
Analytics.identify(data.login.userId, trackingOpts);
Analytics.track(Analytics.events.USER_CREATED_ACCOUNT, trackingOpts);
setTokenAsync(data.login.token);
navigation.navigate(NAVIGATION_SCREEN.Menu);
} catch (e) {
console.log(e)
console.log(e);
} finally {
setLoading(false)
setLoading(false);
}
}
function onError(error) {
try {
console.log(JSON.stringify(error))
console.log(JSON.stringify(error));
FlashMessage({
message: error.graphQLErrors[0].message
})
loginButtonSetter(null)
message: error.graphQLErrors[0].message,
});
loginButtonSetter(null);
} catch (e) {
console.log(e)
console.log(e);
} finally {
setLoading(false)
setLoading(false);
}
}
async function mutateLogin(user) {
setLoading(true)
let notificationToken = null
setLoading(true);
let notificationToken = null;
if (Constants.isDevice) {
const { status: existingStatus } =
await Notifications.getPermissionsAsync()
if (existingStatus === 'granted') {
notificationToken = (await Notifications.getExpoPushTokenAsync()).data
await Notifications.getPermissionsAsync();
if (existingStatus === "granted") {
notificationToken = (await Notifications.getExpoPushTokenAsync()).data;
}
}
mutate({ variables: { ...user, notificationToken } })
mutate({ variables: { ...user, notificationToken } });
}
function renderAppleAction() {
if (loading && loginButton === 'Apple') {
if (loading && loginButton === "Apple") {
return (
<View style={styles.buttonBackground}>
<Spinner backColor="rgba(0,0,0,0.1)" spinnerColor={colors.tagColor} />
</View>
)
);
}
return (
<TouchableOpacity
@ -117,36 +121,38 @@ const CreateAccount = () => {
const credential = await AppleAuthentication.signInAsync({
requestedScopes: [
AppleAuthentication.AppleAuthenticationScope.FULL_NAME,
AppleAuthentication.AppleAuthenticationScope.EMAIL
]
})
AppleAuthentication.AppleAuthenticationScope.EMAIL,
],
});
console.log(credential);
if (credential) {
const user = {
appleId: credential.user,
phone: '',
phone: "",
email: credential.email,
password: '',
password: "",
name:
credential.fullName.givenName +
' ' +
" " +
credential.fullName.familyName,
picture: '',
type: 'apple'
picture: "",
type: "apple",
};
mutateLogin(user);
}
mutateLogin(user)
}
loginButtonSetter('Apple')
loginButtonSetter("Apple");
// signed in
} catch (e) {
if (e.code === 'ERR_CANCELLED') {
if (e.code === "ERR_CANCELLED") {
// handle that the user canceled the sign-in flow
loginButtonSetter(null)
loginButtonSetter(null);
} else {
// handle other errors
loginButtonSetter(null)
loginButtonSetter(null);
}
}
}}>
}}
>
<FontAwesome
style={styles.marginLeft5}
name="apple"
@ -157,116 +163,78 @@ const CreateAccount = () => {
Signup with Apple
</TextDefault>
</TouchableOpacity>
)
);
}
async function _facebookSignup() {
try {
await Facebook.initializeAsync({ appId: FACEBOOK_APP_ID })
} catch (err) {
console.log('err', err)
}
try {
const { type, token } = await Facebook.logInWithReadPermissionsAsync({
permissions: ['public_profile', 'email']
})
if (type === 'success') {
// Get the user's name using Facebook's Graph API
const response = await fetch(
`https://graph.facebook.com/me?access_token=${token}&fields=email,name`
)
const user = await response.json()
return user
}
} catch (err) {
console.log('error', err)
}
}
async function _googleSignup() {
try {
const { type, user } = await Google.logInAsync({
const [googleRequest, googleResponse, googlePromptAsync] =
Google.useAuthRequest({
expoClientId: Expo_CLIENT_ID_GOOGLE,
iosClientId: IOS_CLIENT_ID_GOOGLE,
iosStandaloneAppClientId: IOS_CLIENT_ID_GOOGLE,
androidClientId: ANDROID_CLIENT_ID_GOOGLE,
androidStandaloneAppClientId: ANDROID_CLIENT_ID_GOOGLE,
redirectUrl: `${AppAuth.OAuthRedirect}:/oauth2redirect/google`,
scopes: ['profile', 'email']
})
if (type === 'success') {
/* `accessToken` is now valid and can be used to get data from the Google API with HTTP requests */
return user
}
} catch (err) {
console.log('err', err)
}
}
//redirectUrl: `${AuthSession.OAuthRedirect}:/oauth2redirect/google`,
scopes: ["profile", "email"],
...{ useProxy: true },
});
function renderFacebookAction() {
return (
<FdFacebookBtn
loadingIcon={loading && loginButton === 'Facebook'}
onPressIn={() => {
loginButtonSetter('Facebook')
}}
onPress={async() => {
const facebookUser = await _facebookSignup()
if (facebookUser) {
const googleSignUp = () => {
if (googleResponse?.type === "success") {
const { authentication } = googleResponse;
console.log(authentication.accessToken);
(async () => {
const userInfoResponse = await fetch(
"https://www.googleapis.com/oauth2/v1/userinfo?alt=json",
{
headers: { Authorization: `Bearer ${authentication.accessToken}` },
}
);
const googleUser = await userInfoResponse.json();
const user = {
facebookId: facebookUser.id,
phone: '',
email: facebookUser.email,
password: '',
name: facebookUser.name,
picture: '',
type: 'facebook'
}
mutateLogin(user)
}
}}
/>
)
phone: "",
email: googleUser.email,
password: "",
name: googleUser.name,
picture: googleUser.picture,
type: "google",
};
mutateLogin(user);
})();
}
};
useEffect(() => {
googleSignUp();
}, [googleResponse]);
function renderGoogleAction() {
return (
<FdGoogleBtn
loadingIcon={loading && loginButton === 'Google'}
loadingIcon={loading && loginButton === "Google"}
onPressIn={() => {
loginButtonSetter('Google')
}}
onPress={async() => {
const googleUser = await _googleSignup()
if (googleUser) {
const user = {
phone: '',
email: googleUser.email,
password: '',
name: googleUser.name,
picture: googleUser.photoUrl,
type: 'google'
}
mutateLogin(user)
}
loginButtonSetter("Google");
}}
disabled={!googleRequest}
onPress={() => googlePromptAsync()}
/>
)
);
}
function renderEmailAction() {
return (
<FdEmailBtn
loadingIcon={loading && loginButton === 'Email'}
loadingIcon={loading && loginButton === "Email"}
onPress={() => {
loginButtonSetter('Email')
navigation.navigate(NAVIGATION_SCREEN.Register)
loginButtonSetter("Email");
navigation.navigate(NAVIGATION_SCREEN.Register);
}}
/>
)
);
}
return (
<WrapperView>
<View style={[styles.mainContainer, styles.flex]}>
<RegistrationHeader title={'Get Started'} />
<RegistrationHeader title={"Get Started"} />
<View style={styles.subContainer}>
<View style={[styles.flex, styles.upperContainer]}>
<EnategaImage
@ -276,7 +244,6 @@ const CreateAccount = () => {
/>
</View>
<View style={styles.width100}>
{Platform.OS === 'ios' && renderFacebookAction()}
<View style={alignment.MTmedium}>{renderGoogleAction()}</View>
{enableApple && (
<View style={alignment.MTmedium}>{renderAppleAction()}</View>
@ -286,7 +253,8 @@ const CreateAccount = () => {
<TouchableOpacity
activeOpacity={0.7}
style={styles.alreadyBtn}
onPress={() => navigation.navigate(NAVIGATION_SCREEN.Login)}>
onPress={() => navigation.navigate(NAVIGATION_SCREEN.Login)}
>
<TextDefault style={[alignment.MLsmall]} bold>
Already a member? Log in
</TextDefault>
@ -295,6 +263,6 @@ const CreateAccount = () => {
</View>
</View>
</WrapperView>
)
}
export default CreateAccount
);
};
export default CreateAccount;

66
Customer App/src/screens/Menu/Menu.js
View File

@ -1,51 +1,51 @@
import { useQuery } from '@apollo/react-hooks'
import { useNavigation } from '@react-navigation/native'
import gql from 'graphql-tag'
import React, { useContext, useLayoutEffect } from 'react'
import { FlatList, View } from 'react-native'
import { categories } from '../../apollo/server'
import EmptyFood from '../../assets/images/SVG/imageComponents/EmptyFood'
import { useQuery } from "@apollo/react-hooks";
import { useNavigation } from "@react-navigation/native";
import gql from "graphql-tag";
import React, { useContext, useLayoutEffect } from "react";
import { FlatList, View } from "react-native";
import { categories } from "../../apollo/server";
import EmptyFood from "../../assets/images/SVG/imageComponents/EmptyFood";
import {
MenuCard,
Spinner,
StatusCard,
TextDefault,
TextError,
WrapperView
} from '../../components'
import UserContext from '../../context/User'
import { alignment } from '../../utils/alignment'
import { NAVIGATION_SCREEN } from '../../utils/constant'
import { scale } from '../../utils/scaling'
import useStyle from './styles'
WrapperView,
} from "../../components";
import UserContext from "../../context/User";
import { alignment } from "../../utils/alignment";
import { NAVIGATION_SCREEN } from "../../utils/constant";
import { scale } from "../../utils/scaling";
import useStyle from "./styles";
// constants
const CATEGORIES = gql`
${categories}
`
`;
function Menu() {
const styles = useStyle()
const navigation = useNavigation()
const { isLoggedIn, profile } = useContext(UserContext)
const { data, refetch, networkStatus, loading, error } = useQuery(CATEGORIES)
const styles = useStyle();
const navigation = useNavigation();
const { isLoggedIn, profile } = useContext(UserContext);
const { data, refetch, networkStatus, loading, error } = useQuery(CATEGORIES);
useLayoutEffect(() => {
navigation.setOptions({
title: 'Home'
})
}, [])
title: "Home",
});
}, []);
function emptyView() {
if (loading) {
return <Spinner />
return <Spinner />;
} else if (error) {
return (
<TextError
text={error ? error.message : 'No Foods'}
text={error ? error.message : "No Foods"}
backColor="transparent"
/>
)
);
} else {
return (
<View style={styles.emptyContainer}>
@ -54,7 +54,7 @@ function Menu() {
No item found
</TextDefault>
</View>
)
);
}
}
@ -65,7 +65,7 @@ function Menu() {
style={styles.flex}
contentContainerStyle={styles.contentContainer}
showsVerticalScrollIndicator={false}
keyExtractor={item => item._id}
keyExtractor={(item, index) => String(index)}
ListEmptyComponent={emptyView()}
data={loading ? [] : error ? [] : data.categories}
refreshing={networkStatus === 4}
@ -80,28 +80,28 @@ function Menu() {
Featured
</TextDefault>
</>
)
);
}
return null
return null;
}}
renderItem={({ item }) => (
<View key={item._id} style={styles.cardViewContainer}>
<MenuCard
onPress={() =>
navigation.navigate(NAVIGATION_SCREEN.MenuItems, {
...item
...item,
})
}
title={item.title}
description={item.description}
image={item.img_menu || ''}
image={item.img_menu || ""}
/>
</View>
)}
/>
</View>
</WrapperView>
)
);
}
export default React.memo(Menu)
export default React.memo(Menu);

2
Customer App/src/screens/MenuItems/MenuItems.js
View File

@ -247,7 +247,7 @@ function MenuItems() {
contentContainerStyle={styles.contentContaienr}
showsVerticalScrollIndicator={false}
ListHeaderComponent={renderListHeader()}
keyExtractor={(item) => item._id}
keyExtractor={(item, index) => String(index)}
ListEmptyComponent={emptyView}
data={loading ? [] : error ? [] : sortData(data.foodByCategory)}
refreshing={networkStatus === 4}

123
Customer App/src/screens/MyOrders/MyOrders.js
View File

@ -1,10 +1,10 @@
import { useApolloClient } from '@apollo/react-hooks'
import { useNavigation, useTheme } from '@react-navigation/native'
import React, { useContext, useLayoutEffect } from 'react'
import { FlatList, TouchableOpacity, View } from 'react-native'
import uuid from 'uuid'
import i18n from '../../../i18n'
import EmptyOrder from '../../assets/images/SVG/imageComponents/EmptyOrder'
import { useApolloClient } from "@apollo/react-hooks";
import { useNavigation, useTheme } from "@react-navigation/native";
import React, { useContext, useLayoutEffect } from "react";
import { FlatList, TouchableOpacity, View } from "react-native";
import uuid from "uuid";
import i18n from "../../../i18n";
import EmptyOrder from "../../assets/images/SVG/imageComponents/EmptyOrder";
import {
ActiveOrders,
CustomIcon,
@ -12,24 +12,24 @@ import {
Spinner,
TextDefault,
TextError,
WrapperView
} from '../../components'
import ConfigurationContext from '../../context/Configuration'
import UserContext from '../../context/User'
import { alignment } from '../../utils/alignment'
import { ICONS_NAME, NAVIGATION_SCREEN } from '../../utils/constant'
import { scale } from '../../utils/scaling'
import useStyle from './style'
WrapperView,
} from "../../components";
import ConfigurationContext from "../../context/Configuration";
import UserContext from "../../context/User";
import { alignment } from "../../utils/alignment";
import { ICONS_NAME, NAVIGATION_SCREEN } from "../../utils/constant";
import { scale } from "../../utils/scaling";
import useStyle from "./style";
const orderStatusActive = ['PENDING', 'PICKED', 'ACCEPTED']
const orderStatusInactive = ['DELIVERED', 'COMPLETED']
const orderStatusActive = ["PENDING", "PICKED", "ACCEPTED"];
const orderStatusInactive = ["DELIVERED", "COMPLETED"];
function MyOrders() {
const styles = useStyle()
const { colors } = useTheme()
const client = useApolloClient()
const navigation = useNavigation()
const configuration = useContext(ConfigurationContext)
const styles = useStyle();
const { colors } = useTheme();
const client = useApolloClient();
const navigation = useNavigation();
const configuration = useContext(ConfigurationContext);
const {
orders,
loadingOrders,
@ -37,47 +37,47 @@ function MyOrders() {
fetchOrders,
fetchMoreOrdersFunc,
networkStatusOrders,
updateCart
} = useContext(UserContext)
updateCart,
} = useContext(UserContext);
useLayoutEffect(() => {
navigation.setOptions({
headerTitle: i18n.t('titleOrders'),
headerRight: null
})
}, [navigation])
headerTitle: i18n.t("titleOrders"),
headerRight: null,
});
}, [navigation]);
// add items to cart and navigate to cart screen
async function onReOrder({ order }) {
const data = {
cartItems: order.items.map(item => {
cartItems: order.items.map((item) => {
return {
...item.food,
key: uuid.v4(),
__typename: 'CartItem',
__typename: "CartItem",
variation: {
__typename: 'ItemVariation',
_id: item.variation._id
__typename: "ItemVariation",
_id: item.variation._id,
},
quantity: item.quantity,
addons: item.addons.map(addon => ({
addons: item.addons.map((addon) => ({
...addon,
__typename: 'ItemAddon',
__typename: "ItemAddon",
options: addon.options.map(({ _id }) => ({
_id,
__typename: 'ItemOption'
}))
}))
}
})
}
await updateCart(data.cartItems)
navigation.navigate(NAVIGATION_SCREEN.Cart)
__typename: "ItemOption",
})),
})),
};
}),
};
await updateCart(data.cartItems);
navigation.navigate(NAVIGATION_SCREEN.Cart);
}
function emptyView() {
if (loadingOrders) return <Spinner visible={loadingOrders} />
if (errorOrders) return <TextError text={errorOrders.message} />
if (loadingOrders) return <Spinner visible={loadingOrders} />;
if (errorOrders) return <TextError text={errorOrders.message} />;
else {
return (
<View style={styles.subContainerImage}>
@ -92,13 +92,14 @@ function MyOrders() {
<TouchableOpacity
activeOpacity={0.7}
style={styles.emptyButton}
onPress={() => navigation.navigate(NAVIGATION_SCREEN.Menu)}>
onPress={() => navigation.navigate(NAVIGATION_SCREEN.Menu)}
>
<TextDefault textColor={colors.buttonText} bold H5 center>
Start Shopping
</TextDefault>
</TouchableOpacity>
</View>
)
);
}
}
@ -108,7 +109,7 @@ function MyOrders() {
data={
loadingOrders || errorOrders
? []
: orders.filter(o => orderStatusInactive.includes(o.order_status))
: orders.filter((o) => orderStatusInactive.includes(o.order_status))
}
style={styles.container}
contentContainerStyle={styles.contentContainer}
@ -116,17 +117,18 @@ function MyOrders() {
ListHeaderComponent={
<ActiveOrders
navigation={navigation}
activeOrders={orders.filter(o =>
activeOrders={orders.filter((o) =>
orderStatusActive.includes(o.order_status)
)}
pastOrders={orders.filter(o =>
pastOrders={orders.filter((o) =>
orderStatusInactive.includes(o.order_status)
)}
loading={loadingOrders}
error={errorOrders}
/>
}
keyExtractor={item => item._id}
//keyExtractor={(item) => item._id}
keyExtractor={(item, index) => String(index)}
refreshing={networkStatusOrders === 4}
onRefresh={() => networkStatusOrders === 7 && fetchOrders()}
renderItem={({ item }) => (
@ -135,9 +137,10 @@ function MyOrders() {
onPress={() =>
navigation.navigate(NAVIGATION_SCREEN.OrderDetail, {
_id: item._id,
currency_symbol: configuration.currency_symbol
currency_symbol: configuration.currency_symbol,
})
}>
}
>
<View style={styles.subContainer}>
<View style={styles.imgContainer}>
<EnategaImage
@ -148,7 +151,7 @@ function MyOrders() {
</View>
<View style={styles.infoContainer}>
<TextDefault H5 bold style={alignment.MBxSmall}>
{'ID: '}
{"ID: "}
{item.order_id}
</TextDefault>
<TextDefault line={3} textColor={colors.tagColor} H5 medium>
@ -163,9 +166,10 @@ function MyOrders() {
<TouchableOpacity
activeOpacity={0.8}
onPress={() => onReOrder({ order: item, client })}
style={styles.subContainerRight}>
style={styles.subContainerRight}
>
<View>
<View style={{ alignSelf: 'center' }}>
<View style={{ alignSelf: "center" }}>
<CustomIcon
name={ICONS_NAME.Refresh}
size={scale(28)}
@ -176,8 +180,9 @@ function MyOrders() {
textColor={colors.text}
style={alignment.MTxSmall}
bold
center>
{'Re-Order'}
center
>
{"Re-Order"}
</TextDefault>
</View>
</TouchableOpacity>
@ -187,7 +192,7 @@ function MyOrders() {
onEndReached={fetchMoreOrdersFunc}
/>
</WrapperView>
)
);
}
export default MyOrders
export default MyOrders;

282
Customer App/src/screens/Settings/Settings.js
View File

@ -1,207 +1,207 @@
import { useMutation } from '@apollo/react-hooks'
import AsyncStorage from '@react-native-async-storage/async-storage'
import { useNavigation, useTheme } from '@react-navigation/native'
import Constants from 'expo-constants'
import * as Device from 'expo-device'
import * as Localization from 'expo-localization'
import * as Notifications from 'expo-notifications'
import * as Updates from 'expo-updates'
import gql from 'graphql-tag'
import React, { useContext, useEffect, useRef, useState } from 'react'
import { useMutation } from "@apollo/react-hooks";
import AsyncStorage from "@react-native-async-storage/async-storage";
import { useNavigation, useTheme } from "@react-navigation/native";
import Constants from "expo-constants";
import * as Device from "expo-device";
import * as Localization from "expo-localization";
import * as Notifications from "expo-notifications";
import * as Updates from "expo-updates";
import gql from "graphql-tag";
import React, { useContext, useEffect, useRef, useState } from "react";
import {
AppState,
Linking,
Platform,
StyleSheet,
TouchableOpacity,
View
} from 'react-native'
import { Modalize } from 'react-native-modalize'
import i18n from '../../../i18n'
View,
} from "react-native";
import { Modalize } from "react-native-modalize";
import i18n from "../../../i18n";
import {
profile,
pushToken,
updateNotificationStatus
} from '../../apollo/server'
updateNotificationStatus,
} from "../../apollo/server";
import {
CustomIcon,
FlashMessage,
Spinner,
TextDefault,
WrapperView
} from '../../components'
import SwitchBtn from '../../components/FdSwitch/SwitchBtn'
import UserContext from '../../context/User'
import { alignment } from '../../utils/alignment'
import { ICONS_NAME } from '../../utils/constant'
import { scale } from '../../utils/scaling'
import SettingModal from './components/SettingModal'
import useStyle from './styles'
WrapperView,
} from "../../components";
import SwitchBtn from "../../components/FdSwitch/SwitchBtn";
import UserContext from "../../context/User";
import { alignment } from "../../utils/alignment";
import { ICONS_NAME } from "../../utils/constant";
import { scale } from "../../utils/scaling";
import SettingModal from "./components/SettingModal";
import useStyle from "./styles";
const languageTypes = [
{ value: 'English', code: 'en', index: 0 },
{ value: 'français', code: 'fr', index: 1 },
{ value: 'ភាសាខ្មែរ', code: 'km', index: 2 },
{ value: '中文', code: 'zh', index: 3 },
{ value: 'Deutsche', code: 'de', index: 4 }
]
{ value: "English", code: "en", index: 0 },
{ value: "français", code: "fr", index: 1 },
{ value: "ភាសាខ្មែរ", code: "km", index: 2 },
{ value: "中文", code: "zh", index: 3 },
{ value: "Deutsche", code: "de", index: 4 },
];
const PUSH_TOKEN = gql`
${pushToken}
`
`;
const UPDATE_NOTIFICATION_TOKEN = gql`
${updateNotificationStatus}
`
`;
const PROFILE = gql`
${profile}
`
`;
function Settings() {
const styles = useStyle()
const { colors } = useTheme()
const navigation = useNavigation()
const { profile } = useContext(UserContext)
const styles = useStyle();
const { colors } = useTheme();
const navigation = useNavigation();
const { profile } = useContext(UserContext);
const [languageName, languageNameSetter] = useState('English')
const [languageName, languageNameSetter] = useState("English");
const [offerNotification, offerNotificationSetter] = useState(
profile.is_offer_notification
)
);
const [orderNotification, orderNotificationSetter] = useState(
profile.is_order_notification
)
const [activeRadio, activeRadioSetter] = useState(languageTypes[0].index)
);
const [activeRadio, activeRadioSetter] = useState(languageTypes[0].index);
// eslint-disable-next-line no-unused-vars
const [appState, setAppState] = useState(AppState.currentState)
const [uploadToken] = useMutation(PUSH_TOKEN)
const [appState, setAppState] = useState(AppState.currentState);
const [uploadToken] = useMutation(PUSH_TOKEN);
const [mutate, { loading }] = useMutation(UPDATE_NOTIFICATION_TOKEN, {
onCompleted,
onError,
refetchQueries: [{ query: PROFILE }]
})
const modalizeRef = useRef(null)
refetchQueries: [{ query: PROFILE }],
});
const modalizeRef = useRef(null);
useEffect(() => {
navigation.setOptions({
headerTitle: i18n.t('titleSettings'),
headerRight: null
})
selectLanguage()
checkPermission()
}, [navigation])
headerTitle: i18n.t("titleSettings"),
headerRight: null,
});
selectLanguage();
checkPermission();
}, [navigation]);
const _handleAppStateChange = async nextAppState => {
if (nextAppState === 'active') {
let token = null
const permission = await getPermission()
if (permission === 'granted') {
const _handleAppStateChange = async (nextAppState) => {
if (nextAppState === "active") {
let token = null;
const permission = await getPermission();
if (permission === "granted") {
if (!profile.notificationToken) {
token = (await Notifications.getExpoPushTokenAsync()).data
uploadToken({ variables: { token } })
token = (await Notifications.getExpoPushTokenAsync()).data;
uploadToken({ variables: { token } });
}
offerNotificationSetter(profile.is_offer_notification)
orderNotificationSetter(profile.is_order_notification)
offerNotificationSetter(profile.is_offer_notification);
orderNotificationSetter(profile.is_order_notification);
} else {
offerNotificationSetter(false)
orderNotificationSetter(false)
offerNotificationSetter(false);
orderNotificationSetter(false);
}
}
setAppState(nextAppState)
}
setAppState(nextAppState);
};
useEffect(() => {
AppState.addEventListener('change', _handleAppStateChange)
AppState.addEventListener("change", _handleAppStateChange);
return () => {
AppState.removeEventListener('change', _handleAppStateChange)
}
}, [])
AppState.remove("change", _handleAppStateChange);
};
}, []);
async function checkPermission() {
const permission = await getPermission()
if (permission !== 'granted') {
offerNotificationSetter(false)
orderNotificationSetter(false)
const permission = await getPermission();
if (permission !== "granted") {
offerNotificationSetter(false);
orderNotificationSetter(false);
} else {
offerNotificationSetter(profile.is_offer_notification)
orderNotificationSetter(profile.is_order_notification)
offerNotificationSetter(profile.is_offer_notification);
orderNotificationSetter(profile.is_order_notification);
}
}
async function getPermission() {
const { status } = await Notifications.getPermissionsAsync()
return status
const { status } = await Notifications.getPermissionsAsync();
return status;
}
async function selectLanguage() {
const lang = await AsyncStorage.getItem('enatega-language')
const lang = await AsyncStorage.getItem("enatega-language");
if (lang) {
const defLang = languageTypes.findIndex(el => el.code === lang)
const langName = languageTypes[defLang].value
activeRadioSetter(defLang)
languageNameSetter(langName)
const defLang = languageTypes.findIndex((el) => el.code === lang);
const langName = languageTypes[defLang].value;
activeRadioSetter(defLang);
languageNameSetter(langName);
}
}
const onSelectedLanguage = async active => {
const languageInd = active
if (Platform.OS === 'android') {
const localization = await Localization.getLocalizationAsync()
localization.locale = languageTypes[languageInd].code
const onSelectedLanguage = async (active) => {
const languageInd = active;
if (Platform.OS === "android") {
const localization = await Localization.getLocalizationAsync();
localization.locale = languageTypes[languageInd].code;
await AsyncStorage.setItem(
'enatega-language',
"enatega-language",
languageTypes[languageInd].code
)
Updates.reloadAsync()
}
);
Updates.reloadAsync();
}
};
const onClose = () => {
modalizeRef.current.close()
}
modalizeRef.current.close();
};
function onCompleted() {
FlashMessage({
message: 'Notification Status Updated'
})
message: "Notification Status Updated",
});
}
function onError(error) {
try {
FlashMessage({
message: error.networkError.result.errors[0].message
})
message: error.networkError.result.errors[0].message,
});
} catch (err) {}
}
async function updateNotificationStatus(notificationCheck) {
let orderNotify, offerNotify
let orderNotify, offerNotify;
if (!Device.isDevice) {
FlashMessage({
message: 'Notification do not work on simulator'
})
return
message: "Notification do not work on simulator",
});
return;
}
const permission = await getPermission()
if (!profile.notificationToken || permission !== 'granted') {
Linking.openSettings()
const permission = await getPermission();
if (!profile.notificationToken || permission !== "granted") {
Linking.openSettings();
}
if (notificationCheck === 'offer') {
offerNotificationSetter(!offerNotification)
orderNotify = orderNotification
offerNotify = !offerNotification
if (notificationCheck === "offer") {
offerNotificationSetter(!offerNotification);
orderNotify = orderNotification;
offerNotify = !offerNotification;
}
if (notificationCheck === 'order') {
orderNotificationSetter(!orderNotification)
orderNotify = !orderNotification
offerNotify = offerNotification
if (notificationCheck === "order") {
orderNotificationSetter(!orderNotification);
orderNotify = !orderNotification;
offerNotify = offerNotification;
}
mutate({
variables: {
offerNotification: offerNotify,
orderNotification: orderNotify
}
})
orderNotification: orderNotify,
},
});
}
return (
@ -213,7 +213,7 @@ function Settings() {
)}
<View style={[styles.flex, styles.mainContainer]}>
<View style={alignment.Plarge}>
{Platform.OS === 'android' && (
{Platform.OS === "android" && (
<View style={[styles.languageContainer, styles.shadow]}>
<View style={styles.changeLanguage}>
<View style={styles.headingLanguage}>
@ -221,7 +221,8 @@ function Settings() {
numberOfLines={1}
textColor={colors.fontSecondColor}
medium
H5>
H5
>
Language
</TextDefault>
<TextDefault medium H5>
@ -230,8 +231,9 @@ function Settings() {
</View>
<TouchableOpacity
activeOpacity={0.5}
onPress={() => modalizeRef.current.open('top')}
style={styles.button}>
onPress={() => modalizeRef.current.open("top")}
style={styles.button}
>
<CustomIcon
name={ICONS_NAME.Pencil}
size={scale(22)}
@ -244,20 +246,22 @@ function Settings() {
<TouchableOpacity
activeOpacity={0.7}
onPress={() => {
updateNotificationStatus('offer')
updateNotificationStatus("offer");
}}
style={[styles.notificationContainer, styles.shadow]}>
style={[styles.notificationContainer, styles.shadow]}
>
<View style={styles.notificationChekboxContainer}>
<TextDefault
numberOfLines={1}
textColor={colors.statusSecondColor}>
{' '}
Receive Special Offers{' '}
textColor={colors.statusSecondColor}
>
{" "}
Receive Special Offers{" "}
</TextDefault>
<SwitchBtn
isEnabled={offerNotification}
onPress={() => {
updateNotificationStatus('offer')
updateNotificationStatus("offer");
}}
/>
</View>
@ -265,20 +269,22 @@ function Settings() {
<TouchableOpacity
activeOpacity={0.7}
onPress={() => {
updateNotificationStatus('order')
updateNotificationStatus("order");
}}
style={[styles.notificationContainer, styles.shadow]}>
style={[styles.notificationContainer, styles.shadow]}
>
<View style={styles.notificationChekboxContainer}>
<TextDefault
numberOfLines={1}
textColor={colors.statusSecondColor}>
{' '}
Get updates on your order status!{' '}
textColor={colors.statusSecondColor}
>
{" "}
Get updates on your order status!{" "}
</TextDefault>
<SwitchBtn
isEnabled={orderNotification}
onPress={() => {
updateNotificationStatus('order')
updateNotificationStatus("order");
}}
/>
</View>
@ -293,7 +299,8 @@ function Settings() {
<TextDefault
textColor={colors.fontSecondColor}
style={alignment.MBsmall}
center>
center
>
All rights are reserved by Enatega
</TextDefault>
@ -304,10 +311,11 @@ function Settings() {
handlePosition="inside"
avoidKeyboardLikeIOS={Platform.select({
ios: true,
android: false
android: false,
})}
keyboardAvoidingOffset={2}
keyboardAvoidingBehavior="height">
keyboardAvoidingBehavior="height"
>
<SettingModal
onClose={onClose}
onSelectedLanguage={onSelectedLanguage}
@ -315,6 +323,6 @@ function Settings() {
/>
</Modalize>
</WrapperView>
)
);
}
export default Settings
export default Settings;

59
Customer App/src/utils/analytics.js
View File

@ -1,15 +1,15 @@
import * as Amplitude from 'expo-analytics-amplitude'
import { normalizeTrackingOptions } from './analyticsUtils'
import getEnvVars from '../../environment'
import { getTrackingPermissions } from './useAppTrackingTransparency'
const { AMPLITUDE_API_KEY } = getEnvVars()
import * as Amplitude from "@amplitude/analytics-react-native";
import { normalizeTrackingOptions } from "./analyticsUtils";
import getEnvVars from "../../environment";
import { getTrackingPermissions } from "./useAppTrackingTransparency";
const { AMPLITUDE_API_KEY } = getEnvVars();
let isInitialized = false
let isInitialized = false;
export const events = {
USER_LOGGED_IN: 'USER_LOGGED_IN',
USER_LOGGED_OUT: 'USER_LOGGED_OUT',
USER_CREATED_ACCOUNT: 'USER_CREATED_ACCOUNT',
USER_LOGGED_IN: "USER_LOGGED_IN",
USER_LOGGED_OUT: "USER_LOGGED_OUT",
USER_CREATED_ACCOUNT: "USER_CREATED_ACCOUNT",
// USER_RESET_PASSWORD: 'USER_RESET_PASSWORD',
// USER_LINKED_SOCIAL: 'USER_LINKED_SOCIAL',
// USER_UPDATED_EMAIL: 'USER_UPDATED_EMAIL',
@ -20,40 +20,41 @@ export const events = {
// USER_REMOVED_PROJECT: 'USER_REMOVED_PROJECT',
// USER_OPENED_CREATION: 'USER_OPENED_CREATION',
// USER_UPDATED_SETTINGS: 'USER_UPDATED_SETTINGS',
USER_PLACED_ORDER: 'USER_PLACED_ORDER'
}
USER_PLACED_ORDER: "USER_PLACED_ORDER",
};
export async function initialize() {
const trackingStatus = await getTrackingPermissions()
if (isInitialized || !AMPLITUDE_API_KEY || trackingStatus !== 'granted') {
return
const trackingStatus = await getTrackingPermissions();
if (isInitialized || !AMPLITUDE_API_KEY || trackingStatus !== "granted") {
return;
}
await Amplitude.initializeAsync(AMPLITUDE_API_KEY)
isInitialized = true
Amplitude.init(AMPLITUDE_API_KEY);
isInitialized = true;
}
export async function identify(id, options) {
initialize()
const properties = normalizeTrackingOptions(options)
initialize();
const properties = normalizeTrackingOptions(options);
if (id) {
await Amplitude.setUserIdAsync(id)
if (properties) {
await Amplitude.setUserPropertiesAsync(properties)
}
Amplitude.Identify(properties);
//await Amplitude.setUserPropertiesAsync(properties)
} else {
await Amplitude.clearUserPropertiesAsync()
//await Amplitude.clearUserPropertiesAsync()
const identifyObj = new Amplitude.Identify();
identifyObj.remove(properties);
Amplitude.Identify(identifyObj);
}
}
export async function track(event, options) {
initialize()
const properties = normalizeTrackingOptions(options)
initialize();
const properties = normalizeTrackingOptions(options);
if (properties) {
await Amplitude.logEventWithPropertiesAsync(event, properties)
Amplitude.track(event, properties);
} else {
await Amplitude.logEventAsync(event)
Amplitude.track(event);
}
}
@ -61,5 +62,5 @@ export default {
events,
initialize,
identify,
track
}
track,
};

39
Customer App/src/utils/androidBackButton.js
View File

@ -1,34 +1,35 @@
// packages
import { BackHandler, Alert } from 'react-native'
import { BackHandler, Alert } from "react-native";
/**
* Attaches an event listener that handles the android-only hardware
* back button
* @param {Function} callback The function to call on click
*/
const handleAndroidBackButton = callback => {
BackHandler.addEventListener('hardwareBackPress', () => {
callback()
return true
})
}
const handleAndroidBackButton = (callback) => {
BackHandler.addEventListener("hardwareBackPress", () => {
callback();
return true;
});
};
/**
* Removes the event listener in order not to add a new one
* every time the view component re-mounts
*/
const removeAndroidBackButtonHandler = () => {
BackHandler.removeEventListener('hardwareBackPress')
}
// BackHandler.removeEventListener('hardwareBackPress')
BackHandler.remove("hardwareBackPress");
};
const exitAlert = () => {
Alert.alert('Confirm exit', 'Do you want to quit the app?', [
{ text: 'CANCEL', style: 'cancel' },
Alert.alert("Confirm exit", "Do you want to quit the app?", [
{ text: "CANCEL", style: "cancel" },
{
text: 'OK',
text: "OK",
onPress: () => {
BackHandler.exitApp()
}
}
])
return true
}
BackHandler.exitApp();
},
},
]);
return true;
};
export { handleAndroidBackButton, removeAndroidBackButtonHandler, exitAlert }
export { handleAndroidBackButton, removeAndroidBackButtonHandler, exitAlert };

10647
Customer App/yarn.lock
View File

File diff suppressed because it is too large Load Diff

0
Customer App/.DS_Store → CustomerApp/.DS_Store vendored
View File

15
CustomerApp/.expo/README.md Normal file
View File

@ -0,0 +1,15 @@
> Why do I have a folder named ".expo" in my project?
The ".expo" folder is created when an Expo project is started using "expo start" command.
> What do the files contain?
- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds.
- "packager-info.json": contains port numbers and process PIDs that are used to serve the application to the mobile device/simulator.
- "settings.json": contains the server configuration that is used to serve the application manifest.
> Should I commit the ".expo" folder?
No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine.
Upon project creation, the ".expo" folder is already added to your ".gitignore" file.

3
CustomerApp/.expo/devices.json Normal file
View File

@ -0,0 +1,3 @@
{
"devices": []
}

8
CustomerApp/.expo/settings.json Normal file
View File

@ -0,0 +1,8 @@
{
"hostType": "lan",
"lanType": "ip",
"dev": true,
"minify": false,
"urlRandomness": null,
"https": false
}

1
CustomerApp/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/node_modules

1
CustomerApp/.npmrc Normal file
View File

@ -0,0 +1 @@
legacy-peer-deps=true

151
CustomerApp/App.js Normal file
View File

@ -0,0 +1,151 @@
import { ApolloProvider } from '@apollo/react-hooks'
import * as Font from 'expo-font'
import * as Location from 'expo-location'
import * as Notifications from 'expo-notifications'
import * as SplashScreen from 'expo-splash-screen'
import React, { useEffect, useState } from 'react'
import {
ActivityIndicator,
BackHandler,
Platform,
StatusBar,
StyleSheet,
useColorScheme,
View
} from 'react-native'
import FlashMessage from 'react-native-flash-message'
import i18n from './i18n'
import setupApolloClient from './src/apollo/index'
import { ConfigurationProvider } from './src/context/Configuration'
import { UserProvider } from './src/context/User'
import AppContainer from './src/routes'
import { AnimatedSplash } from './src/screens'
import { COLORS, THEME } from './src/Theme'
import { exitAlert } from './src/utils/androidBackButton'
import { requestTrackingPermissions } from './src/utils/useAppTrackingTransparency'
SplashScreen.preventAutoHideAsync().catch(() => {})
export default function App() {
const colorScheme = useColorScheme()
const isDark = colorScheme === 'dark'
const [fontLoaded, setFontLoaded] = useState(false)
const [client, setupClient] = useState(null)
useEffect(() => {
requestTrackingPermissions()
}, [])
useEffect(() => {
loadAppData()
return () => {
BackHandler.removeEventListener('hardwareBackPress', exitAlert)
}
}, [])
async function loadAppData() {
const client = await setupApolloClient()
setupClient(client)
await i18n.initAsync()
// load fonts
await Font.loadAsync({
Poppin300: require('./src/assets/font/Poppin/Poppins-Light.ttf'),
Poppin400: require('./src/assets/font/Poppin/Poppins-Regular.ttf'),
Poppin500: require('./src/assets/font/Poppin/Poppins-Medium.ttf'),
Poppin600: require('./src/assets/font/Poppin/Poppins-SemiBold.ttf'),
Poppin700: require('./src/assets/font/Poppin/Poppins-Bold.ttf'),
icomoon: require('./src/assets/font/icomoon.ttf')
})
await permissionForLocationAsync()
await permissionForPushNotificationsAsync()
BackHandler.addEventListener('hardwareBackPress', exitAlert)
setFontLoaded(true)
}
async function permissionForPushNotificationsAsync() {
const { status: existingStatus } = await Notifications.getPermissionsAsync()
let finalStatus = existingStatus
// only ask if permissions have not already been determined, because
// iOS won't necessarily prompt the user a second time.
if (existingStatus !== 'granted') {
// Android remote notification permissions are granted during the app
// install, so this will only ask on iOS
const { status } = await Notifications.requestPermissionsAsync()
finalStatus = status
}
// Stop here if the user did not grant permissions
if (finalStatus !== 'granted') {
return
}
if (Platform.OS === 'android') {
Notifications.setNotificationChannelAsync('default', {
name: 'default',
sound: true,
priority: 'max',
importance: Notifications.AndroidImportance.HIGH,
vibrate: [0, 250, 250, 250],
lightColor: COLORS.primary
})
}
}
async function permissionForLocationAsync() {
const { status: existingStatus } =
await Location.getForegroundPermissionsAsync()
// only ask if permissions have not already been determined, because
// iOS won't necessarily prompt the user a second time.
if (existingStatus !== 'granted') {
// Android location permissions are granted during the app
// install, so this will only ask on iOS
const { status } = await Location.requestForegroundPermissionsAsync()
// eslint-disable-next-line no-undef
finalStatus = status
}
}
if (fontLoaded && client) {
return (
<ApolloProvider client={client}>
<StatusBar
translucent
backgroundColor={'transparent'}
barStyle={isDark ? 'light-content' : 'dark-content'}
/>
<ConfigurationProvider>
<UserProvider>
<AnimatedSplash image={require('./assets/splash.png')}>
<AppContainer />
</AnimatedSplash>
</UserProvider>
</ConfigurationProvider>
<FlashMessage duration={2000} position="center" />
</ApolloProvider>
)
} else {
return (
<View style={[styles.flex, styles.mainContainer]}>
<ActivityIndicator
size="large"
color={
isDark
? THEME.Dark.colors.spinnerColor
: THEME.Light.colors.spinnerColor
}
/>
</View>
)
}
}
const styles = StyleSheet.create({
flex: {
flex: 1
},
mainContainer: {
justifyContent: 'center',
alignItems: 'center'
}
})

83
CustomerApp/app.json Normal file
View File

@ -0,0 +1,83 @@
{
"expo": {
"name": "Enatega",
"version": "1.0.18",
"scheme": "enategasinglevendor",
"description": "Enatega is a starter kit food ordering app built in React Native using Expo for IOS and Android. It's made keeping good aesthetics in mind as well keeping the best coding practices in mind. Its fully customisable to easily help you in your next food delivery project. https://market.nativebase.io/view/react-native-food-delivery-backend-app",
"slug": "enategasinglevendor",
"privacy": "public",
"androidStatusBar": {
"backgroundColor": "#000"
},
"platforms": [
"ios",
"android"
],
"orientation": "portrait",
"icon": "./assets/icon.png",
"splash": {
"image": "./assets/splash.png",
"resizeMode": "cover",
"backgroundColor": "#febb2c"
},
"updates": {
"fallbackToCacheTimeout": 0
},
"assetBundlePatterns": [
"**/*"
],
"ios": {
"supportsTablet": true,
"bundleIdentifier": "com.enatega.vendor",
"config": {
"googleMapsApiKey": ""
},
"usesAppleSignIn": true,
"infoPlist": {
"NSLocationWhenInUseUsageDescription": "This app uses the location to determine the delivery address for your orders.",
"NSUserTrackingUsageDescription": "Allow this app to collect app-related data that can be used for tracking you or your device."
}
},
"notification": {
"iosDisplayInForeground": true,
"color": "#d83765",
"icon": "./assets/not-icon.png",
"androidMode": "default",
"androidCollapsedTitle": "Enatega"
},
"android": {
"versionCode": 23,
"package": "com.enatega.vendor",
"googleServicesFile": "./google-services-prod.json",
"config": {
"googleMaps": {
"apiKey": ""
}
},
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#febb2c"
},
"permissions": [
"ACCESS_FINE_LOCATION",
"ACCESS_COARSE_LOCATION"
]
},
"plugins": [
[
"expo-tracking-transparency",
{
"userTrackingPermission": "Allow this app to collect app-related data that can be used for tracking you or your device."
}
]
],
"facebookScheme": "fb3017447961609878",
"facebookAppId": "3017447961609878",
"facebookDisplayName": "Food delivery",
"extra": {
"eas": {
"projectId": "0b51ea6b-d9fd-48e2-9480-54149ca73a7a"
}
}
}
}

BIN
Customer App/assets/.DS_Store → CustomerApp/assets/.DS_Store vendored
View File

Binary file not shown.

0
Customer App/assets/adaptive-icon.png → CustomerApp/assets/adaptive-icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
Customer App/assets/burger.png → CustomerApp/assets/burger.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 KiB

After

Width:  |  Height:  |  Size: 345 KiB

0
Customer App/assets/icon.png → CustomerApp/assets/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
Customer App/assets/logo.png → CustomerApp/assets/logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
Customer App/assets/not-icon.png → CustomerApp/assets/not-icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
Customer App/assets/profile.png → CustomerApp/assets/profile.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
Customer App/assets/splash.png → CustomerApp/assets/splash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

0
Customer App/assets/transparent-icon.png → CustomerApp/assets/transparent-icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

10
CustomerApp/babel.config.js Normal file
View File

@ -0,0 +1,10 @@
module.exports = function (api) {
api.cache(true);
return {
presets: ["babel-preset-expo"],
plugins: [
"react-native-reanimated/plugin",
"@babel/plugin-syntax-dynamic-import",
],
};
};

41
CustomerApp/eas.json Normal file
View File

@ -0,0 +1,41 @@
{
"cli": {
"version": ">= 3.8.0"
},
"build": {
"development": {
"developmentClient": true,
"distribution": "internal",
"ios": {
"resourceClass": "m-medium"
}
},
"preview": {
"distribution": "internal",
"ios": {
"resourceClass": "m-medium"
}
},
"production": {
"developmentClient": false,
"releaseChannel": "production",
"distribution": "store",
"ios": {
"resourceClass": "m-medium"
}
}
},
"submit": {
"production": {
"android": {
"serviceAccountKeyPath": "./google-service-account.json",
"track": "production"
},
"ios": {
"appleId": "sharan.gohar@icloud.com",
"ascAppId": "1526488093",
"appleTeamId": "GDFK7MVY6P"
}
}
}
}

0
Customer App/enategaprod_upload_cert.pem → CustomerApp/enategaprod_upload_cert.pem
View File

71
CustomerApp/environment.js Normal file
View File

@ -0,0 +1,71 @@
/*****************************
* environment.js
* path: '/environment.js' (root of your project)
******************************/
import Constants from "expo-constants";
const ENV = {
development: {
GRAPHQL_URL: "http://10.97.28.88.90:8000/graphql",
WS_GRAPHQL_URL: "ws://10.97.28.88.90:8000/graphql",
SERVER_URL: "http://10.97.28.88.90:8000/", // put / at the end of server url
IOS_CLIENT_ID_GOOGLE:
"967541328677-uq7f7odvmeea2pb2sq0l7q320ds86536.apps.googleusercontent.com",
ANDROID_CLIENT_ID_GOOGLE:
"967541328677-u9lbhmiesp67j3md9b8nk6mkhooeljur.apps.googleusercontent.com",
AMPLITUDE_API_KEY: "358ef0deb443586e2cc4ddd4380151f0",
STRIPE_PUBLIC_KEY: "pk_test_lEaBbVGnTkzja2FyFiNlbqtw",
STRIPE_IMAGE_URL: "http://192.168.100.90:8000/assets/images/logo.png",
STRIPE_STORE_NAME: "Enatega",
},
staging: {
GRAPHQL_URL: "https://staging-enatega-single-api.herokuapp.com/graphql",
WS_GRAPHQL_URL: "wss://staging-enatega-single-api.herokuapp.com/graphql",
SERVER_URL: "https://staging-enatega-single-api.herokuapp.com/", // put / at the end of server url
IOS_CLIENT_ID_GOOGLE:
"967541328677-nf8h4ou7rhmq9fahs87p057rggo95eah.apps.googleusercontent.com",
ANDROID_CLIENT_ID_GOOGLE:
"967541328677-7264tf7tkdtoufk844rck9mimrve135c.apps.googleusercontent.com",
FACEBOOK_APP_ID: "404956210315749",
AMPLITUDE_API_KEY: "358ef0deb443586e2cc4ddd4380151f0",
STRIPE_PUBLIC_KEY: "pk_test_lEaBbVGnTkzja2FyFiNlbqtw",
STRIPE_IMAGE_URL:
"https://staging-enatega-single-api.herokuapp.com/assets/images/logo.png",
STRIPE_STORE_NAME: "Enatega",
},
production: {
GRAPHQL_URL: "https://prod-enatega-single-api.herokuapp.com/graphql",
WS_GRAPHQL_URL: "wss://prod-enatega-single-api.herokuapp.com/graphql",
SERVER_URL: "https://prod-enatega-single-api.herokuapp.com/", // put / at the end of server url
IOS_CLIENT_ID_GOOGLE:
"94983896797-irt6u2cmq2sjcp7j1rj9m9pqptjd12ue.apps.googleusercontent.com",
ANDROID_CLIENT_ID_GOOGLE:
"94983896797-omp6mi32rl3126siafgnskrqql0rdk5c.apps.googleusercontent.com",
FACEBOOK_APP_ID: "3017447961609878",
AMPLITUDE_API_KEY: "358ef0deb443586e2cc4ddd4380151f0",
STRIPE_PUBLIC_KEY: "pk_test_lEaBbVGnTkzja2FyFiNlbqtw",
STRIPE_IMAGE_URL:
"https://prod-enatega-single-api.herokuapp.com/assets/images/logo.png",
STRIPE_STORE_NAME: "Enatega",
},
};
const getEnvVars = (env = Constants.manifest.releaseChannel) => {
// What is __DEV__ ?
// This variable is set to true when react-native is running in Dev mode.
// __DEV__ is true when run locally, but false when published.
// eslint-disable-next-line no-undef
if (__DEV__) {
return ENV.development;
} else if (env === "production") {
return ENV.production;
} else if (env === "staging") {
return ENV.staging;
} else {
return ENV.production;
}
};
export default getEnvVars;

0
Customer App/environment.js.example → CustomerApp/environment.js.example
View File

0
Customer App/google-services-prod-old.json → CustomerApp/google-services-prod-old.json
View File

0
Customer App/google-services-prod.json → CustomerApp/google-services-prod.json
View File

0
Customer App/google-services.json → CustomerApp/google-services.json
View File

0
Customer App/i18n.js → CustomerApp/i18n.js
View File

8
CustomerApp/index.js Normal file
View File

@ -0,0 +1,8 @@
import { registerRootComponent } from 'expo';
import App from './App';
// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
// It also ensures that whether you load the app in Expo Go or in a native build,
// the environment is set up appropriately
registerRootComponent(App);

4
CustomerApp/metro.config.js Normal file
View File

@ -0,0 +1,4 @@
// Learn more https://docs.expo.io/guides/customizing-metro
const { getDefaultConfig } = require('expo/metro-config');
module.exports = getDefaultConfig(__dirname);

22646
CustomerApp/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

125
CustomerApp/package.json Normal file
View File

@ -0,0 +1,125 @@
{
"name": "enatega-full-app",
"version": "5.0.0",
"scripts": {
"start": "expo start",
"android": "expo start --android",
"ios": "expo start --ios",
"eject": "expo eject",
"test": "jest",
"format": "prettier --write '**/*.js'",
"lint:fix": "eslint . --ext .js --fix",
"postinstall": "patch-package"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.js": [
"npm run format",
"npm run lint:fix"
]
},
"dependencies": {
"@amplitude/analytics-react-native": "^1.1.1",
"@apollo/react-hooks": "^3.1.3",
"@expo/vector-icons": "^13.0.0",
"@ptomasroos/react-native-multi-slider": "^2.2.2",
"@react-native-async-storage/async-storage": "~1.17.3",
"@react-native-community/masked-view": "0.1.11",
"@react-navigation/drawer": "^6.6.0",
"@react-navigation/native": "^6.1.4",
"@react-navigation/native-stack": "^6.9.10",
"@react-navigation/stack": "^6.3.14",
"apollo-boost": "^0.4.9",
"apollo-cache-inmemory": "^1.5.1",
"apollo-cache-persist": "^0.1.1",
"apollo-client": "^2.5.1",
"apollo-link-context": "^1.0.17",
"apollo-link-http": "^1.5.14",
"apollo-link-state": "^0.4.2",
"apollo-link-ws": "^1.0.20",
"apollo-upload-client": "^10.0.0",
"apollo-utilities": "^1.3.4",
"deprecated-react-native-prop-types": "^4.0.0",
"expo": "^47.0.12",
"expo-app-loading": "~2.1.1",
"expo-apple-authentication": "~5.0.1",
"expo-application": "~5.0.1",
"expo-asset": "~8.7.0",
"expo-auth-session": "^3.8.0",
"expo-camera": "~13.1.0",
"expo-constants": "~14.0.2",
"expo-contacts": "~11.0.1",
"expo-device": "~5.0.0",
"expo-font": "~11.0.1",
"expo-image-picker": "~14.0.2",
"expo-linking": "~3.3.1",
"expo-localization": "~14.0.0",
"expo-location": "~15.0.1",
"expo-notifications": "~0.17.0",
"expo-random": "~13.0.0",
"expo-sensors": "~12.0.1",
"expo-splash-screen": "~0.17.5",
"expo-status-bar": "~1.4.2",
"expo-tracking-transparency": "~3.0.1",
"expo-updates": "~0.15.6",
"graphql": "^16.6.0",
"graphql-tag": "^2.10.1",
"i18n-js": "^3.2.2",
"lodash": "^4.17.21",
"patch-package": "^6.5.1",
"react": "18.1.0",
"react-apollo": "^3.1.5",
"react-native": "0.70.5",
"react-native-button": "^3.0.1",
"react-native-flash-message": "^0.4.0",
"react-native-flatlist-slider": "^1.0.5",
"react-native-gesture-handler": "~2.8.0",
"react-native-gifted-chat": "^1.1.1",
"react-native-maps": "1.3.2",
"react-native-material-textfield": "^0.16.1",
"react-native-modal": "^13.0.1",
"react-native-modalize": "^2.0.8",
"react-native-reanimated": "~2.12.0",
"react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.18.0",
"react-native-star-rating": "^1.1.0",
"react-native-svg": "13.4.0",
"react-native-timeline-flatlist": "^0.8.0",
"react-native-webview": "11.23.1",
"subscriptions-transport-ws": "^0.11.0",
"uuid": "^3.3.2",
"validate.js": "^0.13.1"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"babel-jest": "^29.4.3",
"babel-preset-expo": "~9.2.1",
"babel-preset-react-native": "^4.0.1",
"eslint": "^8.34.0",
"eslint-config-standard": "^17.0.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-standard": "^5.0.0",
"husky": "^8.0.3",
"jest": "^29.4.3",
"jest-react-native": "^18.0.0",
"lint-staged": "^13.1.2",
"metro-react-native-babel-preset": "^0.75.0",
"prettier": "^2.3.1",
"prettier-config-standard": "^5.0.0",
"react-test-renderer": "^18.2.0"
},
"jest": {
"preset": "react-native"
},
"private": true,
"resolutions": {
"standard-version-expo/**/@expo/config-plugins": "5.0.2"
}
}

38
CustomerApp/patches/react-native-button+3.0.1.patch Normal file
View File

@ -0,0 +1,38 @@
diff --git a/node_modules/react-native-button/Button.js b/node_modules/react-native-button/Button.js
index b248176..3c6aefa 100644
--- a/node_modules/react-native-button/Button.js
+++ b/node_modules/react-native-button/Button.js
@@ -1,4 +1,5 @@
import PropTypes from 'prop-types';
+import {TextPropTypes,ViewPropTypes} from 'deprecated-react-native-prop-types'
import React, { Component } from 'react';
import {
Platform,
@@ -7,7 +8,7 @@ import {
TouchableOpacity,
TouchableNativeFeedback,
View,
- ViewPropTypes
+ //ViewPropTypes
} from 'react-native';
import coalesceNonElementChildren from './coalesceNonElementChildren';
@@ -18,12 +19,15 @@ export default class Button extends Component {
static propTypes = {
...TouchableOpacity.propTypes,
accessibilityLabel: PropTypes.string,
- allowFontScaling: Text.propTypes.allowFontScaling,
+ // allowFontScaling: Text.propTypes.allowFontScaling,
+ allowFontScaling: TextPropTypes.allowFontScaling,
containerStyle: ViewPropTypes.style,
disabledContainerStyle: ViewPropTypes.style,
disabled: PropTypes.bool,
- style: Text.propTypes.style,
- styleDisabled: Text.propTypes.style,
+ style: TextPropTypes.style,
+ styleDisabled: TextPropTypes.style,
+ // style: Text.propTypes.style,
+ // styleDisabled: Text.propTypes.style,
childGroupStyle: ViewPropTypes.style,
androidBackground: PropTypes.object,
};

405
CustomerApp/patches/react-native-material-textfield+0.16.1.patch Normal file
View File

@ -0,0 +1,405 @@
diff --git a/node_modules/react-native-material-textfield/src/components/affix/index.js b/node_modules/react-native-material-textfield/src/components/affix/index.js
index 0f85022..e467adb 100644
--- a/node_modules/react-native-material-textfield/src/components/affix/index.js
+++ b/node_modules/react-native-material-textfield/src/components/affix/index.js
@@ -9,26 +9,26 @@ export default class Affix extends PureComponent {
numberOfLines: 1,
};
- static propTypes = {
- numberOfLines: PropTypes.number,
- style: Animated.Text.propTypes.style,
+ // static propTypes = {
+ // numberOfLines: PropTypes.number,
+ // style: PropTypes.object,
- color: PropTypes.string.isRequired,
- fontSize: PropTypes.number.isRequired,
+ // color: PropTypes.string.isRequired,
+ // fontSize: PropTypes.number.isRequired,
- type: PropTypes
- .oneOf(['prefix', 'suffix'])
- .isRequired,
+ // type: PropTypes
+ // .oneOf(['prefix', 'suffix'])
+ // .isRequired,
- labelAnimation: PropTypes
- .instanceOf(Animated.Value)
- .isRequired,
+ // labelAnimation: PropTypes
+ // .instanceOf(Animated.Value)
+ // .isRequired,
- children: PropTypes.oneOfType([
- PropTypes.arrayOf(PropTypes.node),
- PropTypes.node,
- ]),
- };
+ // children: PropTypes.oneOfType([
+ // PropTypes.arrayOf(PropTypes.node),
+ // PropTypes.node,
+ // ]),
+ // };
render() {
let { labelAnimation, style, children, type, fontSize, color } = this.props;
diff --git a/node_modules/react-native-material-textfield/src/components/counter/index.js b/node_modules/react-native-material-textfield/src/components/counter/index.js
index 35d3264..089b871 100644
--- a/node_modules/react-native-material-textfield/src/components/counter/index.js
+++ b/node_modules/react-native-material-textfield/src/components/counter/index.js
@@ -5,15 +5,15 @@ import { Text } from 'react-native';
import styles from './styles';
export default class Counter extends PureComponent {
- static propTypes = {
- count: PropTypes.number.isRequired,
- limit: PropTypes.number,
+ // static propTypes = {
+ // count: PropTypes.number.isRequired,
+ // limit: PropTypes.number,
- baseColor: PropTypes.string.isRequired,
- errorColor: PropTypes.string.isRequired,
+ // baseColor: PropTypes.string.isRequired,
+ // errorColor: PropTypes.string.isRequired,
- style: Text.propTypes.style,
- };
+ // style: PropTypes.object,
+ // };
render() {
let { count, limit, baseColor, errorColor, style } = this.props;
diff --git a/node_modules/react-native-material-textfield/src/components/field/index.js b/node_modules/react-native-material-textfield/src/components/field/index.js
index 494bbaa..2a71c82 100644
--- a/node_modules/react-native-material-textfield/src/components/field/index.js
+++ b/node_modules/react-native-material-textfield/src/components/field/index.js
@@ -1,5 +1,6 @@
import PropTypes from 'prop-types';
import React, { PureComponent } from 'react';
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
import {
View,
Text,
@@ -7,7 +8,7 @@ import {
Animated,
StyleSheet,
Platform,
- ViewPropTypes,
+ //ViewPropTypes,
} from 'react-native';
import Line from '../line';
@@ -65,60 +66,60 @@ export default class TextField extends PureComponent {
disabled: false,
};
- static propTypes = {
- ...TextInput.propTypes,
+ // static propTypes = {
+ // ...TextInput.propTypes,
- animationDuration: PropTypes.number,
+ // animationDuration: PropTypes.number,
- fontSize: PropTypes.number,
- labelFontSize: PropTypes.number,
+ // fontSize: PropTypes.number,
+ // labelFontSize: PropTypes.number,
- contentInset: PropTypes.shape({
- top: PropTypes.number,
- label: PropTypes.number,
- input: PropTypes.number,
- left: PropTypes.number,
- right: PropTypes.number,
- }),
+ // contentInset: PropTypes.shape({
+ // top: PropTypes.number,
+ // label: PropTypes.number,
+ // input: PropTypes.number,
+ // left: PropTypes.number,
+ // right: PropTypes.number,
+ // }),
- labelOffset: Label.propTypes.offset,
+ // labelOffset: Label.propTypes.offset,
- labelTextStyle: Text.propTypes.style,
- titleTextStyle: Text.propTypes.style,
- affixTextStyle: Text.propTypes.style,
+ // labelTextStyle: PropTypes.object.style,
+ // // titleTextStyle: PropTypes.object.style,
+ // // affixTextStyle: PropTypes.object.style,
- tintColor: PropTypes.string,
- textColor: PropTypes.string,
- baseColor: PropTypes.string,
+ // tintColor: PropTypes.string,
+ // textColor: PropTypes.string,
+ // baseColor: PropTypes.string,
- label: PropTypes.string,
- title: PropTypes.string,
+ // label: PropTypes.string,
+ // title: PropTypes.string,
- characterRestriction: PropTypes.number,
+ // characterRestriction: PropTypes.number,
- error: PropTypes.string,
- errorColor: PropTypes.string,
+ // error: PropTypes.string,
+ // errorColor: PropTypes.string,
- lineWidth: PropTypes.number,
- activeLineWidth: PropTypes.number,
- disabledLineWidth: PropTypes.number,
+ // lineWidth: PropTypes.number,
+ // activeLineWidth: PropTypes.number,
+ // disabledLineWidth: PropTypes.number,
- lineType: Line.propTypes.lineType,
- disabledLineType: Line.propTypes.lineType,
+ // lineType: Line.propTypes.lineType,
+ // disabledLineType: Line.propTypes.lineType,
- disabled: PropTypes.bool,
+ // disabled: PropTypes.bool,
- formatText: PropTypes.func,
+ // formatText: PropTypes.func,
- renderLeftAccessory: PropTypes.func,
- renderRightAccessory: PropTypes.func,
+ // renderLeftAccessory: PropTypes.func,
+ // renderRightAccessory: PropTypes.func,
- prefix: PropTypes.string,
- suffix: PropTypes.string,
+ // prefix: PropTypes.string,
+ // suffix: PropTypes.string,
- containerStyle: (ViewPropTypes || View.propTypes).style,
- inputContainerStyle: (ViewPropTypes || View.propTypes).style,
- };
+ // containerStyle: (ViewPropTypes || View.propTypes).style,
+ // inputContainerStyle: (ViewPropTypes || View.propTypes).style,
+ // };
static inputContainerStyle = styles.inputContainer;
@@ -221,6 +222,7 @@ export default class TextField extends PureComponent {
let options = {
toValue: this.focusState(),
+ useNativeDriver: false,
duration,
};
diff --git a/node_modules/react-native-material-textfield/src/components/helper/index.js b/node_modules/react-native-material-textfield/src/components/helper/index.js
index 6060f9f..86ac2c0 100644
--- a/node_modules/react-native-material-textfield/src/components/helper/index.js
+++ b/node_modules/react-native-material-textfield/src/components/helper/index.js
@@ -1,23 +1,24 @@
import PropTypes from 'prop-types';
+
import React, { PureComponent } from 'react';
import { Animated } from 'react-native';
import styles from './styles';
export default class Helper extends PureComponent {
- static propTypes = {
- title: PropTypes.string,
- error: PropTypes.string,
+ // static propTypes = {
+ // title: PropTypes.string,
+ // error: PropTypes.string,
- disabled: PropTypes.bool,
+ // disabled: PropTypes.bool,
- style: Animated.Text.propTypes.style,
+ // style: PropTypes.object,
- baseColor: PropTypes.string,
- errorColor: PropTypes.string,
+ // baseColor: PropTypes.string,
+ // errorColor: PropTypes.string,
- focusAnimation: PropTypes.instanceOf(Animated.Value),
- };
+ // focusAnimation: PropTypes.instanceOf(Animated.Value),
+ // };
constructor(props) {
super(props);
diff --git a/node_modules/react-native-material-textfield/src/components/label/index.js b/node_modules/react-native-material-textfield/src/components/label/index.js
index 82eaf03..1ad9a93 100644
--- a/node_modules/react-native-material-textfield/src/components/label/index.js
+++ b/node_modules/react-native-material-textfield/src/components/label/index.js
@@ -11,41 +11,41 @@ export default class Label extends PureComponent {
restricted: false,
};
- static propTypes = {
- numberOfLines: PropTypes.number,
+ // static propTypes = {
+ // numberOfLines: PropTypes.number,
- disabled: PropTypes.bool,
- restricted: PropTypes.bool,
+ // disabled: PropTypes.bool,
+ // restricted: PropTypes.bool,
- fontSize: PropTypes.number.isRequired,
- activeFontSize: PropTypes.number.isRequired,
+ // fontSize: PropTypes.number.isRequired,
+ // activeFontSize: PropTypes.number.isRequired,
- baseColor: PropTypes.string.isRequired,
- tintColor: PropTypes.string.isRequired,
- errorColor: PropTypes.string.isRequired,
+ // baseColor: PropTypes.string.isRequired,
+ // tintColor: PropTypes.string.isRequired,
+ // errorColor: PropTypes.string.isRequired,
- focusAnimation: PropTypes
- .instanceOf(Animated.Value)
- .isRequired,
+ // focusAnimation: PropTypes
+ // .instanceOf(Animated.Value)
+ // .isRequired,
- labelAnimation: PropTypes
- .instanceOf(Animated.Value)
- .isRequired,
+ // labelAnimation: PropTypes
+ // .instanceOf(Animated.Value)
+ // .isRequired,
- contentInset: PropTypes.shape({
- label: PropTypes.number,
- }),
+ // contentInset: PropTypes.shape({
+ // label: PropTypes.number,
+ // }),
- offset: PropTypes.shape({
- x0: PropTypes.number,
- y0: PropTypes.number,
- x1: PropTypes.number,
- y1: PropTypes.number,
- }),
+ // offset: PropTypes.shape({
+ // x0: PropTypes.number,
+ // y0: PropTypes.number,
+ // x1: PropTypes.number,
+ // y1: PropTypes.number,
+ // }),
- style: Animated.Text.propTypes.style,
- label: PropTypes.string,
- };
+ // style: PropTypes.object,
+ // label: PropTypes.string,
+ // };
render() {
let {
diff --git a/node_modules/react-native-material-textfield/src/components/line/index.js b/node_modules/react-native-material-textfield/src/components/line/index.js
index 44995e9..b689387 100644
--- a/node_modules/react-native-material-textfield/src/components/line/index.js
+++ b/node_modules/react-native-material-textfield/src/components/line/index.js
@@ -16,23 +16,23 @@ export default class Line extends PureComponent {
restricted: false,
};
- static propTypes = {
- lineType: lineTypes,
- disabledLineType: lineTypes,
+ // static propTypes = {
+ // lineType: lineTypes,
+ // disabledLineType: lineTypes,
- disabled: PropTypes.bool,
- restricted: PropTypes.bool,
+ // disabled: PropTypes.bool,
+ // restricted: PropTypes.bool,
- tintColor: PropTypes.string,
- baseColor: PropTypes.string,
- errorColor: PropTypes.string,
+ // tintColor: PropTypes.string,
+ // baseColor: PropTypes.string,
+ // errorColor: PropTypes.string,
- lineWidth: PropTypes.number,
- activeLineWidth: PropTypes.number,
- disabledLineWidth: PropTypes.number,
+ // lineWidth: PropTypes.number,
+ // activeLineWidth: PropTypes.number,
+ // disabledLineWidth: PropTypes.number,
- focusAnimation: PropTypes.instanceOf(Animated.Value),
- };
+ // focusAnimation: PropTypes.instanceOf(Animated.Value),
+ // };
static getDerivedStateFromProps(props, state) {
let { lineWidth, activeLineWidth, disabledLineWidth } = props;
diff --git a/node_modules/react-native-material-textfield/src/components/outline/index.js b/node_modules/react-native-material-textfield/src/components/outline/index.js
index 9347a99..9c3e8a3 100644
--- a/node_modules/react-native-material-textfield/src/components/outline/index.js
+++ b/node_modules/react-native-material-textfield/src/components/outline/index.js
@@ -11,29 +11,29 @@ export default class Line extends PureComponent {
restricted: false,
};
- static propTypes = {
- lineType: PropTypes.oneOf(['solid', 'none']),
+ // static propTypes = {
+ // lineType: PropTypes.oneOf(['solid', 'none']),
- disabled: PropTypes.bool,
- restricted: PropTypes.bool,
+ // disabled: PropTypes.bool,
+ // restricted: PropTypes.bool,
- tintColor: PropTypes.string,
- baseColor: PropTypes.string,
- errorColor: PropTypes.string,
+ // tintColor: PropTypes.string,
+ // baseColor: PropTypes.string,
+ // errorColor: PropTypes.string,
- lineWidth: PropTypes.number,
- activeLineWidth: PropTypes.number,
- disabledLineWidth: PropTypes.number,
+ // lineWidth: PropTypes.number,
+ // activeLineWidth: PropTypes.number,
+ // disabledLineWidth: PropTypes.number,
- focusAnimation: PropTypes.instanceOf(Animated.Value),
- labelAnimation: PropTypes.instanceOf(Animated.Value),
- labelWidth: PropTypes.instanceOf(Animated.Value),
+ // focusAnimation: PropTypes.instanceOf(Animated.Value),
+ // labelAnimation: PropTypes.instanceOf(Animated.Value),
+ // labelWidth: PropTypes.instanceOf(Animated.Value),
- contentInset: PropTypes.shape({
- left: PropTypes.number,
- right: PropTypes.number,
- }),
- };
+ // contentInset: PropTypes.shape({
+ // left: PropTypes.number,
+ // right: PropTypes.number,
+ // }),
+ // };
borderProps() {
let {

34
CustomerApp/patches/react-native-star-rating++react-native-button+2.4.0.patch Normal file
View File

@ -0,0 +1,34 @@
diff --git a/node_modules/react-native-star-rating/node_modules/react-native-button/Button.js b/node_modules/react-native-star-rating/node_modules/react-native-button/Button.js
index fb7cf46..8e4c522 100644
--- a/node_modules/react-native-star-rating/node_modules/react-native-button/Button.js
+++ b/node_modules/react-native-star-rating/node_modules/react-native-button/Button.js
@@ -1,11 +1,12 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
+import {TextPropTypes,ViewPropTypes} from 'deprecated-react-native-prop-types'
import {
StyleSheet,
Text,
TouchableOpacity,
View,
- ViewPropTypes,
+ //ViewPropTypes,
} from 'react-native';
import coalesceNonElementChildren from './coalesceNonElementChildren';
@@ -16,12 +17,12 @@ export default class Button extends Component {
static propTypes = {
...TouchableOpacity.propTypes,
accessibilityLabel: PropTypes.string,
- allowFontScaling: Text.propTypes.allowFontScaling,
+ allowFontScaling: TextPropTypes.allowFontScaling,
containerStyle: ViewPropTypes.style,
disabledContainerStyle: ViewPropTypes.style,
disabled: PropTypes.bool,
- style: Text.propTypes.style,
- styleDisabled: Text.propTypes.style,
+ style: TextPropTypes.style,
+ styleDisabled: TextPropTypes.style,
childGroupStyle: ViewPropTypes.style,
};

26
CustomerApp/patches/react-native-star-rating+1.1.0.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/node_modules/react-native-star-rating/StarButton.js b/node_modules/react-native-star-rating/StarButton.js
index b6db613..8a62f5a 100644
--- a/node_modules/react-native-star-rating/StarButton.js
+++ b/node_modules/react-native-star-rating/StarButton.js
@@ -1,6 +1,7 @@
// React and react native imports
import React, { Component } from 'react';
-import { Image, StyleSheet, ViewPropTypes } from 'react-native';
+import { Image, StyleSheet } from 'react-native';
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import { createIconSetFromIcoMoon } from 'react-native-vector-icons';
diff --git a/node_modules/react-native-star-rating/StarRating.js b/node_modules/react-native-star-rating/StarRating.js
index 7aecc95..de6397c 100644
--- a/node_modules/react-native-star-rating/StarRating.js
+++ b/node_modules/react-native-star-rating/StarRating.js
@@ -1,6 +1,7 @@
// React and react native imports
import React, { Component } from 'react';
-import { View, ViewPropTypes, StyleSheet } from 'react-native';
+import { View, StyleSheet } from 'react-native';
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import { View as AnimatableView } from 'react-native-animatable';

0
Customer App/src/.DS_Store → CustomerApp/src/.DS_Store vendored
View File

0
Customer App/src/Theme/Colors.js → CustomerApp/src/Theme/Colors.js
View File

0
Customer App/src/Theme/Theme.js → CustomerApp/src/Theme/Theme.js
View File

0
Customer App/src/Theme/index.js → CustomerApp/src/Theme/index.js
View File

0
Customer App/src/apollo/index.js → CustomerApp/src/apollo/index.js
View File

0
Customer App/src/apollo/server.js → CustomerApp/src/apollo/server.js
View File

0
Customer App/src/assets/.DS_Store → CustomerApp/src/assets/.DS_Store vendored
View File

0
Customer App/src/assets/font/Poppin/Poppins-Bold.ttf → CustomerApp/src/assets/font/Poppin/Poppins-Bold.ttf
View File

0
Customer App/src/assets/font/Poppin/Poppins-Light.ttf → CustomerApp/src/assets/font/Poppin/Poppins-Light.ttf
View File

0
Customer App/src/assets/font/Poppin/Poppins-Medium.ttf → CustomerApp/src/assets/font/Poppin/Poppins-Medium.ttf
View File

0
Customer App/src/assets/font/Poppin/Poppins-Regular.ttf → CustomerApp/src/assets/font/Poppin/Poppins-Regular.ttf
View File

0
Customer App/src/assets/font/Poppin/Poppins-SemiBold.ttf → CustomerApp/src/assets/font/Poppin/Poppins-SemiBold.ttf
View File

0
Customer App/src/assets/font/icomoon.ttf → CustomerApp/src/assets/font/icomoon.ttf
View File

0
Customer App/src/assets/images/.DS_Store → CustomerApp/src/assets/images/.DS_Store vendored
View File

0
Customer App/src/assets/images/SVG/Logo.js → CustomerApp/src/assets/images/SVG/Logo.js
View File

0
Customer App/src/assets/images/SVG/LogoName.js → CustomerApp/src/assets/images/SVG/LogoName.js
View File

0
Customer App/src/assets/images/SVG/imageComponents/CartIcon.js → CustomerApp/src/assets/images/SVG/imageComponents/CartIcon.js
View File

0
Customer App/src/assets/images/SVG/imageComponents/EmptyAddress.js → CustomerApp/src/assets/images/SVG/imageComponents/EmptyAddress.js
View File

0
Customer App/src/assets/images/SVG/imageComponents/EmptyCart.js → CustomerApp/src/assets/images/SVG/imageComponents/EmptyCart.js
View File

0
Customer App/src/assets/images/SVG/imageComponents/EmptyFood.js → CustomerApp/src/assets/images/SVG/imageComponents/EmptyFood.js
View File

0
Customer App/src/assets/images/SVG/imageComponents/EmptyOrder.js → CustomerApp/src/assets/images/SVG/imageComponents/EmptyOrder.js
View File

0
Customer App/src/assets/images/cashIcon.png → CustomerApp/src/assets/images/cashIcon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
Customer App/src/assets/images/defaultNotification.png → CustomerApp/src/assets/images/defaultNotification.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 61 KiB

0
Customer App/src/assets/images/facebook.png → CustomerApp/src/assets/images/facebook.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 277 B

0
Customer App/src/assets/images/food_placeholder1.png → CustomerApp/src/assets/images/food_placeholder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
Customer App/src/assets/images/google.png → CustomerApp/src/assets/images/google.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 522 B

0
Customer App/src/assets/images/home.png → CustomerApp/src/assets/images/home.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
Customer App/src/assets/images/imagePlaceholder.png → CustomerApp/src/assets/images/imagePlaceholder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
Customer App/src/assets/images/location.png → CustomerApp/src/assets/images/location.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

0
Customer App/src/assets/images/login_reg_food.jpg → CustomerApp/src/assets/images/login_reg_food.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

0
Customer App/src/assets/images/markerEnatega.png → CustomerApp/src/assets/images/markerEnatega.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 696 B

0
Customer App/src/assets/images/masterIcon.png → CustomerApp/src/assets/images/masterIcon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
Customer App/src/assets/images/notificationDefault.png → CustomerApp/src/assets/images/notificationDefault.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

0
Customer App/src/assets/images/paypal.png → CustomerApp/src/assets/images/paypal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
Customer App/src/assets/images/placeholder.png → CustomerApp/src/assets/images/placeholder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 124 KiB

0
Customer App/src/assets/images/rider.png → CustomerApp/src/assets/images/rider.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
Customer App/src/assets/images/searchLocation.png → CustomerApp/src/assets/images/searchLocation.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
Customer App/src/assets/images/stripe.png → CustomerApp/src/assets/images/stripe.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Some files were not shown because too many files have changed in this diff Show More