Continue backend UI rewrite

backend/.env.template

@@ -2,8 +2,12 @@
 # SPDX-FileCopyrightText: 2024 JWP Consulting GK
 DJANGO_SETTINGS_MODULE = projectify.settings.development
 DJANGO_CONFIGURATION = Development
+# The following assumes that you've chosen projectify as the database name
+# and use PostgreSQL
 DATABASE_URL=postgres://$USER@localhost/projectify
 # If unix socket, choose something like this:
-# DATABASE_URL = postgres://%2Fvar%2Flib%2Fpostgresql/dbname
+# DATABASE_URL = postgres://%2Fvar%2Flib%2Fpostgresql/projectify
+# On macOS, the PostgreSQL domain socket is here:
+# DATABASE_URL = postgres://%2tmp/projectify
 # If you need to use Redis for your celery worker, add the following:
 # REDIS_TLS_URL = redis://localhost:6379/0

backend/projectify/lib/htmx.py

@@ -12,15 +12,14 @@
 # ruff: noqa: D101, D102, D105, D107
 import json
 from collections.abc import Awaitable
+from inspect import iscoroutinefunction, markcoroutinefunction
 from typing import Any, Callable
 from urllib.parse import unquote, urlsplit, urlunsplit
 
 from django.http import HttpRequest, HttpResponse
 from django.http.response import HttpResponseBase, HttpResponseRedirectBase
 from django.utils.functional import cached_property
 
-from asgiref.sync import iscoroutinefunction, markcoroutinefunction
-
 
 class HtmxMiddleware:
     sync_capable = True

backend/projectify/templates/base.html

@@ -37,7 +37,9 @@
         {% if debug %}
             {% include "common/navigation/header/development_view_bar.html" %}
         {% endif %}
-        <div class="flex min-h-screen flex-col" id="svelte" role="presentation">
+        <div class="flex min-h-screen flex-col"
+             id="app-content"
+             role="presentation">
             {% block content %}{% endblock %}
         </div>
     </body>

backend/projectify/templates/django/forms/widgets/checkbox.html

@@ -6,5 +6,5 @@
            name="{{ widget.name }}"
            {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}
            {% include "django/forms/widgets/attrs.html" %}>
-    <span class="hidden absolute peer-checked:block">{% include "heroicons/check.svg" %}</span>
+    <span class="hidden absolute pointer-events-none peer-checked:block">{% include "heroicons/check.svg" %}</span>
 </div>

backend/projectify/templates/projectify/forms/submit.html

