diff --git a/README.md b/README.md index 95f6081..17a6303 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,12 @@ npm run dev Open http://127.0.0.1:8765/. The dev command checks that Django port **8765** and Vite port **5174** are free before launching either server. Ports 8000 and 1234 are not used. +## Projects manager + +Run `.venv/bin/python manage.py migrate` and create a local account with `.venv/bin/python manage.py createsuperuser`. All dashboard and project pages require sign-in. Projects can be created at `/projects/`; each gets an editable To-do, In Progress, Done board. New cards enter its selected default column with Medium priority. Cards store full Markdown and revision history. The project URL is metadata and is never fetched by the server. + +Configuration: `DJANGO_SECRET_KEY` must be set for deployment; `DJANGO_DEBUG=0` enables secure session and CSRF cookies; `DJANGO_ALLOWED_HOSTS` is a comma-separated host list. Serve the site behind HTTPS in production. + +The MCP server is a later integration. Reserve **8766** for its separate listener so it does not collide with TasksNest. Do not point an MCP client at the Django page server: OAuth discovery, token issuance, and MCP transport are not yet implemented here. The reference TasksNest implementation is in `/home/jorenmartijn/django/main/mcp_server` and uses Streamable HTTP with a separate OAuth-enabled Django API. + For a compiled frontend, run `npm run build`; Django then serves the compiled assets via its static file finder. The templates use Vite when its dev server is running, the build manifest when available, and checked-in preview assets otherwise. A Node.js 20.19+ installation is needed for Vite 7. This workspace had no system Node.js; the build was verified with a temporary Node.js binary. diff --git a/config/settings.py b/config/settings.py index aa713b2..cbfea31 100644 --- a/config/settings.py +++ b/config/settings.py @@ -1,27 +1,41 @@ +import os from pathlib import Path BASE_DIR = Path(__file__).resolve().parent.parent -SECRET_KEY = "django-insecure-local-design-showcase-only" -DEBUG = True -ALLOWED_HOSTS = ["localhost", "127.0.0.1"] +SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'django-insecure-local-development-only') +DEBUG = os.environ.get('DJANGO_DEBUG', '1') == '1' +ALLOWED_HOSTS = os.environ.get('DJANGO_ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',') INSTALLED_APPS = [ + 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.sessions', 'django.contrib.messages', "django.contrib.contenttypes", "django.contrib.staticfiles", "core", + 'projects', ] MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", + 'django.contrib.sessions.middleware.SessionMiddleware', "django.middleware.common.CommonMiddleware", + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', ] ROOT_URLCONF = "config.urls" TEMPLATES = [{ "BACKEND": "django.template.backends.django.DjangoTemplates", "DIRS": [], "APP_DIRS": True, - "OPTIONS": {"context_processors": ["django.template.context_processors.request"]}, + "OPTIONS": {"context_processors": ['django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', 'projects.context_processors.navigation']}, }] WSGI_APPLICATION = "config.wsgi.application" ASGI_APPLICATION = "config.asgi.application" STATIC_URL = "static/" STATICFILES_DIRS = [BASE_DIR / "dist"] if (BASE_DIR / "dist").exists() else [] DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" +DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3', 'NAME': BASE_DIR / 'db.sqlite3'}} +LOGIN_URL = 'login' +LOGIN_REDIRECT_URL = 'projects:list' +LOGOUT_REDIRECT_URL = 'login' +CSRF_COOKIE_SECURE = not DEBUG +SESSION_COOKIE_SECURE = not DEBUG +SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') diff --git a/config/urls.py b/config/urls.py index 79ea96a..94319a4 100644 --- a/config/urls.py +++ b/config/urls.py @@ -1,7 +1,14 @@ -from django.urls import path +from django.urls import path, include +from django.contrib.auth import views as auth_views +from django.contrib import admin from core import views urlpatterns = [ + path('admin/', admin.site.urls), + path('accounts/login/', auth_views.LoginView.as_view(template_name='projects/login.html'), name='login'), + path('accounts/logout/', auth_views.LogoutView.as_view(), name='logout'), + path('accounts/password/change/', auth_views.PasswordChangeView.as_view(template_name='projects/form.html', success_url='/projects/profile/'), name='password_change'), + path('projects/', include('projects.urls')), path("", views.today, name="today"), path("health/", views.health, name="health"), path("energy/", views.energy, name="energy"), diff --git a/core/templates/core/base.html b/core/templates/core/base.html index 5555ded..8b491ad 100644 --- a/core/templates/core/base.html +++ b/core/templates/core/base.html @@ -24,14 +24,15 @@ Energy Home + {% if user.is_authenticated %}{% endif %} - +
-
PERSONAL DASHBOARD / {{ title|upper }}
DEMO MODEJM
+
PERSONAL DASHBOARD / {{ title|upper }}
{% block content %}{% endblock %}
- + diff --git a/core/views.py b/core/views.py index a2ad427..203e19f 100644 --- a/core/views.py +++ b/core/views.py @@ -1,24 +1,30 @@ import json from django.shortcuts import render +from django.contrib.auth.decorators import login_required from . import demo_data as demo def page(request, template, title, section, **data): return render(request, f"core/{template}.html", {"title": title, "section": section, **data}) +@login_required def today(request): return page(request, "today", "Today", "today", groups=demo.TODAY_GROUPS, timeline=demo.TIMELINE) +@login_required def health(request): return page(request, "health", "Health", "health", metrics=demo.HEALTH, activity_chart=json.dumps(demo.ACTIVITY_CHART), trend_chart=json.dumps(demo.TREND_CHART)) +@login_required def energy(request): return page(request, "energy", "Energy", "energy", metrics=demo.ENERGY, energy_chart=json.dumps(demo.ENERGY_CHART)) +@login_required def home(request): return page(request, "home", "Home", "home", rooms=demo.ROOMS, sensors=demo.HOME_SENSORS) +@login_required def showcase(request): return page(request, "showcase", "Showcase", "showcase", metrics=demo.HEALTH[:3], timeline=demo.TIMELINE[:3], activity_chart=json.dumps(demo.ACTIVITY_CHART)) diff --git a/projects/__init__.py b/projects/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/projects/apps.py b/projects/apps.py new file mode 100644 index 0000000..afae498 --- /dev/null +++ b/projects/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ProjectsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'projects' diff --git a/projects/context_processors.py b/projects/context_processors.py new file mode 100644 index 0000000..d7e7029 --- /dev/null +++ b/projects/context_processors.py @@ -0,0 +1,5 @@ +from .services import accessible + + +def navigation(request): + return {'nav_projects': accessible(request.user).filter(archived=False).order_by('name')[:12] if request.user.is_authenticated else []} diff --git a/projects/forms.py b/projects/forms.py new file mode 100644 index 0000000..863ad7a --- /dev/null +++ b/projects/forms.py @@ -0,0 +1,38 @@ +from django import forms +from .models import Card, Column, Profile, Project + + +class ProjectForm(forms.ModelForm): + class Meta: + model = Project + fields = ['name', 'description', 'git_repository_url'] + + def clean_git_repository_url(self): + value = self.cleaned_data['git_repository_url'] + if value and not value.startswith('https://'): + raise forms.ValidationError('Use an HTTPS repository URL.') + return value + + +class CardForm(forms.ModelForm): + expected_revision = forms.IntegerField(widget=forms.HiddenInput, required=False) + + class Meta: + model = Card + fields = ['title', 'description_markdown', 'priority', 'card_type', 'due_date', 'is_blocked', 'blocked_reason'] + widgets = {'description_markdown': forms.Textarea(attrs={'rows': 16}), 'due_date': forms.DateInput(attrs={'type': 'date'})} + + +class ColumnForm(forms.ModelForm): + class Meta: + model = Column + fields = ['name', 'color', 'is_done'] + widgets = {'color': forms.TextInput(attrs={'type': 'color'})} + + +class ProfileForm(forms.ModelForm): + email = forms.EmailField(required=False) + + class Meta: + model = Profile + fields = ['display_name', 'avatar_url', 'timezone', 'language', 'theme'] diff --git a/projects/migrations/0001_initial.py b/projects/migrations/0001_initial.py new file mode 100644 index 0000000..5d82904 --- /dev/null +++ b/projects/migrations/0001_initial.py @@ -0,0 +1,196 @@ +# Generated by Django 6.1.2 on 2026-10-13 13:11 + +import django.core.validators +import django.db.models.deletion +import uuid +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Board', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ], + ), + migrations.CreateModel( + name='Card', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('title', models.CharField(max_length=250)), + ('description_markdown', models.TextField(blank=True)), + ('priority', models.CharField(choices=[('low', 'Low'), ('medium', 'Medium'), ('high', 'High')], default='medium', max_length=6)), + ('card_type', models.CharField(choices=[('feature', 'Feature'), ('bug', 'Bug'), ('task', 'Task'), ('research', 'Research'), ('idea', 'Idea')], default='task', max_length=8)), + ('due_date', models.DateField(blank=True, null=True)), + ('position', models.PositiveIntegerField(default=0)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('completed_at', models.DateTimeField(blank=True, null=True)), + ('archived', models.BooleanField(default=False)), + ('revision', models.PositiveIntegerField(default=1)), + ('is_blocked', models.BooleanField(default=False)), + ('blocked_reason', models.TextField(blank=True)), + ('assignee', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='assigned_cards', to=settings.AUTH_USER_MODEL)), + ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='created_cards', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'ordering': ['position', 'created_at'], + }, + ), + migrations.CreateModel( + name='CardComment', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('body', models.TextField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), + ('card', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='projects.card')), + ], + ), + migrations.CreateModel( + name='Column', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=100)), + ('color', models.CharField(default='#315d4d', max_length=7, validators=[django.core.validators.RegexValidator('^#[0-9a-fA-F]{6}$')])), + ('position', models.PositiveIntegerField(default=0)), + ('is_default', models.BooleanField(default=False)), + ('is_done', models.BooleanField(default=False)), + ('archived', models.BooleanField(default=False)), + ('board', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='columns', to='projects.board')), + ], + options={ + 'ordering': ['position', 'id'], + }, + ), + migrations.AddField( + model_name='card', + name='column', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='cards', to='projects.column'), + ), + migrations.CreateModel( + name='Profile', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('display_name', models.CharField(blank=True, max_length=150)), + ('avatar_url', models.URLField(blank=True)), + ('timezone', models.CharField(default='Europe/Amsterdam', max_length=64)), + ('language', models.CharField(default='en', max_length=16)), + ('theme', models.CharField(default='system', max_length=16)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Project', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=200)), + ('slug', models.SlugField(max_length=220)), + ('description', models.TextField(blank=True)), + ('git_repository_url', models.URLField(blank=True)), + ('archived', models.BooleanField(default=False)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='owned_projects', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Membership', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('role', models.CharField(choices=[('editor', 'Editor'), ('viewer', 'Viewer')], max_length=10)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to='projects.project')), + ], + ), + migrations.AddField( + model_name='card', + name='project', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cards', to='projects.project'), + ), + migrations.AddField( + model_name='board', + name='project', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='board', to='projects.project'), + ), + migrations.CreateModel( + name='Activity', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('action', models.CharField(max_length=60)), + ('detail', models.JSONField(default=dict)), + ('origin', models.CharField(default='web', max_length=8)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), + ('card', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='activity', to='projects.card')), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activity', to='projects.project')), + ], + options={ + 'ordering': ['-created_at'], + }, + ), + migrations.CreateModel( + name='Tag', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=60)), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='projects.project')), + ], + ), + migrations.AddField( + model_name='card', + name='tags', + field=models.ManyToManyField(blank=True, to='projects.tag'), + ), + migrations.CreateModel( + name='CardRevision', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('revision', models.PositiveIntegerField()), + ('markdown', models.TextField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), + ('card', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='revisions', to='projects.card')), + ], + options={ + 'constraints': [models.UniqueConstraint(fields=('card', 'revision'), name='unique_card_revision')], + }, + ), + migrations.AddConstraint( + model_name='column', + constraint=models.UniqueConstraint(condition=models.Q(('archived', False), ('is_default', True)), fields=('board',), name='one_active_default_column'), + ), + migrations.AddConstraint( + model_name='project', + constraint=models.UniqueConstraint(fields=('owner', 'slug'), name='unique_owner_project_slug'), + ), + migrations.AddConstraint( + model_name='project', + constraint=models.UniqueConstraint(fields=('owner', 'name'), name='unique_owner_project_name'), + ), + migrations.AddConstraint( + model_name='membership', + constraint=models.UniqueConstraint(fields=('project', 'user'), name='unique_project_member'), + ), + migrations.AddConstraint( + model_name='tag', + constraint=models.UniqueConstraint(fields=('project', 'name'), name='unique_project_tag'), + ), + migrations.AddIndex( + model_name='card', + index=models.Index(fields=['project', 'archived', 'priority'], name='projects_ca_project_d0e0a4_idx'), + ), + migrations.AddIndex( + model_name='card', + index=models.Index(fields=['column', 'position'], name='projects_ca_column__76a75b_idx'), + ), + ] diff --git a/projects/migrations/__init__.py b/projects/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/projects/models.py b/projects/models.py new file mode 100644 index 0000000..e9f4cbf --- /dev/null +++ b/projects/models.py @@ -0,0 +1,125 @@ +import uuid +from django.conf import settings +from django.core.validators import RegexValidator +from django.db import models +from django.db.models import Q + + +class Profile(models.Model): + user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + display_name = models.CharField(max_length=150, blank=True) + avatar_url = models.URLField(blank=True) + timezone = models.CharField(max_length=64, default='Europe/Amsterdam') + language = models.CharField(max_length=16, default='en') + theme = models.CharField(max_length=16, default='system') + + +class Project(models.Model): + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='owned_projects') + name = models.CharField(max_length=200) + slug = models.SlugField(max_length=220) + description = models.TextField(blank=True) + git_repository_url = models.URLField(blank=True) + archived = models.BooleanField(default=False) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + class Meta: + constraints = [models.UniqueConstraint(fields=['owner', 'slug'], name='unique_owner_project_slug'), models.UniqueConstraint(fields=['owner', 'name'], name='unique_owner_project_name')] + + +class Membership(models.Model): + ROLE = [('editor', 'Editor'), ('viewer', 'Viewer')] + project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name='memberships') + user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + role = models.CharField(max_length=10, choices=ROLE) + + class Meta: + constraints = [models.UniqueConstraint(fields=['project', 'user'], name='unique_project_member')] + + +class Board(models.Model): + project = models.OneToOneField(Project, on_delete=models.CASCADE, related_name='board') + + +class Column(models.Model): + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + board = models.ForeignKey(Board, on_delete=models.CASCADE, related_name='columns') + name = models.CharField(max_length=100) + color = models.CharField(max_length=7, default='#315d4d', validators=[RegexValidator(r'^#[0-9a-fA-F]{6}$')]) + position = models.PositiveIntegerField(default=0) + is_default = models.BooleanField(default=False) + is_done = models.BooleanField(default=False) + archived = models.BooleanField(default=False) + + class Meta: + ordering = ['position', 'id'] + constraints = [models.UniqueConstraint(fields=['board'], condition=Q(is_default=True, archived=False), name='one_active_default_column')] + + +class Tag(models.Model): + project = models.ForeignKey(Project, on_delete=models.CASCADE) + name = models.CharField(max_length=60) + + class Meta: + constraints = [models.UniqueConstraint(fields=['project', 'name'], name='unique_project_tag')] + + +class Card(models.Model): + PRIORITY = [('low', 'Low'), ('medium', 'Medium'), ('high', 'High')] + TYPE = [(x, x.title()) for x in ('feature', 'bug', 'task', 'research', 'idea')] + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name='cards') + column = models.ForeignKey(Column, on_delete=models.PROTECT, related_name='cards') + title = models.CharField(max_length=250) + description_markdown = models.TextField(blank=True) + priority = models.CharField(max_length=6, choices=PRIORITY, default='medium') + card_type = models.CharField(max_length=8, choices=TYPE, default='task') + tags = models.ManyToManyField(Tag, blank=True) + assignee = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, on_delete=models.SET_NULL, related_name='assigned_cards') + due_date = models.DateField(null=True, blank=True) + position = models.PositiveIntegerField(default=0) + created_by = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT, related_name='created_cards') + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + completed_at = models.DateTimeField(null=True, blank=True) + archived = models.BooleanField(default=False) + revision = models.PositiveIntegerField(default=1) + is_blocked = models.BooleanField(default=False) + blocked_reason = models.TextField(blank=True) + + class Meta: + ordering = ['position', 'created_at'] + indexes = [models.Index(fields=['project', 'archived', 'priority']), models.Index(fields=['column', 'position'])] + + +class CardRevision(models.Model): + card = models.ForeignKey(Card, on_delete=models.CASCADE, related_name='revisions') + revision = models.PositiveIntegerField() + markdown = models.TextField() + actor = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL) + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + constraints = [models.UniqueConstraint(fields=['card', 'revision'], name='unique_card_revision')] + + +class CardComment(models.Model): + card = models.ForeignKey(Card, on_delete=models.CASCADE, related_name='comments') + author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT) + body = models.TextField() + created_at = models.DateTimeField(auto_now_add=True) + + +class Activity(models.Model): + project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name='activity') + card = models.ForeignKey(Card, null=True, blank=True, on_delete=models.CASCADE, related_name='activity') + actor = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL) + action = models.CharField(max_length=60) + detail = models.JSONField(default=dict) + origin = models.CharField(max_length=8, default='web') + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + ordering = ['-created_at'] diff --git a/projects/services.py b/projects/services.py new file mode 100644 index 0000000..701f9e5 --- /dev/null +++ b/projects/services.py @@ -0,0 +1,121 @@ +from django.core.exceptions import PermissionDenied, ValidationError +from django.db import transaction +from django.db.models import Q, Max +from django.shortcuts import get_object_or_404 +from django.utils import timezone +from django.utils.text import slugify +from .models import Activity, Board, Card, CardRevision, Column, Membership, Project + + +class RevisionConflict(Exception): + def __init__(self, current): + self.current = current + + +def accessible(user): + return Project.objects.filter(Q(owner=user) | Q(memberships__user=user)).distinct() + + +def project_for(user, identifier, write=False): + project = get_object_or_404(accessible(user), pk=identifier) + if write and project.owner_id != user.pk and not Membership.objects.filter(project=project, user=user, role='editor').exists(): + raise PermissionDenied + return project + + +def card_for(user, identifier, write=False): + card = get_object_or_404(Card.objects.select_related('project', 'column'), pk=identifier, project__in=accessible(user)) + if write: + project_for(user, card.project_id, write=True) + return card + + +@transaction.atomic +def create_project(user, *, name, description='', git_repository_url=''): + base = slugify(name) or 'project' + slug = base + n = 2 + while Project.objects.filter(owner=user, slug=slug).exists(): + slug = f'{base}-{n}' + n += 1 + project = Project.objects.create(owner=user, name=name, slug=slug, description=description, git_repository_url=git_repository_url) + board = Board.objects.create(project=project) + for index, title in enumerate(('To-do', 'In Progress', 'Done')): + Column.objects.create(board=board, name=title, position=index, is_default=index == 0, is_done=index == 2) + Activity.objects.create(project=project, actor=user, action='project.created') + return project + + +@transaction.atomic +def create_card(user, project, *, title, markdown='', column=None, priority='medium', card_type='task', origin='web'): + project_for(user, project.pk, write=True) + if priority not in dict(Card.PRIORITY) or card_type not in dict(Card.TYPE): + raise ValidationError('Invalid priority or card type.') + column = column or project.board.columns.get(is_default=True, archived=False) + if column.board_id != project.board.pk or column.archived: + raise ValidationError('Column is not available in this project.') + position = (Card.objects.filter(column=column, archived=False).aggregate(Max('position'))['position__max'] or 0) + 1 + card = Card.objects.create(project=project, column=column, title=title, description_markdown=markdown, + priority=priority, card_type=card_type, position=position, created_by=user, + completed_at=timezone.now() if column.is_done else None) + CardRevision.objects.create(card=card, revision=1, markdown=markdown, actor=user) + Activity.objects.create(project=project, card=card, actor=user, action='card.created', origin=origin) + return card + + +@transaction.atomic +def update_card(user, card, *, expected_revision=None, origin='web', **changes): + card = Card.objects.select_for_update().get(pk=card.pk) + project_for(user, card.project_id, write=True) + allowed = {'title', 'description_markdown', 'priority', 'card_type', 'is_blocked', 'blocked_reason', 'archived', 'due_date'} + if set(changes) - allowed: + raise ValidationError('Unsupported card field.') + if 'priority' in changes and changes['priority'] not in dict(Card.PRIORITY): + raise ValidationError('Invalid priority.') + markdown_changed = 'description_markdown' in changes and changes['description_markdown'] != card.description_markdown + if changes and (expected_revision is None or int(expected_revision) != card.revision): + raise RevisionConflict(card.revision) + changed = [] + for field, value in changes.items(): + if getattr(card, field) != value: + setattr(card, field, value) + changed.append(field) + if markdown_changed: + card.revision += 1 + if changed: + card.save() + if markdown_changed: + CardRevision.objects.create(card=card, revision=card.revision, markdown=card.description_markdown, actor=user) + Activity.objects.create(project=card.project, card=card, actor=user, action='card.updated', detail={'fields': changed}, origin=origin) + return card + + +@transaction.atomic +def move_card(user, card, column, position=None, origin='web'): + card = Card.objects.select_for_update().get(pk=card.pk) + project_for(user, card.project_id, write=True) + if column.board.project_id != card.project_id or column.archived: + raise ValidationError('Column is not available in this project.') + old_column = card.column_id + card.column = column + card.completed_at = timezone.now() if column.is_done and not card.completed_at else (None if not column.is_done else card.completed_at) + siblings = list(Card.objects.filter(column=column, archived=False).exclude(pk=card.pk).order_by('position', 'created_at')) + index = len(siblings) if position is None else max(0, min(int(position), len(siblings))) + siblings.insert(index, card) + for i, item in enumerate(siblings): + item.position = i + item.save(update_fields=['position']) + card.save() + Activity.objects.create(project=card.project, card=card, actor=user, action='card.moved', detail={'from': str(old_column), 'to': str(column.pk)}, origin=origin) + return card + + +@transaction.atomic +def set_default(user, column): + project_for(user, column.board.project_id, write=True) + if column.archived: + raise ValidationError('Archived column cannot be the default.') + Column.objects.filter(board=column.board, is_default=True).update(is_default=False) + column.is_default = True + column.save(update_fields=['is_default']) + return column diff --git a/projects/templates/projects/_board.html b/projects/templates/projects/_board.html new file mode 100644 index 0000000..c660002 --- /dev/null +++ b/projects/templates/projects/_board.html @@ -0,0 +1 @@ +
{% for column in columns %}
{{ column.name }}{% if column.is_default %} · Default{% endif %}Edit
{% for card in column.visible_cards %}
{{ card.title }}
{{ card.get_priority_display }} {{ card.get_card_type_display }}{% if card.is_blocked %}Blocked{% endif %}
{% csrf_token %}
{% endfor %}
{% endfor %}
diff --git a/projects/templates/projects/_project_list.html b/projects/templates/projects/_project_list.html new file mode 100644 index 0000000..782134c --- /dev/null +++ b/projects/templates/projects/_project_list.html @@ -0,0 +1 @@ +
{% for project in projects %}

