Update production backend url

joonatanaatos · Jan 3, 2024 · a3008ad · a3008ad
1 parent 823fc4e
commit a3008ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/admin-panel/.env.production b/admin-panel/.env.production
@@ -1 +1 @@
-REACT_APP_BACKEND_URL=https://kukasoittaa.joonatanaatos.fi
+REACT_APP_BACKEND_URL=https://kukasoittaa.joonatanaatos.fi/api
diff --git a/admin-panel/src/util/api.ts b/admin-panel/src/util/api.ts
@@ -8,12 +8,15 @@ export const setApiToken = (token: string) => {
   apiToken = token;
 };
 
+const joinPaths = (path1: string, path2: string) =>
+  `${path1.replace(/\/$/, '')}/${path2}`;
+
 export const request = async <T>(
   path: (string | number)[],
   options?: RequestInit,
 ): Promise<T> => {
   const url = new URL(backendUrl);
-  url.pathname = path.join('/');
+  url.pathname = joinPaths(url.pathname, path.join('/'));
   const finalUrl = url.toString();
 
   return await fetch(finalUrl, {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		REACT_APP_BACKEND_URL=https://kukasoittaa.joonatanaatos.fi
		REACT_APP_BACKEND_URL=https://kukasoittaa.joonatanaatos.fi/api