fix: polish queue table

amcsz · amcsz · commit 435c14674e9b · 2026-02-07T09:51:18.000-05:00
diff --git a/config/docker/Dockerfile b/config/docker/Dockerfile
@@ -10,4 +10,6 @@ RUN apt-get update && apt-get install -y \
     firejail \
     && rm -rf /var/lib/apt/lists/*
 
+ENV UV_LINK_MODE copy
+
 EXPOSE 8000
diff --git a/othello/apps/games/consumers.py b/othello/apps/games/consumers.py
@@ -97,25 +97,25 @@ def match_update(self, event: dict[str, Any]) -> None:
     def send_match_update(self, object_id: int) -> None:
         if self.connected:
             match = Match.objects.get(id=object_id)
-            score = "-"
+            score = "? - ? - ?"
             if match.status == "completed":
-                score = f"{match.player1_wins}-{match.ties}-{match.player2_wins}"
+                score = f"{match.player1_wins} - {match.ties} - {match.player2_wins}"
             self.send_json(
                 {
                     "type": "match_update",
                     "match_id": match.id,
                     "status": match.status,
                     "status_display": match.get_status_display(),
-                    "player1": match.player1.get_game_name(),
-                    "player2": match.player2.get_game_name(),
+                    "player1": match.player1.user.username,
+                    "player2": match.player2.user.username,
                     "ranked": "Yes" if match.is_ranked else "No",
                     "num_games": match.num_games,
                     "score": score,
                     "created_at": match.created_at.isoformat(),
-                    "player1_rating_delta": float(match.player1_rating_delta)
+                    "player1_rating_delta": match.player1_rating_delta
                     if match.player1_rating_delta
                     else None,
-                    "player2_rating_delta": float(match.player2_rating_delta)
+                    "player2_rating_delta": match.player2_rating_delta
                     if match.player2_rating_delta
                     else None,
                 }
diff --git a/othello/apps/games/migrations/0037_alter_match_player1_rating_delta_and_more.py b/othello/apps/games/migrations/0037_alter_match_player1_rating_delta_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.2.10 on 2026-02-07 14:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('games', '0036_match_player1_rating_delta_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='match',
+            name='player1_rating_delta',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='match',
+            name='player2_rating_delta',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]
diff --git a/othello/apps/games/models.py b/othello/apps/games/models.py
@@ -143,12 +143,8 @@ class Match(models.Model):
     player1_wins = models.IntegerField(default=0)
     player2_wins = models.IntegerField(default=0)
     ties = models.IntegerField(default=0)
-    player1_rating_delta = models.DecimalField(
-        max_digits=10, decimal_places=2, null=True, blank=True
-    )
-    player2_rating_delta = models.DecimalField(
-        max_digits=10, decimal_places=2, null=True, blank=True
-    )
+    player1_rating_delta = models.IntegerField(null=True, blank=True)
+    player2_rating_delta = models.IntegerField(null=True, blank=True)
 
     @property
     def channels_group_name(self) -> str:
@@ -218,8 +214,8 @@ def calculate_results(self) -> None:
                 ties=ties,
             )
 
-            self.player1_rating_delta = change1
-            self.player2_rating_delta = change2
+            self.player1_rating_delta = int(change1)
+            self.player2_rating_delta = int(change2)
 
             user1.rating = rating1 + change1
             user2.rating = rating2 + change2
diff --git a/othello/apps/games/views.py b/othello/apps/games/views.py
@@ -7,7 +7,7 @@
 from django.db import models
 from django.http import FileResponse, HttpRequest, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils import timezone
+from django.utils import timezone, formats
 
 from .forms import DownloadSubmissionForm, GameForm, MatchForm, SubmissionForm
 from .models import Game, Match, Submission
@@ -191,18 +191,21 @@ def queue_json(request: HttpRequest) -> HttpResponse:
                 "id": match.id,
                 "player1_name": match.player1.user.username,
                 "player2_name": match.player2.user.username,
-                "score": f"{match.player1_wins}-{match.ties}-{match.player2_wins}"
+                "score": f"{match.player1_wins} - {match.ties} - {match.player2_wins}"
                 if match.status == "completed"
                 else "-",
                 "is_ranked": "Yes" if match.is_ranked else "No",
                 "status": match.status,
                 "status_display": match.get_status_display(),
-                "created_at": match.created_at.isoformat(),
+                "created_at": formats.date_format(
+                    timezone.localtime(match.created_at),
+                    "DATETIME_FORMAT",
+                ),
                 "can_view_replay": request.user in [match.player1.user, match.player2.user],
-                "player1_rating_delta": float(match.player1_rating_delta)
+                "player1_rating_delta": match.player1_rating_delta
                 if match.player1_rating_delta
                 else None,
-                "player2_rating_delta": float(match.player2_rating_delta)
+                "player2_rating_delta": match.player2_rating_delta
                 if match.player2_rating_delta
                 else None,
             }
@@ -218,6 +221,7 @@ def queue_json(request: HttpRequest) -> HttpResponse:
     )
 
 
+@login_required
 def queue(request: HttpRequest) -> HttpResponse:
     matches = Match.objects.all().order_by("-created_at")
     my_matches_only = request.GET.get("my_matches") == "1"
diff --git a/othello/settings/__init__.py b/othello/settings/__init__.py
@@ -245,3 +245,6 @@
         integrations=[DjangoIntegration(), CeleryIntegration()],
         send_default_pii=True,
     )
+
+
+DATETIME_FORMAT = "F d, Y, h:i a"
diff --git a/othello/static/css/base.css b/othello/static/css/base.css
@@ -1,9 +1,9 @@
 @charset "UTF-8";
 
-@import url('https://fonts.googleapis.com/css?family=Roboto+Mono');
+@import url('https://fonts.googleapis.com/css2?family=Inter');
 
 body {
-  font-family: 'Roboto Mono', monospace;
+  font-family: 'Inter', sans-serif;
 }
 
 html, body {
@@ -102,19 +102,19 @@ html, body {
 
 
 pre, code {
-    font-family: 'Roboto Mono', monospace;
+    font-family: 'Inter', sans-serif;
     font-size: 16px;
     color: #805229;
 }
 
 h1,h2,h3,h4,h5,h6 {
-    font-family: 'Roboto Mono', monospace;
+    font-family: 'Inter', sans-serif;
     display: block;
     font-weight: bold;
 }
 
 input, button{
-    font-family: 'Roboto Mono', monospace;
+    font-family: 'Inter', sans-serif;
     font-size: 16px;
     color: #805229;
     border: #a06633 2px solid;
@@ -164,4 +164,53 @@ input, button{
 .status-btn:focus {
     outline: none !important;
     box-shadow: none !important;
+}
+
+.score-column {
+    white-space: nowrap;
+}
+
+.result-circle {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    width: 32px;
+    height: 32px;
+    margin: 0 4px;
+    flex-shrink: 0;
+}
+
+.result-circle.result-win {
+    background-color: #bbf7d0;
+}
+
+.result-circle.result-loss {
+    background-color: #fecaca;
+}
+
+.result-circle.result-tie {
+    background-color: #e5e7eb;
+}
+
+.score {
+    display: inline-block;
+}
+
+.rating-delta {
+    font-size: 0.75rem;
+}
+
+.rating-delta.delta-win {
+    color: #16a34a;
+    font-weight: 600;
+}
+
+.rating-delta.delta-loss {
+    color: #dc2626;
+    font-weight: 600;
+}
+
+.rating-delta.delta-tie {
+    color: #6b7280;
 }
diff --git a/othello/static/css/games/design.css b/othello/static/css/games/design.css
@@ -1,5 +1,5 @@
 .selectize-input {
-    font-family: 'Roboto Mono', monospace;
+    font-family: 'Inter', sans-serif;
     font-size: 16px;
     background-color: transparent;
     color: #805229;
diff --git a/othello/static/css/tournaments/create.css b/othello/static/css/tournaments/create.css
@@ -4,7 +4,7 @@
 
 .selectize-input {
     margin-left: 10px;
-    font-family: 'Roboto Mono', monospace;
+    font-family: 'Inter', sans-serif;
     font-size: 16px;
     background-color: transparent;
     color: #805229;
diff --git a/othello/static/css/tournaments/management.css b/othello/static/css/tournaments/management.css
@@ -4,7 +4,7 @@
 
 .selectize-input {
     margin-left: 10px;
-    font-family: 'Roboto Mono', monospace;
+    font-family: 'Inter', sans-serif;
     font-size: 16px;
     background-color: transparent;
     color: #805229;
diff --git a/othello/static/css/upload.css b/othello/static/css/upload.css
@@ -25,7 +25,7 @@
 }
 
 .selectize-input {
-    font-family: 'Roboto Mono', monospace;
+    font-family: 'Inter', sans-serif;
     font-size: 16px;
     background-color: transparent;
     color: #805229;
diff --git a/othello/static/js/games/queue.js b/othello/static/js/games/queue.js
diff --git a/othello/templates/base.html b/othello/templates/base.html
diff --git a/othello/templates/games/queue.html b/othello/templates/games/queue.html

Original file line number	Diff line number	Diff line change
`@@ -245,3 +245,6 @@`
`245`	`245`	`integrations=[DjangoIntegration(), CeleryIntegration()],`
`246`	`246`	`send_default_pii=True,`
`247`	`247`	`)`
	`248`	`+`
	`249`	`+`
	`250`	`+DATETIME_FORMAT = "F d, Y, h:i a"`