initial commit

.github/workflows/build-docker.yml

@@ -17,7 +17,7 @@ jobs:
           poetry install
           poetry env info
           poetry run python manage.py migrate
-          # PROD=1 poetry run pytest
+          PROD=1 poetry run pytest
   build-and-push:
     needs: test
     runs-on: ubuntu-latest

.gitignore

@@ -7,5 +7,3 @@ package-lock.json
 db.sqlite3
 /static/
 dist/
-.DS_Store
-.python-version

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 24.3.0
+    rev: 22.12.0
     hooks:
     -   id: black
 - repo: https://github.com/pycqa/isort

CHANGELOG.md

@@ -1,36 +1,8 @@
 ## Unreleased
 
-## New
-* Render notes as Markdown
-* Require login by default
-* Add stats for dropped purchases, monthly playtimes
-* Allow deleting purchases
-
 ## 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 
-  * 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
+* game overview: improve how editions and purchases are displayed
 * 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
 

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

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

README.md

@@ -1,15 +1,3 @@
 # Timetracker
 
-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`.
+A simple game catalogue and play session tracker.

common/input.css

@@ -23,18 +23,18 @@
   font-style: normal;
 }
 
-/* a:hover {
+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;
+  @apply dark:text-white mx-auto;
 }
 
 .responsive-table tr:nth-child(even) {
@@ -58,11 +58,8 @@ form label {
   .max-w-20char {
     max-width: 20ch;
   }
-  .max-w-30char {
-    max-width: 30ch;
-  }
   .max-w-35char {
-    max-width: 35ch;
+    max-width: 40ch;
   }
   .max-w-40char {
     max-width: 40ch;
@@ -120,41 +117,3 @@ th label {
 .basic-button {
   @apply inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight uppercase rounded shadow-md hover:bg-blue-700 hover:shadow-lg focus:bg-blue-700 focus:shadow-lg focus:outline-none focus:ring-0 active:bg-blue-800 active:shadow-lg transition duration-150 ease-in-out;
 }
-
-.markdown-content ul {
-  list-style-type: disc;
-  list-style-position: inside;
-  padding-left: 1em;
-}
-
-.markdown-content ol {
-  list-style-type: decimal;
-  list-style-position: inside;
-  padding-left: 1em;
-}
-
-.markdown-content ul, 
-.markdown-content ol {
-    list-style-position: outside;
-    padding-left: 1em;
-}
-
-.markdown-content ul ul, 
-.markdown-content ul ol, 
-.markdown-content ol ul, 
-.markdown-content ol ol {
-    list-style-type: circle;
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-    padding-left: 1em;
-}
-
-.truncate-container {
-  @apply inline-block relative transition-all;
-  a {
-    @apply inline-block truncate max-w-20char;
-    &:hover {
-      @apply absolute max-w-none -top-8 -left-6 min-w-60 px-6 py-3.5 bg-purple-600 rounded-sm outline-dashed outline-purple-400 outline-4;
-    }
-  }  
-}

common/utils.py

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

games/forms.py

@@ -1,6 +1,5 @@
 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
 
@@ -46,8 +45,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"):
-            option["attrs"]["data-platform"] = platform_id
+        if value:
+            option["attrs"]["data-platform"] = value.instance.platform.id
         return option
 
 
@@ -84,7 +83,6 @@ class PurchaseForm(forms.ModelForm):
             "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 +91,7 @@ class PurchaseForm(forms.ModelForm):
             "date_purchased",
             "date_refunded",
             "date_finished",
-            "date_dropped",
-            "infinite",
+            "status",
             "price",
             "price_currency",
             "ownership_type",

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/0034_purchase_status.py

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

games/migrations/0035_auto_20231222_1109.py

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

games/models.py

@@ -18,6 +18,19 @@ class Game(models.Model):
     def __str__(self):
         return self.name
 
+    def save(self, *args, **kwargs):
+        def get_sort_name(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)
+
 
 class Edition(models.Model):
     class Meta:
@@ -36,6 +49,19 @@ class Edition(models.Model):
     def __str__(self):
         return self.sort_name
 
+    def save(self, *args, **kwargs):
+        def get_sort_name(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)
+
 
 class PurchaseQueryset(models.QuerySet):
     def refunded(self):
@@ -90,8 +116,6 @@ class Purchase(models.Model):
     date_purchased = models.DateField()
     date_refunded = models.DateField(blank=True, null=True)
     date_finished = models.DateField(blank=True, null=True)
-    date_dropped = models.DateField(blank=True, null=True)
-    infinite = models.BooleanField(default=False)
     price = models.IntegerField(default=0)
     price_currency = models.CharField(max_length=3, default="USD")
     ownership_type = models.CharField(
@@ -109,6 +133,25 @@ class Purchase(models.Model):
     )
     created_at = models.DateTimeField(auto_now_add=True)
 
+    class PurchaseState(models.IntegerChoices):
+        UNPLAYED = (
+            0,
+            "Unplayed",
+        )
+        PLAYING = (1, "Playing")
+        DROPPED = (
+            2,
+            "Dropped",
+        )
+        FINISHED = (
+            3,
+            "Finished",
+        )
+
+    status = models.IntegerField(
+        choices=PurchaseState.choices, default=PurchaseState.UNPLAYED
+    )
+
     def __str__(self):
         additional_info = [
             self.get_type_display() if self.type != Purchase.GAME else "",
@@ -152,19 +195,6 @@ 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:

games/static/base.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com
+! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -32,11 +32,9 @@
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
 6. Use the user's configured `sans` font-variation-settings by default.
-7. Disable tap highlights on iOS
 */
 
-html,
-:host {
+html {
   line-height: 1.5;
   /* 1 */
   -webkit-text-size-adjust: 100%;
@@ -46,14 +44,12 @@ html,
   -o-tab-size: 4;
      tab-size: 4;
   /* 3 */
-  font-family: IBM Plex Sans, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: IBM Plex Sans, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   /* 4 */
   font-feature-settings: normal;
   /* 5 */
   font-variation-settings: normal;
   /* 6 */
-  -webkit-tap-highlight-color: transparent;
-  /* 7 */
 }
 
 /*
@@ -125,10 +121,8 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font-family by default.
-2. Use the user's configured `mono` font-feature-settings by default.
-3. Use the user's configured `mono` font-variation-settings by default.
-4. Correct the odd `em` font sizing in all browsers.
+1. Use the user's configured `mono` font family by default.
+2. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -137,12 +131,8 @@ samp,
 pre {
   font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
-  font-feature-settings: normal;
-  /* 2 */
-  font-variation-settings: normal;
-  /* 3 */
   font-size: 1em;
-  /* 4 */
+  /* 2 */
 }
 
 /*
@@ -211,8 +201,6 @@ textarea {
   /* 1 */
   line-height: inherit;
   /* 1 */
-  letter-spacing: inherit;
-  /* 1 */
   color: inherit;
   /* 1 */
   margin: 0;
@@ -236,9 +224,9 @@ select {
 */
 
 button,
-input:where([type='button']),
-input:where([type='reset']),
-input:where([type='submit']) {
+[type='button'],
+[type='reset'],
+[type='submit'] {
   -webkit-appearance: button;
   /* 1 */
   background-color: transparent;
@@ -579,26 +567,10 @@ select {
   background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
 }
 
-@media (forced-colors: active)  {
-  [type='checkbox']:checked {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='radio']:checked {
   background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e");
 }
 
-@media (forced-colors: active)  {
-  [type='radio']:checked {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='checkbox']:checked:hover,[type='checkbox']:checked:focus,[type='radio']:checked:hover,[type='radio']:checked:focus {
   border-color: transparent;
   background-color: currentColor;
@@ -613,14 +585,6 @@ select {
   background-repeat: no-repeat;
 }
 
-@media (forced-colors: active)  {
-  [type='checkbox']:indeterminate {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='checkbox']:indeterminate:hover,[type='checkbox']:indeterminate:focus {
   border-color: transparent;
   background-color: currentColor;
@@ -689,10 +653,6 @@ select {
   --tw-backdrop-opacity:  ;
   --tw-backdrop-saturate:  ;
   --tw-backdrop-sepia:  ;
-  --tw-contain-size:  ;
-  --tw-contain-layout:  ;
-  --tw-contain-paint:  ;
-  --tw-contain-style:  ;
 }
 
 ::backdrop {
@@ -743,10 +703,6 @@ select {
   --tw-backdrop-opacity:  ;
   --tw-backdrop-saturate:  ;
   --tw-backdrop-sepia:  ;
-  --tw-contain-size:  ;
-  --tw-contain-layout:  ;
-  --tw-contain-paint:  ;
-  --tw-contain-style:  ;
 }
 
 .container {
@@ -783,18 +739,6 @@ select {
   }
 }
 
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  white-space: nowrap;
-  border-width: 0;
-}
-
 .invisible {
   visibility: hidden;
 }
@@ -831,14 +775,6 @@ select {
   top: 0.75rem;
 }
 
-.-left-6 {
-  left: -1.5rem;
-}
-
-.-top-\[31\.5px\] {
-  top: -31.5px;
-}
-
 .mx-2 {
   margin-left: 0.5rem;
   margin-right: 0.5rem;
@@ -876,12 +812,8 @@ select {
   margin-bottom: 0.5rem;
 }
 
-.mb-8 {
-  margin-bottom: 2rem;
-}
-
-.me-2 {
-  margin-inline-end: 0.5rem;
+.mb-4 {
+  margin-bottom: 1rem;
 }
 
 .ml-1 {
@@ -916,10 +848,6 @@ select {
   display: flex;
 }
 
-.inline-flex {
-  display: inline-flex;
-}
-
 .table {
   display: table;
 }
@@ -928,14 +856,6 @@ select {
   display: none;
 }
 
-.h-12 {
-  height: 3rem;
-}
-
-.h-24 {
-  height: 6rem;
-}
-
 .h-4 {
   height: 1rem;
 }
@@ -952,10 +872,6 @@ select {
   min-height: 100vh;
 }
 
-.w-24 {
-  width: 6rem;
-}
-
 .w-5 {
   width: 1.25rem;
 }
@@ -976,10 +892,6 @@ select {
   width: 100%;
 }
 
-.min-w-60 {
-  min-width: 15rem;
-}
-
 .max-w-screen-lg {
   max-width: 1024px;
 }
@@ -992,10 +904,6 @@ select {
   max-width: 20rem;
 }
 
-.flex-1 {
-  flex: 1 1 0%;
-}
-
 @keyframes spin {
   to {
     transform: rotate(360deg);
@@ -1030,12 +938,6 @@ select {
   gap: 0.5rem;
 }
 
-.space-x-1 > :not([hidden]) ~ :not([hidden]) {
-  --tw-space-x-reverse: 0;
-  margin-right: calc(0.25rem * var(--tw-space-x-reverse));
-  margin-left: calc(0.25rem * calc(1 - var(--tw-space-x-reverse)));
-}
-
 .self-center {
   align-self: center;
 }
@@ -1050,8 +952,8 @@ select {
   white-space: nowrap;
 }
 
-.rounded-full {
-  border-radius: 9999px;
+.rounded {
+  border-radius: 0.25rem;
 }
 
 .rounded-lg {
@@ -1072,11 +974,6 @@ select {
   border-color: rgb(100 116 139 / var(--tw-border-opacity));
 }
 
-.bg-blue-700 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(29 78 216 / var(--tw-bg-opacity));
-}
-
 .bg-gray-200 {
   --tw-bg-opacity: 1;
   background-color: rgb(229 231 235 / var(--tw-bg-opacity));
@@ -1092,12 +989,9 @@ select {
   background-color: rgb(124 58 237 / var(--tw-bg-opacity));
 }
 
-.p-2 {
-  padding: 0.5rem;
-}
-
-.p-2\.5 {
-  padding: 0.625rem;
+.bg-white {
+  --tw-bg-opacity: 1;
+  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
 }
 
 .p-4 {
@@ -1124,20 +1018,6 @@ select {
   padding-bottom: 0.5rem;
 }
 
-.px-6 {
-  padding-left: 1.5rem;
-  padding-right: 1.5rem;
-}
-
-.py-\[13\.5px\] {
-  padding-top: 13.5px;
-  padding-bottom: 13.5px;
-}
-
-.pb-16 {
-  padding-bottom: 4rem;
-}
-
 .pl-3 {
   padding-left: 0.75rem;
 }
@@ -1150,18 +1030,10 @@ select {
   padding-top: 0.25rem;
 }
 
-.pt-8 {
-  padding-top: 2rem;
-}
-
 .text-center {
   text-align: center;
 }
 
-.align-top {
-  vertical-align: top;
-}
-
 .font-mono {
   font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
@@ -1191,11 +1063,6 @@ select {
   line-height: 1.75rem;
 }
 
-.text-sm {
-  font-size: 0.875rem;
-  line-height: 1.25rem;
-}
-
 .text-xl {
   font-size: 1.25rem;
   line-height: 1.75rem;
@@ -1206,34 +1073,24 @@ select {
   line-height: 1rem;
 }
 
-.font-medium {
-  font-weight: 500;
-}
-
 .font-semibold {
   font-weight: 600;
 }
 
+.italic {
+  font-style: italic;
+}
+
 .text-gray-700 {
   --tw-text-opacity: 1;
   color: rgb(55 65 81 / var(--tw-text-opacity));
 }
 
-.text-red-600 {
-  --tw-text-opacity: 1;
-  color: rgb(220 38 38 / var(--tw-text-opacity));
-}
-
 .text-slate-300 {
   --tw-text-opacity: 1;
   color: rgb(203 213 225 / var(--tw-text-opacity));
 }
 
-.text-slate-500 {
-  --tw-text-opacity: 1;
-  color: rgb(100 116 139 / var(--tw-text-opacity));
-}
-
 .text-white {
   --tw-text-opacity: 1;
   color: rgb(255 255 255 / var(--tw-text-opacity));
@@ -1316,13 +1173,13 @@ select {
   font-style: normal;
 }
 
-/* a:hover {
+a:hover {
   text-decoration-color: #ff4400;
   color: rgb(254, 185, 160);
   transition: all 0.2s ease-out;
-} */
+}
 
-form label:is(.dark *) {
+:is(.dark form label) {
   --tw-text-opacity: 1;
   color: rgb(148 163 184 / var(--tw-text-opacity));
 }
@@ -1330,10 +1187,9 @@ form label:is(.dark *) {
 .responsive-table {
   margin-left: auto;
   margin-right: auto;
-  table-layout: fixed;
 }
 
-.responsive-table:is(.dark *) {
+:is(.dark .responsive-table) {
   --tw-text-opacity: 1;
   color: rgb(255 255 255 / var(--tw-text-opacity));
 }
@@ -1364,9 +1220,9 @@ form label:is(.dark *) {
   border-left-color: rgb(100 116 139 / var(--tw-border-opacity));
 }
 
-form input:is(.dark *),
-select:is(.dark *),
-textarea:is(.dark *) {
+:is(.dark form input),:is(.dark 
+select),:is(.dark 
+textarea) {
   border-width: 1px;
   --tw-border-opacity: 1;
   border-color: rgb(15 23 42 / var(--tw-border-opacity));
@@ -1376,9 +1232,9 @@ textarea:is(.dark *) {
   color: rgb(241 245 249 / var(--tw-text-opacity));
 }
 
-form input:disabled:is(.dark *),
-select:disabled:is(.dark *),
-textarea:disabled:is(.dark *) {
+:is(.dark form input:disabled),:is(.dark 
+select:disabled),:is(.dark 
+textarea:disabled) {
   --tw-bg-opacity: 1;
   background-color: rgb(51 65 85 / var(--tw-bg-opacity));
   --tw-text-opacity: 1;
@@ -1493,99 +1349,6 @@ th label {
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
-.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 {
-  position: relative;
-  display: inline-block;
-  transition-property: all;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration: 150ms;
-  a {
-    display: inline-block;
-  }
-  a {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  a {
-    max-width: 20ch;
-  }
-  a {
-    &:hover {
-      position: absolute;
-    }
-    &:hover {
-      top: -2rem;
-    }
-    &:hover {
-      left: -1.5rem;
-    }
-    &:hover {
-      min-width: 15rem;
-    }
-    &:hover {
-      max-width: none;
-    }
-    &:hover {
-      border-radius: 0.125rem;
-    }
-    &:hover {
-      --tw-bg-opacity: 1;
-      background-color: rgb(147 51 234 / var(--tw-bg-opacity));
-    }
-    &:hover {
-      padding-left: 1.5rem;
-      padding-right: 1.5rem;
-    }
-    &:hover {
-      padding-top: 0.875rem;
-      padding-bottom: 0.875rem;
-    }
-    &:hover {
-      outline-style: dashed;
-    }
-    &:hover {
-      outline-width: 4px;
-    }
-    &:hover {
-      outline-color: #c084fc;
-    }
-  }
-}
-
-.hover\:bg-blue-800:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(30 64 175 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-gray-400:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(156 163 175 / var(--tw-bg-opacity));
@@ -1616,17 +1379,6 @@ th label {
   box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 }
 
-.focus\:ring-4:focus {
-  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
-  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color);
-  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
-}
-
-.focus\:ring-blue-300:focus {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(147 197 253 / var(--tw-ring-opacity));
-}
-
 .focus\:ring-green-500:focus {
   --tw-ring-opacity: 1;
   --tw-ring-color: rgb(34 197 94 / var(--tw-ring-opacity));
@@ -1653,51 +1405,36 @@ th label {
   display: block;
 }
 
-.dark\:bg-blue-600:is(.dark *) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(37 99 235 / var(--tw-bg-opacity));
-}
-
-.dark\:bg-gray-800:is(.dark *) {
+:is(.dark .dark\:bg-gray-800) {
   --tw-bg-opacity: 1;
   background-color: rgb(31 41 55 / var(--tw-bg-opacity));
 }
 
-.dark\:bg-gray-900:is(.dark *) {
+:is(.dark .dark\:bg-gray-900) {
   --tw-bg-opacity: 1;
   background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 }
 
-.dark\:text-slate-400:is(.dark *) {
+:is(.dark .dark\:text-slate-400) {
   --tw-text-opacity: 1;
   color: rgb(148 163 184 / var(--tw-text-opacity));
 }
 
-.dark\:text-slate-500:is(.dark *) {
+:is(.dark .dark\:text-slate-500) {
   --tw-text-opacity: 1;
   color: rgb(100 116 139 / var(--tw-text-opacity));
 }
 
-.dark\:text-slate-600:is(.dark *) {
+:is(.dark .dark\:text-slate-600) {
   --tw-text-opacity: 1;
   color: rgb(71 85 105 / var(--tw-text-opacity));
 }
 
-.dark\:text-white:is(.dark *) {
+:is(.dark .dark\:text-white) {
   --tw-text-opacity: 1;
   color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
-.dark\:hover\:bg-blue-700:hover:is(.dark *) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(29 78 216 / var(--tw-bg-opacity));
-}
-
-.dark\:focus\:ring-blue-800:focus:is(.dark *) {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(30 64 175 / var(--tw-ring-opacity));
-}
-
 @media (min-width: 640px) {
   .sm\:inline {
     display: inline;
@@ -1763,6 +1500,10 @@ th label {
     padding-top: 0.5rem;
     padding-bottom: 0.5rem;
   }
+
+  .md\:max-w-40char {
+    max-width: 40ch;
+  }
 }
 
 @media (min-width: 1024px) {
@@ -1777,4 +1518,4 @@ th label {
   .lg\:max-w-lg {
     max-width: 32rem;
   }
-}
+}

games/templates/add_purchase.html

@@ -22,14 +22,6 @@
                            value="Submit & Create Session" />
                 </td>
             </tr>
-            {% if purchase_id %}
-                <tr>
-                    <td></td>
-                    <td>
-                        <a href="{% url 'delete_purchase' purchase_id %}" class="text-red-600" onclick="return confirm('Are you sure you want to delete this purchase?');">Delete</a>
-                    </td>
-                </tr>
-            {% endif %}
         </table>
     </form>
 {% endblock content %}

games/templates/base.html

@@ -1,4 +1,3 @@
-{% load django_htmx %}
 <!DOCTYPE html>
 <html lang="en">
     {% load static %}
@@ -13,7 +12,6 @@
             {% endblock title %}
         </title>
         <script src="{% static 'js/htmx.min.js' %}"></script>
-        {% django_htmx_script %}
         <link rel="stylesheet" href="{% static 'base.css' %}" />
     </head>
     <body class="dark" hx-indicator="#indicator">
@@ -23,8 +21,8 @@
              height="24"
              width="24"
              alt="loading indicator" />
-        <div class="flex flex-col min-h-screen">
-            <nav class="dark:bg-gray-900 border-gray-200 h-24 flex items-center">
+        <div class="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">
@@ -39,80 +37,72 @@
                     <div class="w-full md:block md:w-auto">
                         <ul class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
                             <li class="relative group">
-                                {% if user.is_authenticated %}
-                                    <a class="block py-2 pl-3 pr-4 hover:underline"
-                                       href="{% url 'add_game' %}">New</a>
-                                    <ul class="absolute hidden text-gray-700 pt-1 group-hover:block  w-auto whitespace-nowrap">
-                                        {% if purchase_available %}
-                                            <li>
-                                                <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap"
-                                                   href="{% url 'add_device' %}">Device</a>
-                                            </li>
-                                        {% endif %}
+                                <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_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>
-                                        <li>
-                                            <a class="block py-2 pl-3 pr-4 hover:underline"
-                                               href="{% url 'logout' %}">Log Out</a>
+                                               href="{% url 'add_device' %}">Device</a>
                                         </li>
                                     {% endif %}
-                                {% endif %}
-                            </ul>
-                        </div>
+                                    <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>
-                </nav>
-                <div class="flex flex-1 dark:bg-gray-800 justify-center pt-8 pb-16">
-                    {% 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>
-            </div>
-            {% block scripts %}
-            {% endblock scripts %}
-        </body>
-    </html>
+            </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.yml

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

games/templates/components/button.html

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

games/templates/components/button_start.html

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

games/templates/components/game_link.html

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

games/templates/list_sessions.html

@@ -4,66 +4,65 @@
     {{ title }}
 {% endblock title %}
 {% block content %}
-    <div class="flex-col">
-        {% if dataset_count >= 1 %}
-            {% url 'list_sessions_start_session_from_session' last.id as start_session_url %}
-            <div class="mx-auto text-center my-4">
-                <a id="last-session-start"
-                   href="{{ start_session_url }}"
-                   hx-get="{{ start_session_url }}"
-                   hx-swap="afterbegin"
-                   hx-target=".responsive-table tbody"
-                   onClick="document.querySelector('#last-session-start').classList.add('invisible')"
-                   class="{% if last.timestamp_end == null %}invisible{% endif %}">
-                    {% include 'components/button_start.html' with text=last.purchase title="Start session of last played game" only %}
-                </a>
-            </div>
-        {% endif %}
-        {% if dataset_count != 0 %}
-            <table class="responsive-table">
-                <thead>
+    {% if dataset.count >= 1 %}
+        <div class="mx-auto text-center my-4">
+            <a id="last-session-start"
+               href="{% url 'start_session_same_as_last' last.id %}"
+               hx-get="{% url 'start_session_same_as_last' last.id %}"
+               hx-swap="afterbegin"
+               hx-target=".responsive-table tbody"
+               hx-select=".responsive-table tbody tr:first-child"
+               onClick="document.querySelector('#last-session-start').classList.add('invisible')"
+               class="{% if last.timestamp_end == null %}invisible{% endif %}">
+                {% include 'components/button_start.html' with text=last.purchase title="Start session of last played game" only %}
+            </a>
+        </div>
+    {% endif %}
+    {% if dataset.count != 0 %}
+        <table class="responsive-table">
+            <thead>
+                <tr>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
+                    <th class="hidden sm:table-cell px-2 sm:px-4 md:px-6 md:py-2">Start</th>
+                    <th class="hidden lg:table-cell px-2 sm:px-4 md:px-6 md:py-2">End</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Duration</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for data in dataset %}
                     <tr>
-                        <th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
-                        <th class="hidden sm:table-cell px-2 sm:px-4 md:px-6 md:py-2">Start</th>
-                        <th class="hidden lg:table-cell px-2 sm:px-4 md:px-6 md:py-2">End</th>
-                        <th class="px-2 sm:px-4 md:px-6 md:py-2">Duration</th>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char md:max-w-40char">
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'view_game' data.purchase.edition.game.id %}">
+                                {{ data.purchase.edition }}
+                            </a>
+                        </td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden sm:table-cell">
+                            {{ data.timestamp_start | date:"d/m/Y H:i" }}
+                        </td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden lg:table-cell">
+                            {% if data.unfinished %}
+                                <a href="{% url 'update_session' data.id %}"
+                                   hx-get="{% url 'update_session' data.id %}"
+                                   hx-swap="outerHTML"
+                                   hx-target=".responsive-table tbody tr:first-child"
+                                   hx-select=".responsive-table tbody tr:first-child"
+                                   hx-indicator="#indicator"
+                                   onClick="document.querySelector('#last-session-start').classList.remove('invisible')">
+                                    <span class="text-yellow-300">Finish now?</span>
+                                </a>
+                            {% elif data.duration_manual %}
+                                --
+                            {% else %}
+                                {{ data.timestamp_end | date:"d/m/Y H:i" }}
+                            {% endif %}
+                        </td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ data.duration_formatted }}</td>
                     </tr>
-                </thead>
-                <tbody>
-                    {% for session in dataset %}
-                        {% partialdef session-row inline=True %}
-                            <tr>
-                                <td class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name relative align-top w-24 h-12">
-                                    {% gamelink game_id=session.purchase.edition.game.id name=session.purchase.edition.name %}
-                                </td>
-                                <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden sm:table-cell">
-                                    {{ session.timestamp_start | date:"d/m/Y H:i" }}
-                                </td>
-                                <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden lg:table-cell">
-                                    {% if not session.timestamp_end %}
-                                        {% url 'list_sessions_end_session' session.id as end_session_url %}
-                                        <a  href="{{ end_session_url }}"
-                                           hx-get="{{ end_session_url }}"
-                                           hx-target="closest tr"
-                                           hx-swap="outerHTML"
-                                           hx-indicator="#indicator"
-                                           onClick="document.querySelector('#last-session-start').classList.remove('invisible')">
-                                            <span class="text-yellow-300">Finish now?</span>
-                                        </a>
-                                    {% elif session.duration_manual %}
-                                        --
-                                    {% else %}
-                                        {{ session.timestamp_end | date:"d/m/Y H:i" }}
-                                    {% endif %}
-                                </td>
-                                <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ session.duration_formatted }}</td>
-                            </tr>
-                        {% endpartialdef %}
-                    {% endfor %}
-                </tbody>
-            </table>
-        {% else %}
-            <div class="mx-auto text-center text-slate-300 text-xl">No sessions found.</div>
-        {% endif %}
-    </div>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% else %}
+        <div class="mx-auto text-center text-slate-300 text-xl">No sessions found.</div>
+    {% endif %}
 {% endblock content %}

games/templates/registration/login.html

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

games/templates/stats.html

@@ -3,17 +3,6 @@
     {{ title }}
 {% endblock title %}
 {% load static %}
-
-{% partialdef purchase-name %}
-    {% if purchase.type != 'game' %}
-        {% #gamelink game_id=purchase.edition.game.id %}
-            {{ purchase.name }} ({{ purchase.edition.name }} {{ purchase.get_type_display }})
-        {% /gamelink %}
-    {% else %}
-        {% gamelink game_id=purchase.edition.game.id name=purchase.edition.name %}
-    {% endif %}
-{% endpartialdef %}
-
 {% block content %}
     <div class="dark:text-white max-w-sm sm:max-w-xl lg:max-w-3xl mx-auto">
         <div class="flex justify-center items-center">
@@ -54,72 +43,45 @@
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_finished_this_year_count }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_finished_this_year.count }}</td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished ({{ year }})</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ this_year_finished_this_year_count }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ this_year_finished_this_year.count }}</td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Longest session</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ longest_session_time }} ({% gamelink game_id=longest_session_game.id name=longest_session_game.name %})</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ longest_session_time }} ({{ longest_session_game }})</td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Most sessions</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ highest_session_count }} ({% gamelink game_id=highest_session_count_game.id name=highest_session_count_game.name %})</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ highest_session_count }} ({{ highest_session_count_game }})</td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Highest session average</td>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ highest_session_average }} ({% gamelink game_id=highest_session_average_game.id name=highest_session_average_game.name %})
+                        {{ highest_session_average }} ({{ highest_session_average_game }})
                     </td>
                 </tr>
-                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">First play</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% gamelink game_id=first_play_game.id name=first_play_game.name %} ({{ first_play_date }})</td>
-                </tr>
-                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Last play</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% gamelink game_id=last_play_game.id name=last_play_game.name %} ({{ last_play_date }})</td>
-                </tr>
             </tbody>
         </table>
-
-        <h1 class="text-5xl text-center my-6">Playtime per month</h1>
-        <table class="responsive-table">
-            <tbody>
-                {% for month in month_playtimes %}
-                    <tr>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2">{{ month.month | date:"F" }}</td>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ month.playtime }}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-
         <h1 class="text-5xl text-center my-6">Purchases</h1>
         <table class="responsive-table">
             <tbody>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Total</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_this_year_count }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_this_year.count }}</td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Refunded</td>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ all_purchased_refunded_this_year_count }} ({{ refunded_percent }}%)
-                    </td>
-                </tr>
-                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Dropped</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ dropped_count }} ({{ dropped_percentage }}%)
+                        {{ all_purchased_refunded_this_year.count }} ({{ refunded_percent }}%)
                     </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Unfinished</td>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ purchased_unfinished_count }} ({{ unfinished_purchases_percent }}%)
+                        {{ purchased_unfinished.count }} ({{ unfinished_purchases_percent }}%)
                     </td>
                 </tr>
                 <tr>
@@ -144,7 +106,8 @@
                 {% for game in top_10_games_by_playtime %}
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            {% gamelink game_id=game.id name=game.name %}
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'view_game' game.id %}">{{ game.name }}</a>
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
                     </tr>
@@ -174,15 +137,24 @@
                 <tr>
                     <th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
                     <th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Playtime</th>
                 </tr>
             </thead>
             <tbody>
                 {% for purchase in all_finished_this_year %}
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            {% partial purchase-name %}
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'edit_purchase' purchase.id %}">
+                                {% if purchase.type == 'dlc' %}
+                                    {{ purchase.name }} ({{ purchase.edition.name }} DLC)
+                                {% else %}
+                                    {{ purchase.edition.name }}
+                                {% endif %}
+                            </a>
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.formatted_playtime }}</td>
                     </tr>
                 {% endfor %}
             </tbody>
@@ -199,7 +171,8 @@
                 {% for purchase in this_year_finished_this_year %}
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            {% partial purchase-name %}
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a>
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
                     </tr>
@@ -218,36 +191,14 @@
                 {% for purchase in purchased_this_year_finished_this_year %}
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            {% partial purchase-name %}
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a>
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
                     </tr>
                 {% endfor %}
             </tbody>
         </table>
-
-        <h1 class="text-5xl text-center my-6">Unfinished Purchases</h1>
-        <table class="responsive-table">
-            <thead>
-                <tr>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Price ({{ total_spent_currency }})</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for purchase in purchased_unfinished %}
-                    <tr>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            {% partial purchase-name %}
-                        </td>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-
         <h1 class="text-5xl text-center my-6">All Purchases</h1>
         <table class="responsive-table">
             <thead>
@@ -261,7 +212,11 @@
                 {% for purchase in all_purchased_this_year %}
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            {% partial purchase-name %}
+                            <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'edit_purchase' purchase.id %}">
+                                {{ purchase.edition.name }}
+                                {% if purchase.type != "game" %}({{ purchase.name }}, {{ purchase.get_type_display }}){% endif %}
+                            </a>
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>

games/templates/view_game.html

@@ -3,22 +3,18 @@
     {{ title }}
 {% endblock title %}
 {% load static %}
-{% load markdown_extras %}
 {% block content %}
     <div class="dark:text-white max-w-sm sm:max-w-xl lg:max-w-3xl mx-auto">
-        <h1 class="text-5xl flex items-center">
+        <h1 class="text-4xl flex items-center">
             {{ game.name }}
+            <span class="dark:text-slate-500">(#{{ game.pk }})</span>
             {% url 'edit_game' game.id as edit_url %}
             {% include 'components/edit_button.html' with edit_url=edit_url %}
         </h1>
-        <h2 class="text-lg my-2 ml-2 dark:text-slate-500">First Released: <span class="text-white">{{ game.year_released }}</span></h2>
         <h2 class="text-lg my-2 ml-2">
-            <span class="dark:text-slate-500">Playtime: </span>
-            {{ hours_sum }} <span class="dark:text-slate-500">hours over</span> {{ session_count }} <span class="dark:text-slate-500">sessions (</span>{{ session_average_without_manual }}<span class="dark:text-slate-500">/session)</span>
-        </h2>
-        <h2 class="text-lg my-2 ml-2">
-            <span class="dark:text-slate-500">Played in: </span>
-            {{ playrange }}
+            {{ hours_sum }} <span class="dark:text-slate-500">total</span>
+            {{ session_average }} <span class="dark:text-slate-500">avg</span>
+            ({{ playrange }})
         </h2>
         <hr class="border-slate-500">
         <h1 class="text-3xl mt-4 mb-1">
@@ -40,7 +36,7 @@
                 </li>
                 <ul>
                     {% for purchase in edition.game_purchases %}
-                        <li class="sm:pl-6 flex items-center {% if purchase.date_refunded %}text-red-600{% endif %}">
+                        <li class="sm:pl-6 flex items-center">
                             {{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}
                             {% if purchase.price != 0 %}({{ purchase.price }} {{ purchase.price_currency }}){% endif %}
                             {% url 'edit_purchase' purchase.id as edit_url %}
@@ -61,58 +57,21 @@
         </ul>
         <h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center">
             Sessions
-            <span class="dark:text-slate-500" id="session-count">({{ session_count }})</span>
-{% if latest_session_id %}
-            {% url 'view_game_start_session_from_session' latest_session_id as add_session_link %}
-            <a
-                class="truncate max-w-xs py-1 px-2 text-xs bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-sm"
-                title="Start new session"
-                href="{{ add_session_link }}"
-                hx-get="{{ add_session_link }}"
-                hx-vals="js:{session_count:getSessionCount()}"
-                hx-target="#session-list"
-                hx-swap="afterbegin"
-            >New</a>
-{% endif %}
+            <span class="dark:text-slate-500">({{ sessions.count }})</span>
+            {% url 'start_game_session' game.id as add_session_link %}
+            {% include 'components/button.html' with title="Start new session" text="New" link=add_session_link %}
             and Notes <span class="dark:text-slate-500">({{ sessions_with_notes_count }})</span>
         </h1>
-        <ul id="session-list">
+        <ul>
             {% for session in sessions %}
-                {% partialdef session-info inline=True %}
-                    <li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center space-x-1">
-                        {{ session.timestamp_start | date:"d/m/Y H:i" }}{% if session.timestamp_end %}-{{ session.timestamp_end | date:"H:i" }}{% endif %}
-                        ({{ session.device.get_type_display | default:"Unknown" }}, {{ session.duration_formatted }})
-                        {% url 'edit_session' session.id as edit_url %}
-                        {% include 'components/edit_button.html' with edit_url=edit_url %}
-                        {% if not session.timestamp_end %}
-                            {% url 'view_game_end_session' session.id as end_session_url %}
-                            <a
-                                class="flex bg-green-600 rounded-full px-2 w-7 h-4 text-white justify-center items-center"
-                                href="{{ end_session_url }}"
-                                hx-get="{{ end_session_url }}"
-                                hx-target="closest li"
-                                hx-swap="outerHTML"
-                                hx-vals="js:{session_count:getSessionCount()}"
-                                hx-indicator="#indicator"
-                            >
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="#ffffff" class="h-3" x="0px" y="0px" viewBox="0 0 24 24">
-                                    <path d="M 12 2 C 6.486 2 2 6.486 2 12 C 2 17.514 6.486 22 12 22 C 17.514 22 22 17.514 22 12 C 22 10.874 21.803984 9.7942031 21.458984 8.7832031 L 19.839844 10.402344 C 19.944844 10.918344 20 11.453 20 12 C 20 16.411 16.411 20 12 20 C 7.589 20 4 16.411 4 12 C 4 7.589 7.589 4 12 4 C 13.633 4 15.151922 4.4938906 16.419922 5.3378906 L 17.851562 3.90625 C 16.203562 2.71225 14.185 2 12 2 z M 21.292969 3.2929688 L 11 13.585938 L 7.7070312 10.292969 L 6.2929688 11.707031 L 11 16.414062 L 22.707031 4.7070312 L 21.292969 3.2929688 z"></path>
-                                </svg>
-                            </a>
-
-                        {% endif %}
-                    </li>
-                    <li class="sm:pl-4 markdown-content">{{ session.note|markdown }}</li>
-                    <div class="hidden" hx-swap-oob="innerHTML:#session-count">
-                        ({{ session_count }})
-                    </div>
-                {% endpartialdef %}
+                <li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center">
+                    {{ session.timestamp_start | date:"d/m/Y H:m" }}
+                    ({{ session.device.get_type_display | default:"Unknown" }}, {{ session.duration_formatted }})
+                    {% url 'edit_session' session.id as edit_url %}
+                    {% include 'components/edit_button.html' with edit_url=edit_url %}
+                </li>
+                <li class="sm:pl-4 italic">{{ session.note|linebreaks }}</li>
             {% endfor %}
         </ul>
     </div>
-    <script>
-        function getSessionCount() {
-            return document.getElementById('session-count').textContent.match("[0-9]+");
-        }
-    </script>
 {% endblock content %}

games/templatetags/markdown_extras.py

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

games/urls.py

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

games/views.py

@@ -1,20 +1,9 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import Any, Callable
 
-from django.contrib.auth.decorators import login_required
-
-from django.db.models import (
-    Avg,
-    Count,
-    ExpressionWrapper,
-    F,
-    Prefetch,
-    Q,
-    Sum,
-    fields,
-    IntegerField,
-)
-from django.db.models.functions import TruncDate, ExtractMonth, TruncMonth
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Avg, Count, ExpressionWrapper, F, Prefetch, Q, Sum, fields
+from django.db.models.functions import Extract, TruncDate
 from django.http import (
     HttpRequest,
     HttpResponse,
@@ -24,10 +13,9 @@ from django.http import (
 from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.shortcuts import get_object_or_404
 
 from common.time import format_duration
-from common.utils import safe_division, safe_getattr
+from common.utils import safe_division
 
 from .forms import (
     DeviceForm,
@@ -55,7 +43,6 @@ def stats_dropdown_year_range(request):
     return result
 
 
-@login_required
 def add_session(request, purchase_id=None):
     context = {}
     initial = {"timestamp_start": timezone.now()}
@@ -86,6 +73,13 @@ def add_session(request, purchase_id=None):
     return render(request, "add_session.html", context)
 
 
+def update_session(request, session_id=None):
+    session = Session.objects.get(id=session_id)
+    session.finish_now()
+    session.save()
+    return redirect("list_sessions")
+
+
 def use_custom_redirect(
     func: Callable[..., HttpResponse]
 ) -> Callable[..., HttpResponse]:
@@ -104,7 +98,6 @@ def use_custom_redirect(
     return wrapper
 
 
-@login_required
 @use_custom_redirect
 def edit_session(request, session_id=None):
     context = {}
@@ -118,7 +111,6 @@ def edit_session(request, session_id=None):
     return render(request, "add_session.html", context)
 
 
-@login_required
 @use_custom_redirect
 def edit_purchase(request, purchase_id=None):
     context = {}
@@ -129,12 +121,10 @@ def edit_purchase(request, purchase_id=None):
         return redirect("list_sessions")
     context["title"] = "Edit Purchase"
     context["form"] = form
-    context["purchase_id"] = purchase_id
     context["script_name"] = "add_purchase.js"
     return render(request, "add_purchase.html", context)
 
 
-@login_required
 @use_custom_redirect
 def edit_game(request, game_id=None):
     context = {}
@@ -148,14 +138,11 @@ def edit_game(request, game_id=None):
     return render(request, "add.html", context)
 
 
-@login_required
 def view_game(request, game_id=None):
     game = Game.objects.get(id=game_id)
     nongame_related_purchases_prefetch = Prefetch(
         "related_purchases",
-        queryset=Purchase.objects.exclude(type=Purchase.GAME).order_by(
-            "date_purchased"
-        ),
+        queryset=Purchase.objects.exclude(type=Purchase.GAME),
         to_attr="nongame_related_purchases",
     )
     game_purchases_prefetch = Prefetch(
@@ -171,57 +158,37 @@ def view_game(request, game_id=None):
         .order_by("year_released")
     )
 
-    sessions = Session.objects.prefetch_related("device").filter(
-        purchase__edition__game=game
-    )
+    sessions = Session.objects.filter(purchase__edition__game=game)
     session_count = sessions.count()
-    session_count_without_manual = (
-        Session.objects.without_manual().filter(purchase__edition__game=game).count()
+
+    playrange_start = sessions.earliest().timestamp_start.strftime("%b %Y")
+    playrange_end = sessions.latest().timestamp_start.strftime("%b %Y")
+
+    playrange = (
+        playrange_start
+        if playrange_start == playrange_end
+        else f"{playrange_start} — {playrange_end}"
     )
-
-    if sessions:
-        playrange_start = sessions.earliest().timestamp_start.strftime("%b %Y")
-        latest_session = sessions.latest()
-        playrange_end = latest_session.timestamp_start.strftime("%b %Y")
-
-        playrange = (
-            playrange_start
-            if playrange_start == playrange_end
-            else f"{playrange_start} — {playrange_end}"
-        )
-    else:
-        playrange = "N/A"
-        latest_session = None
-
     total_hours = float(format_duration(sessions.total_duration_unformatted(), "%2.1H"))
-    total_hours_without_manual = float(
-        format_duration(sessions.calculated_duration_unformatted(), "%2.1H")
-    )
+
     context = {
         "edition_count": editions.count(),
         "editions": editions,
         "game": game,
         "playrange": playrange,
         "purchase_count": Purchase.objects.filter(edition__game=game).count(),
-        "session_average_without_manual": round(
-            safe_division(
-                total_hours_without_manual, int(session_count_without_manual)
-            ),
-            1,
-        ),
+        "session_average": round(total_hours / int(session_count), 1),
         "session_count": session_count,
         "sessions_with_notes_count": sessions.exclude(note="").count(),
         "sessions": sessions.order_by("-timestamp_start"),
         "title": f"Game Overview - {game.name}",
         "hours_sum": total_hours,
-        "latest_session_id": safe_getattr(latest_session, "pk"),
     }
 
     request.session["return_path"] = request.path
     return render(request, "view_game.html", context)
 
 
-@login_required
 @use_custom_redirect
 def edit_platform(request, platform_id=None):
     context = {}
@@ -235,7 +202,6 @@ def edit_platform(request, platform_id=None):
     return render(request, "add.html", context)
 
 
-@login_required
 @use_custom_redirect
 def edit_edition(request, edition_id=None):
     context = {}
@@ -260,53 +226,39 @@ def related_purchase_by_edition(request):
     return render(request, "partials/related_purchase_field.html", {"form": form})
 
 
-def clone_session_by_id(session_id: int) -> Session:
-    session = get_object_or_404(Session, id=session_id)
-    clone = session
-    clone.pk = None
-    clone.timestamp_start = timezone.now()
-    clone.timestamp_end = None
-    clone.note = ""
-    clone.save()
-    return clone
-
-
-@login_required
 @use_custom_redirect
-def new_session_from_existing_session(request, session_id: int, template: str = ""):
-    session = clone_session_by_id(session_id)
-    if request.htmx:
-        context = {
-            "session": session,
-            "session_count": int(request.GET.get("session_count", 0)) + 1,
+def start_game_session(request, game_id: int):
+    last_session = Session.objects.filter(purchase__edition__game_id=game_id).latest()
+    session = SessionForm(
+        {
+            "purchase": last_session.purchase.id,
+            "timestamp_start": timezone.now(),
+            "device": last_session.device,
         }
-        return render(request, template, context)
-    return redirect("list_sessions")
-
-
-@login_required
-@use_custom_redirect
-def end_session(request, session_id: int, template: str = ""):
-    session = get_object_or_404(Session, id=session_id)
-    session.timestamp_end = timezone.now()
+    )
     session.save()
-    if request.htmx:
-        context = {
-            "session": session,
-            "session_count": request.GET.get("session_count", 0),
+    return redirect("list_sessions")
+
+
+def start_session_same_as_last(request, last_session_id: int):
+    last_session = Session.objects.get(id=last_session_id)
+    session = SessionForm(
+        {
+            "purchase": last_session.purchase.id,
+            "timestamp_start": timezone.now(),
+            "device": last_session.device,
         }
-        return render(request, template, context)
+    )
+    session.save()
     return redirect("list_sessions")
 
 
-@login_required
-def delete_session(request, session_id=None):
-    session = get_object_or_404(Session, id=session_id)
-    session.delete()
-    return redirect("list_sessions")
+# def delete_session(request, session_id=None):
+#     session = Session.objects.get(id=session_id)
+#     session.delete()
+#     return redirect("list_sessions")
 
 
-@login_required
 def list_sessions(
     request,
     filter="",
@@ -319,55 +271,56 @@ def list_sessions(
     context = {}
     context["title"] = "Sessions"
 
-    all_sessions = Session.objects.prefetch_related(
-        "purchase", "purchase__edition", "purchase__edition__game"
-    ).order_by("-timestamp_start")
-
     if filter == "purchase":
-        dataset = all_sessions.filter(purchase=purchase_id)
+        dataset = Session.objects.filter(purchase=purchase_id)
         context["purchase"] = Purchase.objects.get(id=purchase_id)
     elif filter == "platform":
-        dataset = all_sessions.filter(purchase__platform=platform_id)
+        dataset = Session.objects.filter(purchase__platform=platform_id)
         context["platform"] = Platform.objects.get(id=platform_id)
     elif filter == "edition":
-        dataset = all_sessions.filter(purchase__edition=edition_id)
+        dataset = Session.objects.filter(purchase__edition=edition_id)
         context["edition"] = Edition.objects.get(id=edition_id)
     elif filter == "game":
-        dataset = all_sessions.filter(purchase__edition__game=game_id)
+        dataset = Session.objects.filter(purchase__edition__game=game_id)
         context["game"] = Game.objects.get(id=game_id)
     elif filter == "ownership_type":
-        dataset = all_sessions.filter(purchase__ownership_type=ownership_type)
+        dataset = Session.objects.filter(purchase__ownership_type=ownership_type)
         context["ownership_type"] = dict(Purchase.OWNERSHIP_TYPES)[ownership_type]
     elif filter == "recent":
         current_year = timezone.now().year
         first_day_of_year = timezone.make_aware(datetime(current_year, 1, 1))
-        dataset = all_sessions.filter(timestamp_start__gte=first_day_of_year).order_by(
-            "-timestamp_start"
-        )
+        dataset = Session.objects.filter(
+            timestamp_start__gte=first_day_of_year
+        ).order_by("-timestamp_start")
         context["title"] = "This year"
     else:
-        dataset = all_sessions
+        # by default, sort from newest to oldest
+        dataset = Session.objects.order_by("-timestamp_start")
 
-    context = {
-        **context,
-        "dataset": dataset,
-        "dataset_count": dataset.count(),
-        "last": Session.objects.prefetch_related("purchase__platform").latest(),
-    }
+    for session in dataset:
+        if session.timestamp_end == None and session.duration_manual == timedelta(
+            seconds=0
+        ):
+            session.timestamp_end = timezone.now()
+            session.unfinished = True
+
+    context["total_duration"] = dataset.total_duration_formatted()
+    context["dataset"] = dataset
+    try:
+        context["last"] = Session.objects.latest()
+    except ObjectDoesNotExist:
+        context["last"] = None
 
     return render(request, "list_sessions.html", context)
 
 
-@login_required
 def stats(request, year: int = 0):
     selected_year = request.GET.get("year")
     if selected_year:
         return HttpResponseRedirect(reverse("stats_by_year", args=[selected_year]))
     if year == 0:
         year = timezone.now().year
-    this_year_sessions = Session.objects.filter(
-        timestamp_start__year=year
-    ).select_related("purchase__edition")
+    this_year_sessions = Session.objects.filter(timestamp_start__year=year)
     this_year_sessions_with_durations = this_year_sessions.annotate(
         duration=ExpressionWrapper(
             F("timestamp_end") - F("timestamp_start"),
@@ -375,10 +328,7 @@ def stats(request, year: int = 0):
         )
     )
     longest_session = this_year_sessions_with_durations.order_by("-duration").first()
-    this_year_games = Game.objects.filter(
-        edition__purchase__session__in=this_year_sessions
-    ).distinct()
-    this_year_games_with_session_counts = this_year_games.annotate(
+    this_year_games_with_session_counts = Game.objects.annotate(
         session_count=Count(
             "edition__purchase__session",
             filter=Q(edition__purchase__session__timestamp_start__year=year),
@@ -399,52 +349,48 @@ def stats(request, year: int = 0):
     ).distinct()
 
     this_year_purchases = Purchase.objects.filter(date_purchased__year=year)
-    this_year_purchases_with_currency = this_year_purchases.select_related(
-        "edition"
-    ).filter(price_currency__exact=selected_currency)
+    this_year_purchases_with_currency = this_year_purchases.filter(
+        price_currency__exact=selected_currency
+    )
     this_year_purchases_without_refunded = this_year_purchases_with_currency.filter(
         date_refunded=None
     )
     this_year_purchases_refunded = this_year_purchases_with_currency.refunded()
 
-    this_year_purchases_unfinished_dropped_nondropped = (
-        this_year_purchases_without_refunded.filter(date_finished__isnull=True)
-        .filter(infinite=False)
-        .filter(Q(type=Purchase.GAME) | Q(type=Purchase.DLC))
+    this_year_purchases_unfinished = this_year_purchases_without_refunded.filter(
+        date_finished__isnull=True
+    ).filter(
+        Q(type=Purchase.GAME) | Q(type=Purchase.DLC)
     )  # do not count battle passes etc.
 
-    this_year_purchases_unfinished = (
-        this_year_purchases_unfinished_dropped_nondropped.filter(
-            date_dropped__isnull=True
-        )
-    )
-    this_year_purchases_dropped = (
-        this_year_purchases_unfinished_dropped_nondropped.filter(
-            date_dropped__isnull=False
-        )
-    )
-
-    this_year_purchases_without_refunded_count = (
-        this_year_purchases_without_refunded.count()
-    )
-    this_year_purchases_unfinished_count = this_year_purchases_unfinished.count()
     this_year_purchases_unfinished_percent = int(
         safe_division(
-            this_year_purchases_unfinished_count,
-            this_year_purchases_without_refunded_count,
+            this_year_purchases_unfinished.count(), this_year_purchases_refunded.count()
         )
         * 100
     )
 
     purchases_finished_this_year = Purchase.objects.filter(date_finished__year=year)
+    purchases_finished_this_year_with_playtime = purchases_finished_this_year.annotate(
+        total_playtime=Sum(
+            F("session__duration_calculated") + F("session__duration_manual")
+        )
+    )
+
+    for purchase in purchases_finished_this_year_with_playtime:
+        formatted_playtime = format_duration(purchase.total_playtime, "%2.0H")
+        setattr(purchase, "formatted_playtime", formatted_playtime)
+
     purchases_finished_this_year_released_this_year = (
         purchases_finished_this_year.filter(edition__year_released=year).order_by(
             "date_finished"
         )
     )
     purchased_this_year_finished_this_year = (
-        this_year_purchases_without_refunded.filter(date_finished__year=year)
-    ).order_by("date_finished")
+        this_year_purchases_without_refunded.intersection(
+            purchases_finished_this_year
+        ).order_by("date_finished")
+    )
 
     this_year_spendings = this_year_purchases_without_refunded.aggregate(
         total_spent=Sum(F("price"))
@@ -461,15 +407,6 @@ def stats(request, year: int = 0):
         )
         .values("id", "name", "total_playtime")
     )
-    month_playtimes = (
-        this_year_sessions.annotate(month=TruncMonth("timestamp_start"))
-        .values("month")
-        .annotate(playtime=Sum("duration_calculated"))
-        .order_by("month")
-    )
-    for month in month_playtimes:
-        month["playtime"] = format_duration(month["playtime"], "%2.0H")
-
     highest_session_average_game = (
         Game.objects.filter(edition__purchase__session__in=this_year_sessions)
         .annotate(
@@ -498,26 +435,6 @@ def stats(request, year: int = 0):
         .count()
     )
 
-    first_play_name = "N/A"
-    first_play_date = "N/A"
-    last_play_name = "N/A"
-    last_play_date = "N/A"
-    if this_year_sessions:
-        first_session = this_year_sessions.earliest()
-        first_play_game = first_session.purchase.edition.game
-        first_play_date = first_session.timestamp_start.strftime("%x")
-        last_session = this_year_sessions.latest()
-        last_play_game = last_session.purchase.edition.game
-        last_play_date = last_session.timestamp_start.strftime("%x")
-
-    all_purchased_this_year_count = this_year_purchases_with_currency.count()
-    all_purchased_refunded_this_year_count = this_year_purchases_refunded.count()
-
-    this_year_purchases_dropped_count = this_year_purchases_dropped.count()
-    this_year_purchases_dropped_percentage = int(
-        safe_division(this_year_purchases_dropped_count, all_purchased_this_year_count)
-        * 100
-    )
     context = {
         "total_hours": format_duration(
             this_year_sessions.total_duration_unformatted(), "%2.0H"
@@ -533,89 +450,52 @@ def stats(request, year: int = 0):
         "total_spent_currency": selected_currency,
         "all_purchased_this_year": this_year_purchases_without_refunded,
         "spent_per_game": int(
-            safe_division(total_spent, this_year_purchases_without_refunded_count)
+            safe_division(total_spent, this_year_purchases_without_refunded.count())
         ),
-        "all_finished_this_year": purchases_finished_this_year.select_related(
-            "edition"
-        ).order_by("date_finished"),
-        "all_finished_this_year_count": purchases_finished_this_year.count(),
-        "this_year_finished_this_year": purchases_finished_this_year_released_this_year.select_related(
-            "edition"
-        ).order_by(
+        "all_finished_this_year": purchases_finished_this_year_with_playtime.order_by(
             "date_finished"
         ),
-        "this_year_finished_this_year_count": purchases_finished_this_year_released_this_year.count(),
-        "purchased_this_year_finished_this_year": purchased_this_year_finished_this_year.select_related(
-            "edition"
-        ).order_by(
+        "this_year_finished_this_year": purchases_finished_this_year_released_this_year.order_by(
+            "date_finished"
+        ),
+        "purchased_this_year_finished_this_year": purchased_this_year_finished_this_year.order_by(
             "date_finished"
         ),
         "total_sessions": this_year_sessions.count(),
         "unique_days": unique_days["dates"],
         "unique_days_percent": int(unique_days["dates"] / 365 * 100),
         "purchased_unfinished": this_year_purchases_unfinished,
-        "purchased_unfinished_count": this_year_purchases_unfinished_count,
         "unfinished_purchases_percent": this_year_purchases_unfinished_percent,
-        "dropped_count": this_year_purchases_dropped_count,
-        "dropped_percentage": this_year_purchases_dropped_percentage,
         "refunded_percent": int(
             safe_division(
-                all_purchased_refunded_this_year_count,
-                all_purchased_this_year_count,
+                this_year_purchases_refunded.count(),
+                this_year_purchases_with_currency.count(),
             )
             * 100
         ),
         "all_purchased_refunded_this_year": this_year_purchases_refunded,
-        "all_purchased_refunded_this_year_count": all_purchased_refunded_this_year_count,
         "all_purchased_this_year": this_year_purchases_with_currency.order_by(
             "date_purchased"
         ),
-        "all_purchased_this_year_count": all_purchased_this_year_count,
         "backlog_decrease_count": backlog_decrease_count,
-        "longest_session_time": (
-            format_duration(longest_session.duration, "%2.0Hh %2.0mm")
-            if longest_session
-            else 0
+        "longest_session_time": format_duration(
+            longest_session.duration if longest_session else timedelta(0),
+            "%2.0Hh %2.0mm",
         ),
-        "longest_session_game": (
-            longest_session.purchase.edition.game if longest_session else None
-        ),
-        "highest_session_count": (
-            game_highest_session_count.session_count
-            if game_highest_session_count
-            else 0
-        ),
-        "highest_session_count_game": (
-            game_highest_session_count if game_highest_session_count else None
-        ),
-        "highest_session_average": (
-            format_duration(
-                highest_session_average_game.session_average, "%2.0Hh %2.0mm"
-            )
-            if highest_session_average_game
-            else 0
+        "longest_session_game": longest_session.purchase.edition.name,
+        "highest_session_count": game_highest_session_count.session_count,
+        "highest_session_count_game": game_highest_session_count.name,
+        "highest_session_average": format_duration(
+            highest_session_average_game.session_average, "%2.0Hh %2.0mm"
         ),
         "highest_session_average_game": highest_session_average_game,
-        "first_play_game": first_play_game,
-        "first_play_date": first_play_date,
-        "last_play_game": last_play_game,
-        "last_play_date": last_play_date,
         "title": f"{year} Stats",
-        "month_playtimes": month_playtimes,
     }
 
     request.session["return_path"] = request.path
     return render(request, "stats.html", context)
 
 
-@login_required
-def delete_purchase(request, purchase_id=None):
-    purchase = get_object_or_404(Purchase, id=purchase_id)
-    purchase.delete()
-    return redirect("list_sessions")
-
-
-@login_required
 def add_purchase(request, edition_id=None):
     context = {}
     initial = {"date_purchased": timezone.now()}
@@ -651,7 +531,6 @@ def add_purchase(request, edition_id=None):
     return render(request, "add_purchase.html", context)
 
 
-@login_required
 def add_game(request):
     context = {}
     form = GameForm(request.POST or None)
@@ -670,7 +549,6 @@ def add_game(request):
     return render(request, "add_game.html", context)
 
 
-@login_required
 def add_edition(request, game_id=None):
     context = {}
     if request.method == "POST":
@@ -705,7 +583,6 @@ def add_edition(request, game_id=None):
     return render(request, "add_edition.html", context)
 
 
-@login_required
 def add_platform(request):
     context = {}
     form = PlatformForm(request.POST or None)
@@ -718,7 +595,6 @@ def add_platform(request):
     return render(request, "add.html", context)
 
 
-@login_required
 def add_device(request):
     context = {}
     form = DeviceForm(request.POST or None)
@@ -731,6 +607,5 @@ def add_device(request):
     return render(request, "add.html", context)
 
 
-@login_required
 def index(request):
     return redirect("list_sessions_recent")

package.json

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

pyproject.toml

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

timetracker/settings.py

@@ -38,10 +38,7 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "template_partials",
     "graphene_django",
-    "django_htmx",
-    "slippers",
 ]
 
 GRAPHENE = {"SCHEMA": "games.schema.schema"}
@@ -59,7 +56,6 @@ MIDDLEWARE = [
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "django_htmx.middleware.HtmxMiddleware",
 ]
 
 if DEBUG:
@@ -68,9 +64,6 @@ if DEBUG:
     DEBUG_TOOLBAR_CONFIG = {"ROOT_TAG_EXTRA_ATTRS": "hx-preserve"}
 
 ROOT_URLCONF = "timetracker.urls"
-LOGIN_URL = "/login/"
-LOGIN_REDIRECT_URL = "/"
-LOGOUT_REDIRECT_URL = "/login/"
 
 TEMPLATES = [
     {
@@ -86,10 +79,6 @@ TEMPLATES = [
                 "games.views.model_counts",
                 "games.views.stats_dropdown_year_range",
             ],
-            "builtins": [
-                "template_partials.templatetags.partials",
-                "slippers.templatetags.slippers",
-            ],
         },
     },
 ]

timetracker/urls.py

@@ -15,7 +15,6 @@ Including another URLconf
 """
 from django.conf import settings
 from django.contrib import admin
-from django.contrib.auth import views as auth_views
 from django.urls import include, path
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView
@@ -23,10 +22,8 @@ from graphene_django.views import GraphQLView
 
 urlpatterns = [
     path("", RedirectView.as_view(url="/tracker")),
-    path("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True))),
-    path("login/", auth_views.LoginView.as_view(), name="login"),
-    path("logout/", auth_views.LogoutView.as_view(), name="logout"),
     path("tracker/", include("games.urls")),
+    path("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True))),
 ]
 
 if settings.DEBUG: