Add django-cors-headers

Fixes #53

.devcontainer/devcontainer.json

@@ -1,25 +0,0 @@
-{
-  "name": "Django Time Tracker",
-  "dockerFile": "../devcontainer.Dockerfile",
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "python.pythonPath": "/usr/local/bin/python",
-        "python.defaultInterpreterPath": "/usr/local/bin/python",
-        "terminal.integrated.defaultProfile.linux": "bash"
-      },
-      "extensions": [
-        "ms-python.python",
-        "ms-python.debugpy",
-        "ms-python.vscode-pylance",
-        "ms-azuretools.vscode-docker",
-        "batisteo.vscode-django",
-        "charliermarsh.ruff",
-        "bradlc.vscode-tailwindcss",
-        "EditorConfig.EditorConfig"
-      ]
-    }
-  },
-  "forwardPorts": [8000],
-  "postCreateCommand": "poetry install && poetry run python manage.py migrate && npm install && make dev",
-}

.drone.yml

@@ -30,9 +30,7 @@ steps:
   image: plugins/docker
   settings:
     repo: registry.kucharczyk.xyz/timetracker
-    tags:
+    auto_tag: true
-      - ${DRONE_COMMIT_REF}
-      - ${DRONE_COMMIT_BRANCH}
   when:
     branch:
       exclude:

.editorconfig

