Reformat

Fixed #72

.dockerignore

@@ -5,4 +5,13 @@
 .venv
 .vscode
 node_modules
-src/timetracker/static/*
+static
+.drone.yml
+.editorconfig
+.gitignore
+Caddyfile
+CHANGELOG.md
+db.sqlite3
+docker-compose*
+Dockerfile
+Makefile

.drone.yml

@@ -5,11 +5,12 @@ name: default
 
 steps:
 - name: test
-  image: python:3.10
+  image: python:3.12
   commands:
     - python -m pip install poetry
     - poetry install
     - poetry env info
+    - poetry run python manage.py migrate
     - poetry run pytest
 
 - name: build-prod

.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,9 +1,11 @@
 __pycache__
 .mypy_cache
 .pytest_cache
-.venv
+.venv/
 node_modules
 package-lock.json
 db.sqlite3
 /static/
-dist/
+dist/
+.DS_Store
+.python-version

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+repos:
+-   repo: https://github.com/psf/black
+    rev: 24.3.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

CHANGELOG.md

@@ -1,3 +1,134 @@
+## Unreleased
+
+## New
+* Render notes as Markdown
+* Require login by default
+* Add stats for dropped purchases, monthly playtimes
+* Allow deleting purchases
+* Add all-time stats
+
+## Improved
+* mark refunded purchases red on game overview
+* increase session count on game overview when starting a new session
+* game overview:
+  * sort purchases also by date purchased (on top of date released)
+  * improve header format, make it more appealing
+  * ignore manual sessions when calculating session average
+* stats: improve purchase name consistency
+* session list: use display name instead of sort name
+* unify the appearance of game links, and make them expand to full size on hover
+
+## Fixed
+* Fix title not being displayed on the Recent sessions page
+* Avoid errors when displaying game overview with zero sessions
+
+## 1.5.2 / 2024-01-14 21:27+01:00
+
+## Improved
+* game overview:
+  * improve how editions and purchases are displayed
+  * make it possible to end session from overview
+* add purchase: only allow choosing purchases of selected edition
+* session list:
+  * starting and ending sessions is much faster/doest not reload the page
+  * listing sessions is much faster
+
+## 1.5.1 / 2023-11-14 21:10+01:00
+
+## Improved
+* Disallow choosing non-game purchase as related purchase
+* Improve display of purchases
+
+## 1.5.0 / 2023-11-14 19:27+01:00
+
+## New
+* Add stat for finished this year's games
+* Add purchase types:
+  * Game (previously all of them were this type)
+  * DLC
+  * Season Pass
+  * Battle Pass
+
+## Fixed
+* Order purchases by date on game view
+
+## 1.4.0 / 2023-11-09 21:01+01:00
+
+### New
+* More fields are now optional. This is to make it easier to add new items in bulk.
+  * Game: Wikidata ID
+  * Edition: Platform, Year
+  * Purchase: Platform
+  * Platform: Group
+  * Session: Device
+* New fields:
+  * Game: Year Released
+    * To record original year of release
+    * Upon migration, this will be set to a year of any of the game's edition that has it set
+  * Purchase: Date Finished
+* Editions are now unique combination of name and platform
+* Add more stats:
+  * All finished games
+  * All finished 2023 games
+  * All finished games that were purchased this year
+  * Sessions (count)
+  * Days played
+  * Finished (count)
+  * Unfinished (count)
+  * Refunded (count)
+  * Backlog Decrease (count)
+* New workflow:
+  * Adding Game, Edition, Purchase, and Session in a row is now much faster
+
+### Improved
+* game overview: simplify playtime range display
+* new session: order devices alphabetically
+* ignore English articles when sorting names
+  * added a new sort_name field that gets automatically created
+* automatically fill certain values in forms:
+  * new game: name and sort name after typing
+  * new edition: name, sort name, and year when selecting game
+  * new purchase: platform when selecting edition
+
+## 1.3.0 / 2023-11-05 15:09+01:00
+
+### New
+* Add Stats to the main navigation
+* Allow selecting year on the Stats page
+
+### Improved
+* Make some pages redirect back instead to session list
+
+### Improved
+* Make navigation more compact
+
+### Fixed
+* Correctly limit sessions to a single year for stats
+
+## 1.2.0 / 2023-11-01 20:18+01:00
+
+### New
+* Add yearly stats page (https://git.kucharczyk.xyz/lukas/timetracker/issues/15)
+
+### Enhancements
+* Add a button to start session from game overview
+
+## 1.1.2 / 2023-10-13 16:30+02:00
+
+### Enhancements
+* Durations are formatted in a consisent manner across all pages
+
+### Fixes
+* Game Overview: display duration when >1 hour instead of displaying 0
+
+## 1.1.1 / 2023-10-09 20:52+02:00
+
+### New
+* Add notes section to game overview
+
+### Enhancements
+* Make it possible to add any data on the game overview page
+
 ## 1.1.0 / 2023-10-09 00:01+02:00
 
 ### New

Dockerfile

@@ -1,34 +1,45 @@
-FROM node as css
-WORKDIR /app
-COPY . /app
-RUN npm install && \
-    npx tailwindcss -i ./common/input.css -o ./static/base.css --minify
+FROM python:3.12.0-slim-bullseye
 
-FROM python:3.10.9-slim-bullseye
+ENV VERSION_NUMBER=1.5.2 \
+    PROD=1 \
+    PYTHONUNBUFFERED=1 \
+    PYTHONFAULTHANDLER=1 \
+    PYTHONHASHSEED=random \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PIP_NO_CACHE_DIR=1 \
+    PIP_DISABLE_PIP_VERSION_CHECK=1 \
+    PIP_DEFAULT_TIMEOUT=100 \
+    PIP_ROOT_USER_ACTION=ignore \
+    POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_CREATE=false \
+    POETRY_CACHE_DIR='/var/cache/pypoetry' \
+    POETRY_HOME='/usr/local'
 
-ENV VERSION_NUMBER 1.1.0
-ENV PROD 1
-ENV PYTHONUNBUFFERED=1
-
-RUN apt update && \
-    apt install -y \
+RUN apt-get update && apt-get upgrade -y \
+  && apt-get install --no-install-recommends -y \
     bash \
-    vim \
-    curl && \
-    rm -rf /var/lib/apt/lists/*
+    curl \
+  && curl -sSL 'https://install.python-poetry.org' | python - \
+  && poetry --version \
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
-RUN useradd -m --uid 1000 timetracker
+RUN useradd -m --uid 1000 timetracker \
+    && mkdir -p '/var/www/django/static' \
+    && chown timetracker:timetracker '/var/www/django/static'
 WORKDIR /home/timetracker/app
 COPY . /home/timetracker/app/
 RUN chown -R timetracker:timetracker /home/timetracker/app
-COPY --from=css ./app/static/base.css /home/timetracker/app/static/base.css
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
+RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \
+    echo "$PROD" \
+    && poetry version \
+    && poetry run pip install -U pip \
+    && poetry install --only main --no-interaction --no-ansi --sync
+
 USER timetracker
-ENV PATH="$PATH:/home/timetracker/.local/bin"
-RUN pip install --no-cache-dir poetry
-RUN poetry install
 
 EXPOSE 8000
 CMD [ "/entrypoint.sh" ]

Makefile

@@ -3,6 +3,7 @@ all: css migrate
 initialize: npm css migrate sethookdir loadplatforms
 
 HTMLFILES := $(shell find games/templates -type f)
+PYTHON_VERSION = 3.12
 
 npm:
 	npm install
@@ -10,17 +11,26 @@ npm:
 css: common/input.css
 	npx tailwindcss -i ./common/input.css -o  ./games/static/base.css
 
-css-dev: css
-	npx tailwindcss -i ./common/input.css -o  ./games/static/base.css --watch
-
 makemigrations:
 	poetry run python manage.py makemigrations
 
 migrate: makemigrations
 	poetry run python manage.py migrate
 
-dev: migrate
-	poetry run python manage.py runserver
+init:
+	pyenv install -s $(PYTHON_VERSION)
+	pyenv local $(PYTHON_VERSION)
+	pip install poetry
+	poetry install
+	npm install
+
+dev:
+	@npx concurrently \
+		--names "Django,Tailwind" \
+		--prefix-colors "blue,green" \
+		"poetry run python -Wa manage.py runserver" \
+		"npx tailwindcss -i ./common/input.css -o ./games/static/base.css --watch"
+
 
 caddy:
 	caddy run --watch

README.md

@@ -1,3 +1,15 @@
 # Timetracker
 
-A simple game catalogue and play session tracker.
+A simple game catalogue and play session tracker.
+
+# Development
+
+The project uses `pyenv` to manage installed Python versions.
+If you have `pyenv` installed, you can simply run:
+
+```
+make init
+```
+
+This will make sure the correct Python version is installed, and it will install all dependencies using `poetry`.
+Afterwards, you can start the development server using `make dev`.

common/input.css

@@ -4,7 +4,7 @@
 
 @font-face {
   font-family: "IBM Plex Mono";
-  src: url("fonts/IBMPlexMono-regular.woff2") format("woff2");
+  src: url("fonts/IBMPlexMono-Regular.woff2") format("woff2");
   font-weight: 400;
   font-style: normal;
 }
@@ -23,12 +23,33 @@
   font-style: normal;
 }
 
+@font-face {
+  font-family: "IBM Plex Serif";
+  src: url("fonts/IBMPlexSerif-Bold.woff2") format("woff2");
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "IBM Plex Sans Condensed";
+  src: url("fonts/IBMPlexSansCondensed-Regular.woff2") format("woff2");
+  font-weight: 400;
+  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;
 }
 
 .responsive-table {
-  @apply dark:text-white mx-auto;
+  @apply dark:text-white mx-auto table-fixed;
 }
 
 .responsive-table tr:nth-child(even) {
@@ -52,8 +73,11 @@ form label {
   .max-w-20char {
     max-width: 20ch;
   }
+  .max-w-30char {
+    max-width: 30ch;
+  }
   .max-w-35char {
-    max-width: 40ch;
+    max-width: 35ch;
   }
   .max-w-40char {
     max-width: 40ch;
@@ -66,6 +90,16 @@ textarea {
   @apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
 }
 
+form input:disabled,
+select:disabled,
+textarea:disabled {
+  @apply dark:bg-slate-700 dark:text-slate-400;
+}
+
+.errorlist {
+  @apply mt-4 mb-1 pl-3 py-2 bg-red-600 text-slate-200 w-[300px];
+}
+
 @media screen and (min-width: 768px) {
   form input,
   select,
@@ -101,3 +135,39 @@ th label {
 .basic-button {
   @apply inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight uppercase rounded shadow-md hover:bg-blue-700 hover:shadow-lg focus:bg-blue-700 focus:shadow-lg focus:outline-none focus:ring-0 active:bg-blue-800 active:shadow-lg transition duration-150 ease-in-out;
 }
+
+.markdown-content ul {
+  list-style-type: disc;
+  list-style-position: inside;
+  padding-left: 1em;
+}
+
+.markdown-content ol {
+  list-style-type: decimal;
+  list-style-position: inside;
+  padding-left: 1em;
+}
+
+.markdown-content ul, 
+.markdown-content ol {
+    list-style-position: outside;
+    padding-left: 1em;
+}
+
+.markdown-content ul ul, 
+.markdown-content ul ol, 
+.markdown-content ol ul, 
+.markdown-content ol ol {
+    list-style-type: circle;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    padding-left: 1em;
+}
+
+/* .truncate-container {
+  @apply inline-block relative;
+  a {
+    @apply inline-block truncate max-w-20char transition-all group-hover:absolute group-hover:max-w-none group-hover:-top-8 group-hover:-left-6 group-hover:min-w-60 group-hover:px-6 group-hover:py-3.5 group-hover:bg-purple-600 group-hover:rounded-sm group-hover:outline-dashed group-hover:outline-purple-400 group-hover:outline-4;
+    
+  }  
+} */

