initial commit

This reverts commit 6ac4209492.

.gitea/workflows/build-docker.yml

@@ -1,27 +0,0 @@
-name: Django CI/CD
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build-and-push:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-    - name: Build and push
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: true
-        tags: |
-          registry.kucharczyk.xyz/timetracker:latest
-          registry.kucharczyk.xyz/timetracker:${{ env.VERSION_NUMBER }}          
-    env:
-      VERSION_NUMBER: 1.5.1

.github/workflows/build-docker.yml

@@ -0,0 +1,36 @@
+name: Django CI/CD
+
+on:
+  push:
+    paths-ignore: [ 'README.md' ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.12
+      - run: |
+          python -m pip install poetry
+          poetry install
+          poetry env info
+          poetry run python manage.py migrate
+          PROD=1 poetry run pytest
+  build-and-push:
+    needs: test
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            registry.kucharczyk.xyz/timetracker:latest
+            registry.kucharczyk.xyz/timetracker:${{ env.VERSION_NUMBER }}          
+    env:
+      VERSION_NUMBER: 1.5.1

.gitignore

@@ -1,7 +1,7 @@
 __pycache__
 .mypy_cache
 .pytest_cache
-.venv
+.venv/
 node_modules
 package-lock.json
 db.sqlite3

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+repos:
+-   repo: https://github.com/psf/black
+    rev: 22.12.0
+    hooks:
+    -   id: black
+- repo: https://github.com/pycqa/isort
+  rev: 5.12.0
+  hooks:
+    - id: isort
+      name: isort (python)
+- repo: https://github.com/Riverside-Healthcare/djLint
+  rev: v1.34.0
+  hooks:
+    - id: djlint-reformat-django
+    - id: djlint-django

common/input.css

@@ -23,6 +23,12 @@
   font-style: normal;
 }
 
+a:hover {
+  text-decoration-color: #ff4400;
+  color: rgb(254, 185, 160);
+  transition: all 0.2s ease-out;
+}
+
 form label {
   @apply dark:text-slate-400;
 }

games/forms.py

@@ -91,6 +91,7 @@ class PurchaseForm(forms.ModelForm):
             "date_purchased",
             "date_refunded",
             "date_finished",
+            "status",
             "price",
             "price_currency",
             "ownership_type",

games/graphql/mutations/__init__.py

@@ -0,0 +1 @@
+from .game import Mutation as GameMutation

games/graphql/mutations/game.py

@@ -0,0 +1,29 @@
+import graphene
+
+from games.graphql.types import Game
+from games.models import Game as GameModel
+
+
+class UpdateGameMutation(graphene.Mutation):
+    class Arguments:
+        id = graphene.ID(required=True)
+        name = graphene.String()
+        year_released = graphene.Int()
+        wikidata = graphene.String()
+
+    game = graphene.Field(Game)
+
+    def mutate(self, info, id, name=None, year_released=None, wikidata=None):
+        game_instance = GameModel.objects.get(pk=id)
+        if name is not None:
+            game_instance.name = name
+        if year_released is not None:
+            game_instance.year_released = year_released
+        if wikidata is not None:
+            game_instance.wikidata = wikidata
+        game_instance.save()
+        return UpdateGameMutation(game=game_instance)
+
+
+class Mutation(graphene.ObjectType):
+    update_game = UpdateGameMutation.Field()

games/graphql/queries/__init__.py

@@ -0,0 +1,6 @@
+from .device import Query as DeviceQuery
+from .edition import Query as EditionQuery
+from .game import Query as GameQuery
+from .platform import Query as PlatformQuery
+from .purchase import Query as PurchaseQuery
+from .session import Query as SessionQuery

games/graphql/queries/device.py

@@ -0,0 +1,11 @@
+import graphene
+
+from games.graphql.types import Device
+from games.models import Device as DeviceModel
+
+
+class Query(graphene.ObjectType):
+    devices = graphene.List(Device)
+
+    def resolve_devices(self, info, **kwargs):
+        return DeviceModel.objects.all()

games/graphql/queries/edition.py

@@ -0,0 +1,11 @@
+import graphene
+
+from games.graphql.types import Edition
+from games.models import Game as EditionModel
+
+
+class Query(graphene.ObjectType):
+    editions = graphene.List(Edition)
+
+    def resolve_editions(self, info, **kwargs):
+        return EditionModel.objects.all()

games/graphql/queries/game.py

@@ -0,0 +1,18 @@
+import graphene
+
+from games.graphql.types import Game
+from games.models import Game as GameModel
+
+
+class Query(graphene.ObjectType):
+    games = graphene.List(Game)
+    game_by_name = graphene.Field(Game, name=graphene.String(required=True))
+
+    def resolve_games(self, info, **kwargs):
+        return GameModel.objects.all()
+
+    def resolve_game_by_name(self, info, name):
+        try:
+            return GameModel.objects.get(name=name)
+        except GameModel.DoesNotExist:
+            return None

games/graphql/queries/platform.py

@@ -0,0 +1,11 @@
+import graphene
+
+from games.graphql.types import Platform
+from games.models import Platform as PlatformModel
+
+
+class Query(graphene.ObjectType):
+    platforms = graphene.List(Platform)
+
+    def resolve_platforms(self, info, **kwargs):
+        return PlatformModel.objects.all()

games/graphql/queries/purchase.py

@@ -0,0 +1,11 @@
+import graphene
+
+from games.graphql.types import Purchase
+from games.models import Purchase as PurchaseModel
+
+
+class Query(graphene.ObjectType):
+    purchases = graphene.List(Purchase)
+
+    def resolve_purchases(self, info, **kwargs):
+        return PurchaseModel.objects.all()

games/graphql/queries/session.py

@@ -0,0 +1,11 @@
+import graphene
+
+from games.graphql.types import Session
+from games.models import Session as SessionModel
+
+
+class Query(graphene.ObjectType):
+    sessions = graphene.List(Session)
+
+    def resolve_sessions(self, info, **kwargs):
+        return SessionModel.objects.all()

games/graphql/types.py

@@ -0,0 +1,44 @@
+from graphene_django import DjangoObjectType
+
+from games.models import Device as DeviceModel
+from games.models import Edition as EditionModel
+from games.models import Game as GameModel
+from games.models import Platform as PlatformModel
+from games.models import Purchase as PurchaseModel
+from games.models import Session as SessionModel
+
+
+class Game(DjangoObjectType):
+    class Meta:
+        model = GameModel
+        fields = "__all__"
+
+
+class Edition(DjangoObjectType):
+    class Meta:
+        model = EditionModel
+        fields = "__all__"
+
+
+class Purchase(DjangoObjectType):
+    class Meta:
+        model = PurchaseModel
+        fields = "__all__"
+
+
+class Session(DjangoObjectType):
+    class Meta:
+        model = SessionModel
+        fields = "__all__"
+
+
+class Platform(DjangoObjectType):
+    class Meta:
+        model = PlatformModel
+        fields = "__all__"
+
+
+class Device(DjangoObjectType):
+    class Meta:
+        model = DeviceModel
+        fields = "__all__"

games/migrations/0007_alter_purchase_game_alter_purchase_platform_and_more.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-01-19 18:30
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0008_edition.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-02-18 16:29
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0010_alter_purchase_game.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-02-18 19:06
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0014_device_session_device.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-02-18 19:59
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0016_alter_edition_platform_alter_edition_year_released_and_more.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-06 11:10
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0016_alter_edition_platform_alter_edition_year_released_and_more_squashed_0022_rename_year_game_year_released.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-06 18:14
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 def rename_duplicates(apps, schema_editor):

games/migrations/0017_alter_device_type_alter_purchase_platform.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-06 16:53
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0027_purchase_related_purchase.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-14 08:41
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0028_purchase_name.py

@@ -1,6 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-14 11:05
 
 from django.db import migrations, models
+
 from games.models import Purchase
 
 

games/migrations/0029_alter_purchase_related_purchase.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-14 21:19
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0031_device_created_at_edition_created_at_game_created_at_and_more.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-15 13:51
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

games/migrations/0033_alter_edition_unique_together.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2023-11-28 13:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0032_alter_session_options_session_modified_at_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="edition",
+            unique_together={("name", "platform", "year_released")},
+        ),
+    ]