@@ -15,6 +15,3 @@ indent_size = 4
 [**/*.js]
 indent_style = space
 indent_size = 2
-
-[*.html]
-insert_final_newline = false

.envrc

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

.gitea/workflows/build-docker.yml

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

.github/workflows/build-docker.yml

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

.pre-commit-config.yaml

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

.vscode/extensions.json

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

.vscode/settings.json

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

CHANGELOG.md

@@ -1,48 +1,5 @@
 ## Unreleased
 
-## New
-* Render notes as Markdown
-* Require login by default
-* Add stats for dropped purchases, monthly playtimes
-* Allow deleting purchases
-* Add all-time stats
-* Manage purchases
-* Automatically convert purchase prices
-
-## 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:
@@ -51,9 +8,6 @@
   * Season Pass
   * Battle Pass
 
-## Fixed
-* Order purchases by date on game view
-
 ## 1.4.0 / 2023-11-09 21:01+01:00
 
 ### New
@@ -141,24 +95,22 @@
 
 ### Enhancements
 * Improve form appearance
-* Focus important fields on forms
+* Add helper buttons next to datime fields
-* Use the same form when editing a session as when adding a session
 * Change recent session view to current year instead of last 30 days
-* Add a hacky way not to reload a page when starting or ending a session (https://git.kucharczyk.xyz/lukas/timetracker/issues/52)
-* Improve session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/53)
-
-### Fixes
-
-* Fix session being wrongly considered in progress if it had a certain amount of manual hours (https://git.kucharczyk.xyz/lukas/timetracker/issues/58)
 * Fix bug when filtering only manual sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/51)
-
+* Add copy button on Add session page to copy times between fields
+* Use the same form when editing a session as when adding a session
+* Add a hacky way not to reload a page when starting or ending a session (https://git.kucharczyk.xyz/lukas/timetracker/issues/52)
+* Focus important fields on forms
+* Improve session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/53)
+* Change fonts to IBM Plex
+* Only use local WOFF2 font files
 
 ## 1.0.3 / 2023-02-20 17:16+01:00
 
 * Add wikidata ID and year for editions
-* Add icons for game, edition, purchase filters
 * Allow filtering by game, edition, purchase from the session list
-* Allow editing filtered entities from session list
+* Add icons for the above
 
 ## 1.0.2 / 2023-02-18 21:48+01:00
 

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.12.0-slim-bullseye
 
-ENV VERSION_NUMBER=1.5.2 \
+ENV VERSION_NUMBER=1.5.1 \
     PROD=1 \
     PYTHONUNBUFFERED=1 \
     PYTHONFAULTHANDLER=1 \

Makefile

@@ -1,36 +1,20 @@
-all: css migrate
+all: migrate
 
-initialize: npm css migrate sethookdir loadplatforms
+initialize: npm migrate sethookdir loadplatforms
 
 HTMLFILES := $(shell find games/templates -type f)
-PYTHON_VERSION = 3.12
 
 npm:
 	npm install
 
-css: common/input.css
-	npx tailwindcss -i ./common/input.css -o  ./games/static/base.css
-
 makemigrations:
 	poetry run python manage.py makemigrations
 
 migrate: makemigrations
 	poetry run python manage.py migrate
 
-init:
+dev: migrate
-	pyenv install -s $(PYTHON_VERSION)
+	poetry run python manage.py runserver
-	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,15 +1,3 @@
 # 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/components.py

@@ -1,206 +0,0 @@
-from random import choices as random_choices
-from string import ascii_lowercase
-from typing import Any, Callable
-
-from django.template import TemplateDoesNotExist
-from django.template.defaultfilters import floatformat
-from django.template.loader import render_to_string
-from django.urls import NoReverseMatch, reverse
-from django.utils.safestring import SafeText, mark_safe
-
-from common.utils import truncate
-
-HTMLAttribute = tuple[str, str | int | bool]
-HTMLTag = str
-
-
-def Component(
-    attributes: list[HTMLAttribute] = [],
-    children: list[HTMLTag] | HTMLTag = [],
-    template: str = "",
-    tag_name: str = "",
-) -> HTMLTag:
-    if not tag_name and not template:
-        raise ValueError("One of template or tag_name is required.")
-    if isinstance(children, str):
-        children = [children]
-    childrenBlob = "\n".join(children)
-    if len(attributes) == 0:
-        attributesBlob = ""
-    else:
-        attributesList = [f'{name}="{value}"' for name, value in attributes]
-        # make attribute list into a string
-        # and insert space between tag and attribute list
-        attributesBlob = f" {" ".join(attributesList)}"
-    tag: str = ""
-    if tag_name != "":
-        tag = f"<{tag_name}{attributesBlob}>{childrenBlob}</{tag_name}>"
-    elif template != "":
-        tag = render_to_string(
-            template,
-            {name: value for name, value in attributes}
-            | {"slot": mark_safe("\n".join(children))},
-        )
-    return mark_safe(tag)
-
-
-def randomid(seed: str = "", length: int = 10) -> str:
-    return seed + "".join(random_choices(ascii_lowercase, k=length))
-
-
-def Popover(
-    popover_content: str,
-    wrapped_content: str = "",
-    wrapped_classes: str = "",
-    children: list[HTMLTag] = [],
-    attributes: list[HTMLAttribute] = [],
-) -> str:
-    if not wrapped_content and not children:
-        raise ValueError("One of wrapped_content or children is required.")
-    id = randomid()
-    return Component(
-        attributes=attributes
-        + [
-            ("id", id),
-            ("wrapped_content", wrapped_content),
-            ("popover_content", popover_content),
-            ("wrapped_classes", wrapped_classes),
-        ],
-        children=children,
-        template="cotton/popover.html",
-    )
-
-
-def PopoverTruncated(input_string: str, length: int = 30, ellipsis: str = "…") -> str:
-    if (truncated := truncate(input_string, length, ellipsis)) != input_string:
-        return Popover(wrapped_content=truncated, popover_content=input_string)
-    else:
-        return input_string
-
-
-def A(
-    attributes: list[HTMLAttribute] = [],
-    children: list[HTMLTag] | HTMLTag = [],
-    url: str | Callable[..., Any] = "",
-):
-    """
-    Returns the HTML tag "a".
-    "url" can either be:
-        - URL (string)
-        - path name passed to reverse() (string)
-        - function
-    """
-    additional_attributes = []
-    if url:
-        if type(url) is str:
-            try:
-                url_result = reverse(url)
-            except NoReverseMatch:
-                url_result = url
-        elif callable(url):
-            url_result = url()
-        else:
-            raise TypeError("'url' is neither str nor function.")
-        additional_attributes = [("href", url_result)]
-    return Component(
-        tag_name="a", attributes=attributes + additional_attributes, children=children
-    )
-
-
-def Button(
-    attributes: list[HTMLAttribute] = [],
-    children: list[HTMLTag] | HTMLTag = [],
-    size: str = "base",
-    icon: bool = False,
-    color: str = "blue",
-):
-    return Component(
-        template="cotton/button.html",
-        attributes=attributes + [("size", size), ("icon", icon), ("color", color)],
-        children=children,
-    )
-
-
-def Div(
-    attributes: list[HTMLAttribute] = [],
-    children: list[HTMLTag] | HTMLTag = [],
-):
-    return Component(tag_name="div", attributes=attributes, children=children)
-
-
-def Input(
-    type: str = "text",
-    attributes: list[HTMLAttribute] = [],
-    children: list[HTMLTag] | HTMLTag = [],
-):
-    return Component(
-        tag_name="input", attributes=attributes + [("type", type)], children=children
-    )
-
-
-def Form(
-    action="",
-    method="get",
-    attributes: list[HTMLAttribute] = [],
-    children: list[HTMLTag] | HTMLTag = [],
-):
-    return Component(
-        tag_name="form",
-        attributes=attributes + [("action", action), ("method", method)],
-        children=children,
-    )
-
-
-def Icon(
-    name: str,
-    attributes: list[HTMLAttribute] = [],
-):
-    try:
-        result = Component(template=f"cotton/icon/{name}.html", attributes=attributes)
-    except TemplateDoesNotExist:
-        result = Icon(name="unspecified", attributes=attributes)
-    return result
-
-
-def LinkedNameWithPlatformIcon(name: str, game_id: int, platform: str) -> SafeText:
-    link = reverse("view_game", args=[int(game_id)])
-    a_content = Div(
-        [("class", "inline-flex gap-2 items-center")],
-        [
-            Icon(
-                platform.icon,
-                [("title", platform.name)],
-            ),
-            PopoverTruncated(name),
-        ],
-    )
-
-    return mark_safe(
-        A(
-            url=link,
-            children=[a_content],
-        ),
-    )
-
-
-def NameWithPlatformIcon(name: str, platform: str) -> SafeText:
-    content = Div(
-        [("class", "inline-flex gap-2 items-center")],
-        [
-            Icon(
-                platform.icon,
-                [("title", platform.name)],
-            ),
-            PopoverTruncated(name),
-        ],
-    )
-
-    return mark_safe(content)
-
-
-def PurchasePrice(purchase) -> str:
-    return Popover(
-        popover_content=f"{floatformat(purchase.price)} {purchase.price_currency}",
-        wrapped_content=f"{floatformat(purchase.converted_price)} {purchase.converted_currency}",
-        wrapped_classes="underline decoration-dotted",
-    )

common/input.css

@@ -1,171 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@font-face {
-  font-family: "IBM Plex Mono";
-  src: url("fonts/IBMPlexMono-Regular.woff2") format("woff2");
-  font-weight: 400;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: "IBM Plex Sans";
-  src: url("fonts/IBMPlexSans-Regular.woff2") format("woff2");
-  font-weight: 400;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: "IBM Plex Serif";
-  src: url("fonts/IBMPlexSerif-Regular.woff2") format("woff2");
-  font-weight: 400;
-  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 table-fixed;
-}
-
-.responsive-table tr:nth-child(even) {
-  @apply bg-slate-800
-}
-
-.responsive-table tbody tr:nth-child(odd) {
-  @apply bg-slate-900
-}
-
-.responsive-table thead th {
-  @apply text-left border-b-2 border-b-slate-500 text-xl;
-}
-
-.responsive-table thead th:not(:first-child),
-.responsive-table td:not(:first-child) {
-  @apply border-l border-l-slate-500;
-}
-
-@layer utilities {
-  .min-w-20char {
-    min-width: 20ch;
-  }
-  .max-w-20char {
-    max-width: 20ch;
-  }
-  .min-w-30char {
-    min-width: 30ch;
-  }
-  .max-w-30char {
-    max-width: 30ch;
-  }
-  .max-w-35char {
-    max-width: 35ch;
-  }
-  .max-w-40char {
-    max-width: 40ch;
-  }
-}
-
-form input,
-select,
-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,
-  textarea {
-    width: 300px;
-  }
-}
-
-@media screen and (max-width: 768px) {
-  form input,
-  select,
-  textarea {
-    width: 150px;
-  }
-}
-
-#button-container button {
-  @apply mx-1;
-}
-
-.basic-button-container {
-  @apply flex space-x-2 justify-center;
-}
-
-.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,15 +1,5 @@
 import re
-from datetime import date, datetime, timedelta
+from datetime import timedelta
-
-from django.utils import timezone
-
-from common.utils import generate_split_ranges
-
-dateformat: str = "%d/%m/%Y"
-datetimeformat: str = "%d/%m/%Y %H:%M"
-timeformat: str = "%H:%M"
-durationformat: str = "%2.1H hours"
-durationformat_manual: str = "%H hours"
 
 
 def _safe_timedelta(duration: timedelta | int | None):
@@ -22,7 +12,7 @@ def _safe_timedelta(duration: timedelta | int | None):
 
 
 def format_duration(
-    duration: timedelta | int | float | None, format_string: str = "%H hours"
+    duration: timedelta | int | None, format_string: str = "%H hours"
 ) -> str:
     """
     Format timedelta into the specified format_string.
@@ -80,90 +70,3 @@ def format_duration(
                 rf"%\d*\.?\d*{pattern}", replacement, formatted_string
             )
     return formatted_string
-
-
-def local_strftime(datetime: datetime, format: str = datetimeformat) -> str:
-    return timezone.localtime(datetime).strftime(format)
-
-
-def daterange(start: date, end: date, end_inclusive: bool = False) -> list[date]:
-    time_between: timedelta = end - start
-    if (days_between := time_between.days) < 1:
-        raise ValueError("start and end have to be at least 1 day apart.")
-    if end_inclusive:
-        print(f"{end_inclusive=}")
-        print(f"{days_between=}")
-        days_between += 1
-    print(f"{days_between=}")
-    return [start + timedelta(x) for x in range(days_between)]
-
-
-def streak(datelist: list[date]) -> dict[str, int | tuple[date, date]]:
-    if len(datelist) == 1:
-        return {"days": 1, "dates": (datelist[0], datelist[0])}
-    else:
-        print(f"Processing {len(datelist)} dates.")
-        missing = sorted(
-            set(
-                datelist[0] + timedelta(x)
-                for x in range((datelist[-1] - datelist[0]).days)
-            )
-            - set(datelist)
-        )
-        print(f"{len(missing)} days missing.")
-        datelist_with_missing = sorted(datelist + missing)
-        ranges = list(generate_split_ranges(datelist_with_missing, missing))
-        print(f"{len(ranges)} ranges calculated.")
-        longest_consecutive_days = timedelta(0)
-        longest_range: tuple[date, date] = (date(1970, 1, 1), date(1970, 1, 1))
-        for start, end in ranges:
-            if (current_streak := end - start) > longest_consecutive_days:
-                longest_consecutive_days = current_streak
-                longest_range = (start, end)
-        return {"days": longest_consecutive_days.days + 1, "dates": longest_range}
-
-
-def streak_bruteforce(datelist: list[date]) -> dict[str, int | tuple[date, date]]:
-    if (datelist_length := len(datelist)) == 0:
-        raise ValueError("Number of dates in the list is 0.")
-    datelist.sort()
-    current_streak = 1
-    current_start = datelist[0]
-    current_end = datelist[0]
-    current_date = datelist[0]
-    highest_streak = 1
-    highest_streak_daterange = (current_start, current_end)
-
-    def update_highest_streak():
-        nonlocal highest_streak, highest_streak_daterange
-        if current_streak > highest_streak:
-            highest_streak = current_streak
-            highest_streak_daterange = (current_start, current_end)
-
-    def reset_streak():
-        nonlocal current_start, current_end, current_streak
-        current_start = current_end = current_date
-        current_streak = 1
-
-    def increment_streak():
-        nonlocal current_end, current_streak
-        current_end = current_date
-        current_streak += 1
-
-    for i, datelist_item in enumerate(datelist, start=1):
-        current_date = datelist_item
-        if current_date == current_start or current_date == current_end:
-            continue
-        if current_date - timedelta(1) != current_end and i != datelist_length:
-            update_highest_streak()
-            reset_streak()
-        elif current_date - timedelta(1) == current_end and i == datelist_length:
-            increment_streak()
-            update_highest_streak()
-        else:
-            increment_streak()
-    return {"days": highest_streak, "dates": highest_streak_daterange}
-
-
-def available_stats_year_range():
-    return range(datetime.now().year, 1999, -1)

common/utils.py

@@ -1,7 +1,3 @@
-from datetime import date
-from typing import Any, Generator, TypeVar
-
-
 def safe_division(numerator: int | float, denominator: int | float) -> int | float:
     """
     Divides without triggering division by zero exception.
@@ -11,56 +7,3 @@ def safe_division(numerator: int | float, denominator: int | float) -> int | flo
         return numerator / denominator
     except ZeroDivisionError:
         return 0
-
-
-def safe_getattr(obj: object, attr_chain: str, default: Any | None = None) -> object:
-    """
-    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
-
-
-def truncate(input_string: str, length: int = 30, ellipsis: str = "…") -> str:
-    return (
-        (f"{input_string[:length-len(ellipsis)].rstrip()}{ellipsis}")
-        if len(input_string) > length
-        else input_string
-    )
-
-
-T = TypeVar("T", str, int, date)
-
-
-def generate_split_ranges(
-    value_list: list[T], split_points: list[T]
-) -> Generator[tuple[T, T], None, None]:
-    for x in range(0, len(split_points) + 1):
-        if x == 0:
-            start = 0
-        elif x >= len(split_points):
-            start = value_list.index(split_points[x - 1]) + 1
-        else:
-            start = value_list.index(split_points[x - 1]) + 1
-        try:
-            end = value_list.index(split_points[x])
-        except IndexError:
-            end = len(value_list)
-        yield (value_list[start], value_list[end - 1])
-
-
-def format_float_or_int(number: int | float):
-    return int(number) if float(number).is_integer() else f"{number:03.2f}"

devcontainer.Dockerfile

@@ -1,24 +0,0 @@
-FROM python:3.13-slim
-
-# Set up environment
-ENV PYTHONUNBUFFERED=1
-WORKDIR /workspace
-
-# Install Poetry
-RUN apt-get update && apt-get install -y \
-        curl \
-        make \
-        npm \
-    && rm -rf /var/lib/apt/lists/*
-RUN curl -sSL https://install.python-poetry.org | python3 -
-ENV PATH="/root/.local/bin:$PATH"
-
-# Copy pyproject.toml and poetry.lock for dependency installation
-COPY pyproject.toml poetry.lock* ./
-RUN poetry install --no-root
-
-# Copy the rest of the application code
-COPY . .
-
-# Set up Django development server
-EXPOSE 8000

entrypoint.sh

@@ -10,14 +10,10 @@ poetry run python manage.py collectstatic --clear --no-input
 _term() {
   echo "Caught SIGTERM signal!"
   kill -SIGTERM "$gunicorn_pid"
-  kill -SIGTERM "$django_q_pid"
 }
 trap _term SIGTERM
 
-echo "Starting Django-Q cluster"
-poetry run python manage.py qcluster & django_q_pid=$!
-
 echo "Starting app"
 poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile - & gunicorn_pid=$!
 
-wait "$gunicorn_pid" "$django_q_pid"
+wait "$gunicorn_pid"

frontend/.eslintrc.cjs

@@ -0,0 +1,17 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true
+  },
+  extends: ["eslint/recommended", "plugin:react/recommended", "plugin:prettier/recommended"],
+  overrides: [],
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module"
+  },
+  plugins: ["react"],
+  rules: {},
+  parserOptions: {
+    ecmaFeatures: { jsx: true }
+  }
+};

frontend/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

frontend/.prettierrc

@@ -0,0 +1,9 @@
+{
+    "semi": true,
+    "tabWidth": 2,
+    "printWidth": 100,
+    "singleQuote": true,
+    "trailingComma": "none",
+    "bracketSameLine": false,
+    "singleAttributePerLine": true
+}

frontend/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <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.0" />
+    <!-- TODO: replace with own icon -->
+    <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
+    <link rel="stylesheet" href="https://rsms.me/inter/inter.css"/>
+    <title>Timetracker</title>
+  </head>
+  <body class="dark">
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>

frontend/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "frontend",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "autoprefixer": "^10.4.13",
+    "postcss": "^8.4.21",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "tailwindcss": "^3.2.4"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.9",
+    "@vitejs/plugin-react": "^3.0.0",
+    "eslint": "^8.32.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-react": "^7.32.1",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "vite": "^4.0.0"
+  }
+}

frontend/postcss.config.cjs

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}

frontend/src/App.jsx

@@ -0,0 +1,42 @@
+import { useState } from 'react'
+import './App.css'
+
+function App() {
+  
+
+  return (
+    <>
+    <div className="dark:bg-gray-800 min-h-screen">
+            <nav className="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
+                <div className="container flex flex-wrap items-center justify-between mx-auto">
+                    <a href="{% url 'index' %}" className="flex items-center">
+                        <span className="text-4xl">⌚</span>
+                        <span className="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
+                    </a>
+                    <div className="w-full md:block md:w-auto">
+                        <ul
+                            className="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
+                            <li><a className="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
+                            <li><a className="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 className="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_purchase' %}">New Purchase</a></li>
+                            {/* {% endif %} */}
+                            {/* {% if purchase_available %} */}
+                                <li><a className="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
+                            {/* {% endif %} */}
+                            {/* {% if session_count > 0 %} */}
+                                <li><a className="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
+                            {/* {% endif %} */}
+                        </ul>
+                    </div>
+                </div>
+            </nav>
+            {/* {% block content %}No content here.{% endblock content %} */}
+        </div>
+        {/* {% load version %} */}
+        {/* <span className="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span> */}
+        </>
+  )
+}
+
+export default App;

frontend/src/components/Nav.jsx

