.envrc

@@ -1 +0,0 @@
-use nix

.gitignore

@@ -9,4 +9,3 @@ db.sqlite3
 dist/
 .DS_Store
 .python-version
-.direnv

.pre-commit-config.yaml

@@ -1,13 +1,10 @@
 repos:
-# disable due to incomaptible formatting between
+-   repo: https://github.com/psf/black
-# black and ruff
+    rev: 24.3.0
-# TODO: replace with ruff when it works on NixOS
+    hooks:
-# -   repo: https://github.com/psf/black
+    -   id: black
-#     rev: 24.8.0
-#     hooks:
-#     -   id: black
 - repo: https://github.com/pycqa/isort
-  rev: 5.13.2
+  rev: 5.12.0
   hooks:
     - id: isort
       name: isort (python)
@@ -15,6 +12,4 @@ repos:
   rev: v1.34.0
   hooks:
     - id: djlint-reformat-django
-      args: ["--ignore", "H011"]
     - id: djlint-django
-      args: ["--ignore", "H011"]

.vscode/extensions.json

@@ -1,11 +1,8 @@
 {
     "recommendations": [
-        "charliermarsh.ruff",
+        "ms-python.black-formatter",
         "ms-python.python",
         "ms-python.vscode-pylance",
         "ms-python.debugpy",
-        "batisteo.vscode-django",
-        "bradlc.vscode-tailwindcss",
-        "EditorConfig.EditorConfig"
     ]
 }

.vscode/settings.json

@@ -6,28 +6,7 @@
     "python.testing.pytestEnabled": true,
     "python.analysis.typeCheckingMode": "strict",
     "[python]": {
-        "editor.defaultFormatter": "charliermarsh.ruff",
+        "editor.defaultFormatter": "ms-python.black-formatter",
-        "editor.formatOnSave": true,
+        "editor.formatOnSave": true
-        "editor.codeActionsOnSave": {
-            "source.fixAll": "explicit",
-            "source.organizeImports": "explicit"
     },
-    },
-    "ruff.path": ["/nix/store/jaibb3v0rrnlw5ib54qqq3452yhp1xcb-ruff-0.5.7/bin/ruff"],
-    "tailwind-fold.supportedLanguages": [
-        "html",
-        "typescriptreact",
-        "javascriptreact",
-        "typescript",
-        "javascript",
-        "vue-html",
-        "vue",
-        "php",
-        "markdown",
-        "coffeescript",
-        "svelte",
-        "astro",
-        "erb",
-        "django-html"
-    ]
 }

CHANGELOG.md

@@ -6,7 +6,6 @@
 * Add stats for dropped purchases, monthly playtimes
 * Allow deleting purchases
 * Add all-time stats
-* Manage purchases
 
 ## Improved
 * mark refunded purchases red on game overview

common/input.css

