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

cahnge logout reqeust for nbr session fix key in social maps,

Browse Source
This commit is contained in:
Alexandre POMMIER 2023-06-28 18:54:54 +02:00
parent cebe59f067
commit dd3b985ce5
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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/28 17:43:13 by apommier ### ########.fr */ /* Updated: 2023/06/28 18:49:39 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -52,9 +52,10 @@ export class AppController {
const user = await this.userService.findOne(req.user.username) const user = await this.userService.findOne(req.user.username)
if(!user) if(!user)
return ; return ;
if (user.sessionNumber === 1) if (user.sessionNumber > 0)
user.status = 0; user.sessionNumber--;
user.sessionNumber--; if (!user.sessionNumber)
user.status = 0;
this.userService.save(user); this.userService.save(user);
} }

6
containers/api/src/chat/chat.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:25 by apommier #+# #+# */ /* Created: 2023/06/17 01:00:25 by apommier #+# #+# */
/* Updated: 2023/06/28 17:43:35 by apommier ### ########.fr */ /* Updated: 2023/06/28 18:20:07 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -93,7 +93,9 @@ async inviteUser(convId: number, username: string) {
const conv = await this.findConv(convId); const conv = await this.findConv(convId);
if (conv.members.find(item => item === username)) if (conv.members.find(item => item === username))
return (1); return (1);
if (conv.banned.find(item => item === username))
return (0);
conv.members.push(username); conv.members.push(username);
this.save(conv); this.save(conv);
} }

13
containers/react/src/components/Profile/Logout.tsx
View File

@ -1,4 +1,3 @@
import React from "react";
import api from "../../script/axiosApi" import api from "../../script/axiosApi"
@ -7,18 +6,16 @@ function Logout(){
const logout = async () =>{ const logout = async () =>{
try { try {
await api.post("/logout") await api.post("/logout");
localStorage.clear();
const path = 'http://' + process.env.REACT_APP_BASE_URL + '/';
window.history.pushState({}, '', path);
window.location.reload();
} catch (err) { } catch (err) {
console.log(err); console.log(err);
} }
} }
logout(); logout();
localStorage.clear();
const path = 'http://' + process.env.REACT_APP_BASE_URL + '/';
window.history.pushState({}, '', path);
window.location.reload();
return (<></>)
} }
export default Logout; export default Logout;

8
containers/react/src/components/Social/Social.tsx
View File

@ -47,12 +47,12 @@ function Social (){
</div> </div>
{invite.map(c=> ( {invite.map((c: User)=> (
<FriendRequest currentUser={c}/> <FriendRequest currentUser={c} key={c.username}/>
))} ))}
{friends.map(c=> ( {friends.map((c: User)=> (
<Friend currentUser={c}/> <Friend currentUser={c} key={c.username}/>
))} ))}
</div> </div>

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

@ -98,7 +98,7 @@ function DrawCanvas(option: number, gameParam: GameProps) {
socket.on('pong:win', async () => { socket.on('pong:win', async () => {
myScore = maxScore; myScore = maxScore;
await api.post('/status', {status: 1}); await api.post('/rmGame');
running = false; running = false;
socket.emit('pong:disconnect', {id: myId}); socket.emit('pong:disconnect', {id: myId});
return ; return ;
@ -376,8 +376,8 @@ socket.on('pong:hisPoint', (data) => {
if (gameParam.privateParty && !gameId) //delete invite if (gameParam.privateParty && !gameId) //delete invite
{ {
try{ try{
await api.post('/status', {status: 1}); await api.post('/rmGame');
await api.post("deleteInvite", {username: gameParam.username}) await api.post("deleteInvite", {username: gameParam.username});
} }
catch (err){ catch (err){
console.log(err) console.log(err)
@ -421,13 +421,13 @@ async function draw(timestamp: number)
if (myScore === maxScore) if (myScore === maxScore)
{ {
await api.post('/win', data); await api.post('/win', data);
await api.post('/status', {status: 1}); await api.post('/rmGame');
socket.emit('pong:disconnect', {id: myId}); socket.emit('pong:disconnect', {id: myId});
} }
else else
{ {
await api.post('/loss', data); await api.post('/loss', data);
await api.post('/status', {status: 1}); await api.post('/rmGame');
socket.emit('pong:disconnect', {id: myId}); socket.emit('pong:disconnect', {id: myId});
} }
window.location.replace("http://" + process.env.REACT_APP_BASE_URL + "/pong"); window.location.replace("http://" + process.env.REACT_APP_BASE_URL + "/pong");