From c82085dc0ef6d9b1fe876aeef643334d19517c23 Mon Sep 17 00:00:00 2001 From: Theouche Date: Tue, 23 Jul 2024 18:47:56 +0200 Subject: [PATCH 1/7] stat better --- pong/game/utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pong/game/utils.py b/pong/game/utils.py index 4985d59..c02c194 100644 --- a/pong/game/utils.py +++ b/pong/game/utils.py @@ -95,6 +95,12 @@ def player_statistics(request, player_name): 'number of match played' : total_match 'number of win (matches)' : total_win 'pourcentage of victory' : p_win + 'mean score per match' : m_score_match + 'mean score adv per match' : m_score_adv_match + 'best score' : best_score + 'mean nbr ball touch' : m_nbr_ball_touch + 'total duration played' : total_duration + 'mean duration per match' : m_duration 'num_participated_tournaments': num_participated_tournaments, 'num_won_tournaments': num_won_tournaments } From 2efc9bc962e1af0a8dcd0aea702e6f57b4086ce3 Mon Sep 17 00:00:00 2001 From: Theouche Date: Wed, 24 Jul 2024 18:29:10 +0200 Subject: [PATCH 2/7] better classe and add view page web Player, Match, Tournoi --- makefile | 2 + ...r_best_score_player_m_duration_and_more.py | 68 ++++++++ pong/game/models.py | 11 ++ pong/game/templates/pong/match_list.html | 51 ++++++ pong/game/templates/pong/player_list.html | 53 +++++++ pong/game/templates/pong/tournoi_list.html | 37 +++++ pong/game/urls.py | 7 + pong/game/utils.py | 74 ++++++--- pong/game/views.py | 146 +++++++++++++++++- pong/static/game.js | 81 ++++++++++ pong/static/index.html | 2 +- 11 files changed, 509 insertions(+), 23 deletions(-) create mode 100644 pong/game/migrations/0002_player_best_score_player_m_duration_and_more.py create mode 100644 pong/game/templates/pong/match_list.html create mode 100644 pong/game/templates/pong/player_list.html create mode 100644 pong/game/templates/pong/tournoi_list.html diff --git a/makefile b/makefile index 755c103..bded4b4 100644 --- a/makefile +++ b/makefile @@ -31,6 +31,8 @@ logs: ps: $(COMPOSE) ps +re: destroy up + help: @echo "Usage:" @echo " make build [c=service] # Build images" diff --git a/pong/game/migrations/0002_player_best_score_player_m_duration_and_more.py b/pong/game/migrations/0002_player_best_score_player_m_duration_and_more.py new file mode 100644 index 0000000..df55fa5 --- /dev/null +++ b/pong/game/migrations/0002_player_best_score_player_m_duration_and_more.py @@ -0,0 +1,68 @@ +# Generated by Django 5.0.7 on 2024-07-24 16:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('game', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='player', + name='best_score', + field=models.PositiveSmallIntegerField(default=0), + ), + migrations.AddField( + model_name='player', + name='m_duration', + field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), + ), + migrations.AddField( + model_name='player', + name='m_nbr_ball_touch', + field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), + ), + migrations.AddField( + model_name='player', + name='m_score_adv_match', + field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), + ), + migrations.AddField( + model_name='player', + name='m_score_match', + field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), + ), + migrations.AddField( + model_name='player', + name='num_participated_tournaments', + field=models.PositiveSmallIntegerField(default=0), + ), + migrations.AddField( + model_name='player', + name='num_won_tournaments', + field=models.PositiveSmallIntegerField(default=0), + ), + migrations.AddField( + model_name='player', + name='p_win', + field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), + ), + migrations.AddField( + model_name='player', + name='total_duration', + field=models.DurationField(blank=True, null=True), + ), + migrations.AddField( + model_name='player', + name='total_match', + field=models.PositiveSmallIntegerField(default=0), + ), + migrations.AddField( + model_name='player', + name='total_win', + field=models.PositiveSmallIntegerField(default=0), + ), + ] diff --git a/pong/game/models.py b/pong/game/models.py index 6068904..483e955 100644 --- a/pong/game/models.py +++ b/pong/game/models.py @@ -8,6 +8,17 @@ User.add_to_class('auth_token', models.CharField(max_length=100, null=True, blan class Player(models.Model): name = models.CharField(max_length=100) + total_match = models.PositiveSmallIntegerField(default=0) + total_win = models.PositiveSmallIntegerField(default=0) + p_win = models.DecimalField(max_digits=5, decimal_places=2, null=True, blank=True) + m_score_match = models.DecimalField(max_digits=5, decimal_places=2, null=True, blank=True) + m_score_adv_match = models.DecimalField(max_digits=5, decimal_places=2, null=True, blank=True) + best_score = models.PositiveSmallIntegerField(default=0) + m_nbr_ball_touch = models.DecimalField(max_digits=5, decimal_places=2, null=True, blank=True) + total_duration = models.DurationField(null=True, blank=True) + m_duration = models.DecimalField(max_digits=5, decimal_places=2, null=True, blank=True) + num_participated_tournaments = models.PositiveSmallIntegerField(default=0) + num_won_tournaments = models.PositiveSmallIntegerField(default=0) def __str__(self): return self.name diff --git a/pong/game/templates/pong/match_list.html b/pong/game/templates/pong/match_list.html new file mode 100644 index 0000000..72c1315 --- /dev/null +++ b/pong/game/templates/pong/match_list.html @@ -0,0 +1,51 @@ + + + + + + Matches List + + +

