diff --git a/Admin Dashboard/.env.production b/Admin Dashboard/.env.production index 31716a6..4179030 100644 --- a/Admin Dashboard/.env.production +++ b/Admin Dashboard/.env.production @@ -1,8 +1,8 @@ NODE_PATH=./src SKIP_PREFLIGHT_CHECK=true REACT_APP_CLOUDINARY_UPLOAD_URL = https://api.cloudinary.com/v1_1/dimjm4ald/image/upload -REACT_APP_SERVER_URL = https://prod-enatega-single-api.herokuapp.com/ -REACT_APP_WS_SERVER_URL = wss://prod-enatega-single-api.herokuapp.com/ +REACT_APP_SERVER_URL = https://enatega-singlevendor.up.railway.app/ +REACT_APP_WS_SERVER_URL = wss://enatega-singlevendor.up.railway.app/ REACT_APP_CLOUDINARY_CATEGORY = hmtkg7s5 REACT_APP_CLOUDINARY_FOOD = wdgvyas8 REACT_APP_ENV = "prod" \ No newline at end of file diff --git a/Admin Dashboard/.env.staging b/Admin Dashboard/.env.staging index f019936..68477b4 100644 --- a/Admin Dashboard/.env.staging +++ b/Admin Dashboard/.env.staging @@ -1,8 +1,8 @@ NODE_PATH=./src SKIP_PREFLIGHT_CHECK=true REACT_APP_CLOUDINARY_UPLOAD_URL = https://api.cloudinary.com/v1_1/dimjm4ald/image/upload -REACT_APP_SERVER_URL = https://staging-enatega-single-api.herokuapp.com/ -REACT_APP_WS_SERVER_URL = wss://staging-enatega-single-api.herokuapp.com/ +REACT_APP_SERVER_URL = https://enatega-singlevendor.up.railway.app/ +REACT_APP_WS_SERVER_URL = wss://enatega-singlevendor.up.railway.app/ REACT_APP_CLOUDINARY_CATEGORY = hmtkg7s5 REACT_APP_CLOUDINARY_FOOD = wdgvyas8 REACT_APP_ENV = “staging” \ No newline at end of file diff --git a/CustomerApp/app.json b/CustomerApp/app.json index c1217fa..ea62831 100644 --- a/CustomerApp/app.json +++ b/CustomerApp/app.json @@ -1,7 +1,7 @@ { "expo": { "name": "Enatega", - "version": "1.0.20", + "version": "1.0.21", "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": 24, + "versionCode": 25, "package": "com.enatega.vendor", "googleServicesFile": "./google-services-prod.json", "config": { diff --git a/CustomerApp/environment.js b/CustomerApp/environment.js index 014d008..1eb2a37 100644 --- a/CustomerApp/environment.js +++ b/CustomerApp/environment.js @@ -7,9 +7,9 @@ import Constants from "expo-constants"; const ENV = { development: { - GRAPHQL_URL: "http://10.97.28.39:8000/graphql", - WS_GRAPHQL_URL: "ws://110.97.28.39.90:8000/graphql", - SERVER_URL: "http://110.97.28.39.90:8000/", + GRAPHQL_URL: "https://enatega-singlevendor.up.railway.app/graphql", + WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql", + SERVER_URL: "https://enatega-singlevendor.up.railway.app/", Expo_CLIENT_ID_GOOGLE: "630195385603-82e52jpb722a8l0huhkspq3tqh2d6r6f.apps.googleusercontent.com", IOS_CLIENT_ID_GOOGLE: @@ -23,9 +23,9 @@ const ENV = { 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 + GRAPHQL_URL: "https://enatega-singlevendor.up.railway.app/graphql", + WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql", + SERVER_URL: "https://enatega-singlevendor.up.railway.app/", // put / at the end of server url IOS_CLIENT_ID_GOOGLE: "967541328677-nf8h4ou7rhmq9fahs87p057rggo95eah.apps.googleusercontent.com", ANDROID_CLIENT_ID_GOOGLE: @@ -38,9 +38,9 @@ const ENV = { 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 + GRAPHQL_URL: "https://enatega-singlevendor.up.railway.app/graphql", + WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql", + SERVER_URL: "https://enatega-singlevendor.up.railway.app/", // put / at the end of server url IOS_CLIENT_ID_GOOGLE: "94983896797-irt6u2cmq2sjcp7j1rj9m9pqptjd12ue.apps.googleusercontent.com", ANDROID_CLIENT_ID_GOOGLE: diff --git a/CustomerApp/google-service-account.json b/CustomerApp/google-service-account.json new file mode 100644 index 0000000..383a25f --- /dev/null +++ b/CustomerApp/google-service-account.json @@ -0,0 +1,12 @@ +{ + "type": "service_account", + "project_id": "pc-api-8741271665364646084-744", + "private_key_id": "ac6cf3caa3f03a39b82511e6cf118e0f4349f204", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYl3+dsZuMKn8K\nqYyae5IH4ax4JbTsOipt8XTG1MQpEh2kt2oxCYi64WPWxI6waOyORo+v+IEQRbuG\nH5gaD4mGsXEsxIPhJg3lTui+FeWmglZBEe/jI7GeVqGpi/yd/pPbEqP7kJJPQWvK\nIa6PmqiLR6TMCHBm7xJ/+etvKn9sKURtxTaIgs3wZPdH8noNeP2eL3KRuB2hiFNO\ngfVAb0clCMNPPuqQoXHbowfiuFZwoquoX2lbZC3npl19dZJs2H5l7ea/zrwIU+x/\nKTKZazN9jdjElLGbfxvmb8yhuuGOXBHVOmGAITg09b1ALICGv3p2QJEPuTgfahsn\nkZmYAORvAgMBAAECggEAM82S9I08Wmx+7ra61iNHY0eZDrz2XBAvIV4MoAfRhIPy\n7l2aPoWXFqK4C0x1iKxGStLnqvz5i/WwgQsuzwIhVUneOy2H/CK4KvYMC6RRb6Ll\n93dIcltGzJNqlK3CmDy6I3CDnT7qfN+f4WJn6ba+q3IqH15qEnftVucYp4fM9IHT\n1hmKFPtPsaEsnA2VVw1lvYTWhH89lz9bJPLgMllzYJ+p/qHQDsyIdVTEVTLBniDa\ne7SOKA8P3c+jIcXQldH/4BFen4aYThHO8zcG+bj3IX5gOxrg2QrqNxRp04Lqymr0\nDsCTLaChwmGTAi+AYw84uYzDWHKDQD+yZLmXXpaOyQKBgQDHhaJmbcA4rkNYvTkr\nPQ+al8bX91xUDSDqkvJAFbUU9raZrnxiVO5MvxDMRrQAEyz4qj70RrLx2bjghRn0\nQlPewH6nSWzoRe/LE+ixXbzND1sMsK2l3N5jGD9/Y7WjhcYmHttAYNuhlw4lYh2e\nD0IQ0KIdmkXzH+hA0LsAjP584wKBgQDDyRCqZ4k3mVxg3cvCWfWCy2AfnCr0UcLS\nIwkqLoRT0vNDr5ritd15G6L6Z5IqAp/6KcfWtAy+ZbmnV6/Tvitolq5OGXTBuLmE\ncMN//kv0j3rXG0nH0yhRmG+wqurg12xAZqNoV8H0JmjcNIJmTyGBEIdBfym/sNQx\n5WNRF9P8BQKBgQCgmWBvMkhXV22+MBGkTDITLbhQfjtDLI4iQsXb750ikrPIYDqe\nq95kyCatRvv8U3MPdXnXBlFjeuzlTD3n7ruzwR4xaVjQXfr2a8ARhHJEXOfc/xnH\nOFGJUitKTugWB8fHR28UEuK23u/0B1XvtDhpcIYNbfCAEl7QTTM47kSqIQKBgFhV\nonhP6IA2aJCn4aQZtITDv+XjLxo2vYDUH/FxNXEgj3NtiqNZTMi0qG70ReVAc++J\n5ElByTIqcX5IOON/PNSej5xbLeutrb5MplhcYua/ybu96ycGZX2TGmmKZBj3+TaB\nWJ7eYXsHzW31HxSMBWDXFT9+4VZEsSimB45yAsoFAoGAWcqPXt9j6MfTuA2JGuw6\nbKLuXC4JT/Mhte0S7X5WuiKTV5CRwHYRVgyVFO69PMR4pmsmi5OHxpii9fBimgGi\nTeSwYCjrrqj2hKlPOTKDpbowNBKomDGBnLESc7uiTXlmKVLvjQTg/gxwrhjDRkSm\ndRhJ6ccoldcoZFAq1hBlajI=\n-----END PRIVATE KEY-----\n", + "client_email": "android-playstore-eas@pc-api-8741271665364646084-744.iam.gserviceaccount.com", + "client_id": "115125915270931853179", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/android-playstore-eas%40pc-api-8741271665364646084-744.iam.gserviceaccount.com" +} diff --git a/RiderApp/app.json b/RiderApp/app.json index c987629..ca73e9f 100644 --- a/RiderApp/app.json +++ b/RiderApp/app.json @@ -2,7 +2,7 @@ "expo": { "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", - "version": "4.2.6", + "version": "4.2.7", "slug": "food-delivery-rider", "privacy": "public", "androidStatusBar": { @@ -51,7 +51,7 @@ } }, "android": { - "versionCode": 14, + "versionCode": 15, "googleServicesFile": "./google-services.json", "permissions": [ "ACCESS_COARSE_LOCATION", diff --git a/RiderApp/environment.js b/RiderApp/environment.js index 9323ddc..33e09f4 100644 --- a/RiderApp/environment.js +++ b/RiderApp/environment.js @@ -8,16 +8,16 @@ const ENV = { development: { // GRAPHQL_URL: 'http://192.168.100.90:8000/graphql', // WS_GRAPHQL_URL: 'ws://192.168.100.90:8000/graphql' - GRAPHQL_URL: "https://prod-enatega-single-api.herokuapp.com/graphql", - WS_GRAPHQL_URL: "wss://prod-enatega-single-api.herokuapp.com/graphql", + GRAPHQL_URL: "https://enatega-singlevendor.up.railway.app/graphql", + WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql", }, staging: { - GRAPHQL_URL: "https://staging-enatega-single-api.herokuapp.com/graphql", - WS_GRAPHQL_URL: "wss://staging-enatega-single-api.herokuapp.com/graphql", + GRAPHQL_URL: "https://enatega-singlevendor.up.railway.app/graphql", + WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql", }, production: { - GRAPHQL_URL: "https://prod-enatega-single-api.herokuapp.com/graphql", - WS_GRAPHQL_URL: "wss://prod-enatega-single-api.herokuapp.com/graphql", + GRAPHQL_URL: "https://enatega-singlevendor.up.railway.app/graphql", + WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql", }, }; diff --git a/RiderApp/google-service-account.json b/RiderApp/google-service-account.json new file mode 100644 index 0000000..383a25f --- /dev/null +++ b/RiderApp/google-service-account.json @@ -0,0 +1,12 @@ +{ + "type": "service_account", + "project_id": "pc-api-8741271665364646084-744", + "private_key_id": "ac6cf3caa3f03a39b82511e6cf118e0f4349f204", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYl3+dsZuMKn8K\nqYyae5IH4ax4JbTsOipt8XTG1MQpEh2kt2oxCYi64WPWxI6waOyORo+v+IEQRbuG\nH5gaD4mGsXEsxIPhJg3lTui+FeWmglZBEe/jI7GeVqGpi/yd/pPbEqP7kJJPQWvK\nIa6PmqiLR6TMCHBm7xJ/+etvKn9sKURtxTaIgs3wZPdH8noNeP2eL3KRuB2hiFNO\ngfVAb0clCMNPPuqQoXHbowfiuFZwoquoX2lbZC3npl19dZJs2H5l7ea/zrwIU+x/\nKTKZazN9jdjElLGbfxvmb8yhuuGOXBHVOmGAITg09b1ALICGv3p2QJEPuTgfahsn\nkZmYAORvAgMBAAECggEAM82S9I08Wmx+7ra61iNHY0eZDrz2XBAvIV4MoAfRhIPy\n7l2aPoWXFqK4C0x1iKxGStLnqvz5i/WwgQsuzwIhVUneOy2H/CK4KvYMC6RRb6Ll\n93dIcltGzJNqlK3CmDy6I3CDnT7qfN+f4WJn6ba+q3IqH15qEnftVucYp4fM9IHT\n1hmKFPtPsaEsnA2VVw1lvYTWhH89lz9bJPLgMllzYJ+p/qHQDsyIdVTEVTLBniDa\ne7SOKA8P3c+jIcXQldH/4BFen4aYThHO8zcG+bj3IX5gOxrg2QrqNxRp04Lqymr0\nDsCTLaChwmGTAi+AYw84uYzDWHKDQD+yZLmXXpaOyQKBgQDHhaJmbcA4rkNYvTkr\nPQ+al8bX91xUDSDqkvJAFbUU9raZrnxiVO5MvxDMRrQAEyz4qj70RrLx2bjghRn0\nQlPewH6nSWzoRe/LE+ixXbzND1sMsK2l3N5jGD9/Y7WjhcYmHttAYNuhlw4lYh2e\nD0IQ0KIdmkXzH+hA0LsAjP584wKBgQDDyRCqZ4k3mVxg3cvCWfWCy2AfnCr0UcLS\nIwkqLoRT0vNDr5ritd15G6L6Z5IqAp/6KcfWtAy+ZbmnV6/Tvitolq5OGXTBuLmE\ncMN//kv0j3rXG0nH0yhRmG+wqurg12xAZqNoV8H0JmjcNIJmTyGBEIdBfym/sNQx\n5WNRF9P8BQKBgQCgmWBvMkhXV22+MBGkTDITLbhQfjtDLI4iQsXb750ikrPIYDqe\nq95kyCatRvv8U3MPdXnXBlFjeuzlTD3n7ruzwR4xaVjQXfr2a8ARhHJEXOfc/xnH\nOFGJUitKTugWB8fHR28UEuK23u/0B1XvtDhpcIYNbfCAEl7QTTM47kSqIQKBgFhV\nonhP6IA2aJCn4aQZtITDv+XjLxo2vYDUH/FxNXEgj3NtiqNZTMi0qG70ReVAc++J\n5ElByTIqcX5IOON/PNSej5xbLeutrb5MplhcYua/ybu96ycGZX2TGmmKZBj3+TaB\nWJ7eYXsHzW31HxSMBWDXFT9+4VZEsSimB45yAsoFAoGAWcqPXt9j6MfTuA2JGuw6\nbKLuXC4JT/Mhte0S7X5WuiKTV5CRwHYRVgyVFO69PMR4pmsmi5OHxpii9fBimgGi\nTeSwYCjrrqj2hKlPOTKDpbowNBKomDGBnLESc7uiTXlmKVLvjQTg/gxwrhjDRkSm\ndRhJ6ccoldcoZFAq1hBlajI=\n-----END PRIVATE KEY-----\n", + "client_email": "android-playstore-eas@pc-api-8741271665364646084-744.iam.gserviceaccount.com", + "client_id": "115125915270931853179", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/android-playstore-eas%40pc-api-8741271665364646084-744.iam.gserviceaccount.com" +}