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 #19 from Ninjas-Code-official/fixing-issues 

Fixing issues
This commit is contained in:
Kashif Shehzad Baloch 2023-10-16 15:32:26 +05:00 committed by GitHub
parent 3494942113 f92bf954a2
commit c1ac502512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin Dashboard/src/components/Footers/AdminFooter.jsx
View File

@ -35,7 +35,7 @@ function Footer(props) {
<NavItem> <NavItem>
<NavLink <NavLink
href="https://ninjascode.com/pages/ourteam.html" href="https://ninjascode.com/our-team"
rel="noopener noreferrer" rel="noopener noreferrer"
target="_blank"> target="_blank">
{t('About Us')} {t('About Us')}

2
Admin Dashboard/src/components/Footers/AuthFooter.jsx
View File

@ -27,7 +27,7 @@ function AuthFooter(props) {
</NavItem> </NavItem>
<NavItem> <NavItem>
<NavLink <NavLink
href="https://ninjascode.com/pages/ourteam.html" href="https://ninjascode.com/our-team"
target="_blank"> target="_blank">
{t('About Us')} {t('About Us')}
</NavLink> </NavLink>

13
CustomerApp/app.json
View File

@ -3,8 +3,11 @@
"name": "Enatega", "name": "Enatega",
"version": "1.0.21", "version": "1.0.21",
"scheme": "enategasinglevendor", "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", "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://enatega.com/enatega-single-vendor/",
"slug": "enategasinglevendor", "slug": "enategasinglevendor",
"owner": "ninjas_code",
"currentFullName": "@ninjas_code/enategasinglevendor",
"originalFullName": "@ninjas_code/enategasinglevendor",
"privacy": "public", "privacy": "public",
"androidStatusBar": { "androidStatusBar": {
"backgroundColor": "#000" "backgroundColor": "#000"
@ -21,7 +24,8 @@
"backgroundColor": "#febb2c" "backgroundColor": "#febb2c"
}, },
"updates": { "updates": {
"fallbackToCacheTimeout": 0 "fallbackToCacheTimeout": 0,
"url": "https://u.expo.dev/e7c3fd70-4054-4dc8-bbdb-a572a3cc6fb1"
}, },
"assetBundlePatterns": [ "assetBundlePatterns": [
"**/*" "**/*"
@ -76,8 +80,11 @@
"facebookDisplayName": "Food delivery", "facebookDisplayName": "Food delivery",
"extra": { "extra": {
"eas": { "eas": {
"projectId": "0b51ea6b-d9fd-48e2-9480-54149ca73a7a" "projectId": "e7c3fd70-4054-4dc8-bbdb-a572a3cc6fb1"
} }
},
"runtimeVersion": {
"policy": "sdkVersion"
} }
} }
} }

14
CustomerApp/eas.json
View File

@ -8,20 +8,20 @@
"distribution": "internal", "distribution": "internal",
"ios": { "ios": {
"resourceClass": "m-medium" "resourceClass": "m-medium"
} },
"channel": "development"
}, },
"preview": { "preview": {
"distribution": "internal", "distribution": "internal",
"ios": { "ios": {
"resourceClass": "m-medium" "resourceClass": "m-medium"
} },
"channel": "preview"
}, },
"production": { "production": {
"developmentClient": false, "channel": "production",
"releaseChannel": "production", "android": {
"distribution": "store", "buildType": "apk"
"ios": {
"resourceClass": "m-medium"
} }
} }
}, },

8
CustomerApp/environment.js
View File