@@ -70,15 +70,9 @@ form label {
 }
 
 @layer utilities {
-  .min-w-20char {
-    min-width: 20ch;
-  }
   .max-w-20char {
     max-width: 20ch;
   }
-  .min-w-30char {
-    min-width: 30ch;
-  }
   .max-w-30char {
     max-width: 30ch;
   }
@@ -126,6 +120,14 @@ textarea:disabled {
   @apply mx-1;
 }
 
+th {
+  @apply text-right;
+}
+
+th label {
+  @apply mr-4;
+}
+
 .basic-button-container {
   @apply flex space-x-2 justify-center;
 }

common/time.py

@@ -12,7 +12,7 @@ def _safe_timedelta(duration: timedelta | int | None):
 
 
 def format_duration(
-    duration: timedelta | int | float | None, format_string: str = "%H hours"
+    duration: timedelta | int | None, format_string: str = "%H hours"
 ) -> str:
     """
     Format timedelta into the specified format_string.

common/utils.py

@@ -1,32 +1,3 @@
-from random import choices
-from string import ascii_lowercase
-from typing import Any
-
-from django.template.loader import render_to_string
-from django.utils.safestring import mark_safe
-
-
-def Popover(
-    wrapped_content: str,
-    popover_content: str = "",
-) -> str:
-    id = randomid()
-    if popover_content == "":
-        popover_content = wrapped_content
-    content = f"<span data-popover-target={id}>{wrapped_content}</span>"
-    result = mark_safe(
-        str(content)
-        + render_to_string(
-            "cotton/popover.html",
-            {
-                "id": id,
-                "slot": popover_content,
-            },
-        )
-    )
-    return result
-
-
 def safe_division(numerator: int | float, denominator: int | float) -> int | float:
     """
     Divides without triggering division by zero exception.
@@ -38,7 +9,7 @@ def safe_division(numerator: int | float, denominator: int | float) -> int | flo
         return 0
 
 
-def safe_getattr(obj: object, attr_chain: str, default: Any | None = None) -> object:
+def safe_getattr(obj, attr_chain, default=None):
     """
     Safely get the nested attribute from an object.
 
@@ -57,24 +28,3 @@ def safe_getattr(obj: object, attr_chain: str, default: Any | None = None) -> ob
         except AttributeError:
             return default
     return obj
-
-
-def truncate(input_string: str, length: int = 30, ellipsis: str = "…") -> str:
-    return (
-        (f"{input_string[:length-len(ellipsis)]}{ellipsis}")
-        if len(input_string) > 30
-        else input_string
-    )
-
-
-def truncate_with_popover(input_string: str) -> str:
-    if (truncated := truncate(input_string)) != input_string:
-        print(f"Not the same after: {truncated=}")
-        return Popover(wrapped_content=truncated, popover_content=input_string)
-    else:
-        print("Strings are the same!")
-        return input_string
-
-
-def randomid(seed: str = "", length: int = 10) -> str:
-    return seed + "".join(choices(ascii_lowercase, k=length))

games/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.urls import reverse
-
 from common.utils import safe_getattr
+
 from games.models import Device, Edition, Game, Platform, Purchase, Session
 
 custom_date_widget = forms.DateInput(attrs={"type": "date"})

games/migrations/0035_alter_session_device.py

@@ -1,25 +0,0 @@
-# Generated by Django 5.1 on 2024-08-11 15:50
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0034_purchase_date_dropped_purchase_infinite"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="session",
-            name="device",
-            field=models.ForeignKey(
-                blank=True,
-                default=None,
-                null=True,
-                on_delete=django.db.models.deletion.SET_DEFAULT,
-                to="games.device",
-            ),
-        ),
-    ]

games/migrations/0036_alter_edition_platform.py

@@ -1,19 +0,0 @@
-# Generated by Django 5.1 on 2024-08-11 16:48
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('games', '0035_alter_session_device'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='edition',
-            name='platform',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='games.platform'),
-        ),
-    ]

games/models.py

@@ -2,7 +2,7 @@ from datetime import timedelta
 
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import F, Sum
+from django.db.models import F, Manager, Sum
 from django.utils import timezone
 
 from common.time import format_duration
@@ -15,18 +15,6 @@ class Game(models.Model):
     wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
     created_at = models.DateTimeField(auto_now_add=True)
 
-    session_average: float | int | timedelta | None
-    session_count: int | None
-
-    def __str__(self):
-        return self.name
-
-
-class Platform(models.Model):
-    name = models.CharField(max_length=255)
-    group = models.CharField(max_length=255, null=True, blank=True, default=None)
-    created_at = models.DateTimeField(auto_now_add=True)
-
     def __str__(self):
         return self.name
 
@@ -35,11 +23,11 @@ class Edition(models.Model):
     class Meta:
         unique_together = [["name", "platform", "year_released"]]
 
-    game = models.ForeignKey(Game, on_delete=models.CASCADE)
+    game = models.ForeignKey("Game", on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
     sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
     platform = models.ForeignKey(
-        Platform, on_delete=models.SET_DEFAULT, null=True, blank=True, default=None
+        "Platform", on_delete=models.CASCADE, null=True, blank=True, default=None
     )
     year_released = models.IntegerField(null=True, blank=True, default=None)
     wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
@@ -95,9 +83,9 @@ class Purchase(models.Model):
 
     objects = PurchaseQueryset().as_manager()
 
-    edition = models.ForeignKey(Edition, on_delete=models.CASCADE)
+    edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
     platform = models.ForeignKey(
-        Platform, on_delete=models.CASCADE, default=None, null=True, blank=True
+        "Platform", on_delete=models.CASCADE, default=None, null=True, blank=True
     )
     date_purchased = models.DateField()
     date_refunded = models.DateField(blank=True, null=True)
@@ -112,7 +100,7 @@ class Purchase(models.Model):
     type = models.CharField(max_length=255, choices=TYPES, default=GAME)
     name = models.CharField(max_length=255, default="", null=True, blank=True)
     related_purchase = models.ForeignKey(
-        "self",
+        "Purchase",
         on_delete=models.SET_NULL,
         default=None,
         null=True,
@@ -147,6 +135,15 @@ class Purchase(models.Model):
         super().save(*args, **kwargs)
 
 
+class Platform(models.Model):
+    name = models.CharField(max_length=255)
+    group = models.CharField(max_length=255, null=True, blank=True, default=None)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.name
+
+
 class SessionQuerySet(models.QuerySet):
     def total_duration_formatted(self):
         return format_duration(self.total_duration_unformatted())
@@ -175,14 +172,14 @@ class Session(models.Model):
     class Meta:
         get_latest_by = "timestamp_start"
 
-    purchase = models.ForeignKey(Purchase, on_delete=models.CASCADE)
+    purchase = models.ForeignKey("Purchase", on_delete=models.CASCADE)
     timestamp_start = models.DateTimeField()
     timestamp_end = models.DateTimeField(blank=True, null=True)
     duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
     duration_calculated = models.DurationField(blank=True, null=True)
     device = models.ForeignKey(
         "Device",
-        on_delete=models.SET_DEFAULT,
+        on_delete=models.CASCADE,
         null=True,
         blank=True,
         default=None,
@@ -223,7 +220,7 @@ class Session(models.Model):
     def duration_sum(self) -> str:
         return Session.objects.all().total_duration_formatted()
 
-    def save(self, *args, **kwargs) -> None:
+    def save(self, *args, **kwargs):
         if self.timestamp_start != None and self.timestamp_end != None:
             self.duration_calculated = self.timestamp_end - self.timestamp_start
         else:

games/static/base.css

@@ -1246,18 +1246,6 @@ input:checked + .toggle-bg {
   }
 }
 
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  white-space: nowrap;
-  border-width: 0;
-}
-
 .visible {
   visibility: visible;
 }
@@ -1382,18 +1370,10 @@ input:checked + .toggle-bg {
   margin-bottom: 0.75rem;
 }
 
-.mb-4 {
-  margin-bottom: 1rem;
-}
-
 .mb-8 {
   margin-bottom: 2rem;
 }
 
-.me-2 {
-  margin-inline-end: 0.5rem;
-}
-
 .ml-1 {
   margin-left: 0.25rem;
 }
@@ -1402,18 +1382,6 @@ input:checked + .toggle-bg {
   margin-right: 1rem;
 }
 
-.ms-0 {
-  margin-inline-start: 0px;
-}
-
-.ms-2 {
-  margin-inline-start: 0.5rem;
-}
-
-.ms-2\.5 {
-  margin-inline-start: 0.625rem;
-}
-
 .mt-2 {
   margin-top: 0.5rem;
 }
@@ -1422,14 +1390,6 @@ input:checked + .toggle-bg {
   margin-top: 1rem;
 }
 
-.mb-5 {
-  margin-bottom: 1.25rem;
-}
-
-.mb-6 {
-  margin-bottom: 1.5rem;
-}
-
 .block {
   display: block;
 }
@@ -1467,16 +1427,12 @@ input:checked + .toggle-bg {
   height: 1.5rem;
 }
 
-.h-10 {
-  height: 2.5rem;
-}
-
 .h-12 {
   height: 3rem;
 }
 
-.h-2\.5 {
+.h-24 {
-  height: 0.625rem;
+  height: 6rem;
 }
 
 .h-3 {
@@ -1495,10 +1451,6 @@ input:checked + .toggle-bg {
   height: 1.5rem;
 }
 
-.h-8 {
-  height: 2rem;
-}
-
 .h-9 {
   height: 2.25rem;
 }
@@ -1511,14 +1463,6 @@ input:checked + .toggle-bg {
   width: 50%;
 }
 
-.w-10 {
-  width: 2.5rem;
-}
-
-.w-2\.5 {
-  width: 0.625rem;
-}
-
 .w-24 {
   width: 6rem;
 }
@@ -1527,10 +1471,6 @@ input:checked + .toggle-bg {
   width: 1rem;
 }
 
-.w-44 {
-  width: 11rem;
-}
-
 .w-5 {
   width: 1.25rem;
 }
@@ -1547,6 +1487,10 @@ input:checked + .toggle-bg {
   width: 1.75rem;
 }
 
+.w-auto {
+  width: auto;
+}
+
 .w-full {
   width: 100%;
 }
@@ -1559,10 +1503,6 @@ input:checked + .toggle-bg {
   max-width: 1024px;
 }
 
-.max-w-screen-xl {
-  max-width: 1280px;
-}
-
 .max-w-sm {
   max-width: 24rem;
 }
@@ -1699,12 +1639,6 @@ input:checked + .toggle-bg {
   gap: 1.25rem;
 }
 
-.-space-x-px > :not([hidden]) ~ :not([hidden]) {
-  --tw-space-x-reverse: 0;
-  margin-right: calc(-1px * var(--tw-space-x-reverse));
-  margin-left: calc(-1px * calc(1 - var(--tw-space-x-reverse)));
-}
-
 .space-x-1 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
   margin-right: calc(0.25rem * var(--tw-space-x-reverse));
@@ -1717,23 +1651,6 @@ input:checked + .toggle-bg {
   margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse)));
 }
 
-.space-x-3 > :not([hidden]) ~ :not([hidden]) {
-  --tw-space-x-reverse: 0;
-  margin-right: calc(0.75rem * var(--tw-space-x-reverse));
-  margin-left: calc(0.75rem * calc(1 - var(--tw-space-x-reverse)));
-}
-
-.divide-y > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-y-reverse: 0;
-  border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
-  border-bottom-width: calc(1px * var(--tw-divide-y-reverse));
-}
-
-.divide-gray-100 > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 1;
-  border-color: rgb(243 244 246 / var(--tw-divide-opacity));
-}
-
 .self-center {
   align-self: center;
 }
@@ -1742,10 +1659,6 @@ input:checked + .toggle-bg {
   overflow: hidden;
 }
 
-.overflow-x-auto {
-  overflow-x: auto;
-}
-
 .truncate {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -1760,10 +1673,6 @@ input:checked + .toggle-bg {
   text-wrap: wrap;
 }
 
-.rounded {
-  border-radius: 0.25rem;
-}
-
 .rounded-full {
   border-radius: 9999px;
 }
@@ -1808,10 +1717,6 @@ input:checked + .toggle-bg {
   border-width: 0px;
 }
 
-.border-b {
-  border-bottom-width: 1px;
-}
-
 .border-blue-600 {
   --tw-border-opacity: 1;
   border-color: rgb(28 100 242 / var(--tw-border-opacity));
@@ -1842,11 +1747,6 @@ input:checked + .toggle-bg {
   border-color: rgb(220 215 254 / var(--tw-border-opacity));
 }
 
-.bg-blue-100 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(225 239 254 / var(--tw-bg-opacity));
-}
-
 .bg-blue-700 {
   --tw-bg-opacity: 1;
   background-color: rgb(26 86 219 / var(--tw-bg-opacity));
@@ -1862,16 +1762,6 @@ input:checked + .toggle-bg {
   background-color: rgb(229 231 235 / var(--tw-bg-opacity));
 }
 
-.bg-gray-400 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(156 163 175 / var(--tw-bg-opacity));
-}
-
-.bg-gray-50 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(249 250 251 / var(--tw-bg-opacity));
-}
-
 .bg-gray-800 {
   --tw-bg-opacity: 1;
   background-color: rgb(31 41 55 / var(--tw-bg-opacity));
@@ -1904,10 +1794,6 @@ input:checked + .toggle-bg {
   padding: 0.25rem;
 }
 
-.p-2 {
-  padding: 0.5rem;
-}
-
 .p-2\.5 {
   padding: 0.625rem;
 }
@@ -1921,11 +1807,6 @@ input:checked + .toggle-bg {
   padding-right: 0.5rem;
 }
 
-.px-2\.5 {
-  padding-left: 0.625rem;
-  padding-right: 0.625rem;
-}
-
 .px-3 {
   padding-left: 0.75rem;
   padding-right: 0.75rem;
@@ -1941,16 +1822,6 @@ input:checked + .toggle-bg {
   padding-right: 1.25rem;
 }
 
-.px-6 {
-  padding-left: 1.5rem;
-  padding-right: 1.5rem;
-}
-
-.py-0\.5 {
-  padding-top: 0.125rem;
-  padding-bottom: 0.125rem;
-}
-
 .py-1 {
   padding-top: 0.25rem;
   padding-bottom: 0.25rem;
@@ -1971,9 +1842,20 @@ input:checked + .toggle-bg {
   padding-bottom: 0.75rem;
 }
 
-.py-4 {
+.pb-16 {
-  padding-top: 1rem;
+  padding-bottom: 4rem;
-  padding-bottom: 1rem;
+}
+
+.pl-3 {
+  padding-left: 0.75rem;
+}
+
+.pr-4 {
+  padding-right: 1rem;
+}
+
+.pt-1 {
+  padding-top: 0.25rem;
 }
 
 .pt-2 {
@@ -1984,18 +1866,10 @@ input:checked + .toggle-bg {
   padding-top: 2rem;
 }
 
-.text-left {
-  text-align: left;
-}
-
 .text-center {
   text-align: center;
 }
 
-.text-right {
-  text-align: right;
-}
-
 .align-top {
   vertical-align: top;
 }
@@ -2061,26 +1935,14 @@ input:checked + .toggle-bg {
   font-weight: 700;
 }
 
-.font-extrabold {
-  font-weight: 800;
-}
-
 .font-medium {
   font-weight: 500;
 }
 
-.font-normal {
-  font-weight: 400;
-}
-
 .font-semibold {
   font-weight: 600;
 }
 
-.uppercase {
-  text-transform: uppercase;
-}
-
 .leading-6 {
   line-height: 1.5rem;
 }
@@ -2089,33 +1951,11 @@ input:checked + .toggle-bg {
   line-height: 2.25rem;
 }
 
-.leading-none {
-  line-height: 1;
-}
-
-.leading-tight {
-  line-height: 1.25;
-}
-
-.tracking-tight {
-  letter-spacing: -0.025em;
-}
-
 .text-blue-600 {
   --tw-text-opacity: 1;
   color: rgb(28 100 242 / var(--tw-text-opacity));
 }
 
-.text-blue-800 {
-  --tw-text-opacity: 1;
-  color: rgb(30 66 159 / var(--tw-text-opacity));
-}
-
-.text-gray-300 {
-  --tw-text-opacity: 1;
-  color: rgb(209 213 219 / var(--tw-text-opacity));
-}
-
 .text-gray-400 {
   --tw-text-opacity: 1;
   color: rgb(156 163 175 / var(--tw-text-opacity));
@@ -2416,6 +2256,14 @@ textarea:disabled:is(.dark *) {
   margin-right: 0.25rem;
 }
 
+th {
+  text-align: right;
+}
+
+th label {
+  margin-right: 1rem;
+}
+
 .basic-button-container {
   display: flex;
   justify-content: center;
@@ -2518,26 +2366,11 @@ textarea:disabled:is(.dark *) {
   }  
 } */
 
-.odd\:bg-white:nth-child(odd) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
-}
-
-.even\:bg-gray-50:nth-child(even) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(249 250 251 / var(--tw-bg-opacity));
-}
-
 .hover\:border-gray-300:hover {
   --tw-border-opacity: 1;
   border-color: rgb(209 213 219 / var(--tw-border-opacity));
 }
 
-.hover\:border-green-600:hover {
-  --tw-border-opacity: 1;
-  border-color: rgb(5 122 85 / var(--tw-border-opacity));
-}
-
 .hover\:bg-blue-800:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(30 66 159 / var(--tw-bg-opacity));
@@ -2548,14 +2381,9 @@ textarea:disabled:is(.dark *) {
   background-color: rgb(243 244 246 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-gray-50:hover {
+.hover\:bg-gray-400:hover {
   --tw-bg-opacity: 1;
-  background-color: rgb(249 250 251 / var(--tw-bg-opacity));
+  background-color: rgb(156 163 175 / var(--tw-bg-opacity));
-}
-
-.hover\:bg-green-500:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(14 159 110 / var(--tw-bg-opacity));
 }
 
 .hover\:bg-green-700:hover {
@@ -2568,11 +2396,6 @@ textarea:disabled:is(.dark *) {
   background-color: rgb(253 232 232 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-red-500:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(240 82 82 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-violet-700:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(109 40 217 / var(--tw-bg-opacity));
@@ -2598,19 +2421,13 @@ textarea:disabled:is(.dark *) {
   color: rgb(75 85 99 / var(--tw-text-opacity));
 }
 
-.hover\:text-gray-700:hover {
-  --tw-text-opacity: 1;
-  color: rgb(55 65 81 / var(--tw-text-opacity));
-}
-
 .hover\:text-gray-900:hover {
   --tw-text-opacity: 1;
   color: rgb(17 24 39 / var(--tw-text-opacity));
 }
 
-.hover\:text-white:hover {
+.hover\:underline:hover {
-  --tw-text-opacity: 1;
+  text-decoration-line: underline;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
 .focus\:z-10:focus {
@@ -2659,11 +2476,6 @@ textarea:disabled:is(.dark *) {
   --tw-ring-color: rgb(14 159 110 / var(--tw-ring-opacity));
 }
 
-.focus\:ring-green-700:focus {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(4 108 78 / var(--tw-ring-opacity));
-}
-
 .focus\:ring-violet-500:focus {
   --tw-ring-opacity: 1;
   --tw-ring-color: rgb(139 92 246 / var(--tw-ring-opacity));
@@ -2693,6 +2505,10 @@ textarea:disabled:is(.dark *) {
   top: -2rem;
 }
 
+.group:hover .group-hover\:block {
+  display: block;
+}
+
 .group:hover .group-hover\:min-w-60 {
   min-width: 15rem;
 }
@@ -2741,11 +2557,6 @@ textarea:disabled:is(.dark *) {
   outline-color: #AC94FA;
 }
 
-.dark\:divide-gray-600:is(.dark *) > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 1;
-  border-color: rgb(75 85 99 / var(--tw-divide-opacity));
-}
-
 .dark\:border-blue-500:is(.dark *) {
   --tw-border-opacity: 1;
   border-color: rgb(63 131 248 / var(--tw-border-opacity));
@@ -2770,11 +2581,6 @@ textarea:disabled:is(.dark *) {
   border-color: transparent;
 }
 
-.dark\:bg-blue-200:is(.dark *) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(195 221 253 / var(--tw-bg-opacity));
-}
-
 .dark\:bg-blue-600:is(.dark *) {
   --tw-bg-opacity: 1;
   background-color: rgb(28 100 242 / var(--tw-bg-opacity));
@@ -2818,16 +2624,6 @@ textarea:disabled:is(.dark *) {
   color: rgb(63 131 248 / var(--tw-text-opacity));
 }
 
-.dark\:text-blue-800:is(.dark *) {
-  --tw-text-opacity: 1;
-  color: rgb(30 66 159 / var(--tw-text-opacity));
-}
-
-.dark\:text-gray-200:is(.dark *) {
-  --tw-text-opacity: 1;
-  color: rgb(229 231 235 / var(--tw-text-opacity));
-}
-
 .dark\:text-gray-400:is(.dark *) {
   --tw-text-opacity: 1;
   color: rgb(156 163 175 / var(--tw-text-opacity));
@@ -2838,11 +2634,6 @@ textarea:disabled:is(.dark *) {
   color: rgb(107 114 128 / var(--tw-text-opacity));
 }
 
-.dark\:text-gray-600:is(.dark *) {
-  --tw-text-opacity: 1;
-  color: rgb(75 85 99 / var(--tw-text-opacity));
-}
-
 .dark\:text-slate-400:is(.dark *) {
   --tw-text-opacity: 1;
   color: rgb(148 163 184 / var(--tw-text-opacity));
@@ -2863,26 +2654,6 @@ textarea:disabled:is(.dark *) {
   color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
-.odd\:dark\:bg-gray-900:is(.dark *):nth-child(odd) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(17 24 39 / var(--tw-bg-opacity));
-}
-
-.even\:dark\:bg-gray-800:is(.dark *):nth-child(even) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(31 41 55 / var(--tw-bg-opacity));
-}
-
-.dark\:hover\:border-green-700:hover:is(.dark *) {
-  --tw-border-opacity: 1;
-  border-color: rgb(4 108 78 / var(--tw-border-opacity));
-}
-
-.dark\:hover\:border-red-700:hover:is(.dark *) {
-  --tw-border-opacity: 1;
-  border-color: rgb(200 30 30 / var(--tw-border-opacity));
-}
-
 .dark\:hover\:bg-blue-700:hover:is(.dark *) {
   --tw-bg-opacity: 1;
   background-color: rgb(26 86 219 / var(--tw-bg-opacity));
@@ -2903,11 +2674,6 @@ textarea:disabled:is(.dark *) {
   background-color: rgb(31 41 55 / var(--tw-bg-opacity));
 }
 
-.dark\:hover\:bg-green-600:hover:is(.dark *) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(5 122 85 / var(--tw-bg-opacity));
-}
-
 .dark\:hover\:bg-red-700:hover:is(.dark *) {
   --tw-bg-opacity: 1;
   background-color: rgb(200 30 30 / var(--tw-bg-opacity));
@@ -2938,22 +2704,11 @@ textarea:disabled:is(.dark *) {
   --tw-ring-color: rgb(63 131 248 / var(--tw-ring-opacity));
 }
 
-.dark\:focus\:ring-blue-800:focus:is(.dark *) {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(30 66 159 / var(--tw-ring-opacity));
-}
-
-.dark\:focus\:ring-gray-600:focus:is(.dark *) {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity));
-}
-
-.dark\:focus\:ring-green-500:focus:is(.dark *) {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(14 159 110 / var(--tw-ring-opacity));
-}
-
 @media (min-width: 640px) {
+  .sm\:inline {
+    display: inline;
+  }
+
   .sm\:table-cell {
     display: table-cell;
   }
@@ -2962,23 +2717,19 @@ textarea:disabled:is(.dark *) {
     max-width: 28rem;
   }
 
-  .sm\:max-w-screen-sm {
-    max-width: 640px;
-  }
-
   .sm\:max-w-xl {
     max-width: 36rem;
   }
 
-  .sm\:rounded-lg {
-    border-radius: 0.5rem;
-  }
-
   .sm\:px-4 {
     padding-left: 1rem;
     padding-right: 1rem;
   }
 
+  .sm\:pl-12 {
+    padding-left: 3rem;
+  }
+
   .sm\:pl-2 {
     padding-left: 0.5rem;
   }
@@ -2987,67 +2738,28 @@ textarea:disabled:is(.dark *) {
     padding-left: 1rem;
   }
 
+  .sm\:pl-6 {
+    padding-left: 1.5rem;
+  }
+
   .sm\:decoration-2 {
     text-decoration-thickness: 2px;
   }
 }
 
 @media (min-width: 768px) {
-  .md\:mb-0 {
-    margin-bottom: 0px;
-  }
-
-  .md\:mt-0 {
-    margin-top: 0px;
-  }
-
   .md\:block {
     display: block;
   }
 
-  .md\:inline {
-    display: inline;
-  }
-
-  .md\:hidden {
-    display: none;
-  }
-
   .md\:w-auto {
     width: auto;
   }
 
-  .md\:max-w-screen-md {
-    max-width: 768px;
-  }
-
   .md\:flex-row {
     flex-direction: row;
   }
 
-  .md\:space-x-8 > :not([hidden]) ~ :not([hidden]) {
-    --tw-space-x-reverse: 0;
-    margin-right: calc(2rem * var(--tw-space-x-reverse));
-    margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse)));
-  }
-
-  .md\:border-0 {
-    border-width: 0px;
-  }
-
-  .md\:bg-transparent {
-    background-color: transparent;
-  }
-
-  .md\:bg-white {
-    --tw-bg-opacity: 1;
-    background-color: rgb(255 255 255 / var(--tw-bg-opacity));
-  }
-
-  .md\:p-0 {
-    padding: 0px;
-  }
-
   .md\:px-6 {
     padding-left: 1.5rem;
     padding-right: 1.5rem;
@@ -3057,48 +2769,6 @@ textarea:disabled:is(.dark *) {
     padding-top: 0.5rem;
     padding-bottom: 0.5rem;
   }
-
-  .md\:text-5xl {
-    font-size: 3rem;
-    line-height: 1;
-  }
-
-  .md\:text-blue-700 {
-    --tw-text-opacity: 1;
-    color: rgb(26 86 219 / var(--tw-text-opacity));
-  }
-
-  .md\:hover\:bg-transparent:hover {
-    background-color: transparent;
-  }
-
-  .md\:hover\:text-blue-700:hover {
-    --tw-text-opacity: 1;
-    color: rgb(26 86 219 / var(--tw-text-opacity));
-  }
-
-  .md\:dark\:bg-gray-900:is(.dark *) {
-    --tw-bg-opacity: 1;
-    background-color: rgb(17 24 39 / var(--tw-bg-opacity));
-  }
-
-  .md\:dark\:bg-transparent:is(.dark *) {
-    background-color: transparent;
-  }
-
-  .md\:dark\:text-blue-500:is(.dark *) {
-    --tw-text-opacity: 1;
-    color: rgb(63 131 248 / var(--tw-text-opacity));
-  }
-
-  .md\:dark\:hover\:bg-transparent:hover:is(.dark *) {
-    background-color: transparent;
-  }
-
-  .md\:dark\:hover\:text-blue-500:hover:is(.dark *) {
-    --tw-text-opacity: 1;
-    color: rgb(63 131 248 / var(--tw-text-opacity));
-  }
 }
 
 @media (min-width: 1024px) {
@@ -3113,17 +2783,6 @@ textarea:disabled:is(.dark *) {
   .lg\:max-w-lg {
     max-width: 32rem;
   }
-
-  .lg\:text-6xl {
-    font-size: 3.75rem;
-    line-height: 1;
-  }
-}
-
-@media (min-width: 1536px) {
-  .\32xl\:max-w-screen-2xl {
-    max-width: 1536px;
-  }
 }
 
 .rtl\:rotate-180:where([dir="rtl"], [dir="rtl"] *) {
@@ -3134,21 +2793,3 @@ textarea:disabled:is(.dark *) {
 .rtl\:space-x-reverse:where([dir="rtl"], [dir="rtl"] *) > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 1;
 }
-
-.rtl\:text-left:where([dir="rtl"], [dir="rtl"] *) {
-  text-align: left;
-}
-
-.rtl\:text-right:where([dir="rtl"], [dir="rtl"] *) {
-  text-align: right;
-}
-
-.\[\&\:first-of-type_button\]\:rounded-s-lg:first-of-type button {
-  border-start-start-radius: 0.5rem;
-  border-end-start-radius: 0.5rem;
-}
-
-.\[\&\:last-of-type_button\]\:rounded-e-lg:last-of-type button {
-  border-start-end-radius: 0.5rem;
-  border-end-end-radius: 0.5rem;
-}

games/templates/add_purchase.html

@@ -26,9 +26,7 @@
                 <tr>
                     <td></td>
                     <td>
-                        <a href="{% url 'delete_purchase' purchase_id %}"
+                        <a href="{% url 'delete_purchase' purchase_id %}" class="text-red-600" onclick="return confirm('Are you sure you want to delete this purchase?');">Delete</a>
-                           class="text-red-600"
-                           onclick="return confirm('Are you sure you want to delete this purchase?');">Delete</a>
                     </td>
                 </tr>
             {% endif %}

games/templates/base.html

@@ -16,16 +16,8 @@
         {% django_htmx_script %}
         <link rel="stylesheet" href="{% static 'base.css' %}" />
         <script src="https://cdn.jsdelivr.net/npm/flowbite@2.4.1/dist/flowbite.min.js"></script>
-        <script>
-        // On page load or when changing themes, best to add inline in `head` to avoid FOUC
-        if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-            document.documentElement.classList.add('dark');
-        } else {
-            document.documentElement.classList.remove('dark')
-        }
-        </script>
     </head>
-    <body hx-indicator="#indicator">
+    <body class="dark" hx-indicator="#indicator">
         <img id="indicator"
              src="{% static 'icons/loading.png' %}"
              class="absolute right-3 top-3 animate-spin htmx-indicator"
@@ -33,8 +25,91 @@
              width="24"
              alt="loading indicator" />
         <div class="flex flex-col min-h-screen">
-            {% include "navbar.html" %}
+            <nav class="dark:bg-gray-900 border-gray-200 h-24 flex items-center">
-            <div class="flex flex-1 flex-col dark:bg-gray-800 pt-8">
+                <div class="container flex flex-wrap items-center justify-between mx-auto">
+                    <a href="{% url 'list_sessions_recent' %}" class="flex items-center">
+                        <span class="text-4xl">
+                            <img src="{% static 'icons/schedule.png' %}"
+                                 height="48"
+                                 width="48"
+                                 alt="Timetracker Logo"
+                                 class="mr-4" />
+                        </span>
+                        <span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
+                    </a>
+                    <div class="w-full md:block md:w-auto">
+                        <ul class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
+                            <li class="relative group">
+                                {% if user.is_authenticated %}
+                                    <a class="block py-2 pl-3 pr-4 hover:underline"
+                                       href="{% url 'add_game' %}">New</a>
+                                    <ul class="absolute hidden text-gray-700 pt-1 group-hover:block  w-auto whitespace-nowrap">
+                                        {% if purchase_available %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'add_device' %}">Device</a>
+                                            </li>
+                                        {% endif %}
+                                        <li>
+                                            <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                               href="{% url 'add_game' %}">Game</a>
+                                        </li>
+                                        {% if game_available and platform_available %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'add_edition' %}">Edition</a>
+                                            </li>
+                                        {% endif %}
+                                        <li>
+                                            <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                               href="{% url 'add_platform' %}">Platform</a>
+                                        </li>
+                                        {% if edition_available %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'add_purchase' %}">Purchase</a>
+                                            </li>
+                                        {% endif %}
+                                        {% if purchase_available %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'add_session' %}">Session</a>
+                                            </li>
+                                        {% endif %}
+                                    </ul>
+                                    </li>
+                                    {% if session_count > 0 %}
+                                        <li class="relative group">
+                                            <a class="block py-2 pl-3 pr-4 hover:underline"
+                                               href="{% url 'stats_by_year' 0 %}">Stats</a>
+                                            <ul class="absolute hidden text-gray-700 pt-1 group-hover:block">
+                                                <li>
+                                                    <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                       href="{% url 'stats_by_year' 0 %}">Overall</a>
+                                                </li>
+                                                {% for year in stats_dropdown_year_range %}
+                                                    <li>
+                                                        <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                           href="{% url 'stats_by_year' year %}">{{ year }}</a>
+                                                    </li>
+                                                {% endfor %}
+                                            </ul>
+                                        </li>
+                                        <li>
+                                            <a class="block py-2 pl-3 pr-4 hover:underline"
+                                               href="{% url 'list_sessions' %}">All Sessions</a>
+                                        </li>
+                                        <li>
+                                            <a class="block py-2 pl-3 pr-4 hover:underline"
+                                               href="{% url 'logout' %}">Log Out</a>
+                                        </li>
+                                    {% endif %}
+                                {% endif %}
+                            </ul>
+                        </div>
+                    </div>
+                </nav>
+                <div class="flex flex-1 dark:bg-gray-800 justify-center pt-8 pb-16">
                     {% block content %}
                         No content here.
                     {% endblock content %}
@@ -44,47 +119,5 @@
             </div>
             {% block scripts %}
             {% endblock scripts %}
-        <script>
-        var themeToggleDarkIcon = document.getElementById('theme-toggle-dark-icon');
-        var themeToggleLightIcon = document.getElementById('theme-toggle-light-icon');
-
-        // Change the icons inside the button based on previous settings
-        if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-            themeToggleLightIcon.classList.remove('hidden');
-        } else {
-            themeToggleDarkIcon.classList.remove('hidden');
-        }
-
-        var themeToggleBtn = document.getElementById('theme-toggle');
-
-        themeToggleBtn.addEventListener('click', function () {
-
-            // toggle icons inside button
-            themeToggleDarkIcon.classList.toggle('hidden');
-            themeToggleLightIcon.classList.toggle('hidden');
-
-            // if set via local storage previously
-            if (localStorage.getItem('color-theme')) {
-                if (localStorage.getItem('color-theme') === 'light') {
-                    document.documentElement.classList.add('dark');
-                    localStorage.setItem('color-theme', 'dark');
-                } else {
-                    document.documentElement.classList.remove('dark');
-                    localStorage.setItem('color-theme', 'light');
-                }
-
-                // if NOT set via local storage previously
-            } else {
-                if (document.documentElement.classList.contains('dark')) {
-                    document.documentElement.classList.remove('dark');
-                    localStorage.setItem('color-theme', 'light');
-                } else {
-                    document.documentElement.classList.add('dark');
-                    localStorage.setItem('color-theme', 'dark');
-                }
-            }
-
-        });
-        </script>
         </body>
     </html>

games/templates/components.yml

@@ -0,0 +1,3 @@
+components:
+  gamelink: "components/game_link.html"
+  popover: "components/popover.html"

games/templates/components/edit_button.html

@@ -0,0 +1,13 @@
+<a href="{{ edit_url }}">
+    <button type="button"
+            title="Edit"
+            class="ml-1 py-1 px-2 flex justify-center items-center bg-violet-600 hover:bg-violet-700 focus:ring-violet-500 focus:ring-offset-violet-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 w-7 h-4 rounded-lg">
+        <svg xmlns="http://www.w3.org/2000/svg"
+             viewBox="0 0 20 20"
+             fill="currentColor"
+             class="w-5 h-5">
+            <path d="M5.433 13.917l1.262-3.155A4 4 0 017.58 9.42l6.92-6.918a2.121 2.121 0 013 3l-6.92 6.918c-.383.383-.84.685-1.343.886l-3.154 1.262a.5.5 0 01-.65-.65z" />
+            <path d="M3.5 5.75c0-.69.56-1.25 1.25-1.25H10A.75.75 0 0010 3H4.75A2.75 2.75 0 002 5.75v9.5A2.75 2.75 0 004.75 18h9.5A2.75 2.75 0 0017 15.25V10a.75.75 0 00-1.5 0v5.25c0 .69-.56 1.25-1.25 1.25h-9.5c-.69 0-1.25-.56-1.25-1.25v-9.5z" />
+        </svg>
+    </button>
+</a>

games/templates/components/game_link.html

@@ -0,0 +1,9 @@
+<span class="truncate-container">
+    <a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'view_game' game_id %}">
+        {% if children %}
+            {{ children }}
+        {% else %}
+            {{ name }}
+        {% endif %}
+    </a>
+</span>

games/templates/components/popover.html

@@ -0,0 +1,9 @@
+<!-- needs data-popover-target on triggering block -->
+<!-- id -->
+<!-- children -->
+<div data-popover id="{{ id }}" role="tooltip" class="absolute z-10 invisible inline-block text-sm text-white transition-opacity duration-300 bg-white border border-purple-200 rounded-lg shadow-sm opacity-0 dark:text-white dark:border-purple-600 dark:bg-purple-800">
+    <div class="px-3 py-2">
+        {{ children }}
+    </div>
+    <div data-popper-arrow></div>
+</div>

games/templates/cotton/button.html

@@ -1,4 +0,0 @@
-<button type="button"
-        class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2 mt-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
-    {{ text }}
-</button>

games/templates/cotton/button_group_button_sm.html

@@ -1,20 +0,0 @@
-<c-vars color="gray" />
-<a href="{{ href }}"
-   class="[&:first-of-type_button]:rounded-s-lg [&:last-of-type_button]:rounded-e-lg">
-    {% if color == "gray" %}
-        <button type="button"
-                class="px-2 py-1 text-xs font-medium text-gray-900 bg-white border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white">
-            {{ text }}
-        </button>
-    {% elif color == "red" %}
-        <button type="button"
-                class="px-2 py-1 text-xs font-medium text-gray-900 bg-white border border-gray-200 hover:bg-red-500 hover:text-white focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:border-red-700 dark:hover:bg-red-700 dark:focus:ring-blue-500 dark:focus:text-white">
-            {{ text }}
-        </button>
-    {% elif color == "green" %}
-        <button type="button"
-                class="px-2 py-1 text-xs font-medium text-gray-900 bg-white border border-gray-200 hover:bg-green-500 hover:border-green-600 hover:text-white focus:z-10 focus:ring-2 focus:ring-green-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:border-green-700 dark:hover:bg-green-600 dark:focus:ring-green-500 dark:focus:text-white">
-            {{ text }}
-        </button>
-    {% endif %}
-</a>

games/templates/cotton/button_group_sm.html

@@ -1,6 +0,0 @@
-<c-vars color="gray" />
-<div class="inline-flex rounded-md shadow-sm" role="group">
-    {% for button in buttons %}
-        <c-button-group-button-sm :href=button.href :text=button.text :color=button.color />
-    {% endfor %}
-</div>

games/templates/cotton/gamelink.html

@@ -1,10 +0,0 @@
-<span class="truncate-container">
-    <a class="underline decoration-slate-500 sm:decoration-2"
-       href="{% url 'view_game' game_id %}">
-        {% if slot %}
-            {{ slot }}
-        {% else %}
-            {{ name }}
-        {% endif %}
-    </a>
-</span>

games/templates/cotton/h1.html

@@ -1,8 +0,0 @@
-<h1 class="{% if badge %}flex items-center {% endif %}mb-4 text-3xl font-extrabold leading-none tracking-tight text-gray-900 dark:text-white">
-    {{ slot }}
-    {% if badge %}
-        <span class="bg-blue-100 text-blue-800 text-2xl font-semibold me-2 px-2.5 py-0.5 rounded dark:bg-blue-200 dark:text-blue-800 ms-2">
-            {{ badge }}
-        </span>
-    {% endif %}
-</h1>

games/templates/cotton/popover.html

@@ -1,7 +0,0 @@
-<div data-popover
-     id="{{ id }}"
-     role="tooltip"
-     class="absolute z-10 invisible inline-block text-sm text-white transition-opacity duration-300 bg-white border border-purple-200 rounded-lg shadow-sm opacity-0 dark:text-white dark:border-purple-600 dark:bg-purple-800">
-    <div class="px-3 py-2">{{ slot }}</div>
-    <div data-popper-arrow></div>
-</div>

games/templates/cotton/simple_table.html

@@ -1,50 +0,0 @@
-{% load param_utils %}
-<div class="shadow-md sm:rounded-lg" hx-boost="false">
-    <div class="relative overflow-x-auto sm:rounded-lg">
-        <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-            <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
-                <tr>
-                    {% for column in columns %}<th scope="col" class="px-6 py-3">{{ column }}</th>{% endfor %}
-                </tr>
-            </thead>
-            <tbody>
-                {% for row in rows %}<c-table-row :data=row />{% endfor %}
-            </tbody>
-        </table>
-    </div>
-    {% if page_obj and elided_page_range %}
-        <nav class="flex items-center flex-column md:flex-row justify-between px-6 py-4"
-             aria-label="Table navigation">
-            <span class="text-sm font-normal text-gray-500 dark:text-gray-400 mb-4 md:mb-0 block w-full md:inline md:w-auto">Showing <span class="font-semibold text-gray-900 dark:text-white">{{ page_obj.start_index }}</span>—<span class="font-semibold text-gray-900 dark:text-white">{{ page_obj.end_index }}</span> of <span class="font-semibold text-gray-900 dark:text-white">{{ page_obj.paginator.count }}</span></span>
-            <ul class="inline-flex -space-x-px rtl:space-x-reverse text-sm h-8">
-                <li>
-                    {% if page_obj.has_previous %}
-                        <a href="?{% param_replace page=page_obj.previous_page_number %}"
-                           class="flex items-center justify-center px-3 h-8 ms-0 leading-tight text-gray-500 bg-white border border-gray-300 rounded-s-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">Previous</a>
-                    {% else %}
-                        <a aria-current="page"
-                           class="cursor-not-allowed flex items-center justify-center px-3 h-8 leading-tight text-gray-300 bg-white border border-gray-300 rounded-s-lg dark:bg-gray-800 dark:border-gray-700 dark:text-gray-600">Previous</a>
-                    {% endif %}
-                    {% for page in elided_page_range %}
-                        <li>
-                            {% if page != page_obj.number %}
-                                <a href="?{% param_replace page=page %}"
-                                   class="flex items-center justify-center px-3 h-8 leading-tight text-gray-500 bg-white border border-gray-300 hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">{{ page }}</a>
-                            {% else %}
-                                <a aria-current="page"
-                                   class="cursor-not-allowed flex items-center justify-center px-3 h-8 leading-tight text-white border bg-gray-400 border-gray-300 dark:bg-gray-900 dark:border-gray-700 dark:text-gray-200">{{ page }}</a>
-                            {% endif %}
-                        </li>
-                    {% endfor %}
-                    {% if page_obj.has_next %}
-                        <a href="?{% param_replace page=page_obj.next_page_number %}"
-                           class="flex items-center justify-center px-3 h-8 leading-tight text-gray-500 bg-white border border-gray-300 rounded-e-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">Next</a>
-                    {% else %}
-                        <a aria-current="page"
-                           class="cursor-not-allowed flex items-center justify-center px-3 h-8 leading-tight text-gray-300 bg-white border border-gray-300 rounded-e-lg dark:bg-gray-800 dark:border-gray-700 dark:text-gray-600">Next</a>
-                    {% endif %}
-                </li>
-            </ul>
-        </nav>
-    {% endif %}
-</div>

games/templates/cotton/table.html

@@ -1,12 +0,0 @@
-<div class="relative overflow-x-auto shadow-md sm:rounded-lg">
-    <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-        <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
-            <tr>
-                {% for column in columns %}<th scope="col" class="px-6 py-3">{{ column }}</th>{% endfor %}
-            </tr>
-        </thead>
-        <tbody>
-            {{ slot }}
-        </tbody>
-    </table>
-</div>

games/templates/cotton/table_row.html

@@ -1,16 +0,0 @@
-<tr class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 border-b">
-    {% if slot %}
-        {{ slot }}
-    {% else %}
-        {% for td in data %}
-            {% if forloop.first %}
-                <th scope="row"
-                    class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">{{ td }}</th>
-            {% else %}
-                <c-table-td>
-                {{ td }}
-                </c-table-td>
-            {% endif %}
-        {% endfor %}
-    {% endif %}
-</tr>

games/templates/cotton/table_td.html

@@ -1 +0,0 @@
-<td class="px-6 py-4 min-w-20-char max-w-20-char">{{ slot }}</td>

games/templates/list_purchases.html

@@ -1,10 +0,0 @@
-{% extends "base.html" %}
-{% load static %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
-{% block content %}
-    <div class="2xl:max-w-screen-2xl md:max-w-screen-md sm:max-w-screen-sm self-center">
-        <c-simple-table :columns=data.columns :rows=data.rows :page_obj=page_obj :elided_page_range=elided_page_range />
-    </div>
-{% endblock content %}

games/templates/list_sessions.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
 {% load static %}
 {% block title %}
     {{ title }}
@@ -15,7 +15,7 @@
                    hx-target=".responsive-table tbody"
                    onClick="document.querySelector('#last-session-start').classList.add('invisible')"
                    class="{% if last.timestamp_end == null %}invisible{% endif %}">
-                    {% include "components/button_start.html" with text=last.purchase title="Start session of last played game" only %}
+                    {% include 'components/button_start.html' with text=last.purchase title="Start session of last played game" only %}
                 </a>
             </div>
         {% endif %}
@@ -35,8 +35,7 @@
                             <tr>
                                 <td class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name relative align-top w-24 h-12 group">
                                     <span class="inline-block relative">
-                                    <a class="underline decoration-slate-500 sm:decoration-2 inline-block truncate max-w-20char group-hover:absolute group-hover:max-w-none group-hover:-top-8 group-hover:-left-6 group-hover:min-w-60 group-hover:px-6 group-hover:py-3.5 group-hover:bg-purple-600 group-hover:rounded-sm group-hover:outline-dashed group-hover:outline-purple-400 group-hover:outline-4 group-hover:decoration-purple-900 group-hover:text-purple-100"
+                                        <a class="underline decoration-slate-500 sm:decoration-2 inline-block truncate max-w-20char group-hover:absolute group-hover:max-w-none group-hover:-top-8 group-hover:-left-6 group-hover:min-w-60 group-hover:px-6 group-hover:py-3.5 group-hover:bg-purple-600 group-hover:rounded-sm group-hover:outline-dashed group-hover:outline-purple-400 group-hover:outline-4 group-hover:decoration-purple-900 group-hover:text-purple-100" href="{% url 'view_game' session.purchase.edition.game.id %}">
-                                       href="{% url 'view_game' session.purchase.edition.game.id %}">
                                             {{ session.purchase.edition.name }}
                                         </a>
                                     </span>

games/templates/navbar.html

@@ -1,136 +0,0 @@
-{% load static %}
-<nav class="bg-white border-gray-200 dark:bg-gray-900 dark:border-gray-700">
-    <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
-        <a href="{% url 'index' %}"
-           class="flex items-center space-x-3 rtl:space-x-reverse">
-            <img src="{% static 'icons/schedule.png' %}"
-                 height="48"
-                 width="48"
-                 alt="Timetracker Logo"
-                 class="mr-4" />
-            <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">Timetracker</span>
-        </a>
-        <button data-collapse-toggle="navbar-dropdown"
-                type="button"
-                class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg md:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600"
-                aria-controls="navbar-dropdown"
-                aria-expanded="false">
-            <span class="sr-only">Open main menu</span>
-            <svg class="w-5 h-5"
-                 aria-hidden="true"
-                 xmlns="http://www.w3.org/2000/svg"
-                 fill="none"
-                 viewBox="0 0 17 14">
-                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15" />
-            </svg>
-        </button>
-        <div class="hidden w-full md:block md:w-auto" id="navbar-dropdown">
-            <ul class="flex flex-col font-medium p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700">
-                <li>
-                    <a href="#"
-                       class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500 dark:bg-blue-600 md:dark:bg-transparent"
-                       aria-current="page">Home</a>
-                </li>
-                <li>
-                    <button id="dropdownNavbarNewLink"
-                            data-dropdown-toggle="dropdownNavbarNew"
-                            class="flex items-center justify-between w-full py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 md:w-auto dark:text-white md:dark:hover:text-blue-500 dark:focus:text-white dark:border-gray-700 dark:hover:bg-gray-700 md:dark:hover:bg-transparent">
-                        New
-                        <svg class="w-2.5 h-2.5 ms-2.5"
-                             aria-hidden="true"
-                             xmlns="http://www.w3.org/2000/svg"
-                             fill="none"
-                             viewBox="0 0 10 6">
-                            <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" />
-                        </svg>
-                    </button>
-                    <!-- Dropdown menu -->
-                    <div id="dropdownNavbarNew"
-                         class="z-10 hidden font-normal bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700 dark:divide-gray-600">
-                        <ul class="py-2 text-sm text-gray-700 dark:text-gray-400"
-                            aria-labelledby="dropdownLargeButton">
-                            <li>
-                                <a href="{% url 'add_device' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Device</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'add_game' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Game</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'add_edition' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Edition</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'add_platform' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Platform</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'add_purchase' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Purchase</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'add_session' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Session</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li>
-                    <button id="dropdownNavbarManageLink"
-                            data-dropdown-toggle="dropdownNavbarManage"
-                            class="flex items-center justify-between w-full py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 md:w-auto dark:text-white md:dark:hover:text-blue-500 dark:focus:text-white dark:border-gray-700 dark:hover:bg-gray-700 md:dark:hover:bg-transparent">
-                        Manage
-                        <svg class="w-2.5 h-2.5 ms-2.5"
-                             aria-hidden="true"
-                             xmlns="http://www.w3.org/2000/svg"
-                             fill="none"
-                             viewBox="0 0 10 6">
-                            <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" />
-                        </svg>
-                    </button>
-                    <!-- Dropdown menu -->
-                    <div id="dropdownNavbarManage"
-                         class="z-10 hidden font-normal bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700 dark:divide-gray-600">
-                        <ul class="py-2 text-sm text-gray-700 dark:text-gray-400"
-                            aria-labelledby="dropdownLargeButton">
-                            <li>
-                                <a href="{% url 'list_devices' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Devices</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'list_games' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Games</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'list_editions' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Editions</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'list_platforms' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Platforms</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'list_purchases' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Purchases</a>
-                            </li>
-                            <li>
-                                <a href="{% url 'list_sessions' %}"
-                                   class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">Sessions</a>
-                            </li>
-                        </ul>
-                    </div>
-                </li>
-                <li>
-                    <a href="{% url 'stats_by_year' 0 %}"
-                       class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent">Stats</a>
-                </li>
-                <li>
-                    <a href="{% url 'logout' %}"
-                       class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent">Log
-                    out</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</nav>

games/templates/registration/login.html

@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load static %}
+
 {% block title %}
     Login
 {% endblock title %}

games/templates/stats.html

@@ -3,15 +3,17 @@
     {{ title }}
 {% endblock title %}
 {% load static %}
+
 {% partialdef purchase-name %}
     {% if purchase.type != 'game' %}
-    <c-gamelink :game_id=purchase.edition.game.id>
+        {% #gamelink game_id=purchase.edition.game.id %}
             {{ purchase.name }} ({{ purchase.edition.name }} {{ purchase.get_type_display }})
-    </c-gamelink>
+        {% /gamelink %}
     {% else %}
-    <c-gamelink :game_id=purchase.edition.game.id name=purchase.edition.name />
+        {% gamelink game_id=purchase.edition.game.id name=purchase.edition.name %}
     {% endif %}
 {% endpartialdef %}
+
 {% block content %}
     <div class="dark:text-white max-w-sm sm:max-w-xl lg:max-w-3xl mx-auto">
         <div class="flex justify-center items-center">
@@ -64,36 +66,29 @@
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Longest session</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ longest_session_time }} ({% gamelink game_id=longest_session_game.id name=longest_session_game.name %})</td>
-                        {{ longest_session_time }} (<c-gamelink :game_id=longest_session_game.id :name=longest_session_game.name />)
-                    </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Most sessions</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ highest_session_count }} ({% gamelink game_id=highest_session_count_game.id name=highest_session_count_game.name %})</td>
-                        {{ highest_session_count }} (<c-gamelink :game_id=highest_session_count_game.id :name=highest_session_count_game.name />)
-                    </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Highest session average</td>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ highest_session_average }} (<c-gamelink :game_id=highest_session_average_game.id :name=highest_session_average_game.name />)
+                        {{ highest_session_average }} ({% gamelink game_id=highest_session_average_game.id name=highest_session_average_game.name %})
                     </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">First play</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% gamelink game_id=first_play_game.id name=first_play_game.name %} ({{ first_play_date }})</td>
-                        <c-gamelink :game_id=first_play_game.id :name=first_play_game.name /> ({{ first_play_date }})
-                    </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Last play</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% gamelink game_id=last_play_game.id name=last_play_game.name %} ({{ last_play_date }})</td>
-                        <c-gamelink :game_id=last_play_game.id :name=last_play_game.name /> ({{ last_play_date }})
-                    </td>
                 </tr>
             </tbody>
         </table>
+
         {% if month_playtime %}
             <h1 class="text-5xl text-center my-6">Playtime per month</h1>
             <table class="responsive-table">
@@ -107,6 +102,7 @@
                 </tbody>
             </table>
         {% endif %}
+
         <h1 class="text-5xl text-center my-6">Purchases</h1>
         <table class="responsive-table">
             <tbody>
@@ -122,7 +118,9 @@
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Dropped</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ dropped_count }} ({{ dropped_percentage }}%)</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                        {{ dropped_count }} ({{ dropped_percentage }}%)
+                    </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Unfinished</td>
@@ -152,7 +150,7 @@
                 {% for game in top_10_games_by_playtime %}
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            <c-gamelink :game_id=game.id :name=game.name />
+                            {% gamelink game_id=game.id name=game.name %}
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
                     </tr>
@@ -176,6 +174,7 @@
                 {% endfor %}
             </tbody>
         </table>
+
         {% if all_finished_this_year %}
             <h1 class="text-5xl text-center my-6">Finished</h1>
             <table class="responsive-table">
@@ -188,13 +187,16 @@
                 <tbody>
                     {% for purchase in all_finished_this_year %}
                         <tr>
-                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% partial purchase-name %}</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
                             <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
                         </tr>
                     {% endfor %}
                 </tbody>
             </table>
         {% endif %}
+
         {% if this_year_finished_this_year %}
             <h1 class="text-5xl text-center my-6">Finished ({{ year }} games)</h1>
             <table class="responsive-table">
@@ -207,13 +209,16 @@
                 <tbody>
                     {% for purchase in this_year_finished_this_year %}
                         <tr>
-                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% partial purchase-name %}</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
                             <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
                         </tr>
                     {% endfor %}
                 </tbody>
             </table>
         {% endif %}
+
         {% if purchased_this_year_finished_this_year %}
             <h1 class="text-5xl text-center my-6">Bought and Finished ({{ year }})</h1>
             <table class="responsive-table">
@@ -226,13 +231,16 @@
                 <tbody>
                     {% for purchase in purchased_this_year_finished_this_year %}
                         <tr>
-                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% partial purchase-name %}</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
                             <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
                         </tr>
                     {% endfor %}
                 </tbody>
             </table>
         {% endif %}
+
         {% if purchased_unfinished %}
             <h1 class="text-5xl text-center my-6">Unfinished Purchases</h1>
             <table class="responsive-table">
@@ -246,7 +254,9 @@
                 <tbody>
                     {% for purchase in purchased_unfinished %}
                         <tr>
-                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% partial purchase-name %}</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
                             <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
                             <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
                         </tr>
@@ -254,6 +264,7 @@
                 </tbody>
             </table>
         {% endif %}
+
         {% if all_purchased_this_year %}
             <h1 class="text-5xl text-center my-6">All Purchases</h1>
             <table class="responsive-table">
@@ -267,7 +278,9 @@
                 <tbody>
                     {% for purchase in all_purchased_this_year %}
                         <tr>
-                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% partial purchase-name %}</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
                             <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
                             <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
                         </tr>

games/templates/view_game.html

@@ -10,98 +10,151 @@
             <div class="flex gap-5 mb-3">
                 <span class="text-wrap max-w-80 text-4xl">
                     <span class="font-bold font-serif">{{ game.name }}</span>&nbsp;<span data-popover-target="popover-year" class="text-slate-500 text-2xl">{{ game.year_released }}</span>
-                    <c-popover id="popover-year">
+                    {% #popover id="popover-year" %}
                         Original release year
-                    </c-popover>
+                    {% /popover %}
                 </span>
             </div>
             <div class="flex gap-4 dark:text-slate-400 mb-3">
                 <span data-popover-target="popover-hours" class="flex gap-2 items-center">
-                    <svg xmlns="http://www.w3.org/2000/svg"
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                         fill="none"
-                         viewBox="0 0 24 24"
-                         stroke-width="1.5"
-                         stroke="currentColor"
-                         class="size-6">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
                     </svg>
                     {{ hours_sum }}
-                    <c-popover id="popover-hours">
+                    {% #popover id="popover-hours" %}
                         Total hours played
-                    </c-popover>
+                    {% /popover %}
                 </span>
-                <span data-popover-target="popover-sessions"
+                <span data-popover-target="popover-sessions" class="flex gap-2 items-center">
-                      class="flex gap-2 items-center">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                    <svg xmlns="http://www.w3.org/2000/svg"
-                         fill="none"
-                         viewBox="0 0 24 24"
-                         stroke-width="1.5"
-                         stroke="currentColor"
-                         class="size-6">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 8.25h15m-16.5 7.5h15m-1.8-13.5-3.9 19.5m-2.1-19.5-3.9 19.5" />
                     </svg>
                     {{ session_count }}
-                    <c-popover id="popover-sessions">
+                    {% #popover id="popover-sessions" %}
                         Number of sessions
-                    </c-popover>
+                    {% /popover %}
                 </span>
                 <span data-popover-target="popover-average" class="flex gap-2 items-center">
-                    <svg xmlns="http://www.w3.org/2000/svg"
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                         fill="none"
-                         viewBox="0 0 24 24"
-                         stroke-width="1.5"
-                         stroke="currentColor"
-                         class="size-6">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M7.5 14.25v2.25m3-4.5v4.5m3-6.75v6.75m3-9v9M6 20.25h12A2.25 2.25 0 0 0 20.25 18V6A2.25 2.25 0 0 0 18 3.75H6A2.25 2.25 0 0 0 3.75 6v12A2.25 2.25 0 0 0 6 20.25Z" />
                     </svg>
                     {{ session_average_without_manual }}
-                    <c-popover id="popover-average">
+                    {% #popover id="popover-average" %}
                         Average playtime per session
-                    </c-popover>
+                    {% /popover %}
                 </span>
-                <span data-popover-target="popover-playrange"
+                <span data-popover-target="popover-playrange" class="flex gap-2 items-center">
-                      class="flex gap-2 items-center">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                    <svg xmlns="http://www.w3.org/2000/svg"
-                         fill="none"
-                         viewBox="0 0 24 24"
-                         stroke-width="1.5"
-                         stroke="currentColor"
-                         class="size-6">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 0 1 2.25-2.25h13.5A2.25 2.25 0 0 1 21 7.5v11.25m-18 0A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75m-18 0v-7.5A2.25 2.25 0 0 1 5.25 9h13.5A2.25 2.25 0 0 1 21 11.25v7.5m-9-6h.008v.008H12v-.008ZM12 15h.008v.008H12V15Zm0 2.25h.008v.008H12v-.008ZM9.75 15h.008v.008H9.75V15Zm0 2.25h.008v.008H9.75v-.008ZM7.5 15h.008v.008H7.5V15Zm0 2.25h.008v.008H7.5v-.008Zm6.75-4.5h.008v.008h-.008v-.008Zm0 2.25h.008v.008h-.008V15Zm0 2.25h.008v.008h-.008v-.008Zm2.25-4.5h.008v.008H16.5v-.008Zm0 2.25h.008v.008H16.5V15Z" />
                     </svg>
                     {{ playrange }}
-                    <c-popover id="popover-playrange">
+                    {% #popover id="popover-playrange" %}
                         Earliest and latest dates played
-                    </c-popover>
+                    {% /popover %}
                 </span>
             </div>
             <div class="inline-flex rounded-md shadow-sm mb-3" role="group">
                 <a href="{% url 'edit_game' game.id %}">
-                    <button type="button"
+                    <button type="button" class="px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-s-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white">
-                            class="px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-s-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white">
                         Edit
                     </button>
                 </a>
                 <a href="{% url 'delete_game' game.id %}">
-                    <button type="button"
+                    <button type="button" class="px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-e-lg hover:bg-red-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-red-700 dark:focus:ring-blue-500 dark:focus:text-white">
-                            class="px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-e-lg hover:bg-red-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-red-700 dark:focus:ring-blue-500 dark:focus:text-white">
                         Delete
                     </button>
                 </a>
             </div>
         </div>
-        <c-h1 :badge=edition_count>Editions</c-h1>
+
-        <div class="mb-6">
+        <h1 class="text-3xl mt-4 mb-1 font-condensed">
-            <c-simple-table :rows=edition_data.rows :columns=edition_data.columns />
+            Editions <span class="dark:text-slate-500">({{ edition_count }})</span> and Purchases <span class="dark:text-slate-500">({{ purchase_count }})</span>
-        </div>
+        </h1>
-        <div class="mb-6">
+        <ul>
-            <c-h1 :badge=purchase_count>Purchases</c-h1>
+            {% for edition in editions %}
-            <c-simple-table :rows=purchase_data.rows :columns=purchase_data.columns />
+                <li class="sm:pl-2 flex items-center">
-        </div>
+                    {{ edition.name }} ({{ edition.platform }}, {{ edition.year_released }})
-        <div class="mb-6">
+                    {% if edition.wikidata %}
-            <c-h1 :badge=session_count>Sessions</c-h1>
+                        <span class="hidden sm:inline">
-            <c-simple-table :rows=session_data.rows :columns=session_data.columns :page_obj=session_page_obj :elided_page_range=session_elided_page_range />
+                            <a href="https://www.wikidata.org/wiki/{{ edition.wikidata }}">
+                                <img class="inline mx-2 w-6" src="{% static 'icons/wikidata.png' %}" />
+                            </a>
+                        </span>
+                    {% endif %}
+                    {% url 'edit_edition' edition.id as edit_url %}
+                    {% include 'components/edit_button.html' with edit_url=edit_url %}
+                </li>
+                <ul>
+                    {% for purchase in edition.game_purchases %}
+                        <li class="sm:pl-6 flex items-center {% if purchase.date_refunded %}text-red-600{% endif %}">
+                            {{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}
+                            {% if purchase.price != 0 %}({{ purchase.price }} {{ purchase.price_currency }}){% endif %}
+                            {% url 'edit_purchase' purchase.id as edit_url %}
+                            {% include 'components/edit_button.html' with edit_url=edit_url %}
+                        </li>
+                        <ul>
+                            {% for related_purchase in purchase.nongame_related_purchases %}
+                                <li class="sm:pl-12 flex items-center">
+                                    {{ related_purchase.name }} ({{ related_purchase.get_type_display }}, {{ purchase.platform }}, {{ related_purchase.date_purchased | date:"Y" }}, {{ related_purchase.price }} {{ related_purchase.price_currency }})
+                                    {% url 'edit_purchase' related_purchase.id as edit_url %}
+                                    {% include 'components/edit_button.html' with edit_url=edit_url %}
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    {% endfor %}
+                </ul>
+            {% endfor %}
+        </ul>
+        <h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center font-condensed">
+            Sessions
+            <span class="dark:text-slate-500" id="session-count">({{ session_count }})</span>
+            {% if latest_session_id %}
+                {% url 'view_game_start_session_from_session' latest_session_id as add_session_link %}
+                <a
+                    class="truncate max-w-xs py-1 px-2 text-xs bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-sm"
+                    title="Start new session"
+                    href="{{ add_session_link }}"
+                    hx-get="{{ add_session_link }}"
+                    hx-vals="js:{session_count:getSessionCount()}"
+                    hx-target="#session-list"
+                    hx-swap="afterbegin"
+                >New</a>
+            {% endif %}
+            and Notes <span class="dark:text-slate-500">({{ sessions_with_notes_count }})</span>
+        </h1>
+        <ul id="session-list">
+            {% for session in sessions %}
+                {% partialdef session-info inline=True %}
+                    <li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center space-x-1">
+                        {{ session.timestamp_start | date:"d/m/Y H:i" }}{% if session.timestamp_end %}-{{ session.timestamp_end | date:"H:i" }}{% endif %}
+                        ({{ session.device.get_type_display | default:"Unknown" }}, {{ session.duration_formatted }})
+                        {% url 'edit_session' session.id as edit_url %}
+                        {% include 'components/edit_button.html' with edit_url=edit_url %}
+                        {% if not session.timestamp_end %}
+                            {% url 'view_game_end_session' session.id as end_session_url %}
+                            <a
+                                class="flex bg-green-600 rounded-full px-2 w-7 h-4 text-white justify-center items-center"
+                                href="{{ end_session_url }}"
+                                hx-get="{{ end_session_url }}"
+                                hx-target="closest li"
+                                hx-swap="outerHTML"
+                                hx-vals="js:{session_count:getSessionCount()}"
+                                hx-indicator="#indicator"
+                            >
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="#ffffff" class="h-3" x="0px" y="0px" viewBox="0 0 24 24">
+                                    <path d="M 12 2 C 6.486 2 2 6.486 2 12 C 2 17.514 6.486 22 12 22 C 17.514 22 22 17.514 22 12 C 22 10.874 21.803984 9.7942031 21.458984 8.7832031 L 19.839844 10.402344 C 19.944844 10.918344 20 11.453 20 12 C 20 16.411 16.411 20 12 20 C 7.589 20 4 16.411 4 12 C 4 7.589 7.589 4 12 4 C 13.633 4 15.151922 4.4938906 16.419922 5.3378906 L 17.851562 3.90625 C 16.203562 2.71225 14.185 2 12 2 z M 21.292969 3.2929688 L 11 13.585938 L 7.7070312 10.292969 L 6.2929688 11.707031 L 11 16.414062 L 22.707031 4.7070312 L 21.292969 3.2929688 z"></path>
+                                </svg>
+                            </a>
+
+                        {% endif %}
+                    </li>
+                    <li class="sm:pl-4 markdown-content">{{ session.note|markdown }}</li>
+                    <div class="hidden" hx-swap-oob="innerHTML:#session-count">
+                        ({{ session_count }})
                     </div>
+                {% endpartialdef %}
+            {% endfor %}
+        </ul>
     </div>
     <script>
         function getSessionCount() {

games/templatetags/markdown_extras.py

@@ -1,6 +1,6 @@
-import markdown
 from django import template
 from django.utils.safestring import mark_safe
+import markdown
 
 register = template.Library()
 

games/templatetags/param_utils.py

@@ -1,18 +0,0 @@
-from typing import Any
-
-from django import template
-from django.http import QueryDict
-
-register = template.Library()
-
-
-@register.simple_tag(takes_context=True)
-def param_replace(context: dict[Any, Any], **kwargs):
-    """
-    Return encoded URL parameters that are the same as the current
-    request's parameters, only with the specified GET parameters added or changed.
-    """
-    d: QueryDict = context["request"].GET.copy()
-    for k, v in kwargs.items():
-        d[k] = v
-    return d.urlencode()

games/templatetags/randomid.py

@@ -1,11 +0,0 @@
-import random
-import string
-
-from django import template
-
-register = template.Library()
-
-
-@register.simple_tag
-def randomid(seed: str = "") -> str:
-    return str(hash(seed + "".join(random.choices(string.ascii_lowercase, k=10))))

games/urls.py

@@ -1,110 +1,117 @@
 from django.urls import path
 
-from games.views import device, edition, game, general, platform, purchase, session
+from games import views
 
 urlpatterns = [
-    path("", general.index, name="index"),
+    path("", views.index, name="index"),
-    path("device/add", device.add_device, name="add_device"),
+    path("device/add", views.add_device, name="add_device"),
-    path("device/delete/<int:device_id>", device.delete_device, name="delete_device"),
+    path("edition/add", views.add_edition, name="add_edition"),
-    path("device/edit/<int:device_id>", device.edit_device, name="edit_device"),
-    path("device/list", device.list_devices, name="list_devices"),
-    path("edition/add", edition.add_edition, name="add_edition"),
     path(
         "edition/add/for-game/<int:game_id>",
-        edition.add_edition,
+        views.add_edition,
         name="add_edition_for_game",
     ),
-    path("edition/<int:edition_id>/edit", edition.edit_edition, name="edit_edition"),
+    path("edition/<int:edition_id>/edit", views.edit_edition, name="edit_edition"),
-    path("edition/list", edition.list_editions, name="list_editions"),
+    path("game/add", views.add_game, name="add_game"),
-    path(
+    path("game/<int:game_id>/edit", views.edit_game, name="edit_game"),
-        "edition/<int:edition_id>/delete",
+    path("game/<int:game_id>/view", views.view_game, name="view_game"),
-        edition.delete_edition,
+    path("game/<int:game_id>/delete", views.delete_game, name="delete_game"),
-        name="delete_edition",
+    path("platform/add", views.add_platform, name="add_platform"),
-    ),
+    path("platform/<int:platform_id>/edit", views.edit_platform, name="edit_platform"),
-    path("game/add", game.add_game, name="add_game"),
+    path("purchase/add", views.add_purchase, name="add_purchase"),
-    path("game/<int:game_id>/edit", game.edit_game, name="edit_game"),
+    path("purchase/<int:purchase_id>/edit", views.edit_purchase, name="edit_purchase"),
-    path("game/<int:game_id>/view", game.view_game, name="view_game"),
-    path("game/<int:game_id>/delete", game.delete_game, name="delete_game"),
-    path("game/list", game.list_games, name="list_games"),
-    path("platform/add", platform.add_platform, name="add_platform"),
-    path(
-        "platform/<int:platform_id>/edit",
-        platform.edit_platform,
-        name="edit_platform",
-    ),
-    path(
-        "platform/<int:platform_id>/delete",
-        platform.delete_platform,
-        name="delete_platform",
-    ),
-    path("platform/list", platform.list_platforms, name="list_platforms"),
-    path("purchase/add", purchase.add_purchase, name="add_purchase"),
-    path(
-        "purchase/<int:purchase_id>/edit",
-        purchase.edit_purchase,
-        name="edit_purchase",
-    ),
     path(
         "purchase/<int:purchase_id>/delete",
-        purchase.delete_purchase,
+        views.delete_purchase,
         name="delete_purchase",
     ),
-    path(
-        "purchase/list",
-        purchase.list_purchases,
-        name="list_purchases",
-    ),
     path(
         "purchase/related-purchase-by-edition",
-        purchase.related_purchase_by_edition,
+        views.related_purchase_by_edition,
         name="related_purchase_by_edition",
     ),
     path(
         "purchase/add/for-edition/<int:edition_id>",
-        purchase.add_purchase,
+        views.add_purchase,
         name="add_purchase_for_edition",
     ),
-    path("session/add", session.add_session, name="add_session"),
+    path("session/add", views.add_session, name="add_session"),
     path(
         "session/add/for-purchase/<int:purchase_id>",
-        session.add_session,
+        views.add_session,
         name="add_session_for_purchase",
     ),
     path(
         "session/add/from-game/<int:session_id>",
-        session.new_session_from_existing_session,
+        views.new_session_from_existing_session,
         {"template": "view_game.html#session-info"},
         name="view_game_start_session_from_session",
     ),
     path(
         "session/add/from-list/<int:session_id>",
-        session.new_session_from_existing_session,
+        views.new_session_from_existing_session,
         {"template": "list_sessions.html#session-row"},
         name="list_sessions_start_session_from_session",
     ),
-    path("session/<int:session_id>/edit", session.edit_session, name="edit_session"),
+    path("session/<int:session_id>/edit", views.edit_session, name="edit_session"),
     path(
         "session/<int:session_id>/delete",
-        session.delete_session,
+        views.delete_session,
         name="delete_session",
     ),
     path(
         "session/end/from-game/<int:session_id>",
-        session.end_session,
+        views.end_session,
         {"template": "view_game.html#session-info"},
         name="view_game_end_session",
     ),
     path(
         "session/end/from-list/<int:session_id>",
-        session.end_session,
+        views.end_session,
         {"template": "list_sessions.html#session-row"},
         name="list_sessions_end_session",
     ),
-    path("session/list", session.list_sessions, name="list_sessions"),
+    path("session/list", views.list_sessions, name="list_sessions"),
-    path("stats/", general.stats_alltime, name="stats_alltime"),
+    path(
+        "session/list/recent",
+        views.list_sessions,
+        {"filter": "recent"},
+        name="list_sessions_recent",
+    ),
+    path(
+        "session/list/by-purchase/<int:purchase_id>",
+        views.list_sessions,
+        {"filter": "purchase"},
+        name="list_sessions_by_purchase",
+    ),
+    path(
+        "session/list/by-platform/<int:platform_id>",
+        views.list_sessions,
+        {"filter": "platform"},
+        name="list_sessions_by_platform",
+    ),
+    path(
+        "session/list/by-game/<int:game_id>",
+        views.list_sessions,
+        {"filter": "game"},
+        name="list_sessions_by_game",
+    ),
+    path(
+        "session/list/by-edition/<int:edition_id>",
+        views.list_sessions,
+        {"filter": "edition"},
+        name="list_sessions_by_edition",
+    ),
+    path(
+        "session/list/by-ownership/<str:ownership_type>",
+        views.list_sessions,
+        {"filter": "ownership_type"},
+        name="list_sessions_by_ownership_type",
+    ),
+    path("stats/", views.stats_alltime, name="stats_alltime"),
     path(
         "stats/<int:year>",
-        general.stats,
+        views.stats,
         name="stats_by_year",
     ),
 ]

games/views.py

@@ -1,25 +1,45 @@
+from datetime import datetime
 from typing import Any, Callable
 
 from django.contrib.auth.decorators import login_required
-from django.db.models import Avg, Count, ExpressionWrapper, F, Q, Sum, fields
+
+from django.db.models import (
+    Avg,
+    Count,
+    ExpressionWrapper,
+    F,
+    Prefetch,
+    Q,
+    Sum,
+    fields,
+)
 from django.db.models.functions import TruncDate, TruncMonth
-from django.db.models.manager import BaseManager
+from django.http import (
-from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
+    HttpRequest,
+    HttpResponse,
+    HttpResponseBadRequest,
+    HttpResponseRedirect,
+)
 from django.shortcuts import redirect, render
 from django.urls import reverse
+from django.utils import timezone
+from django.shortcuts import get_object_or_404
 
 from common.time import format_duration
-from common.utils import safe_division
+from common.utils import safe_division, safe_getattr
-from games.models import Edition, Game, Platform, Purchase, Session
 
-dateformat: str = "%d/%m/%Y"
+from .forms import (
-datetimeformat: str = "%d/%m/%Y %H:%M"
+    DeviceForm,
-timeformat: str = "%H:%M"
+    EditionForm,
-durationformat: str = "%2.1H hours"
+    GameForm,
-durationformat_manual: str = "%H hours"
+    PlatformForm,
+    PurchaseForm,
+    SessionForm,
+)
+from .models import Edition, Game, Platform, Purchase, Session
 
 
-def model_counts(request: HttpRequest) -> dict[str, bool]:
+def model_counts(request):
     return {
         "game_available": Game.objects.exists(),
         "edition_available": Edition.objects.exists(),
@@ -29,8 +49,44 @@ def model_counts(request: HttpRequest) -> dict[str, bool]:
     }
 
 
+def stats_dropdown_year_range(request):
+    result = {"stats_dropdown_year_range": range(timezone.now().year, 1999, -1)}
+    return result
+
+
+@login_required
+def add_session(request, purchase_id=None):
+    context = {}
+    initial = {"timestamp_start": timezone.now()}
+
+    last = Session.objects.last()
+    if last != None:
+        initial["purchase"] = last.purchase
+
+    if request.method == "POST":
+        form = SessionForm(request.POST or None, initial=initial)
+        if form.is_valid():
+            form.save()
+            return redirect("list_sessions")
+    else:
+        if purchase_id:
+            purchase = Purchase.objects.get(id=purchase_id)
+            form = SessionForm(
+                initial={
+                    **initial,
+                    "purchase": purchase,
+                }
+            )
+        else:
+            form = SessionForm(initial=initial)
+
+    context["title"] = "Add New Session"
+    context["form"] = form
+    return render(request, "add_session.html", context)
+
+
 def use_custom_redirect(
-    func: Callable[..., HttpResponse],
+    func: Callable[..., HttpResponse]
 ) -> Callable[..., HttpResponse]:
     """
     Will redirect to "return_path" session variable if set.
@@ -48,7 +104,268 @@ def use_custom_redirect(
 
 
 @login_required
-def stats_alltime(request: HttpRequest) -> HttpResponse:
+@use_custom_redirect
+def edit_session(request, session_id=None):
+    context = {}
+    session = Session.objects.get(id=session_id)
+    form = SessionForm(request.POST or None, instance=session)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Session"
+    context["form"] = form
+    return render(request, "add_session.html", context)
+
+
+@login_required
+@use_custom_redirect
+def edit_purchase(request, purchase_id=None):
+    context = {}
+    purchase = Purchase.objects.get(id=purchase_id)
+    form = PurchaseForm(request.POST or None, instance=purchase)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Purchase"
+    context["form"] = form
+    context["purchase_id"] = purchase_id
+    context["script_name"] = "add_purchase.js"
+    return render(request, "add_purchase.html", context)
+
+
+@login_required
+@use_custom_redirect
+def edit_game(request, game_id=None):
+    context = {}
+    purchase = Game.objects.get(id=game_id)
+    form = GameForm(request.POST or None, instance=purchase)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Game"
+    context["form"] = form
+    return render(request, "add.html", context)
+
+
+@login_required
+def delete_game(request, game_id=None):
+    game = get_object_or_404(Game, id=game_id)
+    game.delete()
+    return redirect("list_sessions")
+
+
+@login_required
+def view_game(request, game_id=None):
+    game = Game.objects.get(id=game_id)
+    nongame_related_purchases_prefetch = Prefetch(
+        "related_purchases",
+        queryset=Purchase.objects.exclude(type=Purchase.GAME).order_by(
+            "date_purchased"
+        ),
+        to_attr="nongame_related_purchases",
+    )
+    game_purchases_prefetch = Prefetch(
+        "purchase_set",
+        queryset=Purchase.objects.filter(type=Purchase.GAME).prefetch_related(
+            nongame_related_purchases_prefetch
+        ),
+        to_attr="game_purchases",
+    )
+    editions = (
+        Edition.objects.filter(game=game)
+        .prefetch_related(game_purchases_prefetch)
+        .order_by("year_released")
+    )
+
+    sessions = Session.objects.prefetch_related("device").filter(
+        purchase__edition__game=game
+    )
+    session_count = sessions.count()
+    session_count_without_manual = (
+        Session.objects.without_manual().filter(purchase__edition__game=game).count()
+    )
+
+    if sessions:
+        playrange_start = sessions.earliest().timestamp_start.strftime("%b %Y")
+        latest_session = sessions.latest()
+        playrange_end = latest_session.timestamp_start.strftime("%b %Y")
+
+        playrange = (
+            playrange_start
+            if playrange_start == playrange_end
+            else f"{playrange_start} — {playrange_end}"
+        )
+    else:
+        playrange = "N/A"
+        latest_session = None
+
+    total_hours = float(format_duration(sessions.total_duration_unformatted(), "%2.1H"))
+    total_hours_without_manual = float(
+        format_duration(sessions.calculated_duration_unformatted(), "%2.1H")
+    )
+    context = {
+        "edition_count": editions.count(),
+        "editions": editions,
+        "game": game,
+        "playrange": playrange,
+        "purchase_count": Purchase.objects.filter(edition__game=game).count(),
+        "session_average_without_manual": round(
+            safe_division(
+                total_hours_without_manual, int(session_count_without_manual)
+            ),
+            1,
+        ),
+        "session_count": session_count,
+        "sessions_with_notes_count": sessions.exclude(note="").count(),
+        "sessions": sessions.order_by("-timestamp_start"),
+        "title": f"Game Overview - {game.name}",
+        "hours_sum": total_hours,
+        "latest_session_id": safe_getattr(latest_session, "pk"),
+    }
+
+    request.session["return_path"] = request.path
+    return render(request, "view_game.html", context)
+
+
+@login_required
+@use_custom_redirect
+def edit_platform(request, platform_id=None):
+    context = {}
+    purchase = Platform.objects.get(id=platform_id)
+    form = PlatformForm(request.POST or None, instance=purchase)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Platform"
+    context["form"] = form
+    return render(request, "add.html", context)
+
+
+@login_required
+@use_custom_redirect
+def edit_edition(request, edition_id=None):
+    context = {}
+    edition = Edition.objects.get(id=edition_id)
+    form = EditionForm(request.POST or None, instance=edition)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Edition"
+    context["form"] = form
+    return render(request, "add.html", context)
+
+
+def related_purchase_by_edition(request):
+    edition_id = request.GET.get("edition")
+    if not edition_id:
+        return HttpResponseBadRequest("Invalid edition_id")
+    form = PurchaseForm()
+    form.fields["related_purchase"].queryset = Purchase.objects.filter(
+        edition_id=edition_id, type=Purchase.GAME
+    ).order_by("edition__sort_name")
+    return render(request, "partials/related_purchase_field.html", {"form": form})
+
+
+def clone_session_by_id(session_id: int) -> Session:
+    session = get_object_or_404(Session, id=session_id)
+    clone = session
+    clone.pk = None
+    clone.timestamp_start = timezone.now()
+    clone.timestamp_end = None
+    clone.note = ""
+    clone.save()
+    return clone
+
+
+@login_required
+@use_custom_redirect
+def new_session_from_existing_session(request, session_id: int, template: str = ""):
+    session = clone_session_by_id(session_id)
+    if request.htmx:
+        context = {
+            "session": session,
+            "session_count": int(request.GET.get("session_count", 0)) + 1,
+        }
+        return render(request, template, context)
+    return redirect("list_sessions")
+
+
+@login_required
+@use_custom_redirect
+def end_session(request, session_id: int, template: str = ""):
+    session = get_object_or_404(Session, id=session_id)
+    session.timestamp_end = timezone.now()
+    session.save()
+    if request.htmx:
+        context = {
+            "session": session,
+            "session_count": request.GET.get("session_count", 0),
+        }
+        return render(request, template, context)
+    return redirect("list_sessions")
+
+
+@login_required
+def delete_session(request, session_id=None):
+    session = get_object_or_404(Session, id=session_id)
+    session.delete()
+    return redirect("list_sessions")
+
+
+@login_required
+def list_sessions(
+    request,
+    filter="",
+    purchase_id="",
+    platform_id="",
+    game_id="",
+    edition_id="",
+    ownership_type: str = "",
+):
+    context = {}
+    context["title"] = "Sessions"
+
+    all_sessions = Session.objects.prefetch_related(
+        "purchase", "purchase__edition", "purchase__edition__game"
+    ).order_by("-timestamp_start")
+
+    if filter == "purchase":
+        dataset = all_sessions.filter(purchase=purchase_id)
+        context["purchase"] = Purchase.objects.get(id=purchase_id)
+    elif filter == "platform":
+        dataset = all_sessions.filter(purchase__platform=platform_id)
+        context["platform"] = Platform.objects.get(id=platform_id)
+    elif filter == "edition":
+        dataset = all_sessions.filter(purchase__edition=edition_id)
+        context["edition"] = Edition.objects.get(id=edition_id)
+    elif filter == "game":
+        dataset = all_sessions.filter(purchase__edition__game=game_id)
+        context["game"] = Game.objects.get(id=game_id)
+    elif filter == "ownership_type":
+        dataset = all_sessions.filter(purchase__ownership_type=ownership_type)
+        context["ownership_type"] = dict(Purchase.OWNERSHIP_TYPES)[ownership_type]
+    elif filter == "recent":
+        current_year = timezone.now().year
+        first_day_of_year = timezone.make_aware(datetime(current_year, 1, 1))
+        dataset = all_sessions.filter(timestamp_start__gte=first_day_of_year).order_by(
+            "-timestamp_start"
+        )
+        context["title"] = "This year"
+    else:
+        dataset = all_sessions
+
+    context = {
+        **context,
+        "dataset": dataset,
+        "dataset_count": dataset.count(),
+        "last": Session.objects.prefetch_related("purchase__platform").latest(),
+    }
+
+    return render(request, "list_sessions.html", context)
+
+
+@login_required
+def stats_alltime(request):
     year = "Alltime"
     this_year_sessions = Session.objects.all().select_related("purchase__edition")
     this_year_sessions_with_durations = this_year_sessions.annotate(
@@ -116,7 +433,7 @@ def stats_alltime(request: HttpRequest) -> HttpResponse:
         * 100
     )
 
-    purchases_finished_this_year: BaseManager[Purchase] = Purchase.objects.finished()
+    purchases_finished_this_year = Purchase.objects.finished()
     purchases_finished_this_year_released_this_year = (
         purchases_finished_this_year.all().order_by("date_finished")
     )
@@ -185,7 +502,7 @@ def stats_alltime(request: HttpRequest) -> HttpResponse:
         last_play_date = last_session.timestamp_start.strftime("%x")
 
     all_purchased_this_year_count = this_year_purchases_with_currency.count()
-    all_purchased_refunded_this_year_count: int = this_year_purchases_refunded.count()
+    all_purchased_refunded_this_year_count = this_year_purchases_refunded.count()
 
     this_year_purchases_dropped_count = this_year_purchases_dropped.count()
     this_year_purchases_dropped_percentage = int(
@@ -260,7 +577,7 @@ def stats_alltime(request: HttpRequest) -> HttpResponse:
 
 
 @login_required
-def stats(request: HttpRequest, year: int = 0) -> HttpResponse:
+def stats(request, year: int = 0):
     selected_year = request.GET.get("year")
     if selected_year:
         return HttpResponseRedirect(reverse("stats_by_year", args=[selected_year]))
@@ -401,8 +718,6 @@ def stats(request: HttpRequest, year: int = 0) -> HttpResponse:
 
     first_play_date = "N/A"
     last_play_date = "N/A"
-    first_play_game = None
-    last_play_game = None
     if this_year_sessions:
         first_session = this_year_sessions.earliest()
         first_play_game = first_session.purchase.edition.game
@@ -442,11 +757,15 @@ def stats(request: HttpRequest, year: int = 0) -> HttpResponse:
         "all_finished_this_year_count": purchases_finished_this_year.count(),
         "this_year_finished_this_year": purchases_finished_this_year_released_this_year.select_related(
             "edition"
-        ).order_by("date_finished"),
+        ).order_by(
+            "date_finished"
+        ),
         "this_year_finished_this_year_count": purchases_finished_this_year_released_this_year.count(),
         "purchased_this_year_finished_this_year": purchased_this_year_finished_this_year.select_related(
             "edition"
-        ).order_by("date_finished"),
+        ).order_by(
+            "date_finished"
+        ),
         "total_sessions": this_year_sessions.count(),
         "unique_days": unique_days["dates"],
         "unique_days_percent": int(unique_days["dates"] / 365 * 100),
@@ -506,5 +825,128 @@ def stats(request: HttpRequest, year: int = 0) -> HttpResponse:
 
 
 @login_required
-def index(request: HttpRequest) -> HttpResponse:
+def delete_purchase(request, purchase_id=None):
+    purchase = get_object_or_404(Purchase, id=purchase_id)
+    purchase.delete()
     return redirect("list_sessions")
+
+
+@login_required
+def add_purchase(request, edition_id=None):
+    context = {}
+    initial = {"date_purchased": timezone.now()}
+
+    if request.method == "POST":
+        form = PurchaseForm(request.POST or None, initial=initial)
+        if form.is_valid():
+            purchase = form.save()
+            if "submit_and_redirect" in request.POST:
+                return HttpResponseRedirect(
+                    reverse(
+                        "add_session_for_purchase", kwargs={"purchase_id": purchase.id}
+                    )
+                )
+            else:
+                return redirect("index")
+    else:
+        if edition_id:
+            edition = Edition.objects.get(id=edition_id)
+            form = PurchaseForm(
+                initial={
+                    **initial,
+                    "edition": edition,
+                    "platform": edition.platform,
+                }
+            )
+        else:
+            form = PurchaseForm(initial=initial)
+
+    context["form"] = form
+    context["title"] = "Add New Purchase"
+    context["script_name"] = "add_purchase.js"
+    return render(request, "add_purchase.html", context)
+
+
+@login_required
+def add_game(request):
+    context = {}
+    form = GameForm(request.POST or None)
+    if form.is_valid():
+        game = form.save()
+        if "submit_and_redirect" in request.POST:
+            return HttpResponseRedirect(
+                reverse("add_edition_for_game", kwargs={"game_id": game.id})
+            )
+        else:
+            return redirect("index")
+
+    context["form"] = form
+    context["title"] = "Add New Game"
+    context["script_name"] = "add_game.js"
+    return render(request, "add_game.html", context)
+
+
+@login_required
+def add_edition(request, game_id=None):
+    context = {}
+    if request.method == "POST":
+        form = EditionForm(request.POST or None)
+        if form.is_valid():
+            edition = form.save()
+            if "submit_and_redirect" in request.POST:
+                return HttpResponseRedirect(
+                    reverse(
+                        "add_purchase_for_edition", kwargs={"edition_id": edition.id}
+                    )
+                )
+            else:
+                return redirect("index")
+    else:
+        if game_id:
+            game = Game.objects.get(id=game_id)
+            form = EditionForm(
+                initial={
+                    "game": game,
+                    "name": game.name,
+                    "sort_name": game.sort_name,
+                    "year_released": game.year_released,
+                }
+            )
+        else:
+            form = EditionForm()
+
+    context["form"] = form
+    context["title"] = "Add New Edition"
+    context["script_name"] = "add_edition.js"
+    return render(request, "add_edition.html", context)
+
+
+@login_required
+def add_platform(request):
+    context = {}
+    form = PlatformForm(request.POST or None)
+    if form.is_valid():
+        form.save()
+        return redirect("index")
+
+    context["form"] = form
+    context["title"] = "Add New Platform"
+    return render(request, "add.html", context)
+
+
+@login_required
+def add_device(request):
+    context = {}
+    form = DeviceForm(request.POST or None)
+    if form.is_valid():
+        form.save()
+        return redirect("index")
+
+    context["form"] = form
+    context["title"] = "Add New Device"
+    return render(request, "add.html", context)
+
+
+@login_required
+def index(request):
+    return redirect("list_sessions_recent")

games/views/device.py

@@ -1,103 +0,0 @@
-from typing import Any
-
-from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import get_object_or_404, redirect, render
-from django.template.loader import render_to_string
-from django.urls import reverse
-
-from games.forms import DeviceForm
-from games.models import Device
-from games.views.general import dateformat
-
-
-@login_required
-def list_devices(request: HttpRequest) -> HttpResponse:
-    context: dict[Any, Any] = {}
-    page_number = request.GET.get("page", 1)
-    limit = request.GET.get("limit", 10)
-    devices = Device.objects.order_by("-created_at")
-    page_obj = None
-    if int(limit) != 0:
-        paginator = Paginator(devices, limit)
-        page_obj = paginator.get_page(page_number)
-        devices = page_obj.object_list
-
-    context = {
-        "title": "Manage devices",
-        "page_obj": page_obj or None,
-        "elided_page_range": (
-            page_obj.paginator.get_elided_page_range(
-                page_number, on_each_side=1, on_ends=1
-            )
-            if page_obj
-            else None
-        ),
-        "data": {
-            "columns": [
-                "Name",
-                "Type",
-                "Created",
-                "Actions",
-            ],
-            "rows": [
-                [
-                    device.name,
-                    device.get_type_display(),
-                    device.created_at.strftime(dateformat),
-                    render_to_string(
-                        "cotton/button_group_sm.html",
-                        {
-                            "buttons": [
-                                {
-                                    "href": reverse("edit_device", args=[device.pk]),
-                                    "text": "Edit",
-                                    "color": "gray",
-                                },
-                                {
-                                    "href": reverse("delete_device", args=[device.pk]),
-                                    "text": "Delete",
-                                    "color": "red",
-                                },
-                            ]
-                        },
-                    ),
-                ]
-                for device in devices
-            ],
-        },
-    }
-    return render(request, "list_purchases.html", context)
-
-
-@login_required
-def edit_device(request: HttpRequest, device_id: int = 0) -> HttpResponse:
-    device = get_object_or_404(Device, id=device_id)
-    form = DeviceForm(request.POST or None, instance=device)
-    if form.is_valid():
-        form.save()
-        return redirect("list_devices")
-
-    context: dict[str, Any] = {"form": form, "title": "Edit device"}
-    return render(request, "add.html", context)
-
-
-@login_required
-def delete_device(request: HttpRequest, device_id: int) -> HttpResponse:
-    device = get_object_or_404(Device, id=device_id)
-    device.delete()
-    return redirect("list_sessions")
-
-
-@login_required
-def add_device(request: HttpRequest) -> HttpResponse:
-    context: dict[str, Any] = {}
-    form = DeviceForm(request.POST or None)
-    if form.is_valid():
-        form.save()
-        return redirect("index")
-
-    context["form"] = form
-    context["title"] = "Add New Device"
-    return render(request, "add.html", context)

games/views/edition.py

@@ -1,145 +0,0 @@
-from typing import Any
-
-from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator
-from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render
-from django.template.loader import render_to_string
-from django.urls import reverse
-
-from common.utils import truncate_with_popover
-from games.forms import EditionForm
-from games.models import Edition, Game
-from games.views.general import dateformat
-
-
-@login_required
-def list_editions(request: HttpRequest) -> HttpResponse:
-    context: dict[Any, Any] = {}
-    page_number = request.GET.get("page", 1)
-    limit = request.GET.get("limit", 10)
-    editions = Edition.objects.order_by("-created_at")
-    page_obj = None
-    if int(limit) != 0:
-        paginator = Paginator(editions, limit)
-        page_obj = paginator.get_page(page_number)
-        editions = page_obj.object_list
-
-    context = {
-        "title": "Manage editions",
-        "page_obj": page_obj or None,
-        "elided_page_range": (
-            page_obj.paginator.get_elided_page_range(
-                page_number, on_each_side=1, on_ends=1
-            )
-            if page_obj
-            else None
-        ),
-        "data": {
-            "columns": [
-                "Game",
-                "Name",
-                "Sort Name",
-                "Platform",
-                "Year",
-                "Wikidata",
-                "Created",
-                "Actions",
-            ],
-            "rows": [
-                [
-                    truncate_with_popover(edition.game.name),
-                    truncate_with_popover(
-                        edition.name
-                        if edition.game.name != edition.name
-                        else "(identical)"
-                    ),
-                    truncate_with_popover(
-                        edition.sort_name
-                        if edition.sort_name is not None
-                        and edition.game.name != edition.sort_name
-                        else "(identical)"
-                    ),
-                    truncate_with_popover(str(edition.platform)),
-                    edition.year_released,
-                    edition.wikidata,
-                    edition.created_at.strftime(dateformat),
-                    render_to_string(
-                        "cotton/button_group_sm.html",
-                        {
-                            "buttons": [
-                                {
-                                    "href": reverse("edit_edition", args=[edition.pk]),
-                                    "text": "Edit",
-                                    "color": "gray",
-                                },
-                                {
-                                    "href": reverse(
-                                        "delete_edition", args=[edition.pk]
-                                    ),
-                                    "text": "Delete",
-                                    "color": "red",
-                                },
-                            ]
-                        },
-                    ),
-                ]
-                for edition in editions
-            ],
-        },
-    }
-    return render(request, "list_purchases.html", context)
-
-
-@login_required
-def edit_edition(request: HttpRequest, edition_id: int = 0) -> HttpResponse:
-    edition = get_object_or_404(Edition, id=edition_id)
-    form = EditionForm(request.POST or None, instance=edition)
-    if form.is_valid():
-        form.save()
-        return redirect("list_editions")
-
-    context: dict[str, Any] = {"form": form, "title": "Edit edition"}
-    return render(request, "add.html", context)
-
-
-@login_required
-def delete_edition(request: HttpRequest, edition_id: int) -> HttpResponse:
-    edition = get_object_or_404(Edition, id=edition_id)
-    edition.delete()
-    return redirect("list_editions")
-
-
-@login_required
-def add_edition(request: HttpRequest, game_id: int = 0) -> HttpResponse:
-    context: dict[str, Any] = {}
-    if request.method == "POST":
-        form = EditionForm(request.POST or None)
-        if form.is_valid():
-            edition = form.save()
-            if "submit_and_redirect" in request.POST:
-                return HttpResponseRedirect(
-                    reverse(
-                        "add_purchase_for_edition", kwargs={"edition_id": edition.id}
-                    )
-                )
-            else:
-                return redirect("index")
-    else:
-        if game_id:
-            game = get_object_or_404(Game, id=game_id)
-            form = EditionForm(
-                initial={
-                    "game": game,
-                    "name": game.name,
-                    "sort_name": game.sort_name,
-                    "year_released": game.year_released,
-                }
-            )
-        else:
-            form = EditionForm()
-
-    context["form"] = form
-    context["title"] = "Add New Edition"
-    context["script_name"] = "add_edition.js"
-    return render(request, "add_edition.html", context)

games/views/game.py

@@ -1,323 +0,0 @@
-from typing import Any
-
-from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator
-from django.db.models import Prefetch
-from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render
-from django.template.loader import render_to_string
-from django.urls import reverse
-
-from common.time import format_duration
-from common.utils import safe_division, truncate_with_popover
-from games.forms import GameForm
-from games.models import Edition, Game, Purchase, Session
-from games.views.general import (
-    dateformat,
-    datetimeformat,
-    durationformat,
-    durationformat_manual,
-    timeformat,
-    use_custom_redirect,
-)
-
-
-@login_required
-def list_games(request: HttpRequest) -> HttpResponse:
-    context: dict[Any, Any] = {}
-    page_number = request.GET.get("page", 1)
-    limit = request.GET.get("limit", 10)
-    games = Game.objects.order_by("-created_at")
-    page_obj = None
-    if int(limit) != 0:
-        paginator = Paginator(games, limit)
-        page_obj = paginator.get_page(page_number)
-        games = page_obj.object_list
-
-    context = {
-        "title": "Manage games",
-        "page_obj": page_obj or None,
-        "elided_page_range": (
-            page_obj.paginator.get_elided_page_range(
-                page_number, on_each_side=1, on_ends=1
-            )
-            if page_obj
-            else None
-        ),
-        "data": {
-            "columns": [
-                "Name",
-                "Sort Name",
-                "Year",
-                "Wikidata",
-                "Created",
-                "Actions",
-            ],
-            "rows": [
-                [
-                    truncate_with_popover(game.name),
-                    truncate_with_popover(
-                        game.sort_name
-                        if game.sort_name is not None and game.name != game.sort_name
-                        else "(identical)"
-                    ),
-                    game.year_released,
-                    game.wikidata,
-                    game.created_at.strftime(dateformat),
-                    render_to_string(
-                        "cotton/button_group_sm.html",
-                        {
-                            "buttons": [
-                                {
-                                    "href": reverse("edit_game", args=[game.pk]),
-                                    "text": "Edit",
-                                    "color": "gray",
-                                },
-                                {
-                                    "href": reverse("delete_game", args=[game.pk]),
-                                    "text": "Delete",
-                                    "color": "red",
-                                },
-                            ]
-                        },
-                    ),
-                ]
-                for game in games
-            ],
-        },
-    }
-    return render(request, "list_purchases.html", context)
-
-
-@login_required
-def add_game(request: HttpRequest) -> HttpResponse:
-    context: dict[str, Any] = {}
-    form = GameForm(request.POST or None)
-    if form.is_valid():
-        game = form.save()
-        if "submit_and_redirect" in request.POST:
-            return HttpResponseRedirect(
-                reverse("add_edition_for_game", kwargs={"game_id": game.id})
-            )
-        else:
-            return redirect("list_games")
-
-    context["form"] = form
-    context["title"] = "Add New Game"
-    context["script_name"] = "add_game.js"
-    return render(request, "add_game.html", context)
-
-
-@login_required
-def delete_game(request: HttpRequest, game_id: int) -> HttpResponse:
-    game = get_object_or_404(Game, id=game_id)
-    game.delete()
-    return redirect("list_sessions")
-
-
-@login_required
-@use_custom_redirect
-def edit_game(request: HttpRequest, game_id: int) -> HttpResponse:
-    context = {}
-    purchase = get_object_or_404(Game, id=game_id)
-    form = GameForm(request.POST or None, instance=purchase)
-    if form.is_valid():
-        form.save()
-        return redirect("list_sessions")
-    context["title"] = "Edit Game"
-    context["form"] = form
-    return render(request, "add.html", context)
-
-
-@login_required
-def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
-    game = Game.objects.get(id=game_id)
-    nongame_related_purchases_prefetch: Prefetch[Purchase] = Prefetch(
-        "related_purchases",
-        queryset=Purchase.objects.exclude(type=Purchase.GAME).order_by(
-            "date_purchased"
-        ),
-        to_attr="nongame_related_purchases",
-    )
-    game_purchases_prefetch: Prefetch[Purchase] = Prefetch(
-        "purchase_set",
-        queryset=Purchase.objects.filter(type=Purchase.GAME).prefetch_related(
-            nongame_related_purchases_prefetch
-        ),
-        to_attr="game_purchases",
-    )
-    editions = (
-        Edition.objects.filter(game=game)
-        .prefetch_related(game_purchases_prefetch)
-        .order_by("year_released")
-    )
-
-    purchases = Purchase.objects.filter(edition__game=game).order_by("date_purchased")
-
-    sessions = Session.objects.prefetch_related("device").filter(
-        purchase__edition__game=game
-    )
-    session_count = sessions.count()
-    session_count_without_manual = (
-        Session.objects.without_manual().filter(purchase__edition__game=game).count()
-    )
-
-    if sessions:
-        playrange_start = sessions.earliest().timestamp_start.strftime("%b %Y")
-        latest_session = sessions.latest()
-        playrange_end = latest_session.timestamp_start.strftime("%b %Y")
-
-        playrange = (
-            playrange_start
-            if playrange_start == playrange_end
-            else f"{playrange_start} — {playrange_end}"
-        )
-    else:
-        playrange = "N/A"
-        latest_session = None
-
-    total_hours = float(format_duration(sessions.total_duration_unformatted(), "%2.1H"))
-    total_hours_without_manual = float(
-        format_duration(sessions.calculated_duration_unformatted(), "%2.1H")
-    )
-
-    edition_data: dict[str, Any] = {
-        "columns": [
-            "Name",
-            "Platform",
-            "Year Released",
-            "Actions",
-        ],
-        "rows": [
-            [
-                edition.name,
-                edition.platform,
-                edition.year_released,
-                render_to_string(
-                    "cotton/button_group_sm.html",
-                    {
-                        "buttons": [
-                            {
-                                "href": reverse("edit_edition", args=[edition.pk]),
-                                "text": "Edit",
-                                "color": "gray",
-                            },
-                            {
-                                "href": reverse("delete_edition", args=[edition.pk]),
-                                "text": "Delete",
-                                "color": "red",
-                            },
-                        ]
-                    },
-                ),
-            ]
-            for edition in editions
-        ],
-    }
-
-    purchase_data: dict[str, Any] = {
-        "columns": ["Name", "Type", "Price", "Actions"],
-        "rows": [
-            [
-                purchase.name if purchase.name else purchase.edition.name,
-                purchase.get_type_display(),
-                f"{purchase.price} {purchase.price_currency}",
-                render_to_string(
-                    "cotton/button_group_sm.html",
-                    {
-                        "buttons": [
-                            {
-                                "href": reverse("edit_purchase", args=[purchase.pk]),
-                                "text": "Edit",
-                                "color": "gray",
-                            },
-                            {
-                                "href": reverse("delete_purchase", args=[purchase.pk]),
-                                "text": "Delete",
-                                "color": "red",
-                            },
-                        ]
-                    },
-                ),
-            ]
-            for purchase in purchases
-        ],
-    }
-
-    sessions_all = Session.objects.filter(purchase__edition__game=game).order_by(
-        "-timestamp_start"
-    )
-    session_count = sessions_all.count()
-    session_paginator = Paginator(sessions_all, 5)
-    page_number = request.GET.get("page", 1)
-    session_page_obj = session_paginator.get_page(page_number)
-    sessions = session_page_obj.object_list
-
-    session_data: dict[str, Any] = {
-        "columns": ["Date", "Duration", "Duration (manual)", "Actions"],
-        "rows": [
-            [
-                f"{session.timestamp_start.strftime(datetimeformat)}{f" — {session.timestamp_end.strftime(timeformat)}" if session.timestamp_end else ""}",
-                (
-                    format_duration(session.duration_calculated, durationformat)
-                    if session.duration_calculated
-                    else "-"
-                ),
-                (
-                    format_duration(session.duration_manual, durationformat_manual)
-                    if session.duration_manual
-                    else "-"
-                ),
-                render_to_string(
-                    "cotton/button_group_sm.html",
-                    {
-                        "buttons": [
-                            {
-                                "href": reverse("edit_session", args=[session.pk]),
-                                "text": "Edit",
-                                "color": "gray",
-                            },
-                            {
-                                "href": reverse("delete_session", args=[session.pk]),
-                                "text": "Delete",
-                                "color": "red",
-                            },
-                        ]
-                    },
-                ),
-            ]
-            for session in sessions
-        ],
-    }
-
-    context: dict[str, Any] = {
-        "edition_count": editions.count(),
-        "editions": editions,
-        "game": game,
-        "playrange": playrange,
-        "purchase_count": Purchase.objects.filter(edition__game=game).count(),
-        "session_average_without_manual": round(
-            safe_division(
-                total_hours_without_manual, int(session_count_without_manual)
-            ),
-            1,
-        ),
-        "session_count": session_count,
-        "sessions": sessions,
-        "title": f"Game Overview - {game.name}",
-        "hours_sum": total_hours,
-        "edition_data": edition_data,
-        "purchase_data": purchase_data,
-        "session_data": session_data,
-        "session_page_obj": session_page_obj,
-        "session_elided_page_range": (
-            session_page_obj.paginator.get_elided_page_range(
-                page_number, on_each_side=1, on_ends=1
-            )
-            if session_page_obj and session_count > 5
-            else None
-        ),
-    }
-
-    request.session["return_path"] = request.path
-    return render(request, "view_game.html", context)

games/views/platform.py

@@ -1,109 +0,0 @@
-from typing import Any
-
-from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import get_object_or_404, redirect, render
-from django.template.loader import render_to_string
-from django.urls import reverse
-
-from games.forms import PlatformForm
-from games.models import Platform
-from games.views.general import dateformat, use_custom_redirect
-
-
-@login_required
-def list_platforms(request: HttpRequest) -> HttpResponse:
-    context: dict[Any, Any] = {}
-    page_number = request.GET.get("page", 1)
-    limit = request.GET.get("limit", 10)
-    platforms = Platform.objects.order_by("-created_at")
-    page_obj = None
-    if int(limit) != 0:
-        paginator = Paginator(platforms, limit)
-        page_obj = paginator.get_page(page_number)
-        platforms = page_obj.object_list
-
-    context = {
-        "title": "Manage platforms",
-        "page_obj": page_obj or None,
-        "elided_page_range": (
-            page_obj.paginator.get_elided_page_range(
-                page_number, on_each_side=1, on_ends=1
-            )
-            if page_obj
-            else None
-        ),
-        "data": {
-            "columns": [
-                "Name",
-                "Group",
-                "Created",
-                "Actions",
-            ],
-            "rows": [
-                [
-                    platform.name,
-                    platform.group,
-                    platform.created_at.strftime(dateformat),
-                    render_to_string(
-                        "cotton/button_group_sm.html",
-                        {
-                            "buttons": [
-                                {
-                                    "href": reverse(
-                                        "edit_platform", args=[platform.pk]
-                                    ),
-                                    "text": "Edit",
-                                    "color": "gray",
-                                },
-                                {
-                                    "href": reverse(
-                                        "delete_platform", args=[platform.pk]
-                                    ),
-                                    "text": "Delete",
-                                    "color": "red",
-                                },
-                            ]
-                        },
-                    ),
-                ]
-                for platform in platforms
-            ],
-        },
-    }
-    return render(request, "list_purchases.html", context)
-
-
-@login_required
-def delete_platform(request: HttpRequest, platform_id: int) -> HttpResponse:
-    platform = get_object_or_404(Platform, id=platform_id)
-    platform.delete()
-    return redirect("list_platforms")
-
-
-@login_required
-@use_custom_redirect
-def edit_platform(request: HttpRequest, platform_id: int) -> HttpResponse:
-    context = {}
-    platform = get_object_or_404(Platform, id=platform_id)
-    form = PlatformForm(request.POST or None, instance=platform)
-    if form.is_valid():
-        form.save()
-        return redirect("list_platforms")
-    context["title"] = "Edit Platform"
-    context["form"] = form
-    return render(request, "add.html", context)
-
-
-@login_required
-def add_platform(request: HttpRequest) -> HttpResponse:
-    context: dict[str, Any] = {}
-    form = PlatformForm(request.POST or None)
-    if form.is_valid():
-        form.save()
-        return redirect("index")
-
-    context["form"] = form
-    context["title"] = "Add New Platform"
-    return render(request, "add.html", context)

games/views/purchase.py

@@ -1,178 +0,0 @@
-from typing import Any
-
-from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator
-from django.http import (
-    HttpRequest,
-    HttpResponse,
-    HttpResponseBadRequest,
-    HttpResponseRedirect,
-)
-from django.shortcuts import get_object_or_404, redirect, render
-from django.template.loader import render_to_string
-from django.urls import reverse
-from django.utils import timezone
-
-from common.utils import truncate_with_popover
-from games.forms import PurchaseForm
-from games.models import Edition, Purchase
-from games.views.general import dateformat, use_custom_redirect
-
-
-@login_required
-def list_purchases(request: HttpRequest) -> HttpResponse:
-    context: dict[Any, Any] = {}
-    page_number = request.GET.get("page", 1)
-    limit = request.GET.get("limit", 10)
-    purchases = Purchase.objects.order_by("-date_purchased")
-    page_obj = None
-    if int(limit) != 0:
-        paginator = Paginator(purchases, limit)
-        page_obj = paginator.get_page(page_number)
-        purchases = page_obj.object_list
-
-    context = {
-        "title": "Manage purchases",
-        "page_obj": page_obj or None,
-        "elided_page_range": (
-            page_obj.paginator.get_elided_page_range(
-                page_number, on_each_side=1, on_ends=1
-            )
-            if page_obj
-            else None
-        ),
-        "data": {
-            "columns": [
-                "Name",
-                "Platform",
-                "Price",
-                "Currency",
-                "Infinite",
-                "Purchased",
-                "Refunded",
-                "Finished",
-                "Dropped",
-                "Created",
-                "Actions",
-            ],
-            "rows": [
-                [
-                    truncate_with_popover(purchase.edition.name),
-                    purchase.platform,
-                    purchase.price,
-                    purchase.price_currency,
-                    purchase.infinite,
-                    purchase.date_purchased.strftime(dateformat),
-                    (
-                        purchase.date_refunded.strftime(dateformat)
-                        if purchase.date_refunded
-                        else "-"
-                    ),
-                    (
-                        purchase.date_finished.strftime(dateformat)
-                        if purchase.date_finished
-                        else "-"
-                    ),
-                    (
-                        purchase.date_dropped.strftime(dateformat)
-                        if purchase.date_dropped
-                        else "-"
-                    ),
-                    purchase.created_at.strftime(dateformat),
-                    render_to_string(
-                        "cotton/button_group_sm.html",
-                        {
-                            "buttons": [
-                                {
-                                    "href": reverse(
-                                        "edit_purchase", args=[purchase.pk]
-                                    ),
-                                    "text": "Edit",
-                                    "color": "gray",
-                                },
-                                {
-                                    "href": reverse(
-                                        "delete_purchase", args=[purchase.pk]
-                                    ),
-                                    "text": "Delete",
-                                    "color": "red",
-                                },
-                            ]
-                        },
-                    ),
-                ]
-                for purchase in purchases
-            ],
-        },
-    }
-    return render(request, "list_purchases.html", context)
-
-
-@login_required
-def add_purchase(request: HttpRequest, edition_id: int = 0) -> HttpResponse:
-    context: dict[str, Any] = {}
-    initial = {"date_purchased": timezone.now()}
-
-    if request.method == "POST":
-        form = PurchaseForm(request.POST or None, initial=initial)
-        if form.is_valid():
-            purchase = form.save()
-            if "submit_and_redirect" in request.POST:
-                return HttpResponseRedirect(
-                    reverse(
-                        "add_session_for_purchase", kwargs={"purchase_id": purchase.id}
-                    )
-                )
-            else:
-                return redirect("list_purchases")
-    else:
-        if edition_id:
-            edition = Edition.objects.get(id=edition_id)
-            form = PurchaseForm(
-                initial={
-                    **initial,
-                    "edition": edition,
-                    "platform": edition.platform,
-                }
-            )
-        else:
-            form = PurchaseForm(initial=initial)
-
-    context["form"] = form
-    context["title"] = "Add New Purchase"
-    context["script_name"] = "add_purchase.js"
-    return render(request, "add_purchase.html", context)
-
-
-@login_required
-@use_custom_redirect
-def edit_purchase(request: HttpRequest, purchase_id: int) -> HttpResponse:
-    context = {}
-    purchase = get_object_or_404(Purchase, id=purchase_id)
-    form = PurchaseForm(request.POST or None, instance=purchase)
-    if form.is_valid():
-        form.save()
-        return redirect("list_sessions")
-    context["title"] = "Edit Purchase"
-    context["form"] = form
-    context["purchase_id"] = str(purchase_id)
-    context["script_name"] = "add_purchase.js"
-    return render(request, "add_purchase.html", context)
-
-
-@login_required
-def delete_purchase(request: HttpRequest, purchase_id: int) -> HttpResponse:
-    purchase = get_object_or_404(Purchase, id=purchase_id)
-    purchase.delete()
-    return redirect("list_sessions")
-
-
-def related_purchase_by_edition(request: HttpRequest) -> HttpResponse:
-    edition_id = request.GET.get("edition")
-    if not edition_id:
-        return HttpResponseBadRequest("Invalid edition_id")
-    form = PurchaseForm()
-    form.fields["related_purchase"].queryset = Purchase.objects.filter(
-        edition_id=edition_id, type=Purchase.GAME
-    ).order_by("edition__sort_name")
-    return render(request, "partials/related_purchase_field.html", {"form": form})

games/views/session.py

@@ -1,192 +0,0 @@
-from typing import Any
-
-from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import get_object_or_404, redirect, render
-from django.template.loader import render_to_string
-from django.urls import reverse
-from django.utils import timezone
-
-from common.time import format_duration
-from common.utils import truncate_with_popover
-from games.forms import SessionForm
-from games.models import Purchase, Session
-from games.views.general import (
-    dateformat,
-    datetimeformat,
-    durationformat,
-    durationformat_manual,
-    timeformat,
-    use_custom_redirect,
-)
-
-
-@login_required
-def list_sessions(request: HttpRequest) -> HttpResponse:
-    context: dict[Any, Any] = {}
-    page_number = request.GET.get("page", 1)
-    limit = request.GET.get("limit", 10)
-    sessions = Session.objects.order_by("-timestamp_start")
-    page_obj = None
-    if int(limit) != 0:
-        paginator = Paginator(sessions, limit)
-        page_obj = paginator.get_page(page_number)
-        sessions = page_obj.object_list
-
-    context = {
-        "title": "Manage sessions",
-        "page_obj": page_obj or None,
-        "elided_page_range": (
-            page_obj.paginator.get_elided_page_range(
-                page_number, on_each_side=1, on_ends=1
-            )
-            if page_obj
-            else None
-        ),
-        "data": {
-            "columns": [
-                "Name",
-                "Date",
-                "Duration",
-                "Duration (manual)",
-                "Device",
-                "Created",
-                "Actions",
-            ],
-            "rows": [
-                [
-                    truncate_with_popover(session.purchase.edition.name),
-                    f"{session.timestamp_start.strftime(datetimeformat)}{f" — {session.timestamp_end.strftime(timeformat)}" if session.timestamp_end else ""}",
-                    (
-                        format_duration(session.duration_calculated, durationformat)
-                        if session.duration_calculated
-                        else "-"
-                    ),
-                    (
-                        format_duration(session.duration_manual, durationformat_manual)
-                        if session.duration_manual
-                        else "-"
-                    ),
-                    session.device,
-                    session.created_at.strftime(dateformat),
-                    render_to_string(
-                        "cotton/button_group_sm.html",
-                        {
-                            "buttons": [
-                                {
-                                    "href": reverse("edit_session", args=[session.pk]),
-                                    "text": "Edit",
-                                    "color": "gray",
-                                },
-                                {
-                                    "href": reverse(
-                                        "delete_session", args=[session.pk]
-                                    ),
-                                    "text": "Delete",
-                                    "color": "red",
-                                },
-                            ]
-                        },
-                    ),
-                ]
-                for session in sessions
-            ],
-        },
-    }
-    return render(request, "list_purchases.html", context)
-
-
-@login_required
-def add_session(request: HttpRequest, purchase_id: int = 0) -> HttpResponse:
-    context = {}
-    initial: dict[str, Any] = {"timestamp_start": timezone.now()}
-
-    last = Session.objects.last()
-    if last != None:
-        initial["purchase"] = last.purchase
-
-    if request.method == "POST":
-        form = SessionForm(request.POST or None, initial=initial)
-        if form.is_valid():
-            form.save()
-            return redirect("list_sessions")
-    else:
-        if purchase_id:
-            purchase = Purchase.objects.get(id=purchase_id)
-            form = SessionForm(
-                initial={
-                    **initial,
-                    "purchase": purchase,
-                }
-            )
-        else:
-            form = SessionForm(initial=initial)
-
-    context["title"] = "Add New Session"
-    context["form"] = form
-    return render(request, "add_session.html", context)
-
-
-@login_required
-@use_custom_redirect
-def edit_session(request: HttpRequest, session_id: int) -> HttpResponse:
-    context = {}
-    session = get_object_or_404(Session, id=session_id)
-    form = SessionForm(request.POST or None, instance=session)
-    if form.is_valid():
-        form.save()
-        return redirect("list_sessions")
-    context["title"] = "Edit Session"
-    context["form"] = form
-    return render(request, "add_session.html", context)
-
-
-def clone_session_by_id(session_id: int) -> Session:
-    session = get_object_or_404(Session, id=session_id)
-    clone = session
-    clone.pk = None
-    clone.timestamp_start = timezone.now()
-    clone.timestamp_end = None
-    clone.note = ""
-    clone.save()
-    return clone
-
-
-@login_required
-@use_custom_redirect
-def new_session_from_existing_session(
-    request: HttpRequest, session_id: int, template: str = ""
-) -> HttpResponse:
-    session = clone_session_by_id(session_id)
-    if request.htmx:
-        context = {
-            "session": session,
-            "session_count": int(request.GET.get("session_count", 0)) + 1,
-        }
-        return render(request, template, context)
-    return redirect("list_sessions")
-
-
-@login_required
-@use_custom_redirect
-def end_session(
-    request: HttpRequest, session_id: int, template: str = ""
-) -> HttpResponse:
-    session = get_object_or_404(Session, id=session_id)
-    session.timestamp_end = timezone.now()
-    session.save()
-    if request.htmx:
-        context = {
-            "session": session,
-            "session_count": request.GET.get("session_count", 0),
-        }
-        return render(request, template, context)
-    return redirect("list_sessions")
-
-
-@login_required
-def delete_session(request: HttpRequest, session_id: int = 0) -> HttpResponse:
-    session = get_object_or_404(Session, id=session_id)
-    session.delete()
-    return redirect("list_sessions")

manage.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
-
 import os
 import sys
 

poetry.lock

@@ -29,25 +29,48 @@ files = [
 tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
 
 [[package]]
-name = "beautifulsoup4"
+name = "black"
-version = "4.12.3"
+version = "24.8.0"
-description = "Screen-scraping library"
+description = "The uncompromising code formatter."
 optional = false
-python-versions = ">=3.6.0"
+python-versions = ">=3.8"
 files = [
-    {file = "beautifulsoup4-4.12.3-py3-none-any.whl", hash = "sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed"},
+    {file = "black-24.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6"},
-    {file = "beautifulsoup4-4.12.3.tar.gz", hash = "sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051"},
+    {file = "black-24.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb"},
+    {file = "black-24.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42"},
+    {file = "black-24.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a"},
+    {file = "black-24.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1"},
+    {file = "black-24.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af"},
+    {file = "black-24.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4"},
+    {file = "black-24.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af"},
+    {file = "black-24.8.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368"},
+    {file = "black-24.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed"},
+    {file = "black-24.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018"},
+    {file = "black-24.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2"},
+    {file = "black-24.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd"},
+    {file = "black-24.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2"},
+    {file = "black-24.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e"},
+    {file = "black-24.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920"},
+    {file = "black-24.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c"},
+    {file = "black-24.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e"},
+    {file = "black-24.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47"},
+    {file = "black-24.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb"},
+    {file = "black-24.8.0-py3-none-any.whl", hash = "sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed"},
+    {file = "black-24.8.0.tar.gz", hash = "sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f"},
 ]
 
 [package.dependencies]
-soupsieve = ">1.2"
+click = ">=8.0.0"
+mypy-extensions = ">=0.4.3"
+packaging = ">=22.0"
+pathspec = ">=0.9.0"
+platformdirs = ">=2"
 
 [package.extras]
-cchardet = ["cchardet"]
+colorama = ["colorama (>=0.4.3)"]
-chardet = ["chardet"]
+d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"]
-charset-normalizer = ["charset-normalizer"]
+jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
-html5lib = ["html5lib"]
+uvloop = ["uvloop (>=0.15.2)"]
-lxml = ["lxml"]
 
 [[package]]
 name = "cfgv"
@@ -131,20 +154,6 @@ tzdata = {version = "*", markers = "sys_platform == \"win32\""}
 argon2 = ["argon2-cffi (>=19.1.0)"]
 bcrypt = ["bcrypt"]
 
-[[package]]
-name = "django-cotton"
-version = "0.9.34"
-description = "Bringing component based design to Django templates."
-optional = false
-python-versions = "<4,>=3.8"
-files = [
-    {file = "django_cotton-0.9.34-py3-none-any.whl", hash = "sha256:9721dd79066d5a28eefb84527bea7f2daa8f1db6111ffdecbc5dd64fe2e300c9"},
-    {file = "django_cotton-0.9.34.tar.gz", hash = "sha256:3f2d950a9ad0985955ca0fb2d5fbb42be1f07f55239864fe5a1d0e873303f0bd"},
-]
-
-[package.dependencies]
-beautifulsoup4 = ">=4.12.2,<4.13.0"
-
 [[package]]
 name = "django-debug-toolbar"
 version = "4.4.6"
@@ -823,16 +832,22 @@ files = [
 ]
 
 [[package]]
-name = "soupsieve"
+name = "slippers"
-version = "2.6"
+version = "0.6.2"
-description = "A modern CSS selector implementation for Beautiful Soup."
+description = "Build reusable components in Django without writing a single line of Python."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.8.0"
 files = [
-    {file = "soupsieve-2.6-py3-none-any.whl", hash = "sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9"},
+    {file = "slippers-0.6.2-py3-none-any.whl", hash = "sha256:739e05f85354becbf0a65daab831eea62557d89e7512042209ab629af4378bca"},
-    {file = "soupsieve-2.6.tar.gz", hash = "sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb"},
+    {file = "slippers-0.6.2.tar.gz", hash = "sha256:4cb555b8822ba0d404e5405723f5d723994022c29046008ee917081031bc0cf1"},
 ]
 
+[package.dependencies]
+Django = ">=3.2"
+PyYAML = ">=5.4.0"
+typeguard = ">=2.13.3,<3.0.0"
+typing-extensions = ">=4.4.0"
+
 [[package]]
 name = "sqlparse"
 version = "0.5.1"
@@ -879,6 +894,21 @@ notebook = ["ipywidgets (>=6)"]
 slack = ["slack-sdk"]
 telegram = ["requests"]
 
+[[package]]
+name = "typeguard"
+version = "2.13.3"
+description = "Run-time type checker for Python"
+optional = false
+python-versions = ">=3.5.3"
+files = [
+    {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"},
+    {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"},
+]
+
+[package.extras]
+doc = ["sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"]
+test = ["mypy", "pytest", "typing-extensions"]
+
 [[package]]
 name = "typing-extensions"
 version = "4.12.2"
@@ -942,4 +972,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "f96f55c381f25a4a473be8d53ef83d13c70bb7c731b5132f4ece2af1b3d3afed"
+content-hash = "ca9188453f62ec4470e2b2f8bc1e4a17ad421272f401328f82d6fede231dc737"

pyproject.toml

@@ -8,6 +8,7 @@ readme = "README.md"
 packages = [{include = "timetracker"}]
 
 [tool.poetry.group.dev.dependencies]
+black = "^24.4.2"
 mypy = "^1.10.1"
 pyyaml = "^6.0.1"
 pytest = "^8.2.2"
@@ -30,7 +31,7 @@ django-template-partials = "^24.2"
 markdown = "^3.6"
 
 
-django-cotton = "^0.9.34"
+slippers = "^0.6.2"
 [tool.isort]
 profile = "black"
 

shell.nix

@@ -5,14 +5,10 @@
 pkgs.mkShell {
   buildInputs = with pkgs; [
     nodejs
-    python3
+    (poetry.override { python3 = python312; })
-    poetry
-    ruff
   ];
 
   shellHook = ''
-    python -m venv .venv
-    . .venv/bin/activate
     poetry install
   '';
 }

timetracker/settings.py

@@ -41,7 +41,7 @@ INSTALLED_APPS = [
     "template_partials",
     "graphene_django",
     "django_htmx",
-    "django_cotton",
+    "slippers",
 ]
 
 GRAPHENE = {"SCHEMA": "games.schema.schema"}
@@ -83,10 +83,12 @@ TEMPLATES = [
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
-                "games.views.general.model_counts",
+                "games.views.model_counts",
+                "games.views.stats_dropdown_year_range",
             ],
             "builtins": [
                 "template_partials.templatetags.partials",
+                "slippers.templatetags.slippers",
             ],
         },
     },

timetracker/urls.py

@@ -13,7 +13,6 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth import views as auth_views