Add django-cors-headers

Fixes #53

.gitea/workflows/build-docker.yml

@@ -3,12 +3,10 @@ name: Django CI/CD
 on:
   push:
     branches: [ main ]
-  pull_request:
-    branches: [ main ]
+    paths-ignore: [ 'README.md' ]
 
 jobs:
   build-and-push:
-    needs: test
     runs-on: ubuntu-latest
     steps:
     - name: Checkout

CHANGELOG.md

@@ -1,17 +1,5 @@
 ## Unreleased
 
-## Improved
-* game overview: improve how editions and purchases are displayed
-* add purchase: only allow choosing purchases of selected edition
-
-## 1.5.1 / 2023-11-14 21:10+01:00
-
-## Improved
-* Disallow choosing non-game purchase as related purchase
-* Improve display of purchases
-
-## 1.5.0 / 2023-11-14 19:27+01:00
-
 ## New
 * Add stat for finished this year's games
 * Add purchase types:
@@ -20,9 +8,6 @@
   * Season Pass
   * Battle Pass
 
-## Fixed
-* Order purchases by date on game view
-
 ## 1.4.0 / 2023-11-09 21:01+01:00
 
 ### New
@@ -110,24 +95,22 @@
 
 ### Enhancements
 * Improve form appearance
-* Focus important fields on forms
-* Use the same form when editing a session as when adding a session
+* Add helper buttons next to datime fields
 * Change recent session view to current year instead of last 30 days
-* Add a hacky way not to reload a page when starting or ending a session (https://git.kucharczyk.xyz/lukas/timetracker/issues/52)
-* Improve session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/53)
-
-### Fixes
-
-* Fix session being wrongly considered in progress if it had a certain amount of manual hours (https://git.kucharczyk.xyz/lukas/timetracker/issues/58)
 * Fix bug when filtering only manual sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/51)
-
+* Add copy button on Add session page to copy times between fields
+* Use the same form when editing a session as when adding a session
+* Add a hacky way not to reload a page when starting or ending a session (https://git.kucharczyk.xyz/lukas/timetracker/issues/52)
+* Focus important fields on forms
+* Improve session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/53)
+* Change fonts to IBM Plex
+* Only use local WOFF2 font files
 
 ## 1.0.3 / 2023-02-20 17:16+01:00
 
 * Add wikidata ID and year for editions
-* Add icons for game, edition, purchase filters
 * Allow filtering by game, edition, purchase from the session list
-* Allow editing filtered entities from session list
+* Add icons for the above
 
 ## 1.0.2 / 2023-02-18 21:48+01:00
 

games/forms.py

@@ -9,6 +9,11 @@ custom_datetime_widget = forms.DateTimeInput(
 )
 autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
 
+custom_date_widget = forms.DateInput(attrs={"type": "date"})
+custom_datetime_widget = forms.DateTimeInput(
+    attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M"
+)
+
 
 class SessionForm(forms.ModelForm):
     # purchase = forms.ModelChoiceField(
@@ -82,7 +87,6 @@ class PurchaseForm(forms.ModelForm):
         widgets = {
             "date_purchased": custom_date_widget,
             "date_refunded": custom_date_widget,
-            "date_finished": custom_date_widget,
         }
         model = Purchase
         fields = [
@@ -147,7 +151,7 @@ class EditionForm(forms.ModelForm):
 
     class Meta:
         model = Edition
-        fields = ["game", "name", "sort_name", "platform", "year_released", "wikidata"]
+        fields = ["game", "name", "platform", "year_released", "wikidata"]
 
 
 class GameForm(forms.ModelForm):

games/migrations/0027_purchase_related_purchase.py

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

games/migrations/0028_purchase_name.py

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

games/models.py

@@ -2,6 +2,7 @@ from datetime import timedelta
 
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.core.exceptions import ValidationError
 from django.db.models import F, Manager, Sum
 from django.utils import timezone
 
@@ -38,13 +39,9 @@ class Edition(models.Model):
 
     game = models.ForeignKey("Game", on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
-    sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
-    platform = models.ForeignKey(
-        "Platform", on_delete=models.CASCADE, null=True, blank=True, default=None
-    )
-    year_released = models.IntegerField(null=True, blank=True, default=None)
+    platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
+    year_released = models.IntegerField(default=datetime.today().year)
     wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.sort_name
@@ -124,25 +121,14 @@ class Purchase(models.Model):
     type = models.CharField(max_length=255, choices=TYPES, default=GAME)
     name = models.CharField(max_length=255, default="", null=True, blank=True)
     related_purchase = models.ForeignKey(
-        "Purchase",
-        on_delete=models.SET_NULL,
-        default=None,
-        null=True,
-        blank=True,
-        related_name="related_purchases",
+        "Purchase", on_delete=models.SET_NULL, default=None, null=True, blank=True
     )
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
-        additional_info = [
-            self.get_type_display() if self.type != Purchase.GAME else "",
-            f"{self.edition.platform} version on {self.platform}"
-            if self.platform != self.edition.platform
-            else self.platform,
-            self.edition.year_released,
-            self.get_ownership_type_display(),
-        ]
-        return f"{self.edition} ({', '.join(filter(None, map(str, additional_info)))})"
+        platform_info = self.platform
+        if self.platform != self.edition.platform:
+            platform_info = f"{self.edition.platform} version on {self.platform}"
+        return f"{self.edition} ({platform_info}, {self.edition.year_released}, {self.get_ownership_type_display()})"
 
     def is_game(self):
         return self.type == self.GAME

games/static/base.css

@@ -755,10 +755,6 @@ select {
   position: absolute;
 }
 
-.relative {
-  position: relative;
-}
-
 .bottom-2 {
   bottom: 0.5rem;
 }
@@ -775,55 +771,20 @@ select {
   top: 0.75rem;
 }
 
-.mx-2 {
-  margin-left: 0.5rem;
-  margin-right: 0.5rem;
-}
-
 .mx-auto {
   margin-left: auto;
   margin-right: auto;
 }
 
-.my-2 {
-  margin-top: 0.5rem;
-  margin-bottom: 0.5rem;
-}
-
 .my-4 {
   margin-top: 1rem;
   margin-bottom: 1rem;
 }
 
-.my-6 {
-  margin-top: 1.5rem;
-  margin-bottom: 1.5rem;
-}
-
-.mb-1 {
-  margin-bottom: 0.25rem;
-}
-
-.mb-10 {
-  margin-bottom: 2.5rem;
-}
-
-.mb-2 {
-  margin-bottom: 0.5rem;
-}
-
 .mb-4 {
   margin-bottom: 1rem;
 }
 
-.ml-1 {
-  margin-left: 0.25rem;
-}
-
-.ml-2 {
-  margin-left: 0.5rem;
-}
-
 .mr-4 {
   margin-right: 1rem;
 }
@@ -836,10 +797,6 @@ select {
   display: block;
 }
 
-.inline-block {
-  display: inline-block;
-}
-
 .inline {
   display: inline;
 }
@@ -856,14 +813,6 @@ select {
   display: none;
 }
 
-.h-4 {
-  height: 1rem;
-}
-
-.h-5 {
-  height: 1.25rem;
-}
-
 .h-6 {
   height: 1.5rem;
 }
@@ -872,22 +821,10 @@ select {
   min-height: 100vh;
 }
 
-.w-5 {
-  width: 1.25rem;
-}
-
 .w-6 {
   width: 1.5rem;
 }
 
-.w-7 {
-  width: 1.75rem;
-}
-
-.w-auto {
-  width: auto;
-}
-
 .w-full {
   width: 100%;
 }
@@ -896,10 +833,6 @@ select {
   max-width: 1024px;
 }
 
-.max-w-sm {
-  max-width: 24rem;
-}
-
 .max-w-xs {
   max-width: 20rem;
 }
@@ -926,18 +859,10 @@ select {
   align-items: center;
 }
 
-.justify-center {
-  justify-content: center;
-}
-
 .justify-between {
   justify-content: space-between;
 }
 
-.gap-2 {
-  gap: 0.5rem;
-}
-
 .self-center {
   align-self: center;
 }
@@ -960,35 +885,16 @@ select {
   border-radius: 0.5rem;
 }
 
-.rounded-sm {
-  border-radius: 0.125rem;
-}
-
 .border-gray-200 {
   --tw-border-opacity: 1;
   border-color: rgb(229 231 235 / var(--tw-border-opacity));
 }
 
-.border-slate-500 {
-  --tw-border-opacity: 1;
-  border-color: rgb(100 116 139 / var(--tw-border-opacity));
-}
-
-.bg-gray-200 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(229 231 235 / var(--tw-bg-opacity));
-}
-
 .bg-green-600 {
   --tw-bg-opacity: 1;
   background-color: rgb(22 163 74 / var(--tw-bg-opacity));
 }
 
-.bg-violet-600 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(124 58 237 / var(--tw-bg-opacity));
-}
-
 .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -1003,11 +909,6 @@ select {
   padding-right: 0.5rem;
 }
 
