diff --git a/CustomerApp/app.json b/CustomerApp/app.json index c52d515..9b54e6a 100644 --- a/CustomerApp/app.json +++ b/CustomerApp/app.json @@ -1,7 +1,7 @@ { "expo": { "name": "Enatega", - "version": "1.0.16", + "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", @@ -46,7 +46,7 @@ "androidCollapsedTitle": "Enatega" }, "android": { - "versionCode": 22, + "versionCode": 23, "package": "com.enatega.vendor", "googleServicesFile": "./google-services-prod.json", "config": { diff --git a/CustomerApp/assets/.DS_Store b/CustomerApp/assets/.DS_Store index c6776ac..13cb151 100644 Binary files a/CustomerApp/assets/.DS_Store and b/CustomerApp/assets/.DS_Store differ diff --git a/CustomerApp/eas.json b/CustomerApp/eas.json index c1098c4..3277943 100644 --- a/CustomerApp/eas.json +++ b/CustomerApp/eas.json @@ -6,9 +6,6 @@ "development": { "developmentClient": true, "distribution": "internal", - "android": { - "buildType": "apk" - }, "ios": { "resourceClass": "m-medium" } @@ -23,16 +20,22 @@ "developmentClient": false, "releaseChannel": "production", "distribution": "store", - "android": { - "buildType": "apk" - }, "ios": { - "buildConfiguration": "Debug", - "image": "latest" + "resourceClass": "m-medium" } } }, "submit": { - "production": {} + "production": { + "android": { + "serviceAccountKeyPath": "./google-service-account.json", + "track": "production" + }, + "ios": { + "appleId": "sharan.gohar@icloud.com", + "ascAppId": "1526488093", + "appleTeamId": "GDFK7MVY6P" + } + } } } diff --git a/CustomerApp/environment.js b/CustomerApp/environment.js index 666fa4c..761fe5b 100644 --- a/CustomerApp/environment.js +++ b/CustomerApp/environment.js @@ -10,23 +10,27 @@ const ENV = { 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: "", - ANDROID_CLIENT_ID_GOOGLE: "", - FACEBOOK_APP_ID: "404956210315749", - AMPLITUDE_API_KEY: "", - STRIPE_PUBLIC_KEY: "", - STRIPE_IMAGE_URL: "http://10.97.28.88.90:8000/assets/images/logo.png", + 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: "", - ANDROID_CLIENT_ID_GOOGLE: "", + 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: "", - STRIPE_PUBLIC_KEY: "", + 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", @@ -35,11 +39,13 @@ const ENV = { 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: "", - ANDROID_CLIENT_ID_GOOGLE: "", + 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: "", - STRIPE_PUBLIC_KEY: "", + 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", diff --git a/CustomerApp/package-lock.json b/CustomerApp/package-lock.json index eff6d35..32b8cac 100644 --- a/CustomerApp/package-lock.json +++ b/CustomerApp/package-lock.json @@ -69,7 +69,7 @@ "react-native-material-textfield": "^0.16.1", "react-native-modal": "^13.0.1", "react-native-modalize": "^2.0.8", - "react-native-reanimated": "~2.9.1", + "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", @@ -19528,11 +19528,10 @@ } }, "node_modules/react-native-reanimated": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.9.1.tgz", - "integrity": "sha512-309SIhDBwY4F1n6e5Mr5D1uPZm2ESIcmZsGXHUu8hpKX4oIOlZj2MilTk+kHhi05LjChoJkcpfkstotCJmPRPg==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.12.0.tgz", + "integrity": "sha512-nrlPyw+Hx9u4iJhZk9PoTvDo/QmVAd+bo7OK9Tv3hveNEF9++5oig/g3Uv9V93shy9avTYGsUprUvAEt/xdzeQ==", "dependencies": { - "@babel/plugin-proposal-export-namespace-from": "^7.17.12", "@babel/plugin-transform-object-assign": "^7.16.7", "@babel/preset-typescript": "^7.16.7", "@types/invariant": "^2.2.35", diff --git a/CustomerApp/package.json b/CustomerApp/package.json index c3aa4b7..a5035b2 100644 --- a/CustomerApp/package.json +++ b/CustomerApp/package.json @@ -25,7 +25,6 @@ "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", @@ -84,7 +83,7 @@ "react-native-material-textfield": "^0.16.1", "react-native-modal": "^13.0.1", "react-native-modalize": "^2.0.8", - "react-native-reanimated": "~2.9.1", + "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",