games/migrations/0034_purchase_status.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.7 on 2023-12-22 10:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0033_alter_edition_unique_together"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="purchase",
+            name="status",
+            field=models.IntegerField(
+                choices=[
+                    (0, "Unplayed"),
+                    (1, "Playing"),
+                    (2, "Dropped"),
+                    (3, "Finished"),
+                ],
+                default=0,
+            ),
+        ),
+    ]

games/migrations/0035_auto_20231222_1109.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.7 on 2023-12-22 10:09
+
+from django.db import migrations
+
+from games.models import Purchase
+
+
+def set_default_state(apps, schema_editor):
+    Purchase.objects.filter(session__isnull=False).update(
+        status=Purchase.PurchaseState.PLAYING
+    )
+    Purchase.objects.filter(date_finished__isnull=False).update(
+        status=Purchase.PurchaseState.FINISHED
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("games", "0034_purchase_status"),
+    ]
+
+    operations = [migrations.RunPython(set_default_state)]

games/models.py

@@ -34,7 +34,7 @@ class Game(models.Model):
 
 class Edition(models.Model):
     class Meta:
-        unique_together = [["name", "platform"]]
+        unique_together = [["name", "platform", "year_released"]]
 
     game = models.ForeignKey("Game", on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
@@ -133,6 +133,25 @@ class Purchase(models.Model):
     )
     created_at = models.DateTimeField(auto_now_add=True)
 
+    class PurchaseState(models.IntegerChoices):
+        UNPLAYED = (
+            0,
+            "Unplayed",
+        )
+        PLAYING = (1, "Playing")
+        DROPPED = (
+            2,
+            "Dropped",
+        )
+        FINISHED = (
+            3,
+            "Finished",
+        )
+
+    status = models.IntegerField(
+        choices=PurchaseState.choices, default=PurchaseState.UNPLAYED
+    )
+
     def __str__(self):
         additional_info = [
             self.get_type_display() if self.type != Purchase.GAME else "",

games/schema.py

@@ -0,0 +1,30 @@
+import graphene
+
+from games.graphql.mutations import GameMutation
+from games.graphql.queries import (
+    DeviceQuery,
+    EditionQuery,
+    GameQuery,
+    PlatformQuery,
+    PurchaseQuery,
+    SessionQuery,
+)
+
+
+class Query(
+    GameQuery,
+    EditionQuery,
+    DeviceQuery,
+    PlatformQuery,
+    PurchaseQuery,
+    SessionQuery,
+    graphene.ObjectType,
+):
+    pass
+
+
+class Mutation(GameMutation, graphene.ObjectType):
+    pass
+
+
+schema = graphene.Schema(query=Query, mutation=Mutation)

games/static/base.css

@@ -808,6 +808,10 @@ select {
   margin-bottom: 2.5rem;
 }
 
+.mb-2 {
+  margin-bottom: 0.5rem;
+}
+
 .mb-4 {
   margin-bottom: 1rem;
 }
@@ -1169,6 +1173,12 @@ select {
   font-style: normal;
 }
 
+a:hover {
+  text-decoration-color: #ff4400;
+  color: rgb(254, 185, 160);
+  transition: all 0.2s ease-out;
+}
+
 :is(.dark form label) {
   --tw-text-opacity: 1;
   color: rgb(148 163 184 / var(--tw-text-opacity));
@@ -1405,6 +1415,11 @@ th label {
   background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 }
 
+:is(.dark .dark\:text-slate-400) {
+  --tw-text-opacity: 1;
+  color: rgb(148 163 184 / var(--tw-text-opacity));
+}
+
 :is(.dark .dark\:text-slate-500) {
   --tw-text-opacity: 1;
   color: rgb(100 116 139 / var(--tw-text-opacity));
@@ -1468,10 +1483,6 @@ th label {
     display: block;
   }
 
-  .md\:w-1\/2 {
-    width: 50%;
-  }
-
   .md\:w-auto {
     width: auto;
   }

games/static/js/add_edition.js

@@ -1,24 +1,24 @@
-import { syncSelectInputUntilChanged } from './utils.js';
+import { syncSelectInputUntilChanged } from "./utils.js";
 
 let syncData = [
   {
-    "source": "#id_game",
-    "source_value": "dataset.name",
-    "target": "#id_name",
-    "target_value": "value"
+    source: "#id_game",
+    source_value: "dataset.name",
+    target: "#id_name",
+    target_value: "value",
   },
   {
-    "source": "#id_game",
-    "source_value": "textContent",
-    "target": "#id_sort_name",
-    "target_value": "value"
+    source: "#id_game",
+    source_value: "textContent",
+    target: "#id_sort_name",
+    target_value: "value",
   },
   {
-    "source": "#id_game",
-    "source_value": "dataset.year",
-    "target": "#id_year_released",
-    "target_value": "value"
+    source: "#id_game",
+    source_value: "dataset.year",
+    target: "#id_year_released",
+    target_value: "value",
   },
-]
+];
 
 syncSelectInputUntilChanged(syncData, "form");

games/static/js/add_game.js

@@ -1,12 +1,12 @@
-import { syncSelectInputUntilChanged } from './utils.js'
+import { syncSelectInputUntilChanged } from "./utils.js";
 
 let syncData = [
   {
-    "source": "#id_name",
-    "source_value": "value",
-    "target": "#id_sort_name",
-    "target_value": "value"
-  }
-]
+    source: "#id_name",
+    source_value: "value",
+    target: "#id_sort_name",
+    target_value: "value",
+  },
+];
 
-syncSelectInputUntilChanged(syncData, "form")
+syncSelectInputUntilChanged(syncData, "form");

games/static/js/add_purchase.js

@@ -2,7 +2,7 @@ import {
   syncSelectInputUntilChanged,
   getEl,
   disableElementsWhenTrue,
-  disableElementsWhenFalse,
+  disableElementsWhenValueNotEqual,
 } from "./utils.js";
 
 let syncData = [
@@ -21,7 +21,11 @@ function setupElementHandlers() {
     "#id_name",
     "#id_related_purchase",
   ]);
-  disableElementsWhenFalse("#id_type", "game", ["#id_date_finished"]);
+  disableElementsWhenValueNotEqual(
+    "#id_type",
+    ["game", "dlc"],
+    ["#id_date_finished"]
+  );
 }
 
 document.addEventListener("DOMContentLoaded", setupElementHandlers);
@@ -30,13 +34,13 @@ getEl("#id_type").onchange = () => {
   setupElementHandlers();
 };
 