@ -11,7 +11,7 @@ const ENV = {
WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql", WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql",
SERVER_URL: "https://enatega-singlevendor.up.railway.app/", SERVER_URL: "https://enatega-singlevendor.up.railway.app/",
Expo_CLIENT_ID_GOOGLE: Expo_CLIENT_ID_GOOGLE:
"630195385603-82e52jpb722a8l0huhkspq3tqh2d6r6f.apps.googleusercontent.com", "967541328677-2lkpq6a9cj7bnokht7ich14igsi3brs5.apps.googleusercontent.com",
IOS_CLIENT_ID_GOOGLE: IOS_CLIENT_ID_GOOGLE:
"967541328677-uq7f7odvmeea2pb2sq0l7q320ds86536.apps.googleusercontent.com", "967541328677-uq7f7odvmeea2pb2sq0l7q320ds86536.apps.googleusercontent.com",
ANDROID_CLIENT_ID_GOOGLE: ANDROID_CLIENT_ID_GOOGLE:
@ -54,7 +54,7 @@ const ENV = {
}, },
}; };
const getEnvVars = (env = Constants.manifest.releaseChannel) => { const getEnvVars = (env = Constants.manifest/*.releaseChannel*/) => {
// What is __DEV__ ? // What is __DEV__ ?
// This variable is set to true when react-native is running in Dev mode. // This variable is set to true when react-native is running in Dev mode.
// __DEV__ is true when run locally, but false when published. // __DEV__ is true when run locally, but false when published.
@ -63,8 +63,8 @@ const getEnvVars = (env = Constants.manifest.releaseChannel) => {
return ENV.development; return ENV.development;
} else if (env === "production") { } else if (env === "production") {
return ENV.production; return ENV.production;
} else if (env === "staging") { // } else if (env === "staging") {
return ENV.staging; // return ENV.staging;
} else { } else {
return ENV.production; return ENV.production;
} }

15
CustomerApp/src/screens/AnimatedSplash/AnimatedSplash.js
View File

@ -39,13 +39,14 @@ function AnimatedSplashScreen({ children, image }) {
{!animationCompleted && ( {!animationCompleted && (
<Animated.View <Animated.View
pointerEvents="none" pointerEvents="none"
style={[ // style={[
StyleSheet.absoluteFill, // StyleSheet.absoluteFill,
{ // {
backgroundColor: Constants.manifest.splash.backgroundColor, // backgroundColor: Constants.manifest.splash.backgroundColor,
opacity: animation // opacity: animation
} // }
]}> // ]}
>
<Animated.Image <Animated.Image
style={{ style={{
width: '100%', width: '100%',

8
CustomerApp/src/screens/Help/Help.js
View File

@ -10,14 +10,14 @@ import useStyle from './styles'
const links = [ const links = [
{ {
title: 'Product Page', title: 'Product Page',
url: 'https://market.nativebase.io/view/react-native-food-delivery-backend-app' url: 'https://enatega.com/enatega-single-vendor/'
}, },
{ title: 'Docs', url: 'https://enatega.gitbook.io/enatega-full-app/' }, { title: 'Docs', url: 'https://enatega.com/docs/enatega-singlevendor-introduction/' },
{ {
title: 'Blog', title: 'Blog',
url: 'https://blog.nativebase.io/enatega-full-food-delivery-app-is-finally-here-a6039de4a09d' url: 'https://enatega.com/blog/'
}, },
{ title: 'About Us', url: 'https://ninjascode.com/pages/ourteam.html' } { title: 'About Us', url: 'https://ninjascode.com/our-team' }
] ]
function Help() { function Help() {
const styles = useStyle() const styles = useStyle()

11
RiderApp/app.json
View File

@ -1,9 +1,12 @@
{ {
"expo": { "expo": {
"name": "Enatega Rider", "name": "Enatega Rider",
"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", "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://enatega.com/enatega-single-vendor/",
"version": "4.2.7", "version": "4.2.7",
"slug": "food-delivery-rider", "slug": "food-delivery-rider-singlevendor",
"owner": "ninjas_code",
"currentFullName": "@ninjas_code/food-delivery-rider-singlevendor",
"originalFullName": "@ninjas_code/food-delivery-rider-singlevendor",
"privacy": "public", "privacy": "public",
"androidStatusBar": { "androidStatusBar": {
"backgroundColor": "#000" "backgroundColor": "#000"
@ -21,7 +24,7 @@
}, },
"updates": { "updates": {
"fallbackToCacheTimeout": 0, "fallbackToCacheTimeout": 0,
"url": "https://u.expo.dev/e3fb49ee-7c4f-4e4a-91fe-8f4f93662dde" "url": "https://u.expo.dev/311d86a0-30ce-4683-8b9f-85be18904561"
}, },
"assetBundlePatterns": [ "assetBundlePatterns": [
"**/*" "**/*"
@ -66,7 +69,7 @@
}, },
"extra": { "extra": {
"eas": { "eas": {
"projectId": "e3fb49ee-7c4f-4e4a-91fe-8f4f93662dde" "projectId": "311d86a0-30ce-4683-8b9f-85be18904561"
} }
}, },
"runtimeVersion": { "runtimeVersion": {

11
RiderApp/eas.json
View File

@ -8,17 +8,20 @@
"distribution": "internal", "distribution": "internal",
"ios": { "ios": {
"resourceClass": "m-medium" "resourceClass": "m-medium"
} },
"channel": "development"
}, },
"preview": { "preview": {
"distribution": "internal", "distribution": "internal",
"ios": { "ios": {
"resourceClass": "m-medium" "resourceClass": "m-medium"
} },
"channel": "preview"
}, },
"production": { "production": {
"ios": { "channel": "production",
"resourceClass": "m-medium" "android": {
"buildType": "apk"
} }
} }
}, },

3
RiderApp/i18n.js
View File

@ -1,5 +1,6 @@
import * as Localization from 'expo-localization' import * as Localization from 'expo-localization'
import { AsyncStorage, Platform } from 'react-native' import AsyncStorage from "@react-native-async-storage/async-storage";
import { Platform } from 'react-native'
import i18n from 'i18n-js' import i18n from 'i18n-js'
import { en } from './languages/en' import { en } from './languages/en'
import { fr } from './languages/fr' import { fr } from './languages/fr'

11
RiderApp/package.json
View File

@ -25,7 +25,7 @@
"dependencies": { "dependencies": {
"@apollo/react-hooks": "^3.1.3", "@apollo/react-hooks": "^3.1.3",
"@expo/vector-icons": "^13.0.0", "@expo/vector-icons": "^13.0.0",
"@react-native-async-storage/async-storage": "~1.17.3", "@react-native-async-storage/async-storage": "^1.17.12",
"@react-native-community/masked-view": "0.1.10", "@react-native-community/masked-view": "0.1.10",
"@react-navigation/bottom-tabs": "^5.11.11", "@react-navigation/bottom-tabs": "^5.11.11",
"@react-navigation/drawer": "^5.12.5", "@react-navigation/drawer": "^5.12.5",
@ -45,8 +45,11 @@
"expo-font": "~11.0.1", "expo-font": "~11.0.1",
"expo-localization": "~14.0.0", "expo-localization": "~14.0.0",
"expo-location": "~15.0.1", "expo-location": "~15.0.1",
"expo-modules-autolinking": "^1.5.1",
"expo-navigation-bar": "~2.0.1",
"expo-notifications": "~0.17.0", "expo-notifications": "~0.17.0",
"expo-splash-screen": "~0.17.5", "expo-splash-screen": "~0.17.5",
"expo-system-ui": "~2.0.1",
"expo-task-manager": "~11.0.1", "expo-task-manager": "~11.0.1",
"expo-updates": "~0.15.6", "expo-updates": "~0.15.6",
"graphql": "^14.3.1", "graphql": "^14.3.1",
@ -55,7 +58,7 @@
"patch-package": "^6.5.1", "patch-package": "^6.5.1",
"react": "18.1.0", "react": "18.1.0",
"react-apollo": "^2.5.8", "react-apollo": "^2.5.8",
"react-native": "0.70.5", "react-native": "0.70.8",
"react-native-animatable": "^1.3.2", "react-native-animatable": "^1.3.2",
"react-native-flash-message": "^0.1.13", "react-native-flash-message": "^0.1.13",
"react-native-gesture-handler": "~2.8.0", "react-native-gesture-handler": "~2.8.0",
@ -69,9 +72,7 @@
"react-native-screens": "~3.18.0", "react-native-screens": "~3.18.0",
"react-native-svg": "13.4.0", "react-native-svg": "13.4.0",
"react-native-webview": "11.23.1", "react-native-webview": "11.23.1",
"subscriptions-transport-ws": "^0.9.16", "subscriptions-transport-ws": "^0.9.16"
"expo-system-ui": "~2.0.1",
"expo-navigation-bar": "~2.0.1"
}, },
"devDependencies": { "devDependencies": {
"babel-preset-expo": "~9.2.1", "babel-preset-expo": "~9.2.1",

8
RiderApp/src/screens/Help/Help.js
View File

@ -12,15 +12,15 @@ const links = [
{ {
title: 'Product Page', title: 'Product Page',
url: url:
'https://market.nativebase.io/view/react-native-food-delivery-backend-app' 'https://enatega.com/enatega-single-vendor/'
}, },
{ title: 'Docs', url: 'https://enatega.gitbook.io/enatega-full-app/' }, { title: 'Docs', url: 'https://enatega.com/docs/enatega-singlevendor-rider-app-introduction/' },
{ {
title: 'Blog', title: 'Blog',
url: url:
'https://blog.nativebase.io/enatega-full-food-delivery-app-is-finally-here-a6039de4a09d' 'https://enatega.com/blog/'
}, },
{ title: 'About Us', url: 'https://ninjascode.com/pages/ourteam.html' } { title: 'About Us', url: 'https://ninjascode.com/our-team/' }
] ]
function Help() { function Help() {
const navigation = useNavigation() const navigation = useNavigation()