{{ project.name }}

{{ project.description|truncatechars:180 }}

{{ project.card_count }} cards{% if project.git_repository_url %}

Repository

{% endif %}
{% empty %}

No projects found.

{% endfor %}
diff --git a/projects/templates/projects/board.html b/projects/templates/projects/board.html new file mode 100644 index 0000000..1635158 --- /dev/null +++ b/projects/templates/projects/board.html @@ -0,0 +1 @@ +{% extends 'core/base.html' %}{% block content %}
All projects

{{ project.name }}

{{ project.description }}

{% if project.git_repository_url %}Repository{% endif %}
Edit project New card
{% include 'projects/_board.html' %}
Add column{% csrf_token %}{% endblock %} diff --git a/projects/templates/projects/card.html b/projects/templates/projects/card.html new file mode 100644 index 0000000..31964d9 --- /dev/null +++ b/projects/templates/projects/card.html @@ -0,0 +1 @@ +{% extends 'core/base.html' %}{% load project_markdown %}{% block content %}← {{ card.project.name }}

{{ card.title }}

Edit

{{ card.get_priority_display }} {{ card.column.name }} · {{ card.get_card_type_display }} · Revision {{ card.revision }}

{{ card.description_markdown|safe_markdown }}

Progress notes

{% for comment in card.comments.all %}
{{ comment.author }} · {{ comment.created_at }}

