merge avec adrien

pong/game/utils.py

@@ -152,7 +152,5 @@ def update_tournament(name_tournoi, winner_name):
     tournoi.save()
 
 
-
-
 def getlen():
     return Tournoi.objects.count()

pong/settings.py

@@ -136,6 +136,32 @@ CHANNEL_LAYERS = {
     },
 }
 
+LOGGING = {
+    'version': 1,  # Django requires this key
+    'disable_existing_loggers': False,  # Keep Django's default loggers
+    'formatters': {
+        'simple': {
+            'format': '{levelname} {message}',
+            'style': '{',  # Allows to use Python's new style string formatting
+        },
+    },
+    'handlers': {
+        'console': {  # Log to the console
+            'level': 'DEBUG',  # Minimum level of messages that should be handled
+            'class': 'logging.StreamHandler',
+            'formatter': 'simple',  # Use the simple formatter defined above
+        },
+    },
+    'loggers': {
+        'django': {  # The main logger for Django itself
+            'handlers': ['console'],
+            'level': 'DEBUG',  # Minimum log level to be logged
+            'propagate': False,  # Prevents log propagation to other loggers
+        },
+    },
+}
+
+"""
 LOGGING = {
     'version': 1,  # The version of the logging configuration schema
     'disable_existing_loggers': False,  # Allows existing loggers to keep logging
@@ -170,3 +196,4 @@ LOGGING = {
         },
     },
 }
+"""

pong/static/burger.js

@@ -103,11 +103,10 @@ document.addEventListener('DOMContentLoaded', () => {
         console.log('Displaying matches:');
         const matchListBody = document.querySelector('#match-list tbody');
         matchListBody.innerHTML = '';
-        
 
         if (matches.length != 0) {
             matches.forEach(match => {
-                const row = document.createElement('tr');
+        		const row = document.createElement('tr');
                 row.innerHTML = `
                     <td>${match.id}</td>
                     <td>${match.player1__name}</td>
@@ -137,11 +136,10 @@ document.addEventListener('DOMContentLoaded', () => {
         console.log('Displaying players:');
         const playersListBody = document.querySelector('#player-list tbody');
         playersListBody.innerHTML = '';
-        
 
         if (players.length != 0) {
             players.forEach(player => {
-                const row = document.createElement('tr');
+        		const row = document.createElement('tr');
                 row.innerHTML = `
                     <td>${player.id}</td>
                     <td>${player.name}</td>
@@ -169,9 +167,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
         if (tournois.length != 0) {
             tournois.forEach(tournoi => {
-                console.log('Winner:', tournoi.winner); //debug !!!!!!!!!!!!!!!!!
-                console.log('Winner:', tournoi.winner__name); //debug !!!!!!!!!!!!!!!!!
-                const row = document.createElement('tr');
+        		const row = document.createElement('tr');
                 row.innerHTML = `
                     <td>${tournoi.id}</td>
                     <td>${tournoi.name}</td>
@@ -395,4 +391,4 @@ document.addEventListener('DOMContentLoaded', () => {
         return color;
     }
 
-});
+});

pong/static/game.js

@@ -360,7 +360,7 @@ document.addEventListener('DOMContentLoaded', () => {
     }
 
     function startWebSocketConnection(token, players) {
-        socket = new WebSocket(`ws://${window.location.host}/ws/game/`);
+        socket = new WebSocket(`wss://${window.location.host}/ws/game/`);
 
         socket.onopen = function (event) {
             console.log('WebSocket connection established');