From 8cb756a2ae068369cc143c838679ff635f48c435 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 14:09:33 +0200
Subject: [PATCH 01/47] auto push

---
 containers/test | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 containers/test

diff --git a/containers/test b/containers/test
new file mode 100644
index 00000000..e69de29b

From c501524a403a5111cf9a85a37c6cc677c0cdd9ca Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 14:22:11 +0200
Subject: [PATCH 02/47] auto push

---
 containers/test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/containers/test b/containers/test
index e69de29b..3deae27f 100644
--- a/containers/test
+++ b/containers/test
@@ -0,0 +1 @@
+cc toi
\ No newline at end of file

From 08985f9eeca675901b762eab1c4c8ab3725972e5 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 14:24:11 +0200
Subject: [PATCH 03/47] auto push

---
 containers/test | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/containers/test b/containers/test
index 3deae27f..f7eced04 100644
--- a/containers/test
+++ b/containers/test
@@ -1 +1,2 @@
-cc toi
\ No newline at end of file
+cc toi
+cc 2
\ No newline at end of file

From 2107ab31a4e4989d54867518d63ae19cbd0b703b Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:23:11 +0200
Subject: [PATCH 04/47] auto push

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 04b613cb..97febb2a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
     # command: sh -c "envsubst < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
     ports:
-      - 80:80
+      - 8080:8080
     volumes:
      - ./conf/nginx.conf:/etc/nginx/conf.d/default.conf
     # volumes:

From ad7016c4650e2eeafd33c18fbe2cabc1cb04ffcf Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:27:11 +0200
Subject: [PATCH 05/47] auto push

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 97febb2a..04b613cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
     # command: sh -c "envsubst < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
     ports:
-      - 8080:8080
+      - 80:80
     volumes:
      - ./conf/nginx.conf:/etc/nginx/conf.d/default.conf
     # volumes:

From 23c601187340151e4a624b4a4fa045050ce6786a Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:46:11 +0200
Subject: [PATCH 06/47] auto push

