Merge remote-tracking branch 'refs/remotes/origin/server' into server

README.md

@@ -25,6 +25,7 @@ pip install -r requirements.txt
 python manage.py makemigrations games
 python manage.py makemigrations profiles
 python manage.py makemigrations chat
+python manage.py makemigrations tournament
 python manage.py migrate
 ```
 - Start the developpement server

chat/consumers.py

@@ -2,7 +2,6 @@ import json
 from channels.generic.websocket import WebsocketConsumer
 from asgiref.sync import async_to_sync
 from .models import MemberModel, MessageModel
-from profiles.models import BlockModel
 import time
 
 class ChatConsumer(WebsocketConsumer):
@@ -35,9 +34,6 @@ class ChatConsumer(WebsocketConsumer):
 
 		text_data_json = json.loads(text_data)
 		message = text_data_json['message']
-		receivers_id = text_data_json['receivers_id']
-
-		print(text_data)
 
 		channel_id : int = int(self.scope['path'].split('/')[3])
 		user = self.scope["user"]
@@ -50,14 +46,9 @@ class ChatConsumer(WebsocketConsumer):
 		if (self.channel_layer == None):
 			return
 
-		message_time : int = int(time.time() * 1000)
-		
-		if (len(receivers_id) == 1 and 
-			BlockModel.objects.filter(blocker=user.pk, blocked=receivers_id[0]) or
-			BlockModel.objects.filter(blocker=receivers_id[0], blocked=user.pk)
-			):
-			return
+		print(message)
 
+		message_time : int = int(time.time() * 1000)
 		async_to_sync(self.channel_layer.group_send)(
 			self.room_group_name,
 			{

frontend/static/js/api/account.js

@@ -33,7 +33,7 @@ class Account
 
 		if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
 		{
-			this.client._logged = false;
+			this.client._update_logged(false);
 			return null;			
 		}
 		if (response_data == "user deleted")

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

@@ -54,14 +54,13 @@ class Channel {
 		return new_messages;
 	}
 
-	async sendMessageChannel(message, receivers_id) {
+	async sendMessageChannel(message) {
 
 		if (this.chatSocket == undefined)
 			return;
 
 		this.chatSocket.send(JSON.stringify({
-			'message':message,
-			'receivers_id':receivers_id,
+			'message':message
 		}));
 	}
 

frontend/static/js/api/client.js

@@ -35,11 +35,10 @@ class Client
 		return this.logged;	
 	}
 
-	async _get(uri, data)
+	async _get(uri)
 	{
 		let response = await fetch(this._url + uri, {
 			method: "GET",
-			body: JSON.stringify(data),
 		});
 		return response;
 	}

frontend/static/js/api/matchmaking.js

@@ -8,7 +8,7 @@ class MatchMaking
 	constructor(client)
 	{
 		/**
-		 * @type {client}
+		 * @type {Client}
 		 */
 		this.client = client
 	}

frontend/static/js/api/profile.js

@@ -12,9 +12,8 @@ class Profile
 		 */
 		this.client = client;
 		this.username = username;
-		this.avatar_url = avatar_url;
-		this.user_id = user_id;
-		this.isBlocked = false;
+		this.avatar_url = avatar_url
+		this.user_id = user_id
 	}
 
 	async init(user_id)
@@ -25,21 +24,7 @@ class Profile
 		this.user_id = response_data.user_id;
 		this.username = response_data.username;
 		this.avatar_url = response_data.avatar_url;
-
-		let block_response = await this.client._get("/api/profiles/block");
-
-		if (block_response.status == 404)
-			return
-
-		let block_data = await block_response.json();
-		let block_list = JSON.parse(block_data);
-		block_list.forEach(block => {
-			let blocker = block.fields.blocker;
-			let blocked = block.fields.blocked;
-			if (blocker == this.client.me.user_id && blocked == user_id)
-				return this.isBlocked = true;
-		});
 	}
 }
 
-export {Profile}
+export {Profile}

frontend/static/js/api/profiles.js

@@ -35,30 +35,13 @@ class Profiles
 	async block(user_id) {
 
 		// blocker & blocked
-		let response = await this.client._post("/api/profiles/block", { 
-			users_id:[this.client.me.user_id, user_id],
-		});
+		let response = await this.client._post("/api/block/", 
+			[this.client.me.user_id, user_id],
+		);
 
 		let data = await response.json();
-		console.log(response.status);
-		console.log(data);
-		return data;
 
 	}
-
-	async deblock(user_id) {
-
-		// blocker & blocked
-		let response = await this.client._delete("/api/profiles/block", { 
-			users_id:[this.client.me.user_id, user_id],
-		});
-
-		let data = await response.json();
-		console.log(response.status);
-		console.log(data);
-		return data;
-		
-	}
 }
 
 export {Profiles}

frontend/static/js/api/tournament/tournament.js

@@ -0,0 +1,19 @@
+import { Client } from "./client.js";
+
+class Tourmanent
+{
+	/**
+	 * @param  {Client} client
+	 */
+	constructor(client)
+	{
+		/**
+		 * @type {Client}
+		 */
+		this.client = client
+	}
+
+	
+}
+
+export { Tourmanent }

frontend/static/js/api/tournament/tournaments.js

@@ -0,0 +1,33 @@
+import { Client } from "./client.js";
+
+class Tourmanents
+{
+	/**
+	 * @param  {Client} client
+	 */
+	constructor(client)
+	{
+		/**
+		 * @type {Client}
+		 */
+		this.client = client
+	}
+
+	async createTournament(nb_players, online)
+	{
+		if (online)
+			return "offline";
+		let response = await this.client._post("/api/tournaments/", {numbers_of_players: nb_players});
+		let response_data = await response.json();
+
+		if (JSON.stringify(response_data) === JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
+		{
+			this.client._update_logged(false);
+			return null;			
+		}
+		return response_data.tournament_id;
+	}
+	
+}
+
+export { Tourmanents }

frontend/static/js/views/ProfilePageView.js

@@ -9,47 +9,33 @@ export default class extends AbstractView {
 
     async postInit()
     {
-        this.profile = await client.profiles.getProfile(this.user_id);
-		this.info = document.getElementById("info");
+        let profile = await client.profiles.getProfile(this.user_id);
+		let info = document.getElementById("info");
 
 		// Username
         let username = document.createElement("a");
 		username.id = "username";
-        username.appendChild(document.createTextNode(this.profile.username));
-		this.info.appendChild(username);
+        username.appendChild(document.createTextNode(profile.username));
+		info.appendChild(username);
 
-		this.info.appendChild(document.createElement("br"));
+	info.appendChild(document.createElement("br"));
 
 		// Avatar
         let avatar = document.createElement("img");
 		avatar.id = "avatar";
-        avatar.src = this.profile.avatar_url;
-		this.info.appendChild(avatar);
-
-		await this.blockButton();
-    }
-
-	async blockButton() {
+        avatar.src = profile.avatar_url;
+		info.appendChild(avatar);
+		
 		// Block option
-		if (client.me.user_id != this.user_id) {
-			let block = document.getElementById("block") || document.createElement("a");
-			block.id = "block";
-			block.innerText = "";
-			block.onclick = async () => {
-				if (!this.profile.isBlocked)
-					await client.profiles.block(this.user_id);
-				else
-					await client.profiles.deblock(this.user_id);
-				this.profile = await client.profiles.getProfile(this.user_id);
-				this.blockButton();
-			};
-			if (this.profile.isBlocked)
-				block.appendChild(document.createTextNode("Deblock"));
-			else
-				block.appendChild(document.createTextNode("Block"));
-			this.info.appendChild(block);
-		}
-	}
+		let block = document.createElement("a");
+		block.id = "block";
+		block.addEventListener("click", async () => {
+			if (client.me.user_id != user.user_id) {
+			}
+		});
+		block.appendChild(document.createTextNode("Block"));
+		info.appendChild(block);
+    }
 
     async getHtml() {
         return `