-document.body.addEventListener('htmx:beforeRequest', function(event) {
+document.body.addEventListener("htmx:beforeRequest", function (event) {
   // Assuming 'Purchase1' is the element that triggers the HTMX request
-  if (event.target.id === 'id_edition') {
-      var idEditionValue = document.getElementById('id_edition').value;
+  if (event.target.id === "id_edition") {
+    var idEditionValue = document.getElementById("id_edition").value;
 
     // Condition to check - replace this with your actual logic
-      if (idEditionValue != '') {
+    if (idEditionValue != "") {
       event.preventDefault(); // This cancels the HTMX request
     }
   }

games/static/js/add_session.js

@@ -7,10 +7,14 @@ for (let button of document.querySelectorAll("[data-target]")) {
   button.addEventListener("click", (event) => {
     event.preventDefault();
     if (type == "now") {
-      targetElement.value = toISOUTCString(new Date);
+      targetElement.value = toISOUTCString(new Date());
     } else if (type == "copy") {
-      const oppositeName = targetElement.name == "timestamp_start" ? "timestamp_end" : "timestamp_start";
-      document.querySelector(`[name='${oppositeName}']`).value = targetElement.value;
+      const oppositeName =
+        targetElement.name == "timestamp_start"
+          ? "timestamp_end"
+          : "timestamp_start";
+      document.querySelector(`[name='${oppositeName}']`).value =
+        targetElement.value;
     } else if (type == "toggle") {
       if (targetElement.type == "datetime-local") targetElement.type = "text";
       else targetElement.type = "datetime-local";

games/static/js/utils.js

@@ -75,7 +75,10 @@ function syncSelectInputUntilChanged(syncData, parentSelector = document) {
  * @param {string} property - The property to retrieve the value from.
  */
 function getValueFromProperty(sourceElement, property) {
-  let source = (sourceElement instanceof HTMLSelectElement) ? sourceElement.selectedOptions[0] : sourceElement
+  let source =
+    sourceElement instanceof HTMLSelectElement
+      ? sourceElement.selectedOptions[0]
+      : sourceElement;
   if (property.startsWith("dataset.")) {
     let datasetKey = property.slice(8); // Remove 'dataset.' part
     return source.dataset[datasetKey];
@@ -93,13 +96,11 @@ function getValueFromProperty(sourceElement, property) {
  */
 function getEl(selector) {
   if (selector.startsWith("#")) {
-    return document.getElementById(selector.slice(1))
-  }
-  else if (selector.startsWith(".")) {
-    return document.getElementsByClassName(selector)
-  }
-  else {
-    return document.getElementsByTagName(selector)
+    return document.getElementById(selector.slice(1));
+  } else if (selector.startsWith(".")) {
+    return document.getElementsByClassName(selector);
+  } else {
+    return document.getElementsByTagName(selector);
   }
 }
 
@@ -116,7 +117,7 @@ function getEl(selector) {
 function conditionalElementHandler(...configs) {
   configs.forEach(([condition, targetElements, callbackfn1, callbackfn2]) => {
     if (condition()) {
-      targetElements.forEach(elementName => {
+      targetElements.forEach((elementName) => {
         let el = getEl(elementName);
         if (el === null) {
           console.error(`Element ${elementName} doesn't exist.`);
@@ -125,7 +126,7 @@ function conditionalElementHandler(...configs) {
         }
       });
     } else {
-      targetElements.forEach(elementName => {
+      targetElements.forEach((elementName) => {
         let el = getEl(elementName);
         if (el === null) {
           console.error(`Element ${elementName} doesn't exist.`);
@@ -137,16 +138,44 @@ function conditionalElementHandler(...configs) {
   });
 }
 
-function disableElementsWhenFalse(targetSelect, targetValue, elementList) {
+function disableElementsWhenValueNotEqual(
+  targetSelect,
+  targetValue,
+  elementList
+) {
   return conditionalElementHandler([
     () => {
-      return getEl(targetSelect).value != targetValue;
+      let target = getEl(targetSelect);
+      console.debug(
+        `${disableElementsWhenTrue.name}: triggered on ${target.id}`
+      );
+      console.debug(`
+      ${disableElementsWhenTrue.name}: matching against value(s): ${targetValue}`);
+      if (targetValue instanceof Array) {
+        if (targetValue.every((value) => target.value != value)) {
+          console.debug(
+            `${disableElementsWhenTrue.name}: none of the values is equal to ${target.value}, returning true.`
+          );
+          return true;
+        }
+      } else {
+        console.debug(
+          `${disableElementsWhenTrue.name}: none of the values is equal to ${target.value}, returning true.`
+        );
+        return target.value != targetValue;
+      }
     },
     elementList,
     (el) => {
+      console.debug(
+        `${disableElementsWhenTrue.name}: evaluated true, disabling ${el.id}.`
+      );
       el.disabled = "disabled";
     },
     (el) => {
+      console.debug(
+        `${disableElementsWhenTrue.name}: evaluated false, NOT disabling ${el.id}.`
+      );
       el.disabled = "";
     },
   ]);
@@ -167,4 +196,12 @@ function disableElementsWhenTrue(targetSelect, targetValue, elementList) {
   ]);
 }
 
-export { toISOUTCString, syncSelectInputUntilChanged, getEl, conditionalElementHandler, disableElementsWhenFalse, disableElementsWhenTrue, getValueFromProperty };
+export {
+  toISOUTCString,
+  syncSelectInputUntilChanged,
+  getEl,
+  conditionalElementHandler,
+  disableElementsWhenValueNotEqual,
+  disableElementsWhenTrue,
+  getValueFromProperty,
+};

games/templates/add.html

@@ -1,25 +1,24 @@
 {% extends "base.html" %}
 {% load static %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
             {% csrf_token %}
-
             {{ form.as_table }}
             <tr>
                 <td></td>
-            <td><input type="submit" value="Submit"/></td>
+                <td>
+                    <input type="submit" value="Submit" />
+                </td>
             </tr>
         </table>
     </form>
 {% endblock content %}
-
 {% block scripts %}
     {% if script_name %}
         <script type="module" src="{% static 'js/'|add:script_name %}"></script>
     {% endif %}
 {% endblock scripts %}
-        

games/templates/add_edition.html

@@ -1,29 +1,32 @@
 {% extends "base.html" %}
 {% load static %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
             {% csrf_token %}
-
             {{ form.as_table }}
             <tr>
                 <td></td>
-            <td><input type="submit" name="submit" value="Submit"/></td>
+                <td>
+                    <input type="submit" name="submit" value="Submit" />
+                </td>
             </tr>
             <tr>
                 <td></td>
-            <td><input type="submit" name="submit_and_redirect" value="Submit & Create Purchase"/></td>
+                <td>
+                    <input type="submit"
+                           name="submit_and_redirect"
+                           value="Submit & Create Purchase" />
+                </td>
             </tr>
         </table>
     </form>
 {% endblock content %}
-
 {% block scripts %}
     {% if script_name %}
         <script type="module" src="{% static 'js/'|add:script_name %}"></script>
     {% endif %}
 {% endblock scripts %}
-        

games/templates/add_game.html

@@ -1,29 +1,32 @@
 {% extends "base.html" %}
 {% load static %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
             {% csrf_token %}
-
             {{ form.as_table }}
             <tr>
                 <td></td>
-            <td><input type="submit" name="submit" value="Submit"/></td>
+                <td>
+                    <input type="submit" name="submit" value="Submit" />
+                </td>
             </tr>
             <tr>
                 <td></td>
-            <td><input type="submit" name="submit_and_redirect" value="Submit & Create Edition"/></td>
+                <td>
+                    <input type="submit"
+                           name="submit_and_redirect"
+                           value="Submit & Create Edition" />
+                </td>
             </tr>
         </table>
     </form>
 {% endblock content %}
-
 {% block scripts %}
     {% if script_name %}
         <script type="module" src="{% static 'js/'|add:script_name %}"></script>
     {% endif %}
 {% endblock scripts %}
-        

games/templates/add_purchase.html

@@ -1,29 +1,32 @@
 {% extends "base.html" %}
 {% load static %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
             {% csrf_token %}
-
             {{ form.as_table }}
             <tr>
                 <td></td>
-            <td><input type="submit" name="submit" value="Submit"/></td>
+                <td>
+                    <input type="submit" name="submit" value="Submit" />
+                </td>
             </tr>
             <tr>
                 <td></td>
-            <td><input type="submit" name="submit_and_redirect" value="Submit & Create Session"/></td>
+                <td>
+                    <input type="submit"
+                           name="submit_and_redirect"
+                           value="Submit & Create Session" />
+                </td>
             </tr>
         </table>
     </form>
 {% endblock content %}
-
 {% block scripts %}
     {% if script_name %}
         <script type="module" src="{% static 'js/'|add:script_name %}"></script>
     {% endif %}
 {% endblock scripts %}
-        

games/templates/add_session.html

@@ -1,12 +1,11 @@
 {% extends "base.html" %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
             {% csrf_token %}
-
             {% for field in form %}
                 <tr>
                     <th>{{ field.label_tag }}</th>
@@ -17,10 +16,12 @@
                     {% endif %}
                     {% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
                         <td>
-                <div class="basic-button-container">
-                    <button class="basic-button" data-target="{{field.name}}" data-type="now">Set to now</button>
-                    <button class="basic-button" data-target="{{field.name}}" data-type="toggle">Toggle text</button>
-                    <button class="basic-button" data-target="{{field.name}}" data-type="copy">Copy</button>
+                            <div class="basic-button-container" hx-boost="false">
+                                <button class="basic-button" data-target="{{ field.name }}" data-type="now">Set to now</button>
+                                <button class="basic-button"
+                                        data-target="{{ field.name }}"
+                                        data-type="toggle">Toggle text</button>
+                                <button class="basic-button" data-target="{{ field.name }}" data-type="copy">Copy</button>
                             </div>
                         </td>
                     {% endif %}
@@ -28,7 +29,9 @@
             {% endfor %}
             <tr>
                 <td></td>
-            <td><input type="submit" value="Submit"/></td>
+                <td>
+                    <input type="submit" value="Submit" />
+                </td>
             </tr>
         </table>
     </form>

games/templates/base.html

@@ -1,72 +1,108 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
-
     {% load static %}
-
     <head>
-        <meta charset="utf-8"/>
-        <meta name="description" content="Self-hosted time-tracker."/>
-        <meta name="keywords" content="time, tracking, video games, self-hosted"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1"/>
-        <title>Timetracker - {% block title %}Untitled{% endblock title %}</title>
+        <meta charset="utf-8" />
+        <meta name="description" content="Self-hosted time-tracker." />
+        <meta name="keywords" content="time, tracking, video games, self-hosted" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>Timetracker -
+            {% block title %}
+                Untitled
+            {% endblock title %}
+        </title>
         <script src="{% static 'js/htmx.min.js' %}"></script>
         <link rel="stylesheet" href="{% static 'base.css' %}" />
     </head>
-    
-    <body class="dark" hx-indicator="#indicator" hx-boost="true">
-        <img id="indicator" src="{% static 'icons/loading.png' %}" class="absolute right-3 top-3 animate-spin htmx-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"
+             height="24"
+             width="24"
+             alt="loading indicator" />
         <div class="dark:bg-gray-800 min-h-screen">
             <nav class="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
                 <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' %}" width="48" class="mr-4" /></span>
+                        <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">
+                        <ul class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
                             <li class="relative group">
-                                <a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New</a>
+                                <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>
+                                        <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>
+                                    <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>
+                                        <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>
+                                    <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>
+                                        <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>
+                                        <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_current_year' %}">Stats</a>
+                                    <a class="block py-2 pl-3 pr-4 hover:underline"
+                                       href="{% url 'stats_current_year' %}">Stats</a>
                                     <ul class="absolute hidden text-gray-700 pt-1 group-hover:block">
                                         {% 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>
+                                                <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 'list_sessions' %}">All Sessions</a>
+                                </li>
                             {% endif %}
                         </ul>
                     </div>
                 </div>
             </nav>
-            {% block content %}No content here.{% endblock content %}
+            {% block content %}
+                No content here.
+            {% endblock content %}
         </div>
         {% load version %}
         <span class="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span>
-    {% block scripts %}{% endblock scripts %}
+        {% block scripts %}
+        {% endblock scripts %}
     </body>
-
 </html>

games/templates/components/button.html

@@ -2,24 +2,11 @@
 title
 text
 {% endcomment %}
-<a
-  href="{{ link }}"
+<a href="{{ link }}"
    title="{{ title }}"
-  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"
->
-  {% comment %} <svg
-    xmlns="http://www.w3.org/2000/svg"
-    fill="none"
-    viewBox="0 0 24 24"
-    stroke-width="1.5"
-    stroke="currentColor"
-    class="self-center w-6 h-6 inline"
-  >
-    <path
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
-      /> 
+   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">
+    {% comment %} <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="self-center w-6 h-6 inline">
+    <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" /> 
     </svg>
     {% endcomment %}
     {{ text }}

games/templates/components/button_start.html

@@ -2,25 +2,17 @@
 title
 text
 {% endcomment %}
-<button
-  type="button"
+<button type="button"
         title="{{ title }}"
         autofocus
-  class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 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 text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg"
->
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
+        class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 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 text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg">
+    <svg xmlns="http://www.w3.org/2000/svg"
          fill="none"
          viewBox="0 0 24 24"
          stroke-width="1.5"
          stroke="currentColor"
-    class="self-center w-6 h-6 inline"
-  >
-    <path
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
-    />
+         class="self-center w-6 h-6 inline">
+        <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
     </svg>
     {{ text }}
 </button>

games/templates/components/edit_button.html

@@ -1,21 +1,13 @@
 <a href="{{ edit_url }}">
-  <button
-    type="button"
+    <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"
+            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"
-      />
+             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/index.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% block content %}
     <div class="text-slate-300 mx-auto max-w-screen-lg text-center">
         {% if session_count > 0 %}

games/templates/list_sessions.html

@@ -1,30 +1,25 @@
 {% extends 'base.html' %}
-
 {% load static %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% block content %}
-
-{% if dataset.count >= 1 %}
-<div class="mx-auto text-center my-4">
-  <a
-    id="last-session-start"
+    {% if dataset.count >= 1 %}
+        <div class="mx-auto text-center my-4">
+            <a id="last-session-start"
                href="{% url 'start_session_same_as_last' last.id %}"
                hx-get="{% url 'start_session_same_as_last' last.id %}"
                hx-swap="afterbegin"
                hx-target=".responsive-table tbody"
                hx-select=".responsive-table tbody tr:first-child"
                onClick="document.querySelector('#last-session-start').classList.add('invisible')"
-    class="{% if last.timestamp_end == null %}invisible{% endif %}"
-  >
+               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 %}
             </a>
-</div>
-{% endif %}
-
-{% if dataset.count != 0 %}
-<table class="responsive-table">
+        </div>
+    {% endif %}
+    {% if dataset.count != 0 %}
+        <table class="responsive-table">
             <thead>
                 <tr>
                     <th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
@@ -36,11 +31,8 @@
             <tbody>
                 {% for data in dataset %}
                     <tr>
-      <td
-        class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char md:max-w-40char"
-      >
-        <a
-          class="underline decoration-slate-500 sm:decoration-2"
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char md:max-w-40char">
+                            <a class="underline decoration-slate-500 sm:decoration-2"
                                href="{% url 'view_game' data.purchase.edition.game.id %}">
                                 {{ data.purchase.edition }}
                             </a>
@@ -50,15 +42,13 @@
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden lg:table-cell">
                             {% if data.unfinished %}
-        <a
-          href="{% url 'update_session' data.id %}"
+                                <a href="{% url 'update_session' data.id %}"
                                    hx-get="{% url 'update_session' data.id %}"
                                    hx-swap="outerHTML"
                                    hx-target=".responsive-table tbody tr:first-child"
                                    hx-select=".responsive-table tbody tr:first-child"
                                    hx-indicator="#indicator"
-          onClick="document.querySelector('#last-session-start').classList.remove('invisible')"
-          >
+                                   onClick="document.querySelector('#last-session-start').classList.remove('invisible')">
                                     <span class="text-yellow-300">Finish now?</span>
                                 </a>
                             {% elif data.duration_manual %}
@@ -67,14 +57,12 @@
                                 {{ data.timestamp_end | date:"d/m/Y H:i" }}
                             {% endif %}
                         </td>
-      <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-        {{ data.duration_formatted }}
-      </td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ data.duration_formatted }}</td>
                     </tr>
                 {% endfor %}
             </tbody>
-</table>
-{% else %}
-<div class="mx-auto text-center text-slate-300 text-xl">No sessions found.</div>
-{% endif %}
+        </table>
+    {% else %}
+        <div class="mx-auto text-center text-slate-300 text-xl">No sessions found.</div>
+    {% endif %}
 {% endblock content %}

games/templates/stats.html

@@ -1,23 +1,23 @@
 {% extends "base.html" %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% load static %}
-
 {% 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">
             <form method="get" class="text-center">
                 <label class="text-5xl text-center inline-block mb-10" for="yearSelect">Stats for:</label>
-                <select name="year" id="yearSelect" onchange="this.form.submit();" class="mx-2">
+                <select name="year"
+                        id="yearSelect"
+                        onchange="this.form.submit();"
+                        class="mx-2">
                     {% for year_item in stats_dropdown_year_range %}
                         <option value="{{ year_item }}" {% if year == year_item %}selected{% endif %}>{{ year_item }}</option>
                     {% endfor %}
                 </select>
             </form>
         </div>
-        <div class="flex flex-column flex-wrap justify-center">
-            <div class="md:w-1/2">
         <h1 class="text-5xl text-center my-6">Playtime</h1>
         <table class="responsive-table">
             <tbody>
@@ -49,10 +49,22 @@
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished ({{ year }})</td>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ this_year_finished_this_year.count }}</td>
                 </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">{{ longest_session_time }} ({{ longest_session_game }})</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">{{ highest_session_count }} ({{ highest_session_count_game }})</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 }} ({{ highest_session_average_game }})
+                    </td>
+                </tr>
             </tbody>
         </table>
-            </div>
-            <div class="md:w-1/2">
         <h1 class="text-5xl text-center my-6">Purchases</h1>
         <table class="responsive-table">
             <tbody>
@@ -62,11 +74,15 @@
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Refunded</td>
-                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_refunded_this_year.count }} ({{ refunded_percent }}%)</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                        {{ all_purchased_refunded_this_year.count }} ({{ refunded_percent }}%)
+                    </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Unfinished</td>
-                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchased_unfinished.count }} ({{ unfinished_purchases_percent }}%)</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                        {{ purchased_unfinished.count }} ({{ unfinished_purchases_percent }}%)
+                    </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Backlog Decrease</td>
@@ -78,8 +94,6 @@
                 </tr>
             </tbody>
         </table>
-            </div>
-        </div>
         <h1 class="text-5xl text-center my-6">Top games by playtime</h1>
         <table class="responsive-table">
             <thead>
@@ -92,9 +106,8 @@
                 {% for game in top_10_games_by_playtime %}
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        <a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'view_game' game.id  %}">{{ game.name }}
-
-                        </a>
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'view_game' game.id %}">{{ game.name }}</a>
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
                     </tr>
@@ -124,13 +137,24 @@
                 <tr>
                     <th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
                     <th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Playtime</th>
                 </tr>
             </thead>
             <tbody>
                 {% for purchase in all_finished_this_year %}
                     <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono"><a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a></td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'edit_purchase' purchase.id %}">
+                                {% if purchase.type == 'dlc' %}
+                                    {{ purchase.name }} ({{ purchase.edition.name }} DLC)
+                                {% else %}
+                                    {{ purchase.edition.name }}
+                                {% endif %}
+                            </a>
+                        </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.formatted_playtime }}</td>
                     </tr>
                 {% endfor %}
             </tbody>
@@ -146,7 +170,10 @@
             <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"><a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a></td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a>
+                        </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 %}
@@ -163,7 +190,10 @@
             <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"><a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a></td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a>
+                        </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 %}
@@ -182,11 +212,10 @@
                 {% for purchase in all_purchased_this_year %}
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        <a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'edit_purchase' purchase.id %}">
                                 {{ purchase.edition.name }}
-                        {% if purchase.type != "game" %}
-                        ({{ purchase.name }}, {{ purchase.get_type_display }})
-                        {% endif %}
+                                {% if purchase.type != "game" %}({{ purchase.name }}, {{ purchase.get_type_display }}){% endif %}
                             </a>
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>

games/templates/view_game.html

@@ -1,9 +1,8 @@
 {% extends "base.html" %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% block title %}
+    {{ title }}
+{% endblock title %}
 {% load static %}
-
 {% block content %}
     <div class="dark:text-white max-w-sm sm:max-w-xl lg:max-w-3xl mx-auto">
         <h1 class="text-4xl flex items-center">
@@ -15,10 +14,12 @@
         <h2 class="text-lg my-2 ml-2">
             {{ hours_sum }} <span class="dark:text-slate-500">total</span>
             {{ session_average }} <span class="dark:text-slate-500">avg</span>
-            ({{ playrange }}) </h2>
+            ({{ playrange }})
+        </h2>
         <hr class="border-slate-500">
-        <h1 class="text-3xl mt-4 mb-1">Editions <span class="dark:text-slate-500">({{ edition_count }})</span> and Purchases <span class="dark:text-slate-500">({{ purchase_count }})</span></h1>
-
+        <h1 class="text-3xl mt-4 mb-1">
+            Editions <span class="dark:text-slate-500">({{ edition_count }})</span> and Purchases <span class="dark:text-slate-500">({{ purchase_count }})</span>
+        </h1>
         <ul>
             {% for edition in editions %}
                 <li class="sm:pl-2 flex items-center">
@@ -26,7 +27,7 @@
                     {% if edition.wikidata %}
                         <span class="hidden sm:inline">
                             <a href="https://www.wikidata.org/wiki/{{ edition.wikidata }}">
-                            <img class="inline mx-2 w-6" src="{% static 'icons/wikidata.png' %}"/>
+                                <img class="inline mx-2 w-6" src="{% static 'icons/wikidata.png' %}" />
                             </a>
                         </span>
                     {% endif %}
@@ -36,14 +37,15 @@
                 <ul>
                     {% for purchase in edition.game_purchases %}
                         <li class="sm:pl-6 flex items-center">
-                        {{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}, {{ purchase.price }} {{ purchase.price_currency}}
+                            {{ 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}})
+                                    {{ 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>
@@ -53,44 +55,23 @@
                 </ul>
             {% endfor %}
         </ul>
-
         <h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center">
             Sessions
-            <span class="dark:text-slate-500">
-                ({{ sessions.count }})
-            </span>
+            <span class="dark:text-slate-500">({{ sessions.count }})</span>
             {% url 'start_game_session' game.id as add_session_link %}
             {% include 'components/button.html' with title="Start new session" text="New" link=add_session_link %}
+            and Notes <span class="dark:text-slate-500">({{ sessions_with_notes_count }})</span>
         </h1>
         <ul>
             {% for session in sessions %}
-            <li class="sm:pl-2 flex items-center">
-                {{ session.timestamp_start | date:"d/m/Y" }}
+                <li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center">
+                    {{ session.timestamp_start | date:"d/m/Y H:m" }}
                     ({{ 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 %}
                 </li>
+                <li class="sm:pl-4 italic">{{ session.note|linebreaks }}</li>
             {% endfor %}
         </ul>
-        <h1 class="text-3xl mt-4 mb-1">Notes <span class="dark:text-slate-500">({{ sessions_with_notes.count }})</span></h1>
-        <ul>
-            {% for session in sessions_with_notes %}
-            <li class="sm:pl-2">
-                <ul>
-                    <li class="block dark:text-slate-500">
-                        <span class="flex items-center">
-                            {{ session.timestamp_start | date:"d/m/Y H:m" }}
-                            {% url 'edit_session' session.id as edit_session_url %}
-                            {% include 'components/edit_button.html' with edit_url=edit_session_url %}
-                        </span>
-                    </li>
-                    <li class="sm:pl-4 italic">
-                        {{ session.note|linebreaks }}
-                    </li>
-                </ul>
-            </li>
-            {% endfor %}
-        </ul>
-        
     </div>
 {% endblock content %}

games/views.py

@@ -1,13 +1,18 @@
 from datetime import datetime, timedelta
 from typing import Any, Callable
 
-from django.db.models import Count, F, Prefetch, Sum
-from django.db.models.functions import TruncDate
-from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Avg, Count, ExpressionWrapper, F, Prefetch, Q, Sum, fields
+from django.db.models.functions import Extract, TruncDate
+from django.http import (
+    HttpRequest,
+    HttpResponse,
+    HttpResponseBadRequest,
+    HttpResponseRedirect,
+)
 from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.core.exceptions import ObjectDoesNotExist
 
 from common.time import format_duration
 from common.utils import safe_division
@@ -25,11 +30,11 @@ from .models import Edition, Game, Platform, Purchase, Session
 
 def model_counts(request):
     return {
-        "game_available": Game.objects.count() != 0,
-        "edition_available": Edition.objects.count() != 0,
-        "platform_available": Platform.objects.count() != 0,
-        "purchase_available": Purchase.objects.count() != 0,
-        "session_count": Session.objects.count(),
+        "game_available": Game.objects.exists(),
+        "edition_available": Edition.objects.exists(),
+        "platform_available": Platform.objects.exists(),
+        "purchase_available": Purchase.objects.exists(),
+        "session_count": Session.objects.exists(),
     }
 
 
@@ -174,7 +179,7 @@ def view_game(request, game_id=None):
         "purchase_count": Purchase.objects.filter(edition__game=game).count(),
         "session_average": round(total_hours / int(session_count), 1),
         "session_count": session_count,
-        "sessions_with_notes": sessions.exclude(note=""),
+        "sessions_with_notes_count": sessions.exclude(note="").count(),
         "sessions": sessions.order_by("-timestamp_start"),
         "title": f"Game Overview - {game.name}",
         "hours_sum": total_hours,
@@ -212,6 +217,8 @@ def edit_edition(request, edition_id=None):
 
 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
@@ -314,6 +321,22 @@ def stats(request, year: int = 0):
     if year == 0:
         year = timezone.now().year
     this_year_sessions = Session.objects.filter(timestamp_start__year=year)
+    this_year_sessions_with_durations = this_year_sessions.annotate(
+        duration=ExpressionWrapper(
+            F("timestamp_end") - F("timestamp_start"),
+            output_field=fields.DurationField(),
+        )
+    )
+    longest_session = this_year_sessions_with_durations.order_by("-duration").first()
+    this_year_games_with_session_counts = Game.objects.annotate(
+        session_count=Count(
+            "edition__purchase__session",
+            filter=Q(edition__purchase__session__timestamp_start__year=year),
+        )
+    )
+    game_highest_session_count = this_year_games_with_session_counts.order_by(
+        "-session_count"
+    ).first()
     selected_currency = "CZK"
     unique_days = (
         this_year_sessions.annotate(date=TruncDate("timestamp_start"))
@@ -337,8 +360,8 @@ def stats(request, year: int = 0):
     this_year_purchases_unfinished = this_year_purchases_without_refunded.filter(
         date_finished__isnull=True
     ).filter(
-        type=Purchase.GAME
-    )  # do not count DLC etc.
+        Q(type=Purchase.GAME) | Q(type=Purchase.DLC)
+    )  # do not count battle passes etc.
 
     this_year_purchases_unfinished_percent = int(
         safe_division(
@@ -348,6 +371,16 @@ def stats(request, year: int = 0):
     )
 
     purchases_finished_this_year = Purchase.objects.filter(date_finished__year=year)
+    purchases_finished_this_year_with_playtime = purchases_finished_this_year.annotate(
+        total_playtime=Sum(
+            F("session__duration_calculated") + F("session__duration_manual")
+        )
+    )
+
+    for purchase in purchases_finished_this_year_with_playtime:
+        formatted_playtime = format_duration(purchase.total_playtime, "%2.0H")
+        setattr(purchase, "formatted_playtime", formatted_playtime)
+
     purchases_finished_this_year_released_this_year = (
         purchases_finished_this_year.filter(edition__year_released=year).order_by(
             "date_finished"
@@ -374,6 +407,14 @@ def stats(request, year: int = 0):
         )
         .values("id", "name", "total_playtime")
     )
+    highest_session_average_game = (
+        Game.objects.filter(edition__purchase__session__in=this_year_sessions)
+        .annotate(
+            session_average=Avg("edition__purchase__session__duration_calculated")
+        )
+        .order_by("-session_average")
+        .first()
+    )
     top_10_games_by_playtime = games_with_playtime.order_by("-total_playtime")[:10]
     for game in top_10_games_by_playtime:
         game["formatted_playtime"] = format_duration(game["total_playtime"], "%2.0H")
@@ -411,7 +452,7 @@ def stats(request, year: int = 0):
         "spent_per_game": int(
             safe_division(total_spent, this_year_purchases_without_refunded.count())
         ),
-        "all_finished_this_year": purchases_finished_this_year.order_by(
+        "all_finished_this_year": purchases_finished_this_year_with_playtime.order_by(
             "date_finished"
         ),
         "this_year_finished_this_year": purchases_finished_this_year_released_this_year.order_by(
@@ -437,6 +478,18 @@ def stats(request, year: int = 0):
             "date_purchased"
         ),
         "backlog_decrease_count": backlog_decrease_count,
+        "longest_session_time": format_duration(
+            longest_session.duration if longest_session else timedelta(0),
+            "%2.0Hh %2.0mm",
+        ),
+        "longest_session_game": longest_session.purchase.edition.name,
+        "highest_session_count": game_highest_session_count.session_count,
+        "highest_session_count_game": game_highest_session_count.name,
+        "highest_session_average": format_duration(
+            highest_session_average_game.session_average, "%2.0Hh %2.0mm"
+        ),
+        "highest_session_average_game": highest_session_average_game,
+        "title": f"{year} Stats",
     }
 
     request.session["return_path"] = request.path

poetry.lock

@@ -1,10 +1,23 @@
-# This file is automatically @generated by Poetry and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+
+[[package]]
+name = "aniso8601"
+version = "9.0.1"
+description = "A library for parsing ISO 8601 strings."
+optional = false
+python-versions = "*"
+files = [
+    {file = "aniso8601-9.0.1-py2.py3-none-any.whl", hash = "sha256:1d2b7ef82963909e93c4f24ce48d4de9e66009a21bf1c1e1c85bdd0812fe412f"},
+    {file = "aniso8601-9.0.1.tar.gz", hash = "sha256:72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973"},
+]
+
+[package.extras]
+dev = ["black", "coverage", "isort", "pre-commit", "pyenchant", "pylint"]
 
 [[package]]
 name = "asgiref"
 version = "3.7.2"
 description = "ASGI specs, helper code, and adapters"
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -19,7 +32,6 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
 name = "black"
 version = "22.12.0"
 description = "The uncompromising code formatter."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -49,11 +61,21 @@ d = ["aiohttp (>=3.7.4)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
+[[package]]
+name = "cfgv"
+version = "3.4.0"
+description = "Validate configuration and produce human readable error messages."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "cfgv-3.4.0-py2.py3-none-any.whl", hash = "sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9"},
+    {file = "cfgv-3.4.0.tar.gz", hash = "sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560"},
+]
+
 [[package]]
 name = "click"
 version = "8.1.7"
 description = "Composable command line interface toolkit"
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -68,7 +90,6 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 name = "colorama"
 version = "0.4.6"
 description = "Cross-platform colored terminal text."
-category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
 files = [
@@ -80,7 +101,6 @@ files = [
 name = "cssbeautifier"
 version = "1.14.11"
 description = "CSS unobfuscator and beautifier."
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -92,11 +112,21 @@ editorconfig = ">=0.12.2"
 jsbeautifier = "*"
 six = ">=1.13.0"
 
+[[package]]
+name = "distlib"
+version = "0.3.7"
+description = "Distribution utilities"
+optional = false
+python-versions = "*"
+files = [
+    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
+    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
+]
+
 [[package]]
 name = "django"
 version = "4.2.7"
 description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
-category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -113,11 +143,25 @@ tzdata = {version = "*", markers = "sys_platform == \"win32\""}
 argon2 = ["argon2-cffi (>=19.1.0)"]
 bcrypt = ["bcrypt"]
 
+[[package]]
+name = "django-debug-toolbar"
+version = "4.2.0"
+description = "A configurable set of panels that display various debug information about the current request/response."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "django_debug_toolbar-4.2.0-py3-none-any.whl", hash = "sha256:af99128c06e8e794479e65ab62cc6c7d1e74e1c19beb44dcbf9bad7a9c017327"},
+    {file = "django_debug_toolbar-4.2.0.tar.gz", hash = "sha256:bc7fdaafafcdedefcc67a4a5ad9dac96efd6e41db15bc74d402a54a2ba4854dc"},
+]
+
+[package.dependencies]
+django = ">=3.2.4"
+sqlparse = ">=0.2"
+
 [[package]]
 name = "django-extensions"
 version = "3.2.3"
 description = "Extensions for Django"
-category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -132,7 +176,6 @@ Django = ">=3.2"
 name = "djhtml"
 version = "1.5.2"
 description = "Django/Jinja template indenter"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -146,7 +189,6 @@ dev = ["black", "flake8", "isort", "nox", "pre-commit"]
 name = "djlint"
 version = "1.34.0"
 description = "HTML Template Linter and Formatter"
-category = "dev"
 optional = false
 python-versions = ">=3.8.0,<4.0.0"
 files = [
@@ -171,7 +213,6 @@ tqdm = ">=4.62.2,<5.0.0"
 name = "editorconfig"
 version = "0.12.3"
 description = "EditorConfig File Locator and Interpreter for Python"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -179,11 +220,95 @@ files = [
     {file = "EditorConfig-0.12.3.tar.gz", hash = "sha256:57f8ce78afcba15c8b18d46b5170848c88d56fd38f05c2ec60dbbfcb8996e89e"},
 ]
 
+[[package]]
+name = "filelock"
+version = "3.13.1"
+description = "A platform independent file lock."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "filelock-3.13.1-py3-none-any.whl", hash = "sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c"},
+    {file = "filelock-3.13.1.tar.gz", hash = "sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e"},
+]
+
+[package.extras]
+docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.24)"]
+testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"]
+typing = ["typing-extensions (>=4.8)"]
+
+[[package]]
+name = "graphene"
+version = "3.3"
+description = "GraphQL Framework for Python"
+optional = false
+python-versions = "*"
+files = [
+    {file = "graphene-3.3-py2.py3-none-any.whl", hash = "sha256:bb3810be33b54cb3e6969506671eb72319e8d7ba0d5ca9c8066472f75bf35a38"},
+    {file = "graphene-3.3.tar.gz", hash = "sha256:529bf40c2a698954217d3713c6041d69d3f719ad0080857d7ee31327112446b0"},
+]
+
+[package.dependencies]
+aniso8601 = ">=8,<10"
+graphql-core = ">=3.1,<3.3"
+graphql-relay = ">=3.1,<3.3"
+
+[package.extras]
+dev = ["black (==22.3.0)", "coveralls (>=3.3,<4)", "flake8 (>=4,<5)", "iso8601 (>=1,<2)", "mock (>=4,<5)", "pytest (>=6,<7)", "pytest-asyncio (>=0.16,<2)", "pytest-benchmark (>=3.4,<4)", "pytest-cov (>=3,<4)", "pytest-mock (>=3,<4)", "pytz (==2022.1)", "snapshottest (>=0.6,<1)"]
+test = ["coveralls (>=3.3,<4)", "iso8601 (>=1,<2)", "mock (>=4,<5)", "pytest (>=6,<7)", "pytest-asyncio (>=0.16,<2)", "pytest-benchmark (>=3.4,<4)", "pytest-cov (>=3,<4)", "pytest-mock (>=3,<4)", "pytz (==2022.1)", "snapshottest (>=0.6,<1)"]
+
+[[package]]
+name = "graphene-django"
+version = "3.1.5"
+description = "Graphene Django integration"
+optional = false
+python-versions = "*"
+files = [
+    {file = "graphene-django-3.1.5.tar.gz", hash = "sha256:abe42f820b9731d94bebff6d73088d0dc2ffb8c8863a6d7bf3d378412d866a3b"},
+    {file = "graphene_django-3.1.5-py2.py3-none-any.whl", hash = "sha256:2e42742fae21fa50e514f3acae26a9bc6cb5e51c179a97b3db5390ff258ca816"},
+]
+
+[package.dependencies]
+Django = ">=3.2"
+graphene = ">=3.0,<4"
+graphql-core = ">=3.1.0,<4"
+graphql-relay = ">=3.1.1,<4"
+promise = ">=2.1"
+text-unidecode = "*"
+
+[package.extras]
+dev = ["black (==23.7.0)", "coveralls", "django-filter (>=22.1)", "djangorestframework (>=3.6.3)", "mock", "pre-commit", "pytest (>=7.3.1)", "pytest-cov", "pytest-django (>=4.5.2)", "pytest-random-order", "pytz", "ruff (==0.0.283)"]
+rest-framework = ["djangorestframework (>=3.6.3)"]
+test = ["coveralls", "django-filter (>=22.1)", "djangorestframework (>=3.6.3)", "mock", "pytest (>=7.3.1)", "pytest-cov", "pytest-django (>=4.5.2)", "pytest-random-order", "pytz"]
+
+[[package]]
+name = "graphql-core"
+version = "3.2.3"
+description = "GraphQL implementation for Python, a port of GraphQL.js, the JavaScript reference implementation for GraphQL."
+optional = false
+python-versions = ">=3.6,<4"
+files = [
+    {file = "graphql-core-3.2.3.tar.gz", hash = "sha256:06d2aad0ac723e35b1cb47885d3e5c45e956a53bc1b209a9fc5369007fe46676"},
+    {file = "graphql_core-3.2.3-py3-none-any.whl", hash = "sha256:5766780452bd5ec8ba133f8bf287dc92713e3868ddd83aee4faab9fc3e303dc3"},
+]
+
+[[package]]
+name = "graphql-relay"
+version = "3.2.0"
+description = "Relay library for graphql-core"
+optional = false
+python-versions = ">=3.6,<4"
+files = [
+    {file = "graphql-relay-3.2.0.tar.gz", hash = "sha256:1ff1c51298356e481a0be009ccdff249832ce53f30559c1338f22a0e0d17250c"},
+    {file = "graphql_relay-3.2.0-py3-none-any.whl", hash = "sha256:c9b22bd28b170ba1fe674c74384a8ff30a76c8e26f88ac3aa1584dd3179953e5"},
+]
+
+[package.dependencies]
+graphql-core = ">=3.2,<3.3"
+
 [[package]]
 name = "gunicorn"
 version = "20.1.0"
 description = "WSGI HTTP Server for UNIX"
-category = "main"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -204,7 +329,6 @@ tornado = ["tornado (>=0.2)"]
 name = "h11"
 version = "0.14.0"
 description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -216,7 +340,6 @@ files = [
 name = "html-tag-names"
 version = "0.1.2"
 description = "List of known HTML tag names"
-category = "dev"
 optional = false
 python-versions = ">=3.7,<4.0"
 files = [
@@ -228,7 +351,6 @@ files = [
 name = "html-void-elements"
 version = "0.1.0"
 description = "List of HTML void tag names."
-category = "dev"
 optional = false
 python-versions = ">=3.7,<4.0"
 files = [
@@ -236,11 +358,24 @@ files = [
     {file = "html_void_elements-0.1.0-py3-none-any.whl", hash = "sha256:784cf39db03cdeb017320d9301009f8f3480f9d7b254d0974272e80e0cb5e0d2"},
 ]
 
+[[package]]
+name = "identify"
+version = "2.5.32"
+description = "File identification library for Python"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "identify-2.5.32-py2.py3-none-any.whl", hash = "sha256:0b7656ef6cba81664b783352c73f8c24b39cf82f926f78f4550eda928e5e0545"},
+    {file = "identify-2.5.32.tar.gz", hash = "sha256:5d9979348ec1a21c768ae07e0a652924538e8bce67313a73cb0f681cf08ba407"},
+]
+
+[package.extras]
+license = ["ukkonen"]
+
 [[package]]
 name = "iniconfig"
 version = "2.0.0"
 description = "brain-dead simple config-ini parsing"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -252,7 +387,6 @@ files = [
 name = "isort"
 version = "5.12.0"
 description = "A Python utility / library to sort Python imports."
-category = "dev"
 optional = false
 python-versions = ">=3.8.0"
 files = [
@@ -270,7 +404,6 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"]
 name = "jsbeautifier"
 version = "1.14.11"
 description = "JavaScript unobfuscator and beautifier."
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -285,7 +418,6 @@ six = ">=1.13.0"
 name = "json5"
 version = "0.9.14"
 description = "A Python implementation of the JSON5 data format."
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -300,7 +432,6 @@ dev = ["hypothesis"]
 name = "markupsafe"
 version = "2.1.3"
 description = "Safely add untrusted strings to HTML/XML markup."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -370,7 +501,6 @@ files = [
 name = "mypy"
 version = "0.991"
 description = "Optional static typing for Python"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -420,7 +550,6 @@ reports = ["lxml"]
 name = "mypy-extensions"
 version = "1.0.0"
 description = "Type system extensions for programs checked with the mypy type checker."
-category = "dev"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -428,11 +557,24 @@ files = [
     {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
 ]
 
+[[package]]
+name = "nodeenv"
+version = "1.8.0"
+description = "Node.js virtual environment builder"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
+files = [
+    {file = "nodeenv-1.8.0-py2.py3-none-any.whl", hash = "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec"},
+    {file = "nodeenv-1.8.0.tar.gz", hash = "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2"},
+]
+
+[package.dependencies]
+setuptools = "*"
+
 [[package]]
 name = "packaging"
 version = "23.2"
 description = "Core utilities for Python packages"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -444,7 +586,6 @@ files = [
 name = "pathspec"
 version = "0.11.2"
 description = "Utility library for gitignore style pattern matching of file paths."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -456,7 +597,6 @@ files = [
 name = "platformdirs"
 version = "4.0.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -472,7 +612,6 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co
 name = "pluggy"
 version = "1.3.0"
 description = "plugin and hook calling mechanisms for python"
-category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -484,11 +623,44 @@ files = [
 dev = ["pre-commit", "tox"]
 testing = ["pytest", "pytest-benchmark"]
 
+[[package]]
+name = "pre-commit"
+version = "3.5.0"
+description = "A framework for managing and maintaining multi-language pre-commit hooks."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "pre_commit-3.5.0-py2.py3-none-any.whl", hash = "sha256:841dc9aef25daba9a0238cd27984041fa0467b4199fc4852e27950664919f660"},
+    {file = "pre_commit-3.5.0.tar.gz", hash = "sha256:5804465c675b659b0862f07907f96295d490822a450c4c40e747d0b1c6ebcb32"},
+]
+
+[package.dependencies]
+cfgv = ">=2.0.0"
+identify = ">=1.0.0"
+nodeenv = ">=0.11.1"
+pyyaml = ">=5.1"
+virtualenv = ">=20.10.0"
+
+[[package]]
+name = "promise"
+version = "2.3"
+description = "Promises/A+ implementation for Python"
+optional = false
+python-versions = "*"
+files = [
+    {file = "promise-2.3.tar.gz", hash = "sha256:dfd18337c523ba4b6a58801c164c1904a9d4d1b1747c7d5dbf45b693a49d93d0"},
+]
+
+[package.dependencies]
+six = "*"
+
+[package.extras]
+test = ["coveralls", "futures", "mock", "pytest (>=2.7.3)", "pytest-benchmark", "pytest-cov"]
+
 [[package]]
 name = "pytest"
 version = "7.4.3"
 description = "pytest: simple powerful testing with Python"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -509,7 +681,6 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no
 name = "pyyaml"
 version = "6.0.1"
 description = "YAML parser and emitter for Python"
-category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -569,7 +740,6 @@ files = [
 name = "regex"
 version = "2023.10.3"
 description = "Alternative regular expression module, to replace re."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -665,18 +835,17 @@ files = [
 
 [[package]]
 name = "setuptools"
-version = "68.2.2"
+version = "69.0.2"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
-category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
-    {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
+    {file = "setuptools-69.0.2-py3-none-any.whl", hash = "sha256:1e8fdff6797d3865f37397be788a4e3cba233608e9b509382a2777d25ebde7f2"},
+    {file = "setuptools-69.0.2.tar.gz", hash = "sha256:735896e78a4742605974de002ac60562d286fa8051a7e2299445e8e8fbb01aa6"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
@@ -684,7 +853,6 @@ testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jar
 name = "six"
 version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
-category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 files = [
@@ -696,7 +864,6 @@ files = [
 name = "sqlparse"
 version = "0.4.4"
 description = "A non-validating SQL parser."
-category = "main"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -709,11 +876,21 @@ dev = ["build", "flake8"]
 doc = ["sphinx"]
 test = ["pytest", "pytest-cov"]
 
+[[package]]
+name = "text-unidecode"
+version = "1.3"
+description = "The most basic Text::Unidecode port"
+optional = false
+python-versions = "*"
+files = [
+    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
+    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
+]
+
 [[package]]
 name = "tqdm"
 version = "4.66.1"
 description = "Fast, Extensible Progress Meter"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -734,7 +911,6 @@ telegram = ["requests"]
 name = "typing-extensions"
 version = "4.8.0"
 description = "Backported and Experimental Type Hints for Python 3.8+"
-category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -746,7 +922,6 @@ files = [
 name = "tzdata"
 version = "2023.3"
 description = "Provider of IANA time zone data"
-category = "main"
 optional = false
 python-versions = ">=2"
 files = [
@@ -758,7 +933,6 @@ files = [
 name = "uvicorn"
 version = "0.20.0"
 description = "The lightning-fast ASGI server."
-category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -773,11 +947,30 @@ h11 = ">=0.8"
 [package.extras]
 standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", "pyyaml (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "watchfiles (>=0.13)", "websockets (>=10.4)"]
 
+[[package]]
+name = "virtualenv"
+version = "20.24.7"
+description = "Virtual Python Environment builder"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "virtualenv-20.24.7-py3-none-any.whl", hash = "sha256:a18b3fd0314ca59a2e9f4b556819ed07183b3e9a3702ecfe213f593d44f7b3fd"},
+    {file = "virtualenv-20.24.7.tar.gz", hash = "sha256:69050ffb42419c91f6c1284a7b24e0475d793447e35929b488bf6a0aade39353"},
+]
+
+[package.dependencies]
+distlib = ">=0.3.7,<1"
+filelock = ">=3.12.2,<4"
+platformdirs = ">=3.9.1,<5"
+
+[package.extras]
+docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
+test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"]
+
 [[package]]
 name = "werkzeug"
 version = "2.3.8"
 description = "The comprehensive WSGI web application library."
-category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -793,5 +986,5 @@ watchdog = ["watchdog (>=2.3)"]
 
 [metadata]
 lock-version = "2.0"
-python-versions = "^3.11"
-content-hash = "c82d09d48e81655bd981938540184878d986253d41858277180d3a48244fd069"
+python-versions = "^3.12"
+content-hash = "e864dc8abf6c84e5bb16ac2aa937c2a70561d15f3e8a1459866b9d6507e8773e"

pyproject.toml

@@ -12,6 +12,7 @@ python = "^3.12"
 django = "^4.2.0"
 gunicorn = "^20.1.0"
 uvicorn = "^0.20.0"
+graphene-django = "^3.1.5"
 
 [tool.poetry.group.dev.dependencies]
 black = "^22.12.0"
@@ -23,6 +24,11 @@ werkzeug = "^2.2.2"
 djhtml = "^1.5.2"
 djlint = "^1.19.11"
 isort = "^5.11.4"
+pre-commit = "^3.5.0"
+django-debug-toolbar = "^4.2.0"
+
+[tool.isort]
+profile = "black"
 
 [build-system]
 requires = ["poetry-core"]

tests/test_graphql.py

@@ -0,0 +1,35 @@
+import json
+import os
+
+import django
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
+django.setup()
+
+from django.test import TestCase
+from graphene_django.utils.testing import GraphQLTestCase
+
+from games import schema
+from games.models import Game
+
+
+class GameAPITestCase(GraphQLTestCase):
+    GRAPHENE_SCHEMA = schema.schema
+
+    def test_query_all_games(self):
+        response = self.query(
+            """
+        query {
+            games {
+                id
+                name
+            }
+        }
+        """
+        )
+
+        self.assertResponseNoErrors(response)
+        self.assertEqual(
+            len(json.loads(response.content)["data"]["games"]),
+            Game.objects.count(),
+        )

timetracker/settings.py

@@ -38,11 +38,15 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "graphene_django",
 ]
 
+GRAPHENE = {"SCHEMA": "games.schema.schema"}
+
 if DEBUG:
     INSTALLED_APPS.append("django_extensions")
     INSTALLED_APPS.append("django.contrib.admin")
+    INSTALLED_APPS.append("debug_toolbar")
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
@@ -54,6 +58,11 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
+if DEBUG:
+    MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware")
+    INTERNAL_IPS = ["127.0.0.1"]
+    DEBUG_TOOLBAR_CONFIG = {"ROOT_TAG_EXTRA_ATTRS": "hx-preserve"}
+
 ROOT_URLCONF = "timetracker.urls"
 
 TEMPLATES = [

timetracker/urls.py

@@ -16,12 +16,16 @@ Including another URLconf
 from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
+from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView
+from graphene_django.views import GraphQLView
 
 urlpatterns = [
     path("", RedirectView.as_view(url="/tracker")),
     path("tracker/", include("games.urls")),
+    path("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True))),
 ]
 
 if settings.DEBUG:
     urlpatterns.append(path("admin/", admin.site.urls))
+    urlpatterns.append(path("__debug__/", include("debug_toolbar.urls")))