{{ comment.body|linebreaksbr }}

{% endfor %}
{% csrf_token %}

History

{% endblock %} diff --git a/projects/templates/projects/form.html b/projects/templates/projects/form.html new file mode 100644 index 0000000..252b02f --- /dev/null +++ b/projects/templates/projects/form.html @@ -0,0 +1 @@ +{% extends 'core/base.html' %}{% block content %}

{{ title }}

{% csrf_token %}{{ form.as_p }}
{% endblock %} diff --git a/projects/templates/projects/list.html b/projects/templates/projects/list.html new file mode 100644 index 0000000..1403863 --- /dev/null +++ b/projects/templates/projects/list.html @@ -0,0 +1 @@ +{% extends 'core/base.html' %}{% block content %}

Projects

Boards and specifications across your workspace.

New project
{% include 'projects/_project_list.html' %}
{% endblock %} diff --git a/projects/templates/projects/login.html b/projects/templates/projects/login.html new file mode 100644 index 0000000..7a0814a --- /dev/null +++ b/projects/templates/projects/login.html @@ -0,0 +1 @@ +Sign in · Common Ground

Common Ground

Sign in to your dashboard.

{% csrf_token %}{{ form.as_p }}
diff --git a/projects/templates/projects/profile.html b/projects/templates/projects/profile.html new file mode 100644 index 0000000..9b17e56 --- /dev/null +++ b/projects/templates/projects/profile.html @@ -0,0 +1 @@ +{% extends 'core/base.html' %}{% block content %}

Profile

Account

{% csrf_token %}{{ form.as_p }}
Change password
{% csrf_token %}

MCP connections

Remote MCP and OAuth connections are being prepared. No clients are connected.

{% endblock %} diff --git a/projects/templatetags/__init__.py b/projects/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/projects/templatetags/project_markdown.py b/projects/templatetags/project_markdown.py new file mode 100644 index 0000000..a769188 --- /dev/null +++ b/projects/templatetags/project_markdown.py @@ -0,0 +1,12 @@ +import markdown +import nh3 +from django import template +from django.utils.safestring import mark_safe + +register = template.Library() + + +@register.filter +def safe_markdown(value): + html = markdown.markdown(value or '', extensions=['extra', 'fenced_code', 'tables', 'sane_lists']) + return mark_safe(nh3.clean(html, tags={'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ul', 'ol', 'li', 'pre', 'code', 'blockquote', 'strong', 'em', 'a', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'hr', 'br', 'input'}, attributes={'a': {'href', 'title'}, 'input': {'type', 'checked', 'disabled'}}, url_schemes={'https', 'http', 'mailto'})) diff --git a/projects/tests.py b/projects/tests.py new file mode 100644 index 0000000..ff9069e --- /dev/null +++ b/projects/tests.py @@ -0,0 +1,39 @@ +from django.contrib.auth import get_user_model +from django.test import TestCase +from django.urls import reverse +from .models import Card, CardRevision +from .services import RevisionConflict, card_for, create_card, create_project, move_card, update_card + + +class ProjectWorkflowTests(TestCase): + def setUp(self): + users = get_user_model() + self.owner = users.objects.create_user('owner', password='test-password') + self.other = users.objects.create_user('other', password='test-password') + self.project = create_project(self.owner, name='BoomCast', git_repository_url='https://example.com/repo') + + def test_default_card_and_revision_conflict(self): + card = create_card(self.owner, self.project, title='Field notes', markdown='# Notes\n\n```py\nprint(1)\n```') + self.assertEqual(card.priority, 'medium') + self.assertTrue(card.column.is_default) + self.assertEqual(CardRevision.objects.get(card=card).markdown, card.description_markdown) + update_card(self.owner, card, expected_revision=1, description_markdown='# Revised') + with self.assertRaises(RevisionConflict): + update_card(self.owner, card, expected_revision=1, description_markdown='# Overwritten') + self.assertEqual(Card.objects.get(pk=card.pk).description_markdown, '# Revised') + + def test_access_and_move(self): + card = create_card(self.owner, self.project, title='A') + self.assertEqual(self.client.get(reverse('projects:board', args=[self.project.pk])).status_code, 302) + self.client.force_login(self.other) + self.assertEqual(self.client.get(reverse('projects:board', args=[self.project.pk])).status_code, 404) + self.client.force_login(self.owner) + done = self.project.board.columns.get(is_done=True) + move_card(self.owner, card, done) + card.refresh_from_db() + self.assertIsNotNone(card.completed_at) + + def test_existing_dashboard_requires_login(self): + self.assertEqual(self.client.get('/').status_code, 302) + self.client.force_login(self.owner) + self.assertEqual(self.client.get('/').status_code, 200) diff --git a/projects/urls.py b/projects/urls.py new file mode 100644 index 0000000..4998eb0 --- /dev/null +++ b/projects/urls.py @@ -0,0 +1,23 @@ +from django.urls import path +from . import views + +app_name = 'projects' +urlpatterns = [ + path('', views.project_list, name='list'), + path('new/', views.project_create, name='create'), + path('profile/', views.profile, name='profile'), + path('/', views.board, name='board'), + path('/edit/', views.project_edit, name='edit'), + path('/archive/', views.project_archive, name='archive'), + path('/cards/new/', views.card_create, name='card_create'), + path('/columns/new/', views.column_create, name='column_create'), + path('/columns/reorder/', views.column_reorder, name='column_reorder'), + path('columns//edit/', views.column_edit, name='column_edit'), + path('columns//default/', views.column_default, name='column_default'), + path('columns//archive/', views.column_archive, name='column_archive'), + path('cards//', views.card_detail, name='card'), + path('cards//edit/', views.card_edit, name='card_edit'), + path('cards//move/', views.card_move, name='card_move'), + path('cards//comment/', views.card_comment, name='card_comment'), + path('cards//archive/', views.card_archive, name='card_archive'), +] diff --git a/projects/views.py b/projects/views.py new file mode 100644 index 0000000..d02ccfa --- /dev/null +++ b/projects/views.py @@ -0,0 +1,203 @@ +from django.contrib.auth.decorators import login_required +from django.core.exceptions import ValidationError +from django.db.models import Q, Count +from django.http import HttpResponseBadRequest, JsonResponse +from django.shortcuts import get_object_or_404, redirect, render +from django.views.decorators.http import require_POST +from .forms import CardForm, ColumnForm, ProfileForm, ProjectForm +from .models import Card, CardComment, Column, Profile +from . import services + + +@login_required +def project_list(request): + query = request.GET.get('q', '').strip() + projects = services.accessible(request.user).filter(archived=False) + if query: + projects = projects.filter(Q(name__icontains=query) | Q(description__icontains=query) | Q(cards__title__icontains=query) | Q(cards__description_markdown__icontains=query)).distinct() + projects = projects.annotate(card_count=Count('cards', distinct=True)).order_by('name') + template = 'projects/_project_list.html' if request.headers.get('HX-Request') else 'projects/list.html' + return render(request, template, {'projects': projects, 'query': query, 'section': 'projects', 'title': 'Projects'}) + + +@login_required +def project_create(request): + form = ProjectForm(request.POST or None) + if request.method == 'POST' and form.is_valid(): + project = services.create_project(request.user, **form.cleaned_data) + return redirect('projects:board', project_id=project.pk) + return render(request, 'projects/form.html', {'form': form, 'title': 'New project', 'section': 'projects'}) + + +@login_required +def project_edit(request, project_id): + project = services.project_for(request.user, project_id, write=True) + form = ProjectForm(request.POST or None, instance=project) + if request.method == 'POST' and form.is_valid(): + form.save() + return redirect('projects:board', project_id=project.pk) + return render(request, 'projects/form.html', {'form': form, 'title': 'Edit project', 'section': 'projects'}) + + +@login_required +@require_POST +def project_archive(request, project_id): + project = services.project_for(request.user, project_id, write=True) + project.archived = True + project.save(update_fields=['archived']) + return redirect('projects:list') + + +@login_required +def board(request, project_id): + project = services.project_for(request.user, project_id) + columns = list(project.board.columns.filter(archived=False)) + cards = Card.objects.filter(project=project, archived=False) + query = request.GET.get('q', '').strip() + if query: + cards = cards.filter(Q(title__icontains=query) | Q(description_markdown__icontains=query) | Q(tags__name__icontains=query)).distinct() + for field in ('priority', 'card_type'): + if request.GET.get(field): + cards = cards.filter(**{field: request.GET[field]}) + if request.GET.get('column'): + cards = cards.filter(column_id__in=[c.pk for c in columns if str(c.pk) == request.GET['column']]) + cards = list(cards) + for column in columns: + column.visible_cards = [card for card in cards if card.column_id == column.pk] + context = {'project': project, 'columns': columns, 'query': query, 'title': project.name, 'section': 'projects', 'card_count': len(cards)} + template = 'projects/_board.html' if request.headers.get('HX-Request') else 'projects/board.html' + return render(request, template, context) + + +@login_required +def card_create(request, project_id): + project = services.project_for(request.user, project_id, write=True) + form = CardForm(request.POST or None) + if request.method == 'POST' and form.is_valid(): + data = form.cleaned_data + card = services.create_card(request.user, project, title=data['title'], markdown=data['description_markdown'], priority=data['priority'], card_type=data['card_type']) + services.update_card(request.user, card, expected_revision=card.revision, due_date=data['due_date'], is_blocked=data['is_blocked'], blocked_reason=data['blocked_reason']) + return redirect('projects:card', card_id=card.pk) + return render(request, 'projects/form.html', {'form': form, 'title': 'New card', 'section': 'projects'}) + + +@login_required +def card_detail(request, card_id): + card = services.card_for(request.user, card_id) + return render(request, 'projects/card.html', {'card': card, 'title': card.title, 'section': 'projects'}) + + +@login_required +def card_edit(request, card_id): + card = services.card_for(request.user, card_id, write=True) + form = CardForm(request.POST or None, instance=card, initial={'expected_revision': card.revision}) + if request.method == 'POST' and form.is_valid(): + try: + services.update_card(request.user, card, expected_revision=form.cleaned_data['expected_revision'], **{field: form.cleaned_data[field] for field in CardForm.Meta.fields}) + return redirect('projects:card', card_id=card.pk) + except services.RevisionConflict as conflict: + form.add_error(None, f'This card changed since you opened it. Current revision: {conflict.current}. Copy your changes before reloading.') + return render(request, 'projects/form.html', {'form': form, 'title': 'Edit card', 'section': 'projects'}, status=409) + return render(request, 'projects/form.html', {'form': form, 'title': 'Edit card', 'section': 'projects'}) + + +@login_required +@require_POST +def card_move(request, card_id): + card = services.card_for(request.user, card_id, write=True) + column = get_object_or_404(Column, pk=request.POST.get('column_id'), board=card.project.board, archived=False) + try: + services.move_card(request.user, card, column, request.POST.get('position') or None) + except (ValidationError, ValueError) as exc: + return HttpResponseBadRequest(str(exc)) + if request.headers.get('HX-Request'): + return JsonResponse({'ok': True}) + return redirect('projects:board', project_id=card.project_id) + + +@login_required +def column_create(request, project_id): + project = services.project_for(request.user, project_id, write=True) + form = ColumnForm(request.POST or None) + if request.method == 'POST' and form.is_valid(): + column = form.save(commit=False) + column.board = project.board + column.position = project.board.columns.count() + column.save() + return redirect('projects:board', project_id=project.pk) + return render(request, 'projects/form.html', {'form': form, 'title': 'New column', 'section': 'projects'}) + + +@login_required +def column_edit(request, column_id): + column = get_object_or_404(Column, pk=column_id) + services.project_for(request.user, column.board.project_id, write=True) + form = ColumnForm(request.POST or None, instance=column) + if request.method == 'POST' and form.is_valid(): + form.save() + return redirect('projects:board', project_id=column.board.project_id) + return render(request, 'projects/form.html', {'form': form, 'title': 'Edit column', 'section': 'projects'}) + + +@login_required +@require_POST +def column_default(request, column_id): + column = get_object_or_404(Column, pk=column_id) + services.set_default(request.user, column) + return redirect('projects:board', project_id=column.board.project_id) + + +@login_required +@require_POST +def column_archive(request, column_id): + column = get_object_or_404(Column, pk=column_id) + services.project_for(request.user, column.board.project_id, write=True) + if column.is_default or column.cards.filter(archived=False).exists(): + return HttpResponseBadRequest('Choose another default and move cards before archiving this column.') + column.archived = True + column.save(update_fields=['archived']) + return redirect('projects:board', project_id=column.board.project_id) + + +@login_required +@require_POST +def column_reorder(request, project_id): + project = services.project_for(request.user, project_id, write=True) + ids = request.POST.getlist('columns') + columns = list(project.board.columns.filter(archived=False)) + if set(ids) != {str(c.pk) for c in columns} or len(ids) != len(columns): + return HttpResponseBadRequest('Invalid column order') + for index, value in enumerate(ids): + Column.objects.filter(pk=value).update(position=index) + return JsonResponse({'ok': True}) + + +@login_required +@require_POST +def card_comment(request, card_id): + card = services.card_for(request.user, card_id, write=True) + body = request.POST.get('body', '').strip() + if not body: + return HttpResponseBadRequest('Comment is required') + CardComment.objects.create(card=card, author=request.user, body=body) + return redirect('projects:card', card_id=card.pk) + + +@login_required +@require_POST +def card_archive(request, card_id): + card = services.card_for(request.user, card_id, write=True) + services.update_card(request.user, card, expected_revision=card.revision, archived=True) + return redirect('projects:board', project_id=card.project_id) + + +@login_required +def profile(request): + profile, _ = Profile.objects.get_or_create(user=request.user) + form = ProfileForm(request.POST or None, instance=profile, initial={'email': request.user.email}) + if request.method == 'POST' and form.is_valid(): + form.save() + request.user.email = form.cleaned_data['email'] + request.user.save(update_fields=['email']) + return redirect('projects:profile') + return render(request, 'projects/profile.html', {'form': form, 'title': 'Profile', 'section': 'profile'}) diff --git a/requirements.txt b/requirements.txt index 2b3853c..ef15b22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,3 @@ Django>=6.1,<6.2 +Markdown>=3.8,<4 +nh3>=0.2.21,<1