chat/consumers.py

@@ -3,10 +3,9 @@
 
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 from django.contrib.auth.models import User
-from participation.models import Team, Pool, Tournament
 from registration.models import Registration
 
-from .models import Channel, Message
+from .models import Channel
 
 
 class ChatConsumer(AsyncJsonWebsocketConsumer):
@@ -35,10 +34,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
         # Accept the connection
         await self.accept()
 
-        channels = await Channel.get_accessible_channels(user, 'read')
-        async for channel in channels.all():
-            await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name)
-
     async def disconnect(self, close_code) -> None:
         """
         Called when the websocket got disconnected, for any reason.
@@ -48,10 +43,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
             # User is not authenticated
             return
 
-        channels = await Channel.get_accessible_channels(self.scope['user'], 'read')
-        async for channel in channels.all():
-            await self.channel_layer.group_discard(f"chat-{channel.id}", self.channel_name)
-
     async def receive_json(self, content, **kwargs):
         """
         Called when the client sends us some data, parsed as JSON.
@@ -60,10 +51,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
         match content['type']:
             case 'fetch_channels':
                 await self.fetch_channels()
-            case 'send_message':
-                await self.receive_message(content)
-            case 'fetch_messages':
-                await self.fetch_messages(**content)
             case unknown:
                 print("Unknown message type:", unknown)
 
@@ -72,6 +59,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
 
         read_channels = await Channel.get_accessible_channels(user, 'read')
         write_channels = await Channel.get_accessible_channels(user, 'write')
+        print([channel async for channel in write_channels.all()])
         message = {
             'type': 'fetch_channels',
             'channels': [
@@ -85,54 +73,3 @@ class ChatConsumer(AsyncJsonWebsocketConsumer):
             ]
         }
         await self.send_json(message)
-
-    async def receive_message(self, message: dict) -> None:
-        user = self.scope['user']
-        channel = await Channel.objects.prefetch_related('tournament__pools__juries', 'pool', 'team', 'invited') \
-            .aget(id=message['channel_id'])
-        write_channels = await Channel.get_accessible_channels(user, 'write')
-        if not await write_channels.acontains(channel):
-            return
-
-        message = await Message.objects.acreate(
-            author=user,
-            channel=channel,
-            content=message['content'],
-        )
-
-        await self.channel_layer.group_send(f'chat-{channel.id}', {
-            'type': 'chat.send_message',
-            'id': message.id,
-            'channel_id': channel.id,
-            'timestamp': message.created_at.isoformat(),
-            'author': await message.aget_author_name(),
-            'content': message.content,
-        })
-
-    async def fetch_messages(self, channel_id: int, offset: int = 0, limit: int = 50, **_kwargs) -> None:
-        channel = await Channel.objects.aget(id=channel_id)
-        read_channels = await Channel.get_accessible_channels(self.scope['user'], 'read')
-        if not await read_channels.acontains(channel):
-            return
-
-        limit = min(limit, 200)  # Fetch only maximum 200 messages at the time
-
-        messages = Message.objects.filter(channel=channel).order_by('-created_at')[offset:offset + limit].all()
-        await self.send_json({
-            'type': 'fetch_messages',
-            'channel_id': channel_id,
-            'messages': list(reversed([
-                {
-                    'id': message.id,
-                    'timestamp': message.created_at.isoformat(),
-                    'author': await message.aget_author_name(),
-                    'content': message.content,
-                }
-                async for message in messages
-            ]))
-        })
-
-    async def chat_send_message(self, message) -> None:
-        await self.send_json({'type': 'send_message', 'id': message['id'], 'channel_id': message['channel_id'],
-                              'timestamp': message['timestamp'], 'author': message['author'],
-                              'content': message['content']})

chat/models.py

@@ -1,13 +1,12 @@
 # Copyright (C) 2024 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from asgiref.sync import sync_to_async
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models import Q, QuerySet
 from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy as _
-from participation.models import Pool, Team, Tournament
+from participation.models import Tournament
 from registration.models import ParticipantRegistration, Registration, VolunteerRegistration
 from tfjm.permissions import PermissionType
 
@@ -142,6 +141,9 @@ class Channel(models.Model):
 
         qs |= Channel.objects.filter(invited=user)
 
+        print(user)
+        print(qs.query)
+
         return qs
 
     class Meta:
@@ -180,65 +182,6 @@ class Message(models.Model):
         verbose_name=_("content"),
     )
 
