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

fix invit

Browse Source
This commit is contained in:
Alexandre POMMIER 2023-06-24 18:19:41 +02:00
parent fc280662b9
commit 38052b5034
5 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
containers/api/src/users/users.service.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:07 by apommier #+# #+# */ /* Created: 2023/06/17 01:00:07 by apommier #+# #+# */
/* Updated: 2023/06/23 22:27:16 by apommier ### ########.fr */ /* Updated: 2023/06/24 17:38:24 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -122,6 +122,7 @@ export class UsersService {
} }
user.friends.push(username); user.friends.push(username);
user.friendRequest = user.friendRequest.filter((item) => item !== username); user.friendRequest = user.friendRequest.filter((item) => item !== username);
user2.friends = user2.friends || [];
user2.friends.push(user.username); user2.friends.push(user.username);
this.save(user2); this.save(user2);
this.save(user); this.save(user);

13
containers/pong/src/pong/pong.gateway.ts
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/06/19 15:18:38 by apommier #+# #+# */ /* Created: 2023/06/19 15:18:38 by apommier #+# #+# */
/* Updated: 2023/06/24 00:43:19 by apommier ### ########.fr */ /* Updated: 2023/06/24 17:20:24 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -167,8 +167,9 @@ addMatchmaking(client: Socket, payload: any): void {
player.join(gameId); player.join(gameId);
console.log(`Player ${player.id} joined game ${gameId}`); console.log(`Player ${player.id} joined game ${gameId}`);
}); });
payload.gameId = gameId;
players.forEach((player) => { players.forEach((player) => {
player.emit('pong:gameId', gameId); player.emit('pong:gameId', payload);
}); });
} }
@ -202,8 +203,8 @@ joinPrivateParty(client: Socket, payload: any): void {
{ {
game.push(client); game.push(client);
const playersIds = game.map(socket => socket.id); const playersIds = game.map(socket => socket.id);
this.clients[playersIds[0]].emit('pong:gameId', payload.gameId); this.clients[playersIds[0]].emit('pong:gameId', payload);
this.clients[playersIds[1]].emit('pong:gameId', payload.gameId); this.clients[playersIds[1]].emit('pong:gameId', payload);
} }
else else
{ {
@ -367,11 +368,11 @@ addPrivateParty(client: Socket, payload: any): void {
if (playersIds[0] === payload.id) if (playersIds[0] === payload.id)
{ {
this.clients[playersIds[1]].emit('pong:name', payload.name); this.clients[playersIds[1]].emit('pong:name', payload);
} }
if (playersIds[1] === payload.id) if (playersIds[1] === payload.id)
{ {
this.clients[playersIds[0]].emit('pong:name', payload.name); this.clients[playersIds[0]].emit('pong:name', payload);
} }
} }

4
containers/react/.env
View File

@ -1,5 +1,5 @@
REACT_APP_BASE_URL=localhost:8080 REACT_APP_BASE_URL=bess-f2r5s11:8080
REACT_APP_SOCKET_URL=localhost REACT_APP_SOCKET_URL=bess-f2r5s11
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

9
containers/react/src/components/Game/Ranking.tsx
View File

@ -21,18 +21,15 @@ function Ranking(){
// setFriends(tmpFriends.data); // setFriends(tmpFriends.data);
// return tmpUser; // return tmpUser;
// console.log(`user= ${tmpUser.data.username}`); // console.log(`user= ${tmpUser.data.username}`);
setIsLoading(false) setIsLoading(false);
} }
catch(err){ catch(err){
console.log(err); console.log(err);
} }
}; };
getRanking(); getRanking();
}, []);
}, []) console.log(`ranking after= ${ranking}`);
console.log(`ranking after= ${ranking}`)
return ( return (
<div> <div>

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

@ -170,7 +170,9 @@ socket.on('pong:privateId', async (data) => {
socket.on('pong:gameId', async (data) => { socket.on('pong:gameId', async (data) => {
console.log("gameId received"); console.log("gameId received");
gameId = data; gameId = data.gameId;
console.log("gameid = ", gameId);
console.log("data gameid = ", data);
try { try {
let response = await api.get('/profile'); let response = await api.get('/profile');
@ -190,6 +192,16 @@ socket.on('pong:gameId', async (data) => {
console.log("emit to name"); console.log("emit to name");
socket.emit('pong:name', info); socket.emit('pong:name', info);
if (data.id === myId)
{
console.log("myId= true")
vX = 0.0001;
}
else
{
console.log("myId= false")
vX = -0.0001;
}
} catch (error) { } catch (error) {
console.log(error); console.log(error);
// Handle error here // Handle error here
@ -198,7 +210,11 @@ socket.on('pong:gameId', async (data) => {
}); });
socket.on('pong:name', (data) => { socket.on('pong:name', (data) => {
opName = data; opName = data.name;
// if (data.myId === myId)
// vX = 0.0001;
// else
// vX = -0.0001;
console.log(`opponent Name= ${opName}`) console.log(`opponent Name= ${opName}`)
}); });
@ -222,7 +238,6 @@ socket.on('pong:info', (data) => {
vY = data.vY; vY = data.vY;
}); });
socket.on('pong:paddle', (data) => { socket.on('pong:paddle', (data) => {
console.log("paddle info receive") console.log("paddle info receive")
oPaddleY = (data.paddleY / data.height) * canvas.height oPaddleY = (data.paddleY / data.height) * canvas.height
@ -251,7 +266,7 @@ socket.on('pong:point', (data) => {
// console.log("up point"); // console.log("up point");
myScore = data.point; myScore = data.point;
// } // }
vX = 0.0001; vX = -0.0001;
vY = 0; vY = 0;
ballX = canvas.width / 2; ballX = canvas.width / 2;
ballY = canvas.height / 2; ballY = canvas.height / 2;
@ -265,7 +280,7 @@ socket.on('pong:hisPoint', (data) => {
// console.log("up point"); // console.log("up point");
hisScore = data.point; hisScore = data.point;
// } // }
vX = 0.0001; vX = -0.0001;
vY = 0; vY = 0;
ballX = canvas.width / 2; ballX = canvas.width / 2;
ballY = canvas.height / 2; ballY = canvas.height / 2;
@ -338,6 +353,7 @@ socket.on('pong:hisPoint', (data) => {
point: hisScore, point: hisScore,
} }
socket.emit('pong:point', info); socket.emit('pong:point', info);
vX = 0.0001;
} }
function send_my_point() function send_my_point()