ci(client): pass env variable to react app in the right way (#761)

.github/workflows/client.yml

@@ -99,11 +99,12 @@ jobs:
 
       - name: build
         working-directory: client
-        run: npm run build:staging
+        run: npm run build
         env:
           NODE_ENV: staging
           BASE_NAME: ${{ github.ref_name }}
           PUBLIC_URL: "https://staging.meirim.org/${{ github.ref_name }}" 
+          REACT_APP_BASE_API_URL: https://staging-api.meirim.org/api
 
       - uses: jakejarvis/s3-sync-action@master
         with:
@@ -146,6 +147,7 @@ jobs:
         env:
           PUBLIC_URL: "https://meirim.org"
           NODE_ENV: production
+          REACT_APP_BASE_API_URL: https://api.meirim.org/api
 
       - uses: jakejarvis/s3-sync-action@master
         with:

client/.env

@@ -0,0 +1,2 @@
+REACT_APP_MAPBOX_KEY=pk.eyJ1IjoibWVpcmltIiwiYSI6ImNrbWNjYmlwYjJhYzYycW42NTYzcmdpYWcifQ.lCBjl1gWMI6UxySOCCBUHg
+REACT_APP_BASE_API_URL=https://change-this.meirim.org/api

client/src/components/Map/map.jsx

@@ -10,7 +10,7 @@ import Mapbox from 'react-map-gl';
 import PropTypes from 'prop-types';
 
 mapboxgl.workerClass = MapboxWorker;
-const apiKey = process.env.CONFIG.mapboxApiKey;
+const apiKey = process.env.REACT_APP_MAPBOX_KEY;
 
 
 export const Map = ({ onMouseMove, id, children, onClick, initialViewState, interactiveLayerIds, style, mapStyle = 'mapbox://styles/mapbox/light-v11' }) => {

client/src/services/api.js

@@ -1,6 +1,9 @@
 import axios from 'axios'
 
-const instance = axios.create(process.env.CONFIG.axios)
+const instance = axios.create({
+	"baseURL": process.env.REACT_APP_BASE_API_URL,
+	"withCredentials": true
+})
 
 export default {
 	get: (path, data, options) => instance.get(path, { params: data }, options)

client/src/services/paymentApi.js

@@ -1,8 +1,8 @@
 const axios = require('axios');
-const config = process.env.CONFIG.axios;
+const config = process.env.REACT_APP_BASE_API_URL
 
 const instance = axios.create({
-    baseURL: `${config.baseURL}/funding`
+    baseURL: `${config}/funding`
 })
 
 module.exports = {