-.px-4 {
-  padding-left: 1rem;
-  padding-right: 1rem;
-}
-
 .py-1 {
   padding-top: 0.25rem;
   padding-bottom: 0.25rem;
@@ -1026,10 +927,6 @@ select {
   padding-right: 1rem;
 }
 
-.pt-1 {
-  padding-top: 0.25rem;
-}
-
 .text-center {
   text-align: center;
 }
@@ -1038,9 +935,12 @@ select {
   font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
 
-.text-3xl {
-  font-size: 1.875rem;
-  line-height: 2.25rem;
+.font-serif {
+  font-family: IBM Plex Serif, ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
+}
+
+.font-sans {
+  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";
 }
 
 .text-4xl {
@@ -1048,21 +948,11 @@ select {
   line-height: 2.5rem;
 }
 
-.text-5xl {
-  font-size: 3rem;
-  line-height: 1;
-}
-
 .text-base {
   font-size: 1rem;
   line-height: 1.5rem;
 }
 
-.text-lg {
-  font-size: 1.125rem;
-  line-height: 1.75rem;
-}
-
 .text-xl {
   font-size: 1.25rem;
   line-height: 1.75rem;
@@ -1073,17 +963,55 @@ select {
   line-height: 1rem;
 }
 
+.text-2xl {
+  font-size: 1.5rem;
+  line-height: 2rem;
+}
+
+.text-9xl {
+  font-size: 8rem;
+  line-height: 1;
+}
+
+.text-8xl {
+  font-size: 6rem;
+  line-height: 1;
+}
+
+.text-7xl {
+  font-size: 4.5rem;
+  line-height: 1;
+}
+
+.text-6xl {
+  font-size: 3.75rem;
+  line-height: 1;
+}
+
+.text-5xl {
+  font-size: 3rem;
+  line-height: 1;
+}
+
+.text-lg {
+  font-size: 1.125rem;
+  line-height: 1.75rem;
+}
+
 .font-semibold {
   font-weight: 600;
 }
 
-.italic {
-  font-style: italic;
+.font-bold {
+  font-weight: 700;
 }
 
-.text-gray-700 {
-  --tw-text-opacity: 1;
-  color: rgb(55 65 81 / var(--tw-text-opacity));
+.capitalize {
+  text-transform: capitalize;
+}
+
+.italic {
+  font-style: italic;
 }
 
 .text-slate-300 {
@@ -1101,14 +1029,6 @@ select {
   color: rgb(253 224 71 / var(--tw-text-opacity));
 }
 
-.underline {
-  text-decoration-line: underline;
-}
-
-.decoration-slate-500 {
-  text-decoration-color: #64748b;
-}
-
 .shadow-md {
   --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
   --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
@@ -1208,10 +1128,12 @@ select {
 }
 
 .responsive-table thead th:not(:first-child),
-.responsive-table td:not(:first-child) {
+td:not(:first-child) {
   border-left-width: 1px;
   --tw-border-opacity: 1;
   border-left-color: rgb(100 116 139 / var(--tw-border-opacity));
+  padding-left: 1rem;
+  padding-right: 1rem;
 }
 
 :is(.dark form input),:is(.dark 
@@ -1343,21 +1265,11 @@ th label {
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
-.hover\:bg-gray-400:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(156 163 175 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-green-700:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(21 128 61 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-violet-700:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(109 40 217 / var(--tw-bg-opacity));
-}
-
 .hover\:underline:hover {
   text-decoration-line: underline;
 }
@@ -1378,11 +1290,6 @@ th label {
   --tw-ring-color: rgb(34 197 94 / var(--tw-ring-opacity));
 }
 
-.focus\:ring-violet-500:focus {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(139 92 246 / var(--tw-ring-opacity));
-}
-
 .focus\:ring-offset-2:focus {
   --tw-ring-offset-width: 2px;
 }
@@ -1391,14 +1298,6 @@ th label {
   --tw-ring-offset-color: #bfdbfe;
 }
 
-.focus\:ring-offset-violet-200:focus {
-  --tw-ring-offset-color: #ddd6fe;
-}
-
-.group:hover .group-hover\:block {
-  display: block;
-}
-
 :is(.dark .dark\:bg-gray-800) {
   --tw-bg-opacity: 1;
   background-color: rgb(31 41 55 / var(--tw-bg-opacity));
@@ -1409,16 +1308,6 @@ th label {
   background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 }
 
-:is(.dark .dark\:text-slate-400) {
-  --tw-text-opacity: 1;
-  color: rgb(148 163 184 / var(--tw-text-opacity));
-}
-
-:is(.dark .dark\:text-slate-500) {
-  --tw-text-opacity: 1;
-  color: rgb(100 116 139 / var(--tw-text-opacity));
-}
-
 :is(.dark .dark\:text-slate-600) {
   --tw-text-opacity: 1;
   color: rgb(71 85 105 / var(--tw-text-opacity));
@@ -1430,10 +1319,6 @@ th label {
 }
 
 @media (min-width: 640px) {
-  .sm\:inline {
-    display: inline;
-  }
-
   .sm\:table-cell {
     display: table-cell;
   }
@@ -1442,19 +1327,11 @@ th label {
     max-width: 28rem;
   }
 
-  .sm\:max-w-xl {
-    max-width: 36rem;
-  }
-
   .sm\:px-4 {
     padding-left: 1rem;
     padding-right: 1rem;
   }
 
-  .sm\:pl-12 {
-    padding-left: 3rem;
-  }
-
   .sm\:pl-2 {
     padding-left: 0.5rem;
   }
@@ -1509,10 +1386,6 @@ th label {
     display: table-cell;
   }
 
-  .lg\:max-w-3xl {
-    max-width: 48rem;
-  }
-
   .lg\:max-w-lg {
     max-width: 32rem;
   }

games/static/js/add_edition.js

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

games/static/js/add_purchase.js

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

games/static/js/add_session.js

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

games/static/js/utils.js

@@ -3,16 +3,9 @@
  * @param {Date} date
  * @returns {string}
  */
-function toISOUTCString(date) {
-  function stringAndPad(number) {
-    return number.toString().padStart(2, 0);
-  }
-  const year = date.getFullYear();
-  const month = stringAndPad(date.getMonth() + 1);
-  const day = stringAndPad(date.getDate());
-  const hours = stringAndPad(date.getHours());
-  const minutes = stringAndPad(date.getMinutes());
-  return `${year}-${month}-${day}T${hours}:${minutes}`;
+export function toISOUTCString(date) {
+  let month = (date.getMonth() + 1).toString().padStart(2, 0);
+  return `${date.getFullYear()}-${month}-${date.getDate()}T${date.getHours()}:${date.getMinutes()}`;
 }
 
 /**
@@ -99,72 +92,37 @@ function getEl(selector) {
     return document.getElementsByClassName(selector)
   }
   else {
-    return document.getElementsByTagName(selector)
+    return document.getElementsByName(selector)
   }
 }
 
 /**
- * @description Applies different behaviors to elements based on multiple conditional configurations.
- * Each configuration is an array containing a condition function, an array of target element selectors,
- * and two callback functions for handling matched and unmatched conditions.
- * @param {...Array} configs Each configuration is an array of the form:
- *   - 0: {function(): boolean} condition - Function that returns true or false based on a condition.
- *   - 1: {string[]} targetElements - Array of CSS selectors for target elements.
- *   - 2: {function(HTMLElement): void} callbackfn1 - Function to execute when condition is true.
- *   - 3: {function(HTMLElement): void} callbackfn2 - Function to execute when condition is false.
+ * @description Does something to elements when something happens.
+ * @param {() => boolean} condition The condition that is being tested.
+ * @param {string[]} targetElements
+ * @param {(elementName: HTMLElement) => void} callbackfn1 Called when the condition matches.
+ * @param {(elementName: HTMLElement) => void} callbackfn2 Called when the condition doesn't match.
  */
-function conditionalElementHandler(...configs) {
-  configs.forEach(([condition, targetElements, callbackfn1, callbackfn2]) => {
-    if (condition()) {
-      targetElements.forEach(elementName => {
-        let el = getEl(elementName);
-        if (el === null) {
-          console.error(`Element ${elementName} doesn't exist.`);
-        } else {
-          callbackfn1(el);
-        }
-      });
-    } else {
-      targetElements.forEach(elementName => {
-        let el = getEl(elementName);
-        if (el === null) {
-          console.error(`Element ${elementName} doesn't exist.`);
-        } else {
-          callbackfn2(el);
-        }
-      });
-    }
-  });
+function conditionalElementHandler(condition, targetElements, callbackfn1, callbackfn2) {
+  if (condition()) {
+    targetElements.forEach((elementName) => {
+      let el = getEl(elementName);
+      if (el === null) {
+        console.error("Element ${elementName} doesn't exist.");
+      } else {
+        callbackfn1(el);
+      }
+    });
+  } else {
+    targetElements.forEach((elementName) => {
+      let el = getEl(elementName);
+      if (el === null) {
+        console.error("Element ${elementName} doesn't exist.");
+      } else {
+        callbackfn2(el);
+      }
+    });
+  }
 }
 
-function disableElementsWhenFalse(targetSelect, targetValue, elementList) {
-  return conditionalElementHandler([
-    () => {
-      return getEl(targetSelect).value != targetValue;
-    },
-    elementList,
-    (el) => {
-      el.disabled = "disabled";
-    },
-    (el) => {
-      el.disabled = "";
-    },
-  ]);
-}
-
-function disableElementsWhenTrue(targetSelect, targetValue, elementList) {
-  return conditionalElementHandler([
-    () => {
-      return getEl(targetSelect).value == targetValue;
-    },
-    elementList,
-    (el) => {
-      el.disabled = "disabled";
-    },
-    (el) => {
-      el.disabled = "";
-    },
-  ]);
-}
-
-export { toISOUTCString, syncSelectInputUntilChanged, getEl, conditionalElementHandler, disableElementsWhenFalse, disableElementsWhenTrue, getValueFromProperty };
+export { toISOUTCString, syncSelectInputUntilChanged, getEl, conditionalElementHandler };

games/templates/add.html

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

games/templates/add_edition.html

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

games/templates/add_session.html

@@ -1,38 +1,34 @@
 {% extends "base.html" %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
-            {% csrf_token %}
-            {% for field in form %}
-                <tr>
-                    <th>{{ field.label_tag }}</th>
-                    {% if field.name == "note" %}
-                        <td>{{ field }}</td>
-                    {% else %}
-                        <td>{{ field }}</td>
-                    {% endif %}
-                    {% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
-                        <td>
-                            <div class="basic-button-container">
-                                <button class="basic-button" data-target="{{ field.name }}" data-type="now">Set to now</button>
-                                <button class="basic-button"
-                                        data-target="{{ field.name }}"
-                                        data-type="toggle">Toggle text</button>
-                                <button class="basic-button" data-target="{{ field.name }}" data-type="copy">Copy</button>
-                            </div>
-                        </td>
-                    {% endif %}
-                </tr>
-            {% endfor %}
-            <tr>
-                <td></td>
-                <td>
-                    <input type="submit" value="Submit" />
-                </td>
-            </tr>
+        {% csrf_token %}
+
+        {% for field in form %}
+        <tr>
+            <th>{{ field.label_tag }}</th>
+            {% if field.name == "note" %}
+            <td>{{ field }}</td>
+            {% else %}
+            <td>{{ field }}</td>
+            {% endif %}
+            {% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
+            <td>
+                <div class="basic-button-container">
+                    <button class="basic-button" data-target="{{field.name}}" data-type="now">Set to now</button>
+                    <button class="basic-button" data-target="{{field.name}}" data-type="toggle">Toggle text</button>
+                </div>
+            </td>
+            {% endif %}
+        </tr>
+        {% endfor %}
+        <tr>
+            <td></td>
+            <td><input type="submit" value="Submit"/></td>
+        </tr>
         </table>
     </form>
     {% load static %}

games/templates/base.html

@@ -2,29 +2,22 @@
 <html lang="en">
     {% load static %}
     <head>
-        <meta charset="utf-8" />
-        <meta name="description" content="Self-hosted time-tracker." />
-        <meta name="keywords" content="time, tracking, video games, self-hosted" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>Timetracker -
-            {% block title %}
-                Untitled
-            {% endblock title %}
-        </title>
+        <meta charset="utf-8"/>
+        <meta name="description" content="Self-hosted time-tracker."/>
+        <meta name="keywords" content="time, tracking, video games, self-hosted"/>
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+        <title>Timetracker - {% block title %}Untitled{% endblock title %}</title>
         <script src="{% static 'js/htmx.min.js' %}"></script>
         <link rel="stylesheet" href="{% static 'base.css' %}" />
     </head>
-    <body class="dark" hx-indicator="#indicator" hx-boost="true">
-        <img id="indicator"
-             src="{% static 'icons/loading.png' %}"
-             class="absolute right-3 top-3 animate-spin htmx-indicator" />
+    
+    <body class="dark">
+        <img id="indicator" src="{% static 'icons/loading.png' %}" class="absolute right-3 top-3 animate-spin htmx-indicator" />
         <div class="dark:bg-gray-800 min-h-screen">
             <nav class="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
                 <div class="container flex flex-wrap items-center justify-between mx-auto">
                     <a href="{% url 'list_sessions_recent' %}" class="flex items-center">
-                        <span class="text-4xl">
-                            <img src="{% static 'icons/schedule.png' %}" width="48" class="mr-4" />
-                        </span>
+                        <span class="text-4xl">⌚</span>
                         <span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
                     </a>
                     <div class="w-full md:block md:w-auto">
@@ -98,4 +91,5 @@
         {% block scripts %}
         {% endblock scripts %}
     </body>
+
 </html>

games/templates/components/button.html

@@ -1,13 +1,22 @@
-{% comment %} 
-title
-text
-{% endcomment %}
-<a href="{{ link }}"
-   title="{{ title }}"
-   class="truncate max-w-xs py-1 px-2 text-xs bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-sm">
-    {% comment %} <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="self-center w-6 h-6 inline">
-    <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" /> 
-    </svg>
-    {% endcomment %}
-    {{ text }}
-</a>
+<button
+  type="button"
+  title="{{ title }}"
+  autofocus
+  class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg"
+>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    class="self-center w-6 h-6 inline"
+  >
+    <path
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
+    />
+  </svg>
+  {{ text }}
+</button>

games/templates/list_sessions.html

@@ -1,68 +1,73 @@
 {% extends 'base.html' %}
+
 {% load static %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
-    {% if dataset.count >= 1 %}
-        <div class="mx-auto text-center my-4">
-            <a id="last-session-start"
-               href="{% url 'start_session_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>
-                        <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>
-                {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <div class="mx-auto text-center text-slate-300 text-xl">No sessions found.</div>
-    {% endif %}
+
+{% if dataset.count >= 1 %}
+<div class="mx-auto text-center my-4">
+  <a
+    id="last-session-start"
+    href="{% url 'start_session' last.id %}"
+    hx-get="{% url 'start_session' last.id %}"
+    hx-indicator="#indicator"
+    hx-swap="afterbegin"
+    hx-target=".responsive-table tbody"
+    hx-select=".responsive-table tbody tr:first-child"
+    onClick="document.querySelector('#last-session-start').classList.add('invisible')"
+    class="{% if last.timestamp_end == null %}invisible{% endif %}"
+  >
+    {% include 'components/button.html' with text=last.purchase title="Start session of last played game" only %}
+  </a>
+</div>
+{% endif %}
+
+<table class="responsive-table">
+  <thead>
+    <tr>
+      <th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
+      <th class="hidden sm:table-cell px-2 sm:px-4 md:px-6 md:py-2">Start</th>
+      <th class="hidden lg:table-cell px-2 sm:px-4 md:px-6 md:py-2">End</th>
+      <th class="px-2 sm:px-4 md:px-6 md:py-2">Duration</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for data in dataset %}
+    <tr>
+      <td
+        class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char md:max-w-40char"
+      >
+        {{ data.purchase.edition }}
+      </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>
+    {% endfor %}
+  </tbody>
+</table>
 {% endblock content %}

games/templates/stats.html

@@ -194,17 +194,18 @@
             </thead>
             <tbody>
                 {% for purchase in all_purchased_this_year %}
-                    <tr>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            <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>
-                    </tr>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                        <a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">
+                            {{ purchase.edition.name }}
+                        {% 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>
+                </tr>
                 {% endfor %}
             </tbody>
         </table>

games/templates/view_game.html

@@ -22,37 +22,42 @@
         </h1>
         <ul>
             {% for edition in editions %}
-                <li class="sm:pl-2 flex items-center">
-                    {{ edition.name }} ({{ edition.platform }}, {{ edition.year_released }})
-                    {% if edition.wikidata %}
-                        <span class="hidden sm:inline">
-                            <a href="https://www.wikidata.org/wiki/{{ edition.wikidata }}">
-                                <img class="inline mx-2 w-6" src="{% static 'icons/wikidata.png' %}" />
-                            </a>
-                        </span>
-                    {% endif %}
-                    {% url 'edit_edition' edition.id as edit_url %}
-                    {% include 'components/edit_button.html' with edit_url=edit_url %}
-                </li>
-                <ul>
-                    {% for purchase in edition.game_purchases %}
-                        <li class="sm:pl-6 flex items-center">
-                            {{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}
-                            {% if purchase.price != 0 %}({{ purchase.price }} {{ purchase.price_currency }}){% endif %}
-                            {% url 'edit_purchase' purchase.id as edit_url %}
-                            {% include 'components/edit_button.html' with edit_url=edit_url %}
-                        </li>
+            <li class="sm:pl-2 flex items-center">
+                {{ edition.name }} ({{ edition.platform }}, {{ edition.year_released }})
+                {% if edition.wikidata %}
+                <span class="hidden sm:inline">
+                    <a href="https://www.wikidata.org/wiki/{{ edition.wikidata }}">
+                        <img class="inline mx-2 w-6" src="{% static 'icons/wikidata.png' %}"/>
+                    </a>
+                </span>
+                {% endif %}
+                {% url 'edit_edition' edition.id as edit_url %}
+                {% include 'components/edit_button.html' with edit_url=edit_url %}
+            </li>
+            {% endfor %}
+        </ul>
+        <h1 class="text-3xl mt-4 mb-1">Purchases <span class="dark:text-slate-500">({{ purchases.count }})</span></h1>
+        <ul>
+            {% for purchase in purchases %}
+            <li class="sm:pl-2 flex items-center">
+                {{ purchase.platform }}
+                ({{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}, {{ purchase.price }} {{ purchase.price_currency}})
+                {% url 'edit_purchase' purchase.id as edit_url %}
+                {% include 'components/edit_button.html' with edit_url=edit_url %}
+                {% if purchase.related_purchases %}
+                    <li>
                         <ul>
-                            {% for related_purchase in purchase.nongame_related_purchases %}
-                                <li class="sm:pl-12 flex items-center">
-                                    {{ related_purchase.name }} ({{ related_purchase.get_type_display }}, {{ purchase.platform }}, {{ related_purchase.date_purchased | date:"Y" }}, {{ related_purchase.price }} {{ related_purchase.price_currency }})
+                            {% for related_purchase in purchase.related_purchases %}
+                                <li class="sm:pl-6 flex items-center">
+                                    {{ related_purchase.name}} ({{ related_purchase.get_type_display }}, {{ related_purchase.date_purchased | date:"Y" }}, {{ related_purchase.price }} {{ related_purchase.price_currency}})
                                     {% url 'edit_purchase' related_purchase.id as edit_url %}
                                     {% include 'components/edit_button.html' with edit_url=edit_url %}
                                 </li>
                             {% endfor %}
                         </ul>
-                    {% endfor %}
-                </ul>
+                    </li>
+                {% endif %}
+            </li>
             {% endfor %}
         </ul>
         <h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center">

games/urls.py

@@ -93,10 +93,4 @@ urlpatterns = [
         {"filter": "ownership_type"},
         name="list_sessions_by_ownership_type",
     ),
-    path("stats/", views.stats, name="stats_current_year"),
-    path(
-        "stats/<int:year>",
-        views.stats,
-        name="stats_by_year",
-    ),
 ]

games/views.py

@@ -1,15 +1,8 @@
 from datetime import datetime, timedelta
-from typing import Any, Callable
+from zoneinfo import ZoneInfo
 
-from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import Count, F, Prefetch, Sum
-from django.db.models.functions import TruncDate
-from django.http import (
-    HttpRequest,
-    HttpResponse,
-    HttpResponseBadRequest,
-    HttpResponseRedirect,
-)
+from common.time import now as now_with_tz
+from django.conf import settings
 from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils import timezone
@@ -140,10 +133,23 @@ def edit_game(request, game_id=None):
 
 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),
-        to_attr="nongame_related_purchases",
+    context["title"] = "View Game"
+    context["game"] = game
+    context["editions"] = Edition.objects.filter(game_id=game_id)
+    game_purchases = Purchase.objects.filter(edition__game_id=game_id).filter(
+        type=Purchase.GAME
+    )
+    for purchase in game_purchases:
+        purchase.related_purchases = Purchase.objects.exclude(
+            type=Purchase.GAME
+        ).filter(related_purchase=purchase.id)
+
+    context["purchases"] = game_purchases
+    context["sessions"] = Session.objects.filter(
+        purchase__edition__game_id=game_id
+    ).order_by("-timestamp_start")
+    context["total_hours"] = float(
+        format_duration(context["sessions"].total_duration_unformatted(), "%2.1H")
     )
     game_purchases_prefetch = Prefetch(
         "purchase_set",
@@ -253,12 +259,6 @@ def start_session_same_as_last(request, last_session_id: int):
     return redirect("list_sessions")
 
 
-# def delete_session(request, session_id=None):
-#     session = Session.objects.get(id=session_id)
-#     session.delete()
-#     return redirect("list_sessions")
-
-
 def list_sessions(
     request,
     filter="",
@@ -287,12 +287,10 @@ def list_sessions(
         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 = Session.objects.filter(
-            timestamp_start__gte=first_day_of_year
-        ).order_by("-timestamp_start")
-        context["title"] = "This year"
+            timestamp_start__gte=datetime.now() - timedelta(days=30)
+        )
+        context["title"] = "Last 30 days"
     else:
         # by default, sort from newest to oldest
         dataset = Session.objects.order_by("-timestamp_start")
@@ -306,10 +304,8 @@ def list_sessions(
 
     context["total_duration"] = dataset.total_duration_formatted()
     context["dataset"] = dataset
-    try:
-        context["last"] = Session.objects.latest()
-    except ObjectDoesNotExist:
-        context["last"] = None
+    # cannot use dataset[0] here because that might be only partial QuerySet
+    context["last"] = Session.objects.all().order_by("timestamp_start").last()
 
     return render(request, "list_sessions.html", context)
 
@@ -547,19 +543,3 @@ def add_platform(request):
     context["form"] = form
     context["title"] = "Add New Platform"
     return render(request, "add.html", context)
-
-
-def add_device(request):
-    context = {}
-    form = DeviceForm(request.POST or None)
-    if form.is_valid():
-        form.save()
-        return redirect("index")
-
-    context["form"] = form
-    context["title"] = "Add New Device"
-    return render(request, "add.html", context)
-
-
-def index(request):
-    return redirect("list_sessions_recent")

poetry.lock

@@ -98,17 +98,6 @@ editorconfig = ">=0.12.2"
 jsbeautifier = "*"
 six = ">=1.13.0"
 
-[[package]]
-name = "distlib"
-version = "0.3.7"
-description = "Distribution utilities"
-optional = false
-python-versions = "*"
-files = [
-    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
-    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
-]
-
 [[package]]
 name = "django"
 version = "4.2.7"
@@ -248,9 +237,7 @@ files = [
 ]
 
 [package.extras]
-docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.24)"]
-testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"]
-typing = ["typing-extensions (>=4.8)"]
+test = ["pytest (>=6)"]
 
 [[package]]
 name = "gunicorn"
@@ -361,20 +348,6 @@ files = [
 editorconfig = ">=0.12.2"
 six = ">=1.13.0"
 
-[[package]]
-name = "json5"
-version = "0.9.14"
-description = "A Python implementation of the JSON5 data format."
-optional = false
-python-versions = "*"
-files = [
-    {file = "json5-0.9.14-py2.py3-none-any.whl", hash = "sha256:740c7f1b9e584a468dbb2939d8d458db3427f2c93ae2139d05f47e453eae964f"},
-    {file = "json5-0.9.14.tar.gz", hash = "sha256:9ed66c3a6ca3510a976a9ef9b8c0787de24802724ab1860bc0153c7fdd589b02"},
-]
-
-[package.extras]
-dev = ["hypothesis"]
-
 [[package]]
 name = "markupsafe"
 version = "2.1.3"
@@ -505,23 +478,22 @@ files = [
 ]
 
 [[package]]
-name = "nodeenv"
-version = "1.8.0"
-description = "Node.js virtual environment builder"
+name = "packaging"
+version = "22.0"
+description = "Core utilities for Python packages"
+category = "dev"
 optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
+python-versions = ">=3.7"
 files = [
-    {file = "nodeenv-1.8.0-py2.py3-none-any.whl", hash = "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec"},
-    {file = "nodeenv-1.8.0.tar.gz", hash = "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2"},
+    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
+    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
 ]
 
-[package.dependencies]
-setuptools = "*"
-
 [[package]]
-name = "packaging"
-version = "23.2"
-description = "Core utilities for Python packages"
+name = "pathspec"
+version = "0.10.3"
+description = "Utility library for gitignore style pattern matching of file paths."
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -657,24 +629,6 @@ files = [
 dev = ["pre-commit", "tox"]
 testing = ["pytest", "pytest-benchmark"]
 
-[[package]]
-name = "pre-commit"
-version = "3.5.0"
-description = "A framework for managing and maintaining multi-language pre-commit hooks."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "pre_commit-3.5.0-py2.py3-none-any.whl", hash = "sha256:841dc9aef25daba9a0238cd27984041fa0467b4199fc4852e27950664919f660"},
-    {file = "pre_commit-3.5.0.tar.gz", hash = "sha256:5804465c675b659b0862f07907f96295d490822a450c4c40e747d0b1c6ebcb32"},
-]
-
-[package.dependencies]
-cfgv = ">=2.0.0"
-identify = ">=1.0.0"
-nodeenv = ">=0.11.1"
-pyyaml = ">=5.1"
-virtualenv = ">=20.10.0"
-
 [[package]]
 name = "pytest"
 version = "7.4.3"
@@ -693,7 +647,7 @@ packaging = "*"
 pluggy = ">=0.12,<2.0"
 
 [package.extras]
-testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
+testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"]
 
 [[package]]
 name = "pyyaml"
@@ -871,6 +825,7 @@ testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jar
 name = "six"
 version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 files = [