-    def get_author_name(self):
-        registration = self.author.registration
-
-        author_name = f"{self.author.first_name} {self.author.last_name}"
-        if registration.is_volunteer:
-            if registration.is_admin:
-                author_name += " (CNO)"
-
-            if self.channel.pool:
-                if registration == self.channel.pool.jury_president:
-                    author_name += " (P. jury)"
-                elif registration in self.channel.pool.juries.all():
-                    author_name += " (Juré⋅e)"
-                elif registration in self.channel.pool.tournament.organizers.all():
-                    author_name += " (CRO)"
-                else:
-                    author_name += " (Bénévole)"
-            elif self.channel.tournament:
-                if registration in self.channel.tournament.organizers.all():
-                    author_name += " (CRO)"
-                elif any([registration.id == pool.jury_president
-                          for pool in self.channel.tournament.pools.all()]):
-                    pools = ", ".join([pool.short_name
-                                       for pool in self.channel.tournament.pools.all()
-                                       if pool.jury_president == registration])
-                    author_name += f" (P. jury {pools})"
-                elif any([pool.juries.contains(registration)
-                          for pool in self.channel.tournament.pools.all()]):
-                    pools = ", ".join([pool.short_name
-                                       for pool in self.channel.tournament.pools.all()
-                                       if pool.juries.acontains(registration)])
-                    author_name += f" (Juré⋅e {pools})"
-                else:
-                    author_name += " (Bénévole)"
-            else:
-                if registration.organized_tournaments.exists():
-                    tournaments = ", ".join([tournament.name
-                                             for tournament in registration.organized_tournaments.all()])
-                    author_name += f" (CRO {tournaments})"
-                if Pool.objects.filter(jury_president=registration).exists():
-                    tournaments = Tournament.objects.filter(pools__jury_president=registration).distinct()
-                    tournaments = ", ".join([tournament.name for tournament in tournaments])
-                    author_name += f" (P. jury {tournaments})"
-                elif registration.jury_in.exists():
-                    tournaments = Tournament.objects.filter(pools__juries=registration).distinct()
-                    tournaments = ", ".join([tournament.name for tournament in tournaments])
-                    author_name += f" (Juré⋅e {tournaments})"
-        else:
-            if registration.team_id:
-                team = Team.objects.get(id=registration.team_id)
-                author_name += f" ({team.trigram})"
-            else:
-                author_name += " (sans équipe)"
-
-        return author_name
-
-    async def aget_author_name(self):
-        return await sync_to_async(self.get_author_name)()
-
     class Meta:
         verbose_name = _("message")
         verbose_name_plural = _("messages")

chat/static/chat.js

@@ -4,12 +4,6 @@
     await Notification.requestPermission()
 })()
 
