Kinou/ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try locahost

Browse Source
This commit is contained in:
Alexandre POMMIER 2023-06-24 20:12:13 +02:00
parent c6fe3a5a99
commit 2f777480a0
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env
View File

@ -12,9 +12,9 @@
#URL #URL
NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf" NGINX_ENVSUBST_TEMPLATE_SUFFIX=".conf"
BASE_URL=bess-f2r2s16:8080 BASE_URL=localhost:8080
REACT_APP_BASE_URL=bess-f2r2s16:8080 REACT_APP_BASE_URL=localhost:8080
REDIRECT_URI=http://bess-f2r2s16:8080/api/auth/login REDIRECT_URI=http://localhost:8080/api/auth/login
POSTGRES_HOST=postgresql POSTGRES_HOST=postgresql
POSTGRES_USER=postgres POSTGRES_USER=postgres
POSTGRES_PASSWORD=postgres POSTGRES_PASSWORD=postgres

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
.env # .env
containers/react/.env # containers/react/.env
backend/node_modules/ backend/node_modules/
containers/backend/dist/ containers/backend/dist/

10
containers/api/src/app.controller.ts
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/06/17 01:00:00 by apommier #+# #+# */ /* 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}`);
console.log(`user in auth/login= ${user.username}`); console.log(`user in auth/login= ${user.username}`);
const data = await this.authService.login(user); 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); const myJSON = JSON.stringify(data);
console.log(`all data json version= ${myJSON}`) console.log(`all data json version= ${myJSON}`);
console.log(`data in api = ${(await data).access_token}`);
console.log(`data in api = ${(await data).access_token}`)
// console.log(`data i = ${(await data).access_token}`) // console.log(`data i = ${(await data).access_token}`)
const token = (await data).access_token; const token = (await data).access_token;
// console // console

4
containers/react/.env
View File

@ -1,5 +1,5 @@
REACT_APP_BASE_URL=bess-f2r2s16:8080 REACT_APP_BASE_URL=localhost:8080
REACT_APP_SOCKET_URL=bess-f2r2s16 REACT_APP_SOCKET_URL=localhost
REACT_APP_API_SECRET=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 REACT_APP_API_SECRET=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
REACT_APP_CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41 REACT_APP_CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41

2
containers/react/src/pages/canvas.tsx
View File

@ -652,7 +652,7 @@ async function draw(timestamp: number)
send_point(); send_point();
// send_forced_info(); // 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") console.log("ball out win point pls")
send_my_point(); send_my_point();