@@ -0,0 +1,7 @@
+{# SPDX-License-Identifier: AGPL-3.0-or-later #}
+{# SPDX-FileCopyrightText: 2025 JWP Consulting GK #}
+<button type="submit"
+        class="w-full bg-primary text-primary-content hover:bg-primary-hover active:bg-primary-pressed text-base flex min-w-max flex-row justify-center gap-2 rounded-lg px-4 py-2 font-bold disabled:bg-disabled disabled:text-disabled-primary-content"
+        {% if name %}name="{{ name }}"{% endif %}
+        {% if value %}value="{{ value }}"{% endif %}
+        {% if form_name %}form="{{ form_name }}"{% endif %}>{{ text }}</button>

backend/projectify/templatetags/projectify.py

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2024 JWP Consulting GK
 """Shared template tags for Projectify."""
 
-from typing import Optional, Union
+from typing import Any, Literal, Optional, Union
 
 from django import template
 from django.template.loader import render_to_string
@@ -26,7 +26,9 @@ def percent(value: Optional[float]) -> Optional[str]:
 
 
 @register.simple_tag
-def anchor(href: str, label: str, external: bool = False) -> SafeText:
+def anchor(
+    href: str, label: str, external: bool = False, *args: Any, **kwargs: Any
+) -> SafeText:
     """
     Render a fully styled HTML anchor.
 
@@ -39,9 +41,13 @@ def anchor(href: str, label: str, external: bool = False) -> SafeText:
     if href == "":
         raise ValueError("Empty href supplied")
     try:
-        url = reverse(href)
+        url = reverse(href, args=args, kwargs=kwargs)
     except NoReverseMatch:
         url = href
+    # TODO, if we have a reverse match, we don't have external URLs
+    # We could switch all callers of the anchor function to use the route name
+    # and implicitly switch on external for all other URLs. After all, if it's
+    # an internal resource, we'd have a named route for that resource.
     if external:
         a_extra = mark_safe(' target="_blank"')
         extra = format_html(
@@ -62,18 +68,61 @@ def anchor(href: str, label: str, external: bool = False) -> SafeText:
 
 
 @register.simple_tag
-def user_avatar(user: User) -> SafeText:
+def action_button(
+    text: str,
+    icon: Optional[str] = None,
+    style: Literal["secondary", "destructive"] = "secondary",
+    value: Optional[str] = None,
+    name: Optional[str] = None,
+    grow: bool = True,
+) -> SafeText:
+    """Render a styled action button with icon."""
+    # Source: frontend/src/lib/funabashi/buttons/Button.svelte
+    color_classes = {
+        "secondary": "text-secondary-content hover:bg-secondary-hover hover:text-secondary-content-hover active:bg-secondary-pressed active:text-secondary-content-hover",
+        "destructive": "text-destructive hover:bg-destructive-secondary-hover hover:text-destructive-hover active:bg-destructive-secondary-pressed active:text-destructive-pressed",
+    }
+
+    return format_html(
+        '<button type="submit" '
+        'class="{width_class} {color_classes} flex min-w-max flex-row justify-center gap-2 rounded-lg px-4 py-2 font-bold"'
+        "{value}{name}>"
+        "{icon}"
+        "{text}"
+        "</button>",
+        width_class="w-full" if grow else "min-w-max",
+        color_classes=color_classes[style],
+        icon=format_html(
+            '<div class="w-6 h-6">{icon}</div>',
+            icon=render_to_string(f"heroicons/{icon}.svg"),
+        )
+        if icon
+        else "",
+        text=text,
+        value=format_html(' value="{value}"', value=value) if value else "",
+        name=format_html(' name="{name}"', name=name) if name else "",
+    )
+
+
+@register.simple_tag
+def user_avatar(user: Optional[User]) -> SafeText:
     """
     Render a user avatar image.
 
     Takes a user object as parameter.
     """
-    if user.profile_picture:
+    if user and user.profile_picture:
         return format_html(
             '<div class="shrink-0 flex flex-row h-6 w-6 items-center rounded-full border border-primary"><img src="{src}" alt="{alt}" height="24" width="24" class="h-full w-full overflow-x-auto rounded-full object-cover object-center"></div>',
             src=user.profile_picture.url,
             alt=str(user),
         )
+    # TODO improve appearance
+    elif user:
+        return format_html(
+            '<div class="shrink-0 flex flex-row h-6 w-6 items-center rounded-full border border-primary" aria-label="{alt}"></div>',
+            alt=str(user),
+        )
     else:
         return mark_safe(
             '<div class="shrink-0 flex flex-row h-6 w-6 items-center rounded-full border border-primary bg-base-200"></div>'

backend/projectify/theme/static_src/tailwind.config.js

@@ -101,6 +101,7 @@ const config = {
     content: [
         // Apps
         "../../../projectify/*/templates/**/*.html",
+        "../../../projectify/**/const.py",
         // Shared templates
         "../../../projectify/templates/**/*.html",
         // Heroicons

backend/projectify/workspace/dashboard_urls.py

@@ -23,15 +23,20 @@
     task_actions,
     task_create,
     task_create_sub_task_form,
+    task_delete_view,
     task_detail,
     task_move,
+    task_move_to_section,
     task_update_view,
 )
 from projectify.workspace.views.workspace import (
     workspace_list_view,
     workspace_settings_billing,
     workspace_settings_billing_edit,
+    workspace_settings_edit_label,
     workspace_settings_general,
+    workspace_settings_label,
+    workspace_settings_new_label,
     workspace_settings_projects,
     workspace_settings_quota,
     workspace_settings_team_member_remove,
@@ -71,6 +76,21 @@
         workspace_settings_projects,
         name="projects",
     ),
+    path(
+        "<uuid:workspace_uuid>/labels",
+        workspace_settings_label,
+        name="labels",
+    ),
+    path(
+        "<uuid:workspace_uuid>/labels/create",
+        workspace_settings_new_label,
+        name="create-label",
+    ),
+    path(
+        "<uuid:workspace_uuid>/labels/<uuid:label_uuid>",
+        workspace_settings_edit_label,
+        name="edit-label",
+    ),
     path(
         "<uuid:workspace_uuid>/settings/team-members",
         workspace_settings_team_members,
@@ -153,8 +173,14 @@
     path("<uuid:task_uuid>/update", task_update_view, name="update"),
     # Move/delete actions menu
     path("<uuid:task_uuid>/actions", task_actions, name="actions"),
+    path("<uuid:task_uuid>/delete", task_delete_view, name="delete"),
     # Form
     path("<uuid:task_uuid>/move", task_move, name="move"),
+    path(
+        "<uuid:task_uuid>/move-to-section",
+        task_move_to_section,
+        name="move-to-section",
+    ),
     path(
         "sub-task/<int:sub_tasks>",
         task_create_sub_task_form,

backend/projectify/workspace/migrations/0066_alter_workspace_users_label_label_color_range.py

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+#
+# SPDX-FileCopyrightText: 2025 JWP Consulting GK
+# Generated by Django 5.2.9 on 2026-01-26 07:17
+"""Validate label color range."""
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    """The migration."""
+
+    dependencies = [
+        ("workspace", "0065_workspace_title"),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name="label",
+            constraint=models.CheckConstraint(
+                check=models.Q(("color__gte", 0), ("color__lte", 7)),
+                name="label_color_range",
+                violation_error_message="Color must be between 0 and 7",
+            ),
+        ),
+    ]

backend/projectify/workspace/models/const.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
-# SPDX-FileCopyrightText: 2023 JWP Consulting GK
+# SPDX-FileCopyrightText: 2023,2025 JWP Consulting GK
 """Contains enums and other constant values."""
 
 from django.db import models
@@ -14,3 +14,49 @@ class TeamMemberRoles(models.TextChoices):
     CONTRIBUTOR = "CONTRIBUTOR", _("Contributor")
     MAINTAINER = "MAINTAINER", _("Maintainer")
     OWNER = "OWNER", _("Owner")
+
+
+COLOR_MAP = {
+    0: {
+        "name": _("Orange"),
+        "bg_class": "bg-label-orange",
+        "border_class": "border-label-text-orange",
+        "text_class": "text-label-text-orange",
+    },
+    1: {
+        "name": _("Pink"),
+        "bg_class": "bg-label-pink",
+        "border_class": "border-label-text-pink",
+        "text_class": "text-label-text-pink",
+    },
+    2: {
+        "name": _("Blue"),
+        "bg_class": "bg-label-blue",
+        "border_class": "border-label-text-blue",
+        "text_class": "text-label-text-blue",
+    },
+    3: {
+        "name": _("Purple"),
+        "bg_class": "bg-label-purple",
+        "border_class": "border-label-text-purple",
+        "text_class": "text-label-text-purple",
+    },
+    4: {
+        "name": _("Yellow"),
+        "bg_class": "bg-label-yellow",
+        "border_class": "border-label-text-yellow",
+        "text_class": "text-label-text-yellow",
+    },
+    5: {
+        "name": _("Red"),
+        "bg_class": "bg-label-red",
+        "border_class": "border-label-text-red",
+        "text_class": "text-label-text-red",
+    },
+    6: {
+        "name": _("Green"),
+        "bg_class": "bg-label-green",
+        "border_class": "border-label-text-green",
+        "text_class": "text-label-text-green",
+    },
+}

backend/projectify/workspace/models/label.py

@@ -1,13 +1,14 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
-# SPDX-FileCopyrightText: 2023-2024 JWP Consulting GK
+# SPDX-FileCopyrightText: 2023-2025 JWP Consulting GK
 """Label manager and model."""
 
 import uuid
 from typing import TYPE_CHECKING, Any, ClassVar, Self, cast
 
 from django.contrib.auth.models import AbstractBaseUser
 from django.db import models
+from django.db.models import CheckConstraint, Q
 from django.utils.translation import gettext_lazy as _
 
 from projectify.lib.models import BaseModel
@@ -37,6 +38,15 @@ class Label(BaseModel):
 
     # TODO It should be fine to just use TitleDescription here
     name = models.CharField(max_length=255)
+    """
+    0 -> orange
+    2 -> pink
+    3 -> blue
+    4 -> purple
+    5 -> yellow
+    6 -> red
+    7 -> green
+    """
     color = models.PositiveBigIntegerField(
         help_text=_("Color index"),
     )
@@ -68,3 +78,10 @@ class Meta:
         # TODO remove this restriction, just let users do what they want to
         unique_together = ("workspace", "name")
         ordering = ("-modified",)
+        constraints = [
+            CheckConstraint(
+                check=Q(color__gte=0) & Q(color__lte=7),
+                name="label_color_range",
+                violation_error_message=_("Color must be between 0 and 7"),
+            ),
+        ]