@@ -0,0 +1,71 @@
+import { Link } from 'react-router-dom';
+
+function Nav() {
+  return (
+    <nav className="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
+      <div className="container flex flex-wrap items-center justify-between mx-auto">
+        <Link
+          to="/"
+          className="flex items-center"
+        >
+          <span className="text-4xl">⌚</span>
+          <span className="self-center text-xl font-semibold whitespace-nowrap text-white">
+            Timetracker
+          </span>
+        </Link>
+        <div className="w-full md:block md:w-auto">
+          <ul className="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
+            <li>
+              <a
+                className="block py-2 pl-3 pr-4 hover:underline"
+                href="{% url 'add_game' %}"
+              >
+                New Game
+              </a>
+            </li>
+            <li>
+              <a
+                className="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
+                className="block py-2 pl-3 pr-4 hover:underline"
+                href="{% url 'add_purchase' %}"
+              >
+                New Purchase
+              </a>
+            </li>
+            {/* {% endif %} */}
+            {/* {% if purchase_available %} */}
+            <li>
+              <a
+                className="block py-2 pl-3 pr-4 hover:underline"
+                href="{% url 'add_session' %}"
+              >
+                New Session
+              </a>
+            </li>
+            {/* {% endif %} */}
+            {/* {% if session_count > 0 %} */}
+            <li>
+              <Link
+                className="block py-2 pl-3 pr-4 hover:underline"
+                to="/sessions"
+              >
+                All Sessions
+              </Link>
+            </li>
+            {/* {% endif %} */}
+          </ul>
+        </div>
+      </div>
+    </nav>
+  );
+}
+
+export default Nav;

frontend/src/components/SessionList.jsx

@@ -0,0 +1,162 @@
+export default function SessionList() {
+  const data = [
+    {
+        "url": "http://localhost:8000/api/sessions/25/",
+        "timestamp_start": "2020-01-01T00:00:00+01:00",
+        "timestamp_end": null,
+        "duration_manual": "12:00:00",
+        "duration_calculated": "00:00:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/26/",
+        "timestamp_start": "2022-12-31T15:25:00+01:00",
+        "timestamp_end": "2022-12-31T17:25:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:00:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/2/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/27/",
+        "timestamp_start": "2023-01-01T23:00:00+01:00",
+        "timestamp_end": "2023-01-02T00:28:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "01:28:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/28/",
+        "timestamp_start": "2023-01-02T22:08:00+01:00",
+        "timestamp_end": "2023-01-03T01:08:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "03:00:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/29/",
+        "timestamp_start": "2023-01-03T22:36:00+01:00",
+        "timestamp_end": "2023-01-04T00:12:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "01:36:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/30/",
+        "timestamp_start": "2023-01-04T20:35:00+01:00",
+        "timestamp_end": "2023-01-04T22:36:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:01:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/31/",
+        "timestamp_start": "2023-01-06T18:48:00+01:00",
+        "timestamp_end": "2023-01-06T23:39:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "04:51:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/32/",
+        "timestamp_start": "2023-01-07T23:49:00+01:00",
+        "timestamp_end": "2023-01-08T01:43:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "01:54:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/33/",
+        "timestamp_start": "2023-01-08T16:21:00+01:00",
+        "timestamp_end": "2023-01-08T18:27:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:06:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/34/",
+        "timestamp_start": "2023-01-08T19:04:00+01:00",
+        "timestamp_end": "2023-01-08T22:03:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:59:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/35/",
+        "timestamp_start": "2023-01-09T19:35:48+01:00",
+        "timestamp_end": "2023-01-09T22:13:20.519058+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:37:32.519058",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/36/",
+        "timestamp_start": "2023-01-10T15:50:12+01:00",
+        "timestamp_end": "2023-01-10T17:03:45.424429+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "01:13:33.424429",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/4/"
+    }
+  ]
+  const header = ["url", "timestamp_start", "timestamp_end", "duration_manual", "duration_calculated", "note", "purchase"]
+  // const header = ["Name", "Platform", "Start", "End", "Duration", "Manage"]
+  return (
+        <>
+          <div id="session-table" className="gap-4 shadow rounded-xl max-w-screen-lg mx-auto dark:bg-slate-700 p-2 justify-center">
+              {header.map(column => {
+                <div className="dark:border-white dark:text-slate-300 text-lg">{column}</div>
+              })}
+          {data.map(session => {
+              <>
+                <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.url }
+                </a>
+                <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.timestamp_start }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.timestamp_end }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.duration_manual }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.duration_calculated }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.note }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.purchase }
+                </a>
+              </div>
+              </div>
+              </>
+          })}
+          </div>
+        </>
+  )
+}

frontend/src/error-page.jsx

@@ -0,0 +1,16 @@
+import { useRouteError } from "react-router-dom";
+
+export default function ErrorPage() {
+    const error = useRouteError()
+    console.error(error)
+
+    return (
+        <div className="container text-center">
+            <h1 className="text-3xl">Oops!</h1>
+            <p>Sorry, an unexpected error has occurred.</p>
+            <p>
+                <i>{error.statusText || error.message}</i>
+            </p>
+        </div>
+    )
+}

frontend/src/index.css

@@ -0,0 +1,22 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+form label {
+  @apply dark:text-slate-400;
+}
+
+form input,
+select,
+textarea {
+  @apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
+}
+
+#session-table {
+  display: grid;
+  grid-template-columns: 3fr 1fr repeat(2, 2fr) 0.5fr 1fr;
+}
+
+#button-container button {
+  @apply mx-1;
+}

frontend/src/main.jsx

@@ -0,0 +1,34 @@
+import React from 'react'
+import ReactDOM from 'react-dom/client'
+import App from './App'
+import './index.css'
+import { createBrowserRouter, RouterProvider } from 'react-router-dom'
+// import { loader as sessionLoader } from './routes/sessions'
+import ErrorPage from "./error-page"
+import SessionList from './components/SessionList'
+// import Session from './routes/sessions'
+
+const router = createBrowserRouter([
+  {
+    path: "/",
+    element: <App />,
+    errorElement: <ErrorPage />,
+    // loader: sessionLoader,
+    children:  [
+      {
+        path: "sessions/",
+        element: <SessionList />
+      }
+    ]
+  },
+  // {
+  //   path: "sessions",
+  //   element: <SessionList />
+  // }
+])
+
+ReactDOM.createRoot(document.getElementById('root')).render(
+  <React.StrictMode>
+    <RouterProvider router={router} />
+  </React.StrictMode>,
+)

frontend/src/services/ApiService.jsx

@@ -0,0 +1,17 @@
+export async function api(url) {
+    const response = await fetch(url);
+    if (response.ok) {
+      const jsonValue = await response.json();
+      return Promise.resolve(jsonValue);
+    } else {
+      return Promise.reject('Response was not OK.');
+    }
+  }
+
+export async function getSession(sessionId) {
+    return await api(`/api/sessions/${sessionId}/`); 
+  }
+
+  export async function getSessionList() {
+    return await api(`/api/sessions/`); 
+  }

frontend/tailwind.config.cjs

@@ -0,0 +1,12 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  darkMode: "class",
+  content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
+  theme: {
+    fontFamily: {
+      sans: ["Inter", "sans-serif"],
+    },
+    extend: {},
+  },
+  plugins: [require("@tailwindcss/typography"), require("@tailwindcss/forms")],
+};

frontend/vite.config.js

@@ -0,0 +1,12 @@
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+  server: {
+    proxy: {
+      "/api": "http://127.0.0.1:8001",
+    },
+  },
+});

games/admin.py

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

games/apps.py

@@ -1,33 +1,6 @@
-from datetime import timedelta
-
 from django.apps import AppConfig
-from django.core.management import call_command
-from django.db.models.signals import post_migrate
-from django.utils.timezone import now
 
 
 class GamesConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "games"
-
-    def ready(self):
-        post_migrate.connect(schedule_tasks, sender=self)
-
-
-def schedule_tasks(sender, **kwargs):
-    from django_q.models import Schedule
-    from django_q.tasks import schedule
-
-    if not Schedule.objects.filter(name="Update converted prices").exists():
-        schedule(
-            "games.tasks.convert_prices",
-            name="Update converted prices",
-            schedule_type=Schedule.MINUTES,
-            next_run=now() + timedelta(seconds=30),
-        )
-
-    from games.models import ExchangeRate
-
-    if not ExchangeRate.objects.exists():
-        print("ExchangeRate table is empty. Loading fixture...")
-        call_command("loaddata", "exchangerates.yaml")

games/fixtures/exchangerates.yaml

@@ -1,112 +0,0 @@
-- model: games.exchangerate
-  pk: 1
-  fields:
-    currency_from: USD
-    currency_to: CZK
-    year: 2024
-    rate: 23.4
-- model: games.exchangerate
-  pk: 2
-  fields:
-    currency_from: CNY
-    currency_to: CZK
-    year: 2024
-    rate: 3.267
-- model: games.exchangerate
-  pk: 3
-  fields:
-    currency_from: USD
-    currency_to: CZK
-    year: 2019
-    rate: 22.466
-- model: games.exchangerate
-  pk: 4
-  fields:
-    currency_from: USD
-    currency_to: CZK
-    year: 2023
-    rate: 22.63
-- model: games.exchangerate
-  pk: 5
-  fields:
-    currency_from: USD
-    currency_to: CZK
-    year: 2017
-    rate: 25.819
-- model: games.exchangerate
-  pk: 6
-  fields:
-    currency_from: USD
-    currency_to: CZK
-    year: 2013
-    rate: 19.023
-- model: games.exchangerate
-  pk: 7
-  fields:
-    currency_from: CNY
-    currency_to: CZK
-    year: 2019
-    rate: 3.295
-- model: games.exchangerate
-  pk: 8
-  fields:
-    currency_from: CNY
-    currency_to: CZK
-    year: 2016
-    rate: 3.795
-- model: games.exchangerate
-  pk: 9
-  fields:
-    currency_from: CNY
-    currency_to: CZK
-    year: 2015
-    rate: 3.707
-- model: games.exchangerate
-  pk: 10
-  fields:
-    currency_from: CNY
-    currency_to: CZK
-    year: 2020
-    rate: 3.26
-- model: games.exchangerate
-  pk: 11
-  fields:
-    currency_from: EUR
-    currency_to: CZK
-    year: 2012
-    rate: 25.51
-- model: games.exchangerate
-  pk: 12
-  fields:
-    currency_from: EUR
-    currency_to: CZK
-    year: 2010
-    rate: 26.465
-- model: games.exchangerate
-  pk: 13
-  fields:
-    currency_from: EUR
-    currency_to: CZK
-    year: 2014
-    rate: 27.52
-- model: games.exchangerate
-  pk: 14
-  fields:
-    currency_from: EUR
-    currency_to: CZK
-    year: 2024
-    rate: 25.21
-- model: games.exchangerate
-  pk: 15
-  fields:
-    currency_from: EUR
-    currency_to: CZK
-    year: 2022
-    rate: 24.325
-- model: games.exchangerate
-  pk: 16
-  fields:
-    currency_from: CNY
-    currency_to: CZK
-    year: 2018
-    rate: 3.268

games/forms.py

@@ -1,7 +1,6 @@
 from django import forms
 from django.urls import reverse
 
-from common.utils import safe_getattr
 from games.models import Device, Edition, Game, Platform, Purchase, Session
 
 custom_date_widget = forms.DateInput(attrs={"type": "date"})
@@ -10,6 +9,11 @@ custom_datetime_widget = forms.DateTimeInput(
 )
 autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
 
