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

merge

Browse Source
This commit is contained in:
Elisee ADJIGUIDI 2023-06-26 03:02:04 +02:00
commit 9026a81680
15 changed files with 130 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
/* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */ /* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/06/17 01:00:00 by apommier #+# #+# */ /* Created: 2023/06/17 01:00:00 by apommier #+# #+# */
/* Updated: 2023/06/26 02:19:48 by sadjigui ### ########.fr */ /* Updated: 2023/06/26 02:57:07 by sadjigui ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -451,14 +451,22 @@ export class AppController {
@UseGuards(JwtAuthGuard) @UseGuards(JwtAuthGuard)
@Post('/quit') @Post('/quit')
async setOffline(@Request() req) { async setOffline(@Request() req) {
const user = await this.userService.findOne(req.user.username); const user = await this.userService.findOne(req.user.username);
user.sessionNumber-- ;
if (!user.sessionNumber)
user.status = 0; user.status = 0;
await this.userService.save(user); await this.userService.save(user);
console.log("User quit"); console.log("User quit");
} }
@UseGuards(JwtAuthGuard)
@Post('/addSession')
async addSession(@Request() req) {
const user = await this.userService.findOne(req.user.username);
user.sessionNumber++ ;
await this.userService.save(user);
}
//======================================================================================================== //========================================================================================================
//======================================================================================================== //========================================================================================================

3
containers/api/src/auth/login42.ts
View File

@ -16,8 +16,6 @@ export class loginClass {
let token = null; let token = null;
let userId = null; let userId = null;
let userName = null; let userName = null;
// let = null;
const params = new URLSearchParams(url.split('?')[1]); const params = new URLSearchParams(url.split('?')[1]);
const code = params.get('code'); const code = params.get('code');
@ -76,6 +74,7 @@ export class loginClass {
friends: null, friends: null,
blocked: null, blocked: null,
photo: null, photo: null,
sessionNumber: 1,
}; };
await this.usersService.create(user); await this.usersService.create(user);
} }

2
containers/api/src/chat/chat.service.ts
View File

@ -6,7 +6,7 @@
/* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */ /* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/06/17 01:00:25 by apommier #+# #+# */ /* Created: 2023/06/17 01:00:25 by apommier #+# #+# */
/* Updated: 2023/06/26 02:21:38 by sadjigui ### ########.fr */ /* Updated: 2023/06/26 03:01:23 by sadjigui ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

3
containers/api/src/model/user.entity.ts
View File

@ -50,6 +50,9 @@ export class User {
@Column({ default: 0 }) @Column({ default: 0 })
loss: number; loss: number;
@Column({ default: 0 })
sessionNumber: number;
@Column({ default: 0 }) @Column({ default: 0 })
rank: number; rank: number;

4
containers/react/.env
View File

@ -5,3 +5,7 @@ REACT_APP_CLIENT_UID=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df187
# REACT_APP_BASE_URL=92.143.191.152 # REACT_APP_BASE_URL=92.143.191.152
# REACT_APP_BASE_URL=192.168.1.19 # REACT_APP_BASE_URL=192.168.1.19
REACT_APP_INTRA_URL="https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41&redirect_uri=http%3A%2F%2Flocalhost%3A8080%2Fapi%2Fauth%2Flogin&response_type=code"
# REACT_APP_BASE_URL=92.143.191.152
# REACT_APP_BASE_URL=192.168.1.19

26
containers/react/src/components/AnimatedRoute.tsx
View File

@ -1,26 +0,0 @@
import React from "react";
import {Routes, Route} from 'react-router-dom';
import Home from "../pages/Home.jsx";
import PlayButton from "./Game/PlayButton.tsx";
import Field from "../pages/Field";
import Login42 from "../pages/Login42.js";
import Messages from "../pages/Messages.jsx";
import { useLocation } from "react-router-dom";
import {AnimatePresence} from "framer-motion";
function AnimatedRoute () {
const location = useLocation();
return (
<AnimatePresence>
<Routes location={location} key={location.pathname}>
<Route path="/" element={<Home/>}/>
<Route path="/game" element={<PlayButton />}/>
<Route path="/pong/play" element={<Field />}/>
<Route path="/login42" element={<Login42 />}/>
<Route path="/messages" element={<Messages />}/>
</Routes>
</AnimatePresence>
)
}
export default AnimatedRoute

30
containers/react/src/components/App.tsx
View File

@ -1,6 +1,6 @@
import React from "react"; import React, { useEffect } from "react";
import {Routes, Route, Navigate} from 'react-router-dom'; import {Routes, Route, Navigate} from 'react-router-dom';
import HomeLogin from "../pages/Home.js"; import HomeLogin from "../pages/LoginButton.tsx";
import Home from "../pages/Home.tsx"; import Home from "../pages/Home.tsx";
@ -19,9 +19,35 @@ import DoubleAuth from "../pages/2fa.tsx";
import Game from "../pages/Game.tsx"; import Game from "../pages/Game.tsx";
import Social from "./Social/Social.tsx"; import Social from "./Social/Social.tsx";
import Logout from "./Profile/Logout.tsx"; import Logout from "./Profile/Logout.tsx";
import api from "../script/axiosApi.tsx"
function AnimatedRoute () { function AnimatedRoute () {
// const location = useLocation(); // const location = useLocation();
useEffect(() => {
const handleBeforeUnload = async (event: { preventDefault: () => void; returnValue: string; }) => {
event.preventDefault(); // Cancel the default event behavior if needed
event.returnValue = ''; // Chrome requires a return value to display a custom message
if (!localStorage.getItem('token'))
return ;
try {
await api.post("/quit");
} catch(err) {
console.log(err);
}
// Perform your desired actions before the user leaves the page
// For example, you can show a confirmation dialog or save user data
};
window.addEventListener('beforeunload', handleBeforeUnload);
return () => {
window.removeEventListener('beforeunload', handleBeforeUnload);
};
}, []);
const location = useLocation(); const location = useLocation();
if (!localStorage.getItem('token')) if (!localStorage.getItem('token'))
{ {

11
containers/react/src/components/Game/PlayButton.tsx
View File

@ -19,10 +19,10 @@ function PlayButton() {
path += 'superpower=true&'; path += 'superpower=true&';
} }
const obstacleCheckbox = document.querySelector<HTMLInputElement>('input[value="obstacle"]'); // const obstacleCheckbox = document.querySelector<HTMLInputElement>('input[value="obstacle"]');
if (obstacleCheckbox && obstacleCheckbox.checked) { // if (obstacleCheckbox && obstacleCheckbox.checked) {
path += 'obstacle=true&'; // path += 'obstacle=true&';
} // }
const speedCheckbox = document.querySelector<HTMLInputElement>('input[value="speed"]'); const speedCheckbox = document.querySelector<HTMLInputElement>('input[value="speed"]');
if (speedCheckbox && speedCheckbox.checked) { if (speedCheckbox && speedCheckbox.checked) {
@ -41,7 +41,8 @@ function PlayButton() {
{/* !buttonClicked && <button onClick={handleButtonClick}>Draw on Canvas</button> */} {/* !buttonClicked && <button onClick={handleButtonClick}>Draw on Canvas</button> */}
<div className='checkbox'> <div className='checkbox'>
<p><input className="inside_checkbox" type="checkbox" value="superpower"/> Super Power <br/> ( w = wall power ) </p> <p><input className="inside_checkbox" type="checkbox" value="superpower"/> Super Power <br/> ( w = wall power ) </p>
<p><input className="inside_checkbox" type="checkbox" value="obstacle"/> Obstacle </p>
<p><input className="inside_checkbox" type="checkbox" value="superpower"/> Super Power</p>
<p><input className="inside_checkbox" type="checkbox" value="speed"/> Faster and Faster </p> <p><input className="inside_checkbox" type="checkbox" value="speed"/> Faster and Faster </p>
</div> </div>
</div> </div>