frontend/static/js/views/Search.js

@@ -100,7 +100,6 @@ export default class extends AbstractView {
 
 	async chat() {
 
-		let users = await client.profiles.all();
 		let logged = await client.isAuthentificate();
 		/*let reload = document.getElementById("messages");
 		if (reload != null)
@@ -136,7 +135,7 @@ export default class extends AbstractView {
 		// les messages, réecriture seulement du dernier 
 		let i = 0;
 		client.channel.messages.forEach((message) => {
-			if (messages.children[i] == null || message.content != messages.children[i].innerText) {
+			if (messages[i] == null || message != messages.children[i].innerText) {
 				let text = document.createElement("p");
 				text.appendChild(document.createTextNode(message.content));
 				if (message.author_id == client.me.user_id)
@@ -159,25 +158,21 @@ export default class extends AbstractView {
 			chat_input.maxLength=255;
 			chat.appendChild(chat_input);
 			
-			chat_input.onkeydown = async () => {
+			chat_input.addEventListener("keydown", async () => {
 				if (event.keyCode == 13 && client.channel != undefined) {
 					//let chat_input = document.getElementById("input_chat");
 					let chat_text = chat_input.value;
 
-					let receivers_id = [];
-					client.channel.members_id.forEach((member_id) => {
-						if (member_id != client.me.user_id)
-							receivers_id.push(users.filter(user => user.user_id == member_id)[0].user_id);
-					});
-					await client.channel.sendMessageChannel(chat_text, receivers_id)
+					await client.channel.sendMessageChannel(chat_text)
 
 					// Reset
 					chat_input.value = "";
 				}
-			};
+			});
 		}
 
 		// nom des membres du chat
+		let users = await client.profiles.all();
 		let members = document.createElement("h2");
 		members.id = "members";
 		let usernames = "";

games/models.py

@@ -2,12 +2,19 @@ from django.db import models
 
 # Create your models here.
 class GameModel(models.Model):
+
+	finished = models.BooleanField(default=False)
+	started = models.BooleanField(default=False)
+	winner_id = models.IntegerField()
 	
 	def create(self, users_id: [int]):
 		self.save()
 		for user_id in users_id:
-			GameMembersModel(game_id=self.pk, member_id=user_id)
+			GameMembersModel(game_id=self.pk, member_id=user_id).save()
 		return self.pk
+	
+	def get_users(self):
+		return list(GameMembersModel.objects.filter(self.pk))
 
 class GameMembersModel(models.Model):
 	game_id = models.IntegerField()

profiles/admin.py

@@ -1,7 +1,6 @@
 from django.contrib import admin
 
-from .models import ProfileModel, BlockModel
+from .models import ProfileModel
 
 # Register your models here.
-admin.site.register(ProfileModel)
-admin.site.register(BlockModel)
+admin.site.register(ProfileModel)

profiles/urls.py

@@ -9,7 +9,5 @@ urlpatterns = [
     path("me", viewsets.MyProfileViewSet.as_view({'patch': 'partial_update', 'get': 'retrieve'}), name="my_profile_page"),
     path("<int:pk>", viewsets.ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
     path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
-	path("block", views.BlocksView.as_view(), name="block_page"),
-	path("block/<int:pk>", views.BlockView.as_view(), name="block_page"),
-
+	path("block", views.BlockView.as_view(), name="block_page"),
 ] + static("/static/avatars/", document_root="./avatars")

profiles/views.py

@@ -2,65 +2,17 @@ from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework import authentication, permissions, status
 from rest_framework.authentication import SessionAuthentication
-from rest_framework.renderers import JSONRenderer
 from django.core import serializers
-from .models import BlockModel
 
 class BlockView(APIView):
 	permission_classes = (permissions.IsAuthenticated,)
 	authentication_classes = (SessionAuthentication,)
+	
+	def post(self, request, pk):
+		pass
 
 	def get(self, request, pk):
-		block = BlockModel.objects.filter(pk=pk)
-		if (block):
-			return Response(serializers.serialize("json", block), status=status.HTTP_200_OK)
-		else:
-			return Response("Not Found", status=status.HTTP_404_NOT_FOUND)
+		pass
 
-
-class BlocksView(APIView):
-	permission_classes = (permissions.IsAuthenticated,)
-	authentication_classes = (SessionAuthentication,)
-
-	def get(self, request):
-		blocks = BlockModel.objects.filter(blocker=request.user.pk)
-		if (blocks):
-			return Response(serializers.serialize("json", BlockModel.objects.filter(blocker=request.user.pk)), status=status.HTTP_200_OK)
-		else:
-			return Response({}, status=status.HTTP_404_NOT_FOUND)
-
-	def post(self, request):
-		data: dict = request.data
-		users_id = request.data.get("users_id", None)
-
-		if (users_id == None):
-			return Response({"Error"}, status=status.HTTP_400_BAD_REQUEST)
-
-		if (BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])):
-			return Response({"Already Exist"}, status=status.HTTP_409_CONFLICT)
-
-		new_block = BlockModel()
-		new_block.blocker = users_id[0]
-		new_block.blocked = users_id[1]
-		new_block.save()
-
-		return Response({"block_id": new_block.pk}, status=status.HTTP_201_CREATED)
-
-	def delete(self, request):
-		data: dict = request.data
-		users_id = request.data.get("users_id", None)
-
-		if (users_id == None):
-			return Response({"Error"}, status=status.HTTP_400_BAD_REQUEST)
-
-		block = BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])
-
-		print(list(block))
-		if (block.count() > 1):
-			return Response("Not normal >:[", status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-		
-		if (not block):
-			return Response("Don't exist", status=status.HTTP_404_NOT_FOUND)
-
-		block.delete()
-		return Response("Deleted", status=status.HTTP_200_OK)
+	def delete(self, request, pk):
+		pass

tournament/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

tournament/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class TournamentConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'tournament'

tournament/models.py

@@ -0,0 +1,47 @@
+from django.db import models
+
+from games.models import GameModel
+
+# Create your models here.tu
+class TournamentModel(models.Model):
+
+	name = models.CharField()
+	nb_players = models.IntegerField()
+	nb_players_by_game = models.IntegerField()
+	level = models.IntegerField()
+	started = models.BooleanField(default=False)
+	finished = models.BooleanField(default=False)
+
+	def create(self, nb_players: int, nb_players_by_game: int, name: str = ""):
+		self.level = 1
+		number: int = nb_players
+		while (number != nb_players_by_game):
+			number = number // 2 + (number % 2)
+			self.level += 1
+		self.nb_players = nb_players
+		self.nb_players_by_game = nb_players_by_game
+		self.name = name
+		return self.save()
+
+	def create_game(self, users_id):
+		game_id = GameModel.create(users_id=users_id)
+		TournamentGamesModel(game_id=game_id, tournament_id=self.pk).save()
+		return game_id
+	
+	def get_games_id_by_level(self, level):
+		return list(TournamentGamesModel.objects.filter(tournament_id=self.pk, tournament_level=level))
+
+	def get_games_id(self):
+		return list(TournamentGamesModel.objects.filter(tournament_id=self.pk))
+	
+	def get_players_id(self):
+		lst: [int] = []
+		for game_id in self.get_games_id():
+			lst.append(GameMembersModel.objects.filter(game_id=game_id))
+		return lst
+
+class TournamentGamesModel(models.Model):
+
+	tournament_id = models.IntegerField()
+	tournament_level = models.IntegerField()
+	game_id = models.IntegerField()

tournament/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

tournament/urls.py

@@ -0,0 +1,10 @@
+from django.urls import path
+from django.conf import settings
+from django.conf.urls.static import static
+
+from .views import TournamentsView, TournamentView
+
+urlpatterns = [
+    path("<int:pk>",  name="tournament_page"),
+    path("", TournamentsView.as_view(), name="tournaments"),
+]

tournament/views.py

@@ -0,0 +1,61 @@
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import permissions, status
+from rest_framework.authentication import SessionAuthentication
+
+from django.http import HttpRequest
+from django.contrib.auth import login
+
+from matchmaking.models import in_matchmaking
+from .models import TournamentModel
+
+# Create your views here.
+class TournamentsView(APIView):
+    
+	permission_classes = (permissions.IsAuthenticated,)
+	authentication_classes = (SessionAuthentication,)
+
+	def post(self, request: HttpRequest):
+
+		data: dict = request.data
+
+		nb_players_by_game = data.get("nb_players_by_game")
+		if (nb_players_by_game is None):
+			return Response("nb_player_by_game is required.", status=status.HTTP_400_BAD_REQUEST)
+
+		nb_players = data.get("nb_players")
+		if (nb_players is None):
+			return Response("nb_players is required.", status=status.HTTP_400_BAD_REQUEST)
+
+		tournament_id: int = TournamentModel.create(users_id=users_id, nb_players=nb_players)
+		
+		return Response({"tournament_id": tournament_id}, status=status.HTTP_201_CREATED)
+
+class TournamentView(APIView):
+
+	permission_classes = (permissions.IsAuthenticated,)
+	authentication_classes = (SessionAuthentication,)
+
+	def get(self, request: HttpRequest, pk):
+
+		if (not TournamentModel.objects.filter(pk=pk).exists()):
+			return Response({"detail": "Tournament not found."}, status=status.HTTP_404_NOT_FOUND)
+		
+		tournament = TournamentModel.objects.get(pk=pk)
+
+		levels: [[int]] = []
+		level: [int] = tournament.get_games_id_by_level
+		while level != []:
+			levels.append(level)
+			level: [int] = tournament.get_games_id_by_level
+
+		data = {
+			"name": tournament.name,
+			"finished": tournament.finished,
+			"started": tournament.finished,
+			"nb_players": tournament.nb_players,
+			"nb_players_by_game": tournament.nb_players_by_game,
+			"levels": levels
+		}
+
+		return Response(data, status=status.HTTP_200_OK)

trancendence/settings.py

@@ -43,6 +43,7 @@ INSTALLED_APPS = [
 	'channels',
 	'daphne',
 
+    'tournament.apps.TournamentConfig',
     'matchmaking.apps.MatchmakingConfig',
     'games.apps.GamesConfig',
     'accounts.apps.AccountsConfig',

trancendence/urls.py

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