+custom_date_widget = forms.DateInput(attrs={"type": "date"})
+custom_datetime_widget = forms.DateTimeInput(
+    attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M"
+)
+
 
 class SessionForm(forms.ModelForm):
     # purchase = forms.ModelChoiceField(
@@ -46,8 +50,8 @@ class EditionChoiceField(forms.ModelChoiceField):
 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"):
+        if value:
-            option["attrs"]["data-platform"] = platform_id
+            option["attrs"]["data-platform"] = value.instance.platform.id
         return option
 
 
@@ -83,8 +87,6 @@ class PurchaseForm(forms.ModelForm):
         widgets = {
             "date_purchased": custom_date_widget,
             "date_refunded": custom_date_widget,
-            "date_finished": custom_date_widget,
-            "date_dropped": custom_date_widget,
         }
         model = Purchase
         fields = [
@@ -93,8 +95,6 @@ class PurchaseForm(forms.ModelForm):
             "date_purchased",
             "date_refunded",
             "date_finished",
-            "date_dropped",
-            "infinite",
             "price",
             "price_currency",
             "ownership_type",
@@ -151,7 +151,7 @@ class EditionForm(forms.ModelForm):
 
     class Meta:
         model = Edition
-        fields = ["game", "name", "sort_name", "platform", "year_released", "wikidata"]
+        fields = ["game", "name", "platform", "year_released", "wikidata"]
 
 
 class GameForm(forms.ModelForm):
@@ -164,11 +164,7 @@ class GameForm(forms.ModelForm):
 class PlatformForm(forms.ModelForm):
     class Meta:
         model = Platform
-        fields = [
+        fields = ["name", "group"]
-            "name",
-            "icon",
-            "group",
-        ]
         widgets = {"name": autofocus_input_widget}
 
 

games/graphql/mutations/__init__.py

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

games/graphql/mutations/game.py

@@ -1,29 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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/management/commands/schedule_convert_prices.py

@@ -1,24 +0,0 @@
-from datetime import timedelta
-
-from django.core.management.base import BaseCommand
-from django.utils.timezone import now
-from django_q.models import Schedule
-from django_q.tasks import schedule
-
-
-class Command(BaseCommand):
-    help = "Manually schedule the next update_converted_prices task"
-
-    def handle(self, *args, **kwargs):
-        if not Schedule.objects.filter(name="Update converted prices").exists():
-            schedule(
-                "games.tasks.convert_prices",
-                name="Update converted prices",
-                schedule_type=Schedule.MINUTES,
-                next_run=now() + timedelta(seconds=30),
-            )
-            self.stdout.write(
-                self.style.SUCCESS("Scheduled the update_converted_prices task.")
-            )
-        else:
-            self.stdout.write(self.style.WARNING("Task is already scheduled."))

games/migrations/0027_purchase_related_purchase.py

@@ -1,11 +1,10 @@
 # Generated by Django 4.1.5 on 2023-11-14 08:41
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("games", "0026_purchase_type"),
     ]

games/migrations/0028_purchase_name.py

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

games/migrations/0033_alter_edition_unique_together.py

@@ -1,17 +0,0 @@
-# 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

@@ -1,23 +0,0 @@
-# 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/migrations/0035_alter_session_device.py

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

games/migrations/0036_alter_edition_platform.py

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

games/migrations/0037_platform_icon.py

@@ -1,26 +0,0 @@
-# Generated by Django 5.1.1 on 2024-09-14 07:05
-
-from django.db import migrations, models
-from django.utils.text import slugify
-
-
-def update_empty_icons(apps, schema_editor):
-    Platform = apps.get_model("games", "Platform")
-    for platform in Platform.objects.filter(icon=""):
-        platform.icon = slugify(platform.name)
-        platform.save()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("games", "0036_alter_edition_platform"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="platform",
-            name="icon",
-            field=models.SlugField(blank=True),
-        ),
-        migrations.RunPython(update_empty_icons),
-    ]

games/migrations/0038_alter_purchase_price.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.1 on 2024-10-04 09:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('games', '0037_platform_icon'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='purchase',
-            name='price',
-            field=models.FloatField(default=0),
-        ),
-    ]

games/migrations/0039_alter_device_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-09 22:38
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('games', '0038_alter_purchase_price'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='device',
-            name='type',
-            field=models.CharField(choices=[('PC', 'PC'), ('Console', 'Console'), ('Handheld', 'Handheld'), ('Mobile', 'Mobile'), ('Single-board computer', 'Single-board computer'), ('Unknown', 'Unknown')], default='Unknown', max_length=255),
-        ),
-    ]

games/migrations/0040_migrate_device_types.py

@@ -1,33 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-09 22:39
-
-from django.db import migrations
-
-
-def update_device_types(apps, schema_editor):
-    Device = apps.get_model("games", "Device")
-
-    # Mapping of short names to long names
-    type_map = {
-        "pc": "PC",
-        "co": "Console",
-        "ha": "Handheld",
-        "mo": "Mobile",
-        "sbc": "Single-board computer",
-        "un": "Unknown",
-    }
-
-    # Loop through all devices and update the type field
-    for device in Device.objects.all():
-        if device.type in type_map:
-            device.type = type_map[device.type]
-            device.save()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("games", "0039_alter_device_type"),
-    ]
-
-    operations = [
-        migrations.RunPython(update_device_types),
-    ]

games/migrations/0041_purchase_converted_currency_purchase_converted_price_and_more.py

@@ -1,36 +0,0 @@
-# Generated by Django 5.1.3 on 2024-11-10 15:14
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('games', '0040_migrate_device_types'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='purchase',
-            name='converted_currency',
-            field=models.CharField(max_length=3, null=True),
-        ),
-        migrations.AddField(
-            model_name='purchase',
-            name='converted_price',
-            field=models.FloatField(null=True),
-        ),
-        migrations.CreateModel(
-            name='ExchangeRate',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('currency_from', models.CharField(max_length=255)),
-                ('currency_to', models.CharField(max_length=255)),
-                ('year', models.PositiveIntegerField()),
-                ('rate', models.FloatField()),
-            ],
-            options={
-                'unique_together': {('currency_from', 'currency_to', 'year')},
-            },
-        ),
-    ]

games/models.py

@@ -2,8 +2,8 @@ from datetime import timedelta
 
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import F, Sum
+from django.core.exceptions import ValidationError
-from django.template.defaultfilters import slugify
+from django.db.models import F, Manager, Sum
 from django.utils import timezone
 
 from common.time import format_duration
@@ -16,54 +16,47 @@ class Game(models.Model):
     wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
     created_at = models.DateTimeField(auto_now_add=True)
 
-    session_average: float | int | timedelta | None
-    session_count: int | None
-
-    def __str__(self):
-        return self.name
-
-
-class Platform(models.Model):
-    name = models.CharField(max_length=255)
-    group = models.CharField(max_length=255, null=True, blank=True, default=None)
-    icon = models.SlugField(blank=True)
-    created_at = models.DateTimeField(auto_now_add=True)
-
     def __str__(self):
         return self.name
 
     def save(self, *args, **kwargs):
-        if not self.icon:
+        def get_sort_name(name):
-            self.icon = slugify(self.name)
+            articles = ["a", "an", "the"]
+            name_parts = name.split()
+            first_word = name_parts[0].lower()
+            if first_word in articles:
+                return f"{' '.join(name_parts[1:])}, {name_parts[0]}"
+            else:
+                return name
+
+        self.sort_name = get_sort_name(self.name)
         super().save(*args, **kwargs)
 
 
-def get_sentinel_platform():
-    return Platform.objects.get_or_create(
-        name="Unspecified", icon="unspecified", group="Unspecified"
-    )[0]
-
-
 class Edition(models.Model):
     class Meta:
-        unique_together = [["name", "platform", "year_released"]]
+        unique_together = [["name", "platform"]]
 