Matches List

+ + + + + + + + + + + + + + + + + + + {% for match in matches %} + + + + + + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
IDPlayer 1Player 2Score Player 1Score Player 2WinnerBall Touches Player 1Ball Touches Player 2DurationDateIs TournamentTournament
{{ match.id }}{{ match.player1.name }}{{ match.player2.name }}{{ match.score_player1 }}{{ match.score_player2 }}{{ match.winner.name }}{{ match.nbr_ball_touch_p1 }}{{ match.nbr_ball_touch_p2 }}{{ match.duration }}{{ match.date }}{{ match.is_tournoi }}{{ match.tournoi.name }}
No matches found.
+ + diff --git a/pong/game/templates/pong/player_list.html b/pong/game/templates/pong/player_list.html new file mode 100644 index 0000000..b9fbb42 --- /dev/null +++ b/pong/game/templates/pong/player_list.html @@ -0,0 +1,53 @@ + + + + + + Players List + + +

Players List

+ + + + + + + + + + + + + + + + + + + + {% for player in players %} + + + + + + + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
IDNameTotal MatchesTotal WinsWin PercentageAverage Match ScoreAverage Opponent ScoreBest ScoreAverage Ball TouchesTotal DurationAverage DurationParticipated TournamentsWon Tournaments
{{ player.id }}{{ player.name }}{{ player.total_match }}{{ player.total_win }}{{ player.p_win }}{{ player.m_score_match }}{{ player.m_score_adv_match }}{{ player.best_score }}{{ player.m_nbr_ball_touch }}{{ player.total_duration }}{{ player.m_duration }}{{ player.num_participated_tournaments }}{{ player.num_won_tournaments }}
No players found.
+ + diff --git a/pong/game/templates/pong/tournoi_list.html b/pong/game/templates/pong/tournoi_list.html new file mode 100644 index 0000000..e5718f5 --- /dev/null +++ b/pong/game/templates/pong/tournoi_list.html @@ -0,0 +1,37 @@ + + + + + + Tournaments List + + +

Tournaments List

+ + + + + + + + + + + + {% for tournoi in tournois %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
IDNameNumber of PlayersDateWinner
{{ tournoi.id }}{{ tournoi.name }}{{ tournoi.nbr_player }}{{ tournoi.date }}{{ tournoi.winner.name }}
No tournaments found.
+ + diff --git a/pong/game/urls.py b/pong/game/urls.py index 96488b0..43f7305 100644 --- a/pong/game/urls.py +++ b/pong/game/urls.py @@ -2,10 +2,17 @@ from django.urls import path from . import views +from .views import player_list, tournoi_list, match_list urlpatterns = [ path('', views.index, name='index'), path('check_user_exists/', views.check_user_exists, name='check_user_exists'), path('register_user/', views.register_user, name='register_user'), path('authenticate_user/', views.authenticate_user, name='authenticate_user'), + path('create_player/', views.create_player_view, name='create_player'), + path('create_tournoi/', views.create_tournoi_view, name='create_tournoi'), + path('create_match/', views.create_match_view, name='create_match'), + path('players/', player_list, name='player_list'), + path('matches/', match_list, name='match_list'), + path('tournois/', tournoi_list, name='tournoi_list'), ] diff --git a/pong/game/utils.py b/pong/game/utils.py index c02c194..add9877 100644 --- a/pong/game/utils.py +++ b/pong/game/utils.py @@ -1,33 +1,69 @@ -from myapp.models import Player, Tournoi, Match +from .models import Player, Tournoi, Match from django.core.exceptions import ValidationError -def create_player(name): - player = Player(name=name) +def create_player( + name, + total_match=0, + total_win=0, + p_win= None, + m_score_match= None, + m_score_adv_match= None, + best_score=0, + m_nbr_ball_touch= None, + total_duration= None, + m_duration= None, + num_participated_tournaments=0, + num_won_tournaments=0 +): + if Player.objects.filter(name=name).exists(): + raise ValueError(f"A player with the name '{name}' already exists.") + + player = Player( + name=name, + total_match = total_match, + total_win = total_win, + p_win = p_win, + m_score_match = m_score_match, + m_score_adv_match = m_score_adv_match, + best_score = best_score, + m_nbr_ball_touch = m_nbr_ball_touch, + total_duration = total_duration, + m_duration = m_duration, + num_participated_tournaments = num_participated_tournaments, + num_won_tournaments = num_won_tournaments + ) player.save() return player -def create_tournoi(name, nbr_player, date, winner=None): +def create_tournoi(name, nbr_player, date, winner): tournoi = Tournoi(name=name, nbr_player=nbr_player, date=date, winner=winner) tournoi.save() return tournoi -def create_match(player1, player2, score_player1=0, score_player2=0, winner=None, nbr_ball_touch_p1=0, nbr_ball_touch_p2=0, duration=None, is_tournoi=False, tournoi=None): +def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration, is_tournoi, tournoi): match = Match( player1=player1, player2=player2, score_player1=score_player1, score_player2=score_player2, - winner=winner, nbr_ball_touch_p1=nbr_ball_touch_p1, nbr_ball_touch_p2=nbr_ball_touch_p2, duration=duration, is_tournoi=is_tournoi, tournoi=tournoi ) + + if score_player1 > score_player2: + match.winner = match.player1 + elif score_player2 > score_player1: + match.winner = match.player2 + else: + match.winner = None + match.save() return match -def complete_match(match_id, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration): +""" def complete_match(match_id, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration): try: match = Match.objects.get(id=match_id) except Match.DoesNotExist: @@ -47,9 +83,9 @@ def complete_match(match_id, score_player1, score_player2, nbr_ball_touch_p1, nb match.winner = None match.save() - return match + return match """ -def complete_tournoi(tournoi_id, player): +""" def complete_tournoi(tournoi_id, player): try: tournoi = Tournoi.objects.get(id = tournoi_id) except Tournoi.DoesNotExist: @@ -57,7 +93,7 @@ def complete_tournoi(tournoi_id, player): tournoi.winner = player tournoi.save() - return tournoi + return tournoi """ def player_statistics(request, player_name): player = get_object_or_404(Player, nam = player_name) @@ -92,15 +128,15 @@ def player_statistics(request, player_name): data = { 'player_name': player.name, - 'number of match played' : total_match - 'number of win (matches)' : total_win - 'pourcentage of victory' : p_win - 'mean score per match' : m_score_match - 'mean score adv per match' : m_score_adv_match - 'best score' : best_score - 'mean nbr ball touch' : m_nbr_ball_touch - 'total duration played' : total_duration - 'mean duration per match' : m_duration + 'number of match played' : total_match, + 'number of win (matches)' : total_win, + 'pourcentage of victory' : p_win, + 'mean score per match' : m_score_match, + 'mean score adv per match' : m_score_adv_match, + 'best score' : best_score, + 'mean nbr ball touch' : m_nbr_ball_touch, + 'total duration played' : total_duration, + 'mean duration per match' : m_duration, 'num_participated_tournaments': num_participated_tournaments, 'num_won_tournaments': num_won_tournaments } diff --git a/pong/game/views.py b/pong/game/views.py index 279a317..298fa5b 100644 --- a/pong/game/views.py +++ b/pong/game/views.py @@ -2,9 +2,9 @@ from django.shortcuts import render -def index(request): - return render(request, 'index.html') - +from django.core.exceptions import ObjectDoesNotExist +from .models import Player, Tournoi, Match +from .utils import create_player, create_tournoi, create_match from django.http import JsonResponse from django.contrib.auth.models import User from django.contrib.auth import authenticate @@ -12,6 +12,11 @@ from django.views.decorators.csrf import csrf_exempt import json import uuid + +def index(request): + return render(request, 'index.html') + + @csrf_exempt def register_user(request): if request.method == 'POST': @@ -62,3 +67,138 @@ def get_or_create_token(user): user.save() break return user.auth_token + + +####################### THEOUCHE PART ############################ + + +@csrf_exempt +def create_player_view(request): + if request.method == 'POST': + try: + data = json.loads(request.body) + name = data.get('name') + + # Vérifier que le nom est présent + if not name: + return JsonResponse({'error': 'Name is required'}, status=400) + + # Appeler la fonction create_player et traiter les exceptions + player = create_player( + name=name, + total_match=data.get('total_match', 0), + total_win=data.get('total_win', 0), + p_win=data.get('p_win'), + m_score_match=data.get('m_score_match'), + m_score_adv_match=data.get('m_score_adv_match'), + best_score=data.get('best_score', 0), + m_nbr_ball_touch=data.get('m_nbr_ball_touch'), + total_duration=data.get('total_duration'), + m_duration=data.get('m_duration'), + num_participated_tournaments=data.get('num_participated_tournaments', 0), + num_won_tournaments=data.get('num_won_tournaments', 0) + ) + return JsonResponse({'id': player.id, 'name': player.name}) + + except ValueError as e: + # Erreur spécifique à la validation + return JsonResponse({'error': str(e)}, status=400) + except json.JSONDecodeError: + # Erreur de décodage JSON + return JsonResponse({'error': 'Invalid JSON format'}, status=400) + except Exception as e: + # Erreur générale + return JsonResponse({'error': 'An unexpected error occurred', 'details': str(e)}, status=500) + + # Méthode HTTP non supportée + return JsonResponse({'error': 'Invalid HTTP method'}, status=405) + + + +@csrf_exempt +def create_tournoi_view(request): + if request.method == 'POST': + data = json.loads(request.body) + name = data.get('name') + nbr_player = data.get('nbr_player') + date = data.get('date') + winner_id = data.get('winner_id') + if not (name and nbr_player and date): + return JsonResponse({'error': 'Name, number of players, and date are required'}, status=400) + + winner = None + if winner_id: + try: + winner = Player.objects.get(id=winner_id) + except Player.DoesNotExist: + return JsonResponse({'error': 'Winner not found'}, status=404) + + tournoi = create_tournoi(name, nbr_player, date, winner) + return JsonResponse({ + 'id': tournoi.id, + 'name': tournoi.name, + 'nbr_player': tournoi.nbr_player, + 'date': tournoi.date.isoformat(), + 'winner': winner.id if winner else None + }) + return JsonResponse({'error': 'Invalid HTTP method'}, status=405) + +@csrf_exempt +def create_match_view(request): + if request.method == 'POST': + data = json.loads(request.body) + player1_id = data.get('player1_id') + player2_id = data.get('player2_id') + score_player1 = data.get('score_player1', 0) + score_player2 = data.get('score_player2', 0) + nbr_ball_touch_p1 = data.get('nbr_ball_touch_p1', 0) + nbr_ball_touch_p2 = data.get('nbr_ball_touch_p2', 0) + duration = data.get('duration') + is_tournoi = data.get('is_tournoi', False) + tournoi_id = data.get('tournoi_id') + + if not (player1_id and player2_id and duration): + return JsonResponse({'error': 'Player IDs and duration are required'}, status=400) + + try: + player1 = Player.objects.get(id=player1_id) + player2 = Player.objects.get(id=player2_id) + except Player.DoesNotExist: + return JsonResponse({'error': 'One or both players not found'}, status=404) + + tournoi = None + if tournoi_id: + try: + tournoi = Tournoi.objects.get(id=tournoi_id) + except Tournoi.DoesNotExist: + return JsonResponse({'error': 'Tournoi not found'}, status=404) + + match = create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration, is_tournoi, tournoi) + return JsonResponse({ + 'id': match.id, + 'player1': match.player1.id, + 'player2': match.player2.id, + 'score_player1': match.score_player1, + 'score_player2': match.score_player2, + 'nbr_ball_touch_p1': match.nbr_ball_touch_p1, + 'nbr_ball_touch_p2': match.nbr_ball_touch_p2, + 'duration': str(match.duration), + 'is_tournoi': match.is_tournoi, + 'tournoi': match.tournoi.id if match.tournoi else None + }) + return JsonResponse({'error': 'Invalid HTTP method'}, status=405) + + +def player_list(request): + players = Player.objects.all() + return render(request, 'pong/player_list.html', {'players': players}) + +def match_list(request): + matches = Match.objects.select_related('player1', 'player2', 'winner', 'tournoi').all() + return render(request, 'pong/match_list.html', {'matches': matches}) + +def tournoi_list(request): + tournois = Tournoi.objects.select_related('winner').all() + return render(request, 'pong/tournoi_list.html', {'tournois': tournois}) + +####################### THEOUCHE PART ############################ diff --git a/pong/static/game.js b/pong/static/game.js index 4c985aa..2287657 100644 --- a/pong/static/game.js +++ b/pong/static/game.js @@ -19,6 +19,86 @@ document.addEventListener('DOMContentLoaded', () => { registerButton.addEventListener('click', handleRegister); loginButton.addEventListener('click', handleLogin); + + /// THEOUCHE NOT CERTAIN /// + async function createPlayer(name, totalMatch = 0, totalWin = 0, pWin = null, mScoreMatch = null, mScoreAdvMatch = null, bestScore = 0, mNbrBallTouch = null, totalDuration = null, mDuration = null, numParticipatedTournaments = 0, numWonTournaments = 0) { + try { + const response = await fetch('/api/create_player/', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + name, + total_match: totalMatch, + total_win: totalWin, + p_win: pWin, + m_score_match: mScoreMatch, + m_score_adv_match: mScoreAdvMatch, + best_score: bestScore, + m_nbr_ball_touch: mNbrBallTouch, + total_duration: totalDuration, + m_duration: mDuration, + num_participated_tournaments: numParticipatedTournaments, + num_won_tournaments: numWonTournaments + }) + }); + + if (!response.ok) { + const errorData = await response.json(); + throw new Error(errorData.error || 'Network response was not ok'); + } + + const data = await response.json(); + return data; + + } catch (error) { + // Afficher l'erreur avec un message plus spécifique + console.error('Error creating player:', error.message); + alert(`Failed to create player: ${error.message}`); + } + } + + async function createTournoi(name, nbr_player, date, winner_id) { + try { + const response = await fetch('/api/create_tournoi/', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ name, nbr_player, date, winner_id }) + }); + if (!response.ok) { + throw new Error('Network response was not ok'); + } + const data = await response.json(); + return data; + } catch (error) { + console.error('Error creating tournoi:', error); + } + } + + async function createMatch(player1_id, player2_id, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration, is_tournoi, tournoi_id) { + try { + const response = await fetch('/api/create_match/', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ player1_id, player2_id, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration, is_tournoi, tournoi_id }) + }); + if (!response.ok) { + throw new Error('Network response was not ok'); + } + const data = await response.json(); + return data; + } catch (error) { + console.error('Error creating match:', error); + } + } + + /// THEOUCHE NOT CERTAIN /// + async function handleCheckNickname() { const nickname = nicknameInput.value.trim(); if (nickname) { @@ -161,6 +241,7 @@ document.addEventListener('DOMContentLoaded', () => { document.getElementById('player1-name').textContent = `${player1_name}`; document.getElementById('player2-name').textContent = `${player2_name}`; document.addEventListener('keydown', handleKeyDown); + } function handleKeyDown(event) { diff --git a/pong/static/index.html b/pong/static/index.html index 1aad5b6..5f8b5a9 100644 --- a/pong/static/index.html +++ b/pong/static/index.html @@ -26,7 +26,7 @@ +
+

BIENVENUE DANS LE PONG 42

+
@@ -25,6 +44,7 @@
+
+ diff --git a/pong/static/logo-42-perpignan.png b/pong/static/logo-42-perpignan.png new file mode 100644 index 0000000000000000000000000000000000000000..d91cd1fdf1da6f33dbc52a7600762b165c1424f3 GIT binary patch literal 5912 zcmeHL_d6U+wARb&tX@}_5WOV2)h*U;1krn4J)(wSm5^u=QNyZ92%-z?vtgA)FDrT{ zy68f3H}~JTcYc^>&O9^kdFMSd&&-@;sEHm8fCE54KtN-luMHz0AjII?xfI0sI^}Zk zf`EXS01A1iqvsF#`~T(t75KlZfa}_!3jS~q1j9_=1kzu6yT8sur7&ZaxqWG}XMf)V z^fjkWG{kz);=f)T-%UBXC-dr5QX(}y^TVuz*K(p4Dwj6$ovH>y*zAM{Nr_02 zWWeb4gIX5<0Oty}sKcE6KL*pXu8a&8jxV>? zt+hqaL~UsEs(qWJ8g8s-pA96l+vck_ulc0a@FYask&d5$fU(a&Tk~OP!M?4h1G5g} z0fkcx1-ltN4N1IltTxe|w^bfQN#uOp=0MFP5gzR}M#==zHgiit9Zd#F=sJZi4eH}| zEZ?0vejWx_W(GQv4*Fn=g~AU9MQerG7j`0H;Ar*5VBEuz$?q5KU#_{ZPATyMJCj1o z{o#676%auopHZn~)T5Szv6oIaE{RkeBAjwu6FrJQ>l@?yrbHG?JdIVNZv^Vuk8jEP z`TMdM72HMW{Q{iM)Y0VWj_|fzL!GQsl^7U z=OOU`OvT`>p?F78pA68M9MUk|#8t{trym1-JBuBk0DjOQYBCjmSZSdTVDiDE6EzwL zp{KIIwn9LpC+)uuC_A+s9g!AvhQGI@QY`g;722a;yk86Yc7D1XZ_C3>P@Q9S&g$Kw zK5q`DCxBSCNwwTjq$nQ+lGgq;7|v!bNdMaz&;#I1>ct~CLV8+0y2QFM3dB;dYnxUOU%gNRy2;a`@Dpfcl*bpHnK#$k z#UMs>75E;?s<8A?RLe4|PKWP*Nm7-;qs&kuasIHkT-89=Jj~me*#<=Lhe300pxf2O zz|1I6H*K>gT&n-|l7l~#t?{3>rMeHAc&b;&`SUSu|HK{R&$=Z0Swl%^;22YcV3k9f zq0FmwLvQ&+Ayfw`f%pl;P3~U?!=SLYESP^(b@9wqBx1bPG3F#WVH-9{^GiI%X6g<7NpVKaY`PM7gepnWr0s4HXe?da zmZ3czW=-*3fCCj}#w#ZhF2nj>AwG|^A>w_r;P7a^<%>H{U8*Fmp(mzvM$oyq9risF z7ibR3H$BR1;|+b(nA&VcK&k8$tGOM69i#z_i&Nuk5$5MwDUaJ3#QT0ZJAoPz;K(eW zO%Ek*vTv;Q0#}9AnWDXnR;eb#p<$prJwYj}2pM0f`^|J7OBC<^K&$3ZT#jf<{GbCm z5I-u%PB$W8r*AvCh7u$G=POn29xb2H}%_7&5c~+s#?mt%_Xp&`54=k+N zIto1W(O%$HYSrYk;*5{8jK3)GURP-*!(^H&?q?L%&SqX>%5OamCGgru3o*{<;N1rc zzd^NqpeZp49vrmz7mD`U$2Fc~-u9E^5A7eS#%bF(ju33T>0zxpE52q?t>>RSE2gUo zn(`XjhUG*~CG@aY6{QB0dl^+pgyVTh`_muyPUWewtL`q+1lB%Ao+xG# zWlv8FLlxoe?ZfiYy-nzZbtam&SCC=SJS}Q+6berXxuszsUShxduZUZJC zJ56BMbu?eJkkGa**Cy4owFhfG11>zbHb~3XUifeK(bv`*L&@s%?tGvyJJx^p#2X-x z00aEySTCfPM>2pxNDEX^1ymjg>&Ks@4<)ZKHlHl+ig8H?PNu)Lp9}(?Gl!2sXF`G* zP?zTr&;S=4CMXqN&EDmlI;u2*5)6>D5JSuB=o_XOy)eYy8sDMjir(rm$f|_wOAVnX zwo#d@U-q^adWD2~FJ_Ld-GIzPbxx$RDJj_71;;IB9i6p*bb;Kj2USFIX5NbI~Z~I0dHwo^EFg< zcFY@S=kikryuvWdsYa5S$Q>)~*3l(^ju8p($=%jUUmmrZ)l#t@?+bhUETfvh*}_V3 zSk`$U&1$Ug_>@T|{DG;@h47TLvwK)7#>N`YCcpjQQZNXonDW*%=f(*V{K`mS;jkqu?2Pr(Q#+5v(0b`veq zNtcQ@e8N=wvSkI4cR7xl8gD_RFGar|8J0YB+bm=P9f{jW>s3hPJl{GpL4>-XT=u~p-0C0s{2|s;S0_vKyY!;+?Rny0RM-a)rS7grC zFD(=e{>55hh(Q=+XPE;_kjmp{{O=FvwoG5AM@04v_&w-zCOM$@tR9*7S=kK$Bk1`^({Lw{CM3>h`$5+Q_c}uS~lJ|VB!K{Wkf`|5Y zC`d^f&~>G}r&O!1vV> zbH$A^hnVJO^8Np?%hGx(QVKvV2M=Ng&+W*Ols+O{ncsCc+{wa?7K@MgqdWV>s!wyr zpK>|F_t;Dn-)^cz`w}Lh{Y7>LXYMIY=hXf&>Nx-S2IC`aGpL2F6GeY$1 z=-gxP{K|M`^LaI+NVT!EcS-b$RvI+)F##TvtM$i|l7rNJUpKv4!feM^Cv7U`&3DJd zD#{2+I1B+@S~b&euy9DD7&b4OqvM(4O=S|gC{2Utp1;URYgC)g3eK4AHyKeStrbNg zzaMl)EZuG$7!qW+xyvZbJ#ipQMMafT7xC@D=jubY{su(OgG;~eHA2jENUMfPoO`<^ z4io5VDjW0ijq%c=AfuE5GwV;mO70#P?khyG z7ZhVMS$WA?cCIYCx6MJVE&E^ehJD_S=#8NQ?+fGV#pR8zHRv14o55_V<#&xNT60kA zkS2C@nqvZF_bGqn5xM@KLU=4qFYlhx0~J+E!fVwvg!1{d)wH`>)`C2C+Sx3U>w%h7 zg%Zi*!^6OhcjXIG;g&lWa_R1zU5#8)V;40tGg<`)IZ`Q6q}KZ!oC@zuRbu8+4Zh7p1; z)JXW=$Ca4nN2cZ{t?A4N-MKr_geiBG!L@%1y0=!oHMpr23dE^N9*9vtV&E8qCLvz* znj|-rP;md~(ja(%IlvxpvX%CACvDl{2nP~XEFTOY=0UGlNkY6?68L(lqa=yXpKRu# z9~zy6*1-(JSTWepN+}O9FKsYL*nUHVf$h6?m;8e&do9t38cRmlI;4?KFmP#|*VaA* zok!KDsnly2gRTUT=e`PAx}{0zlo^@9y`xxt5@1r|H_}XH1`9>Li+84n#KjPjt$arL zvpBbW4QQ8T_|(Der?b?kd!`-+O?sT4@#j&q6Z5FJ+zf?JwZ^-2g3VJ__Bp@S%_mw(S~>TDg9Q`Ta4XV9;4Ln ztORR6l&EibhMV7?SgY#@O1iNz?#`F;S?j#&`#$A4@ym5W|2f(kh9}`K_gCfyN2s! z20+f=KG%Ka-idHXA6t2%NO(`*j)d|6OHfXF=CB_|2gdK#UT6{LW; zYlA!@Kz<3ZFOF6gd>ZSpvEWvfQ(&w_wSKZrGQrtvd2toF$bpjm9neMbY?kg>tvfaR z@XppaC*Zr$4IyYg!ObiWVs#$Tq~5^9Q!GVDQP!S5_orUgzn4ps*VcW>NEH;RpGh<J3u67pe$QLbAv`1g3Xo=E0P`K|pDh-nqXkFmyG(uuyrM%cwWz*0 zlzr_BPs*o4#NJ0LeYw2M3lH6-1Vrl*F9qsji(N7-pDWO5KTU2Kd5U}d*#_4CGCD|PP_tLX}Wmmpq4T6i}Nt+SoA86IdULl z{=|2MlmrmHA#zdx#JHLKroDz*9z0WZC7n8{e!ffyuo7rIqOguR_U<*Y35*Xl&?7=R z^(nI=-3sr7>;yrRBF+&D=xlGef({K3rw|L!Y+p$E z-*d961>k?5i6q5!TumbDe?{Fo6UyjWz1(w$$9}Eoo_E*y;g%;NVzs7)fAq}>7u~|Qlzj~lPp!ZoWQH}Rb8zE0gy7_@W+n0$vVtLzVVUa{Vk5%tD>7{gD zgiDz?%1pa@3ngwj80UPQ2?=niEsczsu_NvhzeGoMl@XAc^LA)~oI4*-!bOGx^o?rw z$v?++oVf8`1e?gry%16NA_}ofbdFN34E4MIATO5ipe1Z=!_lb@yU=2e11X|Z>G_#`~dq@d4lC*9lKwM0jn*c f6A9sDf61#)A~#d%>Phh#Zvq1y6YWo04zd3OsHB2+ literal 0 HcmV?d00001 diff --git a/pong/static/styles.css b/pong/static/styles.css index 1dfd64b..c07dbd0 100644 --- a/pong/static/styles.css +++ b/pong/static/styles.css @@ -1,15 +1,17 @@ /* General styles */ -body { +body, html { font-family: Arial, sans-serif; - color: #ffffff; - background-color: #000000; + color: #00ffff; + background-color: #0a0a2a; margin: 0; padding: 0; display: flex; flex-direction: column; align-items: center; justify-content: center; - height: 100vh; + height: 100%; + overflow: hidden; + } label { @@ -111,3 +113,111 @@ button { border-radius: 50%; position: absolute; } + +.logo { + position: absolute; + top: 20px; + left: 20px; + font-size: 3rem; + color: #00ffff; + text-shadow: 0 0 15px #00ffff; + z-index: 20; +} + +.stars { + position: absolute; + width: 100%; + height: 100%; +} + +.star { + position: absolute; + background-color: #ffffff; + border-radius: 50%; + animation: twinkle 2s infinite alternate; +} + +.background { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 0; + pointer-events: none; +} + +.pong-elements { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 5; + pointer-events: none; +} + +.paddle { + position: absolute; + width: 20px; + height: 100px; + background-color: #00ffff; + border-radius: 10px; + box-shadow: 0 0 15px #00ffff; +} + +.paddle-left { + left: 50px; + animation: paddleMove 5s infinite alternate ease-in-out; +} + +.paddle-right { + right: 50px; + animation: paddleMove 4s infinite alternate-reverse ease-in-out; +} + +.ball_anim { + position: absolute; + width: 30px; + height: 30px; + background-color: #00ffff; + border-radius: 50%; + box-shadow: 0 0 20px #00ffff; + left: 80px; + top: 50%; + transform-style: preserve-3d; + animation: ballMove 3s linear infinite; +} + +@keyframes paddleMove { + 0% { transform: translateY(10vh); } + 100% { transform: translateY(70vh); } +} + +@keyframes ballMove { + 0% { + transform: translateZ(0) scale(1); + } + 50% { + transform: translateZ(-500px) scale(0.5); + } + 100% { + transform: translateZ(0) scale(1); + } +} + +.input-container { + margin-bottom: 2rem; +} + +.container { + text-align: center; + background-color: rgba(0, 0, 40, 0.8); + padding: 3rem; + border-radius: 15px; + border: 3px solid #00ffff; + box-shadow: 0 0 30px #00ffff, inset 0 0 20px #00ffff; + position: relative; + z-index: 10; + max-width: 80%; +} \ No newline at end of file From eedf17ddc0c04fc1d63bf93c2a120ac696512ad3 Mon Sep 17 00:00:00 2001 From: Theouche Date: Tue, 30 Jul 2024 16:52:16 +0200 Subject: [PATCH 5/7] Waiting last fonction Chaku, normally, everithing work --- pong/game/game.py | 1 + pong/game/urls.py | 3 --- pong/game/utils.py | 27 ++++++++++++++++++++++----- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/pong/game/game.py b/pong/game/game.py index d7244f9..fc234ec 100644 --- a/pong/game/game.py +++ b/pong/game/game.py @@ -140,3 +140,4 @@ class Game: await self.player1.send(end_message) if not self.botgame: await self.player2.send(end_message) + #endfortheouche(p1, p2, s_p1, s_p2, winner, bt_p1, bt_p2, dur, is_tournoi, name_tournament) diff --git a/pong/game/urls.py b/pong/game/urls.py index 43f7305..570f027 100644 --- a/pong/game/urls.py +++ b/pong/game/urls.py @@ -9,9 +9,6 @@ urlpatterns = [ path('check_user_exists/', views.check_user_exists, name='check_user_exists'), path('register_user/', views.register_user, name='register_user'), path('authenticate_user/', views.authenticate_user, name='authenticate_user'), - path('create_player/', views.create_player_view, name='create_player'), - path('create_tournoi/', views.create_tournoi_view, name='create_tournoi'), - path('create_match/', views.create_match_view, name='create_match'), path('players/', player_list, name='player_list'), path('matches/', match_list, name='match_list'), path('tournois/', tournoi_list, name='tournoi_list'), diff --git a/pong/game/utils.py b/pong/game/utils.py index eeb7107..c6655ee 100644 --- a/pong/game/utils.py +++ b/pong/game/utils.py @@ -4,6 +4,23 @@ from django.shortcuts import get_object_or_404 from django.db.models import Max, Sum, F from datetime import timedelta +def endfortheouche(p1, p2, s_p1, s_p2, winner, bt_p1, bt_p2, dur, is_tournoi, name_tournament) : + #If he doesn't exist, create player p1 + if not Player.objects.filter(name=p1).exist(): + create_player(p1) + + #If he doesn't exist, create player p2 + if not Player.objects.filter(name=p2).exist(): + create_player(p2) + + #create Match + create_match(p1, p2, s_p1, s_p2, bt_p1, bt_p2, dur, is_tournoi, name_tournamenttournoi) + + #Update data p1 et p2 + uptdate_player_statistics(p1) + uptdate_player_statistics(p2) + + def create_player( name, total_match=0, @@ -67,7 +84,7 @@ def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_ return match -def player_statistics(player_name): +def uptdate_player_statistics(player_name): player = get_object_or_404(Player, name=player_name) # Filtrer les matchs où le joueur est joueur 1 ou joueur 2 @@ -118,10 +135,10 @@ def player_statistics(player_name): total_duration += matches_as_player2.aggregate(Sum('duration'))['duration__sum'] or timedelta() m_duration = total_duration / total_match - total_tourn_p = part_tourn_as_p1.count() + part_tourn_as_p2.count() + """ total_tourn_p = part_tourn_as_p1.count() + part_tourn_as_p2.count() total_win_tourn = won_tourn.count() p_win_tourn = (total_win_tourn / total_tourn_p) * 100 if total_tourn_p else 0 - + """ best_score_as_player1 = matches_as_player1.aggregate(Max('score_player1'))['score_player1__max'] or 0 best_score_as_player2 = matches_as_player2.aggregate(Max('score_player2'))['score_player2__max'] or 0 best_score = max(best_score_as_player1, best_score_as_player2) @@ -136,8 +153,8 @@ def player_statistics(player_name): player.m_nbr_ball_touch = m_nbr_ball_touch player.total_duration = total_duration player.m_duration = m_duration - player.num_participated_tournaments = total_tourn_p - player.num_won_tournaments = total_win_tourn + """ player.num_participated_tournaments = total_tourn_p + player.num_won_tournaments = total_win_tourn """ player.save() From 3564ef6ee24b451f88a80dffa8b3a475c15c42ee Mon Sep 17 00:00:00 2001 From: estellon Date: Tue, 30 Jul 2024 18:52:14 +0200 Subject: [PATCH 6/7] ball --- pong/static/game.js | 24 +++++++----- pong/static/index.html | 84 +++++++++++++++++++++--------------------- pong/static/styles.css | 44 +++++++++++++++++----- 3 files changed, 91 insertions(+), 61 deletions(-) diff --git a/pong/static/game.js b/pong/static/game.js index 8c5a1b1..b7d38cb 100644 --- a/pong/static/game.js +++ b/pong/static/game.js @@ -10,6 +10,8 @@ document.addEventListener('DOMContentLoaded', () => { const loginPasswordInput = document.getElementById('login-password'); const loginForm = document.getElementById('login-form'); const registerForm = document.getElementById('register-form'); + const formBlock = document.getElementById('block-form'); + let socket; let token; @@ -17,7 +19,7 @@ document.addEventListener('DOMContentLoaded', () => { // Auto-focus and key handling for AUTH-FORM nicknameInput.focus(); - nicknameInput.addEventListener('keypress', function(event) { + nicknameInput.addEventListener('keypress', function (event) { if (event.key === 'Enter') { event.preventDefault(); checkNicknameButton.click(); @@ -52,15 +54,15 @@ document.addEventListener('DOMContentLoaded', () => { num_won_tournaments: numWonTournaments }) }); - + if (!response.ok) { const errorData = await response.json(); throw new Error(errorData.error || 'Network response was not ok'); } - + const data = await response.json(); return data; - + } catch (error) { // Afficher l'erreur avec un message plus spécifique console.error('Error creating player:', error.message); @@ -118,28 +120,28 @@ document.addEventListener('DOMContentLoaded', () => { loginForm.style.display = 'block'; // Auto-focus and key handling for LOGIN-FORM loginPasswordInput.focus(); - loginPasswordInput.addEventListener('keypress', function(event) { + loginPasswordInput.addEventListener('keypress', function (event) { if (event.key === 'Enter') { event.preventDefault(); loginButton.click(); } - }); + }); } else { authForm.style.display = 'none'; registerForm.style.display = 'block'; // Auto-focus and key handling for REGISTER-FORM passwordInput.focus(); - passwordInput.addEventListener('keypress', function(event) { + passwordInput.addEventListener('keypress', function (event) { if (event.key === 'Enter') { confirmPasswordInput.focus(); - confirmPasswordInput.addEventListener('keypress', function(event) { + confirmPasswordInput.addEventListener('keypress', function (event) { if (event.key === 'Enter') { event.preventDefault(); registerButton.click(); } - }); + }); } - }); + }); } } catch (error) { console.error('Error checking user existence:', error); @@ -173,6 +175,7 @@ document.addEventListener('DOMContentLoaded', () => { //await createPlayer(nickname); registerForm.style.display = 'none'; gameContainer.style.display = 'flex'; + formBlock.style.display = 'none'; startWebSocketConnection(token); } else { alert('Registration failed. Please try again.'); @@ -208,6 +211,7 @@ document.addEventListener('DOMContentLoaded', () => { if (result) { loginForm.style.display = 'none'; gameContainer.style.display = 'flex'; + formBlock.style.display = 'none'; startWebSocketConnection(token); } else { alert('Authentication failed. Please try again.'); diff --git a/pong/static/index.html b/pong/static/index.html index e2ff4ed..63fc79c 100644 --- a/pong/static/index.html +++ b/pong/static/index.html @@ -1,6 +1,7 @@ {% load static %} + @@ -9,42 +10,42 @@ -
-
-
- -
-
-
-
-
+ +
- -
-

BIENVENUE DANS LE PONG 42

-
-
- - - +
+
+
+
- +