From 2f777480a0d254016c22c885f110dced6ffb556b Mon Sep 17 00:00:00 2001
From: Alexandre POMMIER <apommier@bess-f2r2s16.clusters.42paris.fr>
Date: Sat, 24 Jun 2023 20:12:13 +0200
Subject: [PATCH] try locahost

---
 .env                                  |  6 +++---
 .gitignore                            |  4 ++--
 containers/api/src/app.controller.ts  | 10 ++++------
 containers/react/.env                 |  4 ++--
 containers/react/src/pages/canvas.tsx |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.env b/.env
index 53fa4ec5..cc9ec9b3 100644
--- a/.env
+++ b/.env
@@ -12,9 +12,9 @@
 
 #URL
 NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf"
-BASE_URL=bess-f2r2s16:8080
-REACT_APP_BASE_URL=bess-f2r2s16:8080
-REDIRECT_URI=http://bess-f2r2s16:8080/api/auth/login
+BASE_URL=localhost:8080
+REACT_APP_BASE_URL=localhost:8080
+REDIRECT_URI=http://localhost:8080/api/auth/login
 POSTGRES_HOST=postgresql
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
diff --git a/.gitignore b/.gitignore
index d9d0b8f9..4374dd6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-.env
-containers/react/.env
+# .env
+# containers/react/.env
 backend/node_modules/
 containers/backend/dist/
 
diff --git a/containers/api/src/app.controller.ts b/containers/api/src/app.controller.ts
index 76050290..73f09733 100644
--- a/containers/api/src/app.controller.ts
+++ b/containers/api/src/app.controller.ts
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/06/17 01:00:00 by apommier          #+#    #+#             */
-/*   Updated: 2023/06/23 23:24:16 by apommier         ###   ########.fr       */
+/*   Updated: 2023/06/24 20:00:09 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -369,12 +369,10 @@ export class AppController {
 	  console.log(`user in auth/login= ${user}`);
 	  console.log(`user in auth/login= ${user.username}`);
 	  const data = await this.authService.login(user);
-	  console.log(`all data in api = ${data}`)
-
+	  console.log(`all data in api = ${data}`);
 	  const myJSON = JSON.stringify(data);
-	  console.log(`all data json version= ${myJSON}`)
-
-	  console.log(`data in api = ${(await data).access_token}`)
+	  console.log(`all data json version= ${myJSON}`);
+	  console.log(`data in api = ${(await data).access_token}`);
 	//   console.log(`data i = ${(await data).access_token}`)
 	  const token = (await data).access_token;
 	//   console
diff --git a/containers/react/.env b/containers/react/.env
index 0554a08a..191f18bd 100644
--- a/containers/react/.env
+++ b/containers/react/.env
@@ -1,5 +1,5 @@
-REACT_APP_BASE_URL=bess-f2r2s16:8080
-REACT_APP_SOCKET_URL=bess-f2r2s16
+REACT_APP_BASE_URL=localhost:8080
+REACT_APP_SOCKET_URL=localhost
 REACT_APP_API_SECRET=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
 REACT_APP_CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41
 
diff --git a/containers/react/src/pages/canvas.tsx b/containers/react/src/pages/canvas.tsx
index 5bcfdb45..a08ef02d 100644
--- a/containers/react/src/pages/canvas.tsx
+++ b/containers/react/src/pages/canvas.tsx
@@ -652,7 +652,7 @@ async function draw(timestamp: number)
 			send_point();
 			// send_forced_info();
 		}
-		if (ballX > (canvas.width * 1.2) && ballX - vX > canvas.width)
+		if (ballX > (canvas.width * 1.2) && ballX - (vX * 2) > canvas.width)
 		{
 			console.log("ball out win point pls")
 			send_my_point();