add backend functionality

add links to add a new X to: game, edition, purchase, session, device, platform
Properly display non-game type names
2024-09-03 15:30:51 +02:00 · 2024-09-03 15:27:04 +02:00 · 2024-09-02 23:52:28 +02:00 · 2024-09-02 23:44:18 +02:00 · 2024-09-02 20:14:52 +02:00 · 2024-09-02 20:04:21 +02:00
34 changed files with 798 additions and 295 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -15,4 +15,6 @@ repos:
  rev: v1.34.0
  hooks:
    - id: djlint-reformat-django
+      args: ["--ignore", "H011"]
    - id: djlint-django
+      args: ["--ignore", "H011"]
--- a/common/utils.py
+++ b/common/utils.py
@ -1,8 +1,9 @@
 from random import choices
 from string import ascii_lowercase
-from typing import Any
+from typing import Any, Callable

 from django.template.loader import render_to_string
+from django.urls import NoReverseMatch, reverse
 from django.utils.safestring import mark_safe


@ -17,16 +18,82 @@ def Popover(
    result = mark_safe(
        str(content)
        + render_to_string(
-            "components/popover.html",
+            "cotton/popover.html",
            {
                "id": id,
-                "children": popover_content,
+                "slot": popover_content,
            },
        )
    )
    return result


+HTMLAttribute = tuple[str, str]
+HTMLTag = str
+
+
+def Component(
+    attributes: list[HTMLAttribute] = [],
+    children: list[HTMLTag] | HTMLTag = [],
+    template: str = "",
+    tag_name: str = "",
+) -> HTMLTag:
+    if not tag_name and not template:
+        raise ValueError("One of template or tag_name is required.")
+    if isinstance(children, str):
+        children = [children]
+    childrenBlob = "\n".join(children)
+    attributesList = [f'{name} = "{value}"' for name, value in attributes]
+    attributesBlob = " ".join(attributesList)
+    tag: str = ""
+    if tag_name != "":
+        tag = f"<a {attributesBlob}>{childrenBlob}</a>"
+    elif template != "":
+        tag = render_to_string(
+            template,
+            {name: value for name, value in attributes} | {"slot": "\n".join(children)},
+        )
+    return mark_safe(tag)
+
+
+def A(
+    attributes: list[HTMLAttribute] = [],
+    children: list[HTMLTag] | HTMLTag = [],
+    url: str | Callable[..., Any] = "",
+):
+    """
+    Returns the HTML tag "a".
+    "url" can either be:
+        - URL (string)
+        - path name passed to reverse() (string)
+        - function
+    """
+    additional_attributes = []
+    if url:
+        if type(url) is str:
+            try:
+                url_result = reverse(url)
+            except NoReverseMatch:
+                url_result = url
+        elif callable(url):
+            url_result = url()
+        else:
+            raise TypeError("'url' is neither str nor function.")
+        additional_attributes = [("href", url_result)]
+    return Component(
+        tag_name="a", attributes=attributes + additional_attributes, children=children
+    )
+
+
+def Button(
+    attributes: list[HTMLAttribute] = [],
+    children: list[HTMLTag] | HTMLTag = [],
+):
+    return Component(
+        template="cotton/button.html", attributes=attributes, children=children
+    )
+
+
 def safe_division(numerator: int | float, denominator: int | float) -> int | float:
    """
    Divides without triggering division by zero exception.
--- a/games/static/base.css
+++ b/games/static/base.css
@ -1386,12 +1386,16 @@ input:checked + .toggle-bg {
  margin-bottom: 1rem;
 }

+.mb-6 {
+  margin-bottom: 1.5rem;
+}
+
 .mb-8 {
  margin-bottom: 2rem;
 }

-.ml-1 {
-  margin-left: 0.25rem;
+.me-2 {
+  margin-inline-end: 0.5rem;
 }

 .mr-4 {
@ -1402,6 +1406,10 @@ input:checked + .toggle-bg {
  margin-inline-start: 0px;
 }

+.ms-2 {
+  margin-inline-start: 0.5rem;
+}
+
 .ms-2\.5 {
  margin-inline-start: 0.625rem;
 }
@ -1463,10 +1471,6 @@ input:checked + .toggle-bg {
  height: 0.625rem;
 }

-.h-3 {
-  height: 0.75rem;
-}
-
 .h-4 {
  height: 1rem;
 }
@ -1527,10 +1531,6 @@ input:checked + .toggle-bg {
  width: 16rem;
 }

-.w-7 {
-  width: 1.75rem;
-}
-
 .w-full {
  width: 100%;
 }
@ -1689,12 +1689,6 @@ input:checked + .toggle-bg {
  margin-left: calc(-1px * calc(1 - var(--tw-space-x-reverse)));
 }

-.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)));
-}
-
 .space-x-2 > :not([hidden]) ~ :not([hidden]) {
  --tw-space-x-reverse: 0;
  margin-right: calc(0.5rem * var(--tw-space-x-reverse));
@ -1748,10 +1742,6 @@ input:checked + .toggle-bg {
  border-radius: 0.25rem;
 }

-.rounded-full {
-  border-radius: 9999px;
-}
-
 .rounded-lg {
  border-radius: 0.5rem;
 }
@ -1826,6 +1816,11 @@ input:checked + .toggle-bg {
  border-color: rgb(220 215 254 / var(--tw-border-opacity));
 }

+.bg-blue-100 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(225 239 254 / var(--tw-bg-opacity));
+}
+
 .bg-blue-700 {
  --tw-bg-opacity: 1;
  background-color: rgb(26 86 219 / var(--tw-bg-opacity));
@ -1865,11 +1860,6 @@ input:checked + .toggle-bg {
  background-color: rgb(5 122 85 / 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));
@ -1900,6 +1890,11 @@ input:checked + .toggle-bg {
  padding-right: 0.5rem;
 }

+.px-2\.5 {
+  padding-left: 0.625rem;
+  padding-right: 0.625rem;
+}
+
 .px-3 {
  padding-left: 0.75rem;
  padding-right: 0.75rem;
@ -1920,6 +1915,11 @@ input:checked + .toggle-bg {
  padding-right: 1.5rem;
 }

+.py-0\.5 {
+  padding-top: 0.125rem;
+  padding-bottom: 0.125rem;
+}
+
 .py-1 {
  padding-top: 0.25rem;
  padding-bottom: 0.25rem;
@ -1961,12 +1961,12 @@ input:checked + .toggle-bg {
  text-align: center;
 }

-.align-top {
-  vertical-align: top;
+.text-right {
+  text-align: right;
 }

-.font-condensed {
-  font-family: IBM Plex Sans Condensed, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+.align-top {
+  vertical-align: top;
 }

 .font-mono {
@ -2026,6 +2026,10 @@ input:checked + .toggle-bg {
  font-weight: 700;
 }

+.font-extrabold {
+  font-weight: 800;
+}
+
 .font-medium {
  font-weight: 500;
 }
@ -2050,15 +2054,28 @@ input:checked + .toggle-bg {
  line-height: 2.25rem;
 }

+.leading-none {
+  line-height: 1;
+}
+
 .leading-tight {
  line-height: 1.25;
 }

+.tracking-tight {
+  letter-spacing: -0.025em;
+}
+
 .text-blue-600 {
  --tw-text-opacity: 1;
  color: rgb(28 100 242 / var(--tw-text-opacity));
 }

+.text-blue-800 {
+  --tw-text-opacity: 1;
+  color: rgb(30 66 159 / var(--tw-text-opacity));
+}
+
 .text-gray-300 {
  --tw-text-opacity: 1;
  color: rgb(209 213 219 / var(--tw-text-opacity));
@ -2521,11 +2538,6 @@ textarea:disabled:is(.dark *) {
  background-color: rgb(240 82 82 / var(--tw-bg-opacity));
 }

-.hover\:bg-violet-700:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(109 40 217 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-white:hover {
  --tw-bg-opacity: 1;
  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@ -2612,11 +2624,6 @@ textarea:disabled:is(.dark *) {
  --tw-ring-color: rgb(4 108 78 / 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;
 }
@ -2625,10 +2632,6 @@ textarea:disabled:is(.dark *) {
  --tw-ring-offset-color: #C3DDFD;
 }

-.focus\:ring-offset-violet-200:focus {
-  --tw-ring-offset-color: #ddd6fe;
-}
-
 .group:hover .group-hover\:absolute {
  position: absolute;
 }
@ -2718,6 +2721,11 @@ textarea:disabled:is(.dark *) {
  border-color: transparent;
 }

+.dark\:bg-blue-200:is(.dark *) {
+  --tw-bg-opacity: 1;
+  background-color: rgb(195 221 253 / var(--tw-bg-opacity));
+}
+
 .dark\:bg-blue-600:is(.dark *) {
  --tw-bg-opacity: 1;
  background-color: rgb(28 100 242 / var(--tw-bg-opacity));
@ -2761,6 +2769,11 @@ textarea:disabled:is(.dark *) {
  color: rgb(63 131 248 / var(--tw-text-opacity));
 }

+.dark\:text-blue-800:is(.dark *) {
+  --tw-text-opacity: 1;
+  color: rgb(30 66 159 / var(--tw-text-opacity));
+}
+
 .dark\:text-gray-200:is(.dark *) {
  --tw-text-opacity: 1;
  color: rgb(229 231 235 / var(--tw-text-opacity));
@ -2786,11 +2799,6 @@ textarea:disabled:is(.dark *) {
  color: rgb(148 163 184 / var(--tw-text-opacity));
 }

-.dark\:text-slate-500:is(.dark *) {
-  --tw-text-opacity: 1;
-  color: rgb(100 116 139 / var(--tw-text-opacity));
-}
-
 .dark\:text-slate-600:is(.dark *) {
  --tw-text-opacity: 1;
  color: rgb(71 85 105 / var(--tw-text-opacity));
@ -2876,6 +2884,11 @@ textarea:disabled:is(.dark *) {
  --tw-ring-color: rgb(63 131 248 / var(--tw-ring-opacity));
 }

+.dark\:focus\:ring-blue-800:focus:is(.dark *) {
+  --tw-ring-opacity: 1;
+  --tw-ring-color: rgb(30 66 159 / var(--tw-ring-opacity));
+}
+
 .dark\:focus\:ring-gray-600:focus:is(.dark *) {
  --tw-ring-opacity: 1;
  --tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity));
@ -2887,10 +2900,6 @@ textarea:disabled:is(.dark *) {
 }

@media (min-width: 640px) {
-  .sm\:inline {
-    display: inline;
-  }
-
  .sm\:table-cell {
    display: table-cell;
  }
@ -2916,22 +2925,6 @@ textarea:disabled:is(.dark *) {
    padding-right: 1rem;
  }

-  .sm\:pl-12 {
-    padding-left: 3rem;
-  }
-
-  .sm\:pl-2 {
-    padding-left: 0.5rem;
-  }
-
-  .sm\:pl-4 {
-    padding-left: 1rem;
-  }
-
-  .sm\:pl-6 {
-    padding-left: 1.5rem;
-  }
-
  .sm\:decoration-2 {
    text-decoration-thickness: 2px;
  }
@ -3055,6 +3048,12 @@ textarea:disabled:is(.dark *) {
  }
 }

+@media (min-width: 1280px) {
+  .xl\:max-w-screen-xl {
+    max-width: 1280px;
+  }
+}
+
@media (min-width: 1536px) {
  .\32xl\:max-w-screen-2xl {
    max-width: 1536px;
@ -3070,6 +3069,10 @@ textarea:disabled:is(.dark *) {
  --tw-space-x-reverse: 1;
 }

+.rtl\:text-left:where([dir="rtl"], [dir="rtl"] *) {
+  text-align: left;
+}
+
 .rtl\:text-right:where([dir="rtl"], [dir="rtl"] *) {
  text-align: right;
 }
@ -3083,3 +3086,15 @@ textarea:disabled:is(.dark *) {
  border-start-end-radius: 0.5rem;
  border-end-end-radius: 0.5rem;
 }
+
+.\[\&_a\]\:underline a {
+  text-decoration-line: underline;
+}
+
+.\[\&_a\]\:decoration-2 a {
+  text-decoration-thickness: 2px;
+}
+
+.\[\&_a\]\:underline-offset-4 a {
+  text-underline-offset: 4px;
+}
--- a/games/templates/components.yml
+++ b/games/templates/components.yml
@ -1,9 +0,0 @@
-components:
-  gamelink: "components/game_link.html"
-  popover: "components/popover.html"
-  table: "components/table.html"
-  table_row: "components/table_row.html"
-  table_td: "components/table_td.html"
-  simple_table: "components/simple_table.html"
-  button_group_sm: "components/button_group_sm.html"
-  button_group_button_sm: "components/button_group_button_sm.html"
--- a/games/templates/components/button_group_sm.html
+++ b/games/templates/components/button_group_sm.html
@ -1,5 +0,0 @@
-<div class="inline-flex rounded-md shadow-sm" role="group">
-    {% for button in buttons %}
-        {% button_group_button_sm href=button.href text=button.text color=button.color %}
-    {% endfor %}
-</div>
--- a/games/templates/components/edit_button.html
+++ b/games/templates/components/edit_button.html
@ -1,13 +0,0 @@
-<a href="{{ edit_url }}">
-    <button type="button"
-            title="Edit"
-            class="ml-1 py-1 px-2 flex justify-center items-center bg-violet-600 hover:bg-violet-700 focus:ring-violet-500 focus:ring-offset-violet-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 w-7 h-4 rounded-lg">
-        <svg xmlns="http://www.w3.org/2000/svg"
-             viewBox="0 0 20 20"
-             fill="currentColor"
-             class="w-5 h-5">
-            <path d="M5.433 13.917l1.262-3.155A4 4 0 017.58 9.42l6.92-6.918a2.121 2.121 0 013 3l-6.92 6.918c-.383.383-.84.685-1.343.886l-3.154 1.262a.5.5 0 01-.65-.65z" />
-            <path d="M3.5 5.75c0-.69.56-1.25 1.25-1.25H10A.75.75 0 0010 3H4.75A2.75 2.75 0 002 5.75v9.5A2.75 2.75 0 004.75 18h9.5A2.75 2.75 0 0017 15.25V10a.75.75 0 00-1.5 0v5.25c0 .69-.56 1.25-1.25 1.25h-9.5c-.69 0-1.25-.56-1.25-1.25v-9.5z" />
-        </svg>
-    </button>
-</a>
--- a/games/templates/components/table_row.html
+++ b/games/templates/components/table_row.html
@ -1,15 +0,0 @@
-{% fragment as default_content %}
-{% for td in data %}
-    {% if forloop.first %}
-        <th scope="row"
-            class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">{{ td }}</th>
-    {% else %}
-        {% #table_td %}
-        {{ td }}
-        {% /table_td %}
-    {% endif %}
-{% endfor %}
-{% endfragment %}
-<tr class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 border-b">
-    {{ children|default:default_content }}
-</tr>
--- a/games/templates/components/table_td.html
+++ b/games/templates/components/table_td.html
@ -1 +0,0 @@
-<td class="px-6 py-4 min-w-20-char max-w-20-char">{{ children }}</td>
--- a/games/templates/cotton/button.html
+++ b/games/templates/cotton/button.html
@ -0,0 +1,5 @@
+<button type="button"
+        class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2 mt-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
+    {{ text }}
+    {{ slot }}
+</button>
--- a/games/templates/components/button_group_button_sm.html
+++ b/games/templates/components/button_group_button_sm.html
@ -1,4 +1,4 @@
-{% var color=color|default:"gray" %}
+<c-vars color="gray" />
 <a href="{{ href }}"
   class="[&:first-of-type_button]:rounded-s-lg [&:last-of-type_button]:rounded-e-lg">
    {% if color == "gray" %}
--- a/games/templates/cotton/button_group_sm.html
+++ b/games/templates/cotton/button_group_sm.html
@ -0,0 +1,6 @@
+<c-vars color="gray" />
+<div class="inline-flex rounded-md shadow-sm" role="group">
+    {% for button in buttons %}
+        <c-button-group-button-sm :href=button.href :text=button.text :color=button.color />
+    {% endfor %}
+</div>
--- a/games/templates/cotton/button_old.html
+++ b/games/templates/cotton/button_old.html
--- a/games/templates/components/button_start.html
+++ b/games/templates/components/button_start.html
--- a/games/templates/components/game_link.html
+++ b/games/templates/components/game_link.html
@ -1,8 +1,8 @@
 <span class="truncate-container">
    <a class="underline decoration-slate-500 sm:decoration-2"
       href="{% url 'view_game' game_id %}">
-        {% if children %}
-            {{ children }}
+        {% if slot %}
+            {{ slot }}
        {% else %}
            {{ name }}
        {% endif %}
--- a/games/templates/cotton/h1.html
+++ b/games/templates/cotton/h1.html
@ -0,0 +1,8 @@
+<h1 class="{% if badge %}flex items-center {% endif %}mb-4 text-3xl font-extrabold leading-none tracking-tight text-gray-900 dark:text-white">
+    {{ slot }}
+    {% if badge %}
+        <span class="bg-blue-100 text-blue-800 text-2xl font-semibold me-2 px-2.5 py-0.5 rounded dark:bg-blue-200 dark:text-blue-800 ms-2">
+            {{ badge }}
+        </span>
+    {% endif %}
+</h1>
--- a/games/templates/components/popover.html
+++ b/games/templates/components/popover.html
@ -2,6 +2,6 @@
     id="{{ id }}"
     role="tooltip"
     class="absolute z-10 invisible inline-block text-sm text-white transition-opacity duration-300 bg-white border border-purple-200 rounded-lg shadow-sm opacity-0 dark:text-white dark:border-purple-600 dark:bg-purple-800">
-    <div class="px-3 py-2">{{ children }}</div>
+    <div class="px-3 py-2">{{ slot }}</div>
    <div data-popper-arrow></div>
 </div>
--- a/games/templates/components/simple_table.html
+++ b/games/templates/components/simple_table.html
@ -1,26 +1,30 @@
+{% load param_utils %}
 <div class="shadow-md sm:rounded-lg" hx-boost="false">
-    <div class="relative overflow-x-auto">
+    <div class="relative overflow-x-auto sm:rounded-lg">
        <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
+            {% if header_action %}
+                <c-table-header>
+                {{ header_action }}
+                </c-table-header>
+            {% endif %}
            <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
                <tr>
                    {% for column in columns %}<th scope="col" class="px-6 py-3">{{ column }}</th>{% endfor %}
                </tr>
            </thead>
            <tbody>
-                {% for row in rows %}
-                    {% table_row data=row %}
-                {% endfor %}
+                {% for row in rows %}<c-table-row :data=row />{% endfor %}
            </tbody>
        </table>
    </div>
-    {% if page_obj %}
+    {% if page_obj and elided_page_range %}
        <nav class="flex items-center flex-column md:flex-row justify-between px-6 py-4"
             aria-label="Table navigation">
            <span class="text-sm font-normal text-gray-500 dark:text-gray-400 mb-4 md:mb-0 block w-full md:inline md:w-auto">Showing <span class="font-semibold text-gray-900 dark:text-white">{{ page_obj.start_index }}</span>—<span class="font-semibold text-gray-900 dark:text-white">{{ page_obj.end_index }}</span> of <span class="font-semibold text-gray-900 dark:text-white">{{ page_obj.paginator.count }}</span></span>
            <ul class="inline-flex -space-x-px rtl:space-x-reverse text-sm h-8">
                <li>
                    {% if page_obj.has_previous %}
-                        <a href="?page={{ page_obj.previous_page_number }}"
+                        <a href="?{% param_replace page=page_obj.previous_page_number %}"
                           class="flex items-center justify-center px-3 h-8 ms-0 leading-tight text-gray-500 bg-white border border-gray-300 rounded-s-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">Previous</a>
                    {% else %}
                        <a aria-current="page"
@ -29,7 +33,7 @@
                    {% for page in elided_page_range %}
                        <li>
                            {% if page != page_obj.number %}
-                                <a href="?page={{ page }}"
+                                <a href="?{% param_replace page=page %}"
                                   class="flex items-center justify-center px-3 h-8 leading-tight text-gray-500 bg-white border border-gray-300 hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">{{ page }}</a>
                            {% else %}
                                <a aria-current="page"
@ -38,7 +42,7 @@
                        </li>
                    {% endfor %}
                    {% if page_obj.has_next %}
-                        <a href="?page={{ page_obj.next_page_number }}"
+                        <a href="?{% param_replace page=page_obj.next_page_number %}"
                           class="flex items-center justify-center px-3 h-8 leading-tight text-gray-500 bg-white border border-gray-300 rounded-e-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">Next</a>
                    {% else %}
                        <a aria-current="page"
--- a/games/templates/components/table.html
+++ b/games/templates/components/table.html
@ -6,7 +6,7 @@
            </tr>
        </thead>
        <tbody>
-            {{ children }}
+            {{ slot }}
        </tbody>
    </table>
 </div>
--- a/games/templates/cotton/table_header.html
+++ b/games/templates/cotton/table_header.html
@ -0,0 +1,3 @@
+<caption class="p-2 text-lg font-semibold rtl:text-left text-right text-gray-900 bg-white dark:text-white dark:bg-gray-900">
+    {{ slot }}
+</caption>
--- a/games/templates/cotton/table_row.html
+++ b/games/templates/cotton/table_row.html
@ -0,0 +1,16 @@
+<tr class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 border-b [&_a]:underline [&_a]:underline-offset-4 [&_a]:decoration-2">
+    {% if slot %}
+        {{ slot }}
+    {% else %}
+        {% for td in data %}
+            {% if forloop.first %}
+                <th scope="row"
+                    class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">{{ td }}</th>
+            {% else %}
+                <c-table-td>
+                {{ td }}
+                </c-table-td>
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+</tr>
--- a/games/templates/cotton/table_td.html
+++ b/games/templates/cotton/table_td.html
@ -0,0 +1 @@
+<td class="px-6 py-4 min-w-20-char max-w-20-char">{{ slot }}</td>
--- a/games/templates/list_purchases.html
+++ b/games/templates/list_purchases.html
@ -4,7 +4,7 @@
    {{ title }}
 {% endblock title %}
 {% block content %}
-    <div class="2xl:max-w-screen-2xl md:max-w-screen-md sm:max-w-screen-sm self-center">
-        {% simple_table columns=data.columns rows=data.rows page_obj=page_obj elided_page_range=elided_page_range %}
+    <div class="2xl:max-w-screen-2xl xl:max-w-screen-xl md:max-w-screen-md sm:max-w-screen-sm self-center">
+        <c-simple-table :columns=data.columns :rows=data.rows :page_obj=page_obj :elided_page_range=elided_page_range />
    </div>
 {% endblock content %}
--- a/games/templates/stats.html
+++ b/games/templates/stats.html
@ -5,11 +5,11 @@
 {% load static %}
 {% partialdef purchase-name %}
 {% if purchase.type != 'game' %}
-    {% #gamelink game_id=purchase.edition.game.id %}
+    <c-gamelink :game_id=purchase.edition.game.id>
    {{ purchase.name }} ({{ purchase.edition.name }} {{ purchase.get_type_display }})
-    {% /gamelink %}
+    </c-gamelink>
 {% else %}
-    {% gamelink game_id=purchase.edition.game.id name=purchase.edition.name %}
+    <c-gamelink :game_id=purchase.edition.game.id name=purchase.edition.name />
 {% endif %}
 {% endpartialdef %}
 {% block content %}
@ -65,31 +65,31 @@
                <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 %})
+                        {{ longest_session_time }} (<c-gamelink :game_id=longest_session_game.id :name=longest_session_game.name />)
                    </td>
                </tr>
                <tr>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Most sessions</td>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ highest_session_count }} ({% gamelink game_id=highest_session_count_game.id name=highest_session_count_game.name %})
+                        {{ highest_session_count }} (<c-gamelink :game_id=highest_session_count_game.id :name=highest_session_count_game.name />)
                    </td>
                </tr>
                <tr>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Highest session average</td>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ highest_session_average }} ({% gamelink game_id=highest_session_average_game.id name=highest_session_average_game.name %})
+                        {{ highest_session_average }} (<c-gamelink :game_id=highest_session_average_game.id :name=highest_session_average_game.name />)
                    </td>
                </tr>
                <tr>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2">First play</td>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {% gamelink game_id=first_play_game.id name=first_play_game.name %} ({{ first_play_date }})
+                        <c-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 }})
+                        <c-gamelink :game_id=last_play_game.id :name=last_play_game.name /> ({{ last_play_date }})
                    </td>
                </tr>
            </tbody>
@ -151,7 +151,9 @@
            <tbody>
                {% for game in top_10_games_by_playtime %}
                    <tr>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{% gamelink game_id=game.id name=game.name %}</td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                            <c-gamelink :game_id=game.id :name=game.name />
+                        </td>
                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
                    </tr>
                {% endfor %}
--- a/games/templates/view_game.html
+++ b/games/templates/view_game.html
@ -10,9 +10,9 @@
            <div class="flex gap-5 mb-3">
                <span class="text-wrap max-w-80 text-4xl">
                    <span class="font-bold font-serif">{{ game.name }}</span>&nbsp;<span data-popover-target="popover-year" class="text-slate-500 text-2xl">{{ game.year_released }}</span>
-                    {% #popover id="popover-year" %}
+                    <c-popover id="popover-year">
                    Original release year
-                    {% /popover %}
+                    </c-popover>
                </span>
            </div>
            <div class="flex gap-4 dark:text-slate-400 mb-3">
@ -26,9 +26,9 @@
                        <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
                    </svg>
                    {{ hours_sum }}
-                    {% #popover id="popover-hours" %}
+                    <c-popover id="popover-hours">
                    Total hours played
-                    {% /popover %}
+                    </c-popover>
                </span>
                <span data-popover-target="popover-sessions"
                      class="flex gap-2 items-center">
@ -41,9 +41,9 @@
                        <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 8.25h15m-16.5 7.5h15m-1.8-13.5-3.9 19.5m-2.1-19.5-3.9 19.5" />
                    </svg>
                    {{ session_count }}
-                    {% #popover id="popover-sessions" %}
+                    <c-popover id="popover-sessions">
                    Number of sessions
-                    {% /popover %}
+                    </c-popover>
                </span>
                <span data-popover-target="popover-average" class="flex gap-2 items-center">
                    <svg xmlns="http://www.w3.org/2000/svg"
@ -55,9 +55,9 @@
                        <path stroke-linecap="round" stroke-linejoin="round" d="M7.5 14.25v2.25m3-4.5v4.5m3-6.75v6.75m3-9v9M6 20.25h12A2.25 2.25 0 0 0 20.25 18V6A2.25 2.25 0 0 0 18 3.75H6A2.25 2.25 0 0 0 3.75 6v12A2.25 2.25 0 0 0 6 20.25Z" />
                    </svg>
                    {{ session_average_without_manual }}
-                    {% #popover id="popover-average" %}
+                    <c-popover id="popover-average">
                    Average playtime per session
-                    {% /popover %}
+                    </c-popover>
                </span>
                <span data-popover-target="popover-playrange"
                      class="flex gap-2 items-center">
@ -70,9 +70,9 @@
                        <path stroke-linecap="round" stroke-linejoin="round" d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 0 1 2.25-2.25h13.5A2.25 2.25 0 0 1 21 7.5v11.25m-18 0A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75m-18 0v-7.5A2.25 2.25 0 0 1 5.25 9h13.5A2.25 2.25 0 0 1 21 11.25v7.5m-9-6h.008v.008H12v-.008ZM12 15h.008v.008H12V15Zm0 2.25h.008v.008H12v-.008ZM9.75 15h.008v.008H9.75V15Zm0 2.25h.008v.008H9.75v-.008ZM7.5 15h.008v.008H7.5V15Zm0 2.25h.008v.008H7.5v-.008Zm6.75-4.5h.008v.008h-.008v-.008Zm0 2.25h.008v.008h-.008V15Zm0 2.25h.008v.008h-.008v-.008Zm2.25-4.5h.008v.008H16.5v-.008Zm0 2.25h.008v.008H16.5V15Z" />
                    </svg>
                    {{ playrange }}
-                    {% #popover id="popover-playrange" %}
+                    <c-popover id="popover-playrange">
                    Earliest and latest dates played
-                    {% /popover %}
+                    </c-popover>
                </span>
            </div>
            <div class="inline-flex rounded-md shadow-sm mb-3" role="group">
@ -90,102 +90,22 @@
                </a>
            </div>
        </div>
-        <h1 class="text-3xl mt-4 mb-1 font-condensed">
-            Editions <span class="dark:text-slate-500">({{ edition_count }})</span> and Purchases <span class="dark:text-slate-500">({{ purchase_count }})</span>
-        </h1>
-        <ul>
-            {% for edition in editions %}
-                <li class="sm:pl-2 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"
-                                     width="48"
-                                     height="48"
-                                     alt="Wikidata Icon"
-                                     src="{% static 'icons/wikidata.png' %}" />
-                            </a>
-                        </span>
-                    {% endif %}
-                    {% url 'edit_edition' edition.id as edit_url %}
-                    {% include "components/edit_button.html" with edit_url=edit_url %}
-                </li>
-                <ul>
-                    {% for purchase in edition.game_purchases %}
-                        <li class="sm:pl-6 flex items-center {% if purchase.date_refunded %}text-red-600{% endif %}">
-                            {{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}
-                            {% if purchase.price != 0 %}({{ purchase.price }} {{ purchase.price_currency }}){% endif %}
-                            {% url 'edit_purchase' purchase.id as edit_url %}
-                            {% include "components/edit_button.html" with edit_url=edit_url %}
-                        </li>
-                        <ul>
-                            {% for related_purchase in purchase.nongame_related_purchases %}
-                                <li class="sm:pl-12 flex items-center">
-                                    {{ related_purchase.name }} ({{ related_purchase.get_type_display }}, {{ purchase.platform }}, {{ related_purchase.date_purchased | date:"Y" }}, {{ related_purchase.price }} {{ related_purchase.price_currency }})
-                                    {% url 'edit_purchase' related_purchase.id as edit_url %}
-                                    {% include "components/edit_button.html" with edit_url=edit_url %}
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    {% endfor %}
-                </ul>
-            {% endfor %}
-        </ul>
-        <h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center font-condensed">
-            Sessions
-            <span class="dark:text-slate-500" id="session-count">({{ session_count }})</span>
-            {% if latest_session_id %}
-                {% url 'view_game_start_session_from_session' latest_session_id as add_session_link %}
-                <a class="truncate max-w-xs py-1 px-2 text-xs bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-sm"
-                   title="Start new session"
-                   href="{{ add_session_link }}"
-                   hx-get="{{ add_session_link }}"
-                   hx-vals="js:{session_count:getSessionCount()}"
-                   hx-target="#session-list"
-                   hx-swap="afterbegin">New</a>
-            {% endif %}
-            and Notes <span class="dark:text-slate-500">({{ sessions_with_notes_count }})</span>
-        </h1>
-        <ul id="session-list">
-            {% for session in sessions %}
-                {% partialdef session-info inline=True %}
-                <li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center space-x-1">
-                    {{ session.timestamp_start | date:"d/m/Y H:i" }}
-                    {% if session.timestamp_end %}-{{ session.timestamp_end | date:"H:i" }}{% endif %}
-                    ({{ session.device.get_type_display | default:"Unknown" }}, {{ session.duration_formatted }})
-                    {% url 'edit_session' session.id as edit_url %}
-                    {% include "components/edit_button.html" with edit_url=edit_url %}
-                    {% if not session.timestamp_end %}
-                        {% url 'view_game_end_session' session.id as end_session_url %}
-                        <a class="flex bg-green-600 rounded-full px-2 w-7 h-4 text-white justify-center items-center"
-                           href="{{ end_session_url }}"
-                           hx-get="{{ end_session_url }}"
-                           hx-target="closest li"
-                           hx-swap="outerHTML"
-                           hx-vals="js:{session_count:getSessionCount()}"
-                           hx-indicator="#indicator">
-                            <svg xmlns="http://www.w3.org/2000/svg"
-                                 fill="#ffffff"
-                                 class="h-3"
-                                 x="0px"
-                                 y="0px"
-                                 viewBox="0 0 24 24">
-                                <path d="M 12 2 C 6.486 2 2 6.486 2 12 C 2 17.514 6.486 22 12 22 C 17.514 22 22 17.514 22 12 C 22 10.874 21.803984 9.7942031 21.458984 8.7832031 L 19.839844 10.402344 C 19.944844 10.918344 20 11.453 20 12 C 20 16.411 16.411 20 12 20 C 7.589 20 4 16.411 4 12 C 4 7.589 7.589 4 12 4 C 13.633 4 15.151922 4.4938906 16.419922 5.3378906 L 17.851562 3.90625 C 16.203562 2.71225 14.185 2 12 2 z M 21.292969 3.2929688 L 11 13.585938 L 7.7070312 10.292969 L 6.2929688 11.707031 L 11 16.414062 L 22.707031 4.7070312 L 21.292969 3.2929688 z">
-                                </path>
-                            </svg>
-                        </a>
-                    {% endif %}
-                </li>
-                <li class="sm:pl-4 markdown-content">{{ session.note|markdown }}</li>
-                <div class="hidden" hx-swap-oob="innerHTML:#session-count">({{ session_count }})</div>
-            {% endpartialdef %}
-        {% endfor %}
-    </ul>
-</div>
-<script>
+        <c-h1 :badge=edition_count>Editions</c-h1>
+        <div class="mb-6">
+            <c-simple-table :rows=edition_data.rows :columns=edition_data.columns />
+        </div>
+        <div class="mb-6">
+            <c-h1 :badge=purchase_count>Purchases</c-h1>
+            <c-simple-table :rows=purchase_data.rows :columns=purchase_data.columns />
+        </div>
+        <div class="mb-6">
+            <c-h1 :badge=session_count>Sessions</c-h1>
+            <c-simple-table :rows=session_data.rows :columns=session_data.columns :page_obj=session_page_obj :elided_page_range=session_elided_page_range />
+        </div>
+    </div>
+    <script>
        function getSessionCount() {
            return document.getElementById('session-count').textContent.match("[0-9]+");
        }
-</script>
+    </script>
 {% endblock content %}
--- a/games/templatetags/param_utils.py
+++ b/games/templatetags/param_utils.py
@ -0,0 +1,18 @@
+from typing import Any
+
+from django import template
+from django.http import QueryDict
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def param_replace(context: dict[Any, Any], **kwargs):
+    """
+    Return encoded URL parameters that are the same as the current
+    request's parameters, only with the specified GET parameters added or changed.
+    """
+    d: QueryDict = context["request"].GET.copy()
+    for k, v in kwargs.items():
+        d[k] = v
+    return d.urlencode()
--- a/games/views/device.py
+++ b/games/views/device.py
@ -7,6 +7,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
 from django.urls import reverse

+from common.utils import A, Button
 from games.forms import DeviceForm
 from games.models import Device
 from games.views.general import dateformat
@ -35,6 +36,7 @@ def list_devices(request: HttpRequest) -> HttpResponse:
            else None
        ),
        "data": {
+            "header_action": A([], Button([], "Add device"), url="add_device"),
            "columns": [
                "Name",
                "Type",
@ -47,12 +49,13 @@ def list_devices(request: HttpRequest) -> HttpResponse:
                    device.get_type_display(),
                    device.created_at.strftime(dateformat),
                    render_to_string(
-                        "components/button_group_sm.html",
+                        "cotton/button_group_sm.html",
                        {
                            "buttons": [
                                {
                                    "href": reverse("edit_device", args=[device.pk]),
                                    "text": "Edit",
+                                    "color": "gray",
                                },
                                {
                                    "href": reverse("delete_device", args=[device.pk]),
--- a/games/views/edition.py
+++ b/games/views/edition.py
@ -7,7 +7,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
 from django.urls import reverse

-from common.utils import truncate_with_popover
+from common.utils import A, Button, truncate_with_popover
 from games.forms import EditionForm
 from games.models import Edition, Game
 from games.views.general import dateformat
@ -36,6 +36,7 @@ def list_editions(request: HttpRequest) -> HttpResponse:
            else None
        ),
        "data": {
+            "header_action": A([], Button([], "Add edition"), url="add_edition"),
            "columns": [
                "Game",
                "Name",
@ -48,7 +49,18 @@ def list_editions(request: HttpRequest) -> HttpResponse:
            ],
            "rows": [
                [
-                    truncate_with_popover(edition.game.name),
+                    A(
+                        [
+                            (
+                                "href",
+                                reverse(
+                                    "view_game",
+                                    args=[edition.game.pk],
+                                ),
+                            )
+                        ],
+                        truncate_with_popover(edition.game.name),
+                    ),
                    truncate_with_popover(
                        edition.name
                        if edition.game.name != edition.name
@ -65,12 +77,13 @@ def list_editions(request: HttpRequest) -> HttpResponse:
                    edition.wikidata,
                    edition.created_at.strftime(dateformat),
                    render_to_string(
-                        "components/button_group_sm.html",
+                        "cotton/button_group_sm.html",
                        {
                            "buttons": [
                                {
                                    "href": reverse("edit_edition", args=[edition.pk]),
                                    "text": "Edit",
+                                    "color": "gray",
                                },
                                {
                                    "href": reverse(
--- a/games/views/game.py
+++ b/games/views/game.py
@ -2,16 +2,24 @@ from typing import Any

 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
+from django.db.models import Prefetch
 from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
 from django.urls import reverse

 from common.time import format_duration
-from common.utils import safe_division, safe_getattr, truncate_with_popover
+from common.utils import A, Button, safe_division, truncate_with_popover
 from games.forms import GameForm
-from games.models import Game, Purchase, Session
-from games.views.general import dateformat, use_custom_redirect
+from games.models import Edition, Game, Purchase, Session
+from games.views.general import (
+    dateformat,
+    datetimeformat,
+    durationformat,
+    durationformat_manual,
+    timeformat,
+    use_custom_redirect,
+)


@login_required
@ -37,6 +45,7 @@ def list_games(request: HttpRequest) -> HttpResponse:
            else None
        ),
        "data": {
+            "header_action": A([], Button([], "Add game"), url="add_game"),
            "columns": [
                "Name",
                "Sort Name",
@ -47,7 +56,18 @@ def list_games(request: HttpRequest) -> HttpResponse:
            ],
            "rows": [
                [
-                    truncate_with_popover(game.name),
+                    A(
+                        [
+                            (
+                                "href",
+                                reverse(
+                                    "view_game",
+                                    args=[game.pk],
+                                ),
+                            )
+                        ],
+                        truncate_with_popover(game.name),
+                    ),
                    truncate_with_popover(
                        game.sort_name
                        if game.sort_name is not None and game.name != game.sort_name
@ -57,12 +77,13 @@ def list_games(request: HttpRequest) -> HttpResponse:
                    game.wikidata,
                    game.created_at.strftime(dateformat),
                    render_to_string(
-                        "components/button_group_sm.html",
+                        "cotton/button_group_sm.html",
                        {
                            "buttons": [
                                {
                                    "href": reverse("edit_game", args=[game.pk]),
                                    "text": "Edit",
+                                    "color": "gray",
                                },
                                {
                                    "href": reverse("delete_game", args=[game.pk]),
@ -143,6 +164,8 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
        .order_by("year_released")
    )

+    purchases = Purchase.objects.filter(edition__game=game).order_by("date_purchased")
+
    sessions = Session.objects.prefetch_related("device").filter(
        purchase__edition__game=game
    )
@ -169,7 +192,117 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
    total_hours_without_manual = float(
        format_duration(sessions.calculated_duration_unformatted(), "%2.1H")
    )
-    context = {
+
+    edition_data: dict[str, Any] = {
+        "columns": [
+            "Name",
+            "Platform",
+            "Year Released",
+            "Actions",
+        ],
+        "rows": [
+            [
+                edition.name,
+                edition.platform,
+                edition.year_released,
+                render_to_string(
+                    "cotton/button_group_sm.html",
+                    {
+                        "buttons": [
+                            {
+                                "href": reverse("edit_edition", args=[edition.pk]),
+                                "text": "Edit",
+                                "color": "gray",
+                            },
+                            {
+                                "href": reverse("delete_edition", args=[edition.pk]),
+                                "text": "Delete",
+                                "color": "red",
+                            },
+                        ]
+                    },
+                ),
+            ]
+            for edition in editions
+        ],
+    }
+
+    purchase_data: dict[str, Any] = {
+        "columns": ["Name", "Type", "Price", "Actions"],
+        "rows": [
+            [
+                purchase.name if purchase.name else purchase.edition.name,
+                purchase.get_type_display(),
+                f"{purchase.price} {purchase.price_currency}",
+                render_to_string(
+                    "cotton/button_group_sm.html",
+                    {
+                        "buttons": [
+                            {
+                                "href": reverse("edit_purchase", args=[purchase.pk]),
+                                "text": "Edit",
+                                "color": "gray",
+                            },
+                            {
+                                "href": reverse("delete_purchase", args=[purchase.pk]),
+                                "text": "Delete",
+                                "color": "red",
+                            },
+                        ]
+                    },
+                ),
+            ]
+            for purchase in purchases
+        ],
+    }
+
+    sessions_all = Session.objects.filter(purchase__edition__game=game).order_by(
+        "-timestamp_start"
+    )
+    session_count = sessions_all.count()
+    session_paginator = Paginator(sessions_all, 5)
+    page_number = request.GET.get("page", 1)
+    session_page_obj = session_paginator.get_page(page_number)
+    sessions = session_page_obj.object_list
+
+    session_data: dict[str, Any] = {
+        "columns": ["Date", "Duration", "Duration (manual)", "Actions"],
+        "rows": [
+            [
+                f"{session.timestamp_start.strftime(datetimeformat)}{f" — {session.timestamp_end.strftime(timeformat)}" if session.timestamp_end else ""}",
+                (
+                    format_duration(session.duration_calculated, durationformat)
+                    if session.duration_calculated
+                    else "-"
+                ),
+                (
+                    format_duration(session.duration_manual, durationformat_manual)
+                    if session.duration_manual
+                    else "-"
+                ),
+                render_to_string(
+                    "cotton/button_group_sm.html",
+                    {
+                        "buttons": [
+                            {
+                                "href": reverse("edit_session", args=[session.pk]),
+                                "text": "Edit",
+                                "color": "gray",
+                            },
+                            {
+                                "href": reverse("delete_session", args=[session.pk]),
+                                "text": "Delete",
+                                "color": "red",
+                            },
+                        ]
+                    },
+                ),
+            ]
+            for session in sessions
+        ],
+    }
+
+    context: dict[str, Any] = {
        "edition_count": editions.count(),
        "editions": editions,
        "game": game,
@ -182,11 +315,20 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
            1,
        ),
        "session_count": session_count,
-        "sessions_with_notes_count": sessions.exclude(note="").count(),
-        "sessions": sessions.order_by("-timestamp_start"),
+        "sessions": sessions,
        "title": f"Game Overview - {game.name}",
        "hours_sum": total_hours,
-        "latest_session_id": safe_getattr(latest_session, "pk"),
+        "edition_data": edition_data,
+        "purchase_data": purchase_data,
+        "session_data": session_data,
+        "session_page_obj": session_page_obj,
+        "session_elided_page_range": (
+            session_page_obj.paginator.get_elided_page_range(
+                page_number, on_each_side=1, on_ends=1
+            )
+            if session_page_obj and session_count > 5
+            else None
+        ),
    }

    request.session["return_path"] = request.path
--- a/games/views/platform.py
+++ b/games/views/platform.py
@ -7,6 +7,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
 from django.urls import reverse

+from common.utils import A, Button
 from games.forms import PlatformForm
 from games.models import Platform
 from games.views.general import dateformat, use_custom_redirect
@ -35,6 +36,7 @@ def list_platforms(request: HttpRequest) -> HttpResponse:
            else None
        ),
        "data": {
+            "header_action": A([], Button([], "Add platform"), url="add_platform"),
            "columns": [
                "Name",
                "Group",
@ -47,7 +49,7 @@ def list_platforms(request: HttpRequest) -> HttpResponse:
                    platform.group,
                    platform.created_at.strftime(dateformat),
                    render_to_string(
-                        "components/button_group_sm.html",
+                        "cotton/button_group_sm.html",
                        {
                            "buttons": [
                                {
@ -55,6 +57,7 @@ def list_platforms(request: HttpRequest) -> HttpResponse:
                                        "edit_platform", args=[platform.pk]
                                    ),
                                    "text": "Edit",
+                                    "color": "gray",
                                },
                                {
                                    "href": reverse(
--- a/games/views/purchase.py
+++ b/games/views/purchase.py
@ -13,7 +13,7 @@ from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils import timezone

-from common.utils import truncate_with_popover
+from common.utils import A, Button, truncate_with_popover
 from games.forms import PurchaseForm
 from games.models import Edition, Purchase
 from games.views.general import dateformat, use_custom_redirect
@ -42,8 +42,10 @@ def list_purchases(request: HttpRequest) -> HttpResponse:
            else None
        ),
        "data": {
+            "header_action": A([], Button([], "Add purchase"), url="add_purchase"),
            "columns": [
                "Name",
+                "Type",
                "Platform",
                "Price",
                "Currency",
@ -57,7 +59,23 @@ def list_purchases(request: HttpRequest) -> HttpResponse:
            ],
            "rows": [
                [
-                    truncate_with_popover(purchase.edition.name),
+                    A(
+                        [
+                            (
+                                "href",
+                                reverse(
+                                    "view_game",
+                                    args=[purchase.edition.game.pk],
+                                ),
+                            ),
+                        ],
+                        truncate_with_popover(
+                            purchase.edition.game.name
+                            if purchase.type == "game"
+                            else f"{purchase.edition.game.name} ({purchase.name})"
+                        ),
+                    ),
+                    purchase.get_type_display(),
                    purchase.platform,
                    purchase.price,
                    purchase.price_currency,
@ -80,7 +98,7 @@ def list_purchases(request: HttpRequest) -> HttpResponse:
                    ),
                    purchase.created_at.strftime(dateformat),
                    render_to_string(
-                        "components/button_group_sm.html",
+                        "cotton/button_group_sm.html",
                        {
                            "buttons": [
                                {
@ -88,6 +106,7 @@ def list_purchases(request: HttpRequest) -> HttpResponse:
                                        "edit_purchase", args=[purchase.pk]
                                    ),
                                    "text": "Edit",
+                                    "color": "gray",
                                },
                                {
                                    "href": reverse(
--- a/games/views/session.py
+++ b/games/views/session.py
@ -1,15 +1,22 @@
-from typing import Any
+import operator
+from functools import reduce
+from json import dumps as json_dumps
+from json import loads as json_loads
+from typing import Any, NotRequired, TypeAlias, TypedDict, TypeGuard

 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
+from django.db.models.query import QuerySet
+from django.db.models.query_utils import Q
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils import timezone
+from typing_extensions import TypeGuard

 from common.time import format_duration
-from common.utils import truncate_with_popover
+from common.utils import A, Button, truncate_with_popover
 from games.forms import SessionForm
 from games.models import Purchase, Session
 from games.views.general import (
@ -22,12 +29,283 @@ from games.views.general import (
 )


+class Filter(TypedDict):
+    filter_id: str
+    filter_display: str
+    filter_string: str
+
+
+def is_filter(obj: dict[Any, Any]) -> TypeGuard[Filter]:
+    return (
+        isinstance(obj, dict)
+        and "filter_id" in obj
+        and isinstance(obj["filter_id"], str)
+        and "filter_display" in obj
+        and isinstance(obj["filter_display"], str)
+        and "filter_string" in obj
+        and isinstance(obj["filter_string"], str)
+    )
+
+
+FilterList: TypeAlias = list[Filter]
+
+
+def is_filterlist(obj: list[Any]) -> TypeGuard[FilterList]:
+    return isinstance(obj, list) and all([is_filter(item) for item in obj])
+
+
+ModelFilterSet: TypeAlias = list[dict[str, FilterList]]
+
+
+class FieldFilter(TypedDict):
+    filtered_field: str
+    filtered_value: str
+    negated: NotRequired[bool]
+    filter: Filter
+
+
+def is_fieldfilter(obj: dict) -> TypeGuard[FieldFilter]:
+    return (
+        isinstance(obj, dict)
+        and "filtered_field" in obj
+        and isinstance(obj["filtered_field"], str)
+        and "filtered_value" in obj
+        and isinstance(obj["filtered_value"], str)
+        and "filter" in obj
+        and is_filter(obj["filter"])
+    )
+
+
+FilterSet: TypeAlias = list[FieldFilter]
+
+
+def is_filterset(obj: list) -> TypeGuard[FilterSet]:
+    return isinstance(obj, list) and all([is_fieldfilter(item) for item in obj])
+
+
+iexact_filter: Filter = {
+    "filter_id": "IEXACT",
+    "filter_display": "Equals (case-insensitive)",
+    "filter_string": "__iexact",
+}
+exact_filter: Filter = {
+    "filter_id": "EXACT",
+    "filter_display": "Equals (case-sensitive)",
+    "filter_string": "__exact",
+}
+isnull_filter: Filter = {
+    "filter_id": "ISNULL",
+    "filter_display": "Is null",
+    "filter_string": "__isnull",
+}
+contains_filter: Filter = {
+    "filter_id": "CONTAINS",
+    "filter_display": "Contains",
+    "filter_string": "__contains",
+}
+startswith_filter: Filter = {
+    "filter_id": "STARTSWITH",
+    "filter_display": "Starts with",
+    "filter_string": "__startswith",
+}
+endswith_filter: Filter = {
+    "filter_id": "ENDSWITH",
+    "filter_display": "Ends with",
+    "filter_string": "__endswith",
+}
+gt_filter: Filter = {
+    "filter_id": "GT",
+    "filter_display": "Greater than",
+    "filter_string": "__gt",
+}
+lt_filter: Filter = {
+    "filter_id": "LT",
+    "filter_display": "Lesser than",
+    "filter_string": "__lt",
+}
+year_gt_filter: Filter = {
+    "filter_id": "YEARGT",
+    "filter_display": "Greater than",
+    "filter_string": "__year__gt",
+}
+year_lt_filter: Filter = {
+    "filter_id": "YEARLT",
+    "filter_display": "Lesser than",
+    "filter_string": "__year__lt",
+}
+year_exact_filter: Filter = {
+    "filter_id": "YEAREXACT",
+    "filter_display": "Equals (case-sensitive)",
+    "filter_string": "__year__exact",
+}
+
+defined_filters = [
+    iexact_filter,
+    exact_filter,
+    isnull_filter,
+    contains_filter,
+    startswith_filter,
+    endswith_filter,
+    gt_filter,
+    lt_filter,
+    year_gt_filter,
+    year_lt_filter,
+    year_exact_filter,
+]
+
+defined_filters_list = {list["filter_id"]: list for list in defined_filters}
+
+char_filter: FilterList = [
+    iexact_filter,
+    isnull_filter,
+    contains_filter,
+    startswith_filter,
+    endswith_filter,
+]
+text_filter: FilterList = [
+    isnull_filter,
+    contains_filter,
+]
+num_filter: FilterList = [exact_filter, gt_filter, lt_filter]
+date_filter: FilterList = [
+    year_exact_filter,
+    isnull_filter,
+    year_gt_filter,
+    year_lt_filter,
+]
+
+conditions = ["and", "or"]
+session_filters: ModelFilterSet = [
+    {"name": char_filter},
+    {"timestamp_start": date_filter},
+    {"timestamp_end": date_filter},
+    {"duration_manual": num_filter},
+    {"duration_calculated": num_filter},
+    {"note": text_filter},
+    {"device": char_filter},
+    {"created_at": date_filter},
+    {"modified_at": date_filter},
+]
+name_contains_age: FieldFilter = {
+    "filtered_field": "name",
+    "filtered_value": "age",
+    "filter": contains_filter,
+}
+simple_example_filter: FilterSet = [name_contains_age]
+timestamp_start_year_2024: FieldFilter = {
+    "filtered_field": "timestamp_start",
+    "filtered_value": "2024",
+    "filter": year_exact_filter,
+}
+physical_only: FieldFilter = {
+    "filtered_field": "purchase__ownership_type",
+    "filtered_value": "ph",
+    "filter": exact_filter,
+}
+
+
+def negate_filter(filter: FieldFilter) -> FieldFilter:
+    return {**filter, "negated": True}
+
+
+without_physical: FieldFilter = negate_filter(physical_only)
+combined_example_filter: FilterSet = [name_contains_age, timestamp_start_year_2024]
+combined_with_negated_example_filter = [timestamp_start_year_2024, without_physical]
+
+
+def string_to_dict(s: str) -> dict[str, str]:
+    key, value = s.split("=")
+    return {key: value}
+
+
+def create_django_filter_dict(
+    filter: Filter, field: str, filtered_value: str
+) -> dict[str, str]:
+    """
+    Creates a dict that can be used with the Django
+    filter function by unpacking it:
+    Model.objects.filter(**return_value)
+    """
+    if not is_filter(filter):
+        raise ValueError("filter is not of type Filter")
+    return {f"{field}{filter["filter_string"]}": filtered_value}
+
+
+def join_filter_with_condition(filters: FilterSet, condition: str):
+    if not is_filterset(filters):
+        raise ValueError("filters is not FilterSet")
+    conditions = {"AND": operator.and_, "OR": operator.or_, "XOR": operator.xor}
+    condition = condition.upper()
+    if condition not in conditions:
+        raise ValueError(f"Condition '{condition}' not one of '{conditions.keys()}'.")
+    q_objects: list[Q] = []
+    for filter_item in filters:
+        q = Q(
+            **create_django_filter_dict(
+                filter_item["filter"],
+                filter_item["filtered_field"],
+                filter_item["filtered_value"],
+            )
+        )
+        if filter_item.get("negated", False):
+            q = ~q
+        q_objects.append(q)
+    return reduce(conditions[condition], q_objects)
+
+
+def apply_filters(
+    filters: FilterSet,
+    queryset: QuerySet[Any],
+) -> QuerySet[Any] | None:
+    if len(filters) == 0:
+        return queryset
+    if type(filters) is not list:
+        raise ValueError("filters argument not of type list")
+    # TODO: modify FilterSet so it includes the condition to use
+    # so we can remove the hard-coding of "AND" here
+    return queryset.filter(join_filter_with_condition(filters, "AND"))
+
+
+def filters_to_string(filters: FilterSet) -> str:
+    constructed_filters: list[dict[str, str | bool]] = []
+    for filter in filters:
+        constructed_filters.append(
+            {
+                "id": filter["filter"]["filter_id"],
+                "field": filter["filtered_field"],
+                "value": filter["filtered_value"],
+                "negated": filter.get("negated", False),
+            }
+        )
+    return json_dumps(constructed_filters)
+
+
+def string_to_filters(filter_string: str) -> FilterSet:
+    obj = json_loads(filter_string)
+    filters = [
+        {
+            "filter": defined_filters_list[item["id"]],
+            "filtered_field": item["field"],
+            "filtered_value": item["value"],
+            "negated": item.get("negated", False),
+        }
+        for item in obj
+    ]
+    if not is_filterset(filters):
+        raise ValueError("filters is not of type FilterSet")
+    return filters
+
+
@login_required
 def list_sessions(request: HttpRequest) -> HttpResponse:
    context: dict[Any, Any] = {}
    page_number = request.GET.get("page", 1)
    limit = request.GET.get("limit", 10)
+    filters = request.GET.get("filters", "")
    sessions = Session.objects.order_by("-timestamp_start")
+    if filters != "":
+        filter_obj = string_to_filters(filters)
+        sessions = apply_filters(filter_obj, queryset=sessions)
    page_obj = None
    if int(limit) != 0:
        paginator = Paginator(sessions, limit)
@ -45,6 +323,7 @@ def list_sessions(request: HttpRequest) -> HttpResponse:
            else None
        ),
        "data": {
+            "header_action": A([], Button([], "Add session"), url="add_session"),
            "columns": [
                "Name",
                "Date",
@ -56,7 +335,13 @@ def list_sessions(request: HttpRequest) -> HttpResponse:
            ],
            "rows": [
                [
-                    truncate_with_popover(session.purchase.edition.name),
+                    A(
+                        children=truncate_with_popover(session.purchase.edition.name),
+                        url=reverse(
+                            "view_game",
+                            args=[session.purchase.edition.game.pk],
+                        ),
+                    ),
                    f"{session.timestamp_start.strftime(datetimeformat)}{f" — {session.timestamp_end.strftime(timeformat)}" if session.timestamp_end else ""}",
                    (
                        format_duration(session.duration_calculated, durationformat)
@ -71,12 +356,13 @@ def list_sessions(request: HttpRequest) -> HttpResponse:
                    session.device,
                    session.created_at.strftime(dateformat),
                    render_to_string(
-                        "components/button_group_sm.html",
+                        "cotton/button_group_sm.html",
                        {
                            "buttons": [
                                {
                                    "href": reverse("edit_session", args=[session.pk]),
                                    "text": "Edit",
+                                    "color": "gray",
                                },
                                {
                                    "href": reverse(
--- a/poetry.lock
+++ b/poetry.lock
@ -28,6 +28,27 @@ files = [
 [package.extras]
 tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]

+[[package]]
+name = "beautifulsoup4"
+version = "4.12.3"
+description = "Screen-scraping library"
+optional = false
+python-versions = ">=3.6.0"
+files = [
+    {file = "beautifulsoup4-4.12.3-py3-none-any.whl", hash = "sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed"},
+    {file = "beautifulsoup4-4.12.3.tar.gz", hash = "sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051"},
+]
+
+[package.dependencies]
+soupsieve = ">1.2"
+
+[package.extras]
+cchardet = ["cchardet"]
+chardet = ["chardet"]
+charset-normalizer = ["charset-normalizer"]
+html5lib = ["html5lib"]
+lxml = ["lxml"]
+
 [[package]]
 name = "cfgv"
 version = "3.4.0"
@ -110,6 +131,20 @@ tzdata = {version = "*", markers = "sys_platform == \"win32\""}
 argon2 = ["argon2-cffi (>=19.1.0)"]
 bcrypt = ["bcrypt"]

+[[package]]
+name = "django-cotton"
+version = "0.9.34"
+description = "Bringing component based design to Django templates."
+optional = false
+python-versions = "<4,>=3.8"
+files = [
+    {file = "django_cotton-0.9.34-py3-none-any.whl", hash = "sha256:9721dd79066d5a28eefb84527bea7f2daa8f1db6111ffdecbc5dd64fe2e300c9"},
+    {file = "django_cotton-0.9.34.tar.gz", hash = "sha256:3f2d950a9ad0985955ca0fb2d5fbb42be1f07f55239864fe5a1d0e873303f0bd"},
+]
+
+[package.dependencies]
+beautifulsoup4 = ">=4.12.2,<4.13.0"
+
 [[package]]
 name = "django-debug-toolbar"
 version = "4.4.6"
@ -788,22 +823,16 @@ files = [
 ]

 [[package]]
-name = "slippers"
-version = "0.6.2"
-description = "Build reusable components in Django without writing a single line of Python."
+name = "soupsieve"
+version = "2.6"
+description = "A modern CSS selector implementation for Beautiful Soup."
 optional = false
-python-versions = ">=3.8.0"
+python-versions = ">=3.8"
 files = [
-    {file = "slippers-0.6.2-py3-none-any.whl", hash = "sha256:739e05f85354becbf0a65daab831eea62557d89e7512042209ab629af4378bca"},
-    {file = "slippers-0.6.2.tar.gz", hash = "sha256:4cb555b8822ba0d404e5405723f5d723994022c29046008ee917081031bc0cf1"},
+    {file = "soupsieve-2.6-py3-none-any.whl", hash = "sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9"},
+    {file = "soupsieve-2.6.tar.gz", hash = "sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb"},
 ]

-[package.dependencies]
-Django = ">=3.2"
-PyYAML = ">=5.4.0"
-typeguard = ">=2.13.3,<3.0.0"
-typing-extensions = ">=4.4.0"
-
 [[package]]
 name = "sqlparse"
 version = "0.5.1"
@ -850,21 +879,6 @@ notebook = ["ipywidgets (>=6)"]
 slack = ["slack-sdk"]
 telegram = ["requests"]

-[[package]]
-name = "typeguard"
-version = "2.13.3"
-description = "Run-time type checker for Python"
-optional = false
-python-versions = ">=3.5.3"
-files = [
-    {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"},
-    {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"},
-]
-
-[package.extras]
-doc = ["sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"]
-test = ["mypy", "pytest", "typing-extensions"]
-
 [[package]]
 name = "typing-extensions"
 version = "4.12.2"
@ -928,4 +942,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "eb741020e400664070ed1eee24a17b6a9c07a2f2d44103e4947279aa26a40315"
+content-hash = "f96f55c381f25a4a473be8d53ef83d13c70bb7c731b5132f4ece2af1b3d3afed"
--- a/pyproject.toml
+++ b/pyproject.toml
@ -30,7 +30,7 @@ django-template-partials = "^24.2"
 markdown = "^3.6"


-slippers = "^0.6.2"
+django-cotton = "^0.9.34"
 [tool.isort]
 profile = "black"

--- a/timetracker/settings.py
+++ b/timetracker/settings.py
@ -41,7 +41,7 @@ INSTALLED_APPS = [
    "template_partials",
    "graphene_django",
    "django_htmx",
-    "slippers",
+    "django_cotton",
 ]

 GRAPHENE = {"SCHEMA": "games.schema.schema"}
@ -87,7 +87,6 @@ TEMPLATES = [
            ],
            "builtins": [
                "template_partials.templatetags.partials",
-                "slippers.templatetags.slippers",
            ],
        },
    },
Author	SHA1	Message	Date
Lukáš Kucharczyk	c2f1d8fe0a	add backend functionality All checks were successful Django CI/CD / test (push) Successful in 50s Details Django CI/CD / build-and-push (push) Has been skipped Details	2024-09-03 15:30:51 +02:00
Lukáš Kucharczyk	cd3e400297	add links to add a new X to: game, edition, purchase, session, device, platform All checks were successful Django CI/CD / test (push) Successful in 52s Details Django CI/CD / build-and-push (push) Successful in 2m5s Details	2024-09-03 15:27:04 +02:00
Lukáš Kucharczyk	c738245783	Properly display non-game type names All checks were successful Django CI/CD / test (push) Successful in 1m8s Details Django CI/CD / build-and-push (push) Successful in 1m55s Details	2024-09-02 23:52:28 +02:00
Lukáš Kucharczyk	57184ceea0	add one more breakpoint to better utilize smaller screens All checks were successful Django CI/CD / test (push) Successful in 53s Details Django CI/CD / build-and-push (push) Successful in 1m56s Details	2024-09-02 23:44:18 +02:00
Lukáš Kucharczyk	c2b9409562	update styles All checks were successful Django CI/CD / test (push) Successful in 53s Details Django CI/CD / build-and-push (push) Successful in 1m52s Details	2024-09-02 20:14:52 +02:00
Lukáš Kucharczyk	e067e65bce	linkify game, edition, purchase, session references Some checks failed Django CI/CD / test (push) Successful in 1m0s Details Django CI/CD / build-and-push (push) Has been cancelled Details also add link styles for links in a table row	2024-09-02 20:04:21 +02:00
Lukáš Kucharczyk	b8258e2937	replace slippers with django-cotton All checks were successful Django CI/CD / test (push) Successful in 59s Details Django CI/CD / build-and-push (push) Successful in 2m4s Details main reason: slippers cannot pass request via context inside its components, making it annoying to use template takes that take request. more reasons: not actively worked on, no named slots, having to define components in components.yaml + new components do not get registered without restarting server	2024-09-02 17:43:41 +02:00
Lukas Kucharczyk	9af4c79947	improve game view All checks were successful Django CI/CD / test (push) Successful in 56s Details Django CI/CD / build-and-push (push) Has been skipped Details	2024-08-19 21:58:43 +02:00
Lukas Kucharczyk	d8b8182b91	fix table top rounding	2024-08-13 08:36:40 +02:00
				`@ -1 +0,0 @@`
				`<td class="px-6 py-4 min-w-20-char max-w-20-char">{{ children }}</td>`
				`@ -0,0 +1 @@`
				`<td class="px-6 py-4 min-w-20-char max-w-20-char">{{ slot }}</td>`