prev

Author: SilviaAmAm

frontend/.env.example

@@ -1,4 +1,2 @@
-REACT_APP_API_SCHEME=http
-REACT_APP_API_HOST=localhost
-REACT_APP_API_PORT=8080
+REACT_APP_API_URL=http://localhost:8080
 REACT_APP_API_PATH=/api/v1

frontend/.env.production.template

@@ -1,4 +1,2 @@
-REACT_APP_API_SCHEME=REACT_APP_API_SCHEME_PLACEHOLDER
-REACT_APP_API_HOST=REACT_APP_API_HOST_PLACEHOLDER
-REACT_APP_API_PORT=REACT_APP_API_PORT_PLACEHOLDER
+REACT_APP_API_URL=REACT_APP_API_URL_PLACEHOLDER
 REACT_APP_API_PATH=REACT_APP_API_PATH_PLACEHOLDER

frontend/scripts/replace-envvars.sh

@@ -4,8 +4,6 @@ set -eux -o pipefail
 
 for file in /app/static/js/*.js;
 do
-  sed -i 's|REACT_APP_API_SCHEME_PLACEHOLDER|'${REACT_APP_API_SCHEME}'|g' $file
-  sed -i 's|REACT_APP_API_HOST_PLACEHOLDER|'${REACT_APP_API_HOST}'|g' $file
-  sed -i 's|REACT_APP_API_PORT_PLACEHOLDER|'${REACT_APP_API_PORT}'|g' $file
+  sed -i 's|REACT_APP_API_URL_PLACEHOLDER|'${REACT_APP_API_URL}'|g' $file
   sed -i 's|REACT_APP_API_PATH_PLACEHOLDER|'${REACT_APP_API_PATH}'|g' $file
 done

frontend/src/lib/api/request.ts

@@ -1,19 +1,13 @@
 import { getCookie } from "../cookie/cookie";
 
 /** Scheme for all API requests. */
-export const API_SCHEME = process.env.REACT_APP_API_SCHEME;
-
-/** The host for the API server. */
-export const API_HOST = process.env.REACT_APP_API_HOST;
-
-/** The port for the API server. */
-export const API_PORT = process.env.REACT_APP_API_PORT;
+export const API_URL = process.env.REACT_APP_API_URL;
 
 /** The base path for all API requests. */
 export const API_PATH = process.env.REACT_APP_API_PATH;
 
 /** The base url for all API requests. */
-export const API_BASE_URL = `${API_SCHEME}://${API_HOST}:${API_PORT}${API_PATH}`;
+export const API_BASE_URL = `${API_URL}${API_PATH}`;
 
 /**
  * Makes an actual fetch request to the API, should be used by all other API implementations.