-const MAX_MESSAGES = 50
-
-let channels = {}
-let messages = {}
-let selected_channel_id = null
-
 /**
  * Display a new notification with the given title and the given body.
  * @param title The title of the notification
@@ -24,167 +18,14 @@ function showNotification(title, body, timeout = 5000) {
     return notif
 }
 
-function selectChannel(channel_id) {
-    let channel = channels[channel_id]
-    if (!channel) {
-        console.error('Channel not found:', channel_id)
-        return
-    }
-
-    selected_channel_id = channel_id
-
-    let channelTitle = document.getElementById('channel-title')
-    channelTitle.innerText = channel['name']
-
-    let messageInput = document.getElementById('input-message')
-    messageInput.disabled = !channel['write_access']
-
-    redrawMessages()
-}
-
-function sendMessage() {
-    let messageInput = document.getElementById('input-message')
-    let message = messageInput.value
-    messageInput.value = ''
-
-    if (!message) {
-        return
-    }
-
-    socket.send(JSON.stringify({
-        'type': 'send_message',
-        'channel_id': selected_channel_id,
-        'content': message,
-    }))
-}
-
-function setChannels(new_channels) {
-    channels = {}
-    for (let channel of new_channels) {
-        channels[channel['id']] = channel
-        if (!messages[channel['id']])
-            messages[channel['id']] = new Map()
-
-        fetchMessages(channel['id'])
-    }
-
-    if (new_channels && (!selected_channel_id || !channels[selected_channel_id]))
-        selectChannel(Object.keys(channels)[0])
-}
-
-function receiveMessage(message) {
-    messages[message['channel_id']].push(message)
-    redrawMessages()
-}
-
-function fetchMessages(channel_id, offset = 0, limit = MAX_MESSAGES) {
-    socket.send(JSON.stringify({
-        'type': 'fetch_messages',
-        'channel_id': channel_id,
-        'offset': offset,
-        'limit': limit,
-    }))
-}
-
-function fetchPreviousMessages() {
-    let channel_id = selected_channel_id
-    let offset = messages[channel_id].size
-    fetchMessages(channel_id, offset, MAX_MESSAGES)
-}
-
-function receiveFetchedMessages(data) {
-    let channel_id = data['channel_id']
-    let new_messages = data['messages']
-
-    if (!messages[channel_id])
-        messages[channel_id] = new Map()
-
-    for (let message of new_messages)
-        messages[channel_id].set(message['id'], message)
-
-    // Sort messages by timestamp
-    messages[channel_id] = new Map([...messages[channel_id].values()]
-      .sort((a, b) => new Date(a['timestamp']) - new Date(b['timestamp']))
-      .map(message => [message['id'], message]))
-
-    redrawMessages()
-}
-
-function redrawMessages() {
-    let messageList = document.getElementById('message-list')
-    messageList.innerHTML = ''
-
-    let lastMessage = null
-    let lastContentDiv = null
-
-    for (let message of messages[selected_channel_id].values()) {
-        if (lastMessage && lastMessage['author'] === message['author']) {
-            let lastTimestamp = new Date(lastMessage['timestamp'])
-            let newTimestamp = new Date(message['timestamp'])
-            if ((newTimestamp - lastTimestamp) / 1000 < 60 * 10) {
-                let messageContentDiv = document.createElement('div')
-                messageContentDiv.innerText = message['content']
-                lastContentDiv.appendChild(messageContentDiv)
-                continue
-            }
-        }
-
-        let messageElement = document.createElement('li')
-        messageElement.classList.add('list-group-item')
-        messageList.appendChild(messageElement)
-
-        let authorDiv = document.createElement('div')
-        messageElement.appendChild(authorDiv)
-
-        let authorSpan = document.createElement('span')
-        authorSpan.classList.add('text-muted', 'fw-bold')
-        authorSpan.innerText = message['author']
-        authorDiv.appendChild(authorSpan)
-
-        let dateSpan = document.createElement('span')
-        dateSpan.classList.add('text-muted', 'float-end')
-        dateSpan.innerText = new Date(message['timestamp']).toLocaleString()
-        authorDiv.appendChild(dateSpan)
-
-        let contentDiv = document.createElement('div')
-        messageElement.appendChild(contentDiv)
-
-        let messageContentDiv = document.createElement('div')
-        messageContentDiv.innerText = message['content']
-        contentDiv.appendChild(messageContentDiv)
-
-        lastMessage = message
-        lastContentDiv = contentDiv
-    }
-
-    let fetchMoreButton = document.getElementById('fetch-previous-messages')
-    if (!messages[selected_channel_id] || messages[selected_channel_id].size % MAX_MESSAGES !== 0)
-        fetchMoreButton.classList.add('d-none')
-    else
-        fetchMoreButton.classList.remove('d-none')
-}
-
 document.addEventListener('DOMContentLoaded', () => {
     /**
      * Process the received data from the server.
      * @param data The received message
      */
     function processMessage(data) {
-        switch (data['type']) {
+        // TODO Implement chat protocol
-            case 'fetch_channels':
-                setChannels(data['channels'])
-                break
-            case 'send_message':
-                receiveMessage(data)
-                break
-            case 'fetch_messages':
-                receiveFetchedMessages(data)
-                break
-            default:
         console.log(data)
-                console.error('Unknown message type:', data['type'])
-                break
-        }
     }
 
     function setupSocket(nextDelay = 1000) {

chat/templates/chat/chat.html

@@ -4,59 +4,6 @@
 {% load i18n %}
 
 {% block content %}
-    <noscript>
-        {% trans "JavaScript must be enabled on your browser to access chat." %}
-    </noscript>
-    <div class="offcanvas offcanvas-start" tabindex="-1" id="channelSelector" aria-labelledby="offcanvasExampleLabel">
-        <div class="offcanvas-header">
-            <h4 class="offcanvas-title" id="offcanvasExampleLabel">{% trans "Chat channels" %}</h4>
-            <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-        </div>
-        <div class="offcanvas-body">
-            <ul class="list-group list-group-flush" id="nav-channels-tab">
-                {% for channel in channels %}
-                    <li class="list-group-item" id="tab-channel-{{ channel.id }}" data-bs-dismiss="offcanvas"
-                        onclick="selectChannel({{ channel.id }})">
-                        <button class="nav-link">{{ channel.name }}</button>
-                    </li>
-                {% endfor %}
-            </ul>
-        </div>
-    </div>
-
-    <div class="card tab-content w-100 mh-100" style="height: 95vh" id="nav-channels-content">
-        <div class="card-header">
-            <h3>
-                <button class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#channelSelector"
-                        aria-controls="channelSelector" aria-expanded="false" aria-label="Toggle channel selector">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <span id="channel-title"></span>
-            </h3>
-        </div>
-        <div class="card-body overflow-y-scroll mw-100 h-100 flex-grow-0" id="chat-messages">
-            <div class="text-center d-none" id="fetch-previous-messages">
-                <a href="#" class="nav-link" onclick="event.preventDefault(); fetchPreviousMessages()">
-                    {% trans "Fetch previous messages…" %}
-                </a>
-                <hr>
-            </div>
-            <ul class="list-group list-group-flush" id="message-list"></ul>
-        </div>
-        <div class="card-footer mt-auto">
-            <form onsubmit="event.preventDefault(); sendMessage()">
-                <div class="input-group">
-                    <label for="input-message" class="input-group-text">
-                        <i class="fas fa-comment"></i>
-                    </label>
-                    <input type="text" class="form-control" id="input-message" placeholder="{% trans "Send message…" %}" autocomplete="off">
-                    <button class="input-group-text btn btn-success" type="submit">
-                        <i class="fas fa-paper-plane"></i>
-                    </button>
-                </div>
-            </form>
-        </div>
-    </div>
 {% endblock %}
 
 {% block extrajavascript %}

chat/views.py

@@ -4,8 +4,6 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.views.generic import TemplateView
 
-from chat.models import Channel
-
 
 class ChatView(LoginRequiredMixin, TemplateView):
     """
@@ -13,9 +11,3 @@ class ChatView(LoginRequiredMixin, TemplateView):
     with Javascript and websockets.
     """
     template_name = "chat/chat.html"
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        from asgiref.sync import async_to_sync
-        context['channels'] = async_to_sync(Channel.get_accessible_channels)(self.request.user, 'read')
-        return context

draw/consumers.py

@@ -9,7 +9,6 @@ from random import randint, shuffle
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 from django.conf import settings
-from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.utils import translation
 from django.utils.translation import gettext_lazy as _
@@ -45,8 +44,6 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         We accept only if this is a user of a team of the associated tournament, or a volunteer
         of the tournament.
         """
-        if '_fake_user_id' in self.scope['session']:
-            self.scope['user'] = await User.objects.aget(pk=self.scope['session']['_fake_user_id'])
 
         # Fetch the registration of the current user
         user = self.scope['user']

locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TFJM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-27 14:10+0200\n"
+"POT-Creation-Date: 2024-04-27 08:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emmy D'Anello <emmy.danello@animath.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,20 +21,20 @@ msgstr ""
 msgid "API"
 msgstr "API"
 
-#: chat/models.py:18 participation/models.py:35 participation/models.py:263
+#: chat/models.py:13 participation/models.py:35 participation/models.py:263
 #: participation/tables.py:18 participation/tables.py:34
 msgid "name"
 msgstr "nom"
 
-#: chat/models.py:23
+#: chat/models.py:17
 msgid "read permission"
 msgstr "permission de lecture"
 
-#: chat/models.py:29
+#: chat/models.py:22
 msgid "write permission"
 msgstr "permission d'écriture"
 
-#: chat/models.py:39 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88
+#: chat/models.py:32 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88
 #: draw/models.py:26 participation/admin.py:79 participation/admin.py:140
 #: participation/admin.py:171 participation/models.py:693
 #: participation/models.py:717 participation/models.py:935
@@ -43,7 +43,7 @@ msgstr "permission d'écriture"
 msgid "tournament"
 msgstr "tournoi"
 
-#: chat/models.py:41
+#: chat/models.py:34
 msgid ""
 "For a permission that concerns a tournament, indicates what is the concerned "
 "tournament."
@@ -51,21 +51,21 @@ msgstr ""
 "Pour une permission qui concerne un tournoi, indique quel est le tournoi "
 "concerné."
 
-#: chat/models.py:50 draw/models.py:429 draw/models.py:456
+#: chat/models.py:43 draw/models.py:429 draw/models.py:456
 #: participation/admin.py:136 participation/admin.py:155
 #: participation/models.py:1434 participation/models.py:1443
 #: participation/tables.py:84
 msgid "pool"
 msgstr "poule"
 
-#: chat/models.py:52
+#: chat/models.py:45
 msgid ""
 "For a permission that concerns a pool, indicates what is the concerned pool."
 msgstr ""
 "Pour une permission qui concerne une poule, indique quelle est la poule "
 "concernée."
 
-#: chat/models.py:61 draw/templates/draw/tournament_content.html:277
+#: chat/models.py:54 draw/templates/draw/tournament_content.html:277
 #: participation/admin.py:167 participation/models.py:252
 #: participation/models.py:708
 #: participation/templates/participation/tournament_harmonize.html:15
@@ -75,18 +75,18 @@ msgstr ""
 msgid "team"
 msgstr "équipe"
 
-#: chat/models.py:63
+#: chat/models.py:56
 msgid ""
 "For a permission that concerns a team, indicates what is the concerned team."
 msgstr ""
 "Pour une permission qui concerne une équipe, indique quelle est l'équipe "
 "concernée."
 
-#: chat/models.py:67
+#: chat/models.py:60
 msgid "private"
 msgstr "privé"
 
-#: chat/models.py:69
+#: chat/models.py:62
 msgid ""
 "If checked, only users who have been explicitly added to the channel will be "
 "able to access it."
@@ -94,11 +94,11 @@ msgstr ""
 "Si sélectionné, seul⋅es les utilisateur⋅rices qui ont été explicitement "
 "ajouté⋅es au canal pourront y accéder."
 
-#: chat/models.py:74
+#: chat/models.py:67
 msgid "invited users"
 msgstr "Utilisateur⋅rices invité"
 
-#: chat/models.py:77
+#: chat/models.py:70
 msgid ""
 "Extra users who have been invited to the channel, in addition to the "
 "permitted group of the channel."
@@ -106,59 +106,43 @@ msgstr ""
 "Utilisateur⋅rices supplémentaires qui ont été invité⋅es au canal, en plus du "
 "groupe autorisé du canal."
 
-#: chat/models.py:82
+#: chat/models.py:75
 #, python-brace-format
 msgid "Channel {name}"
 msgstr "Canal {name}"
 
-#: chat/models.py:148 chat/models.py:157
+#: chat/models.py:78 chat/models.py:87
 msgid "channel"
 msgstr "canal"
 
-#: chat/models.py:149
+#: chat/models.py:79
 msgid "channels"
 msgstr "canaux"
 
-#: chat/models.py:163
+#: chat/models.py:93
 msgid "author"
 msgstr "auteur⋅rice"
 
-#: chat/models.py:170
+#: chat/models.py:100
 msgid "created at"
 msgstr "créé le"
 
-#: chat/models.py:175
+#: chat/models.py:105
 msgid "updated at"
 msgstr "modifié le"
 
-#: chat/models.py:180
+#: chat/models.py:110
 msgid "content"
 msgstr "contenu"
 
-#: chat/models.py:243
+#: chat/models.py:114
 msgid "message"
 msgstr "message"
 
-#: chat/models.py:244
+#: chat/models.py:115
 msgid "messages"
 msgstr "messages"
 
-#: chat/templates/chat/chat.html:8
-msgid "JavaScript must be enabled on your browser to access chat."
-msgstr "JavaScript doit être activé sur votre navigateur pour accéder au chat."
-
-#: chat/templates/chat/chat.html:12
-msgid "Chat channels"
-msgstr "Canaux de chat"
-
-#: chat/templates/chat/chat.html:40
-msgid "Fetch previous messages…"
-msgstr "Récupérer les messages précédents…"
-
-#: chat/templates/chat/chat.html:52
-msgid "Send message…"
-msgstr "Envoyer un message…"
-
 #: draw/admin.py:39 draw/admin.py:57 draw/admin.py:75
 #: participation/admin.py:109 participation/models.py:253
 #: participation/tables.py:88
@@ -174,68 +158,68 @@ msgstr "tour"
 msgid "Draw"
 msgstr "Tirage au sort"
 
-#: draw/consumers.py:31
+#: draw/consumers.py:30
 msgid "You are not an organizer."
 msgstr "Vous n'êtes pas un⋅e organisateur⋅rice."
 
-#: draw/consumers.py:165
+#: draw/consumers.py:162
 msgid "The draw is already started."
 msgstr "Le tirage a déjà commencé."
 
-#: draw/consumers.py:171
+#: draw/consumers.py:168
 msgid "Invalid format"
 msgstr "Format invalide"
 
-#: draw/consumers.py:176
+#: draw/consumers.py:173
 #, python-brace-format
 msgid "The sum must be equal to the number of teams: expected {len}, got {sum}"
 msgstr ""
 "La somme doit être égale au nombre d'équipes : attendu {len}, obtenu {sum}"
 
-#: draw/consumers.py:181
+#: draw/consumers.py:178
 msgid "There can be at most one pool with 5 teams."
 msgstr "Il ne peut y avoir au plus qu'une seule poule de 5 équipes."
 
-#: draw/consumers.py:221
+#: draw/consumers.py:218
 msgid "Draw started!"
 msgstr "Le tirage a commencé !"
 
-#: draw/consumers.py:243
+#: draw/consumers.py:240
 #, python-brace-format
 msgid "The draw for the tournament {tournament} will start."
 msgstr "Le tirage au sort du tournoi {tournament} va commencer."
 
-#: draw/consumers.py:254 draw/consumers.py:280 draw/consumers.py:690
+#: draw/consumers.py:251 draw/consumers.py:277 draw/consumers.py:687
-#: draw/consumers.py:907 draw/consumers.py:996 draw/consumers.py:1018
+#: draw/consumers.py:904 draw/consumers.py:993 draw/consumers.py:1015
-#: draw/consumers.py:1109 draw/templates/draw/tournament_content.html:5
+#: draw/consumers.py:1106 draw/templates/draw/tournament_content.html:5
 msgid "The draw has not started yet."
 msgstr "Le tirage au sort n'a pas encore commencé."
 
-#: draw/consumers.py:267
+#: draw/consumers.py:264
 #, python-brace-format
 msgid "The draw for the tournament {tournament} is aborted."
 msgstr "Le tirage au sort du tournoi {tournament} est annulé."
 
-#: draw/consumers.py:307 draw/consumers.py:328 draw/consumers.py:624
+#: draw/consumers.py:304 draw/consumers.py:325 draw/consumers.py:621
-#: draw/consumers.py:695 draw/consumers.py:912
+#: draw/consumers.py:692 draw/consumers.py:909
 msgid "This is not the time for this."
 msgstr "Ce n'est pas le moment pour cela."
 
-#: draw/consumers.py:320 draw/consumers.py:323
+#: draw/consumers.py:317 draw/consumers.py:320
 msgid "You've already launched the dice."
 msgstr "Vous avez déjà lancé le dé."
 
-#: draw/consumers.py:326
+#: draw/consumers.py:323
 msgid "It is not your turn."
 msgstr "Ce n'est pas votre tour."
 
-#: draw/consumers.py:413
+#: draw/consumers.py:410
 #, python-brace-format
 msgid "Dices from teams {teams} are identical. Please relaunch your dices."
 msgstr ""
 "Les dés des équipes {teams} sont identiques. Merci de relancer vos dés."
 
-#: draw/consumers.py:1021
+#: draw/consumers.py:1018
 msgid "This is only available for the final tournament."
 msgstr "Cela n'est possible que pour la finale."
 

tfjm/templates/base.html

@@ -40,18 +40,18 @@
 <body class="d-flex w-100 h-100 flex-column">
 {% include "navbar.html" %}
 
-<div id="body-wrapper" class="row w-100 my-3 flex-grow-1">
+<div id="body-wrapper" class="row w-100 my-3">
     <aside class="col-lg-2 px-2">
         {% include "sidebar.html" %}
     </aside>
 
-    <main class="col d-flex flex-column flex-grow-1">
+    <main class="col d-flex flex-column">
-        <div class="container d-flex flex-column flex-grow-1">
+        <div class="container">
             {% block content-title %}<h1 id="content-title">{{ title }}</h1>{% endblock %}
 
             {% include "messages.html" %}
 
-            <div id="content" class="d-flex flex-column flex-grow-1">
+            <div id="content">
                 {% block content %}
                     <p>Default content...</p>
                 {% endblock content %}