J'ai fais n'imp

.gitignore

@@ -3,4 +3,4 @@
 db.sqlite3
 **/migrations/**
 /profiles/static/avatars/*
-!/profiles/static/avatars/default
+!/profiles/static/avatars/default.env

README.md

@@ -22,8 +22,15 @@ pip install -r requirements.txt
 ```
 - Setup database
 ```
-python manage.py runserver makemigrations profiles games
-python manage.py migrate profiles games
+<<<<<<< HEAD
+python manage.py runserver makemigrations profiles
+python manage.py migrate profiles
+=======
+python manage.py makemigrations games
+python manage.py makemigrations profiles
+python manage.py runserver makemigrations chat
+python manage.py migrate
+>>>>>>> d03f90367f1fd075e79f4a69d31c5a49b9e53d01
 ```
 - Start the developpement server
 ```

chat/consumers.py

@@ -18,19 +18,27 @@ class ChatConsumer(WebsocketConsumer):
 		text_data_json = json.loads(text_data)
 		message = text_data_json['message']
 
+		user = self.scope["user"]
+		if user.is_anonymous:
+			return;
+
 		async_to_sync(self.channel_layer.group_send)(
 			self.room_group_name,
 			{
 				'type':'chat_message',
+				'username':user.username,
 				'message':message
 			}
 		)
 
 	def chat_message(self, event):
-		message = event['message']
+
+		user = self.scope["user"]
+		if user.is_anonymous:
+			return;
 
 		self.send(text_data=json.dumps({
 			'type':'chat',
-			'username':self.scope["user"].username,
-			'message':message
+			'username':event['username'],
+			'message':event['message']
 		}))

chat/models.py

@@ -1,3 +1,17 @@
 from django.db import models
+from django.db.models import IntegerField
+from django.contrib.auth.models import User
 
 # Create your models here.
+class ChannelModel(models.Model):
+	pass
+
+class MemberModel(models.Model):
+	member_id = IntegerField(primary_key=False)
+	channel_id = IntegerField(primary_key=False)
+
+class MessageModel(models.Model):
+	channel_id = IntegerField(primary_key=False)
+	author_id = IntegerField(primary_key=False)
+	content = models.CharField(max_length=255)
+	time = models.DateField()

chat/serializers.py

@@ -0,0 +1,8 @@
+from rest_framework import serializers
+from .models import ChannelModel
+
+class ChannelSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = ChannelModel
+        fields = []

chat/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+from django.conf import settings
+from django.conf.urls.static import static
+
+from . import views
+
+urlpatterns = [
+    path("<int:pk>", views.ChatView.as_view(), name="chat_page"),
+]

chat/views.py

@@ -1,3 +1,29 @@
-from django.shortcuts import render
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import authentication, permissions
+from rest_framework.authentication import SessionAuthentication
+from .models import ChannelModel, MemberModel, MessageModel
 
-# Create your views here.
+class ChatView(APIView):
+	permission_classes = (permissions.IsAuthenticated,)
+	authentication_classes = (SessionAuthentication,)
+	
+	def post(self, request, pk):
+		if (ChannelModel.objects.filter(pk = pk)):
+			return Response("Channel already exist")
+
+		data: dict = request.data
+		users_id = request.data.get("users_id", [])
+		if len(users_id) < 2:
+			return Response("Not enought members to create the channel")
+
+		new_channel = ChannelModel()
+		new_channel.save()	
+
+		for user_id in users_id:
+			new_member = MemberModel()
+			new_member.channel_id = new_channel.pk
+			new_member.member_id = user_id
+			new_member.save()
+
+		return Response("Channel created")

frontend/static/css/search.css

@@ -0,0 +1,17 @@
+#app img
+{
+	max-height: 100px;
+	max-width: 100px;
+}
+
+#app ul
+{
+	margin: 5px 0 0 0;
+	padding: 0 0 0 0;
+	list-style-type: none;
+}
+
+#app li
+{
+	margin: 10px 10px 0 0;
+}

frontend/static/js/api/chat/channel.js

@@ -0,0 +1,9 @@
+class Channel {
+	constructor(id, members, messages) {
+		this.id = id;
+		this.members = members;
+		this.messages = messages;
+	}
+}
+
+export {Channel}

frontend/static/js/api/chat/channels.js

@@ -0,0 +1,19 @@
+class Channels {
+	constructor(client) {
+		this.client = client;
+	}
+
+	async createChannel(users_id) {
+		console.log(users_id);
+		let response = await this.client._post("/api/chat/", {
+			users_id:users_id
+		});
+
+		let data = await response.json();
+		if (data == "Channel already exist")
+			return null;
+		return data;
+	}
+}
+
+export {Channels}

frontend/static/js/api/matchmaking.js

@@ -18,17 +18,12 @@ class MatchMaking
 		if (!await this.client.isAuthentificate())
 			return null;
 		
-		console.log(func)
-		this.callback = func
-		console.log(this.callback)
-
 		let url = `wss://${window.location.host}/ws/matchmaking/`;
 		
 		this._chatSocket = new WebSocket(url);
 		
 		this._chatSocket.onmessage = function (event) {
 			const data = JSON.parse(event.data);
-			console.log(func, data)
 			func(data.game_id)
 		};
 	}

frontend/static/js/index.js

@@ -1,16 +1,19 @@
+import { Client } from "./api/client.js";
+
 import LoginView from "./views/accounts/LoginView.js";
 import Dashboard from "./views/Dashboard.js";
-import Settings from "./views/Settings.js";
+import Search from "./views/Search.js";
 import Chat from "./views/Chat.js";
 import HomeView from "./views/HomeView.js";
 import RegisterView from "./views/accounts/RegisterView.js";
 import LogoutView from "./views/accounts/LogoutView.js";
+import GameView from "./views/Game.js"
+
+import PageNotFoundView from './views/PageNotFoundView.js' 
 
-import { Client } from "./api/client.js";
 import AbstractRedirectView from "./views/AbstractRedirectView.js";
 import MeView from "./views/MeView.js";
 import ProfilePageView from "./views/profiles/ProfilePageView.js";
-import ProfilesView from "./views/profiles/ProfilesView.js";
 import MatchMakingView from "./views/MatchMakingView.js";
 
 let client = new Client(location.protocol + "//" + location.host)
@@ -36,16 +39,16 @@ const navigateTo = async (uri) => {
 const router = async (uri) => {
     const routes = [
         { path: "/", view: Dashboard },
-        { path: "/profiles", view: ProfilesView},
         { path: "/profiles/:id", view: ProfilePageView },
-        { path: "/settings", view: Settings },
         { path: "/login", view: LoginView },
         { path: "/logout", view: LogoutView },
         { path: "/register", view: RegisterView },
+        { path: "/search", view: Search },
         { path: "/chat", view: Chat },
         { path: "/home", view: HomeView },
         { path: "/me", view: MeView },
         { path: "/matchmaking", view: MatchMakingView },
+        { path: "/game/offline", view: GameView },
     ];
 
     // Test each route for potential match
@@ -60,7 +63,10 @@ const router = async (uri) => {
 
     if (!match) {
         match = {
-            route: routes[0],
+            route: {
+				path: uri,
+				view: PageNotFoundView
+			},
             result: [uri]
         };
     }

frontend/static/js/views/Chat.js

@@ -1,10 +1,10 @@
-import AbstractAuthentifiedView from "./AbstractAuthentifiedView.js";
+import AbstractView from "./AbstractView.js";
 
-export default class extends AbstractAuthentifiedView {
+export default class extends AbstractView {
     constructor(params) {
         super(params, "Chat");
 
-		let url = `wss://${window.location.host}/ws/socket-server/`
+		let url = `ws://${window.location.host}/ws/socket-server/`
 
 		this.chatSocket = new WebSocket(url)
 		this.chatSocket.onmessage = function(e){
@@ -44,7 +44,7 @@ export default class extends AbstractAuthentifiedView {
 			<h1>Chat</h1>
 
 			<form id="form">
-				<input type="text" name="message" />
+				<input type="text" name="message" placeholder="message"/>
 			</form>
 
 			<div id="messages">

frontend/static/js/views/Game.js

@@ -0,0 +1,250 @@
+import AbstractView from './AbstractView.js'
+
+export default class extends AbstractView {
+	constructor(params) {
+		super(params, 'Game');
+		this.game = null;
+	}
+
+	async getHtml() {
+		return `
+			<h1>Game</h1>
+			<button id='startGameButton'>Start Game</button>
+			<button id='stopGameButton'>Stop Game</button>
+		`;
+	}
+
+	async postInit() {
+		document.getElementById('startGameButton').onclick = this.startGame.bind(this);
+		document.getElementById('stopGameButton').onclick = this.stopGame.bind(this);
+	}
+
+	startGame() {
+		if (this.game == null) {
+			document.getElementById('startGameButton').innerHTML = 'Reset Game';
+			this.game = new Game;
+		}
+		else {
+			document.getElementById('app').removeChild(this.game.canvas);
+			this.game.cleanup();
+			this.game = new Game;
+		}
+	}
+
+	stopGame() {
+		if (!this.game)
+			return;
+		document.getElementById('app').removeChild(this.game.canvas);
+		document.getElementById('app').removeChild(this.game.scoresDisplay);
+		this.game.cleanup();
+		this.game = null;
+		document.getElementById('startGameButton').innerHTML = 'Start Game';
+	}
+}
+
+class Game {
+	constructor() {
+		//Global variables
+		this.def = {
+			CANVASHEIGHT: 270,
+			CANVASWIDTH: 480,
+			PADDLEHEIGHT: 70,
+			PADDLEWIDTH: 10,
+			PADDLEMARGIN: 5,
+			PADDLESPEED: 3,
+			BALLRADIUS: 5,
+			BALLSPEED: 2,
+			BALLSPEEDINCR: 0.15,
+			MAXBOUNCEANGLE: 10 * (Math.PI / 12),
+			MAXSCORE: 6
+		};
+
+		this.canvas = document.createElement('canvas');
+		this.canvas.id = 'gameCanvas';
+		this.canvas.width = this.def.CANVASWIDTH;
+		this.canvas.height = this.def.CANVASHEIGHT;
+		this.canvas.style.border = '1px solid #d3d3d3';
+		this.canvas.style.backgroundColor = '#f1f1f1';
+		this.context = this.canvas.getContext('2d');
+		document.getElementById('app').appendChild(this.canvas);
+		this.scoresDisplay = document.createElement('p');
+		this.scoresDisplay.innerHTML = 'Scores: 0 - 0';
+		document.getElementById('app').appendChild(this.scoresDisplay);
+
+		this.players = [
+			{
+				paddle: new Paddle(this.context,
+							this.def.PADDLEMARGIN,
+							this.def),
+				score: 0
+			},
+			{
+				paddle: new Paddle(this.context,
+							this.def.CANVASWIDTH - this.def.PADDLEMARGIN - this.def.PADDLEWIDTH,
+							this.def),
+				score: 0
+			}
+		];
+		this.ballStartSide = 0;
+		this.ballRespawned = false;
+		this.ball = new Ball(this.context, this.def, this.ballStartSide);
+
+		this.interval = setInterval(this.updateGame.bind(this), 10);
+
+		this.keys = [];
+		this.keyUpHandler = this.keyUpHandler.bind(this);
+		this.keyDownHandler = this.keyDownHandler.bind(this);
+		document.addEventListener('keydown', this.keyDownHandler);
+		document.addEventListener('keyup', this.keyUpHandler);
+	}
+
+	cleanup() {
+		clearInterval(this.interval);
+		document.removeEventListener('keydown', this.keyDownHandler);
+		document.removeEventListener('keyup', this.keyUpHandler);
+		this.canvas.style.display = 'none';
+	}
+
+	clear() {
+		this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
+	}
+
+	updateGame() {
+		//Paddle movement
+		if (this.keys.includes('s') &&
+			this.players[0].paddle.y + this.def.PADDLEHEIGHT < this.def.CANVASHEIGHT - this.def.PADDLEMARGIN)
+				this.players[0].paddle.y += this.def.PADDLESPEED;
+		if (this.keys.includes('w') &&
+			this.players[0].paddle.y > 0 + this.def.PADDLEMARGIN)
+				this.players[0].paddle.y -= this.def.PADDLESPEED;
+
+		if (this.keys.includes('ArrowDown') &&
+			this.players[1].paddle.y + this.def.PADDLEHEIGHT < this.def.CANVASHEIGHT - this.def.PADDLEMARGIN)
+				this.players[1].paddle.y += this.def.PADDLESPEED;
+		if (this.keys.includes('ArrowUp') &&
+			this.players[1].paddle.y > 0 + this.def.PADDLEMARGIN)
+				this.players[1].paddle.y -= this.def.PADDLESPEED;
+
+		//GOOAAAAL
+		if (this.ball.x <= 0)
+			this.updateScore(this.players[0].score, ++this.players[1].score);
+		else if (this.ball.x >= this.def.CANVASWIDTH)
+			this.updateScore(++this.players[0].score, this.players[1].score);
+
+		//Ball collisions
+		if (this.detectCollision(this.players[0].paddle, this.ball))
+			this.calculateBallVelocity(this.players[0].paddle.getCenter().y, this.ball);
+		else if (this.detectCollision(this.players[1].paddle, this.ball))
+			this.calculateBallVelocity(this.players[1].paddle.getCenter().y, this.ball, -1);
+
+		if (this.ball.y - this.ball.radius <= 0)
+			this.ball.vy *= -1;
+		else if (this.ball.y + this.ball.radius >= this.canvas.height)
+			this.ball.vy *= -1;
+
+		if (!this.ballRespawned) {
+			this.ball.x += this.ball.vx;
+			this.ball.y += this.ball.vy;
+		}
+
+		this.clear();
+		this.players[0].paddle.update();
+		this.players[1].paddle.update();
+		this.ball.update();
+	}
+
+	updateScore(p1Score, p2Score) {
+		if (p1Score > this.def.MAXSCORE) {
+			this.scoresDisplay.innerHTML = 'Player 1 wins!! GGS';
+			this.cleanup();
+		}
+		else if (p2Score > this.def.MAXSCORE) {
+			this.scoresDisplay.innerHTML = 'Player 2 wins!! GGS';
+			this.cleanup();
+		} else {
+			this.scoresDisplay.innerHTML = `Scores: ${p1Score} - ${p2Score}`;
+			this.ballStartSide = 1 - this.ballStartSide;
+			this.ball = new Ball(this.context, this.def, this.ballStartSide);
+			this.ballRespawned = true;
+			new Promise(r => setTimeout(r, 300))
+				.then(_ => this.ballRespawned = false);
+		}
+	}
+
+	detectCollision(paddle, ball) {
+		let paddleCenter = paddle.getCenter();
+		let dx = Math.abs(ball.x - paddleCenter.x);
+		let dy = Math.abs(ball.y - paddleCenter.y);
+		if (dx <= ball.radius + paddle.width / 2 &&
+			dy <= ball.radius + paddle.height / 2)
+				return true;
+		return false;
+	}
+
+	calculateBallVelocity(paddleCenterY, ball, side = 1) {
+		let relativeIntersectY = paddleCenterY - ball.y;
+		let normRelIntersectY = relativeIntersectY / this.def.PADDLEHEIGHT / 2;
+		let bounceAngle = normRelIntersectY * this.def.MAXBOUNCEANGLE;
+
+		ball.speed += this.def.BALLSPEEDINCR;
+		ball.vx = ball.speed * side * Math.cos(bounceAngle);
+		ball.vy = ball.speed * -Math.sin(bounceAngle);
+	}
+
+	keyUpHandler(ev) {
+		const idx = this.keys.indexOf(ev.key);
+		if (idx != -1)
+			this.keys.splice(idx, 1);
+	}
+
+	keyDownHandler(ev) {
+		if (!this.keys.includes(ev.key))
+			this.keys.push(ev.key);
+	}
+}
+
+class Paddle {
+	constructor(context, paddleSide, def) {
+		this.width = def.PADDLEWIDTH;
+		this.height = def.PADDLEHEIGHT;
+		this.x = paddleSide;
+		this.y = def.CANVASHEIGHT / 2 - this.height / 2;
+		this.ctx = context;
+		this.update();
+	}
+
+	update() {
+		this.ctx.fillStyle = 'black';
+		this.ctx.fillRect(this.x, this.y, this.width, this.height);
+	}
+
+	getCenter() {
+		return {
+			x: this.x + this.width / 2,
+			y: this.y + this.height / 2
+		};
+	}
+}
+
+class Ball {
+	constructor(context, def, startSide) {
+		this.radius = def.BALLRADIUS;
+		this.speed = def.BALLSPEED;
+		this.x = def.CANVASWIDTH / 2;
+		this.y = def.CANVASHEIGHT / 2;
+		this.vy = 0;
+		if (startSide === 0)
+			this.vx = -this.speed;
+		else
+			this.vx = this.speed;
+		this.ctx = context;
+		this.update();
+	}
+
+	update() {
+		this.ctx.fillStyle = 'black';
+		this.ctx.beginPath();
+		this.ctx.arc(this.x, this.y, this.radius, 0, 2 * Math.PI);
+		this.ctx.fill();
+	}
+}

frontend/static/js/views/HomeView.js

@@ -10,6 +10,7 @@ export default class extends AbstractAuthentificateView {
         return `
 			<h1>HOME</h1>
             <a href="/matchmaking" class="nav__link" data-link>Play a game</a>
+            <a href="/game/offline" class="nav__link" data-link>Play offline</a>
             <a href="/me" class="nav__link" data-link>Me</a>
             <a href="/logout" class="nav__link" data-link>Logout</a>
         `;

frontend/static/js/views/MatchMakingView.js

@@ -14,7 +14,6 @@ export default class extends AbstractView {
     async postInit()
     {
         await client.matchmaking.start(game_found)
-        console.log("start matchmaking")
     }
 
     async getHtml() {

frontend/static/js/views/PageNotFoundView.js

@@ -0,0 +1,14 @@
+import AbstractView from "./AbstractView.js";
+
+export default class extends AbstractView {
+    constructor(params) {
+        super(params, "Dashboard");
+    }
+
+	async getHtml() {
+		return `
+			<h1>404 Bozo</h1>
+			<p>Git gud</p>
+		`;
+	}
+}

frontend/static/js/views/Search.js

@@ -0,0 +1,85 @@
+import AbstractView from "./AbstractView.js";
+import {client} from "../index.js";
+
+export default class extends AbstractView {
+    constructor(params) {
+        super(params, "Search");
+    }
+
+	async postInit() {
+
+		let search = document.getElementById("form");
+		search.addEventListener("input", this.users)
+
+		this.users();
+
+	}
+
+	async users() {
+
+		let search = document.getElementById("form").value;
+		
+		let logged = await client.isAuthentificate();
+
+		let users = await client.profiles.all();
+		let list_users = document.getElementById('list_users');
+		list_users.innerHTML = "";
+
+		users.filter(user => user.username.startsWith(search) == true).forEach((user) => {
+			var new_user = document.createElement("li");
+
+			// username
+			let username = document.createElement("a");
+			username.href = `/profiles/${user.user_id}`;
+			username.appendChild(document.createTextNode(user.username));
+			new_user.appendChild(username);
+
+			// space
+			new_user.appendChild(document.createTextNode(" "));
+
+			// chat
+			if (logged) {
+				let chat = document.createElement("a");
+				let array = [
+					client.me.user_id,
+					user.user_id,
+				];
+				console.log(client.me.id);
+				chat.addEventListener("click", async function(){
+					console.log("click");
+					await client.channels.createChannel([client.me.user_id , user.user_id]);
+				});
+				//chat.href = `/chat`
+				chat.appendChild(document.createTextNode("Chat"));
+				new_user.appendChild(chat);
+			}
+			
+			// break line
+			new_user.appendChild(document.createElement("br"));
+
+			// avatar
+			var img = document.createElement("img");
+			img.src = user.avatar_url;
+			new_user.appendChild(img);
+
+
+			list_users.appendChild(new_user);
+		});
+		//console.log(list_users);
+
+	}
+
+    async getHtml() {
+        return `
+			<link rel="stylesheet" href="/static/css/search.css">
+
+			<input id="form" type="text" name="message" placeholder="userbozo"/>
+
+			<div id="users">
+				<ul id="list_users">
+				</ul>
+			</div>
+
+        `;
+    }
+}

frontend/static/js/views/Settings.js

@@ -1,14 +0,0 @@
-import AbstractView from "./AbstractView.js";
-
-export default class extends AbstractView {
-    constructor(params) {
-        super(params, "Settings");
-    }
-
-    async getHtml() {
-        return `
-            <h1>Settings</h1>
-            <p>Manage your privacy and configuration.</p>
-        `;
-    }
-}

frontend/static/js/views/profiles/ProfilesView.js

@@ -1,40 +0,0 @@
-import AbstractView from "../AbstractView.js";
-import { client } from "../../index.js"
-
-export default class extends AbstractView {
-    constructor(params) {
-        super(params, "Profiles");
-    }
-
-    async postInit()
-    {
-        let profiles = await client.profiles.all()
-		let profile_list_element = document.getElementById("profile-list")
-
-		profiles.forEach((profile) => {
-			let profile_element = document.createElement("div");
-			profile_element.className = "item";
-			
-			let avatar = document.createElement("img");
-			avatar.src = profile.avatar_url;
-
-			let username = document.createElement("a");
-			username.href = `/profiles/${profile.user_id}`;
-			username.appendChild(document.createTextNode(profile.username));
-
-			profile_element.appendChild(avatar);
-			profile_element.appendChild(username);
-
-			profile_list_element.appendChild(profile_element)
-		});
-    }
-
-    async getHtml() {
-        return `
-			<link rel="stylesheet" href="/static/css/profiles/profiles.css">
-		    <div id="profile-list">
-			
-			</div>
-        `;
-    }
-}

frontend/templates/index.html

@@ -10,10 +10,10 @@
 <body>
     <nav class="nav">
         <a href="/" class="nav__link" data-link>Dashboard</a>
-        <a href="/profiles" class="nav__link" data-link>Profiles</a>
+        <a href="/search" class="nav__link" data-link>Search</a>
+        <a href="/home" class="nav__link" data-link>Home</a>
         <a href="/login" class="nav__link" data-link>Login</a>
         <a href="/register" class="nav__link" data-link>Register</a>
-        <a href="/chat" class="nav__link" data-link>Chat</a>
     </nav>
     <div id="app"></div>
 	<script type="module" src="{% static 'js/index.js' %}"></script>

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "ft_transcendence",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

requirements.txt

@@ -1,10 +1,30 @@
 asgiref==3.7.2
+attrs==23.1.0
+autobahn==23.6.2
+Automat==22.10.0
+cffi==1.16.0
+channels==4.0.0
+constantly==23.10.4
+cryptography==41.0.7
+daphne==4.0.0
 Django==4.2.6
 django-cors-headers==4.3.0
 django-restapi==0.1.3
 djangorestframework==3.14.0
+hyperlink==21.0.0
+idna==3.6
+incremental==22.10.0
 install==1.3.5
+Pillow==10.1.0
+pyasn1==0.5.1
+pyasn1-modules==0.3.0
+pycparser==2.21
+pyOpenSSL==23.3.0
 pytz==2023.3.post1
+service-identity==23.1.0
+six==1.16.0
 sqlparse==0.4.4
-channels==4.0.0
-daphne
+Twisted==23.10.0
+txaio==23.1.1
+typing_extensions==4.8.0
+zope.interface==6.1

trancendence/settings.py

@@ -48,6 +48,7 @@ INSTALLED_APPS = [
     'accounts.apps.AccountsConfig',
     'profiles.apps.ProfilesConfig',
     'frontend.apps.FrontendConfig',
+    'chat.apps.ChatConfig',
     
     'corsheaders',
     'rest_framework',

trancendence/urls.py

@@ -21,5 +21,6 @@ urlpatterns = [
     path('admin/', admin.site.urls),
     path('api/profiles/', include('profiles.urls')),
     path('api/accounts/', include('accounts.urls')),
+    path('api/chat/', include('chat.urls')),
     path('', include('frontend.urls')),
 ]