From 0397efba8a1eb76dedf0f8cecc3ec3cc96b661a3 Mon Sep 17 00:00:00 2001
From: Guillaume Dorce <polynux.dev@gmail.com>
Date: Fri, 4 Nov 2022 15:35:48 +0100
Subject: [PATCH] specify custom api url for client

---
 client/src/controllers/LikeController.ts    |  5 +++--
 client/src/controllers/MessageController.ts |  9 +++++----
 client/src/controllers/UserController.ts    | 11 ++++++-----
 client/src/main.tsx                         |  7 +++++++
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/client/src/controllers/LikeController.ts b/client/src/controllers/LikeController.ts
index 00f4639..f0c6730 100644
--- a/client/src/controllers/LikeController.ts
+++ b/client/src/controllers/LikeController.ts
@@ -1,8 +1,9 @@
 import { Cookies } from "react-cookie";
+import { api } from "../main";
 
 const likePost = async (id: string) => {
   const token = new Cookies().get('token');
-  const response = await fetch(`/api/posts/like/${id}`, {
+  const response = await fetch(`${api}/posts/like/${id}`, {
     method: 'PUT',
     mode: 'cors',
     headers: {
@@ -19,7 +20,7 @@ const likePost = async (id: string) => {
 
 const unlikePost = async (id: string) => {
   const token = new Cookies().get('token');
-  const response = await fetch(`/api/posts/unlike/${id}`, {
+  const response = await fetch(`${api}/posts/unlike/${id}`, {
     method: 'PUT',
     mode: 'cors',
     headers: {
diff --git a/client/src/controllers/MessageController.ts b/client/src/controllers/MessageController.ts
index ba813a2..b2cc4ca 100644
--- a/client/src/controllers/MessageController.ts
+++ b/client/src/controllers/MessageController.ts
@@ -1,8 +1,9 @@
 import { Cookies } from 'react-cookie';
+import { api } from '../main';
 
 const getMessages = async () => {
   const token = new Cookies().get('token');
-  const response = await fetch('/api/posts', {
+  const response = await fetch(api + '/posts', {
     method: 'GET',
     headers: {
       Authorization: `Bearer ${token}`,
@@ -17,7 +18,7 @@ const getMessages = async () => {
 
 const newMessage = async (data: FormData) => {
   const token = new Cookies().get('token');
-  const response = await fetch('/api/posts/new', {
+  const response = await fetch(api + '/posts/new', {
     method: 'POST',
     body: data,
     mode: 'cors',
@@ -30,7 +31,7 @@ const newMessage = async (data: FormData) => {
 
 const deleteMessage = async (id: string) => {
   const token = new Cookies().get('token');
-  const response = await fetch(`/api/posts/delete/${id}`, {
+  const response = await fetch(`${api}/posts/delete/${id}`, {
     method: 'DELETE',
     headers: {
       Authorization: `Bearer ${token}`,
@@ -41,7 +42,7 @@ const deleteMessage = async (id: string) => {
 
 const editMessage = async (id: string, data: FormData) => {
   const token = new Cookies().get('token');
-  const response = await fetch(`/api/posts/edit/${id}`, {
+  const response = await fetch(`${api}/posts/edit/${id}`, {
     method: 'PUT',
     body: data,
     mode: 'cors',
diff --git a/client/src/controllers/UserController.ts b/client/src/controllers/UserController.ts
index eacafa5..bd7e168 100644
--- a/client/src/controllers/UserController.ts
+++ b/client/src/controllers/UserController.ts
@@ -1,9 +1,10 @@
 import { Cookies } from 'react-cookie';
+import { api } from '../main';
 
 const getMeInfo = async () => {
   const token = new Cookies().get('token');
 
-  const response = await fetch('/api/me', {
+  const response = await fetch(api + '/me', {
     method: 'GET',
     mode: 'cors',
     headers: {
@@ -21,7 +22,7 @@ const getMeInfo = async () => {
 const login = async ({ email, password }: { email: string; password: string }) => {
   const token = new Cookies().get('token');
 
-  const response = await fetch('/api/auth/login', {
+  const response = await fetch(api + '/auth/login', {
     method: 'POST',
     body: JSON.stringify({ email, password }),
     mode: 'cors',
@@ -51,7 +52,7 @@ const signup = async (formData: FormData) => {
     throw 'Passwords do not match';
   }
 
-  const response = await fetch('/api/auth/signup', {
+  const response = await fetch(api + '/auth/signup', {
     method: 'POST',
     body: JSON.stringify(form),
     mode: 'cors',
@@ -69,7 +70,7 @@ const signup = async (formData: FormData) => {
 export const giveUserRights = async (userId: string, role: string) => {
   const token = new Cookies().get('token');
   
-  const response = await fetch(`/api/users/${userId}/roles`, {
+  const response = await fetch(`${api}/users/${userId}/roles`, {
     method: 'POST',
     mode: 'cors',
     headers: {
@@ -117,7 +118,7 @@ export const changeUserInfo = async (userId: string, formData: FormData) => {
       }
     }
 
-  const response = await fetch(`/api/users/${userId}`, {
+  const response = await fetch(`${api}/users/${userId}`, {
     method: 'PUT',
     mode: 'cors',
     headers: {
diff --git a/client/src/main.tsx b/client/src/main.tsx
index 4f63be5..e03346e 100644
--- a/client/src/main.tsx
+++ b/client/src/main.tsx
@@ -3,3 +3,10 @@ import App from './App';
 import './index.css';
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(<App />);
+
+let api = '/api';
+if (import.meta.env.VITE_API_URL) {
+  api = import.meta.env.VITE_API_URL;
+}
+
+export { api };