4
containers/react/src/components/Messages/Message.tsx
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/06/01 18:24:46 by apommier #+# #+# */ /* Created: 2023/06/01 18:24:46 by apommier #+# #+# */
/* Updated: 2023/06/24 16:00:48 by apommier ### ########.fr */ /* Updated: 2023/06/25 23:24:46 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -69,7 +69,7 @@ function MessageMe({message, own}: MessageMeProps){
} }
}; };
fetchProfilePicture(); fetchProfilePicture();
}, []) }, []);
const handleButtonClick = () => { const handleButtonClick = () => {
if (!sender) if (!sender)

4
containers/react/src/components/Profile/EditName.tsx
View File

@ -27,7 +27,7 @@ const dropIn = {
// ) // )
// } // }
const ModalEdit = (handleClose) => { const ModalEdit = () => {
// let new_name = ""; // let new_name = "";
const [nickname, setNickname] = useState(""); const [nickname, setNickname] = useState("");
const [errTaken, setErrTaken] = useState(false); const [errTaken, setErrTaken] = useState(false);
@ -35,7 +35,7 @@ const ModalEdit = (handleClose) => {
const [errTooShort, setErrTooShort] = useState(false); const [errTooShort, setErrTooShort] = useState(false);
const closeTooShort = () => setErrTooShort(false); const closeTooShort = () => setErrTooShort(false);
const handler = e => { const handler = (e: { target: { value: React.SetStateAction<string>; }; }) => {
setNickname(e.target.value); setNickname(e.target.value);
console.log("testeeeee") console.log("testeeeee")
const postNickname = async () => { const postNickname = async () => {

14
containers/react/src/pages/Home.tsx
View File

@ -13,6 +13,8 @@
// import { React, useState } from "react"; // import { React, useState } from "react";
import '../styles/Profile.css' import '../styles/Profile.css'
// import '../styles/App.css' // import '../styles/App.css'
import RedAlert from "../components/Alert/RedAlert.tsx";
import DefaultPicture from "../assets/profile.jpg"; import DefaultPicture from "../assets/profile.jpg";
import WinLoss from "../components/Profile/Win_Loss.tsx"; import WinLoss from "../components/Profile/Win_Loss.tsx";
import { motion, AnimatePresence } from 'framer-motion' import { motion, AnimatePresence } from 'framer-motion'
@ -52,7 +54,10 @@ function Profile () {
const [isLoading, setIsLoading] = useState<boolean>(true); const [isLoading, setIsLoading] = useState<boolean>(true);
const [modalOpen, setModalOpen] = useState<boolean>(false); const [modalOpen, setModalOpen] = useState<boolean>(false);
const [mine, setMine] = useState<boolean>(false); const [mine, setMine] = useState<boolean>(false);
const [error, setError] = useState<boolean>(false);
// const [visible, setVisible] = useState<boolean>(false);
const close = () => setModalOpen(false); const close = () => setModalOpen(false);
const closeError = () => setError(false);
const open = () => setModalOpen(true); const open = () => setModalOpen(true);
const { username } = useParams(); const { username } = useParams();
@ -76,6 +81,7 @@ function Profile () {
console.log('File uploaded successfully'); console.log('File uploaded successfully');
window.location.reload(); window.location.reload();
} catch (error) { } catch (error) {
setError(true);
console.error('Error uploading file:', error); console.error('Error uploading file:', error);
} }
} }
@ -146,6 +152,14 @@ function Profile () {
<> <>
<label htmlFor="file-input" className="edit_name"><MdOutlinePhotoLibrary/></label> <label htmlFor="file-input" className="edit_name"><MdOutlinePhotoLibrary/></label>
<input type="file" id="file-input" className="file-input" accept="image/*" onChange={handleFileChange} /> <input type="file" id="file-input" className="file-input" accept="image/*" onChange={handleFileChange} />
<AnimatePresence initial={false} onExitComplete={() => null}>
{error ? (
<RedAlert handleClose={closeError} text={'Error : upload failed'} />
): ("")}
</AnimatePresence>
</> </>
)} )}
</motion.div> </motion.div>

5
containers/react/src/pages/Home.js → containers/react/src/pages/LoginButton.tsx
View File

@ -3,6 +3,7 @@ import '../styles/field.css';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import api from '../script/axiosApi.tsx'; import api from '../script/axiosApi.tsx';
import React from 'react';
function HomeLogin() function HomeLogin()
{ {
@ -25,9 +26,11 @@ function HomeLogin()
console.log(`already token= ${localStorage.getItem('token')}`) console.log(`already token= ${localStorage.getItem('token')}`)
return ; return ;
} }
console.log("yrah im here bitch");
console.log("lien = ", process.env.REACT_APP_INTRA_URL);
// else // 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%2F" + process.env.REACT_APP_BASE_URL + "%2Fapi%2Fauth%2Flogin&response_type=code" let path = process.env.REACT_APP_INTRA_URL || "";
window.location.replace(path); window.location.replace(path);
}; };

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

@ -197,12 +197,12 @@ socket.on('pong:gameId', async (data) => {
if (data.id === myId) if (data.id === myId)
{ {
console.log("myId= true") console.log("myId= true")
vX = 0.0001; vX = 0.0005;
} }
else else
{ {
console.log("myId= false") console.log("myId= false")
vX = -0.0001; vX = -0.0005;
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@ -268,7 +268,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.0005;
vY = 0; vY = 0;
ballX = canvas.width / 2; ballX = canvas.width / 2;
ballY = canvas.height / 2; ballY = canvas.height / 2;
@ -282,7 +282,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.0005;
vY = 0; vY = 0;
ballX = canvas.width / 2; ballX = canvas.width / 2;
ballY = canvas.height / 2; ballY = canvas.height / 2;
@ -355,7 +355,7 @@ socket.on('pong:hisPoint', (data) => {
point: hisScore, point: hisScore,
} }
socket.emit('pong:point', info); socket.emit('pong:point', info);
vX = 0.0001; vX = 0.0005;
} }
function send_my_point() function send_my_point()
@ -370,7 +370,7 @@ socket.on('pong:hisPoint', (data) => {
} }
socket.emit('pong:myPoint', info); socket.emit('pong:myPoint', info);
myScore++; myScore++;
vX = 0.0001; vX = 0.0005;
vY = 0; vY = 0;
ballX = canvas.width / 2; ballX = canvas.width / 2;
ballY = canvas.height / 2; ballY = canvas.height / 2;
@ -494,6 +494,7 @@ socket.on('pong:hisPoint', (data) => {
// option: option, // option: option,
// }; // };
// await api.post("status", {status: 1}); // await api.post("status", {status: 1});
await api.post('/status', {status: 1});
await api.post("deleteInvite", {username: gameParam.username}) await api.post("deleteInvite", {username: gameParam.username})
} }
catch (err){ catch (err){
@ -648,7 +649,7 @@ async function draw(timestamp: number)
} }
ballX = canvas.width / 2; ballX = canvas.width / 2;
ballY = canvas.height / 2; ballY = canvas.height / 2;
vX = 0.0001; vX = 0.0005;
vY = 0; vY = 0;
hisScore += 1; hisScore += 1;
send_point(); send_point();

4
containers/react/src/script/tokenSuccess.tsx
View File

@ -16,7 +16,7 @@ function SuccessToken() {
useEffect(() => { useEffect(() => {
if (!data) { if (!data) {
console.log("No data"); console.log("No data");
return; return ;
} }
const cleanData = data.slice(1, -1); // Declare cleanData here const cleanData = data.slice(1, -1); // Declare cleanData here
@ -94,7 +94,7 @@ function SuccessToken() {
return <h1>Loading...</h1>; return <h1>Loading...</h1>;
} }
if (!data) if (!data)
return ; return (<></>);
const cleanData = data.slice(1, -1); // Declare cleanData here as well const cleanData = data.slice(1, -1); // Declare cleanData here as well
if (!user.otp_verified) { if (!user.otp_verified) {