From 0508d7f2a4d271c3e4087eb8c2a04ce725fc50e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 14 Jan 2024 12:49:33 +0100 Subject: [PATCH] WIP. --- src/project/templates/base.html | 2 +- src/project/views.py | 34 -------- src/services/registry.py | 15 ++++ src/services/services.py | 6 ++ .../templates/services/service_detail.html | 9 ++ .../templates/services/service_subscribe.html | 18 ++++ .../services}/services_overview.html | 7 +- src/services/views.py | 85 +++++++++++++++++++ 8 files changed, 140 insertions(+), 36 deletions(-) create mode 100644 src/services/templates/services/service_detail.html create mode 100644 src/services/templates/services/service_subscribe.html rename src/{project/templates => services/templates/services}/services_overview.html (81%) diff --git a/src/project/templates/base.html b/src/project/templates/base.html index 3dd07c4..4ae7f38 100644 --- a/src/project/templates/base.html +++ b/src/project/templates/base.html @@ -79,7 +79,7 @@
  • - + Services
    • diff --git a/src/project/views.py b/src/project/views.py index 22f4c8c..d69e87b 100644 --- a/src/project/views.py +++ b/src/project/views.py @@ -21,37 +21,3 @@ if TYPE_CHECKING: def index(request: HttpRequest) -> HttpResponse: """View to show the index page.""" return render(request, "index.html") - - -@view( - paths="services/", - name="services", - login_required=True, -) -def services_overview(request: HttpRequest) -> HttpResponse: - """View to show the services overview.""" - active_services = [ - access.service_implementation - for access in ServiceAccess.objects.filter( - user=request.user, - ) - ] - - active_service_classes = [service.__class__ for service in active_services] - - services = [ - service - for _, service in ServiceRegistry.get_items() - if service not in active_service_classes - ] - - context = { - "non_active_services": services, - "active_services": active_services, - } - - return render( - request=request, - template_name="services_overview.html", - context=context, - ) diff --git a/src/services/registry.py b/src/services/registry.py index f80926d..70b5044 100644 --- a/src/services/registry.py +++ b/src/services/registry.py @@ -1,3 +1,4 @@ +from django import forms from django_registries.registry import Interface from django_registries.registry import Registry @@ -23,3 +24,17 @@ class ServiceInterface(Interface): # - maybe a list of tuples with the field name and the type of the field # this could be used to generate a form for the service, and also to validate # the data saved in a JSONField on the ServiceAccess model + + subscribe_fields: list[tuple[str, forms.Field]] = [] + + def get_form(self) -> type: + """Get the form for the service""" + print(self.subscribe_fields) + return type( + "ServiceForm", + (forms.Form,), + { + field_name: field_type + for field_name, field_type in self.subscribe_fields + }, + )() diff --git a/src/services/services.py b/src/services/services.py index f5e4998..9d5135d 100644 --- a/src/services/services.py +++ b/src/services/services.py @@ -1,3 +1,5 @@ +from django import forms + from .registry import ServiceInterface @@ -14,6 +16,10 @@ class MatrixService(ServiceInterface): url = "https://matrix.data.coop" description = "Matrix service for data.coop" + subscribe_fields = [ + ("username", forms.CharField()), + ] + class MastodonService(ServiceInterface): slug = "mastodon" diff --git a/src/services/templates/services/service_detail.html b/src/services/templates/services/service_detail.html new file mode 100644 index 0000000..3f67084 --- /dev/null +++ b/src/services/templates/services/service_detail.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} + +{% block content %} + +
    +

    {{ service.name }}

    +
    + +{% endblock %} diff --git a/src/services/templates/services/service_subscribe.html b/src/services/templates/services/service_subscribe.html new file mode 100644 index 0000000..8df66cb --- /dev/null +++ b/src/services/templates/services/service_subscribe.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block content %} + +
    +

    Subscribe to {{ service.name }}

    + +
    + {{ form }} + + +
    +
    + + +{% endblock %} diff --git a/src/project/templates/services_overview.html b/src/services/templates/services/services_overview.html similarity index 81% rename from src/project/templates/services_overview.html rename to src/services/templates/services/services_overview.html index 4678c4c..ba13a55 100644 --- a/src/project/templates/services_overview.html +++ b/src/services/templates/services/services_overview.html @@ -28,11 +28,16 @@

    {{ service.name }}

    {{ service.description }}

    + + + Read more + + | Visit
    - Subscribe + Subscribe {% endfor %} diff --git a/src/services/views.py b/src/services/views.py index 60f00ef..2eddf92 100644 --- a/src/services/views.py +++ b/src/services/views.py @@ -1 +1,86 @@ # Create your views here. +from django_view_decorator import namespaced_decorator_factory + +from membership.models import ServiceAccess +from services.registry import ServiceRegistry +from utils.view_utils import render + + +services_view = namespaced_decorator_factory( + namespace="services", + base_path="services", +) + + +@services_view( + paths="", + name="list", + login_required=True, +) +def services_overview(request): + active_services = [ + access.service_implementation + for access in ServiceAccess.objects.filter( + user=request.user, + ) + ] + + active_service_classes = [service.__class__ for service in active_services] + + services = [ + service + for _, service in ServiceRegistry.get_items() + if service not in active_service_classes + ] + + context = { + "non_active_services": services, + "active_services": active_services, + } + + return render( + request=request, + template_name="services/services_overview.html", + context=context, + ) + + +@services_view( + paths="/", + name="detail", + login_required=True, +) +def service_detail(request, service_slug): + service = ServiceRegistry.get(slug=service_slug) + + context = { + "service": service, + } + + return render( + request=request, + template_name="services/service_detail.html", + context=context, + ) + + +@services_view( + paths="/subscribe/", + name="subscribe", + login_required=True, +) +def service_subscribe(request, service_slug): + service = ServiceRegistry.get(slug=service_slug) + + # TODO: add a form to subscribe to the service + context = { + "service": service, + "base_path": "services:list", + "form": service.get_form(), + } + + return render( + request=request, + template_name="services/service_subscribe.html", + context=context, + )