---
 containers/react/src/script/axiosApi.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index bf7dbbb5..f43c7ee7 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -13,7 +13,8 @@ console.log(`getToken = ${getToken()}`)
 console.log(`Bearer ${localStorage.getItem("token")}`)
 
 let api = axios.create({
-  baseURL: 'http://localhost/api', 
+//   baseURL: 'http://localhost/api', 
+baseURL: 'http://localhost/api', 
   headers: {
 	//   Authorization: `Bearer ${getToken()}`,
 		Authorization : `Bearer ${localStorage.getItem("token")}`

From 268f2d12779a4e2bf38d50a511ea1a438a217b7b Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:47:11 +0200
Subject: [PATCH 07/47] auto push

---
 containers/react/src/script/axiosApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index f43c7ee7..27a17a8c 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -14,7 +14,7 @@ console.log(`Bearer ${localStorage.getItem("token")}`)
 
 let api = axios.create({
 //   baseURL: 'http://localhost/api', 
-baseURL: 'http://localhost/api', 
+baseURL: 'http://' + process.env.BASE_URL + '/api', 
   headers: {
 	//   Authorization: `Bearer ${getToken()}`,
 		Authorization : `Bearer ${localStorage.getItem("token")}`

From d6f467386e868e99787c39b24deb103cf9fe96f2 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:49:11 +0200
Subject: [PATCH 08/47] auto push

---
 containers/react/src/script/axiosApi.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 27a17a8c..28eaffa2 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -12,6 +12,10 @@ function getToken() {
 console.log(`getToken = ${getToken()}`)
 console.log(`Bearer ${localStorage.getItem("token")}`)
 
+const url = 
+
+console.log("url= ", url)
+
 let api = axios.create({
 //   baseURL: 'http://localhost/api', 
 baseURL: 'http://' + process.env.BASE_URL + '/api', 

From 799534a9b75db8ba1f95c6c143ccdf96869be3a0 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:50:11 +0200
Subject: [PATCH 09/47] auto push

---
 containers/react/src/script/axiosApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 28eaffa2..885c7d06 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -12,7 +12,7 @@ function getToken() {
 console.log(`getToken = ${getToken()}`)
 console.log(`Bearer ${localStorage.getItem("token")}`)
 
-const url = 
+const url = 'http://' + process.env.BASE_URL + '/api'
 
 console.log("url= ", url)
 

From 0a34bbf1e5e2f3869e76e33de38a7e5588fd8d86 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:54:11 +0200
Subject: [PATCH 10/47] auto push

---
 containers/react/src/script/axiosApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 885c7d06..093d9787 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -12,7 +12,7 @@ function getToken() {
 console.log(`getToken = ${getToken()}`)
 console.log(`Bearer ${localStorage.getItem("token")}`)
 
-const url = 'http://' + process.env.BASE_URL + '/api'
+const url = 'http://' + {process.env.BASE_URL} + '/api'
 
 console.log("url= ", url)
 

From 2dcd6bdb47698dfc3f5fca84e9a21d85b5d015a9 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:55:11 +0200
Subject: [PATCH 11/47] auto push

---
 containers/react/src/script/axiosApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 093d9787..885c7d06 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -12,7 +12,7 @@ function getToken() {
 console.log(`getToken = ${getToken()}`)
 console.log(`Bearer ${localStorage.getItem("token")}`)
 
-const url = 'http://' + {process.env.BASE_URL} + '/api'
+const url = 'http://' + process.env.BASE_URL + '/api'
 
 console.log("url= ", url)
 

From 9bfab8f9b791c03ecfdb05823d23aafca1739be3 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:57:11 +0200
Subject: [PATCH 12/47] auto push

---
 containers/react/.env | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 containers/react/.env

diff --git a/containers/react/.env b/containers/react/.env
new file mode 100644
index 00000000..e69de29b

From 1c5cfd949e39bb45fe16de5886f017b5a80931b8 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 16:58:11 +0200
Subject: [PATCH 13/47] auto push

---
 containers/react/.env                   | 1 +
 containers/react/src/script/axiosApi.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/containers/react/.env b/containers/react/.env
index e69de29b..e4c43b6d 100644
--- a/containers/react/.env
+++ b/containers/react/.env
@@ -0,0 +1 @@
+BASE_URL=http://localhost
\ No newline at end of file
diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 885c7d06..1a98263b 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -15,6 +15,8 @@ console.log(`Bearer ${localStorage.getItem("token")}`)
 const url = 'http://' + process.env.BASE_URL + '/api'
 
 console.log("url= ", url)
+console.log("env= ", process.env)
+console.log("env= ", process.env.BASE_URL)
 
 let api = axios.create({
 //   baseURL: 'http://localhost/api', 

From 1fc843740ece78076041db29e9893f9a56ed7052 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:00:11 +0200
Subject: [PATCH 14/47] auto push

---
 containers/react/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/.env b/containers/react/.env
index e4c43b6d..bc523d0d 100644
--- a/containers/react/.env
+++ b/containers/react/.env
@@ -1 +1 @@
-BASE_URL=http://localhost
\ No newline at end of file
+BASE_URL=localhost
\ No newline at end of file

From c4c360c7a2da19a8e261dbeab65a19086b6a07a6 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:01:11 +0200
Subject: [PATCH 15/47] auto push

---
 containers/react/src/script/axiosApi.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 1a98263b..17ecabce 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -12,7 +12,9 @@ function getToken() {
 console.log(`getToken = ${getToken()}`)
 console.log(`Bearer ${localStorage.getItem("token")}`)
 
-const url = 'http://' + process.env.BASE_URL + '/api'
+const test = "192.168.1.19"
+// const url = 'http://' + process.env.BASE_URL + '/api'
+const url = 'http://' + test + '/api'
 
 console.log("url= ", url)
 console.log("env= ", process.env)

From 080987cc31e0f6359958b64366ba42a762ba3bfc Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:02:11 +0200
Subject: [PATCH 16/47] auto push

---
 containers/react/src/script/axiosApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 17ecabce..4351c2e4 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -17,7 +17,7 @@ const test = "192.168.1.19"
 const url = 'http://' + test + '/api'
 
 console.log("url= ", url)
-console.log("env= ", process.env)
+console.log("test= ", test)
 console.log("env= ", process.env.BASE_URL)
 
 let api = axios.create({

From a83842ae9d711479ec48b8a8136461587350253a Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:03:11 +0200
Subject: [PATCH 17/47] auto push

---
 containers/react/src/script/axiosApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 4351c2e4..4d0a2717 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -22,7 +22,7 @@ console.log("env= ", process.env.BASE_URL)
 
 let api = axios.create({
 //   baseURL: 'http://localhost/api', 
-baseURL: 'http://' + process.env.BASE_URL + '/api', 
+baseURL: 'http://' + test + '/api', 
   headers: {
 	//   Authorization: `Bearer ${getToken()}`,
 		Authorization : `Bearer ${localStorage.getItem("token")}`

From 3a0ceabcd0a610cb862decef7c891a61ebe3e91b Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:48:11 +0200
Subject: [PATCH 18/47] auto push

---
 containers/api/src/app.controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/api/src/app.controller.ts b/containers/api/src/app.controller.ts
index c5beab79..08e30ba6 100644
--- a/containers/api/src/app.controller.ts
+++ b/containers/api/src/app.controller.ts
@@ -267,7 +267,7 @@ export class AppController {
 
 
 
-@Redirect('http://localhost/token', 302)
+@Redirect('http://'localhost'/token', 302)
 @Get('auth/login')
   async login2(@Req() request: Request) {
 	  const url = request.url;

From 776e36d310d3d9bf5b1611ab1c501dbb33bc6a36 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:49:11 +0200
Subject: [PATCH 19/47] auto push

---
 containers/api/src/app.controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/api/src/app.controller.ts b/containers/api/src/app.controller.ts
index 08e30ba6..c5c60ace 100644
--- a/containers/api/src/app.controller.ts
+++ b/containers/api/src/app.controller.ts
@@ -267,7 +267,7 @@ export class AppController {
 
 
 
-@Redirect('http://'localhost'/token', 302)
+@Redirect('http://' + process.env.BASE_URL + '/token', 302)
 @Get('auth/login')
   async login2(@Req() request: Request) {
 	  const url = request.url;

From 9a141a829dcc66c4a72830c7d54c8ca49b84b99f Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:50:11 +0200
Subject: [PATCH 20/47] auto push

---
 containers/api/src/app.controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/api/src/app.controller.ts b/containers/api/src/app.controller.ts
index c5c60ace..f71d4eb5 100644
--- a/containers/api/src/app.controller.ts
+++ b/containers/api/src/app.controller.ts
@@ -285,7 +285,7 @@ export class AppController {
 	  const token = (await data).access_token;
 	//   console
 	  await this.userService.save(user);
-	  return { url: `http://localhost/token?data=${encodeURIComponent(JSON.stringify(token))}` };
+	  return { url: 'http://' + process.env.BASE_URL + 'localhost/token?data=${encodeURIComponent(JSON.stringify(token))}' };
   }
 
   @UseGuards(JwtAuthGuard)

From 313eefd752a11dc7c897a102a2ed2072a15027d8 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:51:11 +0200
Subject: [PATCH 21/47] auto push

---
 containers/api/src/app.controller.ts | 2 +-
 containers/react/.env                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/containers/api/src/app.controller.ts b/containers/api/src/app.controller.ts
index f71d4eb5..791dece9 100644
--- a/containers/api/src/app.controller.ts
+++ b/containers/api/src/app.controller.ts
@@ -285,7 +285,7 @@ export class AppController {
 	  const token = (await data).access_token;
 	//   console
 	  await this.userService.save(user);
-	  return { url: 'http://' + process.env.BASE_URL + 'localhost/token?data=${encodeURIComponent(JSON.stringify(token))}' };
+	  return { url: 'http://' + process.env.BASE_URL + '/token?data=${encodeURIComponent(JSON.stringify(token))}' };
   }
 
   @UseGuards(JwtAuthGuard)
diff --git a/containers/react/.env b/containers/react/.env
index bc523d0d..5e340cd3 100644
--- a/containers/react/.env
+++ b/containers/react/.env
@@ -1 +1 @@
-BASE_URL=localhost
\ No newline at end of file
+BASE_URL=192.168.1.19
\ No newline at end of file

From 82fc61885df8e9944d9eabd9c024c7d57d70abfd Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 17:55:02 +0200
Subject: [PATCH 22/47] auto push

---
 .env | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index e81c3999..c204e9a1 100644
--- a/.env
+++ b/.env
@@ -13,7 +13,8 @@
 #URL
 NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf"
 
-BASE_URL=http://localhost
+# BASE_URL=http://localhost
+BASE_URL=192.168.1.19
 
 #postgres var
 # POSTGRES_HOST=127.0.0.1

From 7b8e3983c57b1aafef0cfed06c8d39ba2692ae35 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:05:04 +0200
Subject: [PATCH 23/47] auto push

---
 containers/react/src/components/App.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/containers/react/src/components/App.jsx b/containers/react/src/components/App.jsx
index 27d570b3..7308c286 100644
--- a/containers/react/src/components/App.jsx
+++ b/containers/react/src/components/App.jsx
@@ -30,8 +30,8 @@ function AnimatedRoute () {
 				<Route exact path="/" element={<HomeLogin/>}/>
 				<Route exact path="/token" element={<SuccessToken />}/>
 
-				<Route path="/404" element={<HomeLogin/>} />
-          		<Route path="*" element={<Navigate to="/404" />} />
+				{/* <Route path="/404" element={<HomeLogin/>} /> */}
+          		{/* <Route path="*" element={<Navigate to="/404" />} /> */}
 			</Routes>
 		</AnimatePresence>
 		)

From 8a706ad98727f29c0b9c1205a76f3abf9a7da909 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:11:04 +0200
Subject: [PATCH 24/47] auto push

---
 containers/api/src/auth/login42.ts                 | 2 +-
 containers/react/src/components/Profile/Logout.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/containers/api/src/auth/login42.ts b/containers/api/src/auth/login42.ts
index da09b7f3..12b23014 100644
--- a/containers/api/src/auth/login42.ts
+++ b/containers/api/src/auth/login42.ts
@@ -28,7 +28,7 @@ export class loginClass {
 			// client_secret: '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',
 			client_secret: process.env.API_SECRET,
 			code: code,
-			redirect_uri: process.env.REDIRECT_URI || 'http://localhost:80/api/auth/login',
+			redirect_uri: process.env.REDIRECT_URI || 'http://192.168.1.19:80/api/auth/login',
 		  };
 
 		try {
diff --git a/containers/react/src/components/Profile/Logout.jsx b/containers/react/src/components/Profile/Logout.jsx
index dd422844..788e7b62 100644
--- a/containers/react/src/components/Profile/Logout.jsx
+++ b/containers/react/src/components/Profile/Logout.jsx
@@ -4,7 +4,7 @@
 function Logout(){
 
 	localStorage.clear();
-	const path = `http://localhost/`; 
+	const path = `http://''/`; 
 	// history(path, { replace: true });
 	// window.location.replace(path);
 	// window.history.pushState({}, '', path);

From aac7bfef3b4c53f697de0c87ed4d302c407ebec7 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:12:04 +0200
Subject: [PATCH 25/47] auto push

---
 containers/react/src/components/Profile/Logout.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/components/Profile/Logout.jsx b/containers/react/src/components/Profile/Logout.jsx
index 788e7b62..8a473a18 100644
--- a/containers/react/src/components/Profile/Logout.jsx
+++ b/containers/react/src/components/Profile/Logout.jsx
@@ -4,7 +4,7 @@
 function Logout(){
 
 	localStorage.clear();
-	const path = `http://''/`; 
+	const path = 'http://' + process.env.BASE_URL + '/'; 
 	// history(path, { replace: true });
 	// window.location.replace(path);
 	// window.history.pushState({}, '', path);

From 3b1e80503b1e7ff057c169d38205328239dfc8ae Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:14:04 +0200
Subject: [PATCH 26/47] auto push

---
 containers/react/src/pages/Home.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/pages/Home.js b/containers/react/src/pages/Home.js
index 5273ff21..3b255b54 100644
--- a/containers/react/src/pages/Home.js
+++ b/containers/react/src/pages/Home.js
@@ -26,7 +26,7 @@ function HomeLogin()
 			return ;
 		}
 		// else
-		let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2Flocalhost%3A80%2Fapi%2Fauth%2Flogin&response_type=code"; 
+		let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2F" +  + "%3A80%2Fapi%2Fauth%2Flogin&response_type=code"; 
 		window.location.replace(path);
 	};
 

From d6356c6520bd549812d1b91e60872bffda2e09ad Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:15:04 +0200
Subject: [PATCH 27/47] auto push

---
 containers/react/src/pages/Home.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/pages/Home.js b/containers/react/src/pages/Home.js
index 3b255b54..ae72887c 100644
--- a/containers/react/src/pages/Home.js
+++ b/containers/react/src/pages/Home.js
@@ -26,7 +26,7 @@ function HomeLogin()
 			return ;
 		}
 		// else
-		let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2F" +  + "%3A80%2Fapi%2Fauth%2Flogin&response_type=code"; 
+		let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2F" + process.env.BASE_URL + "%3A80%2Fapi%2Fauth%2Flogin&response_type=code"; 
 		window.location.replace(path);
 	};
 

From 25b955030beea2dcd02107699312d76b88c04345 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:17:04 +0200
Subject: [PATCH 28/47] auto push

---
 containers/react/.env                              | 3 ++-
 containers/react/src/components/Profile/Logout.jsx | 2 +-
 containers/react/src/pages/Home.js                 | 2 +-
 containers/react/src/script/axiosApi.js            | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/containers/react/.env b/containers/react/.env
index 5e340cd3..1be57bc2 100644
--- a/containers/react/.env
+++ b/containers/react/.env
@@ -1 +1,2 @@
-BASE_URL=192.168.1.19
\ No newline at end of file
+REACT_APP_BASE_URL=192.168.1.19
+# REACT_APP_BASE_URL=192.168.1.19
\ No newline at end of file
diff --git a/containers/react/src/components/Profile/Logout.jsx b/containers/react/src/components/Profile/Logout.jsx
index 8a473a18..029078d5 100644
--- a/containers/react/src/components/Profile/Logout.jsx
+++ b/containers/react/src/components/Profile/Logout.jsx
@@ -4,7 +4,7 @@
 function Logout(){
 
 	localStorage.clear();
-	const path = 'http://' + process.env.BASE_URL + '/'; 
+	const path = 'http://' + process.env.REACT_APP_BASE_URL + '/'; 
 	// history(path, { replace: true });
 	// window.location.replace(path);
 	// window.history.pushState({}, '', path);
diff --git a/containers/react/src/pages/Home.js b/containers/react/src/pages/Home.js
index ae72887c..76d98fcf 100644
--- a/containers/react/src/pages/Home.js
+++ b/containers/react/src/pages/Home.js
@@ -26,7 +26,7 @@ function HomeLogin()
 			return ;
 		}
 		// else
-		let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2F" + process.env.BASE_URL + "%3A80%2Fapi%2Fauth%2Flogin&response_type=code"; 
+		let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2F" + process.env.REACT_APP_BASE_URL + "%3A80%2Fapi%2Fauth%2Flogin&response_type=code"; 
 		window.location.replace(path);
 	};
 
diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 4d0a2717..8a73d37a 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -13,12 +13,12 @@ console.log(`getToken = ${getToken()}`)
 console.log(`Bearer ${localStorage.getItem("token")}`)
 
 const test = "192.168.1.19"
-// const url = 'http://' + process.env.BASE_URL + '/api'
+// const url = 'http://' + process.env.REACT_APP_BASE_URL + '/api'
 const url = 'http://' + test + '/api'
 
 console.log("url= ", url)
 console.log("test= ", test)
-console.log("env= ", process.env.BASE_URL)
+console.log("env= ", process.env.REACT_APP_BASE_URL)
 
 let api = axios.create({
 //   baseURL: 'http://localhost/api', 

From 1cb5f86b2980612368567adb37b4f8bf8d9c8252 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:18:03 +0200
Subject: [PATCH 29/47] auto push

---
 .env | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index c204e9a1..8b482b83 100644
--- a/.env
+++ b/.env
@@ -15,7 +15,7 @@ NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf"
 
 # BASE_URL=http://localhost
 BASE_URL=192.168.1.19
-
+REACT_APP_BASE_URL=192.168.1.19
 #postgres var
 # POSTGRES_HOST=127.0.0.1
 # DB_TYPE=postgres
@@ -40,6 +40,7 @@ REACT_HOST=0.0.0.0
 
 #auth var
 JWT_SECRET=secrethere
-REDIRECT_URI=http://localhost:80/api/auth/login
+# REDIRECT_URI=http://localhost:80/api/auth/login
+REDIRECT_URI=http://192.168.1.19:80/api/auth/login
 API_SECRET=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
 CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41
\ No newline at end of file

From 58a2968daf1c1eec6356f6485c2343bbd957a78d Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:22:04 +0200
Subject: [PATCH 30/47] auto push

---
 containers/api/src/app.controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/api/src/app.controller.ts b/containers/api/src/app.controller.ts
index 791dece9..7c20f0ca 100644
--- a/containers/api/src/app.controller.ts
+++ b/containers/api/src/app.controller.ts
@@ -285,7 +285,7 @@ export class AppController {
 	  const token = (await data).access_token;
 	//   console
 	  await this.userService.save(user);
-	  return { url: 'http://' + process.env.BASE_URL + '/token?data=${encodeURIComponent(JSON.stringify(token))}' };
+	  return { url: 'http://' + process.env.BASE_URL + `/token?data=${encodeURIComponent(JSON.stringify(token))}` };
   }
 
   @UseGuards(JwtAuthGuard)

From 00aafd9d8ef31e96feb8af9aa89576a66f9a614b Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:25:04 +0200
Subject: [PATCH 31/47] auto push

---
 containers/api/src/auth/login42.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/api/src/auth/login42.ts b/containers/api/src/auth/login42.ts
index 12b23014..33dcb7e8 100644
--- a/containers/api/src/auth/login42.ts
+++ b/containers/api/src/auth/login42.ts
@@ -28,7 +28,7 @@ export class loginClass {
 			// client_secret: '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',
 			client_secret: process.env.API_SECRET,
 			code: code,
-			redirect_uri: process.env.REDIRECT_URI || 'http://192.168.1.19:80/api/auth/login',
+			redirect_uri: process.env.REDIRECT_URI || 'http://'192.168.1.19':80/api/auth/login',
 		  };
 
 		try {

From 594969b93a594613c81b474b6a7cea9545f9a09a Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:26:04 +0200
Subject: [PATCH 32/47] auto push

---
 containers/api/src/auth/login42.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/api/src/auth/login42.ts b/containers/api/src/auth/login42.ts
index 33dcb7e8..e098ecf4 100644
--- a/containers/api/src/auth/login42.ts
+++ b/containers/api/src/auth/login42.ts
@@ -28,7 +28,7 @@ export class loginClass {
 			// client_secret: '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',
 			client_secret: process.env.API_SECRET,
 			code: code,
-			redirect_uri: process.env.REDIRECT_URI || 'http://'192.168.1.19':80/api/auth/login',
+			redirect_uri: process.env.REDIRECT_URI || 'http://'+ process.env.REACT_APP_BASE_URL +'/api/auth/login',
 		  };
 
 		try {

From 16c46744ca3bafcc09d0cb911d7f15150e83e3eb Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:27:04 +0200
Subject: [PATCH 33/47] auto push

---
 containers/api/src/auth/login42.ts   | 2 +-
 containers/react/src/pages/canvas.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/containers/api/src/auth/login42.ts b/containers/api/src/auth/login42.ts
index e098ecf4..8f44f2e4 100644
--- a/containers/api/src/auth/login42.ts
+++ b/containers/api/src/auth/login42.ts
@@ -28,7 +28,7 @@ export class loginClass {
 			// client_secret: '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',
 			client_secret: process.env.API_SECRET,
 			code: code,
-			redirect_uri: process.env.REDIRECT_URI || 'http://'+ process.env.REACT_APP_BASE_URL +'/api/auth/login',
+			redirect_uri: process.env.REDIRECT_URI || 'http://' + process.env.REACT_APP_BASE_URL + '/api/auth/login',
 		  };
 
 		try {
diff --git a/containers/react/src/pages/canvas.js b/containers/react/src/pages/canvas.js
index ae4785ff..d8d90664 100644
--- a/containers/react/src/pages/canvas.js
+++ b/containers/react/src/pages/canvas.js
@@ -390,7 +390,7 @@ function draw(timestamp)
 			api.post('/status', {status: 1});
 			console.log("send loose");
 		}
-		window.location.replace("http://localhost/pong");
+		window.location.replace("http://" + process.env.REACT_APP_BASE_URL + "/pong");
 		return ;
 	}
 

From fb65a41dea91570c8aeb232737acccdd3d406fdd Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:28:04 +0200
Subject: [PATCH 34/47] auto push

---
 containers/react/src/script/tokenSuccess.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/script/tokenSuccess.js b/containers/react/src/script/tokenSuccess.js
index 87686fca..e8756513 100644
--- a/containers/react/src/script/tokenSuccess.js
+++ b/containers/react/src/script/tokenSuccess.js
@@ -7,7 +7,7 @@ function SuccessToken() {
   const cleanData = data.slice(1, -1);
   localStorage.setItem('token', `${cleanData}`);
   console.log(`prout token2= ${localStorage.getItem('token')}`)
-  window.location.replace("http://localhost/pong");
+  window.location.replace("http://" + process.env.REACT_APP_BASE_URL + "/pong");
 }
 
 export default SuccessToken;
\ No newline at end of file

From cdb7c748929f03daa0390517fb7bbd9df79f3fc1 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:40:04 +0200
Subject: [PATCH 35/47] auto push

---
 containers/react/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/.env b/containers/react/.env
index 1be57bc2..164f6aa7 100644
--- a/containers/react/.env
+++ b/containers/react/.env
@@ -1,2 +1,2 @@
-REACT_APP_BASE_URL=192.168.1.19
+REACT_APP_BASE_URL=92.143.191.152
 # REACT_APP_BASE_URL=192.168.1.19
\ No newline at end of file

From 70f9535847ca4dec036779062952fbd3f010695f Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:42:03 +0200
Subject: [PATCH 36/47] auto push

---
 .env | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 8b482b83..4b96a475 100644
--- a/.env
+++ b/.env
@@ -14,8 +14,9 @@
 NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf"
 
 # BASE_URL=http://localhost
-BASE_URL=192.168.1.19
-REACT_APP_BASE_URL=192.168.1.19
+BASE_URL=92.143.191.152
+REACT_APP_BASE_URL=92.143.191.152
+REDIRECT_URI=http://92.143.191.152/api/auth/login
 #postgres var
 # POSTGRES_HOST=127.0.0.1
 # DB_TYPE=postgres
@@ -41,6 +42,5 @@ REACT_HOST=0.0.0.0
 #auth var
 JWT_SECRET=secrethere
 # REDIRECT_URI=http://localhost:80/api/auth/login
-REDIRECT_URI=http://192.168.1.19:80/api/auth/login
 API_SECRET=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
 CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41
\ No newline at end of file

From 381d188c79c5a4fd971e3e19134e8bec62867cdc Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:48:04 +0200
Subject: [PATCH 37/47] auto push

---
 containers/react/src/pages/Home.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/containers/react/src/pages/Home.js b/containers/react/src/pages/Home.js
index 76d98fcf..62cee02d 100644
--- a/containers/react/src/pages/Home.js
+++ b/containers/react/src/pages/Home.js
@@ -26,7 +26,8 @@ function HomeLogin()
 			return ;
 		}
 		// else
-		let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2F" + process.env.REACT_APP_BASE_URL + "%3A80%2Fapi%2Fauth%2Flogin&response_type=code"; 
+		// let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2F" + process.env.REACT_APP_BASE_URL + "%3A80%2Fapi%2Fauth%2Flogin&response_type=code"; 
+		let path = "https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2F92.143.191.152%2Fapi%2Fauth%2Flogin&response_type=code"
 		window.location.replace(path);
 	};
 

From 9dcf0e7eb61a18c0215401f3e3e61edb95fa3da6 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:54:04 +0200
Subject: [PATCH 38/47] auto push

---
 containers/react/src/script/axiosApi.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/containers/react/src/script/axiosApi.js b/containers/react/src/script/axiosApi.js
index 8a73d37a..8a9c80b9 100644
--- a/containers/react/src/script/axiosApi.js
+++ b/containers/react/src/script/axiosApi.js
@@ -14,15 +14,15 @@ console.log(`Bearer ${localStorage.getItem("token")}`)
 
 const test = "192.168.1.19"
 // const url = 'http://' + process.env.REACT_APP_BASE_URL + '/api'
-const url = 'http://' + test + '/api'
+// const url = 'http://' + test + '/api'
 
-console.log("url= ", url)
+// console.log("url= ", url)
 console.log("test= ", test)
 console.log("env= ", process.env.REACT_APP_BASE_URL)
 
 let api = axios.create({
 //   baseURL: 'http://localhost/api', 
-baseURL: 'http://' + test + '/api', 
+baseURL: 'http://' + process.env.REACT_APP_BASE_URL + '/api', 
   headers: {
 	//   Authorization: `Bearer ${getToken()}`,
 		Authorization : `Bearer ${localStorage.getItem("token")}`

From b741a0fd228f64cf81afe1048bc9b8409ef5fdfa Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:55:04 +0200
Subject: [PATCH 39/47] auto push

---
 containers/react/src/pages/canvas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/pages/canvas.js b/containers/react/src/pages/canvas.js
index d8d90664..ca686f11 100644
--- a/containers/react/src/pages/canvas.js
+++ b/containers/react/src/pages/canvas.js
@@ -25,7 +25,7 @@ function DrawCanvas(option) {
 	
 	// const socketRef = useRef(null);
 	// socketRef.current = io('http://localhost:4000');
-	const socket = io('http://localhost:4000');
+	const socket = io('http://' + process.env. + ':4000');
 	// const socket = socketRef.current
 	console.log("start function");
 	const canvas = document.getElementById('myCanvas');

From 84a0acf48aa2cd6bdf92f44969d2c21483dba101 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:56:04 +0200
Subject: [PATCH 40/47] auto push

---
 containers/react/src/pages/canvas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/pages/canvas.js b/containers/react/src/pages/canvas.js
index ca686f11..f0e3fbf5 100644
--- a/containers/react/src/pages/canvas.js
+++ b/containers/react/src/pages/canvas.js
@@ -25,7 +25,7 @@ function DrawCanvas(option) {
 	
 	// const socketRef = useRef(null);
 	// socketRef.current = io('http://localhost:4000');
-	const socket = io('http://' + process.env. + ':4000');
+	const socket = io('http://' + process.env.REACT_APP_BASE_URL + ':4000');
 	// const socket = socketRef.current
 	console.log("start function");
 	const canvas = document.getElementById('myCanvas');

From 551b16434263894abcf2a9ba583407ae00c060f4 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 18:57:04 +0200
Subject: [PATCH 41/47] auto push

---
 containers/react/src/pages/canvas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/pages/canvas.js b/containers/react/src/pages/canvas.js
index f0e3fbf5..a928bd43 100644
--- a/containers/react/src/pages/canvas.js
+++ b/containers/react/src/pages/canvas.js
@@ -362,7 +362,7 @@ matchmaking();
 
 function draw(timestamp)
 {
-	console.log("send loose");
+	console.log("turning");
 	if (!running)	
 		return ;
 	if (gameId === 0 )

From b4562d0f83b12b46759e6152086d550f96ebf6b0 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 19:03:04 +0200
Subject: [PATCH 42/47] auto push

---
 containers/react/src/components/Messages/Chats.jsx | 2 +-
 containers/react/src/components/Social/Friend.jsx  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/containers/react/src/components/Messages/Chats.jsx b/containers/react/src/components/Messages/Chats.jsx
index 87b29cbf..fdd812e5 100644
--- a/containers/react/src/components/Messages/Chats.jsx
+++ b/containers/react/src/components/Messages/Chats.jsx
@@ -104,7 +104,7 @@ function Chats(){
 				// console.log(`user= ${tmpUser.data.username}`);
 				// console.log(`user= ${tmpUser.data.nickname}`);
 				// console.log(`user= ${tmpUser.data}`);
-				socket.current = io("ws://localhost:4001");
+				socket.current = io("ws://" + process.env.REACT_APP_BASE_URL + ":4001");
 				console.log(`connection....`);
 				socket.current.emit('connection', {username: tmpUser.data.username})
 				// const socket = io("http://localhost:4001", {
diff --git a/containers/react/src/components/Social/Friend.jsx b/containers/react/src/components/Social/Friend.jsx
index 8630f8c1..c68146c4 100644
--- a/containers/react/src/components/Social/Friend.jsx
+++ b/containers/react/src/components/Social/Friend.jsx
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/06/09 08:18:58 by apommier          #+#    #+#             */
-/*   Updated: 2023/06/09 08:35:21 by apommier         ###   ########.fr       */
+/*   Updated: 2023/06/15 19:03:01 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -79,7 +79,7 @@ export default function  Friend({currentUser})
 	};
 
 	const handleButtonClick = (user) => {
-		let path = `http://localhost/profile/${user.username}`; 
+		let path = `http://` process.env.REACT_APP_BASE_URL `/profile/${user.username}`; 
 		// history(path, { replace: true });
 		// window.location.replace(path);
 		window.history.pushState({}, null, path);

From 1e3752a93b90c650e3d9b3a99184c928ef81faa9 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 19:04:04 +0200
Subject: [PATCH 43/47] auto push

---
 containers/react/src/components/Social/Friend.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/containers/react/src/components/Social/Friend.jsx b/containers/react/src/components/Social/Friend.jsx
index c68146c4..ce2bafb5 100644
--- a/containers/react/src/components/Social/Friend.jsx
+++ b/containers/react/src/components/Social/Friend.jsx
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/06/09 08:18:58 by apommier          #+#    #+#             */
-/*   Updated: 2023/06/15 19:03:01 by apommier         ###   ########.fr       */
+/*   Updated: 2023/06/15 19:03:04 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -79,7 +79,7 @@ export default function  Friend({currentUser})
 	};
 
 	const handleButtonClick = (user) => {
-		let path = `http://` process.env.REACT_APP_BASE_URL `/profile/${user.username}`; 
+		let path = `http://` + process.env.REACT_APP_BASE_URL + `/profile/${user.username}`; 
 		// history(path, { replace: true });
 		// window.location.replace(path);
 		window.history.pushState({}, null, path);

From 55b17891fb4046d3f491e2c42ad428d4b767e8e1 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 19:06:04 +0200
Subject: [PATCH 44/47] auto push

---
 containers/react/src/components/Social/Friend.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/containers/react/src/components/Social/Friend.jsx b/containers/react/src/components/Social/Friend.jsx
index ce2bafb5..8627b503 100644
--- a/containers/react/src/components/Social/Friend.jsx
+++ b/containers/react/src/components/Social/Friend.jsx
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/06/09 08:18:58 by apommier          #+#    #+#             */
-/*   Updated: 2023/06/15 19:03:04 by apommier         ###   ########.fr       */
+/*   Updated: 2023/06/15 19:05:14 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -79,7 +79,8 @@ export default function  Friend({currentUser})
 	};
 
 	const handleButtonClick = (user) => {
-		let path = `http://` + process.env.REACT_APP_BASE_URL + `/profile/${user.username}`; 
+		let path = `http://` + process.env.REACT_APP_BASE_URL + `/profile/${user.username}`;
+		console.log("path= ", path)
 		// history(path, { replace: true });
 		// window.location.replace(path);
 		window.history.pushState({}, null, path);

From 7b0008a5f48564085a43079aa3dd657198b460f0 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 19:08:04 +0200
Subject: [PATCH 45/47] auto push

---
 containers/react/src/components/Messages/Chats.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/components/Messages/Chats.jsx b/containers/react/src/components/Messages/Chats.jsx
index fdd812e5..04724e77 100644
--- a/containers/react/src/components/Messages/Chats.jsx
+++ b/containers/react/src/components/Messages/Chats.jsx
@@ -104,7 +104,7 @@ function Chats(){
 				// console.log(`user= ${tmpUser.data.username}`);
 				// console.log(`user= ${tmpUser.data.nickname}`);
 				// console.log(`user= ${tmpUser.data}`);
-				socket.current = io("ws://" + process.env.REACT_APP_BASE_URL + ":4001");
+				socket.current = io("http://" + process.env.REACT_APP_BASE_URL + ":4001");
 				console.log(`connection....`);
 				socket.current.emit('connection', {username: tmpUser.data.username})
 				// const socket = io("http://localhost:4001", {

From 539a0efaa5fa3f92faeac1ef892ad45c7f7a24ec Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 19:09:04 +0200
Subject: [PATCH 46/47] auto push

---
 containers/react/src/components/Messages/Chats.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/components/Messages/Chats.jsx b/containers/react/src/components/Messages/Chats.jsx
index 04724e77..286c46ee 100644
--- a/containers/react/src/components/Messages/Chats.jsx
+++ b/containers/react/src/components/Messages/Chats.jsx
@@ -104,7 +104,7 @@ function Chats(){
 				// console.log(`user= ${tmpUser.data.username}`);
 				// console.log(`user= ${tmpUser.data.nickname}`);
 				// console.log(`user= ${tmpUser.data}`);
-				socket.current = io("http://" + process.env.REACT_APP_BASE_URL + ":4001");
+				socket.current = io('http://' + process.env.REACT_APP_BASE_URL + ':4001');
 				console.log(`connection....`);
 				socket.current.emit('connection', {username: tmpUser.data.username})
 				// const socket = io("http://localhost:4001", {

From 252c61147667fab090c028c643e769fa1a4f2709 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Thu, 15 Jun 2023 19:10:04 +0200
Subject: [PATCH 47/47] auto push

---
 containers/react/src/components/Social/FriendRequest.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers/react/src/components/Social/FriendRequest.jsx b/containers/react/src/components/Social/FriendRequest.jsx
index 7db7f0bd..5f2f7c8a 100644
--- a/containers/react/src/components/Social/FriendRequest.jsx
+++ b/containers/react/src/components/Social/FriendRequest.jsx
@@ -53,7 +53,7 @@ export default function  Friend({currentUser})
 	}, [clickEvent])
 
 	const handleButtonClick = (user) => {
-		let path = `http://localhost/profile/${user.username}`; 
+		let path = `http://` + process.env.REACT_APP_BASE_URL + `/profile/${user.username}`; 
 		// history(path, { replace: true });
 		// window.location.replace(path);
 		window.history.pushState({}, null, path);