common/time.py

@@ -1,12 +1,5 @@
 import re
-from datetime import datetime, timedelta
-from zoneinfo import ZoneInfo
-
-from django.conf import settings
-
-
-def now() -> datetime:
-    return datetime.now(ZoneInfo(settings.TIME_ZONE))
+from datetime import timedelta
 
 
 def _safe_timedelta(duration: timedelta | int | None):
@@ -32,6 +25,8 @@ def format_duration(
     from the formatting string. For example:
     - 61 seconds as "%s" = 61 seconds
     - 61 seconds as "%m %s" = 1 minutes 1 seconds"
+    Format specifiers can include width and precision options:
+    - %5.2H: hours formatted with width 5 and 2 decimal places (padded with zeros)
     """
     minute_seconds = 60
     hour_seconds = 60 * minute_seconds
@@ -42,22 +37,36 @@ def format_duration(
     # timestamps where end is before start
     if seconds_total < 0:
         seconds_total = 0
-    days = hours = minutes = seconds = 0
+    days = hours = hours_float = minutes = seconds = 0
     remainder = seconds = seconds_total
     if "%d" in format_string:
         days, remainder = divmod(seconds_total, day_seconds)
-    if "%H" in format_string:
-        hours, remainder = divmod(remainder, hour_seconds)
-    if "%m" in format_string:
+    if re.search(r"%\d*\.?\d*H", format_string):
+        hours_float, remainder = divmod(remainder, hour_seconds)
+        hours = float(hours_float) + remainder / hour_seconds
+    if re.search(r"%\d*\.?\d*m", format_string):
         minutes, seconds = divmod(remainder, minute_seconds)
     literals = {
-        "%d": str(days),
-        "%H": str(hours),
-        "%m": str(minutes),
-        "%s": str(seconds),
-        "%r": str(seconds_total),
+        "d": str(days),
+        "H": str(hours) if "m" not in format_string else str(hours_float),
+        "m": str(minutes),
+        "s": str(seconds),
+        "r": str(seconds_total),
     }
     formatted_string = format_string
     for pattern, replacement in literals.items():
-        formatted_string = re.sub(pattern, replacement, formatted_string)
+        # Match format specifiers with optional width and precision
+        match = re.search(rf"%(\d*\.?\d*){pattern}", formatted_string)
+        if match:
+            format_spec = match.group(1)
+            if "." in format_spec:
+                # Format the number as float if precision is specified
+                replacement = f"{float(replacement):{format_spec}f}"
+            else:
+                # Format the number as integer if no precision is specified
+                replacement = f"{int(float(replacement)):>{format_spec}}"
+            # Replace the format specifier with the formatted number
+            formatted_string = re.sub(
+                rf"%\d*\.?\d*{pattern}", replacement, formatted_string
+            )
     return formatted_string

common/utils.py

@@ -0,0 +1,30 @@
+def safe_division(numerator: int | float, denominator: int | float) -> int | float:
+    """
+    Divides without triggering division by zero exception.
+    Returns 0 if denominator is 0.
+    """
+    try:
+        return numerator / denominator
+    except ZeroDivisionError:
+        return 0
+
+
+def safe_getattr(obj, attr_chain, default=None):
+    """
+    Safely get the nested attribute from an object.
+
+    Parameters:
+    obj (object): The object from which to retrieve the attribute.
+    attr_chain (str): The chain of attributes, separated by dots.
+    default: The default value to return if any attribute in the chain does not exist.
+
+    Returns:
+    The value of the nested attribute if it exists, otherwise the default value.
+    """
+    attrs = attr_chain.split(".")
+    for attr in attrs:
+        try:
+            obj = getattr(obj, attr)
+        except AttributeError:
+            return default
+    return obj

docker-compose.yml

@@ -10,13 +10,14 @@ services:
       - CSRF_TRUSTED_ORIGINS="https://tracker.kucharczyk.xyz"
     user: "1000"
     volumes:
-      - "static-files:/home/timetracker/app/static"
+      - "static-files:/var/www/django/static"
+      - "$PWD/db.sqlite3:/home/timetracker/app/db.sqlite3"
     restart: unless-stopped
 
   frontend:
     image: caddy
     volumes:
-      - "static-files:/usr/share/caddy"
+      - "static-files:/usr/share/caddy:ro"
       - "$PWD/Caddyfile:/etc/caddy/Caddyfile"
     ports:
       - "8000:8000"
@@ -26,3 +27,4 @@ services:
 volumes:
   static-files:
     
+    

games/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from games.models import Game, Platform, Purchase, Session, Edition, Device
+from games.models import Device, Edition, Game, Platform, Purchase, Session
 
 # Register your models here.
 admin.site.register(Game)

games/forms.py

@@ -1,12 +1,13 @@
 from django import forms
+from django.urls import reverse
+from common.utils import safe_getattr
 
-from games.models import Game, Platform, Purchase, Session, Edition, Device
+from games.models import Device, Edition, Game, Platform, Purchase, Session
 
 custom_date_widget = forms.DateInput(attrs={"type": "date"})
 custom_datetime_widget = forms.DateTimeInput(
     attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M"
 )
-autofocus_select_widget = forms.Select(attrs={"autofocus": "autofocus"})
 autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
 
 
@@ -15,10 +16,12 @@ class SessionForm(forms.ModelForm):
     #     queryset=Purchase.objects.filter(date_refunded=None).order_by("edition__name")
     # )
     purchase = forms.ModelChoiceField(
-        queryset=Purchase.objects.order_by("edition__name"),
-        widget=autofocus_select_widget,
+        queryset=Purchase.objects.order_by("edition__sort_name"),
+        widget=forms.Select(attrs={"autofocus": "autofocus"}),
     )
 
+    device = forms.ModelChoiceField(queryset=Device.objects.order_by("name"))
+
     class Meta:
         widgets = {
             "timestamp_start": custom_datetime_widget,
@@ -37,19 +40,51 @@ class SessionForm(forms.ModelForm):
 
 class EditionChoiceField(forms.ModelChoiceField):
     def label_from_instance(self, obj) -> str:
-        return f"{obj.name} ({obj.platform}, {obj.year_released})"
+        return f"{obj.sort_name} ({obj.platform}, {obj.year_released})"
+
+
+class IncludePlatformSelect(forms.Select):
+    def create_option(self, name, value, *args, **kwargs):
+        option = super().create_option(name, value, *args, **kwargs)
+        if platform_id := safe_getattr(value, "instance.platform.id"):
+            option["attrs"]["data-platform"] = platform_id
+        return option
 
 
 class PurchaseForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Automatically update related_purchase <select/>
+        # to only include purchases of the selected edition.
+        related_purchase_by_edition_url = reverse("related_purchase_by_edition")
+        self.fields["edition"].widget.attrs.update(
+            {
+                "hx-trigger": "load, click",
+                "hx-get": related_purchase_by_edition_url,
+                "hx-target": "#id_related_purchase",
+                "hx-swap": "outerHTML",
+            }
+        )
+
     edition = EditionChoiceField(
-        queryset=Edition.objects.order_by("name"), widget=autofocus_select_widget
+        queryset=Edition.objects.order_by("sort_name"),
+        widget=IncludePlatformSelect(attrs={"autoselect": "autoselect"}),
     )
     platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
+    related_purchase = forms.ModelChoiceField(
+        queryset=Purchase.objects.filter(type=Purchase.GAME).order_by(
+            "edition__sort_name"
+        ),
+        required=False,
+    )
 
     class Meta:
         widgets = {
             "date_purchased": custom_date_widget,
             "date_refunded": custom_date_widget,
+            "date_finished": custom_date_widget,
+            "date_dropped": custom_date_widget,
         }
         model = Purchase
         fields = [
@@ -57,27 +92,72 @@ class PurchaseForm(forms.ModelForm):
             "platform",
             "date_purchased",
             "date_refunded",
+            "date_finished",
+            "date_dropped",
+            "infinite",
             "price",
             "price_currency",
             "ownership_type",
+            "type",
+            "related_purchase",
+            "name",
         ]
 
+    def clean(self):
+        cleaned_data = super().clean()
+        purchase_type = cleaned_data.get("type")
+        related_purchase = cleaned_data.get("related_purchase")
+        name = cleaned_data.get("name")
+
+        # Set the type on the instance to use get_type_display()
+        # This is safe because we're not saving the instance.
+        self.instance.type = purchase_type
+
+        if purchase_type != Purchase.GAME:
+            type_display = self.instance.get_type_display()
+            if not related_purchase:
+                self.add_error(
+                    "related_purchase",
+                    f"{type_display} must have a related purchase.",
+                )
+            if not name:
+                self.add_error("name", f"{type_display} must have a name.")
+        return cleaned_data
+
+
+class IncludeNameSelect(forms.Select):
+    def create_option(self, name, value, *args, **kwargs):
+        option = super().create_option(name, value, *args, **kwargs)
+        if value:
+            option["attrs"]["data-name"] = value.instance.name
+            option["attrs"]["data-year"] = value.instance.year_released
+        return option
+
+
+class GameModelChoiceField(forms.ModelChoiceField):
+    def label_from_instance(self, obj):
+        # Use sort_name as the label for the option
+        return obj.sort_name
+
 
 class EditionForm(forms.ModelForm):
-    game = forms.ModelChoiceField(
-        queryset=Game.objects.order_by("name"), widget=autofocus_select_widget
+    game = GameModelChoiceField(
+        queryset=Game.objects.order_by("sort_name"),
+        widget=IncludeNameSelect(attrs={"autofocus": "autofocus"}),
+    )
+    platform = forms.ModelChoiceField(
+        queryset=Platform.objects.order_by("name"), required=False
     )
-    platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
 
     class Meta:
         model = Edition
-        fields = ["game", "name", "platform", "year_released", "wikidata"]
+        fields = ["game", "name", "sort_name", "platform", "year_released", "wikidata"]
 
 
 class GameForm(forms.ModelForm):
     class Meta:
         model = Game
-        fields = ["name", "wikidata"]
+        fields = ["name", "sort_name", "year_released", "wikidata"]
         widgets = {"name": autofocus_input_widget}
 
 

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

@@ -0,0 +1,51 @@
+# Generated by Django 4.1.5 on 2023-11-06 11:10
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0015_edition_wikidata_edition_year_released"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="edition",
+            name="platform",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="games.platform",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edition",
+            name="year_released",
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+        migrations.AlterField(
+            model_name="game",
+            name="wikidata",
+            field=models.CharField(blank=True, default=None, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name="platform",
+            name="group",
+            field=models.CharField(blank=True, default=None, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="session",
+            name="device",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="games.device",
+            ),
+        ),
+    ]

games/migrations/0016_alter_edition_platform_alter_edition_year_released_and_more_squashed_0022_rename_year_game_year_released.py

@@ -0,0 +1,141 @@
+# Generated by Django 4.1.5 on 2023-11-06 18:14
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def rename_duplicates(apps, schema_editor):
+    Edition = apps.get_model("games", "Edition")
+
+    duplicates = (
+        Edition.objects.values("name", "platform")
+        .annotate(name_count=models.Count("id"))
+        .filter(name_count__gt=1)
+    )
+
+    for duplicate in duplicates:
+        counter = 1
+        duplicate_editions = Edition.objects.filter(
+            name=duplicate["name"], platform_id=duplicate["platform"]
+        ).order_by("id")
+
+        for edition in duplicate_editions[1:]:  # Skip the first one
+            edition.name = f"{edition.name} {counter}"
+            edition.save()
+            counter += 1
+
+
+def update_game_year(apps, schema_editor):
+    Game = apps.get_model("games", "Game")
+    Edition = apps.get_model("games", "Edition")
+
+    for game in Game.objects.filter(year__isnull=True):
+        # Try to get the first related edition with a non-null year_released
+        edition = Edition.objects.filter(game=game, year_released__isnull=False).first()
+        if edition:
+            # If an edition is found, update the game's year
+            game.year = edition.year_released
+            game.save()
+
+
+class Migration(migrations.Migration):
+    replaces = [
+        ("games", "0016_alter_edition_platform_alter_edition_year_released_and_more"),
+        ("games", "0017_alter_device_type_alter_purchase_platform"),
+        ("games", "0018_auto_20231106_1825"),
+        ("games", "0019_alter_edition_unique_together"),
+        ("games", "0020_game_year"),
+        ("games", "0021_auto_20231106_1909"),
+        ("games", "0022_rename_year_game_year_released"),
+    ]
+
+    dependencies = [
+        ("games", "0015_edition_wikidata_edition_year_released"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="edition",
+            name="platform",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="games.platform",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edition",
+            name="year_released",
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+        migrations.AlterField(
+            model_name="game",
+            name="wikidata",
+            field=models.CharField(blank=True, default=None, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name="platform",
+            name="group",
+            field=models.CharField(blank=True, default=None, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="session",
+            name="device",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="games.device",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="device",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("pc", "PC"),
+                    ("co", "Console"),
+                    ("ha", "Handheld"),
+                    ("mo", "Mobile"),
+                    ("sbc", "Single-board computer"),
+                    ("un", "Unknown"),
+                ],
+                default="un",
+                max_length=3,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="purchase",
+            name="platform",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="games.platform",
+            ),
+        ),
+        migrations.RunPython(
+            code=rename_duplicates,
+        ),
+        migrations.AlterUniqueTogether(
+            name="edition",
+            unique_together={("name", "platform")},
+        ),
+        migrations.AddField(
+            model_name="game",
+            name="year",
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+        migrations.RunPython(
+            code=update_game_year,
+        ),
+        migrations.RenameField(
+            model_name="game",
+            old_name="year",
+            new_name="year_released",
+        ),
+    ]

games/migrations/0017_alter_device_type_alter_purchase_platform.py

@@ -0,0 +1,41 @@
+# Generated by Django 4.1.5 on 2023-11-06 16:53
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0016_alter_edition_platform_alter_edition_year_released_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="device",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("pc", "PC"),
+                    ("co", "Console"),
+                    ("ha", "Handheld"),
+                    ("mo", "Mobile"),
+                    ("sbc", "Single-board computer"),
+                    ("un", "Unknown"),
+                ],
+                default="un",
+                max_length=3,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="purchase",
+            name="platform",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="games.platform",
+            ),
+        ),
+    ]

games/migrations/0018_auto_20231106_1825.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.5 on 2023-11-06 17:25
+
+from django.db import migrations, models
+
+
+def rename_duplicates(apps, schema_editor):
+    Edition = apps.get_model("games", "Edition")
+
+    duplicates = (
+        Edition.objects.values("name", "platform")
+        .annotate(name_count=models.Count("id"))
+        .filter(name_count__gt=1)
+    )
+
+    for duplicate in duplicates:
+        counter = 1
+        duplicate_editions = Edition.objects.filter(
+            name=duplicate["name"], platform_id=duplicate["platform"]
+        ).order_by("id")
+
+        for edition in duplicate_editions[1:]:  # Skip the first one
+            edition.name = f"{edition.name} {counter}"
+            edition.save()
+            counter += 1
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("games", "0017_alter_device_type_alter_purchase_platform"),
+    ]
+
+    operations = [
+        migrations.RunPython(rename_duplicates),
+    ]

games/migrations/0019_alter_edition_unique_together.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.1.5 on 2023-11-06 17:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0018_auto_20231106_1825"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="edition",
+            unique_together={("name", "platform")},
+        ),
+    ]

games/migrations/0020_game_year.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-11-06 18:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0019_alter_edition_unique_together"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="game",
+            name="year",
+            field=models.IntegerField(blank=True, default=None, null=True),
+        ),
+    ]

games/migrations/0021_auto_20231106_1909.py

@@ -0,0 +1,24 @@
+from django.db import migrations
+
+
+def update_game_year(apps, schema_editor):
+    Game = apps.get_model("games", "Game")
+    Edition = apps.get_model("games", "Edition")
+
+    for game in Game.objects.filter(year__isnull=True):
+        # Try to get the first related edition with a non-null year_released
+        edition = Edition.objects.filter(game=game, year_released__isnull=False).first()
+        if edition:
+            # If an edition is found, update the game's year
+            game.year = edition.year_released
+            game.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("games", "0020_game_year"),
+    ]
+
+    operations = [
+        migrations.RunPython(update_game_year),
+    ]

games/migrations/0022_rename_year_game_year_released.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-11-06 18:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0021_auto_20231106_1909"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="game",
+            old_name="year",
+            new_name="year_released",
+        ),
+    ]

games/migrations/0023_purchase_date_finished.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.1.5 on 2023-11-06 18:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "games",
+            "0016_alter_edition_platform_alter_edition_year_released_and_more_squashed_0022_rename_year_game_year_released",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="purchase",
+            name="date_finished",
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

games/migrations/0024_edition_sort_name.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.1.5 on 2023-11-09 09:32
+
+from django.db import migrations, models
+
+
+def create_sort_name(apps, schema_editor):
+    Edition = apps.get_model(
+        "games", "Edition"
+    )  # Replace 'your_app_name' with the actual name of your app
+
+    for edition in Edition.objects.all():
+        name = edition.name
+        # Check for articles at the beginning of the name and move them to the end
+        if name.lower().startswith("the "):
+            sort_name = f"{name[4:]}, The"
+        elif name.lower().startswith("a "):
+            sort_name = f"{name[2:]}, A"
+        elif name.lower().startswith("an "):
+            sort_name = f"{name[3:]}, An"
+        else:
+            sort_name = name
+        # Save the sort_name back to the database
+        edition.sort_name = sort_name
+        edition.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("games", "0023_purchase_date_finished"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="edition",
+            name="sort_name",
+            field=models.CharField(blank=True, default=None, max_length=255, null=True),
+        ),
+        migrations.RunPython(create_sort_name),
+    ]

games/migrations/0025_game_sort_name.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.1.5 on 2023-11-09 09:32
+
+from django.db import migrations, models
+
+
+def create_sort_name(apps, schema_editor):
+    Game = apps.get_model(
+        "games", "Game"
+    )  # Replace 'your_app_name' with the actual name of your app
+
+    for game in Game.objects.all():
+        name = game.name
+        # Check for articles at the beginning of the name and move them to the end
+        if name.lower().startswith("the "):
+            sort_name = f"{name[4:]}, The"
+        elif name.lower().startswith("a "):
+            sort_name = f"{name[2:]}, A"
+        elif name.lower().startswith("an "):
+            sort_name = f"{name[3:]}, An"
+        else:
+            sort_name = name
+        # Save the sort_name back to the database
+        game.sort_name = sort_name
+        game.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("games", "0024_edition_sort_name"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="game",
+            name="sort_name",
+            field=models.CharField(blank=True, default=None, max_length=255, null=True),
+        ),
+        migrations.RunPython(create_sort_name),
+    ]

games/migrations/0026_purchase_type.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.1.5 on 2023-11-14 08:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0025_game_sort_name"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="purchase",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("game", "Game"),
+                    ("dlc", "DLC"),
+                    ("season_pass", "Season Pass"),
+                    ("battle_pass", "Battle Pass"),
+                ],
+                default="game",
+                max_length=255,
+            ),
+        ),
+    ]

games/migrations/0027_purchase_related_purchase.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.1.5 on 2023-11-14 08:41
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0026_purchase_type"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="purchase",
+            name="related_purchase",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="games.purchase",
+            ),
+        ),
+    ]

games/migrations/0028_purchase_name.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.1.5 on 2023-11-14 11:05
+
+from django.db import migrations, models
+
+from games.models import Purchase
+
+
+def null_game_name(apps, schema_editor):
+    Purchase.objects.filter(type=Purchase.GAME).update(name=None)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("games", "0027_purchase_related_purchase"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="purchase",
+            name="name",
+            field=models.CharField(
+                blank=True, default="Unknown Name", max_length=255, null=True
+            ),
+        ),
+        migrations.RunPython(null_game_name),
+    ]

games/migrations/0029_alter_purchase_related_purchase.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.1.5 on 2023-11-14 21:19
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0028_purchase_name"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="purchase",
+            name="related_purchase",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="related_purchases",
+                to="games.purchase",
+            ),
+        ),
+    ]

games/migrations/0030_alter_purchase_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-11-15 12:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0029_alter_purchase_related_purchase"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="purchase",
+            name="name",
+            field=models.CharField(blank=True, default="", max_length=255, null=True),
+        ),
+    ]

games/migrations/0031_device_created_at_edition_created_at_game_created_at_and_more.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.1.5 on 2023-11-15 13:51
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0030_alter_purchase_name"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="device",
+            name="created_at",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AddField(
+            model_name="edition",
+            name="created_at",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AddField(
+            model_name="game",
+            name="created_at",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AddField(
+            model_name="platform",
+            name="created_at",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AddField(
+            model_name="purchase",
+            name="created_at",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AddField(
+            model_name="session",
+            name="created_at",
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

games/migrations/0032_alter_session_options_session_modified_at_and_more.py

@@ -0,0 +1,52 @@
+# Generated by Django 4.1.5 on 2023-11-15 18:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0031_device_created_at_edition_created_at_game_created_at_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="session",
+            options={"get_latest_by": "timestamp_start"},
+        ),
+        migrations.AddField(
+            model_name="session",
+            name="modified_at",
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name="device",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name="edition",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name="game",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name="platform",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name="purchase",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name="session",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+    ]

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_date_dropped_purchase_infinite.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-01-03 21:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0033_alter_edition_unique_together"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="purchase",
+            name="date_dropped",
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="purchase",
+            name="infinite",
+            field=models.BooleanField(default=False),
+        ),
+    ]

games/models.py

@@ -1,30 +1,54 @@
-from datetime import datetime, timedelta
-from typing import Any
-from zoneinfo import ZoneInfo
+from datetime import timedelta
 
-from common.time import format_duration
-from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import F, Manager, Sum
+from django.utils import timezone
+
+from common.time import format_duration
 
 
 class Game(models.Model):
     name = models.CharField(max_length=255)
-    wikidata = models.CharField(max_length=50)
+    sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
+    year_released = models.IntegerField(null=True, blank=True, default=None)
+    wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
+    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.name
 
 
 class Edition(models.Model):
+    class Meta:
+        unique_together = [["name", "platform", "year_released"]]
+
     game = models.ForeignKey("Game", on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
-    platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
-    year_released = models.IntegerField(default=datetime.today().year)
+    sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
+    platform = models.ForeignKey(
+        "Platform", on_delete=models.CASCADE, null=True, blank=True, default=None
+    )
+    year_released = models.IntegerField(null=True, blank=True, default=None)
     wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
+    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
-        return self.name
+        return self.sort_name
+
+
+class PurchaseQueryset(models.QuerySet):
+    def refunded(self):
+        return self.filter(date_refunded__isnull=False)
+
+    def not_refunded(self):
+        return self.filter(date_refunded__isnull=True)
+
+    def finished(self):
+        return self.filter(date_finished__isnull=False)
+
+    def games_only(self):
+        return self.filter(type=Purchase.GAME)
 
 
 class Purchase(models.Model):
@@ -46,27 +70,75 @@ class Purchase(models.Model):
         (DEMO, "Demo"),
         (PIRATED, "Pirated"),
     ]
+    GAME = "game"
+    DLC = "dlc"
+    SEASONPASS = "season_pass"
+    BATTLEPASS = "battle_pass"
+    TYPES = [
+        (GAME, "Game"),
+        (DLC, "DLC"),
+        (SEASONPASS, "Season Pass"),
+        (BATTLEPASS, "Battle Pass"),
+    ]
+
+    objects = PurchaseQueryset().as_manager()
 
     edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
-    platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
+    platform = models.ForeignKey(
+        "Platform", on_delete=models.CASCADE, default=None, null=True, blank=True
+    )
     date_purchased = models.DateField()
     date_refunded = models.DateField(blank=True, null=True)
+    date_finished = models.DateField(blank=True, null=True)
+    date_dropped = models.DateField(blank=True, null=True)
+    infinite = models.BooleanField(default=False)
     price = models.IntegerField(default=0)
     price_currency = models.CharField(max_length=3, default="USD")
     ownership_type = models.CharField(
         max_length=2, choices=OWNERSHIP_TYPES, default=DIGITAL
     )
+    type = models.CharField(max_length=255, choices=TYPES, default=GAME)
+    name = models.CharField(max_length=255, default="", null=True, blank=True)
+    related_purchase = models.ForeignKey(
+        "Purchase",
+        on_delete=models.SET_NULL,
+        default=None,
+        null=True,
+        blank=True,
+        related_name="related_purchases",
+    )
+    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
-        platform_info = self.platform
-        if self.platform != self.edition.platform:
-            platform_info = f"{self.edition.platform} version on {self.platform}"
-        return f"{self.edition} ({platform_info}, {self.edition.year_released}, {self.get_ownership_type_display()})"
+        additional_info = [
+            self.get_type_display() if self.type != Purchase.GAME else "",
+            (
+                f"{self.edition.platform} version on {self.platform}"
+                if self.platform != self.edition.platform
+                else self.platform
+            ),
+            self.edition.year_released,
+            self.get_ownership_type_display(),
+        ]
+        return f"{self.edition} ({', '.join(filter(None, map(str, additional_info)))})"
+
+    def is_game(self):
+        return self.type == self.GAME
+
+    def save(self, *args, **kwargs):
+        if self.type == Purchase.GAME:
+            self.name = ""
+        elif self.type != Purchase.GAME and not self.related_purchase:
+            raise ValidationError(
+                f"{self.get_type_display()} must have a related purchase."
+            )
+        super().save(*args, **kwargs)
 
 
 class Platform(models.Model):
     name = models.CharField(max_length=255)
-    group = models.CharField(max_length=255)
+    group = models.CharField(max_length=255, null=True, blank=True, default=None)
+    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.name
@@ -82,41 +154,68 @@ class SessionQuerySet(models.QuerySet):
         )
         return result["duration"]
 
+    def calculated_duration_formatted(self):
+        return format_duration(self.calculated_duration_unformatted())
+
+    def calculated_duration_unformatted(self):
+        result = self.aggregate(duration=Sum(F("duration_calculated")))
+        return result["duration"]
+
+    def without_manual(self):
+        return self.exclude(duration_calculated__iexact=0)
+
+    def only_manual(self):
+        return self.filter(duration_calculated__iexact=0)
+
 
 class Session(models.Model):
+    class Meta:
+        get_latest_by = "timestamp_start"
+
     purchase = models.ForeignKey("Purchase", on_delete=models.CASCADE)
     timestamp_start = models.DateTimeField()
     timestamp_end = models.DateTimeField(blank=True, null=True)
     duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
     duration_calculated = models.DurationField(blank=True, null=True)
-    device = models.ForeignKey("Device", on_delete=models.CASCADE, null=True)
+    device = models.ForeignKey(
+        "Device",
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+        default=None,
+    )
     note = models.TextField(blank=True, null=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+    modified_at = models.DateTimeField(auto_now=True)
 
     objects = SessionQuerySet.as_manager()
 
     def __str__(self):
-        mark = ", manual" if self.duration_manual != None else ""
+        mark = ", manual" if self.is_manual() else ""
         return f"{str(self.purchase)} {str(self.timestamp_start.date())} ({self.duration_formatted()}{mark})"
 
     def finish_now(self):
-        self.timestamp_end = datetime.now(ZoneInfo(settings.TIME_ZONE))
+        self.timestamp_end = timezone.now()
 
     def start_now():
-        self.timestamp_start = datetime.now(ZoneInfo(settings.TIME_ZONE))
+        self.timestamp_start = timezone.now()
 
     def duration_seconds(self) -> timedelta:
         manual = timedelta(0)
         calculated = timedelta(0)
-        if not self.duration_manual in (None, 0, timedelta(0)):
+        if self.is_manual() and isinstance(self.duration_manual, timedelta):
             manual = self.duration_manual
         if self.timestamp_end != None and self.timestamp_start != None:
             calculated = self.timestamp_end - self.timestamp_start
         return timedelta(seconds=(manual + calculated).total_seconds())
 
     def duration_formatted(self) -> str:
-        result = format_duration(self.duration_seconds(), "%H:%m")
+        result = format_duration(self.duration_seconds(), "%02.0H:%02.0m")
         return result
 
+    def is_manual(self) -> bool:
+        return not self.duration_manual == timedelta(0)
+
     @property
     def duration_sum(self) -> str:
         return Session.objects.all().total_duration_formatted()
@@ -126,6 +225,15 @@ class Session(models.Model):
             self.duration_calculated = self.timestamp_end - self.timestamp_start
         else:
             self.duration_calculated = timedelta(0)
+
+        if not isinstance(self.duration_manual, timedelta):
+            self.duration_manual = timedelta(0)
+
+        if not self.device:
+            default_device, _ = Device.objects.get_or_create(
+                type=Device.UNKNOWN, defaults={"name": "Unknown"}
+            )
+            self.device = default_device
         super(Session, self).save(*args, **kwargs)
 
 
@@ -135,15 +243,18 @@ class Device(models.Model):
     HANDHELD = "ha"
     MOBILE = "mo"
     SBC = "sbc"
+    UNKNOWN = "un"
     DEVICE_TYPES = [
         (PC, "PC"),
         (CONSOLE, "Console"),
         (HANDHELD, "Handheld"),
         (MOBILE, "Mobile"),
         (SBC, "Single-board computer"),
+        (UNKNOWN, "Unknown"),
     ]
     name = models.CharField(max_length=255)
-    type = models.CharField(max_length=3, choices=DEVICE_TYPES, default=PC)
+    type = models.CharField(max_length=3, choices=DEVICE_TYPES, default=UNKNOWN)
+    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return f"{self.name} ({self.get_type_display()})"

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/js/add_edition.js

@@ -1,29 +1,24 @@
-/**
- * @description Sync select field with input field until user focuses it.
- * @param {HTMLSelectElement} sourceElementSelector
- * @param {HTMLInputElement} targetElementSelector
- */
-function syncSelectInputUntilChanged(
-  sourceElementSelector,
-  targetElementSelector
-) {
-  const sourceElement = document.querySelector(sourceElementSelector);
-  const targetElement = document.querySelector(targetElementSelector);
-  function sourceElementHandler(event) {
-    let selected = event.target.value;
-    let selectedValue = document.querySelector(
-      `#id_game option[value='${selected}']`
-    ).textContent;
-    targetElement.value = selectedValue;
-  }
-  function targetElementHandler(event) {
-    sourceElement.removeEventListener("change", sourceElementHandler);
-  }
+import { syncSelectInputUntilChanged } from "./utils.js";
 
-  sourceElement.addEventListener("change", sourceElementHandler);
-  targetElement.addEventListener("focus", targetElementHandler);
-}
+let syncData = [
+  {
+    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: "dataset.year",
+    target: "#id_year_released",
+    target_value: "value",
+  },
+];
 
-window.addEventListener("load", () => {
-  syncSelectInputUntilChanged("#id_game", "#id_name");
-});
+syncSelectInputUntilChanged(syncData, "form");

games/static/js/add_game.js

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

games/static/js/add_purchase.js

@@ -0,0 +1,47 @@
+import {
+  syncSelectInputUntilChanged,
+  getEl,
+  disableElementsWhenTrue,
+  disableElementsWhenValueNotEqual,
+} from "./utils.js";
+
+let syncData = [
+  {
+    source: "#id_edition",
+    source_value: "dataset.platform",
+    target: "#id_platform",
+    target_value: "value",
+  },
+];
+
+syncSelectInputUntilChanged(syncData, "form");
+
+function setupElementHandlers() {
+  disableElementsWhenTrue("#id_type", "game", [
+    "#id_name",
+    "#id_related_purchase",
+  ]);
+  disableElementsWhenValueNotEqual(
+    "#id_type",
+    ["game", "dlc"],
+    ["#id_date_finished"]
+  );
+}
+
+document.addEventListener("DOMContentLoaded", setupElementHandlers);
+document.addEventListener("htmx:afterSwap", setupElementHandlers);
+getEl("#id_type").onchange = () => {
+  setupElementHandlers();
+};
+
+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;
+
+    // Condition to check - replace this with your actual logic
+    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

@@ -3,7 +3,7 @@
  * @param {Date} date
  * @returns {string}
  */
-export function toISOUTCString(date) {
+function toISOUTCString(date) {
   function stringAndPad(number) {
     return number.toString().padStart(2, 0);
   }
@@ -14,3 +14,194 @@ export function toISOUTCString(date) {
   const minutes = stringAndPad(date.getMinutes());
   return `${year}-${month}-${day}T${hours}:${minutes}`;
 }
+
+/**
+ * @description Sync values between source and target elements based on syncData configuration.
+ * @param {Array} syncData - Array of objects to define source and target elements with their respective value types.
+ */
+function syncSelectInputUntilChanged(syncData, parentSelector = document) {
+  const parentElement =
+    parentSelector === document
+      ? document
+      : document.querySelector(parentSelector);
+
+  if (!parentElement) {
+    console.error(`The parent selector "${parentSelector}" is not valid.`);
+    return;
+  }
+  // Set up a single change event listener on the document for handling all source changes
+  parentElement.addEventListener("change", function (event) {
+    // Loop through each sync configuration item
+    syncData.forEach((syncItem) => {
+      // Check if the change event target matches the source selector
+      if (event.target.matches(syncItem.source)) {
+        const sourceElement = event.target;
+        const valueToSync = getValueFromProperty(
+          sourceElement,
+          syncItem.source_value
+        );
+        const targetElement = document.querySelector(syncItem.target);
+
+        if (targetElement && valueToSync !== null) {
+          targetElement[syncItem.target_value] = valueToSync;
+        }
+      }
+    });
+  });
+
+  // Set up a single focus event listener on the document for handling all target focuses
+  parentElement.addEventListener(
+    "focus",
+    function (event) {
+      // Loop through each sync configuration item
+      syncData.forEach((syncItem) => {
+        // Check if the focus event target matches the target selector
+        if (event.target.matches(syncItem.target)) {
+          // Remove the change event listener to stop syncing
+          // This assumes you want to stop syncing once any target receives focus
+          // You may need a more sophisticated way to remove listeners if you want to stop
+          // syncing selectively based on other conditions
+          document.removeEventListener("change", syncSelectInputUntilChanged);
+        }
+      });
+    },
+    true
+  ); // Use capture phase to ensure the event is captured during focus, not bubble
+}
+
+/**
+ * @description Retrieve the value from the source element based on the provided property.
+ * @param {Element} sourceElement - The source HTML element.
+ * @param {string} property - The property to retrieve the value from.
+ */
+function getValueFromProperty(sourceElement, property) {
+  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];
+  } else if (property in source) {
+    return source[property];
+  } else {
+    console.error(`Property ${property} is not valid for the option element.`);
+    return null;
+  }
+}
+
+/**
+ * @description Returns a single element by name.
+ * @param {string} selector The selector to look for.
+ */
+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);
+  }
+}
+
+/**
+ * @description Applies different behaviors to elements based on multiple conditional configurations.
+ * Each configuration is an array containing a condition function, an array of target element selectors,
+ * and two callback functions for handling matched and unmatched conditions.
+ * @param {...Array} configs Each configuration is an array of the form:
+ *   - 0: {function(): boolean} condition - Function that returns true or false based on a condition.
+ *   - 1: {string[]} targetElements - Array of CSS selectors for target elements.
+ *   - 2: {function(HTMLElement): void} callbackfn1 - Function to execute when condition is true.
+ *   - 3: {function(HTMLElement): void} callbackfn2 - Function to execute when condition is false.
+ */
+function conditionalElementHandler(...configs) {
+  configs.forEach(([condition, targetElements, callbackfn1, callbackfn2]) => {
+    if (condition()) {
+      targetElements.forEach((elementName) => {
+        let el = getEl(elementName);
+        if (el === null) {
+          console.error(`Element ${elementName} doesn't exist.`);
+        } else {
+          callbackfn1(el);
+        }
+      });
+    } else {
+      targetElements.forEach((elementName) => {
+        let el = getEl(elementName);
+        if (el === null) {
+          console.error(`Element ${elementName} doesn't exist.`);
+        } else {
+          callbackfn2(el);
+        }
+      });
+    }
+  });
+}
+
+function disableElementsWhenValueNotEqual(
+  targetSelect,
+  targetValue,
+  elementList
+) {
+  return conditionalElementHandler([
+    () => {
+      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 = "";
+    },
+  ]);
+}
+
+function disableElementsWhenTrue(targetSelect, targetValue, elementList) {
+  return conditionalElementHandler([
+    () => {
+      return getEl(targetSelect).value == targetValue;
+    },
+    elementList,
+    (el) => {
+      el.disabled = "disabled";
+    },
+    (el) => {
+      el.disabled = "";
+    },
+  ]);
+}
+
+export {
+  toISOUTCString,
+  syncSelectInputUntilChanged,
+  getEl,
+  conditionalElementHandler,
+  disableElementsWhenValueNotEqual,
+  disableElementsWhenTrue,
+  getValueFromProperty,
+};

games/templates/add.html

@@ -1,17 +1,24 @@
 {% extends "base.html" %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% load static %}
+{% 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>
-        </tr>
+            {% csrf_token %}
+            {{ form.as_table }}
+            <tr>
+                <td></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,22 +1,32 @@
 {% extends "base.html" %}
-
-{% block title %}{{ title }}{% endblock title %}
-
+{% load static %}
+{% 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>
-        </tr>
+            {% csrf_token %}
+            {{ form.as_table }}
+            <tr>
+                <td></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>
+            </tr>
         </table>
     </form>
 {% endblock content %}
-
 {% block scripts %}
-{% load static %}
-<script type="module" src="{% static 'js/add_edition.js' %}"></script>
+    {% if script_name %}
+        <script type="module" src="{% static 'js/'|add:script_name %}"></script>
+    {% endif %}
 {% endblock scripts %}

games/templates/add_game.html

@@ -0,0 +1,32 @@
+{% extends "base.html" %}
+{% load static %}
+{% 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>
+            </tr>
+            <tr>
+                <td></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

@@ -0,0 +1,40 @@
+{% extends "base.html" %}
+{% load static %}
+{% 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>
+            </tr>
+            <tr>
+                <td></td>
+                <td>
+                    <input type="submit"
+                           name="submit_and_redirect"
+                           value="Submit & Create Session" />
+                </td>
+            </tr>
+            {% if purchase_id %}
+                <tr>
+                    <td></td>
+                    <td>
+                        <a href="{% url 'delete_purchase' purchase_id %}" class="text-red-600" onclick="return confirm('Are you sure you want to delete this purchase?');">Delete</a>
+                    </td>
+                </tr>
+            {% endif %}
+        </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,35 +1,38 @@
 {% 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>
-            {% if field.name == "note" %}
-            <td>{{ field }}</td>
-            {% else %}
-            <td>{{ field }}</td>
-            {% 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>
-            </td>
-            {% endif %}
-        </tr>
-        {% endfor %}
-        <tr>
-            <td></td>
-            <td><input type="submit" value="Submit"/></td>
-        </tr>
+            {% csrf_token %}
+            {% for field in form %}
+                <tr>
+                    <th>{{ field.label_tag }}</th>
+                    {% if field.name == "note" %}
+                        <td>{{ field }}</td>
+                    {% else %}
+                        <td>{{ field }}</td>
+                    {% endif %}
+                    {% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
+                        <td>
+                            <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 %}
+                </tr>
+            {% endfor %}
+            <tr>
+                <td></td>
+                <td>
+                    <input type="submit" value="Submit" />
+                </td>
+            </tr>
         </table>
     </form>
     {% load static %}

games/templates/base.html

@@ -1,54 +1,123 @@
-<!doctype html>
+{% load django_htmx %}
+<!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>
+        {% django_htmx_script %}
         <link rel="stylesheet" href="{% static 'base.css' %}" />
+        <script src="https://cdn.jsdelivr.net/npm/flowbite@2.4.1/dist/flowbite.min.js"></script>
     </head>
-    
-    <body class="dark">
-        <img id="indicator" src="{% static 'icons/loading.png' %}" class="absolute right-3 top-3 animate-spin htmx-indicator" />
-        <div class="dark:bg-gray-800 min-h-screen">
-            <nav class="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
+    <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="flex flex-col min-h-screen">
+            <nav class="dark:bg-gray-900 border-gray-200 h-24 flex items-center">
                 <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">
-                            <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
-                            <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_platform' %}">New Platform</a></li>
-                            {% if game_available and platform_available %}
-                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_edition' %}">New Edition</a></li>
-                            {% endif %}
-                            {% if edition_available %}
-                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_purchase' %}">New Purchase</a></li>
-                            {% endif %}
-                            {% if purchase_available %}
-                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
-                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_device' %}">New Device</a></li>
-                            {% endif %}
-                            {% if session_count > 0 %}
-                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
-                            {% endif %}
-                        </ul>
+                        <ul class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
+                            <li class="relative group">
+                                {% if user.is_authenticated %}
+                                    <a class="block py-2 pl-3 pr-4 hover:underline"
+                                       href="{% url 'add_game' %}">New</a>
+                                    <ul class="absolute hidden text-gray-700 pt-1 group-hover:block  w-auto whitespace-nowrap">
+                                        {% if purchase_available %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'add_device' %}">Device</a>
+                                            </li>
+                                        {% endif %}
+                                        <li>
+                                            <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                               href="{% url 'add_game' %}">Game</a>
+                                        </li>
+                                        {% if game_available and platform_available %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'add_edition' %}">Edition</a>
+                                            </li>
+                                        {% endif %}
+                                        <li>
+                                            <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                               href="{% url 'add_platform' %}">Platform</a>
+                                        </li>
+                                        {% if edition_available %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'add_purchase' %}">Purchase</a>
+                                            </li>
+                                        {% endif %}
+                                        {% if purchase_available %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'add_session' %}">Session</a>
+                                            </li>
+                                        {% endif %}
+                                    </ul>
+                                    </li>
+                                    {% if session_count > 0 %}
+                                        <li class="relative group">
+                                            <a class="block py-2 pl-3 pr-4 hover:underline"
+                                               href="{% url 'stats_by_year' 0 %}">Stats</a>
+                                            <ul class="absolute hidden text-gray-700 pt-1 group-hover:block">
+                                                <li>
+                                                    <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                       href="{% url 'stats_by_year' 0 %}">Overall</a>
+                                                </li>
+                                                {% for year in stats_dropdown_year_range %}
+                                                    <li>
+                                                        <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                           href="{% url 'stats_by_year' year %}">{{ year }}</a>
+                                                    </li>
+                                                {% endfor %}
+                                            </ul>
+                                        </li>
+                                        <li>
+                                            <a class="block py-2 pl-3 pr-4 hover:underline"
+                                               href="{% url 'list_sessions' %}">All Sessions</a>
+                                        </li>
+                                        <li>
+                                            <a class="block py-2 pl-3 pr-4 hover:underline"
+                                               href="{% url 'logout' %}">Log Out</a>
+                                        </li>
+                                    {% endif %}
+                                {% endif %}
+                            </ul>
+                        </div>
                     </div>
+                </nav>
+                <div class="flex flex-1 dark:bg-gray-800 justify-center pt-8 pb-16">
+                    {% block content %}
+                        No content here.
+                    {% endblock content %}
                 </div>
-            </nav>
-            {% 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 %}
-    </body>
-
-</html>
+                {% load version %}
+                <span class="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span>
+            </div>
+            {% block scripts %}
+            {% endblock scripts %}
+        </body>
+    </html>

games/templates/components.yml

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

games/templates/components/button.html

@@ -1,22 +1,13 @@
-<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"
-    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>
-  {{ text }}
-</button>
+{% comment %}
+title
+text
+{% endcomment %}
+<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" /> 
+    </svg>
+    {% endcomment %}
+    {{ text }}
+</a>

games/templates/components/button_start.html

@@ -0,0 +1,18 @@
+{% comment %}
+title
+text
+{% endcomment %}
+<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"
+         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>
+    {{ text }}
+</button>

games/templates/components/edit_button.html

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

games/templates/components/game_link.html

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

games/templates/components/popover.html

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

games/templates/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,77 +1,73 @@
 {% 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"
-    href="{% url 'start_session' last.id %}"
-    hx-get="{% url 'start_session' last.id %}"
-    hx-indicator="#indicator"
-    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 %}"
-  >
-    {% include 'components/button.html' with text=last.purchase title="Start session of last played game" only %}
-  </a>
-</div>
-{% endif %}
-
-<table class="responsive-table">
-  <thead>
-    <tr>
-      <th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
-      <th class="hidden sm:table-cell px-2 sm:px-4 md:px-6 md:py-2">Start</th>
-      <th class="hidden lg:table-cell px-2 sm:px-4 md:px-6 md:py-2">End</th>
-      <th class="px-2 sm:px-4 md:px-6 md:py-2">Duration</th>
-    </tr>
-  </thead>
-  <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"
-          href="{% url 'view_game' data.purchase.edition.game.id %}">
-            {{ data.purchase.edition }}
-        </a>
-      </td>
-      <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden sm:table-cell">
-        {{ data.timestamp_start | date:"d/m/Y H:i" }}
-      </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 %}"
-          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')"
-          >
-            <span class="text-yellow-300">Finish now?</span>
-        </a>
-        {% elif data.duration_manual %}
-            -- 
-        {% else %}
-            {{ data.timestamp_end | date:"d/m/Y H:i" }}
+    <div class="flex-col">
+        {% if dataset_count >= 1 %}
+            {% url 'list_sessions_start_session_from_session' last.id as start_session_url %}
+            <div class="mx-auto text-center my-4">
+                <a id="last-session-start"
+                   href="{{ start_session_url }}"
+                   hx-get="{{ start_session_url }}"
+                   hx-swap="afterbegin"
+                   hx-target=".responsive-table tbody"
+                   onClick="document.querySelector('#last-session-start').classList.add('invisible')"
+                   class="{% if last.timestamp_end == null %}invisible{% endif %}">
+                    {% include 'components/button_start.html' with text=last.purchase title="Start session of last played game" only %}
+                </a>
+            </div>
         {% endif %}
-      </td>
-      <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-        {{ data.duration_formatted }}
-      </td>
-    </tr>
-    {% endfor %}
-  </tbody>
-</table>
+        {% 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>
+                        <th class="hidden sm:table-cell px-2 sm:px-4 md:px-6 md:py-2">Start</th>
+                        <th class="hidden lg:table-cell px-2 sm:px-4 md:px-6 md:py-2">End</th>
+                        <th class="px-2 sm:px-4 md:px-6 md:py-2">Duration</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for session in dataset %}
+                        {% partialdef session-row inline=True %}
+                            <tr>
+                                <td class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name relative align-top w-24 h-12 group">
+                                    <span class="inline-block relative">
+                                        <a class="underline decoration-slate-500 sm:decoration-2 inline-block truncate max-w-20char group-hover:absolute group-hover:max-w-none group-hover:-top-8 group-hover:-left-6 group-hover:min-w-60 group-hover:px-6 group-hover:py-3.5 group-hover:bg-purple-600 group-hover:rounded-sm group-hover:outline-dashed group-hover:outline-purple-400 group-hover:outline-4 group-hover:decoration-purple-900 group-hover:text-purple-100" href="{% url 'view_game' session.purchase.edition.game.id %}">
+                                            {{ session.purchase.edition.name }}
+                                        </a>
+                                    </span>
+                                </td>
+                                <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden sm:table-cell">
+                                    {{ session.timestamp_start | date:"d/m/Y H:i" }}
+                                </td>
+                                <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden lg:table-cell">
+                                    {% if not session.timestamp_end %}
+                                        {% url 'list_sessions_end_session' session.id as end_session_url %}
+                                        <a  href="{{ end_session_url }}"
+                                           hx-get="{{ end_session_url }}"
+                                           hx-target="closest tr"
+                                           hx-swap="outerHTML"
+                                           hx-indicator="#indicator"
+                                           onClick="document.querySelector('#last-session-start').classList.remove('invisible')">
+                                            <span class="text-yellow-300">Finish now?</span>
+                                        </a>
+                                    {% elif session.duration_manual %}
+                                        --
+                                    {% else %}
+                                        {{ session.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">{{ session.duration_formatted }}</td>
+                            </tr>
+                        {% endpartialdef %}
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% else %}
+            <div class="mx-auto text-center text-slate-300 text-xl">No sessions found.</div>
+        {% endif %}
+    </div>
 {% endblock content %}

games/templates/partials/related_purchase_field.html

@@ -0,0 +1 @@
+{{ form.related_purchase }}

games/templates/registration/login.html

@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block title %}
+    Login
+{% endblock title %}
+{% block content %}
+    <div class="flex items-center flex-col">
+        <h2 class="text-3xl text-white mb-8">Please log in to continue</h2>
+        <form method="post">
+            <table>
+                {% csrf_token %}
+                {{ form.as_table }}
+                <tr>
+                    <td></td>
+                    <td>
+                        <input type="submit" value="Login" />
+                    </td>
+                </tr>
+            </form>
+        </table>
+    </div>
+{% endblock content %}

games/templates/stats.html

@@ -0,0 +1,292 @@
+{% extends "base.html" %}
+{% block title %}
+    {{ title }}
+{% endblock title %}
+{% load static %}
+
+{% partialdef purchase-name %}
+    {% if purchase.type != 'game' %}
+        {% #gamelink game_id=purchase.edition.game.id %}
+            {{ purchase.name }} ({{ purchase.edition.name }} {{ purchase.get_type_display }})
+        {% /gamelink %}
+    {% else %}
+        {% gamelink game_id=purchase.edition.game.id name=purchase.edition.name %}
+    {% endif %}
+{% endpartialdef %}
+
+{% block content %}
+    <div class="dark:text-white max-w-sm sm:max-w-xl lg:max-w-3xl mx-auto">
+        <div class="flex justify-center items-center">
+            <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">
+                    {% 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>
+        <h1 class="text-5xl text-center my-6">Playtime</h1>
+        <table class="responsive-table">
+            <tbody>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Hours</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_hours }}</td>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Sessions</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_sessions }}</td>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Days</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ unique_days }} ({{ unique_days_percent }}%)</td>
+                </tr>
+                {% if total_games %}
+                    <tr>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2">Games</td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_games }}</td>
+                    </tr>
+                {% endif %}
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Games ({{ year }})</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_2023_games }}</td>
+                </tr>
+                {% if all_finished_this_year_count %}
+                    <tr>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished</td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_finished_this_year_count }}</td>
+                    </tr>
+                {% endif %}
+                <tr>
+                    <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 }} ({% gamelink game_id=longest_session_game.id name=longest_session_game.name %})</td>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Most sessions</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ highest_session_count }} ({% gamelink game_id=highest_session_count_game.id name=highest_session_count_game.name %})</td>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Highest session average</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                        {{ highest_session_average }} ({% gamelink game_id=highest_session_average_game.id name=highest_session_average_game.name %})
+                    </td>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">First play</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% gamelink game_id=first_play_game.id name=first_play_game.name %} ({{ first_play_date }})</td>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Last play</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% gamelink game_id=last_play_game.id name=last_play_game.name %} ({{ last_play_date }})</td>
+                </tr>
+            </tbody>
+        </table>
+
+        {% if month_playtime %}
+            <h1 class="text-5xl text-center my-6">Playtime per month</h1>
+            <table class="responsive-table">
+                <tbody>
+                    {% for month in month_playtimes %}
+                        <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">{{ month.month | date:"F" }}</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ month.playtime }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+
+        <h1 class="text-5xl text-center my-6">Purchases</h1>
+        <table class="responsive-table">
+            <tbody>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Total</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_this_year_count }}</td>
+                </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>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Dropped</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                        {{ dropped_count }} ({{ dropped_percentage }}%)
+                    </td>
+                </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>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Backlog Decrease</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ backlog_decrease_count }}</td>
+                </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Spendings ({{ total_spent_currency }})</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_spent }} ({{ spent_per_game }}/game)</td>
+                </tr>
+            </tbody>
+        </table>
+        <h1 class="text-5xl text-center my-6">Top games by playtime</h1>
+        <table class="responsive-table">
+            <thead>
+                <tr>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Playtime (hours)</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for game in top_10_games_by_playtime %}
+                    <tr>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                            {% gamelink game_id=game.id name=game.name %}
+                        </td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        <h1 class="text-5xl text-center my-6">Platforms by playtime</h1>
+        <table class="responsive-table">
+            <thead>
+                <tr>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Platform</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Playtime (hours)</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for item in total_playtime_per_platform %}
+                    <tr>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.platform_name }}</td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.formatted_playtime }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+
+        {% if all_finished_this_year %}
+            <h1 class="text-5xl text-center my-6">Finished</h1>
+            <table class="responsive-table">
+                <thead>
+                    <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>
+                    </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">
+                                {% partial purchase-name %}
+                            </td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+
+        {% if this_year_finished_this_year %}
+            <h1 class="text-5xl text-center my-6">Finished ({{ year }} games)</h1>
+            <table class="responsive-table">
+                <thead>
+                    <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>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for purchase in this_year_finished_this_year %}
+                        <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+
+        {% if purchased_this_year_finished_this_year %}
+            <h1 class="text-5xl text-center my-6">Bought and Finished ({{ year }})</h1>
+            <table class="responsive-table">
+                <thead>
+                    <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>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for purchase in purchased_this_year_finished_this_year %}
+                        <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+
+        {% if purchased_unfinished %}
+            <h1 class="text-5xl text-center my-6">Unfinished Purchases</h1>
+            <table class="responsive-table">
+                <thead>
+                    <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">Price ({{ total_spent_currency }})</th>
+                        <th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for purchase in purchased_unfinished %}
+                        <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+
+        {% if all_purchased_this_year %}
+            <h1 class="text-5xl text-center my-6">All Purchases</h1>
+            <table class="responsive-table">
+                <thead>
+                    <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">Price ({{ total_spent_currency }})</th>
+                        <th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for purchase in all_purchased_this_year %}
+                        <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                                {% partial purchase-name %}
+                            </td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+    </div>
+{% endblock content %}

games/templates/view_game.html

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

games/templatetags/markdown_extras.py

@@ -0,0 +1,10 @@
+from django import template
+from django.utils.safestring import mark_safe
+import markdown
+
+register = template.Library()
+
+
+@register.filter(name="markdown")
+def markdown_format(text):
+    return mark_safe(markdown.markdown(text))

games/urls.py

@@ -4,68 +4,114 @@ from games import views
 
 urlpatterns = [
     path("", views.index, name="index"),
+    path("device/add", views.add_device, name="add_device"),
+    path("edition/add", views.add_edition, name="add_edition"),
     path(
-        "list-sessions/recent",
+        "edition/add/for-game/<int:game_id>",
+        views.add_edition,
+        name="add_edition_for_game",
+    ),
+    path("edition/<int:edition_id>/edit", views.edit_edition, name="edit_edition"),
+    path("game/add", views.add_game, name="add_game"),
+    path("game/<int:game_id>/edit", views.edit_game, name="edit_game"),
+    path("game/<int:game_id>/view", views.view_game, name="view_game"),
+    path("game/<int:game_id>/delete", views.delete_game, name="delete_game"),
+    path("platform/add", views.add_platform, name="add_platform"),
+    path("platform/<int:platform_id>/edit", views.edit_platform, name="edit_platform"),
+    path("purchase/add", views.add_purchase, name="add_purchase"),
+    path("purchase/<int:purchase_id>/edit", views.edit_purchase, name="edit_purchase"),
+    path(
+        "purchase/<int:purchase_id>/delete",
+        views.delete_purchase,
+        name="delete_purchase",
+    ),
+    path(
+        "purchase/related-purchase-by-edition",
+        views.related_purchase_by_edition,
+        name="related_purchase_by_edition",
+    ),
+    path(
+        "purchase/add/for-edition/<int:edition_id>",
+        views.add_purchase,
+        name="add_purchase_for_edition",
+    ),
+    path("session/add", views.add_session, name="add_session"),
+    path(
+        "session/add/for-purchase/<int:purchase_id>",
+        views.add_session,
+        name="add_session_for_purchase",
+    ),
+    path(
+        "session/add/from-game/<int:session_id>",
+        views.new_session_from_existing_session,
+        {"template": "view_game.html#session-info"},
+        name="view_game_start_session_from_session",
+    ),
+    path(
+        "session/add/from-list/<int:session_id>",
+        views.new_session_from_existing_session,
+        {"template": "list_sessions.html#session-row"},
+        name="list_sessions_start_session_from_session",
+    ),
+    path("session/<int:session_id>/edit", views.edit_session, name="edit_session"),
+    path(
+        "session/<int:session_id>/delete",
+        views.delete_session,
+        name="delete_session",
+    ),
+    path(
+        "session/end/from-game/<int:session_id>",
+        views.end_session,
+        {"template": "view_game.html#session-info"},
+        name="view_game_end_session",
+    ),
+    path(
+        "session/end/from-list/<int:session_id>",
+        views.end_session,
+        {"template": "list_sessions.html#session-row"},
+        name="list_sessions_end_session",
+    ),
+    path("session/list", views.list_sessions, name="list_sessions"),
+    path(
+        "session/list/recent",
         views.list_sessions,
         {"filter": "recent"},
         name="list_sessions_recent",
     ),
-    path("add-game/", views.add_game, name="add_game"),
-    path("add-platform/", views.add_platform, name="add_platform"),
-    path("add-session/", views.add_session, name="add_session"),
     path(
-        "update-session/by-session/<int:session_id>",
-        views.update_session,
-        name="update_session",
-    ),
-    path(
-        "start-session/<int:last_session_id>",
-        views.start_session,
-        name="start_session",
-    ),
-    # path(
-    #     "delete_session/by-id/<int:session_id>",
-    #     views.delete_session,
-    #     name="delete_session",
-    # ),
-    path("add-purchase/", views.add_purchase, name="add_purchase"),
-    path("add-edition/", views.add_edition, name="add_edition"),
-    path("edit-edition/<int:edition_id>", views.edit_edition, name="edit_edition"),
-    path("game/<int:game_id>/view", views.view_game, name="view_game"),
-    path("game/<int:game_id>/edit", views.edit_game, name="edit_game"),
-    path("edit-platform/<int:platform_id>", views.edit_platform, name="edit_platform"),
-    path("add-device/", views.add_device, name="add_device"),
-    path("edit-session/<int:session_id>", views.edit_session, name="edit_session"),
-    path("edit-purchase/<int:purchase_id>", views.edit_purchase, name="edit_purchase"),
-    path("list-sessions/", views.list_sessions, name="list_sessions"),
-    path(
-        "list-sessions/by-purchase/<int:purchase_id>",
+        "session/list/by-purchase/<int:purchase_id>",
         views.list_sessions,
         {"filter": "purchase"},
         name="list_sessions_by_purchase",
     ),
     path(
-        "list-sessions/by-platform/<int:platform_id>",
+        "session/list/by-platform/<int:platform_id>",
         views.list_sessions,
         {"filter": "platform"},
         name="list_sessions_by_platform",
     ),
     path(
-        "list-sessions/by-game/<int:game_id>",
+        "session/list/by-game/<int:game_id>",
         views.list_sessions,
         {"filter": "game"},
         name="list_sessions_by_game",
     ),
     path(
-        "list-sessions/by-edition/<int:edition_id>",
+        "session/list/by-edition/<int:edition_id>",
         views.list_sessions,
         {"filter": "edition"},
         name="list_sessions_by_edition",
     ),
     path(
-        "list-sessions/by-ownership/<str:ownership_type>",
+        "session/list/by-ownership/<str:ownership_type>",
         views.list_sessions,
         {"filter": "ownership_type"},
         name="list_sessions_by_ownership_type",
     ),
+    path("stats/", views.stats_alltime, name="stats_alltime"),
+    path(
+        "stats/<int:year>",
+        views.stats,
+        name="stats_by_year",
+    ),
 ]

package.json

@@ -1,7 +1,12 @@
 {
   "devDependencies": {
-    "@tailwindcss/forms": "^0.5.6",
-    "@tailwindcss/typography": "^0.5.10",
-    "tailwindcss": "^3.3.3"
+    "@tailwindcss/forms": "^0.5.7",
+    "@tailwindcss/typography": "^0.5.13",
+    "concurrently": "^8.2.2",
+    "npm-check-updates": "^16.14.20",
+    "tailwindcss": "^3.4.4"
+  },
+  "dependencies": {
+    "flowbite": "^2.4.1"
   }
 }

pyproject.toml

@@ -1,28 +1,39 @@
 [tool.poetry]
 name = "timetracker"
-version = "1.1.0"
+version = "1.5.2"
 description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"
 readme = "README.md"
 packages = [{include = "timetracker"}]
 
-[tool.poetry.dependencies]
-python = "^3.10"
-django = "^4.1.4"
-gunicorn = "^20.1.0"
-uvicorn = "^0.20.0"
-
 [tool.poetry.group.dev.dependencies]
-black = "^22.12.0"
-mypy = "^0.991"
-pyyaml = "^6.0"
-pytest = "^7.2.0"
-django-extensions = "^3.2.1"
-werkzeug = "^2.2.2"
-djhtml = "^1.5.2"
-djlint = "^1.19.11"
-isort = "^5.11.4"
+black = "^24.4.2"
+mypy = "^1.10.1"
+pyyaml = "^6.0.1"
+pytest = "^8.2.2"
+django-extensions = "^3.2.3"
+djhtml = "^3.0.6"
+djlint = "^1.34.1"
+isort = "^5.13.2"
+pre-commit = "^3.7.1"
+django-debug-toolbar = "^4.4.2"
+
+
+[tool.poetry.dependencies]
+python = "^3.11"
+django = "^5.0.6"
+gunicorn = "^22.0.0"
+uvicorn = "^0.30.1"
+graphene-django = "^3.2.2"
+django-htmx = "^1.18.0"
+django-template-partials = "^24.2"
+markdown = "^3.6"
+
+
+slippers = "^0.6.2"
+[tool.isort]
+profile = "black"
 
 [build-system]
 requires = ["poetry-core"]

tailwind.config.js

@@ -1,19 +1,21 @@
 const defaultTheme = require('tailwindcss/defaultTheme')
 
 module.exports = {
-    darkMode: 'class',
-    content: ["./games/**/*.{html,js}"],
-    theme: {
-        extend: {
-          fontFamily: {
-            'sans': ['IBM Plex Sans', ...defaultTheme.fontFamily.sans],
-            'mono': ['IBM Plex Mono', ...defaultTheme.fontFamily.mono],
-            'serif': ['IBM Plex Serif', ...defaultTheme.fontFamily.serif],
-          }
-        },
+  darkMode: 'class',
+  content: ["./games/**/*.{html,js}", './node_modules/flowbite/**/*.js'],
+  theme: {
+    extend: {
+      fontFamily: {
+        'sans': ['IBM Plex Sans', ...defaultTheme.fontFamily.sans],
+        'mono': ['IBM Plex Mono', ...defaultTheme.fontFamily.mono],
+        'serif': ['IBM Plex Serif', ...defaultTheme.fontFamily.serif],
+        'condensed': ['IBM Plex Sans Condensed', ...defaultTheme.fontFamily.sans],
+      }
     },
-    plugins: [
-        require('@tailwindcss/typography'),
-        require('@tailwindcss/forms')
-    ],
+  },
+  plugins: [
+    require('@tailwindcss/typography'),
+    require('@tailwindcss/forms'),
+    require('flowbite/plugin')
+  ],
 }

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(),
+        )

tests/test_paths_return_200.py

@@ -0,0 +1,90 @@
+import os
+from datetime import datetime
+from zoneinfo import ZoneInfo
+
+import django
+from django.test import TestCase
+from django.urls import reverse
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
+django.setup()
+from django.conf import settings
+
+from games.models import Edition, Game, Platform, Purchase, Session
+
+ZONEINFO = ZoneInfo(settings.TIME_ZONE)
+
+
+class PathWorksTest(TestCase):
+    def setUp(self) -> None:
+        pl = Platform(name="Test Platform")
+        pl.save()
+        g = Game(name="The Test Game")
+        g.save()
+        e = Edition(game=g, name="The Test Game Edition", platform=pl)
+        e.save()
+        p = Purchase(
+            edition=e,
+            platform=pl,
+            date_purchased=datetime(2022, 9, 26, 14, 58, tzinfo=ZONEINFO),
+        )
+        p.save()
+        s = Session(
+            purchase=p,
+            timestamp_start=datetime(2022, 9, 26, 14, 58, tzinfo=ZONEINFO),
+            timestamp_end=datetime(2022, 9, 26, 17, 38, tzinfo=ZONEINFO),
+        )
+        s.save()
+        self.testSession = s
+        return super().setUp()
+
+    def test_add_device_returns_200(self):
+        url = reverse("add_device")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_add_platform_returns_200(self):
+        url = reverse("add_platform")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_add_game_returns_200(self):
+        url = reverse("add_game")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_add_edition_returns_200(self):
+        url = reverse("add_edition")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_add_purchase_returns_200(self):
+        url = reverse("add_purchase")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_add_session_returns_200(self):
+        url = reverse("add_session")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_edit_session_returns_200(self):
+        id = self.testSession.id
+        url = reverse("edit_session", args=[id])
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_view_game_returns_200(self):
+        url = reverse("view_game", args=[1])
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_edit_game_returns_200(self):
+        url = reverse("edit_game", args=[1])
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_list_sessions_returns_200(self):
+        url = reverse("list_sessions")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)

tests/test_session_formatting.py

@@ -0,0 +1,40 @@
+import os
+from datetime import datetime
+from zoneinfo import ZoneInfo
+
+import django
+from django.db import models
+from django.test import TestCase
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
+django.setup()
+from django.conf import settings
+
+from games.models import Edition, Game, Purchase, Session
+
+ZONEINFO = ZoneInfo(settings.TIME_ZONE)
+
+
+class FormatDurationTest(TestCase):
+    def setUp(self) -> None:
+        return super().setUp()
+
+    def test_duration_format(self):
+        g = Game(name="The Test Game")
+        g.save()
+        e = Edition(game=g, name="The Test Game Edition")
+        e.save()
+        p = Purchase(
+            edition=e, date_purchased=datetime(2022, 9, 26, 14, 58, tzinfo=ZONEINFO)
+        )
+        p.save()
+        s = Session(
+            purchase=p,
+            timestamp_start=datetime(2022, 9, 26, 14, 58, tzinfo=ZONEINFO),
+            timestamp_end=datetime(2022, 9, 26, 17, 38, tzinfo=ZONEINFO),
+        )
+        s.save()
+        self.assertEqual(
+            s.duration_formatted(),
+            "02:40",
+        )

tests/test_time.py

@@ -6,7 +6,6 @@ from common.time import format_duration
 
 class FormatDurationTest(unittest.TestCase):
     def setUp(self) -> None:
-
         return super().setUp()
 
     def test_only_days(self):
@@ -19,6 +18,21 @@ class FormatDurationTest(unittest.TestCase):
         result = format_duration(delta, "%H hours")
         self.assertEqual(result, "1 hours")
 
+    def test_only_hours_fractional(self):
+        delta = timedelta(hours=1)
+        result = format_duration(delta, "%.1H hours")
+        self.assertEqual(result, "1.0 hours")
+
+    def test_less_than_hour_with_precision(self):
+        delta = timedelta(hours=0.5)
+        result = format_duration(delta, "%.1H hours")
+        self.assertEqual(result, "0.5 hours")
+
+    def test_less_than_hour_without_precision(self):
+        delta = timedelta(hours=0.5)
+        result = format_duration(delta, "%H hours")
+        self.assertEqual(result, "0 hours")
+
     def test_overflow_hours(self):
         delta = timedelta(hours=25)
         result = format_duration(delta, "%H hours")
@@ -69,6 +83,16 @@ class FormatDurationTest(unittest.TestCase):
         result = format_duration(delta, "%r seconds")
         self.assertEqual(result, "0 seconds")
 
+    def test_specific(self):
+        delta = timedelta(hours=2, minutes=40)
+        result = format_duration(delta, "%H:%m")
+        self.assertEqual(result, "2:40")
+
+    def test_specific_precise_if_unncessary(self):
+        delta = timedelta(hours=2, minutes=40)
+        result = format_duration(delta, "%02.0H:%02.0m")
+        self.assertEqual(result, "02:40")
+
     def test_all_at_once(self):
         delta = timedelta(days=50, hours=10, minutes=34, seconds=24)
         result = format_duration(

timetracker/settings.py

@@ -38,11 +38,18 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "template_partials",
+    "graphene_django",
+    "django_htmx",
+    "slippers",
 ]
 
-# if DEBUG:
-INSTALLED_APPS.append("django_extensions")
-INSTALLED_APPS.append("django.contrib.admin")
+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",
@@ -52,9 +59,18 @@ MIDDLEWARE = [
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "django_htmx.middleware.HtmxMiddleware",
 ]
 
+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"
+LOGIN_URL = "/login/"
+LOGIN_REDIRECT_URL = "/"
+LOGOUT_REDIRECT_URL = "/login/"
 
 TEMPLATES = [
     {
@@ -68,6 +84,11 @@ TEMPLATES = [
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
                 "games.views.model_counts",
+                "games.views.stats_dropdown_year_range",
+            ],
+            "builtins": [
+                "template_partials.templatetags.partials",
+                "slippers.templatetags.slippers",
             ],
         },
     },
@@ -122,7 +143,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/4.1/howto/static-files/
 
 STATIC_URL = "static/"
-STATIC_ROOT = BASE_DIR / "static"
+STATIC_ROOT = BASE_DIR / "static" if DEBUG else "/var/www/django/static"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
@@ -149,5 +170,3 @@ if _csrf_trusted_origins:
     CSRF_TRUSTED_ORIGINS = _csrf_trusted_origins.split(",")
 else:
     CSRF_TRUSTED_ORIGINS = []
-
-USE_L10N = False

timetracker/urls.py

@@ -15,14 +15,20 @@ Including another URLconf
 """
 from django.conf import settings
 from django.contrib import admin
+from django.contrib.auth import views as auth_views
 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("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True))),
+    path("login/", auth_views.LoginView.as_view(), name="login"),
+    path("logout/", auth_views.LogoutView.as_view(), name="logout"),
     path("tracker/", include("games.urls")),
 ]
 
-# if settings.DEBUG:
-#     urlpatterns.append(path("admin/", admin.site.urls))
-urlpatterns.append(path("admin/", admin.site.urls))
+if settings.DEBUG:
+    urlpatterns.append(path("admin/", admin.site.urls))
+    urlpatterns.append(path("__debug__/", include("debug_toolbar.urls")))