-    game = models.ForeignKey(Game, on_delete=models.CASCADE)
+    game = models.ForeignKey("Game", on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
-    sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
+    platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
-    platform = models.ForeignKey(
+    year_released = models.IntegerField(default=datetime.today().year)
-        Platform, on_delete=models.SET_DEFAULT, 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.sort_name
 
     def save(self, *args, **kwargs):
-        if self.platform is None:
+        def get_sort_name(name):
-            self.platform = get_sentinel_platform()
+            articles = ["a", "an", "the"]
+            name_parts = name.split()
+            first_word = name_parts[0].lower()
+            if first_word in articles:
+                return f"{' '.join(name_parts[1:])}, {name_parts[0]}"
+            else:
+                return name
+
+        self.sort_name = get_sort_name(self.name)
         super().save(*args, **kwargs)
 
 
@@ -113,46 +106,29 @@ class Purchase(models.Model):
 
     objects = PurchaseQueryset().as_manager()
 
-    edition = models.ForeignKey(Edition, on_delete=models.CASCADE)
+    edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
     platform = models.ForeignKey(
-        Platform, on_delete=models.CASCADE, default=None, null=True, blank=True
+        "Platform", on_delete=models.CASCADE, default=None, null=True, blank=True
     )
     date_purchased = models.DateField()
     date_refunded = models.DateField(blank=True, null=True)
     date_finished = models.DateField(blank=True, null=True)
-    date_dropped = models.DateField(blank=True, null=True)
+    price = models.IntegerField(default=0)
-    infinite = models.BooleanField(default=False)
-    price = models.FloatField(default=0)
     price_currency = models.CharField(max_length=3, default="USD")
-    converted_price = models.FloatField(null=True)
-    converted_currency = models.CharField(max_length=3, null=True)
     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(
-        "self",
+        "Purchase", on_delete=models.SET_NULL, default=None, null=True, blank=True
-        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):
-        additional_info = [
+        platform_info = self.platform
-            self.get_type_display() if self.type != Purchase.GAME else "",
+        if self.platform != self.edition.platform:
-            (
+            platform_info = f"{self.edition.platform} version on {self.platform}"
-                f"{self.edition.platform} version on {self.platform}"
+        return f"{self.edition} ({platform_info}, {self.edition.year_released}, {self.get_ownership_type_display()})"
-                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
@@ -164,19 +140,18 @@ class Purchase(models.Model):
             raise ValidationError(
                 f"{self.get_type_display()} must have a related purchase."
             )
-        if self.pk is not None:
-            # Retrieve the existing instance from the database
-            existing_purchase = Purchase.objects.get(pk=self.pk)
-            # If price has changed, reset converted fields
-            if (
-                existing_purchase.price != self.price
-                or existing_purchase.price_currency != self.price_currency
-            ):
-                self.converted_price = None
-                self.converted_currency = None
         super().save(*args, **kwargs)
 
 
+class Platform(models.Model):
+    name = models.CharField(max_length=255)
+    group = models.CharField(max_length=255, null=True, blank=True, default=None)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.name
+
+
 class SessionQuerySet(models.QuerySet):
     def total_duration_formatted(self):
         return format_duration(self.total_duration_unformatted())
@@ -187,32 +162,19 @@ 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)
+    purchase = models.ForeignKey("Purchase", on_delete=models.CASCADE)
     timestamp_start = models.DateTimeField()
     timestamp_end = models.DateTimeField(blank=True, null=True)
     duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
     duration_calculated = models.DurationField(blank=True, null=True)
     device = models.ForeignKey(
         "Device",
-        on_delete=models.SET_DEFAULT,
+        on_delete=models.CASCADE,
         null=True,
         blank=True,
         default=None,
@@ -236,7 +198,7 @@ class Session(models.Model):
     def duration_seconds(self) -> timedelta:
         manual = timedelta(0)
         calculated = timedelta(0)
-        if self.is_manual() and isinstance(self.duration_manual, timedelta):
+        if self.is_manual():
             manual = self.duration_manual
         if self.timestamp_end != None and self.timestamp_start != None:
             calculated = self.timestamp_end - self.timestamp_start
@@ -253,15 +215,12 @@ class Session(models.Model):
     def duration_sum(self) -> str:
         return Session.objects.all().total_duration_formatted()
 
-    def save(self, *args, **kwargs) -> None:
+    def save(self, *args, **kwargs):
         if self.timestamp_start != None and self.timestamp_end != None:
             self.duration_calculated = self.timestamp_end - self.timestamp_start
         else:
             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"}
@@ -271,12 +230,12 @@ class Session(models.Model):
 
 
 class Device(models.Model):
-    PC = "PC"
+    PC = "pc"
-    CONSOLE = "Console"
+    CONSOLE = "co"
-    HANDHELD = "Handheld"
+    HANDHELD = "ha"
-    MOBILE = "Mobile"
+    MOBILE = "mo"
-    SBC = "Single-board computer"
+    SBC = "sbc"
-    UNKNOWN = "Unknown"
+    UNKNOWN = "un"
     DEVICE_TYPES = [
         (PC, "PC"),
         (CONSOLE, "Console"),
@@ -286,21 +245,8 @@ class Device(models.Model):
         (UNKNOWN, "Unknown"),
     ]
     name = models.CharField(max_length=255)
-    type = models.CharField(max_length=255, choices=DEVICE_TYPES, default=UNKNOWN)
+    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.type})"
+        return f"{self.name} ({self.get_type_display()})"
-
-
-class ExchangeRate(models.Model):
-    currency_from = models.CharField(max_length=255)
-    currency_to = models.CharField(max_length=255)
-    year = models.PositiveIntegerField()
-    rate = models.FloatField()
-
-    class Meta:
-        unique_together = ("currency_from", "currency_to", "year")
-
-    def __str__(self):
-        return f"{self.currency_from}/{self.currency_to} - {self.rate} ({self.year})"

games/schema.py

@@ -1,30 +0,0 @@
-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,24 +1,29 @@
-import { syncSelectInputUntilChanged } from "./utils.js";
+/**
+ * @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);
+  }
 
-let syncData = [
+  sourceElement.addEventListener("change", sourceElementHandler);
-  {
+  targetElement.addEventListener("focus", targetElementHandler);
-    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",
-  },
-];
 
-syncSelectInputUntilChanged(syncData, "form");
+window.addEventListener("load", () => {
+  syncSelectInputUntilChanged("#id_game", "#id_name");
+});

games/static/js/add_game.js

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

games/static/js/add_purchase.js

@@ -1,9 +1,4 @@
-import {
+import { syncSelectInputUntilChanged, getEl, conditionalElementHandler } from "./utils.js";
-  syncSelectInputUntilChanged,
-  getEl,
-  disableElementsWhenTrue,
-  disableElementsWhenValueNotEqual,
-} from "./utils.js";
 
 let syncData = [
   {
@@ -16,32 +11,21 @@ let syncData = [
 
 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);
+let myConfig = [
-document.addEventListener("htmx:afterSwap", setupElementHandlers);
+  () => {
-getEl("#id_type").onchange = () => {
+    return getEl("#id_type").value == "game";
-  setupElementHandlers();
+  },
-};
+  ["#id_name", "#id_related_purchase"],
-
+  (el) => {
-document.body.addEventListener("htmx:beforeRequest", function (event) {
+    el.disabled = "disabled";
-  // Assuming 'Purchase1' is the element that triggers the HTMX request
+  },
-  if (event.target.id === "id_edition") {
+  (el) => {
-    var idEditionValue = document.getElementById("id_edition").value;
+    el.disabled = "";
-
-    // Condition to check - replace this with your actual logic
-    if (idEditionValue != "") {
-      event.preventDefault(); // This cancels the HTMX request
-    }
   }
-});
+]
+
+document.DOMContentLoaded = conditionalElementHandler(...myConfig)
+getEl("#id_type").onchange = () => {
+  conditionalElementHandler(...myConfig)
+}

games/static/js/add_session.js

@@ -7,14 +7,7 @@ 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;
     } else if (type == "toggle") {
       if (targetElement.type == "datetime-local") targetElement.type = "text";
       else targetElement.type = "datetime-local";

games/static/js/utils.js

@@ -3,16 +3,9 @@
  * @param {Date} date
  * @returns {string}
  */
-function toISOUTCString(date) {
+export function toISOUTCString(date) {
-  function stringAndPad(number) {
+  let month = (date.getMonth() + 1).toString().padStart(2, 0);
-    return number.toString().padStart(2, 0);
+  return `${date.getFullYear()}-${month}-${date.getDate()}T${date.getHours()}:${date.getMinutes()}`;
-  }
-  const year = date.getFullYear();
-  const month = stringAndPad(date.getMonth() + 1);
-  const day = stringAndPad(date.getDate());
-  const hours = stringAndPad(date.getHours());
-  const minutes = stringAndPad(date.getMinutes());
-  return `${year}-${month}-${day}T${hours}:${minutes}`;
 }
 
 /**
@@ -75,10 +68,7 @@ function syncSelectInputUntilChanged(syncData, parentSelector = document) {
  * @param {string} property - The property to retrieve the value from.
  */
 function getValueFromProperty(sourceElement, property) {
-  let source =
+  let source = (sourceElement instanceof HTMLSelectElement) ? sourceElement.selectedOptions[0] : sourceElement
-    sourceElement instanceof HTMLSelectElement
-      ? sourceElement.selectedOptions[0]
-      : sourceElement;
   if (property.startsWith("dataset.")) {
     let datasetKey = property.slice(8); // Remove 'dataset.' part
     return source.dataset[datasetKey];
@@ -96,112 +86,43 @@ function getValueFromProperty(sourceElement, property) {
  */
 function getEl(selector) {
   if (selector.startsWith("#")) {
-    return document.getElementById(selector.slice(1));
+    return document.getElementById(selector.slice(1))
-  } else if (selector.startsWith(".")) {
+  }
-    return document.getElementsByClassName(selector);
+  else if (selector.startsWith(".")) {
-  } else {
+    return document.getElementsByClassName(selector)
-    return document.getElementsByTagName(selector);
+  }
+  else {
+    return document.getElementsByName(selector)
   }
 }
 
 /**
- * @description Applies different behaviors to elements based on multiple conditional configurations.
+ * @description Does something to elements when something happens.
- * Each configuration is an array containing a condition function, an array of target element selectors,
+ * @param {() => boolean} condition The condition that is being tested.
- * and two callback functions for handling matched and unmatched conditions.
+ * @param {string[]} targetElements
- * @param {...Array} configs Each configuration is an array of the form:
+ * @param {(elementName: HTMLElement) => void} callbackfn1 Called when the condition matches.
- *   - 0: {function(): boolean} condition - Function that returns true or false based on a condition.
+ * @param {(elementName: HTMLElement) => void} callbackfn2 Called when the condition doesn't match.
- *   - 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) {
+function conditionalElementHandler(condition, targetElements, callbackfn1, callbackfn2) {
-  configs.forEach(([condition, targetElements, callbackfn1, callbackfn2]) => {
+  if (condition()) {
-    if (condition()) {
+    targetElements.forEach((elementName) => {
-      targetElements.forEach((elementName) => {
+      let el = getEl(elementName);
-        let el = getEl(elementName);
+      if (el === null) {
-        if (el === null) {
+        console.error("Element ${elementName} doesn't exist.");
-          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(
+        callbackfn1(el);
-          `${disableElementsWhenTrue.name}: none of the values is equal to ${target.value}, returning true.`
-        );
-        return target.value != targetValue;
       }
-    },
+    });
-    elementList,
+  } else {
-    (el) => {
+    targetElements.forEach((elementName) => {
-      console.debug(
+      let el = getEl(elementName);
-        `${disableElementsWhenTrue.name}: evaluated true, disabling ${el.id}.`
+      if (el === null) {
-      );
+        console.error("Element ${elementName} doesn't exist.");
-      el.disabled = "disabled";
+      } else {
-    },
+        callbackfn2(el);
-    (el) => {
+      }
-      console.debug(
+    });
-        `${disableElementsWhenTrue.name}: evaluated false, NOT disabling ${el.id}.`
+  }
-      );
-      el.disabled = "";
-    },
-  ]);
 }
 
-function disableElementsWhenTrue(targetSelect, targetValue, elementList) {
+export { toISOUTCString, syncSelectInputUntilChanged, getEl, conditionalElementHandler };
-  return conditionalElementHandler([
-    () => {
-      return getEl(targetSelect).value == targetValue;
-    },
-    elementList,
-    (el) => {
-      el.disabled = "disabled";
-    },
-    (el) => {
-      el.disabled = "";
-    },
-  ]);
-}
-
-export {
-  toISOUTCString,
-  syncSelectInputUntilChanged,
-  getEl,
-  conditionalElementHandler,
-  disableElementsWhenValueNotEqual,
-  disableElementsWhenTrue,
-  getValueFromProperty,
-};

games/tasks.py

@@ -1,57 +0,0 @@
-import requests
-
-from games.models import ExchangeRate, Purchase
-
-# fixme: save preferred currency in user model
-currency_to = "CZK"
-currency_to = currency_to.upper()
-
-
-def save_converted_info(purchase, converted_price, converted_currency):
-    print(
-        f"Changing converted price of {purchase} to {converted_price} {converted_currency} "
-    )
-    purchase.converted_price = converted_price
-    purchase.converted_currency = converted_currency
-    purchase.save()
-
-
-def convert_prices():
-    purchases = Purchase.objects.filter(
-        converted_price__isnull=True, converted_currency__isnull=True
-    )
-
-    for purchase in purchases:
-        if purchase.price_currency.upper() == currency_to or purchase.price == 0:
-            save_converted_info(purchase, purchase.price, currency_to)
-            continue
-        year = purchase.date_purchased.year
-        currency_from = purchase.price_currency.upper()
-        exchange_rate = ExchangeRate.objects.filter(
-            currency_from=currency_from, currency_to=currency_to, year=year
-        ).first()
-
-        if not exchange_rate:
-            try:
-                response = requests.get(
-                    f"https://cdn.jsdelivr.net/npm/@fawazahmed0/currency-api@{year}-01-01/v1/currencies/{currency_from}.json"
-                )
-                response.raise_for_status()
-                data = response.json()
-                rate = data[currency_from].get(currency_to)
-
-                if rate:
-                    exchange_rate = ExchangeRate.objects.create(
-                        currency_from=currency_from,
-                        currency_to=currency_to,
-                        year=year,
-                        rate=rate,
-                    )
-            except requests.RequestException as e:
-                print(
-                    f"Failed to fetch exchange rate for {currency_from}->{currency_to} in {year}: {e}"
-                )
-        if exchange_rate:
-            save_converted_info(
-                purchase, purchase.price * exchange_rate.rate, currency_to
-            )

games/templates/add.html

@@ -1,2 +1,18 @@
-<c-layouts.add>
+{% extends "base.html" %}
-</c-layouts.add>
+{% 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>
+        </table>
+    </form>
+{% endblock content %}

games/templates/add_edition.html

@@ -1,12 +1,22 @@
-<c-layouts.add>
+{% extends "base.html" %}
-<c-slot name="additional_row">
+{% load static %}
-<tr>
+{% block title %}
-    <td></td>
+    {{ title }}
-    <td>
+{% endblock title %}
-        <input type="submit"
+{% block content %}
-               name="submit_and_redirect"
+    <form method="post" enctype="multipart/form-data">
-               value="Submit & Create Purchase" />
+        <table class="mx-auto">
-    </td>
+        {% csrf_token %}
-</tr>
+
-</c-slot>
+        {{ form.as_table }}
-</c-layouts.add>
+        <tr>
+            <td></td>
+            <td><input type="submit" value="Submit"/></td>
+        </tr>
+        </table>
+    </form>
+{% endblock content %}
+{% block scripts %}
+{% load static %}
+<script type="module" src="{% static 'js/add_edition.js' %}"></script>
+{% endblock scripts %}

games/templates/add_game.html

@@ -1,12 +1,32 @@
-<c-layouts.add>
+{% extends "base.html" %}
-<c-slot name="additional_row">
+{% load static %}
-<tr>
+{% block title %}
-    <td></td>
+    {{ title }}
-    <td>
+{% endblock title %}
-        <input type="submit"
+{% block content %}
-               name="submit_and_redirect"
+    <form method="post" enctype="multipart/form-data">
-               value="Submit & Create Edition" />
+        <table class="mx-auto">
-    </td>
+            {% csrf_token %}
-</tr>
+            {{ form.as_table }}
-</c-slot>
+            <tr>
-</c-layouts.add>
+                <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

@@ -1,12 +1,32 @@
-<c-layouts.add>
+{% extends "base.html" %}
-<c-slot name="additional_row">
+{% load static %}
-<tr>
+{% block title %}
-    <td></td>
+    {{ title }}
-    <td>
+{% endblock title %}
-        <input type="submit"
+{% block content %}
-               name="submit_and_redirect"
+    <form method="post" enctype="multipart/form-data">
-               value="Submit & Create Session" />
+        <table class="mx-auto">
-    </td>
+            {% csrf_token %}
-</tr>
+            {{ form.as_table }}
-</c-slot>
+            <tr>
-</c-layouts.add>
+                <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>
+        </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,36 +1,36 @@
-<c-layouts.add>
+{% extends "base.html" %}
-<c-slot name="form_content">
+
-<form method="post" enctype="multipart/form-data">
+{% block title %}{{ title }}{% endblock title %}
-    <table class="mx-auto">
+
+{% block content %}
+    <form method="post" enctype="multipart/form-data">
+        <table class="mx-auto">
         {% csrf_token %}
+
         {% for field in form %}
-            <tr>
+        <tr>
-                <th>{{ field.label_tag }}</th>
+            <th>{{ field.label_tag }}</th>
-                {% if field.name == "note" %}
+            {% if field.name == "note" %}
-                    <td>{{ field }}</td>
+            <td>{{ field }}</td>
-                {% else %}
+            {% else %}
-                    <td>{{ field }}</td>
+            <td>{{ field }}</td>
-                {% endif %}
+            {% endif %}
-                {% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
+            {% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
-                    <td>
+            <td>
-                        <div class="basic-button-container" hx-boost="false">
+                <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="now">Set to now</button>
-                            <button class="basic-button"
+                    <button class="basic-button" data-target="{{field.name}}" data-type="toggle">Toggle text</button>
-                                    data-target="{{ field.name }}"
+                </div>
-                                    data-type="toggle">Toggle text</button>
+            </td>
-                            <button class="basic-button" data-target="{{ field.name }}" data-type="copy">Copy</button>
+            {% endif %}
-                        </div>
+        </tr>
-                    </td>
-                {% endif %}
-            </tr>
         {% endfor %}
         <tr>
             <td></td>
-            <td>
+            <td><input type="submit" value="Submit"/></td>
-                <input type="submit" value="Submit" />
-            </td>
         </tr>
-    </table>
+        </table>
-</form>
+    </form>
-</c-slot>
+    {% load static %}
-</c-layouts.add>
+    <script type="module" src="{% static 'js/add_session.js' %}"></script>
+{% endblock content %}

games/templates/base.html

@@ -0,0 +1,95 @@
+<!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>
+        <script src="{% static 'js/htmx.min.js' %}"></script>
+        <link rel="stylesheet" href="{% static 'base.css' %}" />
+    </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">
+                <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">⌚</span>
+                        <span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
+                    </a>
+                    <div class="w-full md:block md:w-auto">
+                        <ul class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
+                            <li class="relative group">
+                                <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_current_year' %}">Stats</a>
+                                    <ul class="absolute hidden text-gray-700 pt-1 group-hover:block">
+                                        {% for year in stats_dropdown_year_range %}
+                                            <li>
+                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
+                                                   href="{% url 'stats_by_year' year %}">{{ year }}</a>
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                </li>
+                                <li>
+                                    <a class="block py-2 pl-3 pr-4 hover:underline"
+                                       href="{% url 'list_sessions' %}">All Sessions</a>
+                                </li>
+                            {% endif %}
+                        </ul>
+                    </div>
+                </div>
+            </nav>
+            {% block content %}
+                No content here.
+            {% endblock content %}
+        </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>

games/templates/components/button.html

@@ -0,0 +1,22 @@
+<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/button_start.html

@@ -1,4 +1,4 @@
-{% comment %}
+{% comment %} 
 title
 text
 {% endcomment %}

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/cotton/button.html

@@ -1,6 +0,0 @@
-<c-vars color="blue" size="base" />
-<button type="button"
-        title="{{ title }}"
-        class=" {% if color == "blue" %} bg-blue-700 dark:bg-blue-600 dark:focus:ring-blue-800 dark:hover:bg-blue-700 focus:ring-blue-300 hover:bg-blue-800 text-white {% elif color == "red" %} bg-red-700 dark:bg-red-600 dark:focus:ring-red-900 dark:hover:bg-red-700 focus:ring-red-300 hover:bg-red-800 text-white {% elif color == "gray" %} bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-600 dark:focus:ring-gray-700 dark:hover:bg-gray-700 dark:hover:text-white dark:text-gray-400 focus:ring-gray-100 hover:bg-gray-100 hover:text-blue-700 text-gray-900 border {% elif color == "green" %} bg-green-700 dark:bg-green-600 dark:focus:ring-green-800 dark:hover:bg-green-700 focus:ring-green-300 hover:bg-green-800 text-white {% endif %} focus:outline-none focus:ring-4 font-medium mb-2 me-2 rounded-lg {% if size == "xs" %} px-3 py-2 text-xs {% elif size == "sm" %} px-3 py-2 text-sm {% elif size == "base" %} px-5 py-2.5 text-sm {% elif size == "lg" %} px-5 py-3 text-base {% elif size == "xl" %} px-6 py-3.5 text-base {% endif %} {% if icon %} inline-flex text-center items-center gap-2 {% else %} {% endif %} ">
-    {{ slot }}
-</button>

games/templates/cotton/button_group.html

@@ -1,8 +0,0 @@
-<div class="inline-flex rounded-md shadow-sm" role="group">
-    {% if slot %}{{ slot }}{% endif %}
-    {% for button in buttons %}
-        {% if button.slot %}
-            <c-button-group-button-sm :href=button.href :slot=button.slot :color=button.color :hover=button.hover :title=button.title />
-        {% endif %}
-    {% endfor %}
-</div>

games/templates/cotton/button_group_button_sm.html

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

games/templates/cotton/button_old.html

@@ -1,13 +0,0 @@
-{% 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/cotton/gamelink.html

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

games/templates/cotton/h1.html

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

games/templates/cotton/icon/battlenet.html

@@ -1,5 +0,0 @@
-<c-svg title="Battle.net">
-<c-slot name="path">
-M 43.113281 22.152344 C 43.113281 22.152344 47.058594 22.351563 47.058594 20.03125 C 47.058594 16.996094 41.804688 14.261719 41.804688 14.261719 C 41.804688 14.261719 42.628906 12.515625 43.140625 11.539063 C 43.65625 10.5625 45.101563 6.753906 45.230469 5.886719 C 45.394531 4.792969 45.144531 4.449219 45.144531 4.449219 C 44.789063 6.792969 40.972656 13.539063 40.671875 13.769531 C 36.949219 12.023438 31.835938 11.539063 31.835938 11.539063 C 31.835938 11.539063 26.832031 1 22.125 1 C 17.457031 1 17.480469 10.023438 17.480469 10.023438 C 17.480469 10.023438 16.160156 7.464844 14.507813 7.464844 C 12.085938 7.464844 11.292969 11.128906 11.292969 15.097656 C 6.511719 15.097656 2.492188 16.164063 2.132813 16.265625 C 1.773438 16.371094 0.644531 17.191406 1.15625 17.089844 C 2.203125 16.753906 7.113281 15.992188 11.410156 16.367188 C 11.648438 20.140625 13.851563 25.054688 13.851563 25.054688 C 13.851563 25.054688 9.128906 31.894531 9.128906 36.78125 C 9.128906 38.066406 9.6875 40.417969 13.078125 40.417969 C 15.917969 40.417969 19.105469 38.710938 19.707031 38.363281 C 19.183594 39.113281 18.796875 40.535156 18.796875 41.191406 C 18.796875 41.726563 19.113281 43.246094 21.304688 43.246094 C 24.117188 43.246094 27.257813 41.089844 27.257813 41.089844 C 27.257813 41.089844 30.222656 46.019531 32.761719 48.28125 C 33.445313 48.890625 34.097656 49 34.097656 49 C 34.097656 49 31.578125 46.574219 28.257813 40.324219 C 31.34375 38.417969 34.554688 33.921875 34.554688 33.921875 C 34.554688 33.921875 34.933594 33.933594 37.863281 33.933594 C 42.453125 33.933594 48.972656 32.96875 48.972656 29.320313 C 48.972656 25.554688 43.113281 22.152344 43.113281 22.152344 Z M 43.625 19.886719 C 43.625 21.21875 42.359375 21.199219 42.359375 21.199219 L 41.394531 21.265625 C 41.394531 21.265625 39.566406 20.304688 38.460938 19.855469 C 38.460938 19.855469 40.175781 17.207031 40.578125 16.46875 C 40.882813 16.644531 43.625 18.363281 43.625 19.886719 Z M 24.421875 6.308594 C 26.578125 6.308594 29.65625 11.402344 29.65625 11.402344 C 29.65625 11.402344 24.851563 10.972656 20.898438 13.296875 C 21.003906 9.628906 22.238281 6.308594 24.421875 6.308594 Z M 15.871094 10.4375 C 16.558594 10.4375 17.230469 11.269531 17.507813 11.976563 C 17.507813 12.445313 17.75 15.171875 17.75 15.171875 L 13.789063 15.023438 C 13.789063 11.449219 15.1875 10.4375 15.871094 10.4375 Z M 15.464844 35.246094 C 13.300781 35.246094 12.851563 34.039063 12.851563 32.953125 C 12.851563 30.496094 14.8125 27.058594 14.8125 27.058594 C 14.8125 27.058594 17.011719 31.683594 20.851563 33.636719 C 18.945313 34.753906 17.375 35.246094 15.464844 35.246094 Z M 22.492188 40.089844 C 20.972656 40.089844 20.789063 39.105469 20.789063 38.878906 C 20.789063 38.171875 21.339844 37.335938 21.339844 37.335938 C 21.339844 37.335938 23.890625 35.613281 24.054688 35.429688 L 25.9375 38.945313 C 25.9375 38.945313 24.007813 40.089844 22.492188 40.089844 Z M 27.226563 38.171875 C 26.300781 36.554688 25.621094 34.867188 25.621094 34.867188 C 25.621094 34.867188 29.414063 35.113281 31.453125 33.007813 C 30.183594 33.578125 28.15625 34.300781 25.800781 34.082031 C 30.726563 29.742188 33.601563 26.597656 36.03125 23.34375 C 35.824219 23.09375 34.710938 22.316406 34.4375 22.1875 C 32.972656 23.953125 27.265625 30.054688 21.984375 33.074219 C 15.292969 29.425781 13.890625 18.691406 13.746094 16.460938 L 17.402344 16.8125 C 17.402344 16.8125 16.027344 19.246094 16.027344 21.039063 C 16.027344 22.828125 16.242188 22.925781 16.242188 22.925781 C 16.242188 22.925781 16.195313 19.800781 18.125 17.390625 C 19.59375 25.210938 21.125 29.21875 22.320313 31.605469 C 22.925781 31.355469 24.058594 30.851563 24.058594 30.851563 C 24.058594 30.851563 20.683594 21.121094 20.871094 14.535156 C 22.402344 13.71875 24.667969 12.875 27.226563 12.875 C 33.957031 12.875 39.367188 15.773438 39.367188 15.773438 L 37.25 18.730469 C 37.25 18.730469 35.363281 15.3125 32.699219 14.703125 C 34.105469 15.753906 35.679688 17.136719 36.496094 19.128906 C 30.917969 16.949219 24.1875 15.796875 22.027344 15.542969 C 21.839844 16.339844 21.863281 17.480469 21.863281 17.480469 C 21.863281 17.480469 30.890625 19.144531 37.460938 22.90625 C 37.414063 31.125 28.460938 37.4375 27.226563 38.171875 Z M 35.777344 32.027344 C 35.777344 32.027344 38.578125 28.347656 38.535156 23.476563 C 38.535156 23.476563 43.0625 26.28125 43.0625 29.015625 C 43.0625 32.074219 35.777344 32.027344 35.777344 32.027344 Z
-</c-slot>
-</c-svg>

games/templates/cotton/icon/bethesda.html

@@ -1,5 +0,0 @@
-<c-svg viewBox="0 0 20 20">
-<c-slot name="path">
-M2.069,11 L5,11 L5,9 L2.069,9 C2.252,7.542 2.828,6.208 3.688,5.102 L5.757,7.172 L7.171,5.757 L5.102,3.688 C6.208,2.828 8,2.252 9,2.069 L9,5 L11,5 L11,2.069 C12,2.252 13.791,2.828 14.897,3.688 L12.828,5.757 L14.242,7.172 L16.311,5.102 C17.171,6.208 17.747,7.542 17.93,9 L15,9 L15,11 L17.93,11 C17.747,12.458 17.171,13.792 16.311,14.898 L14.242,12.828 L12.828,14.243 L14.897,16.312 C13.791,17.172 12,17.748 11,17.931 L11,15 L9,15 L9,17.931 C8,17.748 6.208,17.172 5.102,16.312 L7.171,14.243 L5.757,12.828 L3.688,14.898 C2.828,13.792 2.252,12.458 2.069,11 M10,0 C4.477,0 0,4.477 0,10 C0,15.523 4.477,20 10,20 C15.522,20 20,15.523 20,10 C20,4.477 15.522,0 10,0
-</c-slot>
-</c-svg>

games/templates/cotton/icon/checkmark.html

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     x="0px"
-     y="0px"
-     viewBox="0 0 48 48"
-     class="text-black dark:text-white w-4 h-4">
-    <path fill="currentColor" d="M 43.470703 8.9863281 A 1.50015 1.50015 0 0 0 42.439453 9.4394531 L 16.5 35.378906 L 5.5605469 24.439453 A 1.50015 1.50015 0 1 0 3.4394531 26.560547 L 15.439453 38.560547 A 1.50015 1.50015 0 0 0 17.560547 38.560547 L 44.560547 11.560547 A 1.50015 1.50015 0 0 0 43.470703 8.9863281 z">
-    </path>
-</svg>

games/templates/cotton/icon/delete.html

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     x="0px"
-     y="0px"
-     viewBox="0 0 48 48"
-     class="text-black dark:text-white w-4 h-4">
-    <path fill="currentColor" d="M 24 4 C 20.491685 4 17.570396 6.6214322 17.080078 10 L 10.238281 10 A 1.50015 1.50015 0 0 0 9.9804688 9.9785156 A 1.50015 1.50015 0 0 0 9.7578125 10 L 6.5 10 A 1.50015 1.50015 0 1 0 6.5 13 L 8.6386719 13 L 11.15625 39.029297 C 11.427329 41.835926 13.811782 44 16.630859 44 L 31.367188 44 C 34.186411 44 36.570826 41.836168 36.841797 39.029297 L 39.361328 13 L 41.5 13 A 1.50015 1.50015 0 1 0 41.5 10 L 38.244141 10 A 1.50015 1.50015 0 0 0 37.763672 10 L 30.919922 10 C 30.429604 6.6214322 27.508315 4 24 4 z M 24 7 C 25.879156 7 27.420767 8.2681608 27.861328 10 L 20.138672 10 C 20.579233 8.2681608 22.120844 7 24 7 z M 11.650391 13 L 36.347656 13 L 33.855469 38.740234 C 33.730439 40.035363 32.667963 41 31.367188 41 L 16.630859 41 C 15.331937 41 14.267499 40.033606 14.142578 38.740234 L 11.650391 13 z M 20.476562 17.978516 A 1.50015 1.50015 0 0 0 19 19.5 L 19 34.5 A 1.50015 1.50015 0 1 0 22 34.5 L 22 19.5 A 1.50015 1.50015 0 0 0 20.476562 17.978516 z M 27.476562 17.978516 A 1.50015 1.50015 0 0 0 26 19.5 L 26 34.5 A 1.50015 1.50015 0 1 0 29 34.5 L 29 19.5 A 1.50015 1.50015 0 0 0 27.476562 17.978516 z">
-    </path>
-</svg>

games/templates/cotton/icon/eaorigin.html

@@ -1,9 +0,0 @@
-<c-svg viewbox="0 0 50 50">
-<g transform="scale(0.09765625)">
-<title>EA/Origin</title>
-<g>
-<path fill="currentColor" d="M299.125,126.274H126.628L97.876,183.93h172.499L299.125,126.274z" />
-<path fill="currentColor" d="M342.248,126.274L224.462,328.066h-105.8l32.862-57.653h61.347l28.758-57.658H69.125l-28.746,57.658H85.31L26.001,385.727h232.784l83.463-153.654l18.169,38.342h-18.169l-28.75,57.654h75.67l28.75,57.658h68.081L342.248,126.274z" />
-</g>
-</g>
-</c-svg>

games/templates/cotton/icon/edit.html

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     x="0px"
-     y="0px"
-     viewBox="0 0 48 48"
-     class="text-black dark:text-white w-4 h-4">
-    <path fill="currentColor" d="M 40.5 6 C 40.11625 6 39.732453 6.1464531 39.439453 6.4394531 L 21.462891 24.417969 L 20 28 L 23.582031 26.537109 L 41.560547 8.5605469 C 42.145547 7.9745469 42.145547 7.0254531 41.560547 6.4394531 C 41.267547 6.1464531 40.88375 6 40.5 6 z M 12.5 7 C 9.4802259 7 7 9.4802259 7 12.5 L 7 35.5 C 7 38.519774 9.4802259 41 12.5 41 L 35.5 41 C 38.519774 41 41 38.519774 41 35.5 L 41 18.5 A 1.50015 1.50015 0 1 0 38 18.5 L 38 35.5 C 38 36.898226 36.898226 38 35.5 38 L 12.5 38 C 11.101774 38 10 36.898226 10 35.5 L 10 12.5 C 10 11.101774 11.101774 10 12.5 10 L 29.5 10 A 1.50015 1.50015 0 1 0 29.5 7 L 12.5 7 z">
-    </path>
-</svg>

games/templates/cotton/icon/egs.html

@@ -1,6 +0,0 @@
-<c-vars title="Epic Games Store" />
-<c-svg :title=title viewbox="0 0 50 50">
-<c-slot name="path">
-M 10 3 C 6.69 3 4 5.69 4 9 L 4 41.240234 L 25 47.539062 L 46 41.240234 L 46 9 C 46 5.69 43.31 3 40 3 L 10 3 z M 11 8 L 15 8 L 15 11 L 11 11 L 11 18 L 14 18 L 14 21 L 11 21 L 11 28 L 15 28 L 15 31 L 11 31 C 9.34 31 8 29.66 8 28 L 8 11 C 8 9.34 9.34 8 11 8 z M 17 8 L 23 8 C 24.66 8 26 9.34 26 11 L 26 18 C 26 19.66 24.66 21 23 21 L 20 21 L 20 31 L 17 31 L 17 8 z M 28 8 L 31 8 L 31 31 L 28 31 L 28 8 z M 36 8 L 39 8 C 40.66 8 42 9.34 42 11 L 42 15 L 39 15 L 39 11 L 36 11 L 36 28 L 39 28 L 39 24 L 42 24 L 42 28 C 42 29.66 40.66 31 39 31 L 36 31 C 34.34 31 33 29.66 33 28 L 33 11 C 33 9.34 34.34 8 36 8 z M 20 11 L 20 18 L 23 18 L 23 11 L 20 11 z M 9 34 L 13 34 C 13.55 34 14 34.45 14 35 L 14 36 L 13 36 L 13 35.25 C 13 35.11 12.89 35 12.75 35 L 9.25 35 C 9.11 35 9 35.11 9 35.25 L 9 38.75 C 9 38.89 9.11 39 9.25 39 L 12.75 39 C 12.89 39 13 38.89 13 38.75 L 13 38 L 12 38 L 12 37 L 14 37 L 14 39 C 14 39.55 13.55 40 13 40 L 9 40 C 8.45 40 8 39.55 8 39 L 8 35 C 8 34.45 8.45 34 9 34 z M 18 34 L 19 34 L 22 40 L 21 40 L 20.5 39 L 16.5 39 L 16 40 L 15 40 L 18 34 z M 23 34 L 24 34 L 26 38 L 28 34 L 29 34 L 29 40 L 28 40 L 28 36 L 26.5 39 L 25.5 39 L 24 36 L 24 40 L 23 40 L 23 34 z M 30 34 L 35 34 L 35 35 L 31 35 L 31 36.5 L 33 36.5 L 33 37.5 L 31 37.5 L 31 39 L 35 39 L 35 40 L 30 40 L 30 34 z M 37 34 L 41 34 C 41.55 34 42 34.45 42 35 L 42 35.5 L 41 35.5 L 41 35.25 C 41 35.11 40.89 35 40.75 35 L 37.25 35 C 37.11 35 37 35.11 37 35.25 L 37 36.25 C 37 36.39 37.11 36.5 37.25 36.5 L 41 36.5 C 41.55 36.5 42 36.95 42 37.5 L 42 39 C 42 39.55 41.55 40 41 40 L 37 40 C 36.45 40 36 39.55 36 39 L 36 38.5 L 37 38.5 L 37 38.75 C 37 38.89 37.11 39 37.25 39 L 40.75 39 C 40.89 39 41 38.89 41 38.75 L 41 37.75 C 41 37.61 40.89 37.5 40.75 37.5 L 37 37.5 C 36.45 37.5 36 37.05 36 36.5 L 36 35 C 36 34.45 36.45 34 37 34 z M 18.5 35 L 17 38 L 20 38 L 18.5 35 z
-</c-slot>
-</c-svg>

games/templates/cotton/icon/eject.html

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     x="0px"
-     y="0px"
-     viewBox="0 0 48 48"
-     class="text-black dark:text-white w-4 h-4">
-    <path fill="currentColor" d="M 24 5.0507812 C 22.945045 5.0507812 21.890232 5.4877258 21.160156 6.3613281 L 7.0566406 23.257812 C 5.2226244 25.45627 6.8812774 29 9.7441406 29 L 38.255859 29 C 41.119312 29 42.778426 25.453888 40.943359 23.255859 L 26.839844 6.3613281 C 26.109768 5.4877258 25.054955 5.0507812 24 5.0507812 z M 24 8.015625 C 24.194045 8.015625 24.387185 8.105759 24.537109 8.2851562 L 38.638672 25.179688 C 38.977605 25.585659 38.784407 26 38.255859 26 L 9.7441406 26 C 9.2150038 26 9.0213443 25.58723 9.3613281 25.179688 L 23.462891 8.2851562 C 23.612815 8.1057586 23.805955 8.015625 24 8.015625 z M 10.5 33 C 8.0324991 33 6 35.032499 6 37.5 L 6 38.5 C 6 40.967501 8.0324991 43 10.5 43 L 37.5 43 C 39.967501 43 42 40.967501 42 38.5 L 42 37.5 C 42 35.032499 39.967501 33 37.5 33 L 10.5 33 z M 10.5 36 L 37.5 36 C 38.346499 36 39 36.653501 39 37.5 L 39 38.5 C 39 39.346499 38.346499 40 37.5 40 L 10.5 40 C 9.6535009 40 9 39.346499 9 38.5 L 9 37.5 C 9 36.653501 9.6535009 36 10.5 36 z">
-    </path>
-</svg>

games/templates/cotton/icon/end.html

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     x="0px"
-     y="0px"
-     viewBox="0 0 48 48"
-     class="text-black dark:text-white w-4 h-4">
-    <path fill="currentColor" d="M 35.5 6 C 33.585045 6 32 7.5850452 32 9.5 L 32 19.365234 L 11.339844 6.6074219 C 9.0734225 5.2081236 6 6.9228749 6 9.5859375 L 6 38.414062 C 6 41.077126 9.0734225 42.791876 11.339844 41.392578 L 32 28.634766 L 32 38.5 C 32 40.414955 33.585045 42 35.5 42 L 38.5 42 C 40.414955 42 42 40.414955 42 38.5 L 42 9.5 C 42 7.5850452 40.414955 6 38.5 6 L 35.5 6 z M 35.5 9 L 38.5 9 C 38.795045 9 39 9.2049548 39 9.5 L 39 38.5 C 39 38.795045 38.795045 39 38.5 39 L 35.5 39 C 35.204955 39 35 38.795045 35 38.5 L 35 9.5 C 35 9.2049548 35.204955 9 35.5 9 z M 9.4765625 9.0566406 C 9.5668015 9.0647233 9.6637771 9.0984812 9.7636719 9.1601562 L 32 22.892578 L 32 25.107422 L 9.7636719 38.839844 C 9.364093 39.086546 9 38.883001 9 38.414062 L 9 9.5859375 C 9 9.3514688 9.091623 9.1841053 9.2324219 9.1054688 C 9.3028213 9.0661502 9.3863235 9.048558 9.4765625 9.0566406 z">
-    </path>
-</svg>

games/templates/cotton/icon/finish.html

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-     x="0px"
-     y="0px"
-     viewBox="0 0 48 48"
-     class="text-black dark:text-white w-4 h-4">
-    <path fill="currentColor" d="M 7.4765625 4.9785156 A 1.50015 1.50015 0 0 0 6 6.5 L 6 31.5 L 6 43.5 A 1.50015 1.50015 0 1 0 9 43.5 L 9 33 L 40.5 33 C 41.329 33 42 32.328 42 31.5 L 42 6.5 C 42 5.672 41.329 5 40.5 5 L 7.7460938 5 A 1.50015 1.50015 0 0 0 7.4765625 4.9785156 z M 16 8 L 24 8 L 24 15 L 32 15 L 32 8 L 39 8 L 39 15 L 32 15 L 32 23 L 39 23 L 39 30 L 32 30 L 32 23 L 24 23 L 24 30 L 16 30 L 16 23 L 9 23 L 9 15 L 16 15 L 16 8 z M 16 15 L 16 23 L 24 23 L 24 15 L 16 15 z">
-    </path>
-</svg>

games/templates/cotton/icon/gog.html

@@ -1,5 +0,0 @@
-<c-svg title="GOG.com" viewbox="0 0 50 50">
-<c-slot name="path">
-M 5.75 6 C 3.703125 6 2 7.703125 2 9.75 L 2 16.25 C 2 18.296875 3.703125 20 5.75 20 L 12 20 L 12 22 L 4 22 C 3.277344 21.988281 2.609375 22.367188 2.246094 22.992188 C 1.878906 23.613281 1.878906 24.386719 2.246094 25.007813 C 2.609375 25.632813 3.277344 26.011719 4 26 L 12.25 26 C 14.296875 26 16 24.296875 16 22.25 L 16 15.75 C 16.003906 15.6875 16.003906 15.625 16 15.5625 L 16 9.75 C 16 7.703125 14.296875 6 12.25 6 Z M 21.75 6 C 19.703125 6 18 7.703125 18 9.75 L 18 16.25 C 18 18.296875 19.703125 20 21.75 20 L 28.25 20 C 30.296875 20 32 18.296875 32 16.25 L 32 9.75 C 32 7.703125 30.296875 6 28.25 6 Z M 37.75 6 C 35.703125 6 34 7.703125 34 9.75 L 34 16.25 C 34 18.296875 35.703125 20 37.75 20 L 44 20 L 44 22 L 36 22 C 35.277344 21.988281 34.609375 22.367188 34.246094 22.992188 C 33.878906 23.613281 33.878906 24.386719 34.246094 25.007813 C 34.609375 25.632813 35.277344 26.011719 36 26 L 44.25 26 C 46.296875 26 48 24.296875 48 22.25 L 48 15.75 C 48.003906 15.6875 48.003906 15.625 48 15.5625 L 48 9.75 C 48 7.703125 46.296875 6 44.25 6 Z M 6 10 L 12 10 L 12 15.59375 C 11.996094 15.644531 11.996094 15.699219 12 15.75 L 12 16 L 6 16 Z M 22 10 L 28 10 L 28 16 L 22 16 Z M 38 10 L 44 10 L 44 15.59375 C 43.996094 15.644531 43.996094 15.699219 44 15.75 L 44 16 L 38 16 Z M 5.75 30 C 3.703125 30 2 31.703125 2 33.75 L 2 40.25 C 2 42.296875 3.703125 44 5.75 44 L 12 44 C 12.722656 44.011719 13.390625 43.632813 13.753906 43.007813 C 14.121094 42.386719 14.121094 41.613281 13.753906 40.992188 C 13.390625 40.367188 12.722656 39.988281 12 40 L 6 40 L 6 34 L 12 34 C 12.722656 34.011719 13.390625 33.632813 13.753906 33.007813 C 14.121094 32.386719 14.121094 31.613281 13.753906 30.992188 C 13.390625 30.367188 12.722656 29.988281 12 30 Z M 19.75 30 C 17.703125 30 16 31.703125 16 33.75 L 16 40.25 C 16 42.296875 17.703125 44 19.75 44 L 26.25 44 C 28.296875 44 29.996094 42.296875 30 40.25 L 30 33.75 C 30 31.703125 28.296875 30 26.25 30 Z M 38.65625 30 C 38.65625 30 37.933594 30 37.15625 30.03125 C 36.769531 30.046875 36.355469 30.066406 36 30.09375 C 35.824219 30.105469 35.667969 30.136719 35.5 30.15625 C 35.332031 30.175781 35.242188 30.152344 34.8125 30.3125 C 33.738281 30.714844 32.972656 31.429688 32.4375 32.4375 C 32.5 32.320313 32.355469 32.496094 32.21875 32.90625 C 32.082031 33.316406 32.078125 33.566406 32.0625 33.875 C 32.03125 34.496094 32.011719 35.507813 32 37.8125 C 31.992188 39.167969 32 40.203125 32 40.90625 C 32 41.257813 31.996094 41.515625 32 41.71875 C 32 41.820313 31.996094 41.914063 32 42 C 32 42.042969 31.992188 42.085938 32 42.15625 C 32.007813 42.226563 31.914063 42.171875 32.125 42.71875 C 32.453125 43.707031 33.484375 44.277344 34.492188 44.035156 C 35.503906 43.789063 36.160156 42.808594 36 41.78125 C 36 41.777344 36 41.722656 36 41.71875 C 36 41.703125 36 41.707031 36 41.6875 C 35.996094 41.527344 36 41.25 36 40.90625 C 36 40.21875 35.992188 39.199219 36 37.84375 C 36.011719 35.640625 36.011719 34.671875 36.03125 34.25 C 36.101563 34.183594 36.167969 34.117188 36.1875 34.09375 C 36.230469 34.089844 36.257813 34.097656 36.3125 34.09375 C 36.585938 34.074219 36.949219 34.046875 37.3125 34.03125 C 37.667969 34.015625 37.75 34.003906 38 34 L 38 42 C 37.988281 42.722656 38.367188 43.390625 38.992188 43.753906 C 39.613281 44.121094 40.386719 44.121094 41.007813 43.753906 C 41.632813 43.390625 42.011719 42.722656 42 42 L 42 34 C 42.800781 34 43.28125 34 44 34 L 44 42 C 43.988281 42.722656 44.367188 43.390625 44.992188 43.753906 C 45.613281 44.121094 46.386719 44.121094 47.007813 43.753906 C 47.632813 43.390625 48.011719 42.722656 48 42 L 48 30 L 46 30 C 46 30 39.59375 29.996094 38.6875 30 Z M 20 34 L 26 34 L 26 40 L 20 40 Z
-</c-slot>
-</c-svg>