Bump vite from 6.2.5 to 6.2.6

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.5 to 6.2.6.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.2.6/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.2.6/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.2.6
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

.env.example

@@ -10,7 +10,6 @@ DATABASE_URL=sqlite:///db.sqlite3
 
 REDIS_PORT=7963
 CACHE_URL=redis://127.0.0.1:${REDIS_PORT}/0
-TASK_BROKER_URL=redis://127.0.0.1:${REDIS_PORT}/1
 
 # Used to select which other services to run alongside
 # manage.py, pytest and runserver

.github/actions/setup_project/action.yml

@@ -1,24 +1,15 @@
 name: "Setup project"
 description: "Setup Python and Poetry"
-inputs:
-  full:
-    description: > 
-      If true, do a full setup, else install
-      only python, uv and non-xapian python deps
-    required: false
-    default: "false"
 runs:
   using: composite
   steps:
     - name: Install apt packages
-      if: ${{ inputs.full == 'true' }}
       uses: awalsh128/cache-apt-pkgs-action@v1.4.3
       with:
         packages: gettext
         version: 1.0  # increment to reset cache
 
     - name: Install Redis
-      if: ${{ inputs.full == 'true' }}
       uses: shogo82148/actions-setup-redis@v1
       with:
         redis-version: "7.x"
@@ -46,20 +37,15 @@ runs:
       shell: bash
 
     - name: Install Xapian
-      if: ${{ inputs.full == 'true' }}
       run: uv run ./manage.py install_xapian
       shell: bash
 
-    # compiling xapian accounts for almost the entirety of the virtualenv setup,
-    # so we save the virtual environment only on workflows where it has been installed
     - name: Save cached virtualenv
-      if: ${{ inputs.full == 'true' }}
       uses: actions/cache/save@v4
       with:
         key: venv-${{ runner.os }}-${{ hashFiles('.python-version') }}-${{ hashFiles('pyproject.toml') }}-${{ env.CACHE_SUFFIX }}
         path: .venv
 
     - name: Compile gettext messages
-      if: ${{ inputs.full == 'true' }}
       run: uv run ./manage.py compilemessages
       shell: bash

.github/workflows/ci.yml

@@ -11,7 +11,6 @@ env:
   SECRET_KEY: notTheRealOne
   DATABASE_URL: sqlite:///db.sqlite3
   CACHE_URL: redis://127.0.0.1:6379/0
-  TASK_BROKER_URL: redis://127.0.0.1:6379/1
 
 jobs:
   pre-commit:
@@ -37,8 +36,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
       - uses: ./.github/actions/setup_project
-        with:
-          full: true
         env:
           # To avoid race conditions on environment cache
           CACHE_SUFFIX: ${{ matrix.pytest-mark }}

.github/workflows/deploy_docs.yml

@@ -2,7 +2,11 @@ name: deploy_docs
 on:
   push:
     branches:
-      - taiste
+      - master
+env:
+  SECRET_KEY: notTheRealOne
+  DATABASE_URL: sqlite:///db.sqlite3
+  CACHE_URL: redis://127.0.0.1:6379/0
 permissions:
   contents: write
 jobs:

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.11.13
+    rev: v0.11.4
     hooks:
-      - id: ruff-check  # just check the code, and print the errors
-      - id: ruff-check  # actually fix the fixable errors, but print nothing
+      - id: ruff  # just check the code, and print the errors
+      - id: ruff  # actually fix the fixable errors, but print nothing
         args: ["--fix", "--silent"]
       # Run the formatter.
       - id: ruff-format

Procfile.service

@@ -1,2 +1 @@
 redis: redis-server --port $REDIS_PORT
-celery: uv run celery -A sith worker --beat -l INFO

accounting/__init__.py

@@ -0,0 +1,14 @@
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#

accounting/migrations/0001_initial.py

@@ -0,0 +1,280 @@
+from __future__ import unicode_literals
+
+import django.core.validators
+import django.db.models.deletion
+from django.db import migrations, models
+
+import counter.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="AccountingType",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                (
+                    "code",
+                    models.CharField(
+                        max_length=16,
+                        verbose_name="code",
+                        validators=[
+                            django.core.validators.RegexValidator(
+                                "^[0-9]*$",
+                                "An accounting type code contains only numbers",
+                            )
+                        ],
+                    ),
+                ),
+                ("label", models.CharField(max_length=128, verbose_name="label")),
+                (
+                    "movement_type",
+                    models.CharField(
+                        choices=[
+                            ("CREDIT", "Credit"),
+                            ("DEBIT", "Debit"),
+                            ("NEUTRAL", "Neutral"),
+                        ],
+                        max_length=12,
+                        verbose_name="movement type",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "accounting type",
+                "ordering": ["movement_type", "code"],
+            },
+        ),
+        migrations.CreateModel(
+            name="BankAccount",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("name", models.CharField(max_length=30, verbose_name="name")),
+                (
+                    "iban",
+                    models.CharField(max_length=255, blank=True, verbose_name="iban"),
+                ),
+                (
+                    "number",
+                    models.CharField(
+                        max_length=255, blank=True, verbose_name="account number"
+                    ),
+                ),
+            ],
+            options={"verbose_name": "Bank account", "ordering": ["club", "name"]},
+        ),
+        migrations.CreateModel(
+            name="ClubAccount",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("name", models.CharField(max_length=30, verbose_name="name")),
+            ],
+            options={
+                "verbose_name": "Club account",
+                "ordering": ["bank_account", "name"],
+            },
+        ),
+        migrations.CreateModel(
+            name="Company",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("name", models.CharField(max_length=60, verbose_name="name")),
+            ],
+            options={"verbose_name": "company"},
+        ),
+        migrations.CreateModel(
+            name="GeneralJournal",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("start_date", models.DateField(verbose_name="start date")),
+                (
+                    "end_date",
+                    models.DateField(
+                        null=True, verbose_name="end date", default=None, blank=True
+                    ),
+                ),
+                ("name", models.CharField(max_length=40, verbose_name="name")),
+                (
+                    "closed",
+                    models.BooleanField(verbose_name="is closed", default=False),
+                ),
+                (
+                    "amount",
+                    counter.fields.CurrencyField(
+                        decimal_places=2,
+                        default=0,
+                        verbose_name="amount",
+                        max_digits=12,
+                    ),
+                ),
+                (
+                    "effective_amount",
+                    counter.fields.CurrencyField(
+                        decimal_places=2,
+                        default=0,
+                        verbose_name="effective_amount",
+                        max_digits=12,
+                    ),
+                ),
+            ],
+            options={"verbose_name": "General journal", "ordering": ["-start_date"]},
+        ),
+        migrations.CreateModel(
+            name="Operation",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("number", models.IntegerField(verbose_name="number")),
+                (
+                    "amount",
+                    counter.fields.CurrencyField(
+                        decimal_places=2, max_digits=12, verbose_name="amount"
+                    ),
+                ),
+                ("date", models.DateField(verbose_name="date")),
+                ("remark", models.CharField(max_length=128, verbose_name="comment")),
+                (
+                    "mode",
+                    models.CharField(
+                        choices=[
+                            ("CHECK", "Check"),
+                            ("CASH", "Cash"),
+                            ("TRANSFERT", "Transfert"),
+                            ("CARD", "Credit card"),
+                        ],
+                        max_length=255,
+                        verbose_name="payment method",
+                    ),
+                ),
+                (
+                    "cheque_number",
+                    models.CharField(
+                        max_length=32,
+                        null=True,
+                        verbose_name="cheque number",
+                        default="",
+                        blank=True,
+                    ),
+                ),
+                ("done", models.BooleanField(verbose_name="is done", default=False)),
+                (
+                    "target_type",
+                    models.CharField(
+                        choices=[
+                            ("USER", "User"),
+                            ("CLUB", "Club"),
+                            ("ACCOUNT", "Account"),
+                            ("COMPANY", "Company"),
+                            ("OTHER", "Other"),
+                        ],
+                        max_length=10,
+                        verbose_name="target type",
+                    ),
+                ),
+                (
+                    "target_id",
+                    models.IntegerField(
+                        null=True, verbose_name="target id", blank=True
+                    ),
+                ),
+                (
+                    "target_label",
+                    models.CharField(
+                        max_length=32,
+                        blank=True,
+                        verbose_name="target label",
+                        default="",
+                    ),
+                ),
+                (
+                    "accounting_type",
+                    models.ForeignKey(
+                        null=True,
+                        related_name="operations",
+                        verbose_name="accounting type",
+                        to="accounting.AccountingType",
+                        blank=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                    ),
+                ),
+            ],
+            options={"ordering": ["-number"]},
+        ),
+        migrations.CreateModel(
+            name="SimplifiedAccountingType",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("label", models.CharField(max_length=128, verbose_name="label")),
+                (
+                    "accounting_type",
+                    models.ForeignKey(
+                        verbose_name="simplified accounting types",
+                        to="accounting.AccountingType",
+                        related_name="simplified_types",
+                        on_delete=django.db.models.deletion.CASCADE,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "simplified type",
+                "ordering": ["accounting_type__movement_type", "accounting_type__code"],
+            },
+        ),
+    ]

accounting/migrations/0002_auto_20160824_2152.py

@@ -0,0 +1,105 @@
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("club", "0001_initial"),
+        ("accounting", "0001_initial"),
+        ("core", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="operation",
+            name="invoice",
+            field=models.ForeignKey(
+                null=True,
+                related_name="operations",
+                verbose_name="invoice",
+                to="core.SithFile",
+                blank=True,
+                on_delete=django.db.models.deletion.CASCADE,
+            ),
+        ),
+        migrations.AddField(
+            model_name="operation",
+            name="journal",
+            field=models.ForeignKey(
+                verbose_name="journal",
+                to="accounting.GeneralJournal",
+                related_name="operations",
+                on_delete=django.db.models.deletion.CASCADE,
+            ),
+        ),
+        migrations.AddField(
+            model_name="operation",
+            name="linked_operation",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                blank=True,
+                to="accounting.Operation",
+                null=True,
+                related_name="operation_linked_to",
+                verbose_name="linked operation",
+                default=None,
+            ),
+        ),
+        migrations.AddField(
+            model_name="operation",
+            name="simpleaccounting_type",
+            field=models.ForeignKey(
+                null=True,
+                related_name="operations",
+                verbose_name="simple type",
+                to="accounting.SimplifiedAccountingType",
+                blank=True,
+                on_delete=django.db.models.deletion.CASCADE,
+            ),
+        ),
+        migrations.AddField(
+            model_name="generaljournal",
+            name="club_account",
+            field=models.ForeignKey(
+                verbose_name="club account",
+                to="accounting.ClubAccount",
+                related_name="journals",
+                on_delete=django.db.models.deletion.CASCADE,
+            ),
+        ),
+        migrations.AddField(
+            model_name="clubaccount",
+            name="bank_account",
+            field=models.ForeignKey(
+                verbose_name="bank account",
+                to="accounting.BankAccount",
+                related_name="club_accounts",
+                on_delete=django.db.models.deletion.CASCADE,
+            ),
+        ),
+        migrations.AddField(
+            model_name="clubaccount",
+            name="club",
+            field=models.ForeignKey(
+                verbose_name="club",
+                to="club.Club",
+                related_name="club_account",
+                on_delete=django.db.models.deletion.CASCADE,
+            ),
+        ),
+        migrations.AddField(
+            model_name="bankaccount",
+            name="club",
+            field=models.ForeignKey(
+                verbose_name="club",
+                to="club.Club",
+                related_name="bank_accounts",
+                on_delete=django.db.models.deletion.CASCADE,
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="operation", unique_together={("number", "journal")}
+        ),
+    ]

accounting/migrations/0003_auto_20160824_2203.py

@@ -0,0 +1,48 @@
+from __future__ import unicode_literals
+
+import phonenumber_field.modelfields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [("accounting", "0002_auto_20160824_2152")]
+
+    operations = [
+        migrations.AddField(
+            model_name="company",
+            name="city",
+            field=models.CharField(blank=True, verbose_name="city", max_length=60),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="country",
+            field=models.CharField(blank=True, verbose_name="country", max_length=32),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="email",
+            field=models.EmailField(blank=True, verbose_name="email", max_length=254),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="phone",
+            field=phonenumber_field.modelfields.PhoneNumberField(
+                blank=True, verbose_name="phone", max_length=128
+            ),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="postcode",
+            field=models.CharField(blank=True, verbose_name="postcode", max_length=10),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="street",
+            field=models.CharField(blank=True, verbose_name="street", max_length=60),
+        ),
+        migrations.AddField(
+            model_name="company",
+            name="website",
+            field=models.CharField(blank=True, verbose_name="website", max_length=64),
+        ),
+    ]

accounting/migrations/0004_auto_20161005_1505.py

@@ -0,0 +1,50 @@
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [("accounting", "0003_auto_20160824_2203")]
+
+    operations = [
+        migrations.CreateModel(
+            name="Label",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        primary_key=True,
+                        auto_created=True,
+                        serialize=False,
+                    ),
+                ),
+                ("name", models.CharField(max_length=64, verbose_name="label")),
+                (
+                    "club_account",
+                    models.ForeignKey(
+                        related_name="labels",
+                        verbose_name="club account",
+                        to="accounting.ClubAccount",
+                        on_delete=django.db.models.deletion.CASCADE,
+                    ),
+                ),
+            ],
+        ),
+        migrations.AddField(
+            model_name="operation",
+            name="label",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="operations",
+                null=True,
+                blank=True,
+                verbose_name="label",
+                to="accounting.Label",
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="label", unique_together={("name", "club_account")}
+        ),
+    ]

accounting/migrations/0005_auto_20170324_0917.py

@@ -0,0 +1,17 @@
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [("accounting", "0004_auto_20161005_1505")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="operation",
+            name="remark",
+            field=models.CharField(
+                null=True, max_length=128, blank=True, verbose_name="comment"
+            ),
+        )
+    ]

accounting/migrations/0006_remove_all_models.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.2.20 on 2025-03-14 16:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [("accounting", "0005_auto_20170324_0917")]
+
+    operations = [
+        migrations.RemoveField(model_name="bankaccount", name="club"),
+        migrations.RemoveField(model_name="clubaccount", name="bank_account"),
+        migrations.RemoveField(model_name="clubaccount", name="club"),
+        migrations.DeleteModel(name="Company"),
+        migrations.RemoveField(model_name="generaljournal", name="club_account"),
+        migrations.AlterUniqueTogether(name="label", unique_together=None),
+        migrations.RemoveField(model_name="label", name="club_account"),
+        migrations.AlterUniqueTogether(name="operation", unique_together=None),
+        migrations.RemoveField(model_name="operation", name="accounting_type"),
+        migrations.RemoveField(model_name="operation", name="invoice"),
+        migrations.RemoveField(model_name="operation", name="journal"),
+        migrations.RemoveField(model_name="operation", name="label"),
+        migrations.RemoveField(model_name="operation", name="linked_operation"),
+        migrations.RemoveField(model_name="operation", name="simpleaccounting_type"),
+        migrations.RemoveField(
+            model_name="simplifiedaccountingtype", name="accounting_type"
+        ),
+        migrations.DeleteModel(name="AccountingType"),
+        migrations.DeleteModel(name="BankAccount"),
+        migrations.DeleteModel(name="ClubAccount"),
+        migrations.DeleteModel(name="GeneralJournal"),
+        migrations.DeleteModel(name="Label"),
+        migrations.DeleteModel(name="Operation"),
+        migrations.DeleteModel(name="SimplifiedAccountingType"),
+    ]

accounting/models.py

@@ -0,0 +1,14 @@
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#

api/admin.py

@@ -1,55 +0,0 @@
-from django.contrib import admin, messages
-from django.db.models import QuerySet
-from django.http import HttpRequest
-from django.utils.translation import gettext_lazy as _
-
-from api.hashers import generate_key
-from api.models import ApiClient, ApiKey
-
-
-@admin.register(ApiClient)
-class ApiClientAdmin(admin.ModelAdmin):
-    list_display = ("name", "owner", "created_at", "updated_at")
-    search_fields = (
-        "name",
-        "owner__first_name",
-        "owner__last_name",
-        "owner__nick_name",
-    )
-    autocomplete_fields = ("owner", "groups", "client_permissions")
-
-
-@admin.register(ApiKey)
-class ApiKeyAdmin(admin.ModelAdmin):
-    list_display = ("name", "client", "created_at", "revoked")
-    list_filter = ("revoked",)
-    date_hierarchy = "created_at"
-
-    readonly_fields = ("prefix", "hashed_key")
-    actions = ("revoke_keys",)
-
-    def save_model(self, request: HttpRequest, obj: ApiKey, form, change):
-        if not change:
-            key, hashed = generate_key()
-            obj.prefix = key[: ApiKey.PREFIX_LENGTH]
-            obj.hashed_key = hashed
-            self.message_user(
-                request,
-                _(
-                    "The API key for %(name)s is: %(key)s. "
-                    "Please store it somewhere safe: "
-                    "you will not be able to see it again."
-                )
-                % {"name": obj.name, "key": key},
-                level=messages.WARNING,
-            )
-        return super().save_model(request, obj, form, change)
-
-    def get_readonly_fields(self, request, obj: ApiKey | None = None):
-        if obj is None or obj.revoked:
-            return ["revoked", *self.readonly_fields]
-        return self.readonly_fields
-
-    @admin.action(description=_("Revoke selected API keys"))
-    def revoke_keys(self, _request: HttpRequest, queryset: QuerySet[ApiKey]):
-        queryset.update(revoked=True)

api/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class ApiConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "api"

api/auth.py

@@ -1,20 +0,0 @@
-from django.http import HttpRequest
-from ninja.security import APIKeyHeader
-
-from api.hashers import get_hasher
-from api.models import ApiClient, ApiKey
-
-
-class ApiKeyAuth(APIKeyHeader):
-    param_name = "X-APIKey"
-
-    def authenticate(self, request: HttpRequest, key: str | None) -> ApiClient | None:
-        if not key or len(key) != ApiKey.KEY_LENGTH:
-            return None
-        hasher = get_hasher()
-        hashed_key = hasher.encode(key)
-        try:
-            key_obj = ApiKey.objects.get(revoked=False, hashed_key=hashed_key)
-        except ApiKey.DoesNotExist:
-            return None
-        return key_obj.client

api/hashers.py

@@ -1,43 +0,0 @@
-import functools
-import hashlib
-import secrets
-
-from django.contrib.auth.hashers import BasePasswordHasher
-from django.utils.crypto import constant_time_compare
-
-
-class Sha512ApiKeyHasher(BasePasswordHasher):
-    """
-    An API key hasher using the sha256 algorithm.
-
-    This hasher shouldn't be used in Django's `PASSWORD_HASHERS` setting.
-    It is insecure for use in hashing passwords, but is safe for hashing
-    high entropy, randomly generated API keys.
-    """
-
-    algorithm = "sha512"
-
-    def salt(self) -> str:
-        # No need for a salt on a high entropy key.
-        return ""
-
-    def encode(self, password: str, salt: str = "") -> str:
-        hashed = hashlib.sha512(password.encode()).hexdigest()
-        return f"{self.algorithm}$${hashed}"
-
-    def verify(self, password: str, encoded: str) -> bool:
-        encoded_2 = self.encode(password, "")
-        return constant_time_compare(encoded, encoded_2)
-
-
-@functools.cache
-def get_hasher():
-    return Sha512ApiKeyHasher()
-
-
-def generate_key() -> tuple[str, str]:
-    """Generate a [key, hash] couple."""
-    # this will result in key with a length of 72
-    key = str(secrets.token_urlsafe(54))
-    hasher = get_hasher()
-    return key, hasher.encode(key)

api/migrations/0001_initial.py

@@ -1,113 +0,0 @@
-# Generated by Django 5.2 on 2025-06-01 08:53
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    initial = True
-
-    dependencies = [
-        ("auth", "0012_alter_user_first_name_max_length"),
-        ("core", "0046_permissionrights"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="ApiClient",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("name", models.CharField(max_length=64, verbose_name="name")),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
-                (
-                    "client_permissions",
-                    models.ManyToManyField(
-                        blank=True,
-                        help_text="Specific permissions for this api client.",
-                        related_name="clients",
-                        to="auth.permission",
-                        verbose_name="client permissions",
-                    ),
-                ),
-                (
-                    "groups",
-                    models.ManyToManyField(
-                        blank=True,
-                        related_name="api_clients",
-                        to="core.group",
-                        verbose_name="groups",
-                    ),
-                ),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="api_clients",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="owner",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "api client",
-                "verbose_name_plural": "api clients",
-            },
-        ),
-        migrations.CreateModel(
-            name="ApiKey",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("name", models.CharField(blank=True, default="", verbose_name="name")),
-                (
-                    "prefix",
-                    models.CharField(
-                        editable=False, max_length=5, verbose_name="prefix"
-                    ),
-                ),
-                (
-                    "hashed_key",
-                    models.CharField(
-                        db_index=True,
-                        editable=False,
-                        max_length=136,
-                        verbose_name="hashed key",
-                    ),
-                ),
-                ("revoked", models.BooleanField(default=False, verbose_name="revoked")),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                (
-                    "client",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="api_keys",
-                        to="api.apiclient",
-                        verbose_name="api client",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "api key",
-                "verbose_name_plural": "api keys",
-                "permissions": [("revoke_apikey", "Revoke API keys")],
-            },
-        ),
-    ]

api/models.py

@@ -1,94 +0,0 @@
-from typing import Iterable
-
-from django.contrib.auth.models import Permission
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from django.utils.translation import pgettext_lazy
-
-from core.models import Group, User
-
-
-class ApiClient(models.Model):
-    name = models.CharField(_("name"), max_length=64)
-    owner = models.ForeignKey(
-        User,
-        verbose_name=_("owner"),
-        related_name="api_clients",
-        on_delete=models.CASCADE,
-    )
-    groups = models.ManyToManyField(
-        Group, verbose_name=_("groups"), related_name="api_clients", blank=True
-    )
-    client_permissions = models.ManyToManyField(
-        Permission,
-        verbose_name=_("client permissions"),
-        blank=True,
-        help_text=_("Specific permissions for this api client."),
-        related_name="clients",
-    )
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-
-    _perm_cache: set[str] | None = None
-
-    class Meta:
-        verbose_name = _("api client")
-        verbose_name_plural = _("api clients")
-
-    def __str__(self):
-        return self.name
-
-    def has_perm(self, perm: str):
-        """Return True if the client has the specified permission."""
-
-        if self._perm_cache is None:
-            group_permissions = (
-                Permission.objects.filter(group__group__in=self.groups.all())
-                .values_list("content_type__app_label", "codename")
-                .order_by()
-            )
-            client_permissions = self.client_permissions.values_list(
-                "content_type__app_label", "codename"
-            ).order_by()
-            self._perm_cache = {
-                f"{content_type}.{name}"
-                for content_type, name in (*group_permissions, *client_permissions)
-            }
-        return perm in self._perm_cache
-
-    def has_perms(self, perm_list):
-        """
-        Return True if the client has each of the specified permissions. If
-        object is passed, check if the client has all required perms for it.
-        """
-        if not isinstance(perm_list, Iterable) or isinstance(perm_list, str):
-            raise ValueError("perm_list must be an iterable of permissions.")
-        return all(self.has_perm(perm) for perm in perm_list)
-
-
-class ApiKey(models.Model):
-    PREFIX_LENGTH = 5
-    KEY_LENGTH = 72
-    HASHED_KEY_LENGTH = 136
-
-    name = models.CharField(_("name"), blank=True, default="")
-    prefix = models.CharField(_("prefix"), max_length=PREFIX_LENGTH, editable=False)
-    hashed_key = models.CharField(
-        _("hashed key"), max_length=HASHED_KEY_LENGTH, db_index=True, editable=False
-    )
-    client = models.ForeignKey(
-        ApiClient,
-        verbose_name=_("api client"),
-        related_name="api_keys",
-        on_delete=models.CASCADE,
-    )
-    revoked = models.BooleanField(pgettext_lazy("api key", "revoked"), default=False)
-    created_at = models.DateTimeField(auto_now_add=True)
-
-    class Meta:
-        verbose_name = _("api key")
-        verbose_name_plural = _("api keys")
-        permissions = [("revoke_apikey", "Revoke API keys")]
-
-    def __str__(self):
-        return f"{self.name} ({self.prefix}***)"

api/tests/test_api_key.py

@@ -1,29 +0,0 @@
-import pytest
-from django.test import RequestFactory
-from model_bakery import baker
-
-from api.auth import ApiKeyAuth
-from api.hashers import generate_key
-from api.models import ApiClient, ApiKey
-
-
-@pytest.mark.django_db
-def test_api_key_auth():
-    key, hashed = generate_key()
-    client = baker.make(ApiClient)
-    baker.make(ApiKey, client=client, hashed_key=hashed)
-    auth = ApiKeyAuth()
-
-    assert auth.authenticate(RequestFactory().get(""), key) == client
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize(
-    ("key", "hashed"), [(generate_key()[0], generate_key()[1]), (generate_key()[0], "")]
-)
-def test_api_key_auth_invalid(key, hashed):
-    client = baker.make(ApiClient)
-    baker.make(ApiKey, client=client, hashed_key=hashed)
-    auth = ApiKeyAuth()
-
-    assert auth.authenticate(RequestFactory().get(""), key) is None

api/urls.py

@@ -1,10 +0,0 @@
-from ninja_extra import NinjaExtraAPI
-
-api = NinjaExtraAPI(
-    title="PICON",
-    description="Portail Interactif de Communication avec les Outils Numériques",
-    version="0.2.0",
-    urls_namespace="api",
-    csrf=True,
-)
-api.auto_discover_controllers()

club/api.py

@@ -1,42 +1,22 @@
 from typing import Annotated
 
 from annotated_types import MinLen
-from django.db.models import Prefetch
-from ninja.security import SessionAuth
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.pagination import PageNumberPaginationExtra
 from ninja_extra.schemas import PaginatedResponseSchema
 
-from api.auth import ApiKeyAuth
-from api.permissions import CanAccessLookup, HasPerm
-from club.models import Club, Membership
-from club.schemas import ClubSchema, SimpleClubSchema
+from club.models import Club
+from club.schemas import ClubSchema
+from core.auth.api_permissions import CanAccessLookup
 
 
 @api_controller("/club")
 class ClubController(ControllerBase):
     @route.get(
         "/search",
-        response=PaginatedResponseSchema[SimpleClubSchema],
-        auth=[SessionAuth(), ApiKeyAuth()],
+        response=PaginatedResponseSchema[ClubSchema],
         permissions=[CanAccessLookup],
-        url_name="search_club",
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
     def search_club(self, search: Annotated[str, MinLen(1)]):
         return Club.objects.filter(name__icontains=search).values()
-
-    @route.get(
-        "/{int:club_id}",
-        response=ClubSchema,
-        auth=[SessionAuth(), ApiKeyAuth()],
-        permissions=[HasPerm("club.view_club")],
-        url_name="fetch_club",
-    )
-    def fetch_club(self, club_id: int):
-        prefetch = Prefetch(
-            "members", queryset=Membership.objects.ongoing().select_related("user")
-        )
-        return self.get_object_or_exception(
-            Club.objects.prefetch_related(prefetch), id=club_id
-        )

club/forms.py

@@ -24,15 +24,13 @@
 
 from django import forms
 from django.conf import settings
-from django.db.models import Exists, OuterRef, Q
-from django.db.models.functions import Lower
 from django.utils.translation import gettext_lazy as _
 
 from club.models import Club, Mailing, MailingSubscription, Membership
 from core.models import User
 from core.views.forms import SelectDate, SelectDateTime
 from core.views.widgets.ajax_select import AutoCompleteSelectMultipleUser
-from counter.models import Counter, Selling
+from counter.models import Counter
 
 
 class ClubEditForm(forms.ModelForm):
@@ -161,21 +159,12 @@ class SellingsForm(forms.Form):
         label=_("End date"), widget=SelectDateTime, required=False
     )
 
+    counters = forms.ModelMultipleChoiceField(
+        Counter.objects.order_by("name").all(), label=_("Counter"), required=False
+    )
+
     def __init__(self, club, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # postgres struggles really hard with a single query having three WHERE conditions,
-        # but deals perfectly fine with UNION of multiple queryset with their own WHERE clause,
-        # so we do this to get the ids, which we use to build another queryset that can be used by django.
-        club_sales_subquery = Selling.objects.filter(counter=OuterRef("pk"), club=club)
-        ids = (
-            Counter.objects.filter(Q(club=club) | Q(products__club=club))
-            .union(Counter.objects.filter(Exists(club_sales_subquery)))
-            .values_list("id", flat=True)
-        )
-        counters_qs = Counter.objects.filter(id__in=ids).order_by(Lower("name"))
-        self.fields["counters"] = forms.ModelMultipleChoiceField(
-            counters_qs, label=_("Counter"), required=False
-        )
         self.fields["products"] = forms.ModelMultipleChoiceField(
             club.products.order_by("name").filter(archived=False).all(),
             label=_("Products"),

club/schemas.py

@@ -1,10 +1,9 @@
 from ninja import ModelSchema
 
-from club.models import Club, Membership
-from core.schemas import SimpleUserSchema
+from club.models import Club
 
 
-class SimpleClubSchema(ModelSchema):
+class ClubSchema(ModelSchema):
     class Meta:
         model = Club
         fields = ["id", "name"]
@@ -22,19 +21,3 @@ class ClubProfileSchema(ModelSchema):
     @staticmethod
     def resolve_url(obj: Club) -> str:
         return obj.get_absolute_url()
-
-
-class ClubMemberSchema(ModelSchema):
-    class Meta:
-        model = Membership
-        fields = ["start_date", "end_date", "role", "description"]
-
-    user: SimpleUserSchema
-
-
-class ClubSchema(ModelSchema):
-    class Meta:
-        model = Club
-        fields = ["id", "name", "logo", "is_active", "short_description", "address"]
-
-    members: list[ClubMemberSchema]

club/templates/club/club_tools.jinja

@@ -16,13 +16,22 @@
     </ul>
     <h4>{% trans %}Counters:{% endtrans %}</h4>
     <ul>
-      {% for c in object.counters.filter(type="OFFICE") %}
-        <li>{{ c }}:
-          <a href="{{ url('counter:details', counter_id=c.id) }}">View</a>
-          <a href="{{ url('counter:admin', counter_id=c.id) }}">Edit</a>
-        </li>
-      {% endfor %}
+      {% if object.id == settings.SITH_LAUNDERETTE_CLUB_ID %}
+        {% for l in Launderette.objects.all() %}
+          <li><a href="{{ url('launderette:main_click', launderette_id=l.id) }}">{{ l }}</a></li>
+        {% endfor %}
+      {% elif object.counters.filter(type="OFFICE")|count > 0 %}
+        {% for c in object.counters.filter(type="OFFICE") %}
+          <li>{{ c }}:
+            <a href="{{ url('counter:details', counter_id=c.id) }}">View</a>
+            <a href="{{ url('counter:admin', counter_id=c.id) }}">Edit</a>
+          </li>
+        {% endfor %}
+      {% endif %}
     </ul>
+    {% if object.id == settings.SITH_LAUNDERETTE_CLUB_ID %}
+      <li><a href="{{ url('launderette:launderette_list') }}">{% trans %}Manage launderettes{% endtrans %}</a></li>
+    {% endif %}
   </div>
 {% endblock %}
 

club/tests/test_club_controller.py

@@ -1,43 +0,0 @@
-from datetime import date, timedelta
-
-import pytest
-from django.test import Client
-from django.urls import reverse
-from model_bakery import baker
-from model_bakery.recipe import Recipe
-from pytest_django.asserts import assertNumQueries
-
-from club.models import Club, Membership
-from core.baker_recipes import subscriber_user
-
-
-@pytest.mark.django_db
-class TestFetchClub:
-    @pytest.fixture()
-    def club(self):
-        club = baker.make(Club)
-        last_month = date.today() - timedelta(days=30)
-        yesterday = date.today() - timedelta(days=1)
-        membership_recipe = Recipe(Membership, club=club, start_date=last_month)
-        membership_recipe.make(end_date=None, _quantity=10, _bulk_create=True)
-        membership_recipe.make(end_date=yesterday, _quantity=10, _bulk_create=True)
-        return club
-
-    def test_fetch_club_members(self, client: Client, club: Club):
-        user = subscriber_user.make()
-        client.force_login(user)
-        res = client.get(reverse("api:fetch_club", kwargs={"club_id": club.id}))
-        assert res.status_code == 200
-        member_ids = {member["user"]["id"] for member in res.json()["members"]}
-        assert member_ids == set(
-            club.members.ongoing().values_list("user_id", flat=True)
-        )
-
-    def test_fetch_club_nb_queries(self, client: Client, club: Club):
-        user = subscriber_user.make()
-        client.force_login(user)
-        with assertNumQueries(6):
-            # - 4 queries for authentication
-            # - 2 queries for the actual data
-            res = client.get(reverse("api:fetch_club", kwargs={"club_id": club.id}))
-            assert res.status_code == 200

club/tests/test_sales.py

@@ -3,11 +3,8 @@ from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 
-from club.forms import SellingsForm
 from club.models import Club
 from core.models import User
-from counter.baker_recipes import product_recipe, sale_recipe
-from counter.models import Counter, Customer
 
 
 @pytest.mark.django_db
@@ -17,22 +14,3 @@ def test_sales_page_doesnt_crash(client: Client):
     client.force_login(admin)
     response = client.get(reverse("club:club_sellings", kwargs={"club_id": club.id}))
     assert response.status_code == 200
-
-
-@pytest.mark.django_db
-def test_sales_form_counter_filter():
-    """Test that counters are properly filtered in SellingsForm"""
-    club = baker.make(Club)
-    counters = baker.make(
-        Counter, _quantity=5, _bulk_create=True, name=iter(["Z", "a", "B", "e", "f"])
-    )
-    counters[0].club = club
-    counters[0].save()
-    sale_recipe.make(
-        counter=counters[1], club=club, unit_price=0, customer=baker.make(Customer)
-    )
-    product_recipe.make(counters=[counters[2]], club=club)
-
-    form = SellingsForm(club)
-    form_counters = list(form.fields["counters"].queryset)
-    assert form_counters == [counters[1], counters[2], counters[0]]

club/widgets/ajax_select.py

@@ -1,7 +1,7 @@
 from pydantic import TypeAdapter
 
 from club.models import Club
-from club.schemas import SimpleClubSchema
+from club.schemas import ClubSchema
 from core.views.widgets.ajax_select import (
     AutoCompleteSelect,
     AutoCompleteSelectMultiple,
@@ -13,7 +13,7 @@ _js = ["bundled/club/components/ajax-select-index.ts"]
 class AutoCompleteSelectClub(AutoCompleteSelect):
     component_name = "club-ajax-select"
     model = Club
-    adapter = TypeAdapter(list[SimpleClubSchema])
+    adapter = TypeAdapter(list[ClubSchema])
 
     js = _js
 
@@ -21,6 +21,6 @@ class AutoCompleteSelectClub(AutoCompleteSelect):
 class AutoCompleteSelectMultipleClub(AutoCompleteSelectMultiple):
     component_name = "club-ajax-select"
     model = Club
-    adapter = TypeAdapter(list[SimpleClubSchema])
+    adapter = TypeAdapter(list[ClubSchema])
 
     js = _js

com/api.py

@@ -1,17 +1,16 @@
 from typing import Literal
 
 from django.http import HttpResponse
-from django.utils.cache import add_never_cache_headers
 from ninja import Query
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.pagination import PageNumberPaginationExtra
 from ninja_extra.permissions import IsAuthenticated
 from ninja_extra.schemas import PaginatedResponseSchema
 
-from api.permissions import HasPerm
 from com.ics_calendar import IcsCalendar
 from com.models import News, NewsDate
 from com.schemas import NewsDateFilterSchema, NewsDateSchema
+from core.auth.api_permissions import HasPerm
 from core.views.files import send_raw_file
 
 
@@ -19,9 +18,7 @@ from core.views.files import send_raw_file
 class CalendarController(ControllerBase):
     @route.get("/internal.ics", url_name="calendar_internal")
     def calendar_internal(self):
-        response = send_raw_file(IcsCalendar.get_internal())
-        add_never_cache_headers(response)
-        return response
+        return send_raw_file(IcsCalendar.get_internal())
 
     @route.get(
         "/unpublished.ics",
@@ -29,12 +26,10 @@ class CalendarController(ControllerBase):
         url_name="calendar_unpublished",
     )
     def calendar_unpublished(self):
-        response = HttpResponse(
+        return HttpResponse(
             IcsCalendar.get_unpublished(self.context.request.user),
             content_type="text/calendar",
         )
-        add_never_cache_headers(response)
-        return response
 
 
 @api_controller("/news")

com/models.py

@@ -160,16 +160,14 @@ class News(models.Model):
         )
 
 
-def news_notification_callback(notif: Notification):
-    # the NewsDate linked to the News
-    # which creation triggered this callback may not exist yet,
-    # so it's important to filter by "not past date" rather than by "future date"
+def news_notification_callback(notif):
     count = News.objects.filter(
-        ~Q(dates__start_date__gt=timezone.now()), is_published=False
+        dates__start_date__gt=timezone.now(), is_published=False
     ).count()
     if count:
         notif.viewed = False
         notif.param = str(count)
+        notif.date = timezone.now()
     else:
         notif.viewed = True
 
@@ -193,7 +191,7 @@ class NewsDateQuerySet(models.QuerySet):
 class NewsDate(models.Model):
     """A date associated with news.
 
-    A [News][com.models.News] can have multiple dates, for example if it is a recurring event.
+    A [News][] can have multiple dates, for example if it is a recurring event.
     """
 
     news = models.ForeignKey(

com/static/bundled/com/components/ics-calendar-index.ts

@@ -7,7 +7,6 @@ import frLocale from "@fullcalendar/core/locales/fr";
 import dayGridPlugin from "@fullcalendar/daygrid";
 import iCalendarPlugin from "@fullcalendar/icalendar";
 import listPlugin from "@fullcalendar/list";
-import { type HTMLTemplateResult, html, render } from "lit-html";
 import {
   calendarCalendarInternal,
   calendarCalendarUnpublished,
@@ -18,12 +17,11 @@ import {
 
 @registerComponent("ics-calendar")
 export class IcsCalendar extends inheritHtmlElement("div") {
-  static observedAttributes = ["locale", "can_moderate", "can_delete", "ics-help-url"];
+  static observedAttributes = ["locale", "can_moderate", "can_delete"];
   private calendar: Calendar;
   private locale = "en";
   private canModerate = false;
   private canDelete = false;
-  private helpUrl = "";
 
   attributeChangedCallback(name: string, _oldValue?: string, newValue?: string) {
     if (name === "locale") {
@@ -35,10 +33,6 @@ export class IcsCalendar extends inheritHtmlElement("div") {
     if (name === "can_delete") {
       this.canDelete = newValue.toLowerCase() === "true";
     }
-
-    if (name === "ics-help-url") {
-      this.helpUrl = newValue;
-    }
   }
 
   isMobile() {
@@ -54,11 +48,11 @@ export class IcsCalendar extends inheritHtmlElement("div") {
     if (this.isMobile()) {
       return {
         start: "",
-        center: "getCalendarLink helpButton",
+        center: "getCalendarLink",
         end: "",
       };
     }
-    return { start: "getCalendarLink helpButton", center: "", end: "" };
+    return { start: "getCalendarLink", center: "", end: "" };
   }
 
   currentHeaderToolbar() {
@@ -93,8 +87,15 @@ export class IcsCalendar extends inheritHtmlElement("div") {
     );
   }
 
-  refreshEvents() {
+  async refreshEvents() {
     this.click(); // Remove focus from popup
+    // We can't just refresh events because some ics files are in
+    // local browser cache (especially internal.ics)
+    // To invalidate the cache, we need to remove the source and add it again
+    this.calendar.removeAllEventSources();
+    for (const source of await this.getEventSources()) {
+      this.calendar.addEventSource(source);
+    }
     this.calendar.refetchEvents();
   }
 
@@ -113,7 +114,7 @@ export class IcsCalendar extends inheritHtmlElement("div") {
         },
       }),
     );
-    this.refreshEvents();
+    await this.refreshEvents();
   }
 
   async unpublishNews(id: number) {
@@ -131,7 +132,7 @@ export class IcsCalendar extends inheritHtmlElement("div") {
         },
       }),
     );
-    this.refreshEvents();
+    await this.refreshEvents();
   }
 
   async deleteNews(id: number) {
@@ -149,23 +150,22 @@ export class IcsCalendar extends inheritHtmlElement("div") {
         },
       }),
     );
-    this.refreshEvents();
+    await this.refreshEvents();
   }
 
   async getEventSources() {
+    const cacheInvalidate = `?invalidate=${Date.now()}`;
     return [
       {
-        url: `${await makeUrl(calendarCalendarInternal)}`,
+        url: `${await makeUrl(calendarCalendarInternal)}${cacheInvalidate}`,
         format: "ics",
         className: "internal",
-        cache: false,
       },
       {
-        url: `${await makeUrl(calendarCalendarUnpublished)}`,
+        url: `${await makeUrl(calendarCalendarUnpublished)}${cacheInvalidate}`,
         format: "ics",
         color: "red",
         className: "unpublished",
-        cache: false,
       },
     ];
   }
@@ -177,25 +177,29 @@ export class IcsCalendar extends inheritHtmlElement("div") {
       oldPopup.remove();
     }
 
-    const makePopupInfo = (info: HTMLTemplateResult, iconClass: string) => {
-      return html`
-        <div class="event-details-row">
-          <i class="event-detail-row-icon fa-xl ${iconClass}"></i>
-          ${info}
-        </div>
-      `;
+    const makePopupInfo = (info: HTMLElement, iconClass: string) => {
+      const row = document.createElement("div");
+      const icon = document.createElement("i");
+
+      row.setAttribute("class", "event-details-row");
+
+      icon.setAttribute("class", `event-detail-row-icon fa-xl ${iconClass}`);
+
+      row.appendChild(icon);
+      row.appendChild(info);
+
+      return row;
     };
 
     const makePopupTitle = (event: EventImpl) => {
-      const row = html`
-        <div>
-          <h4 class="event-details-row-content">
-            ${event.title}
-          </h4>
-          <span class="event-details-row-content">
-            ${this.formatDate(event.start)} - ${this.formatDate(event.end)}
-          </span>
-        </div>
+      const row = document.createElement("div");
+      row.innerHTML = `
+        <h4 class="event-details-row-content">
+          ${event.title}
+        </h4>
+        <span class="event-details-row-content">
+          ${this.formatDate(event.start)} - ${this.formatDate(event.end)}
+        </span>
       `;
       return makePopupInfo(
         row,
@@ -207,11 +211,9 @@ export class IcsCalendar extends inheritHtmlElement("div") {
       if (event.extendedProps.location === null) {
         return null;
       }
-      const info = html`
-        <div>
-          ${event.extendedProps.location}
-        </div>
-      `;
+      const info = document.createElement("div");
+      info.innerText = event.extendedProps.location;
+
       return makePopupInfo(info, "fa-solid fa-location-dot");
     };
 
@@ -219,7 +221,10 @@ export class IcsCalendar extends inheritHtmlElement("div") {
       if (event.url === "") {
         return null;
       }
-      const url = html`<a href="${event.url}">${gettext("More info")}</a>`;
+      const url = document.createElement("a");
+      url.href = event.url;
+      url.textContent = gettext("More info");
+
       return makePopupInfo(url, "fa-solid fa-link");
     };
 
@@ -228,59 +233,64 @@ export class IcsCalendar extends inheritHtmlElement("div") {
         return null;
       }
       const newsId = this.getNewsId(event);
-      const buttons = [] as HTMLTemplateResult[];
-
+      const div = document.createElement("div");
       if (this.canModerate) {
         if (event.source.internalEventSource.ui.classNames.includes("unpublished")) {
-          const button = html`
-            <button class="btn btn-green" @click="${() => this.publishNews(newsId)}">
-              <i class="fa fa-check"></i>${gettext("Publish")}
-            </button>
-          `;
-          buttons.push(button);
+          const button = document.createElement("button");
+          button.innerHTML = `<i class="fa fa-check"></i>${gettext("Publish")}`;
+          button.setAttribute("class", "btn btn-green");
+          button.onclick = () => {
+            this.publishNews(newsId);
+          };
+          div.appendChild(button);
         } else {
-          const button = html`
-            <button class="btn btn-orange" @click="${() => this.unpublishNews(newsId)}">
-              <i class="fa fa-times"></i>${gettext("Unpublish")}
-            </button>
-          `;
-          buttons.push(button);
+          const button = document.createElement("button");
+          button.innerHTML = `<i class="fa fa-times"></i>${gettext("Unpublish")}`;
+          button.setAttribute("class", "btn btn-orange");
+          button.onclick = () => {
+            this.unpublishNews(newsId);
+          };
+          div.appendChild(button);
         }
       }
       if (this.canDelete) {
-        const button = html`
-          <button class="btn btn-red" @click="${() => this.deleteNews(newsId)}">
-            <i class="fa fa-trash-can"></i>${gettext("Delete")}
-          </button>
-        `;
-        buttons.push(button);
+        const button = document.createElement("button");
+        button.innerHTML = `<i class="fa fa-trash-can"></i>${gettext("Delete")}`;
+        button.setAttribute("class", "btn btn-red");
+        button.onclick = () => {
+          this.deleteNews(newsId);
+        };
+        div.appendChild(button);
       }
 
-      return makePopupInfo(html`<div>${buttons}</div>`, "fa-solid fa-toolbox");
+      return makePopupInfo(div, "fa-solid fa-toolbox");
     };
 
     // Create new popup
-    const infos = [] as HTMLTemplateResult[];
-    infos.push(makePopupTitle(event.event));
+    const popup = document.createElement("div");
+    const popupContainer = document.createElement("div");
+
+    popup.setAttribute("id", "event-details");
+    popupContainer.setAttribute("class", "event-details-container");
+
+    popupContainer.appendChild(makePopupTitle(event.event));
 
     const location = makePopupLocation(event.event);
     if (location !== null) {
-      infos.push(location);
+      popupContainer.appendChild(location);
     }
 
     const url = makePopupUrl(event.event);
     if (url !== null) {
-      infos.push(url);
+      popupContainer.appendChild(url);
     }
 
     const tools = makePopupTools(event.event);
     if (tools !== null) {
-      infos.push(tools);
+      popupContainer.appendChild(tools);
     }
 
-    const popup = document.createElement("div");
-    popup.setAttribute("id", "event-details");
-    render(html`<div class="event-details-container">${infos}</div>`, popup);
+    popup.appendChild(popupContainer);
 
     // We can't just add the element relative to the one we want to appear under
     // Otherwise, it either gets clipped by the boundaries of the calendar or resize cells
@@ -310,14 +320,14 @@ export class IcsCalendar extends inheritHtmlElement("div") {
           click: async (event: Event) => {
             const button = event.target as HTMLButtonElement;
             button.classList.add("text-copy");
-            button.setAttribute("tooltip-class", "calendar-copy-tooltip");
-            if (!button.hasAttribute("tooltip-position")) {
-              button.setAttribute("tooltip-position", "top");
+            if (!button.hasAttribute("position")) {
+              button.setAttribute("tooltip", gettext("Link copied"));
+              button.setAttribute("position", "top");
+              button.setAttribute("no-hover", "");
             }
             if (button.classList.contains("text-copied")) {
               button.classList.remove("text-copied");
             }
-            button.setAttribute("tooltip", gettext("Link copied"));
             navigator.clipboard.writeText(
               new URL(
                 await makeUrl(calendarCalendarInternal),
@@ -325,22 +335,12 @@ export class IcsCalendar extends inheritHtmlElement("div") {
               ).toString(),
             );
             setTimeout(() => {
-              button.setAttribute("tooltip-class", "calendar-copy-tooltip text-copied");
               button.classList.remove("text-copied");
               button.classList.add("text-copied");
               button.classList.remove("text-copy");
             }, 1500);
           },
         },
-        helpButton: {
-          text: "?",
-          hint: gettext("How to use calendar link"),
-          click: () => {
-            if (this.helpUrl) {
-              window.open(this.helpUrl, "_blank");
-            }
-          },
-        },
       },
       height: "auto",
       locale: this.locale,
@@ -348,7 +348,6 @@ export class IcsCalendar extends inheritHtmlElement("div") {
       headerToolbar: this.currentHeaderToolbar(),
       footerToolbar: this.currentFooterToolbar(),
       eventSources: await this.getEventSources(),
-      lazyFetching: false,
       windowResize: () => {
         this.calendar.changeView(this.currentView());
         this.calendar.setOption("headerToolbar", this.currentHeaderToolbar());

com/static/bundled/com/components/upcoming-news-loader-index.ts

@@ -8,17 +8,13 @@ interface ParsedNewsDateSchema extends Omit<NewsDateSchema, "start_date" | "end_
 }
 
 document.addEventListener("alpine:init", () => {
-  Alpine.data("upcomingNewsLoader", (startDate: Date, locale: string) => ({
+  Alpine.data("upcomingNewsLoader", (startDate: Date) => ({
     startDate: startDate,
     currentPage: 1,
     pageSize: 6,
     hasNext: true,
     loading: false,
     newsDates: [] as NewsDateSchema[],
-    dateFormat: new Intl.DateTimeFormat(locale, {
-      dateStyle: "medium",
-      timeStyle: "short",
-    }),
 
     async loadMore() {
       this.loading = true;

com/static/com/components/ics-calendar.scss

@@ -1,5 +1,4 @@
 @import "core/static/core/colors";
-@import "core/static/core/tooltips";
 
 
 :root {
@@ -117,33 +116,8 @@ ics-calendar {
     transition: 500ms ease-out;
   }
 
-  .fc .fc-getCalendarLink-button {
-    margin-right: 0.5rem;
+  button.text-copied[tooltip]::before {
+    opacity: 0;
+    transition: opacity 500ms ease-out;
   }
-
-  .fc .fc-helpButton-button {
-    border-radius: 70%;
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
-    background-color: rgba(0, 0, 0, 0.8);
-    transition: 100ms ease-out;
-    width: 30px;
-    height: 30px;
-    font-size: 11px;
-  }
-
-
-  .fc .fc-helpButton-button:hover {
-    background-color: rgba(20, 20, 20, 0.6);
-  }
-}
-
-.tooltip.calendar-copy-tooltip {
-  opacity: 1;
-  transition: opacity 500ms ease-in;
-}
-
-.tooltip.calendar-copy-tooltip.text-copied {
-  opacity: 0;
-  transition: opacity 500ms ease-out;
 }

com/templates/com/news_detail.jinja

@@ -18,7 +18,7 @@
 {% endblock %}
 
 {% block additional_js %}
-  <script type="module" src={{ static("bundled/com/moderation-alert-index.ts") }}></script>
+  <script type="module" src={{ static("bundled/com/components/moderation-alert-index.ts") }}></script>
 {% endblock %}
 
 {% block content %}

com/templates/com/news_list.jinja

@@ -15,8 +15,8 @@
 
 {% block additional_js %}
   <script type="module" src={{ static("bundled/com/components/ics-calendar-index.ts") }}></script>
-  <script type="module" src={{ static("bundled/com/moderation-alert-index.ts") }}></script>
-  <script type="module" src={{ static("bundled/com/upcoming-news-loader-index.ts") }}></script>
+  <script type="module" src={{ static("bundled/com/components/moderation-alert-index.ts") }}></script>
+  <script type="module" src={{ static("bundled/com/components/upcoming-news-loader-index.ts") }}></script>
 {% endblock %}
 
 {% block content %}
@@ -84,11 +84,11 @@
                           <a href="{{ date.news.club.get_absolute_url() }}">{{ date.news.club }}</a>
                           <div class="news_date">
                             <time datetime="{{ date.start_date.isoformat(timespec="seconds") }}">
-                              {{ date.start_date|localtime|date(DATETIME_FORMAT) }},
+                              {{ date.start_date|localtime|date(DATETIME_FORMAT) }}
                               {{ date.start_date|localtime|time(DATETIME_FORMAT) }}
                             </time> -
                             <time datetime="{{ date.end_date.isoformat(timespec="seconds") }}">
-                              {{ date.end_date|localtime|date(DATETIME_FORMAT) }},
+                              {{ date.end_date|localtime|date(DATETIME_FORMAT) }}
                               {{ date.end_date|localtime|time(DATETIME_FORMAT) }}
                             </time>
                           </div>
@@ -103,7 +103,7 @@
               </div>
             </div>
           {% endfor %}
-          <div x-data="upcomingNewsLoader(new Date('{{ last_day + timedelta(days=1) }}'), '{{ get_language() }}')">
+          <div x-data="upcomingNewsLoader(new Date('{{ last_day + timedelta(days=1) }}'))">
             <template x-for="newsList in Object.values(groupedDates())">
               <div class="news_events_group">
                 <div class="news_events_group_date">
@@ -139,11 +139,11 @@
                             <div class="news_date">
                               <time
                                 :datetime="newsDate.start_date.toISOString()"
-                                x-text="dateFormat.format(newsDate.start_date)"
+                                x-text="`${newsDate.start_date.getHours()}:${newsDate.start_date.getMinutes()}`"
                               ></time> -
                               <time
                                 :datetime="newsDate.end_date.toISOString()"
-                                x-text="dateFormat.format(newsDate.end_date)"
+                                x-text="`${newsDate.end_date.getHours()}:${newsDate.end_date.getMinutes()}`"
                               ></time>
                             </div>
                           </div>
@@ -192,7 +192,6 @@
         @calendar-delete="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.DELETED})"
         @calendar-unpublish="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.PENDING})"
         @calendar-publish="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.PUBLISHED})"
-        ics-help-url="{{ url('core:page', page_name='Index/calendrier')}}"
         locale="{{ get_language() }}"
         can_moderate="{{ user.has_perm("com.moderate_news") }}"
         can_delete="{{ user.has_perm("com.delete_news") }}"

com/tests/test_notifications.py

@@ -1,23 +0,0 @@
-import pytest
-from django.conf import settings
-from model_bakery import baker
-
-from com.models import News
-from core.models import Group, Notification, User
-
-
-@pytest.mark.django_db
-def test_notification_created():
-    com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
-    com_admin_group.users.all().delete()
-    Notification.objects.all().delete()
-    com_admin = baker.make(User, groups=[com_admin_group])
-    for i in range(2):
-        # news notifications are permanent, so the notification created
-        # during the first iteration should be reused during the second one.
-        baker.make(News)
-        notifications = list(Notification.objects.all())
-        assert len(notifications) == 1
-        assert notifications[0].user == com_admin
-        assert notifications[0].type == "NEWS_MODERATION"
-        assert notifications[0].param == str(i + 1)

core/api.py

@@ -5,15 +5,13 @@ from django.conf import settings
 from django.db.models import F
 from django.http import HttpResponse
 from ninja import File, Query
-from ninja.security import SessionAuth
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.exceptions import PermissionDenied
 from ninja_extra.pagination import PageNumberPaginationExtra
 from ninja_extra.schemas import PaginatedResponseSchema
 
-from api.auth import ApiKeyAuth
-from api.permissions import CanAccessLookup, CanView, HasPerm
 from club.models import Mailing
+from core.auth.api_permissions import CanAccessLookup, CanView, HasPerm
 from core.models import Group, QuickUploadImage, SithFile, User
 from core.schemas import (
     FamilyGodfatherSchema,
@@ -92,7 +90,6 @@ class SithFileController(ControllerBase):
     @route.get(
         "/search",
         response=PaginatedResponseSchema[SithFileSchema],
-        auth=[SessionAuth(), ApiKeyAuth()],
         permissions=[CanAccessLookup],
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
@@ -105,7 +102,6 @@ class GroupController(ControllerBase):
     @route.get(
         "/search",
         response=PaginatedResponseSchema[GroupSchema],
-        auth=[SessionAuth(), ApiKeyAuth()],
         permissions=[CanAccessLookup],
     )
     @paginate(PageNumberPaginationExtra, page_size=50)

core/apps.py

@@ -32,6 +32,7 @@ class SithConfig(AppConfig):
     verbose_name = "Core app of the Sith"
 
     def ready(self):
+        import core.signals  # noqa F401
         from forum.models import Forum
 
         cache.clear()

core/auth/api_permissions.py

@@ -39,7 +39,7 @@ Example:
 
 import operator
 from functools import reduce
-from typing import Any, Callable
+from typing import Any
 
 from django.contrib.auth.models import Permission
 from django.http import HttpRequest
@@ -67,26 +67,21 @@ class HasPerm(BasePermission):
 
     Example:
         ```python
-        @api_controller("/foo")
-        class FooController(ControllerBase):
-            # this route will require both permissions
-            @route.put("/foo", permissions=[HasPerm(["foo.change_foo", "foo.add_foo"])]
-            def foo(self): ...
+        # this route will require both permissions
+        @route.put("/foo", permissions=[HasPerm(["foo.change_foo", "foo.add_foo"])]
+        def foo(self): ...
 
-            # This route will require at least one of the perm,
-            # but it's not mandatory to have all of them
-            @route.put(
-                "/bar",
-                permissions=[HasPerm(["foo.change_bar", "foo.add_bar"], op=operator.or_)],
-            )
-            def bar(self): ...
-        ```
+        # This route will require at least one of the perm,
+        # but it's not mandatory to have all of them
+        @route.put(
+            "/bar",
+            permissions=[HasPerm(["foo.change_bar", "foo.add_bar"], op=operator.or_)],
+        )
+        def bar(self): ...
     """
 
     def __init__(
-        self,
-        perms: str | Permission | list[str | Permission],
-        op: Callable[[bool, bool], bool] = operator.and_,
+        self, perms: str | Permission | list[str | Permission], op=operator.and_
     ):
         """
         Args:
@@ -101,16 +96,7 @@ class HasPerm(BasePermission):
         self._perms = perms
 
     def has_permission(self, request: HttpRequest, controller: ControllerBase) -> bool:
-        # if the request has the `auth` property,
-        # it means that the user has been explicitly authenticated
-        # using a django-ninja authentication backend
-        # (whether it is SessionAuth or ApiKeyAuth).
-        # If not, this authentication has not been done, but the user may
-        # still be implicitly authenticated through AuthenticationMiddleware
-        user = request.auth if hasattr(request, "auth") else request.user
-        # `user` may either be a `core.User` or an `api.ApiClient` ;
-        # they are not the same model, but they both implement the `has_perm` method
-        return reduce(self._operator, (user.has_perm(p) for p in self._perms))
+        return reduce(self._operator, (request.user.has_perm(p) for p in self._perms))
 
 
 class IsRoot(BasePermission):
@@ -194,4 +180,4 @@ class IsLoggedInCounter(BasePermission):
         return Counter.objects.filter(token=token).exists()
 
 
-CanAccessLookup = IsLoggedInCounter | HasPerm("core.access_lookup")
+CanAccessLookup = IsOldSubscriber | IsRoot | IsLoggedInCounter

core/auth/mixins.py

@@ -227,19 +227,6 @@ class FormerSubscriberMixin(AccessMixin):
         return super().dispatch(request, *args, **kwargs)
 
 
-class IsSubscriberMixin(AccessMixin):
-    """Check if the user is a subscriber.
-
-    Raises:
-        PermissionDenied: if the user isn't subscribed.
-    """
-
-    def dispatch(self, request, *args, **kwargs):
-        if not request.user.is_subscribed:
-            raise PermissionDenied
-        return super().dispatch(request, *args, **kwargs)
-
-
 class PermissionOrAuthorRequiredMixin(PermissionRequiredMixin):
     """Require that the user has the required perm or is the object author.
 

core/management/commands/populate.py

@@ -59,7 +59,6 @@ class PopulatedGroups(NamedTuple):
     counter_admin: Group
     accounting_admin: Group
     pedagogy_admin: Group
-    campus_admin: Group
 
 
 class Command(BaseCommand):
@@ -124,6 +123,11 @@ class Command(BaseCommand):
             name="PdF",
             address="6 Boulevard Anatole France, 90000 Belfort",
         )
+        Club.objects.create(
+            id=settings.SITH_LAUNDERETTE_CLUB_ID,
+            name="Laverie",
+            address="6 Boulevard Anatole France, 90000 Belfort",
+        )
 
         self.reset_index("club")
         for bar_id, bar_name in settings.SITH_COUNTER_BARS:
@@ -287,7 +291,13 @@ class Command(BaseCommand):
             page=services_page,
             title="Services",
             author=skia,
-            content="- [Eboutic](/eboutic)\n- Matmat\n- SAS\n- Weekmail\n- Forum",
+            content="""
+|   |   |   |
+| :---: | :---: | :---: |
+| [Eboutic](/eboutic) | [Laverie](/launderette) | Matmat |
+| SAS | Weekmail | Forum|
+
+""",
         )
 
         index_page = Page(name="Index")
@@ -296,10 +306,23 @@ class Command(BaseCommand):
             page=index_page,
             title="Wiki index",
             author=root,
-            content="Welcome to the wiki page!",
+            content="""
+Welcome to the wiki page!
+""",
         )
 
-        groups.public.viewable_page.set([syntax_page, services_page, index_page])
+        laundry_page = Page(name="launderette")
+        laundry_page.save(force_lock=True)
+        PageRev.objects.create(
+            page=laundry_page,
+            title="Laverie",
+            author=root,
+            content="Fonctionnement de la laverie",
+        )
+
+        groups.public.viewable_page.set(
+            [syntax_page, services_page, index_page, laundry_page]
+        )
 
         self._create_subscription(root)
         self._create_subscription(skia)
@@ -785,13 +808,13 @@ class Command(BaseCommand):
         # public has no permission.
         # Its purpose is not to link users to permissions,
         # but to other objects (like products)
-        public_group = Group.objects.create(name="Publique")
+        public_group = Group.objects.create(name="Public")
 
-        subscribers = Group.objects.create(name="Cotisants")
+        subscribers = Group.objects.create(name="Subscribers")
         subscribers.permissions.add(
             *list(perms.filter(codename__in=["add_news", "add_uvcomment"]))
         )
-        old_subscribers = Group.objects.create(name="Anciens cotisants")
+        old_subscribers = Group.objects.create(name="Old subscribers")
         old_subscribers.permissions.add(
             *list(
                 perms.filter(
@@ -806,19 +829,18 @@ class Command(BaseCommand):
                         "add_peoplepicturerelation",
                         "add_page",
                         "add_quickuploadimage",
-                        "view_club",
-                        "access_lookup",
                     ]
                 )
             )
         )
         accounting_admin = Group.objects.create(
-            name="Admin comptabilité", is_manually_manageable=True
+            name="Accounting admin", is_manually_manageable=True
         )
         accounting_admin.permissions.add(
             *list(
                 perms.filter(
-                    Q(
+                    Q(content_type__app_label="accounting")
+                    | Q(
                         codename__in=[
                             "view_customer",
                             "view_product",
@@ -834,7 +856,7 @@ class Command(BaseCommand):
             )
         )
         com_admin = Group.objects.create(
-            name="Admin communication", is_manually_manageable=True
+            name="Communication admin", is_manually_manageable=True
         )
         com_admin.permissions.add(
             *list(
@@ -842,24 +864,24 @@ class Command(BaseCommand):
             )
         )
         counter_admin = Group.objects.create(
-            name="Admin comptoirs", is_manually_manageable=True
+            name="Counter admin", is_manually_manageable=True
         )
         counter_admin.permissions.add(
             *list(
                 perms.filter(
-                    Q(content_type__app_label__in=["counter"])
+                    Q(content_type__app_label__in=["counter", "launderette"])
                     & ~Q(codename__in=["delete_product", "delete_producttype"])
                 )
             )
         )
-        sas_admin = Group.objects.create(name="Admin SAS", is_manually_manageable=True)
+        sas_admin = Group.objects.create(name="SAS admin", is_manually_manageable=True)
         sas_admin.permissions.add(
             *list(
                 perms.filter(content_type__app_label="sas").values_list("pk", flat=True)
             )
         )
         forum_admin = Group.objects.create(
-            name="Admin forum", is_manually_manageable=True
+            name="Forum admin", is_manually_manageable=True
         )
         forum_admin.permissions.add(
             *list(
@@ -869,7 +891,7 @@ class Command(BaseCommand):
             )
         )
         pedagogy_admin = Group.objects.create(
-            name="Admin pédagogie", is_manually_manageable=True
+            name="Pedagogy admin", is_manually_manageable=True
         )
         pedagogy_admin.permissions.add(
             *list(
@@ -878,16 +900,6 @@ class Command(BaseCommand):
                 .values_list("pk", flat=True)
             )
         )
-        campus_admin = Group.objects.create(
-            name="Respo site", is_manually_manageable=True
-        )
-        campus_admin.permissions.add(
-            *counter_admin.permissions.values_list("pk", flat=True),
-            *perms.filter(content_type__app_label="reservation").values_list(
-                "pk", flat=True
-            ),
-        )
-
         self.reset_index("core", "auth")
 
         return PopulatedGroups(
@@ -900,7 +912,6 @@ class Command(BaseCommand):
             accounting_admin=accounting_admin,
             sas_admin=sas_admin,
             pedagogy_admin=pedagogy_admin,
-            campus_admin=campus_admin,
         )
 
     def _create_ban_groups(self):

core/management/commands/populate_more.py

@@ -238,13 +238,7 @@ class Command(BaseCommand):
         ae = Club.objects.get(id=settings.SITH_MAIN_CLUB_ID)
         other_clubs = random.sample(list(Club.objects.all()), k=3)
         groups = list(
-            Group.objects.filter(
-                id__in=[
-                    settings.SITH_GROUP_SUBSCRIBERS_ID,
-                    settings.SITH_GROUP_OLD_SUBSCRIBERS_ID,
-                    settings.SITH_GROUP_PUBLIC_ID,
-                ]
-            )
+            Group.objects.filter(name__in=["Subscribers", "Old subscribers", "Public"])
         )
         counters = list(
             Counter.objects.filter(name__in=["Foyer", "MDE", "La Gommette", "Eboutic"])

core/migrations/0046_permissionrights.py

@@ -1,28 +0,0 @@
-# Generated by Django 5.2 on 2025-05-20 17:50
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("core", "0045_quickuploadimage")]
-
-    operations = [
-        migrations.CreateModel(
-            name="GlobalPermissionRights",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-            ],
-            options={
-                "permissions": [("access_lookup", "Can access any lookup in the sith")],
-                "managed": False,
-                "default_permissions": [],
-            },
-        ),
-    ]

core/migrations/0047_alter_notification_date_alter_notification_type.py

@@ -1,27 +0,0 @@
-# Generated by Django 5.2.1 on 2025-06-11 16:10
-
-from django.db import migrations, models
-
-import core.models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("core", "0046_permissionrights")]
-
-    operations = [
-        migrations.AlterField(
-            model_name="notification",
-            name="date",
-            field=models.DateTimeField(auto_now=True, verbose_name="date"),
-        ),
-        migrations.AlterField(
-            model_name="notification",
-            name="type",
-            field=models.CharField(
-                choices=core.models.get_notification_types,
-                default="GENERIC",
-                max_length=32,
-                verbose_name="type",
-            ),
-        ),
-    ]

core/models.py

@@ -23,6 +23,7 @@
 #
 from __future__ import annotations
 
+import importlib
 import logging
 import os
 import string
@@ -50,7 +51,6 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.html import escape
-from django.utils.module_loading import import_string
 from django.utils.timezone import localdate, now
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
@@ -341,8 +341,8 @@ class User(AbstractUser):
         return reverse("core:user_profile", kwargs={"user_id": self.pk})
 
     def promo_has_logo(self) -> bool:
-        return (
-            settings.BASE_DIR / f"core/static/core/img/promo_{self.promo:02d}.png"
+        return Path(
+            settings.BASE_DIR / f"core/static/core/img/promo_{self.promo}.png"
         ).exists()
 
     @cached_property
@@ -396,10 +396,19 @@ class User(AbstractUser):
             return self.is_root
         return group in self.cached_groups
 
-    @cached_property
+    @property
     def cached_groups(self) -> list[Group]:
-        """Get the list of groups this user is in."""
-        return list(self.groups.all())
+        """Get the list of groups this user is in.
+
+        The result is cached for the default duration (should be 5 minutes)
+
+        Returns: A list of all the groups this user is in.
+        """
+        groups = cache.get(f"user_{self.id}_groups")
+        if groups is None:
+            groups = list(self.groups.all())
+            cache.set(f"user_{self.id}_groups", groups)
+        return groups
 
     @cached_property
     def is_root(self) -> bool:
@@ -412,6 +421,14 @@ class User(AbstractUser):
     def is_board_member(self) -> bool:
         return self.groups.filter(club_board=settings.SITH_MAIN_CLUB_ID).exists()
 
+    @cached_property
+    def is_launderette_manager(self):
+        from club.models import Club
+
+        return Club.objects.get(
+            id=settings.SITH_LAUNDERETTE_CLUB_ID
+        ).get_membership_for(self)
+
     @cached_property
     def is_banned_alcohol(self) -> bool:
         return self.ban_groups.filter(id=settings.SITH_GROUP_BANNED_ALCOHOL_ID).exists()
@@ -659,6 +676,10 @@ class AnonymousUser(AuthAnonymousUser):
     def is_board_member(self):
         return False
 
+    @property
+    def is_launderette_manager(self):
+        return False
+
     @property
     def is_banned_alcohol(self):
         return False
@@ -754,23 +775,6 @@ class UserBan(models.Model):
         return f"Ban of user {self.user.id}"
 
 
-class GlobalPermissionRights(models.Model):
-    """Little hack to have permissions not linked to a specific db table."""
-
-    class Meta:
-        # No database table creation or deletion
-        # operations will be performed for this model.
-        managed = False
-
-        # disable "add", "change", "delete" and "view" default permissions
-        default_permissions = []
-
-        permissions = [("access_lookup", "Can access any lookup in the sith")]
-
-    def __str__(self):
-        return self.__class__.__name__
-
-
 class Preferences(models.Model):
     user = models.OneToOneField(
         User, related_name="_preferences", on_delete=models.CASCADE
@@ -1451,10 +1455,6 @@ class PageRev(models.Model):
         return self.page.can_be_edited_by(user)
 
 
-def get_notification_types():
-    return settings.SITH_NOTIFICATIONS
-
-
 class Notification(models.Model):
     user = models.ForeignKey(
         User, related_name="notifications", on_delete=models.CASCADE
@@ -1462,9 +1462,9 @@ class Notification(models.Model):
     url = models.CharField(_("url"), max_length=255)
     param = models.CharField(_("param"), max_length=128, default="")
     type = models.CharField(
-        _("type"), max_length=32, choices=get_notification_types, default="GENERIC"
+        _("type"), max_length=32, choices=settings.SITH_NOTIFICATIONS, default="GENERIC"
     )
-    date = models.DateTimeField(_("date"), auto_now=True)
+    date = models.DateTimeField(_("date"), default=timezone.now)
     viewed = models.BooleanField(_("viewed"), default=False, db_index=True)
 
     def __str__(self):
@@ -1473,24 +1473,22 @@ class Notification(models.Model):
         return self.get_type_display()
 
     def save(self, *args, **kwargs):
-        if self._state.adding and self.type in settings.SITH_PERMANENT_NOTIFICATIONS:
+        if not self.id and self.type in settings.SITH_PERMANENT_NOTIFICATIONS:
             old_notif = self.user.notifications.filter(type=self.type).last()
             if old_notif:
                 old_notif.callback()
                 old_notif.save()
                 return
-            # if this permanent notification is the first one,
-            # go into the callback nonetheless, because the logic
-            # to set Notification.param is here
-            # (please don't be mad at me, I'm not the one who cooked this spaghetti)
-            self.callback()
         super().save(*args, **kwargs)
 
     def callback(self):
-        func_name = settings.SITH_PERMANENT_NOTIFICATIONS.get(self.type)
-        if not func_name:
-            return
-        import_string(func_name)(self)
+        # Get the callback defined in settings to update existing
+        # notifications
+        mod_name, func_name = settings.SITH_PERMANENT_NOTIFICATIONS[self.type].rsplit(
+            ".", 1
+        )
+        mod = importlib.import_module(mod_name)
+        getattr(mod, func_name)(self)
 
 
 class Gift(models.Model):

core/signals.py

@@ -0,0 +1,15 @@
+from django.core.cache import cache
+from django.db.models.signals import m2m_changed
+from django.dispatch import receiver
+
+from core.models import User
+
+
+@receiver(m2m_changed, sender=User.groups.through, dispatch_uid="user_groups_changed")
+def user_groups_changed(sender, instance: User, **kwargs):
+    """Clear the cached groups of the user."""
+    # As a m2m relationship doesn't live within the model
+    # but rather on an intermediary table, there is no
+    # model method to override, meaning we must use
+    # a signal to invalidate the cache when a user is removed from a group
+    cache.delete(f"user_{instance.pk}_groups")

core/static/bundled/core/components/tabs-index.ts

@@ -1,120 +0,0 @@
-import { registerComponent } from "#core:utils/web-components";
-import { html, render } from "lit-html";
-import { unsafeHTML } from "lit-html/directives/unsafe-html.js";
-
-@registerComponent("ui-tab")
-export class Tab extends HTMLElement {
-  static observedAttributes = ["title", "active"];
-  private description = "";
-  private inner = "";
-  private active = false;
-
-  attributeChangedCallback(name: string, _oldValue?: string, newValue?: string) {
-    const activeOld = this.active;
-    this.active = this.hasAttribute("active");
-    if (this.active !== activeOld && this.active) {
-      this.dispatchEvent(
-        new CustomEvent("ui-tab-activated", { detail: this, bubbles: true }),
-      );
-    }
-
-    if (name === "title") {
-      this.description = newValue;
-    }
-    this.dispatchEvent(new CustomEvent("ui-tab-updated", { bubbles: true }));
-  }
-
-  getButtonTemplate() {
-    return html`
-    	<button
-	    	role="tab"
-	    	?aria-selected=${this.active}
-    		class="tab-header clickable ${this.active ? "active" : ""}"
-    		@click="${() => this.setActive(true)}"
-    	>
-    		${this.description}
-    	</button>
-    `;
-  }
-  getContentTemplate() {
-    return html`
-    	<section
-    		class="tab-section"
-    		?hidden=${!this.active}
-    	>
-	    	${unsafeHTML(this.getContentHtml())}
-	    </section>
-    `;
-  }
-
-  setActive(value: boolean) {
-    if (value) {
-      this.setAttribute("active", "");
-    } else {
-      this.removeAttribute("active");
-    }
-  }
-
-  connectedCallback() {
-    this.inner = this.innerHTML;
-    this.innerHTML = "";
-  }
-
-  getContentHtml() {
-    const content = this.getElementsByClassName("tab-section")[0];
-    if (content !== undefined) {
-      return content.innerHTML;
-    }
-    return this.inner;
-  }
-
-  setContentHtml(value: string) {
-    const content = this.getElementsByClassName("tab-section")[0];
-    if (content !== undefined) {
-      content.innerHTML = value;
-    }
-    this.inner = value;
-  }
-}
-
-@registerComponent("ui-tab-group")
-export class TabGroup extends HTMLElement {
-  private node: HTMLDivElement;
-
-  connectedCallback() {
-    this.node = document.createElement("div");
-    this.node.classList.add("tabs", "shadow");
-    this.appendChild(this.node);
-
-    this.addEventListener("ui-tab-activated", (event: CustomEvent) => {
-      const target = event.detail as Tab;
-      for (const tab of this.getElementsByTagName("ui-tab") as HTMLCollectionOf<Tab>) {
-        if (tab !== target) {
-          tab.setActive(false);
-        }
-      }
-    });
-    this.addEventListener("ui-tab-updated", () => {
-      this.render();
-    });
-
-    this.render();
-  }
-
-  render() {
-    const tabs = Array.prototype.slice.call(
-      this.getElementsByTagName("ui-tab"),
-    ) as Tab[];
-    render(
-      html`
-      	<div class="tab-headers">
-      		${tabs.map((tab) => tab.getButtonTemplate())}
-      	</div>
-      	<div class="tab-content">
-      		${tabs.map((tab) => tab.getContentTemplate())}
-      	</div>
-    `,
-      this.node,
-    );
-  }
-}

core/static/bundled/core/navbar-index.ts

@@ -1,36 +0,0 @@
-import { exportToHtml } from "#core:utils/globals";
-
-exportToHtml("showMenu", () => {
-  const navbar = document.getElementById("navbar-content");
-  const current = navbar.getAttribute("mobile-display");
-  navbar.setAttribute("mobile-display", current === "hidden" ? "revealed" : "hidden");
-});
-
-document.addEventListener("alpine:init", () => {
-  const menuItems = document.querySelectorAll(".navbar details[name='navbar'].menu");
-  const isDesktop = () => {
-    return window.innerWidth >= 500;
-  };
-  for (const item of menuItems) {
-    item.addEventListener("mouseover", () => {
-      if (isDesktop()) {
-        item.setAttribute("open", "");
-      }
-    });
-    item.addEventListener("mouseout", () => {
-      if (isDesktop()) {
-        item.removeAttribute("open");
-      }
-    });
-    item.addEventListener("click", (event: MouseEvent) => {
-      // Don't close when clicking on desktop mode
-      if ((event.target as HTMLElement).nodeName !== "SUMMARY" || event.detail === 0) {
-        return;
-      }
-
-      if (isDesktop()) {
-        event.preventDefault();
-      }
-    });
-  }
-});

core/static/bundled/core/tooltips-index.ts

@@ -1,174 +0,0 @@
-import {
-  type Placement,
-  autoPlacement,
-  computePosition,
-  flip,
-  offset,
-  size,
-} from "@floating-ui/dom";
-
-/**
- * Library usage:
- *
- * Add a `tooltip` attribute to any html element with it's tooltip text
- * You can control the position of the tooltp with the `tooltip-position` attribute
- * Allowed placements are `auto`, `top`, `right`, `bottom`, `left`
- * You can add `-start` and `-end` to all allowed placement values except for `auto`
- * Default placement is `auto`
- * Note: placement are suggestions and the position could change if the popup gets
- *       outside of the screen.
- *
- * You can customize your tooltip by passing additional classes or ids to it
- * You can use `tooltip-class` and `tooltip-id` to add additional elements to the
- * `class` and `id` attribute of the generated tooltip
- *
- * @example
- * ```html
- * <p tooltip="tooltip text"></p>
- * <p tooltip="tooltip left" tooltip-position="left"></p>
- * <div tooltip="tooltip custom class" tooltip-class="custom custom-class"></div>
- * ```
- **/
-
-type Status = "open" | "close";
-
-const tooltips: Map<HTMLElement, HTMLElement> = new Map();
-
-function getPosition(element: HTMLElement): Placement | "auto" {
-  const position = element.getAttribute("tooltip-position");
-  if (position) {
-    return position as Placement | "auto";
-  }
-  return "auto";
-}
-
-function getMiddleware(element: HTMLElement) {
-  const middleware = [offset(6), size()];
-  if (getPosition(element) === "auto") {
-    middleware.push(autoPlacement());
-  } else {
-    middleware.push(flip());
-  }
-  return { middleware: middleware };
-}
-
-function getPlacement(element: HTMLElement) {
-  const position = getPosition(element);
-  if (position !== "auto") {
-    return { placement: position };
-  }
-  return {};
-}
-
-function createTooltip(element: HTMLElement) {
-  const tooltip = document.createElement("div");
-  document.body.append(tooltip);
-  tooltips.set(element, tooltip);
-  return tooltip;
-}
-
-function updateTooltip(element: HTMLElement, tooltip: HTMLElement, status: Status) {
-  // Update tooltip status and set it's attributes and content
-  tooltip.setAttribute("tooltip-status", status);
-  tooltip.innerText = element.getAttribute("tooltip");
-
-  for (const attributes of [
-    { src: "tooltip-class", dst: "class", default: ["tooltip"] },
-    { src: "tooltip-id", dst: "id", default: [] },
-  ]) {
-    const populated = attributes.default;
-    if (element.hasAttribute(attributes.src)) {
-      populated.push(...element.getAttribute(attributes.src).split(" "));
-    }
-    tooltip.setAttribute(attributes.dst, populated.join(" "));
-  }
-}
-
-function getTooltip(element: HTMLElement) {
-  const tooltip = tooltips.get(element);
-  if (tooltip === undefined) {
-    return createTooltip(element);
-  }
-
-  return tooltip;
-}
-
-function tooltipMouseover(event: MouseEvent) {
-  // We get the closest tooltip to have a consistent behavior
-  // when hovering over a child element of a tooltip marked element
-  const target = (event.target as HTMLElement).closest("[tooltip]") as HTMLElement;
-  const tooltip = getTooltip(target);
-  updateTooltip(target, tooltip, "open");
-
-  computePosition(target, tooltip, {
-    ...getPlacement(target),
-    ...getMiddleware(target),
-  }).then(({ x, y }) => {
-    Object.assign(tooltip.style, {
-      left: `${x}px`,
-      top: `${y}px`,
-    });
-  });
-}
-
-function tooltipMouseout(event: MouseEvent) {
-  // We get the closest tooltip to have a consistent behavior
-  // when hovering over a child element of a tooltip marked element
-  const target = (event.target as HTMLElement).closest("[tooltip]") as HTMLElement;
-  updateTooltip(target, getTooltip(target), "close");
-}
-
-window.addEventListener("DOMContentLoaded", () => {
-  for (const el of document.querySelectorAll("[tooltip]")) {
-    el.addEventListener("mouseover", tooltipMouseover);
-    el.addEventListener("mouseout", tooltipMouseout);
-  }
-});
-
-// Add / remove callback when tooltip attribute is added / removed
-new MutationObserver((mutations: MutationRecord[]) => {
-  for (const mutation of mutations) {
-    const target = mutation.target as HTMLElement;
-    target.removeEventListener("mouseover", tooltipMouseover);
-    target.removeEventListener("mouseout", tooltipMouseout);
-    if (target.hasAttribute("tooltip")) {
-      target.addEventListener("mouseover", tooltipMouseover);
-      target.addEventListener("mouseout", tooltipMouseout);
-      if (target.matches(":hover")) {
-        target.dispatchEvent(new Event("mouseover", { bubbles: true }));
-      } else {
-        target.dispatchEvent(new Event("mouseout", { bubbles: true }));
-      }
-    } else if (tooltips.has(target)) {
-      // Remove corresponding tooltip
-      tooltips.get(target).remove();
-      tooltips.delete(target);
-    }
-  }
-}).observe(document.body, {
-  attributes: true,
-  attributeFilter: ["tooltip", "tooltip-class", "toolitp-position", "tooltip-id"],
-  subtree: true,
-});
-
-// Remove orphan tooltips
-new MutationObserver((mutations: MutationRecord[]) => {
-  for (const mutation of mutations) {
-    for (const node of mutation.removedNodes) {
-      if (node.nodeType !== node.ELEMENT_NODE) {
-        continue;
-      }
-      const target = node as HTMLElement;
-      if (!target.hasAttribute("tooltip")) {
-        continue;
-      }
-      if (tooltips.has(target)) {
-        tooltips.get(target).remove();
-        tooltips.delete(target);
-      }
-    }
-  }
-}).observe(document.body, {
-  subtree: true,
-  childList: true,
-});

core/static/bundled/jquery-ui-index.js

@@ -0,0 +1,2 @@
+// This is only used to import jquery-ui css files
+import "jquery-ui/themes/base/all.css";

core/static/bundled/user/family-graph-index.js

@@ -0,0 +1,274 @@
+import { History, initialUrlParams, updateQueryString } from "#core:utils/history";
+import cytoscape from "cytoscape";
+import cxtmenu from "cytoscape-cxtmenu";
+import klay from "cytoscape-klay";
+import { familyGetFamilyGraph } from "#openapi";
+
+cytoscape.use(klay);
+cytoscape.use(cxtmenu);
+
+async function getGraphData(userId, godfathersDepth, godchildrenDepth) {
+  const data = (
+    await familyGetFamilyGraph({
+      path: {
+        // biome-ignore lint/style/useNamingConvention: api is snake_case
+        user_id: userId,
+      },
+      query: {
+        // biome-ignore lint/style/useNamingConvention: api is snake_case
+        godfathers_depth: godfathersDepth,
+        // biome-ignore lint/style/useNamingConvention: api is snake_case
+        godchildren_depth: godchildrenDepth,
+      },
+    })
+  ).data;
+  return [
+    ...data.users.map((user) => {
+      return { data: user };
+    }),
+    ...data.relationships.map((rel) => {
+      return {
+        data: { source: rel.godfather, target: rel.godchild },
+      };
+    }),
+  ];
+}
+
+function createGraph(container, data, activeUserId) {
+  const cy = cytoscape({
+    boxSelectionEnabled: false,
+    autounselectify: true,
+
+    container,
+    elements: data,
+    minZoom: 0.5,
+
+    style: [
+      // the stylesheet for the graph
+      {
+        selector: "node",
+        style: {
+          label: "data(display_name)",
+          "background-image": "data(profile_pict)",
+          width: "100%",
+          height: "100%",
+          "background-fit": "cover",
+          "background-repeat": "no-repeat",
+          shape: "ellipse",
+        },
+      },
+
+      {
+        selector: "edge",
+        style: {
+          width: 5,
+          "line-color": "#ccc",
+          "target-arrow-color": "#ccc",
+          "target-arrow-shape": "triangle",
+          "curve-style": "bezier",
+        },
+      },
+
+      {
+        selector: ".traversed",
+        style: {
+          "border-width": "5px",
+          "border-style": "solid",
+          "border-color": "red",
+          "target-arrow-color": "red",
+          "line-color": "red",
+        },
+      },
+
+      {
+        selector: ".not-traversed",
+        style: {
+          "line-opacity": "0.5",
+          "background-opacity": "0.5",
+          "background-image-opacity": "0.5",
+        },
+      },
+    ],
+    layout: {
+      name: "klay",
+      nodeDimensionsIncludeLabels: true,
+      fit: true,
+      klay: {
+        addUnnecessaryBendpoints: true,
+        direction: "DOWN",
+        nodePlacement: "INTERACTIVE",
+        layoutHierarchy: true,
+      },
+    },
+  });
+  const activeUser = cy.getElementById(activeUserId).style("shape", "rectangle");
+  /* Reset graph */
+  const resetGraph = () => {
+    cy.elements((element) => {
+      if (element.hasClass("traversed")) {
+        element.removeClass("traversed");
+      }
+      if (element.hasClass("not-traversed")) {
+        element.removeClass("not-traversed");
+      }
+    });
+  };
+
+  const onNodeTap = (el) => {
+    resetGraph();
+    /* Create path on graph if selected isn't the targeted user */
+    if (el === activeUser) {
+      return;
+    }
+    cy.elements((element) => {
+      element.addClass("not-traversed");
+    });
+
+    for (const traversed of cy.elements().aStar({
+      root: el,
+      goal: activeUser,
+    }).path) {
+      traversed.removeClass("not-traversed");
+      traversed.addClass("traversed");
+    }
+  };
+
+  cy.on("tap", "node", (tapped) => {
+    onNodeTap(tapped.target);
+  });
+  cy.zoomingEnabled(false);
+
+  /* Add context menu */
+  cy.cxtmenu({
+    selector: "node",
+
+    commands: [
+      {
+        content: '<i class="fa fa-external-link fa-2x"></i>',
+        select: (el) => {
+          window.open(el.data().profile_url, "_blank").focus();
+        },
+      },
+
+      {
+        content: '<span class="fa fa-mouse-pointer fa-2x"></span>',
+        select: (el) => {
+          onNodeTap(el);
+        },
+      },
+
+      {
+        content: '<i class="fa fa-eraser fa-2x"></i>',
+        select: (_) => {
+          resetGraph();
+        },
+      },
+    ],
+  });
+
+  return cy;
+}
+
+/**
+ * @typedef FamilyGraphConfig
+ * @property {number} activeUser Id of the user to fetch the tree from
+ * @property {number} depthMin Minimum tree depth for godfathers and godchildren
+ * @property {number} depthMax Maximum tree depth for godfathers and godchildren
+ **/
+
+/**
+ * Create a family graph of an user
+ * @param {FamilyGraphConfig} config
+ **/
+window.loadFamilyGraph = (config) => {
+  document.addEventListener("alpine:init", () => {
+    const defaultDepth = 2;
+
+    function getInitialDepth(prop) {
+      const value = Number.parseInt(initialUrlParams.get(prop));
+      if (Number.isNaN(value) || value < config.depthMin || value > config.depthMax) {
+        return defaultDepth;
+      }
+      return value;
+    }
+
+    Alpine.data("graph", () => ({
+      loading: false,
+      godfathersDepth: getInitialDepth("godfathersDepth"),
+      godchildrenDepth: getInitialDepth("godchildrenDepth"),
+      reverse: initialUrlParams.get("reverse")?.toLowerCase?.() === "true",
+      graph: undefined,
+      graphData: {},
+
+      async init() {
+        const delayedFetch = Alpine.debounce(async () => {
+          await this.fetchGraphData();
+        }, 100);
+        for (const param of ["godfathersDepth", "godchildrenDepth"]) {
+          this.$watch(param, async (value) => {
+            if (value < config.depthMin || value > config.depthMax) {
+              return;
+            }
+            updateQueryString(param, value, History.Replace);
+            await delayedFetch();
+          });
+        }
+        this.$watch("reverse", async (value) => {
+          updateQueryString("reverse", value, History.Replace);
+          await this.reverseGraph();
+        });
+        this.$watch("graphData", async () => {
+          this.generateGraph();
+          if (this.reverse) {
+            await this.reverseGraph();
+          }
+        });
+        await this.fetchGraphData();
+      },
+
+      screenshot() {
+        const link = document.createElement("a");
+        link.href = this.graph.jpg();
+        link.download = interpolate(
+          gettext("family_tree.%(extension)s"),
+          { extension: "jpg" },
+          true,
+        );
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      },
+
+      reset() {
+        this.reverse = false;
+        this.godfathersDepth = defaultDepth;
+        this.godchildrenDepth = defaultDepth;
+      },
+
+      async reverseGraph() {
+        this.graph.elements((el) => {
+          el.position({ x: -el.position().x, y: -el.position().y });
+        });
+        this.graph.center(this.graph.elements());
+      },
+
+      async fetchGraphData() {
+        this.graphData = await getGraphData(
+          config.activeUser,
+          this.godfathersDepth,
+          this.godchildrenDepth,
+        );
+      },
+
+      generateGraph() {
+        this.loading = true;
+        this.graph = createGraph(
+          $(this.$refs.graph),
+          this.graphData,
+          config.activeUser,
+        );
+        this.loading = false;
+      },
+    }));
+  });
+};

core/static/bundled/user/family-graph-index.ts

@@ -1,287 +0,0 @@
-import { History, initialUrlParams, updateQueryString } from "#core:utils/history";
-import cytoscape, {
-  type ElementDefinition,
-  type NodeSingular,
-  type Singular,
-} from "cytoscape";
-import cxtmenu from "cytoscape-cxtmenu";
-import klay, { type KlayLayoutOptions } from "cytoscape-klay";
-import { type UserProfileSchema, familyGetFamilyGraph } from "#openapi";
-
-cytoscape.use(klay);
-cytoscape.use(cxtmenu);
-
-type GraphData = (
-  | { data: UserProfileSchema }
-  | { data: { source: number; target: number } }
-)[];
-
-function isMobile() {
-  return window.innerWidth < 500;
-}
-
-async function getGraphData(
-  userId: number,
-  godfathersDepth: number,
-  godchildrenDepth: number,
-): Promise<GraphData> {
-  const data = (
-    await familyGetFamilyGraph({
-      path: {
-        // biome-ignore lint/style/useNamingConvention: api is snake_case
-        user_id: userId,
-      },
-      query: {
-        // biome-ignore lint/style/useNamingConvention: api is snake_case
-        godfathers_depth: godfathersDepth,
-        // biome-ignore lint/style/useNamingConvention: api is snake_case
-        godchildren_depth: godchildrenDepth,
-      },
-    })
-  ).data;
-  return [
-    ...data.users.map((user) => {
-      return { data: user };
-    }),
-    ...data.relationships.map((rel) => {
-      return {
-        data: { source: rel.godfather, target: rel.godchild },
-      };
-    }),
-  ];
-}
-
-function createGraph(container: HTMLDivElement, data: GraphData, activeUserId: number) {
-  const cy = cytoscape({
-    boxSelectionEnabled: false,
-    autounselectify: true,
-
-    container,
-    elements: data as ElementDefinition[],
-    minZoom: 0.5,
-
-    style: [
-      // the stylesheet for the graph
-      {
-        selector: "node",
-        style: {
-          label: "data(display_name)",
-          "background-image": "data(profile_pict)",
-          width: "100%",
-          height: "100%",
-          "background-fit": "cover",
-          "background-repeat": "no-repeat",
-          shape: "ellipse",
-        },
-      },
-
-      {
-        selector: "edge",
-        style: {
-          width: 5,
-          "line-color": "#ccc",
-          "target-arrow-color": "#ccc",
-          "target-arrow-shape": "triangle",
-          "curve-style": "bezier",
-        },
-      },
-
-      {
-        selector: ".traversed",
-        style: {
-          "border-width": "5px",
-          "border-style": "solid",
-          "border-color": "red",
-          "target-arrow-color": "red",
-          "line-color": "red",
-        },
-      },
-
-      {
-        selector: ".not-traversed",
-        style: {
-          "line-opacity": 0.5,
-          "background-opacity": 0.5,
-          "background-image-opacity": 0.5,
-        },
-      },
-    ],
-    layout: {
-      name: "klay",
-      nodeDimensionsIncludeLabels: true,
-      fit: true,
-      klay: {
-        addUnnecessaryBendpoints: true,
-        direction: "DOWN",
-        nodePlacement: "INTERACTIVE",
-        layoutHierarchy: true,
-      },
-    } as KlayLayoutOptions,
-  });
-  const activeUser = cy
-    .getElementById(activeUserId.toString())
-    .style("shape", "rectangle");
-  /* Reset graph */
-  const resetGraph = () => {
-    cy.elements().removeClass("traversed not-traversed");
-  };
-
-  const onNodeTap = (el: Singular) => {
-    resetGraph();
-    /* Create path on graph if selected isn't the targeted user */
-    if (el === activeUser) {
-      return;
-    }
-    cy.elements().addClass("not-traversed");
-
-    for (const traversed of cy.elements().aStar({
-      root: el,
-      goal: activeUser,
-    }).path) {
-      traversed.removeClass("not-traversed");
-      traversed.addClass("traversed");
-    }
-  };
-
-  cy.on("tap", "node", (tapped) => {
-    onNodeTap(tapped.target);
-  });
-
-  /* Add context menu */
-  cy.cxtmenu({
-    selector: "node",
-
-    commands: [
-      {
-        content: '<i class="fa fa-external-link fa-2x"></i>',
-        select: (el) => {
-          window.open(el.data().profile_url, "_blank").focus();
-        },
-      },
-
-      {
-        content: '<span class="fa fa-mouse-pointer fa-2x"></span>',
-        select: (el) => {
-          onNodeTap(el);
-        },
-      },
-
-      {
-        content: '<i class="fa fa-eraser fa-2x"></i>',
-        select: (_) => {
-          resetGraph();
-        },
-      },
-    ],
-  });
-
-  return cy;
-}
-
-interface FamilyGraphConfig {
-  /**Id of the user to fetch the tree from*/
-  activeUser: number;
-  /**Minimum tree depth for godfathers and godchildren*/
-  depthMin: number;
-  /**Maximum tree depth for godfathers and godchildren*/
-  depthMax: number;
-}
-
-document.addEventListener("alpine:init", () => {
-  const defaultDepth = 2;
-
-  Alpine.data("graph", (config: FamilyGraphConfig) => ({
-    loading: false,
-    godfathersDepth: 0,
-    godchildrenDepth: 0,
-    reverse: initialUrlParams.get("reverse")?.toLowerCase?.() === "true",
-    graph: undefined as cytoscape.Core,
-    graphData: {},
-    isZoomEnabled: !isMobile(),
-
-    getInitialDepth(prop: string) {
-      const value = Number.parseInt(initialUrlParams.get(prop));
-      if (Number.isNaN(value) || value < config.depthMin || value > config.depthMax) {
-        return defaultDepth;
-      }
-      return value;
-    },
-
-    async init() {
-      this.godfathersDepth = this.getInitialDepth("godfathersDepth");
-      this.godchildrenDepth = this.getInitialDepth("godchildrenDepth");
-
-      const delayedFetch = Alpine.debounce(async () => {
-        await this.fetchGraphData();
-      }, 100);
-      for (const param of ["godfathersDepth", "godchildrenDepth"]) {
-        this.$watch(param, async (value: number) => {
-          if (value < config.depthMin || value > config.depthMax) {
-            return;
-          }
-          updateQueryString(param, value.toString(), History.Replace);
-          await delayedFetch();
-        });
-      }
-      this.$watch("reverse", async (value: number) => {
-        updateQueryString("reverse", value.toString(), History.Replace);
-        await this.reverseGraph();
-      });
-      this.$watch("graphData", async () => {
-        this.generateGraph();
-        if (this.reverse) {
-          await this.reverseGraph();
-        }
-      });
-      this.$watch("isZoomEnabled", () => {
-        this.graph.userZoomingEnabled(this.isZoomEnabled);
-      });
-      await this.fetchGraphData();
-    },
-
-    screenshot() {
-      const link = document.createElement("a");
-      link.href = this.graph.jpg();
-      link.download = interpolate(
-        gettext("family_tree.%(extension)s"),
-        { extension: "jpg" },
-        true,
-      );
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-
-    reset() {
-      this.reverse = false;
-      this.godfathersDepth = defaultDepth;
-      this.godchildrenDepth = defaultDepth;
-    },
-
-    async reverseGraph() {
-      this.graph.elements((el: NodeSingular) => {
-        el.position({ x: -el.position().x, y: -el.position().y });
-      });
-      this.graph.center(this.graph.elements());
-    },
-
-    async fetchGraphData() {
-      this.graphData = await getGraphData(
-        config.activeUser,
-        this.godfathersDepth,
-        this.godchildrenDepth,
-      );
-    },
-
-    generateGraph() {
-      this.loading = true;
-      this.graph = createGraph(
-        this.$refs.graph as HTMLDivElement,
-        this.graphData,
-        config.activeUser,
-      );
-      this.graph.userZoomingEnabled(this.isZoomEnabled);
-      this.loading = false;
-    },
-  }));
-});

core/static/core/accordion.scss

@@ -1,89 +0,0 @@
-details.accordion>summary {
-  margin: 2px 0 0 0;
-  padding: .5em .5em .5em .7em;
-  cursor: pointer;
-  user-select: none;
-  display: block;
-
-  border-top-right-radius: 3px;
-  border-top-left-radius: 3px;
-}
-
-details[open].accordion>summary {
-  border: 1px solid #003eff;
-  background: #007fff;
-  color: #ffffff;
-}
-
-
-details:not([open]).accordion>summary {
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-
-  border: 1px solid #c5c5c5;
-  background: #f6f6f6;
-  color: #454545;
-}
-
-details.accordion>summary::before {
-  font-family: FontAwesome;
-  content: '\f0da';
-  margin-right: 5px;
-  transition: 700ms;
-  font-size: 0.8em;
-}
-
-details[open].accordion>summary::before {
-  font-family: FontAwesome;
-  content: '\f0d7';
-}
-
-details.accordion>.accordion-content {
-  background: #ffffff;
-  color: #333333;
-  padding: 1em 2.2em;
-  border: 1px solid #dddddd;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-  overflow: hidden;
-}
-
-@mixin animation($selector) {
-  details.accordion#{$selector} {
-    opacity: 0;
-
-    @supports (max-height: calc-size(max-content, size)) {
-      max-height: 0px;
-    }
-  }
-
-  details[open].accordion#{$selector} {
-    opacity: 1;
-
-    // Setting a transition on all states of the content
-    // will create a strange behavior where the transition
-    // continues without being shown, creating inconsistenties
-    transition: all 300ms ease-out;
-
-    @supports (max-height: calc-size(max-content, size)) {
-      max-height: calc-size(max-content, size);
-    }
-  }
-}
-
-// ::details-content isn't available on firefox yet
-// we use .accordion-content as a workaround
-// But we need to use ::details-content for chrome because it's
-// not working correctly otherwise
-// it only happen in chrome, not safari or firefox
-// Note: `selector` is not supported by scss so we comment it out to
-// avoid compiling it and sending it straight to the css
-// This is a trick that comes from here :
-// https://stackoverflow.com/questions/62665318/using-supports-selector-despite-sass-not-supporting-it
-@supports #{'selector(details::details-content)'} {
-  @include animation("::details-content")
-}
-
-@supports #{'not selector(details::details-content)'} {
-  @include animation(">.accordion-content")
-}

core/static/core/components/tabs.scss

@@ -1,53 +0,0 @@
-@import "core/static/core/colors";
-
-ui-tab-group {
-  *[hidden] {
-    display: none;
-  }
-
-  .tabs {
-    border-radius: 5px;
-
-    .tab-headers {
-      display: flex;
-      flex-flow: row wrap;
-      background-color: $primary-neutral-light-color;
-      padding: 3px 12px 12px;
-      column-gap: 20px;
-      border-top-left-radius: 5px;
-      border-top-right-radius: 5px;
-
-      .tab-header {
-        border: none;
-        padding-right: 0;
-        padding-left: 0;
-        font-size: 120%;
-        background-color: unset;
-        position: relative;
-
-        &:after {
-          content: '';
-          position: absolute;
-          bottom: 0;
-          left: 0;
-          width: 100%;
-          border-bottom: 4px solid darken($primary-neutral-light-color, 10%);
-          border-radius: 2px;
-          transition: all 0.2s ease-in-out;
-        }
-
-        &:hover:after {
-          border-bottom-color: darken($primary-neutral-light-color, 20%);
-        }
-
-        &.active:after {
-          border-bottom-color: $primary-dark-color;
-        }
-      }
-    }
-
-    section {
-      padding: 20px;
-    }
-  }
-}

core/static/core/footer.scss

@@ -1,89 +0,0 @@
-@import "colors";
-@import "devices";
-
-footer.bottom-links {
-  @media (max-width: $small-devices) {
-    margin-top: 0.6em;
-    padding: 1.25em;
-    background-color: $primary-neutral-dark-color;
-
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    gap: 1.25em;
-
-    >section {
-
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: center;
-      gap: 0.8em;
-
-    }
-
-    a {
-      color: $white-color;
-      width: auto;
-
-      &:hover {
-        color: $white-color;
-        text-shadow: 0.5px 0.5px 0.5px $shadow-color;
-      }
-    }
-
-    .fa-github {
-      color: $white-color;
-    }
-
-    hr {
-      width: 100%;
-      height: 0px;
-      border: none;
-      border-top: 0.5px solid $white-color;
-    }
-  }
-
-  @media (min-width: $small-devices) {
-    width: 90%;
-    margin: 2em auto;
-
-    font-size: 90%;
-    text-align: center;
-    vertical-align: middle;
-
-    section:first-of-type {
-      margin: 0.6em 0;
-      color: $white-color;
-      border-radius: 5px;
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      background-color: $primary-neutral-dark-color;
-      box-shadow: $shadow-color 0 0 15px;
-
-      a {
-        color: $white-color;
-        width: auto;
-        padding: 0.8em;
-        flex: 1;
-        font-weight: bold;
-
-        &:hover {
-          color: $white-color;
-          text-shadow: 0.5px 0.5px 0.5px $shadow-color;
-        }
-      }
-    }
-
-    .fa-github {
-      color: $githubblack;
-    }
-
-    hr {
-      border: none;
-      height: 5px;
-    }
-  }
-}

core/static/core/js/script.js

@@ -1,4 +1,42 @@
 $(() => {
+  // const buttons = $('.choose_file_button')
+  const popups = $(".choose_file_widget");
+  popups.dialog({
+    autoOpen: false,
+    modal: true,
+    width: "90%",
+    create: (event) => {
+      const target = $(event.target);
+      target.parent().css({
+        position: "fixed",
+        top: "5%",
+        bottom: "5%",
+      });
+      target.css("height", "300px");
+    },
+    buttons: [
+      {
+        text: "Choose",
+        click: function () {
+          $(`input[name=${$(this).attr("name")}]`).attr(
+            "value",
+            $("#file_id").attr("value"),
+          );
+          $(this).dialog("close");
+        },
+        disabled: true,
+      },
+    ],
+  });
+  $(".choose_file_button")
+    .button()
+    .on("click", function () {
+      const popup = popups.filter(`[name=${$(this).attr("name")}]`);
+      popup.html(
+        '<iframe src="/file/popup" width="100%" height="95%"></iframe><div id="file_id" value="null" />',
+      );
+      popup.dialog({ title: $(this).text() }).dialog("open");
+    });
   $("#quick_notif li").click(function () {
     $(this).hide();
   });

core/static/core/navbar.scss

@@ -1,7 +1,5 @@
 @import "colors";
 
-$desktop-size: 500px;
-
 nav.navbar {
   background-color: $primary-dark-color;
   margin: 1em;
@@ -9,24 +7,15 @@ nav.navbar {
   border-radius: 0.6em;
   min-height: 40px;
 
-  @media (max-width: $desktop-size) {
+  @media (max-width: 500px) {
     position: relative;
     flex-direction: column;
     align-items: flex-start;
     gap: 0;
     margin: .2em;
-
-    >.content[mobile-display="hidden"] {
-      display: none;
-    }
-
-    >.content[mobile-display="revealed"] {
-      display: block;
-    }
   }
 
-
-  >.expand-button {
+  > .expand-button {
     background-color: transparent;
     display: none;
     position: relative;
@@ -38,27 +27,27 @@ nav.navbar {
     align-items: center;
     margin: 0;
 
-    >i {
+    > i {
       font-size: 1.5em;
       color: white;
     }
 
-    @media (max-width: $desktop-size) {
+    @media (max-width: 500px) {
       display: flex;
     }
   }
 
-  >.content {
-    @media (min-width: $desktop-size) {
+  > .content {
+    @media (min-width: 500px) {display: flex;
       flex-direction: row;
       flex-wrap: wrap;
       align-items: center;
       justify-content: center;
-      display: flex;
+      display: flex !important;
     }
 
-    >.menu,
-    >.link {
+    > .menu,
+    > .link {
       box-sizing: border-box;
       width: 130px;
       height: 52px;
@@ -67,7 +56,7 @@ nav.navbar {
       justify-content: center;
       cursor: pointer;
 
-      @media (max-width: $desktop-size) {
+      @media (max-width: 500px) {
         width: 100%;
         height: auto;
         justify-content: flex-start;
@@ -75,75 +64,80 @@ nav.navbar {
         &:last-child {
           border-radius: 0 0 .6em .6em;
 
-          >.content {
+          > .content {
             box-shadow: 3px 3px 3px 0 #dfdfdf;
           }
         }
       }
     }
 
-    >.menu>.head,
-    >.link {
+    > .menu > .head,
+    > .link {
       color: white;
-    }
+      padding: 10px 20px;
+      box-sizing: border-box;
 
-    >.menu>summary,
-    >.link {
-      @media (max-width: $desktop-size) {
+      @media (max-width: 500px) {
         padding: 10px;
       }
     }
 
-    >.link {
-      padding: 10px 20px;
-      box-sizing: border-box;
-    }
-
-
     .link:hover,
     .menu:hover {
       background-color: rgba(0, 0, 0, .2);
     }
 
-    details.menu {
-      cursor: pointer;
-      user-select: none;
-      z-index: 10;
-      align-items: center;
-      display: inline-block;
+    > .menu > .head,
+    > .link {
+      color: white;
+      padding: 10px 20px;
+      box-sizing: border-box;
 
-      summary {
-        list-style: none;
-
-        display: flex;
-        align-items: center;
-        height: 100%;
-        padding-left: 20px;
-        padding-right: 20px;
-
-        @media (min-width: $desktop-size) {
-          justify-content: center;
-        }
+      @media (max-width: 500px) {
+        padding: 10px;
       }
+    }
 
-      summary::-webkit-details-marker {
+    .link:hover,
+    .menu:hover {
+      background-color: rgba(0, 0, 0, .2);
+    }
+
+    > .menu:hover > .content,
+    > .menu > .head:hover + .content,
+    > .menu > .content:hover {
+      display: flex;
+    }
+
+    > .menu {
+      display: flex;
+      position: relative;
+
+      > .content {
+        z-index: 10;
         display: none;
-      }
-
-      ul.content {
-        list-style-type: none;
-        background: white;
+        position: absolute;
+        top: 100%;
+        background-color: white;
         margin: 0;
+        list-style-type: none;
+        width: 130px;
+        box-shadow: 3px 3px 3px 0 #dfdfdf;
+        flex-direction: column;
 
-        @media (min-width: $desktop-size) {
-          box-shadow: 3px 3px 3px 0 #dfdfdf;
+        @media (max-width: 500px) {
+          position: absolute;
+          flex-direction: row;
+          flex-wrap: wrap;
+          width: 100%;
+          box-shadow: inset 3px 3px 3px 0 #dfdfdf;
         }
 
-        >li>a {
+        > li > a {
           display: flex;
           padding: 15px 20px;
 
-          @media (max-width: $desktop-size) {
+          @media (max-width: 500px) {
             padding: 10px;
           }
 

core/static/core/style.scss

@@ -45,6 +45,63 @@ body {
   }
 }
 
+[tooltip] {
+  position: relative;
+}
+
+[tooltip]::before {
+  @include shadow;
+  z-index: 1;
+  pointer-events: none;
+  content: attr(tooltip);
+  left: 50%;
+  transform: translateX(-50%);
+  background-color: #333;
+  color: #fff;
+  border: 0.5px solid hsl(0, 0%, 50%);
+  border-radius: 5px;
+  padding: 5px 10px;
+  position: absolute;
+  white-space: nowrap;
+  opacity: 0;
+  transition: opacity 500ms ease-out;
+  top: 120%; // Put the tooltip under the element
+}
+
+[tooltip]:hover::before {
+  opacity: 1;
+  transition: opacity 500ms ease-in;
+}
+
+[no-hover][tooltip]::before {
+  opacity: 1;
+  transition: opacity 500ms ease-in;
+}
+
+[position="top"][tooltip]::before {
+  top: initial;
+  bottom: 120%;
+}
+
+[position="bottom"][tooltip]::before {
+  top: 120%;
+  bottom: initial;
+}
+
+[position="left"][tooltip]::before {
+  top: initial;
+  bottom: 0%;
+  left: initial;
+  right: 65%;
+}
+
+[position="right"][tooltip]::before {
+  top: initial;
+  bottom: 0%;
+  left: 150%;
+  right: initial;
+}
+
 .ib {
   display: inline-block;
   padding: 1px;
@@ -111,6 +168,12 @@ body {
 
 /*--------------------------------HEADER-------------------------------*/
 
+#popupheader {
+  width: 88%;
+  margin: 0 auto;
+  padding: 0.3em 1%;
+}
+
 #info_boxes {
   display: flex;
   flex-wrap: wrap;
@@ -298,22 +361,19 @@ body {
     align-items: center;
     text-align: justify;
 
-    &.alert-yellow,
-    &.alert-warning {
+    &.alert-yellow {
       background-color: rgb(255, 255, 240);
       color: rgb(99, 87, 6);
       border: rgb(192, 180, 16) 1px solid;
     }
 
-    &.alert-green,
-    &.alert-success {
+    &.alert-green {
       background-color: rgb(245, 255, 245);
       color: rgb(3, 84, 63);
       border: rgb(14, 159, 110) 1px solid;
     }
 
-    &.alert-red,
-    &.alert-error {
+    &.alert-red {
       background-color: rgb(255, 245, 245);
       color: #c53030;
       border: #fc8181 1px solid;
@@ -346,6 +406,52 @@ body {
     text-align: center;
   }
 
+  .tabs {
+    border-radius: 5px;
+
+    .tab-headers {
+      display: flex;
+      flex-flow: row wrap;
+      background-color: $primary-neutral-light-color;
+      padding: 3px 12px 12px;
+      column-gap: 20px;
+      border-top-left-radius: 5px;
+      border-top-right-radius: 5px;
+
+      .tab-header {
+        border: none;
+        padding-right: 0;
+        padding-left: 0;
+        font-size: 120%;
+        background-color: unset;
+        position: relative;
+
+        &:after {
+          content: '';
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          width: 100%;
+          border-bottom: 4px solid darken($primary-neutral-light-color, 10%);
+          border-radius: 2px;
+          transition: all 0.2s ease-in-out;
+        }
+
+        &:hover:after {
+          border-bottom-color: darken($primary-neutral-light-color, 20%);
+        }
+
+        &.active:after {
+          border-bottom-color: $primary-dark-color;
+        }
+      }
+    }
+
+    section {
+      padding: 20px;
+    }
+  }
+
   .tool_bar {
     overflow: auto;
     padding: 4px;
@@ -417,6 +523,33 @@ body {
   }
 }
 
+/*---------------------------ACCOUNTING----------------------------*/
+#accounting {
+  .journal-table {
+    tbody {
+      .neg-amount {
+        color: red;
+
+        &:before {
+          font-family: FontAwesome;
+          font-size: 1em;
+          content: "\f063";
+        }
+      }
+
+      .pos-amount {
+        color: green;
+
+        &:before {
+          font-family: FontAwesome;
+          font-size: 1em;
+          content: "\f062";
+        }
+      }
+    }
+  }
+}
+
 /*-----------------------------GENERAL-----------------------------*/
 h1,
 h2,
@@ -713,6 +846,53 @@ textarea {
   margin-top: 10px;
 }
 
+/*---------------------------LAUNDERETTE-------------------------------*/
+
+#token_form label {
+  display: inline;
+}
+
+/*--------------------------------FOOTER-------------------------------*/
+
+footer {
+  width: 90%;
+  margin: 2em auto;
+
+  font-size: 90%;
+  text-align: center;
+  vertical-align: middle;
+
+  div {
+    margin: 0.6em 0;
+    color: $white-color;
+    border-radius: 5px;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    background-color: $primary-neutral-dark-color;
+    box-shadow: $shadow-color 0 0 15px;
+
+    a {
+      padding: 0.8em;
+      flex: 1;
+      font-weight: bold;
+      color: $white-color !important;
+
+      &:hover {
+        color: $primary-dark-color;
+      }
+    }
+  }
+
+  >.version {
+    margin-top: 3px;
+    color: rgba(0, 0, 0, 0.3);
+  }
+
+  .fa-github {
+    color: $githubblack;
+  }
+}
 
 
 .ui-dialog .ui-dialog-buttonpane {
@@ -755,6 +935,25 @@ textarea {
 }
 
 /*--------------------------------JQuery-------------------------------*/
+
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+  background: $primary-color;
+  border-color: $primary-color;
+}
+
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-top,
+.ui-corner-left {
+  border-radius: 0;
+}
+
 #club_detail {
   .club_logo {
     float: right;

core/static/core/tooltips.scss

@@ -1,26 +0,0 @@
-@import "colors";
-
-.tooltip {
-  @include shadow;
-  z-index: 1;
-  pointer-events: none;
-  background-color: #333;
-  color: #fff;
-  border: 0.5px solid hsl(0, 0%, 50%);
-  border-radius: 5px;
-  padding: 5px 10px;
-  position: absolute;
-  white-space: nowrap;
-  opacity: 0;
-  transition: opacity 500ms ease-out;
-
-  white-space: normal;
-
-  left: 0;
-  top: 0;
-}
-
-.tooltip[tooltip-status=open] {
-  opacity: 1;
-  transition: opacity 500ms ease-in;
-}

core/static/user/login.scss

@@ -24,21 +24,13 @@ body {
     background-color: white;
     margin: 0;
 
-    .alert {
-      word-wrap: break-word;
-      white-space: normal;
-      text-align: center;
-      display: block;
-      width: fit-content;
-    }
-
-    >.title {
+    > .title {
       text-align: center;
       margin: 0;
     }
 
-    >div,
-    >form {
+    > div,
+    > form {
       box-sizing: border-box;
       display: flex;
       flex-direction: column;
@@ -49,8 +41,8 @@ body {
       max-width: 500px;
       margin-top: 20px;
 
-      >p,
-      >div {
+      > p,
+      > div {
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -58,7 +50,7 @@ body {
         width: 100%;
         margin: 0;
 
-        >label {
+        > label {
           width: 100%;
 
           @media (min-width: 500px) {
@@ -67,9 +59,9 @@ body {
         }
       }
 
-      >input,
-      >p>input,
-      >div>input {
+      > input,
+      > p > input,
+      > div > input {
         box-sizing: border-box;
         width: 100%;
         max-width: 500px;
@@ -79,35 +71,35 @@ body {
         }
       }
 
-      >.errorlist {
+      > .errorlist {
         color: red;
         text-align: center;
         margin: 10px 0 0 0;
         list-style-type: none;
       }
 
-      >.required>.helptext {
+      > .required > .helptext {
         text-align: center;
         font-style: italic;
       }
 
-      >.required:last-of-type {
+      > .required:last-of-type {
         box-sizing: border-box;
         max-width: 300px;
         flex-direction: row;
         flex-wrap: wrap;
         justify-content: space-between;
 
-        >label {
+        > label {
           width: 100%;
         }
 
-        >img {
+        > img {
           width: 70px;
           object-fit: contain;
         }
 
-        >input {
+        > input {
           width: 200px;
         }
       }

core/static/user/user_godfathers.scss

@@ -4,12 +4,6 @@
   display: block;
 }
 
-.zoom-control {
-  margin-right: 10px;
-  display: flex;
-  justify-content: right;
-}
-
 .graph-toolbar {
   margin-top: 10px;
   margin-bottom: 10px;
@@ -18,7 +12,7 @@
   justify-content: space-around;
   gap: 30px;
 
-  .toolbar-column {
+  .toolbar-column{
     display: flex;
     flex-direction: column;
     gap: 20px;
@@ -40,38 +34,31 @@
 
     .depth-choice {
       white-space: nowrap;
-
       input[type="number"] {
         -webkit-appearance: textfield;
         -moz-appearance: textfield;
         appearance: textfield;
-
         &::-webkit-inner-spin-button,
         &::-webkit-outer-spin-button {
           -webkit-appearance: none;
         }
       }
-
       button {
         background: none;
-
-        &>.fa {
+        & > .fa {
           border-radius: 50%;
           font-size: 12px;
           padding: 5px;
         }
-
-        &:enabled>.fa {
+        &:enabled > .fa {
           background-color: #354a5f;
           color: white;
         }
-
-        &:enabled:hover>.fa {
+        &:enabled:hover > .fa {
           color: white;
           background-color: #35405f; // just a bit darker
         }
-
-        &:disabled>.fa {
+        &:disabled > .fa {
           background-color: gray;
           color: white;
         }
@@ -87,7 +74,6 @@
   @media screen and (max-width: 500px) {
     flex-direction: column;
     gap: 20px;
-
     .toolbar-column {
       min-width: 100%;
     }
@@ -101,16 +87,14 @@
   padding: 10px;
   box-sizing: border-box;
 
-  >form {
+  > form {
     margin: 0;
   }
 }
-
 #family-tree-link {
   display: inline-block;
   margin-top: 10px;
   text-align: center;
-
   @media (min-width: 450px) {
     margin-right: auto;
   }
@@ -138,10 +122,10 @@
     width: 100%;
   }
 
-  >div.mini_profile_link {
+  > div.mini_profile_link {
     position: relative;
 
-    >a {
+    > a {
       &.mini_profile_link {
         display: flex;
         flex-direction: column;
@@ -156,7 +140,7 @@
           max-height: 65px;
         }
 
-        >span {
+        > span {
           height: 150px;
           width: 100%;
 
@@ -165,7 +149,7 @@
             width: 80px;
           }
 
-          >img {
+          > img {
             width: 100%;
             max-width: 100%;
             max-height: 100%;
@@ -179,7 +163,7 @@
           }
         }
 
-        >em {
+        > em {
           box-sizing: border-box;
           padding: 0 5px;
           text-align: center;
@@ -211,7 +195,7 @@
     }
   }
 
-  >a.mini_profile_link {
+  > a.mini_profile_link {
     display: none;
   }
 }

core/templates/core/base.jinja

@@ -7,29 +7,31 @@
       <link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
       <link rel="stylesheet" href="{{ static('core/base.css') }}">
       <link rel="stylesheet" href="{{ static('core/style.scss') }}">
-      <link rel="stylesheet" href="{{ static('core/tooltips.scss') }}">
       <link rel="stylesheet" href="{{ static('core/markdown.scss') }}">
       <link rel="stylesheet" href="{{ static('core/header.scss') }}">
       <link rel="stylesheet" href="{{ static('core/navbar.scss') }}">
-      <link rel="stylesheet" href="{{ static('core/footer.scss') }}">
       <link rel="stylesheet" href="{{ static('core/pagination.scss') }}">
-      <link rel="stylesheet" href="{{ static('core/accordion.scss') }}">
 
+      {% block jquery_css %}
+        {# Thile file is quite heavy (around 250kb), so declaring it in a block allows easy removal #}
+        <link rel="stylesheet" href="{{ static('bundled/jquery-ui-index.css') }}">
+      {% endblock %}
       <link rel="preload" as="style" href="{{ static('bundled/fontawesome-index.css') }}" onload="this.onload=null;this.rel='stylesheet'">
       <noscript><link rel="stylesheet" href="{{ static('bundled/fontawesome-index.css') }}"></noscript>
 
       <script src="{{ url('javascript-catalog') }}"></script>
-      <script type="module" src={{ static("bundled/core/navbar-index.ts") }}></script>
       <script type="module" src={{ static("bundled/core/components/include-index.ts") }}></script>
       <script type="module" src="{{ static('bundled/alpine-index.js') }}"></script>
       <script type="module" src="{{ static('bundled/htmx-index.js') }}"></script>
       <script type="module" src="{{ static('bundled/country-flags-index.ts') }}"></script>
-      <script type="module" src="{{ static('bundled/core/tooltips-index.ts') }}"></script>
 
       <!-- Jquery declared here to be accessible in every django widgets -->
       <script src="{{ static('bundled/vendored/jquery.min.js') }}"></script>
+      <script src="{{ static('bundled/vendored/jquery-ui.min.js') }}"></script>
       <script src="{{ static('core/js/script.js') }}"></script>
 
+
+
       {% block additional_css %}{% endblock %}
       {% block additional_js %}{% endblock %}
     {% endblock %}
@@ -42,28 +44,35 @@
     {% csrf_token %}
 
     {% block header %}
-      {% include "core/base/header.jinja" %}
+      {% if not popup %}
+        {% include "core/base/header.jinja" %}
 
-      {% block info_boxes %}
-        <div id="info_boxes">
-          {% set sith = get_sith() %}
-          {% if sith.alert_msg %}
-            <div id="alert_box">
-              {{ sith.alert_msg|markdown }}
-            </div>
-          {% endif %}
-          {% if sith.info_msg %}
-            <div id="info_box">
-              {{ sith.info_msg|markdown }}
-            </div>
-          {% endif %}
-        </div>
-      {% endblock %}
+        {% block info_boxes %}
+          <div id="info_boxes">
+            {% set sith = get_sith() %}
+            {% if sith.alert_msg %}
+              <div id="alert_box">
+                {{ sith.alert_msg|markdown }}
+              </div>
+            {% endif %}
+            {% if sith.info_msg %}
+              <div id="info_box">
+                {{ sith.info_msg|markdown }}
+              </div>
+            {% endif %}
+          </div>
+        {% endblock %}
+
+      {% else %}
+        <div id="popupheader">{{ user.get_display_name() }}</div>
+      {% endif %}
 
     {% endblock %}
 
     {% block nav %}
-      {% include "core/base/navbar.jinja" %}
+      {% if not popup %}
+        {% include "core/base/navbar.jinja" %}
+      {% endif %}
     {% endblock %}
 
     <div id="page">
@@ -90,12 +99,33 @@
       </div>
     </div>
 
-    {% block footer %}
-      {% include "core/base/footer.jinja" %}
-    {% endblock %}
+    {% if not popup %}
+      <footer>
+        {% block footer %}
+          <div>
+            <a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a>
+            <a href="{{ url('core:page', 'legals') }}">{% trans %}Legal notices{% endtrans %}</a>
+            <a href="{{ url('core:page', 'copyright_agent') }}">{% trans %}Intellectual property{% endtrans %}</a>
+            <a href="{{ url('core:page', 'docs') }}">{% trans %}Help & Documentation{% endtrans %}</a>
+            <a href="{{ url('core:page', 'rd') }}">{% trans %}R&D{% endtrans %}</a>
+          </div>
+          <a rel="nofollow" href="https://github.com/ae-utbm/sith" target="#">
+            <i class="fa-brands fa-github"></i>
+            {% trans %}Site created by the IT Department of the AE{% endtrans %}
+          </a>
+        {% endblock %}
+        <br>
+      </footer>
+    {% endif %}
 
     {% block script %}
       <script>
+        function showMenu() {
+          let navbar = document.getElementById("navbar-content");
+          const current = navbar.style.getPropertyValue("display");
+          navbar.style.setProperty("display", current === "none" ? "block" : "none");
+        }
+
         document.addEventListener("keydown", (e) => {
           // Looking at the `s` key when not typing in a form
           if (e.keyCode !== 83 || ["INPUT", "TEXTAREA", "SELECT"].includes(e.target.nodeName)) {

core/templates/core/base/footer.jinja

@@ -1,16 +0,0 @@
-<footer class="bottom-links">
-  <section>
-    <a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a>
-    <a href="{{ url('core:page', 'legals') }}">{% trans %}Legal notices{% endtrans %}</a>
-    <a href="{{ url('core:page', 'copyright_agent') }}">{% trans %}Intellectual property{% endtrans %}</a>
-    <a href="{{ url('core:page', 'docs') }}">{% trans %}Help & Documentation{% endtrans %}</a>
-    <a href="{{ url('core:page', 'rd') }}">{% trans %}R&D{% endtrans %}</a>
-  </section>
-  <hr>
-  <section>
-    <a rel="nofollow" href="https://github.com/ae-utbm/sith" target="#">
-      <i class="fa-brands fa-github"></i>
-      {% trans %}Site created by the IT Department of the AE{% endtrans %}
-    </a>
-  </section>
-</footer>

core/templates/core/base/navbar.jinja

@@ -1,47 +1,48 @@
 <nav class="navbar">
   <button class="expand-button" onclick="showMenu()"><i class="fa fa-bars"></i></button>
-  <div id="navbar-content" class="content" mobile-display="hidden">
+  <div id="navbar-content" class="content" style="display: none;">
     <a class="link" href="{{ url('core:index') }}">{% trans %}Main{% endtrans %}</a>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}Associations & Clubs{% endtrans %}</summary>
+    <div class="menu">
+      <span class="head">{% trans %}Associations & Clubs{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='ae') }}">{% trans %}AE{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='utbm-associations') }}">{% trans %}Others UTBM's Associations{% endtrans %}</a></li>
       </ul>
-    </details>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}Events{% endtrans %}</summary>
+    </div>
+    <div class="menu">
+      <span class="head">{% trans %}Events{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('election:list') }}">{% trans %}Elections{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='ga') }}">{% trans %}Big event{% endtrans %}</a></li>
       </ul>
-    </details>
+    </div>
     <a class="link" href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
     <a class="link" href="{{ url('sas:main') }}">{% trans %}Gallery{% endtrans %}</a>
     <a class="link" href="{{ url('eboutic:main') }}">{% trans %}Eboutic{% endtrans %}</a>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}Services{% endtrans %}</summary>
+    <div class="menu">
+      <span class="head">{% trans %}Services{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
+        <li><a href="/launderette">{% trans %}Launderette{% endtrans %}</a></li>
         <li><a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a></li>
         <li><a href="{{ url('pedagogy:guide') }}">{% trans %}Pedagogy{% endtrans %}</a></li>
       </ul>
-    </details>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}My Benefits{% endtrans %}</summary>
+    </div>
+    <div class="menu">
+      <span class="head">{% trans %}My Benefits{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='partenaires')}}">{% trans %}Sponsors{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='avantages') }}">{% trans %}Subscriber benefits{% endtrans %}</a></li>
       </ul>
-    </details>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}Help{% endtrans %}</summary>
+    </div>
+    <div class="menu">
+      <span class="head">{% trans %}Help{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='FAQ') }}">{% trans %}FAQ{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='Index') }}">{% trans %}Wiki{% endtrans %}</a></li>
       </ul>
-    </details>
+    </div>
   </div>
 </nav>

core/templates/core/file.jinja

@@ -19,9 +19,9 @@
 {% macro print_file_name(file) %}
   {% if file %}
     {{ print_file_name(file.parent) }} >
-    <a href="{{ url('core:file_detail', file_id=file.id) }}">{{ file.get_display_name() }}</a>
+    <a href="{{ url('core:file_detail', file_id=file.id, popup=popup) }}">{{ file.get_display_name() }}</a>
   {% else %}
-    <a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a>
+    <a href="{{ url('core:file_list', popup) }}">{% trans %}Files{% endtrans %}</a>
   {% endif %}
 {% endmacro %}
 
@@ -33,16 +33,16 @@
       <div>
         {% set home = user.home %}
         {% if home %}
-          <a href="{{ url('core:file_detail', home.id) }}">{% trans %}My files{% endtrans %}</a>
+          <a href="{{ url('core:file_detail', home.id, popup) }}">{% trans %}My files{% endtrans %}</a>
         {% endif %}
       </div>
       {% if file %}
-        <a href="{{ url('core:file_detail', file.id) }}">{% trans %}View{% endtrans %}</a>
+        <a href="{{ url('core:file_detail', file.id, popup) }}">{% trans %}View{% endtrans %}</a>
         {% if can_edit(file, user) %}
-          <a href="{{ url('core:file_edit', file_id=file.id) }}">{% trans %}Edit{% endtrans %}</a>
+          <a href="{{ url('core:file_edit', file_id=file.id, popup=popup) }}">{% trans %}Edit{% endtrans %}</a>
         {% endif %}
         {% if can_edit_prop(file, user) %}
-          <a href="{{ url('core:file_prop', file_id=file.id) }}">{% trans %}Prop{% endtrans %}</a>
+          <a href="{{ url('core:file_prop', file_id=file.id, popup=popup) }}">{% trans %}Prop{% endtrans %}</a>
         {% endif %}
       {% endif %}
     </div>

core/templates/core/file_detail.jinja

@@ -45,7 +45,7 @@
             {% else %}
               <i class="fa fa-file" aria-hidden="true"></i>
             {% endif %}
-            <a href="{{ url('core:file_detail', file_id=f.id) }}">{{ f.get_display_name() }}</a></li>
+            <a href="{{ url('core:file_detail', file_id=f.id, popup=popup) }}">{{ f.get_display_name() }}</a></li>
         {% endfor %}
       </ul>
     </form>
@@ -59,9 +59,22 @@
     <p><a href="{{ url('core:download', file_id=file.id) }}">{% trans %}Download{% endtrans %}</a></p>
   {% endif %}
   {% if not file.home_of and not file.home_of_club and file.parent %}
-    <p><a href="{{ url('core:file_delete', file_id=file.id) }}">{% trans %}Delete{% endtrans %}</a></p>
+    <p><a href="{{ url('core:file_delete', file_id=file.id, popup=popup) }}">{% trans %}Delete{% endtrans %}</a></p>
   {% endif %}
   {% if user.is_com_admin %}
     <p><a href="{{ url('core:file_moderate', file_id=file.id) }}">{% trans %}Moderate{% endtrans %}</a></p>
   {% endif %}
 {% endblock %}
+
+{% block script %}
+  {{ super() }}
+  <script>
+    {% if popup and file.is_file %}
+      parent.$("#file_id").replaceWith('<div id="file_id" value="{{ file.id }}">{{ file.name }}</div>');
+      parent.$(".ui-dialog-buttonpane button").button("option", "disabled", false);
+    {% endif %}
+  </script>
+{% endblock %}
+
+
+

core/templates/core/file_list.jinja

@@ -12,7 +12,7 @@
           {% else %}
             <i class="fa fa-file" aria-hidden="true"></i>
           {% endif %}
-          <a href="{{ url('core:file_detail', file_id=f.id) }}">{{ f.name }}</a></li>
+          <a href="{{ url('core:file_detail', file_id=f.id, popup=popup) }}">{{ f.name }}</a></li>
       {% endfor %}
     </ul>
   {% else %}

core/templates/core/login.jinja

@@ -26,18 +26,17 @@
     {% endif %}
   {% endif %}
 
-  <form method="post" action="{{ url('core:login') }}" id="login-form">
+  <form method="post" action="{{ url('core:login') }}">
     {% if form.errors %}
-      <p class="alert alert-red">
-        {% trans %}Your credentials didn't match. Please try again.{% endtrans %}
-      </p>
+      <p class="alert alert-red">{% trans %}Your username and password didn't match. Please try again.{% endtrans %}</p>
+      <br>
     {% endif %}
 
     {% csrf_token %}
 
     <div>
       <label for="{{ form.username.name }}">{{ form.username.label }}</label>
-      {{ form.username }}
+      <input id="id_username" maxlength="254" name="username" type="text" autofocus="autofocus" />
       {{ form.username.errors }}
     </div>
 

core/templates/core/macros.jinja

@@ -86,6 +86,19 @@
   {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}<br/>
 {%- endmacro %}
 
+{% macro show_slots(user) %}
+  {% if user.slots.filter(start_date__gte=timezone.now()).exists() %}
+    <h5>{% trans %}Slot{% endtrans %}</h5>
+    <ul>
+      {% for i in user.slots.filter(start_date__gte=timezone.now().replace(tzinfo=None)).all() %}
+        <li>{{ i.get_type_display() }} - {{i.machine.launderette }}, {{ i.start_date|date("l j") }} :
+          {{ i.start_date|time(DATETIME_FORMAT) }} |
+          <a href="{{ url('launderette:delete_slot', slot_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></li>
+      {% endfor %}
+    </ul>
+  {% endif %}
+{% endmacro %}
+
 {% macro show_tokens(user) %}
   {% if user.tokens.exists() %}
     <h5>{% trans %}Tokens{% endtrans %}</h5>
@@ -245,3 +258,65 @@
   <button type="button" onclick="checkbox_{{form_id}}(true);">{% trans %}Select All{% endtrans %}</button>
   <button type="button" onclick="checkbox_{{form_id}}(false);">{% trans %}Unselect All{% endtrans %}</button>
 {% endmacro %}
+
+{% macro tabs(tab_list, attrs = "") %}
+  {# Tab component
+
+  Parameters:
+    tab_list: list[tuple[str, str]] The list of tabs to display.
+        Each element of the list is a tuple which first element
+        is the title of the tab and the second element its content
+    attrs: str Additional attributes to put on the enclosing div
+
+  Example:
+    A basic usage would be as follow :
+
+        {{ tabs([("title 1", "content 1"), ("title 2", "content 2")]) }}
+
+    If you want to display more complex logic, you can define macros
+    and use those macros in parameters :
+
+        {{ tabs([("title", my_macro())]) }}
+
+    It's also possible to get and set the currently selected tab using Alpine.
+    Here, the title of the currently selected tab will be displayed.
+    Moreover, on page load, the tab will be opened on "tab 2".
+
+        <div x-data="{current_tab: 'tab 2'}">
+          <p x-text="current_tab"></p>
+          {{ tabs([("tab 1", "Hello"), ("tab 2", "World")], "x-model=current_tab") }}
+        </div>
+
+    If you want to have translated tab titles, you can enclose the macro call
+    in a with block :
+
+        {% with title=_("title"), content=_("Content") %}
+            {{ tabs([(tab1, content)]) }}
+        {% endwith %}
+  #}
+  <div
+    class="tabs shadow"
+    x-data="{selected: '{{ tab_list[0][0] }}'}"
+    x-modelable="selected"
+    {{ attrs }}
+  >
+    <div class="tab-headers">
+      {% for title, _ in tab_list %}
+        <button
+          class="tab-header clickable"
+          :class="{active: selected === '{{ title }}'}"
+          @click="selected = '{{ title }}'"
+        >
+          {{ title }}
+        </button>
+      {% endfor %}
+    </div>
+    <div class="tab-content">
+      {% for title, content in tab_list %}
+        <section x-show="selected === '{{ title }}'">
+          {{ content }}
+        </section>
+      {% endfor %}
+    </div>
+  </div>
+{% endmacro %}

core/templates/core/register.jinja

@@ -18,7 +18,7 @@
   <form action="{{ url('core:register') }}" method="post">
     {% csrf_token %}
     {% render_honeypot_field %}
-    {{ form.as_p() }}
+    {{ form }}
     <input type="submit" value="{% trans %}Register{% endtrans %}" />
   </form>
 {% endblock %}

core/templates/core/user_account.jinja

@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% macro monthly(objects) %}
-  <div class="accordion-content">
+  <div>
     <table>
       <thead>
         <tr>
@@ -37,28 +37,22 @@
   {% if customer %}
     <h3>{% trans %}User account{% endtrans %}</h3>
     <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
-    {% if buyings_month %}
-      <details class="accordion" name="account" open>
-        <summary>{% trans %}Account purchases{% endtrans %}</summary>
+    <div id="drop">
+      {% if buyings_month %}
+        <h5>{% trans %}Account purchases{% endtrans %}</h5>
         {{ monthly(buyings_month) }}
-      </details>
-    {% endif %}
-    {% if refilling_month %}
-      <details class="accordion" name="account">
-        <summary>{% trans %}Reloads{% endtrans %}</summary>
+      {% endif %}
+      {% if refilling_month %}
+        <h5>{% trans %}Reloads{% endtrans %}</h5>
         {{ monthly(refilling_month) }}
-      </details>
-    {% endif %}
-    {% if invoices_month %}
-      <details class="accordion" name="account">
-        <summary>{% trans %}Eboutic invoices{% endtrans %}</summary>
+      {% endif %}
+      {% if invoices_month %}
+        <h5>{% trans %}Eboutic invoices{% endtrans %}</h5>
         {{ monthly(invoices_month) }}
-      </details>
-    {% endif %}
-    {% if etickets %}
-      <details class="accordion" name="account">
-        <summary>{% trans %}Etickets{% endtrans %}</summary>
-        <div class="accordion-content">
+      {% endif %}
+      {% if etickets %}
+        <h4>{% trans %}Etickets{% endtrans %}</h4>
+        <div>
           <ul>
             {% for s in etickets %}
               <li>
@@ -69,9 +63,22 @@
             {% endfor %}
           </ul>
         </div>
-      </details>
-    {% endif %}
+      {% endif %}
+    </div>
   {% else %}
     <p>{% trans %}User has no account{% endtrans %}</p>
   {% endif %}
 {% endblock %}
+
+{% block script %}
+  {{ super() }}
+  <script>
+    $(function(){
+      $("#drop").accordion({
+        heightStyle: "content"
+      });
+    });
+  </script>
+{% endblock %}
+
+

core/templates/core/user_detail.jinja

@@ -141,6 +141,12 @@
             {{ user_subscription(profile) }}
           </div>
         {% endif %}
+        {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
+          <div>
+            {{ show_tokens(profile) }}
+            {{ show_slots(profile) }}
+          </div>
+        {% endif %}
       {% else %}
         <div>
           {% trans %}Not subscribed{% endtrans %}
@@ -254,5 +260,13 @@
         keys.shift();
       }
     });
+
+    $(function () {
+      $("#drop_gifts").accordion({
+        heightStyle: "content",
+        collapsible: true,
+        active: false
+      });
+    });
   </script>
 {% endblock %}

core/templates/core/user_edit.jinja

@@ -74,7 +74,7 @@
     {%- if this_picture -%}
       {% set default_picture = this_picture.get_download_url()|tojson %}
       {% set delete_url = (
-        url('core:file_delete', file_id=this_picture.id)
+        url('core:file_delete', file_id=this_picture.id, popup='')
         + "?next=" + url('core:user_edit', user_id=profile.id)
       )|tojson %}
     {%- else -%}

core/templates/core/user_godfathers_tree.jinja

@@ -7,7 +7,7 @@
 {%- endblock -%}
 
 {% block additional_js %}
-  <script type="module" src="{{ static("bundled/user/family-graph-index.ts") }}"></script>
+  <script type="module" src="{{ static("bundled/user/family-graph-index.js") }}"></script>
 {% endblock %}
 
 {% block title %}
@@ -15,14 +15,7 @@
 {% endblock %}
 
 {% block content %}
-  <div
-    x-data="graph({
-            activeUser: {{ object.id }},
-            depthMin: {{ depth_min }},
-            depthMax: {{ depth_max }},
-            })"
-    :aria-busy="loading"
-  >
+  <div x-data="graph" :aria-busy="loading">
     <div class="graph-toolbar">
       <div class="toolbar-column">
         <div class="toolbar-input">
@@ -93,36 +86,17 @@
         </button>
       </div>
     </div>
-
-    <div class="zoom-control" x-ref="zoomControl">
-      <button
-        @click="graph.zoom(graph.zoom() + 1)"
-        :disabled="!isZoomEnabled"
-      >
-        <i class="fa-solid fa-magnifying-glass-plus"></i>
-      </button>
-      <button
-        @click="graph.zoom(graph.zoom() - 1)"
-        :disabled="!isZoomEnabled"
-      >
-        <i class="fa-solid fa-magnifying-glass-minus"></i>
-      </button>
-      <button
-        x-show="isZoomEnabled"
-        @click="isZoomEnabled = false"
-      >
-        <i class="fa-solid fa-unlock"></i>
-      </button>
-      <button
-        x-show="!isZoomEnabled"
-        @click="isZoomEnabled = true"
-      >
-        <i class="fa-solid fa-lock"></i>
-      </button>
-    </div>
-
     <div x-ref="graph" class="graph"></div>
   </div>
 
+  <script>
+    window.addEventListener("DOMContentLoaded", () => {
+      loadFamilyGraph({
+        activeUser: {{ object.id }},
+        depthMin: {{ depth_min }},
+        depthMax: {{ depth_max }},
+      });
+    });
+  </script>
 {% endblock %}
 

core/tests/test_core.py

@@ -38,7 +38,6 @@ from core.markdown import markdown
 from core.models import AnonymousUser, Group, Page, User
 from core.utils import get_semester_code, get_start_of_semester
 from core.views import AllowFragment
-from counter.models import Customer
 from sith import settings
 
 
@@ -152,44 +151,24 @@ class TestUserLogin:
     def user(self) -> User:
         return baker.make(User, password=make_password("plop"))
 
-    @pytest.mark.parametrize(
-        "identifier_getter",
-        [
-            lambda user: user.username,
-            lambda user: user.email,
-            lambda user: Customer.get_or_create(user)[0].account_id,
-        ],
-    )
-    def test_login_fail(self, client, user, identifier_getter):
+    def test_login_fail(self, client, user):
         """Should not login a user correctly."""
-        identifier = identifier_getter(user)
         response = client.post(
             reverse("core:login"),
-            {"username": identifier, "password": "wrong-password"},
+            {"username": user.username, "password": "wrong-password"},
         )
         assert response.status_code == 200
-        assert response.wsgi_request.user.is_anonymous
-        soup = BeautifulSoup(response.text, "lxml")
-        form = soup.find(id="login-form")
         assert (
-            form.find(class_="alert alert-red").get_text(strip=True)
-            == "Vos identifiants ne correspondent pas. Veuillez réessayer."
-        )
-        assert form.find("input", attrs={"name": "username"}).get("value") == identifier
+            '<p class="alert alert-red">Votre nom d\'utilisateur '
+            "et votre mot de passe ne correspondent pas. Merci de réessayer.</p>"
+        ) in response.text
+        assert response.wsgi_request.user.is_anonymous
 
-    @pytest.mark.parametrize(
-        "identifier_getter",
-        [
-            lambda user: user.username,
-            lambda user: user.email,
-            lambda user: Customer.get_or_create(user)[0].account_id,
-        ],
-    )
-    def test_login_success(self, client, user, identifier_getter):
+    def test_login_success(self, client, user):
         """Should login a user correctly."""
         response = client.post(
             reverse("core:login"),
-            {"username": identifier_getter(user), "password": "plop"},
+            {"username": user.username, "password": "plop"},
         )
         assertRedirects(response, reverse("core:index"))
         assert response.wsgi_request.user == user
@@ -382,9 +361,17 @@ class TestUserIsInGroup(TestCase):
 
     @classmethod
     def setUpTestData(cls):
-        cls.public_group = Group.objects.get(id=settings.SITH_GROUP_PUBLIC_ID)
+        cls.root_group = Group.objects.get(name="Root")
+        cls.public_group = Group.objects.get(name="Public")
         cls.public_user = baker.make(User)
+        cls.subscribers = Group.objects.get(name="Subscribers")
+        cls.old_subscribers = Group.objects.get(name="Old subscribers")
+        cls.accounting_admin = Group.objects.get(name="Accounting admin")
+        cls.com_admin = Group.objects.get(name="Communication admin")
+        cls.counter_admin = Group.objects.get(name="Counter admin")
+        cls.sas_admin = Group.objects.get(name="SAS admin")
         cls.club = baker.make(Club)
+        cls.main_club = Club.objects.get(id=1)
 
     def assert_in_public_group(self, user):
         assert user.is_in_group(pk=self.public_group.id)
@@ -392,7 +379,15 @@ class TestUserIsInGroup(TestCase):
 
     def assert_only_in_public_group(self, user):
         self.assert_in_public_group(user)
-        for group in Group.objects.exclude(id=self.public_group.id):
+        for group in (
+            self.root_group,
+            self.accounting_admin,
+            self.sas_admin,
+            self.subscribers,
+            self.old_subscribers,
+            self.club.members_group,
+            self.club.board_group,
+        ):
             assert not user.is_in_group(pk=group.pk)
             assert not user.is_in_group(name=group.name)
 
@@ -416,11 +411,10 @@ class TestUserIsInGroup(TestCase):
         """Test that the number of db queries is stable
         and that less queries are made when making a new call.
         """
+        # make sure Skia is in at least one group
         group_in = baker.make(Group)
         self.public_user.groups.add(group_in)
 
-        # clear the cached property `User.cached_groups`
-        self.public_user.__dict__.pop("cached_groups", None)
         cache.clear()
         # Test when the user is in the group
         with self.assertNumQueries(2):
@@ -429,7 +423,6 @@ class TestUserIsInGroup(TestCase):
             self.public_user.is_in_group(pk=group_in.id)
 
         group_not_in = baker.make(Group)
-        self.public_user.__dict__.pop("cached_groups", None)
         cache.clear()
         # Test when the user is not in the group
         with self.assertNumQueries(2):
@@ -454,6 +447,24 @@ class TestUserIsInGroup(TestCase):
         )
         assert cached_membership == "not_member"
 
+    def test_cache_properly_cleared_group(self):
+        """Test that when a user is removed from a group,
+        the is_in_group_method return False when calling it again.
+        """
+        # testing with pk
+        self.public_user.groups.add(self.com_admin.pk)
+        assert self.public_user.is_in_group(pk=self.com_admin.pk) is True
+
+        self.public_user.groups.remove(self.com_admin.pk)
+        assert self.public_user.is_in_group(pk=self.com_admin.pk) is False
+
+        # testing with name
+        self.public_user.groups.add(self.sas_admin.pk)
+        assert self.public_user.is_in_group(name="SAS admin") is True
+
+        self.public_user.groups.remove(self.sas_admin.pk)
+        assert self.public_user.is_in_group(name="SAS admin") is False
+
     def test_not_existing_group(self):
         """Test that searching for a not existing group
         returns False.

core/tests/test_files.py

@@ -146,7 +146,7 @@ class TestUserProfilePicture:
         return client.post(
             reverse(
                 "core:file_delete",
-                kwargs={"file_id": user.profile_pict.pk},
+                kwargs={"file_id": user.profile_pict.pk, "popup": ""},
                 query={"next": user.get_absolute_url()},
             ),
         )

core/tests/test_user.py

@@ -318,27 +318,3 @@ def test_displayed_other_user_tabs(user_factory, expected_tabs: list[str]):
     view.object = subscriber_user.make()  # user whose page is being seen
     tabs = [tab["slug"] for tab in view.get_list_of_tabs()]
     assert tabs == expected_tabs
-
-
-@pytest.mark.django_db
-class TestRedirectMe:
-    @pytest.mark.parametrize(
-        "route", ["core:user_profile", "core:user_account", "core:user_edit"]
-    )
-    def test_redirect(self, client: Client, route: str):
-        user = subscriber_user.make()
-        client.force_login(user)
-        target_url = reverse(route, kwargs={"user_id": user.id})
-        src_url = target_url.replace(str(user.id), "me")
-        assertRedirects(client.get(src_url), target_url)
-
-    def test_anonymous_user(self, client: Client):
-        url = reverse("core:user_me_redirect")
-        assertRedirects(client.get(url), reverse("core:login", query={"next": url}))
-
-
-@pytest.mark.parametrize("promo", [7, 22])
-@pytest.mark.django_db
-def test_promo_has_logo(promo):
-    user = baker.make(User, promo=promo)
-    assert user.promo_has_logo()

core/urls.py

@@ -21,6 +21,7 @@
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
+
 from django.urls import path, re_path, register_converter
 from django.views.generic import RedirectView
 
@@ -67,7 +68,6 @@ from core.views import (
     UserGodfathersTreeView,
     UserGodfathersView,
     UserListView,
-    UserMeRedirect,
     UserMiniView,
     UserPreferencesView,
     UserStatsView,
@@ -141,12 +141,6 @@ urlpatterns = [
     ),
     # User views
     path("user/", UserListView.as_view(), name="user_list"),
-    path(
-        "user/me/<path:remaining_path>/",
-        UserMeRedirect.as_view(),
-        name="user_me_redirect_with_path",
-    ),
-    path("user/me/", UserMeRedirect.as_view(), name="user_me_redirect"),
     path("user/<int:user_id>/mini/", UserMiniView.as_view(), name="user_profile_mini"),
     path("user/<int:user_id>/", UserView.as_view(), name="user_profile"),
     path(
@@ -193,24 +187,24 @@ urlpatterns = [
         name="user_gift_delete",
     ),
     # File views
-    re_path(r"^file/$", FileListView.as_view(), name="file_list"),
+    re_path(r"^file/(?P<popup>popup)?$", FileListView.as_view(), name="file_list"),
     re_path(
-        r"^file/(?P<file_id>[0-9]+)/$",
+        r"^file/(?P<file_id>[0-9]+)/(?P<popup>popup)?$",
         FileView.as_view(),
         name="file_detail",
     ),
     re_path(
-        r"^file/(?P<file_id>[0-9]+)/edit/$",
+        r"^file/(?P<file_id>[0-9]+)/edit/(?P<popup>popup)?$",
         FileEditView.as_view(),
         name="file_edit",
     ),
     re_path(
-        r"^file/(?P<file_id>[0-9]+)/prop/$",
+        r"^file/(?P<file_id>[0-9]+)/prop/(?P<popup>popup)?$",
         FileEditPropView.as_view(),
         name="file_prop",
     ),
     re_path(
-        r"^file/(?P<file_id>[0-9]+)/delete/$",
+        r"^file/(?P<file_id>[0-9]+)/delete/(?P<popup>popup)?$",
         FileDeleteView.as_view(),
         name="file_delete",
     ),

core/views/__init__.py

@@ -37,6 +37,8 @@ from core.views.forms import LoginForm
 
 def forbidden(request, exception):
     context = {"next": request.path, "form": LoginForm()}
+    if popup := request.resolver_match.kwargs.get("popup"):
+        context["popup"] = popup
     return HttpResponseForbidden(render(request, "core/403.jinja", context=context))
 
 

core/views/files.py

@@ -198,6 +198,9 @@ class FileListView(ListView):
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
+        kwargs["popup"] = ""
+        if self.kwargs.get("popup") is not None:
+            kwargs["popup"] = "popup"
         return kwargs
 
 
@@ -214,7 +217,20 @@ class FileEditView(CanEditMixin, UpdateView):
         return modelform_factory(SithFile, fields=fields)
 
     def get_success_url(self):
-        return reverse("core:file_detail", kwargs={"file_id": self.object.id})
+        if self.kwargs.get("popup") is not None:
+            return reverse(
+                "core:file_detail", kwargs={"file_id": self.object.id, "popup": "popup"}
+            )
+        return reverse(
+            "core:file_detail", kwargs={"file_id": self.object.id, "popup": ""}
+        )
+
+    def get_context_data(self, **kwargs):
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["popup"] = ""
+        if self.kwargs.get("popup") is not None:
+            kwargs["popup"] = "popup"
+        return kwargs
 
 
 class FileEditPropForm(forms.ModelForm):
@@ -252,9 +268,16 @@ class FileEditPropView(CanEditPropMixin, UpdateView):
     def get_success_url(self):
         return reverse(
             "core:file_detail",
-            kwargs={"file_id": self.object.id},
+            kwargs={"file_id": self.object.id, "popup": self.kwargs.get("popup", "")},
         )
 
+    def get_context_data(self, **kwargs):
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["popup"] = ""
+        if self.kwargs.get("popup") is not None:
+            kwargs["popup"] = "popup"
+        return kwargs
+
 
 class FileView(CanViewMixin, DetailView, FormMixin):
     """Handle the upload of new files into a folder."""
@@ -330,12 +353,15 @@ class FileView(CanViewMixin, DetailView, FormMixin):
     def get_success_url(self):
         return reverse(
             "core:file_detail",
-            kwargs={"file_id": self.object.id},
+            kwargs={"file_id": self.object.id, "popup": self.kwargs.get("popup", "")},
         )
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
+        kwargs["popup"] = ""
         kwargs["form"] = self.form
+        if self.kwargs.get("popup") is not None:
+            kwargs["popup"] = "popup"
         kwargs["clipboard"] = SithFile.objects.filter(
             id__in=self.request.session["clipboard"]
         )
@@ -354,17 +380,19 @@ class FileDeleteView(AllowFragment, CanEditPropMixin, DeleteView):
             return self.request.GET["next"]
         if self.object.parent is None:
             return reverse(
-                "core:file_list",
+                "core:file_list", kwargs={"popup": self.kwargs.get("popup", "")}
             )
         return reverse(
             "core:file_detail",
             kwargs={
                 "file_id": self.object.parent.id,
+                "popup": self.kwargs.get("popup", ""),
             },
         )
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
+        kwargs["popup"] = "" if self.kwargs.get("popup") is None else "popup"
         kwargs["next"] = self.request.GET.get("next", None)
         kwargs["previous"] = self.request.GET.get("previous", None)
         kwargs["current"] = self.request.path

core/views/forms.py

@@ -86,6 +86,30 @@ class NFCTextInput(TextInput):
         return context
 
 
+class SelectFile(TextInput):
+    def render(self, name, value, attrs=None, renderer=None):
+        if attrs:
+            attrs["class"] = "select_file"
+        else:
+            attrs = {"class": "select_file"}
+        output = (
+            '%(content)s<div name="%(name)s" class="choose_file_widget" title="%(title)s"></div>'
+            % {
+                "content": super().render(name, value, attrs, renderer),
+                "title": _("Choose file"),
+                "name": name,
+            }
+        )
+        output += (
+            '<span name="'
+            + name
+            + '" class="choose_file_button">'
+            + gettext("Choose file")
+            + "</span>"
+        )
+        return output
+
+
 class SelectUser(TextInput):
     def render(self, name, value, attrs=None, renderer=None):
         if attrs:
@@ -132,31 +156,29 @@ class FutureDateTimeField(forms.DateTimeField):
 
 class LoginForm(AuthenticationForm):
     def __init__(self, *arg, **kwargs):
+        if "data" in kwargs:
+            from counter.models import Customer
+
+            data = kwargs["data"].copy()
+            account_code = re.compile(r"^[0-9]+[A-Za-z]$")
+            try:
+                if account_code.match(data["username"]):
+                    user = (
+                        Customer.objects.filter(account_id__iexact=data["username"])
+                        .first()
+                        .user
+                    )
+                elif "@" in data["username"]:
+                    user = User.objects.filter(email__iexact=data["username"]).first()
+                else:
+                    user = User.objects.filter(username=data["username"]).first()
+                data["username"] = user.username
+            except:  # noqa E722 I don't know what error is supposed to be raised here
+                pass
+            kwargs["data"] = data
         super().__init__(*arg, **kwargs)
         self.fields["username"].label = _("Username, email, or account number")
 
-    def clean_username(self):
-        identifier: str = self.cleaned_data["username"]
-        account_code = re.compile(r"^[0-9]+[A-Za-z]$")
-        if account_code.match(identifier):
-            qs_filter = "customer__account_id__iexact"
-        elif identifier.count("@") == 1:
-            qs_filter = "email"
-        else:
-            qs_filter = None
-        if qs_filter:
-            # if the user gave an email or an account code instead of
-            # a username, retrieve and return the corresponding username.
-            # If there is no username, return an empty string, so that
-            # Django will properly handle the error when failing the authentication
-            identifier = (
-                User.objects.filter(**{qs_filter: identifier})
-                .values_list("username", flat=True)
-                .first()
-                or ""
-            )
-        return identifier
-
 
 class RegisteringForm(UserCreationForm):
     error_css_class = "error"

core/views/user.py

@@ -48,7 +48,6 @@ from django.views.generic import (
     DeleteView,
     DetailView,
     ListView,
-    RedirectView,
     TemplateView,
 )
 from django.views.generic.dates import MonthMixin, YearMixin
@@ -183,13 +182,6 @@ class UserCreationView(FormView):
         return super().form_valid(form)
 
 
-class UserMeRedirect(LoginRequiredMixin, RedirectView):
-    def get_redirect_url(self, *args, **kwargs):
-        if remaining := kwargs.get("remaining_path"):
-            return f"/user/{self.request.user.id}/{remaining}/"
-        return f"/user/{self.request.user.id}/"
-
-
 class UserTabsMixin(TabedViewMixin):
     def get_tabs_title(self):
         return self.object.get_display_name()
@@ -572,8 +564,10 @@ class UserToolsView(LoginRequiredMixin, QuickNotifMixin, UserTabsMixin, Template
 
     def get_context_data(self, **kwargs):
         self.object = self.request.user
+        from launderette.models import Launderette
 
         kwargs = super().get_context_data(**kwargs)
+        kwargs["launderettes"] = Launderette.objects.all()
         kwargs["profile"] = self.request.user
         kwargs["object"] = self.request.user
         return kwargs

counter/admin.py

@@ -41,7 +41,6 @@ class ProductAdmin(SearchModelAdmin):
         "profit",
         "archived",
     )
-    list_select_related = ("product_type",)
     search_fields = ("name", "code")
 
 
@@ -82,13 +81,20 @@ class AccountDumpAdmin(admin.ModelAdmin):
         "customer",
         "warning_mail_sent_at",
         "warning_mail_error",
-        "dump_operation__date",
+        "dump_operation",
         "amount",
     )
-    list_select_related = ("customer", "customer__user", "dump_operation")
     autocomplete_fields = ("customer", "dump_operation")
     list_filter = ("warning_mail_error",)
 
+    def get_queryset(self, request):
+        # the `amount` property requires to know the customer and the dump_operation
+        return (
+            super()
+            .get_queryset(request)
+            .select_related("customer", "customer__user", "dump_operation")
+        )
+
 
 @admin.register(Counter)
 class CounterAdmin(admin.ModelAdmin):
@@ -107,14 +113,11 @@ class RefillingAdmin(SearchModelAdmin):
         "customer__account_id",
         "counter__name",
     )
-    list_filter = (("counter", admin.RelatedOnlyFieldListFilter),)
-    date_hierarchy = "date"
 
 
 @admin.register(Selling)
 class SellingAdmin(SearchModelAdmin):
     list_display = ("customer", "label", "unit_price", "quantity", "counter", "date")
-    list_select_related = ("customer", "customer__user", "counter")
     search_fields = (
         "customer__user__username",
         "customer__user__first_name",
@@ -123,8 +126,6 @@ class SellingAdmin(SearchModelAdmin):
         "counter__name",
     )
     autocomplete_fields = ("customer", "seller")
-    list_filter = (("counter", admin.RelatedOnlyFieldListFilter),)
-    date_hierarchy = "date"
 
 
 @admin.register(Permanency)

counter/api.py

@@ -16,13 +16,11 @@ from django.conf import settings
 from django.db.models import F
 from django.shortcuts import get_object_or_404
 from ninja import Query
-from ninja.security import SessionAuth
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.pagination import PageNumberPaginationExtra
 from ninja_extra.schemas import PaginatedResponseSchema
 
-from api.auth import ApiKeyAuth
-from api.permissions import CanAccessLookup, CanView, IsInGroup, IsRoot
+from core.auth.api_permissions import CanAccessLookup, CanView, IsInGroup, IsRoot
 from counter.models import Counter, Product, ProductType
 from counter.schemas import (
     CounterFilterSchema,
@@ -64,7 +62,6 @@ class CounterController(ControllerBase):
     @route.get(
         "/search",
         response=PaginatedResponseSchema[SimplifiedCounterSchema],
-        auth=[SessionAuth(), ApiKeyAuth()],
         permissions=[CanAccessLookup],
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
@@ -77,7 +74,6 @@ class ProductController(ControllerBase):
     @route.get(
         "/search",
         response=PaginatedResponseSchema[SimpleProductSchema],
-        auth=[SessionAuth(), ApiKeyAuth()],
         permissions=[CanAccessLookup],
     )
     @paginate(PageNumberPaginationExtra, page_size=50)

counter/forms.py

@@ -1,7 +1,4 @@
-import math
-
 from django import forms
-from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
@@ -264,112 +261,3 @@ class CloseCustomerAccountForm(forms.Form):
         widget=AutoCompleteSelectUser,
         queryset=User.objects.all(),
     )
-
-
-class ProductForm(forms.Form):
-    quantity = forms.IntegerField(min_value=1, required=True)
-    id = forms.IntegerField(min_value=0, required=True)
-
-    def __init__(
-        self,
-        customer: Customer,
-        counter: Counter,
-        allowed_products: dict[int, Product],
-        *args,
-        **kwargs,
-    ):
-        self.customer = customer  # Used by formset
-        self.counter = counter  # Used by formset
-        self.allowed_products = allowed_products
-        super().__init__(*args, **kwargs)
-
-    def clean_id(self):
-        data = self.cleaned_data["id"]
-
-        # We store self.product so we can use it later on the formset validation
-        # And also in the global clean
-        self.product = self.allowed_products.get(data, None)
-        if self.product is None:
-            raise forms.ValidationError(
-                _("The selected product isn't available for this user")
-            )
-
-        return data
-
-    def clean(self):
-        cleaned_data = super().clean()
-        if len(self.errors) > 0:
-            return
-
-        # Compute prices
-        cleaned_data["bonus_quantity"] = 0
-        if self.product.tray:
-            cleaned_data["bonus_quantity"] = math.floor(
-                cleaned_data["quantity"] / Product.QUANTITY_FOR_TRAY_PRICE
-            )
-        cleaned_data["total_price"] = self.product.price * (
-            cleaned_data["quantity"] - cleaned_data["bonus_quantity"]
-        )
-
-        return cleaned_data
-
-
-class BaseBasketForm(forms.BaseFormSet):
-    def clean(self):
-        self.forms = [form for form in self.forms if form.cleaned_data != {}]
-
-        if len(self.forms) == 0:
-            return
-
-        self._check_forms_have_errors()
-        self._check_product_are_unique()
-        self._check_recorded_products(self[0].customer)
-        self._check_enough_money(self[0].counter, self[0].customer)
-
-    def _check_forms_have_errors(self):
-        if any(len(form.errors) > 0 for form in self):
-            raise forms.ValidationError(_("Submitted basket is invalid"))
-
-    def _check_product_are_unique(self):
-        product_ids = {form.cleaned_data["id"] for form in self.forms}
-        if len(product_ids) != len(self.forms):
-            raise forms.ValidationError(_("Duplicated product entries."))
-
-    def _check_enough_money(self, counter: Counter, customer: Customer):
-        self.total_price = sum([data["total_price"] for data in self.cleaned_data])
-        if self.total_price > customer.amount:
-            raise forms.ValidationError(_("Not enough money"))
-
-    def _check_recorded_products(self, customer: Customer):
-        """Check for, among other things, ecocups and pitchers"""
-        items = {
-            form.cleaned_data["id"]: form.cleaned_data["quantity"]
-            for form in self.forms
-        }
-        ids = list(items.keys())
-        returnables = list(
-            ReturnableProduct.objects.filter(
-                Q(product_id__in=ids) | Q(returned_product_id__in=ids)
-            ).annotate_balance_for(customer)
-        )
-        limit_reached = []
-        for returnable in returnables:
-            returnable.balance += items.get(returnable.product_id, 0)
-        for returnable in returnables:
-            dcons = items.get(returnable.returned_product_id, 0)
-            returnable.balance -= dcons
-            if dcons and returnable.balance < -returnable.max_return:
-                limit_reached.append(returnable.returned_product)
-        if limit_reached:
-            raise forms.ValidationError(
-                _(
-                    "This user have reached his recording limit "
-                    "for the following products : %s"
-                )
-                % ", ".join([str(p) for p in limit_reached])
-            )
-
-
-BasketForm = forms.formset_factory(
-    ProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
-)

counter/models.py

@@ -47,10 +47,6 @@ from counter.fields import CurrencyField
 from subscription.models import Subscription
 
 
-def get_eboutic() -> Counter:
-    return Counter.objects.filter(type="EBOUTIC").order_by("id").first()
-
-
 class CustomerQuerySet(models.QuerySet):
     def update_amount(self) -> int:
         """Update the amount of all customers selected by this queryset.
@@ -61,7 +57,7 @@ class CustomerQuerySet(models.QuerySet):
         Returns:
             The number of updated rows.
 
-        Warning:
+        Warnings:
             The execution time of this query grows really quickly.
             When updating 500 customers, it may take around a second.
             If you try to update all customers at once, the execution time

counter/schemas.py

@@ -5,7 +5,7 @@ from django.urls import reverse
 from ninja import Field, FilterSchema, ModelSchema, Schema
 from pydantic import model_validator
 
-from club.schemas import SimpleClubSchema
+from club.schemas import ClubSchema
 from core.schemas import GroupSchema, SimpleUserSchema
 from counter.models import Counter, Product, ProductType
 
@@ -82,7 +82,7 @@ class ProductSchema(ModelSchema):
         ]
 
     buying_groups: list[GroupSchema]
-    club: SimpleClubSchema
+    club: ClubSchema
     product_type: SimpleProductTypeSchema | None
     url: str
 

counter/static/bundled/counter/counter-click-index.ts

@@ -103,7 +103,7 @@ document.addEventListener("alpine:init", () => {
       this.customerBalance += Number.parseFloat(
         (event.detail.target.querySelector("#id_amount") as HTMLInputElement).value,
       );
-      document.getElementById("selling-accordion").setAttribute("open", "");
+      document.getElementById("selling-accordion").click();
       this.codeField.widget.focus();
     },
 
@@ -137,3 +137,14 @@ document.addEventListener("alpine:init", () => {
     },
   }));
 });
+
+$(() => {
+  /* Accordion UI between basket and refills */
+  // biome-ignore lint/suspicious/noExplicitAny: dealing with legacy jquery
+  ($("#click-form") as any).accordion({
+    heightStyle: "content",
+    activate: () => $(".focus").focus(),
+  });
+  // biome-ignore lint/suspicious/noExplicitAny: dealing with legacy jquery
+  ($("#products") as any).tabs();
+});

counter/templates/counter/counter_click.jinja

@@ -9,14 +9,12 @@
   <link rel="stylesheet" type="text/css" href="{{ static('counter/css/counter-click.scss') }}" defer></link>
   <link rel="stylesheet" type="text/css" href="{{ static('bundled/core/components/ajax-select-index.css') }}" defer></link>
   <link rel="stylesheet" type="text/css" href="{{ static('core/components/ajax-select.scss') }}" defer></link>
-  <link rel="stylesheet" type="text/css" href="{{ static('core/components/tabs.scss') }}" defer></link>
   <link rel="stylesheet" href="{{ static("core/components/card.scss") }}">
 {% endblock %}
 
 {% block additional_js %}
   <script type="module" src="{{ static('bundled/counter/counter-click-index.ts') }}"></script>
   <script type="module" src="{{ static('bundled/counter/components/counter-product-select-index.ts') }}"></script>
-  <script type="module" src="{{ static('bundled/core/components/tabs-index.ts') }}"></script>
 {% endblock %}
 
 {% block info_boxes %}
@@ -53,189 +51,185 @@
     </div>
 
     <div id="click-form">
-      <details class="accordion" id="selling-accordion" name="selling" open>
-        <summary>{% trans %}Selling{% endtrans %}</summary>
-        <div class="accordion-content">
-          {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %}
+      <h5 id="selling-accordion">{% trans %}Selling{% endtrans %}</h5>
+      <div>
+        {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %}
 
-          <form method="post" action=""
-                class="code_form" @submit.prevent="handleCode">
+        <form method="post" action=""
+              class="code_form" @submit.prevent="handleCode">
 
-            <counter-product-select name="code" x-ref="codeField" autofocus required placeholder="{% trans %}Select a product...{% endtrans %}">
-              <option value=""></option>
-              <optgroup label="{% trans %}Operations{% endtrans %}">
-                <option value="FIN">{% trans %}Confirm (FIN){% endtrans %}</option>
-                <option value="ANN">{% trans %}Cancel (ANN){% endtrans %}</option>
+          <counter-product-select name="code" x-ref="codeField" autofocus required placeholder="{% trans %}Select a product...{% endtrans %}">
+            <option value=""></option>
+            <optgroup label="{% trans %}Operations{% endtrans %}">
+              <option value="FIN">{% trans %}Confirm (FIN){% endtrans %}</option>
+              <option value="ANN">{% trans %}Cancel (ANN){% endtrans %}</option>
+            </optgroup>
+            {% for category in categories.keys() %}
+              <optgroup label="{{ category }}">
+                {% for product in categories[category] %}
+                  <option value="{{ product.id }}">{{ product }}</option>
+                {% endfor %}
               </optgroup>
-              {% for category in categories.keys() %}
-                <optgroup label="{{ category }}">
-                  {% for product in categories[category] %}
-                    <option value="{{ product.id }}">{{ product }}</option>
-                  {% endfor %}
-                </optgroup>
-              {% endfor %}
-            </counter-product-select>
+            {% endfor %}
+          </counter-product-select>
 
-            <input type="submit" value="{% trans %}Go{% endtrans %}"/>
-          </form>
+          <input type="submit" value="{% trans %}Go{% endtrans %}"/>
+        </form>
 
-          {% for error in form.non_form_errors() %}
-            <div class="alert alert-red">
-              {{ error }}
-            </div>
-          {% endfor %}
-          <p>{% trans %}Basket: {% endtrans %}</p>
-
-          <form x-cloak method="post" action="" x-ref="basketForm">
-
-            <div class="basket-error-container">
-              <div
-                x-cloak
-                class="alert alert-red basket-error"
-                x-show="alertMessage.show"
-                x-transition.duration.500ms
-                x-text="alertMessage.content"
-              ></div>
-            </div>
-
-            {% csrf_token %}
-            <div x-ref="basketManagementForm">
-              {{ form.management_form }}
-            </div>
-            <ul>
-              <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
-              <template x-for="(item, index) in Object.values(basket)">
-                <li>
-                  <template x-for="error in item.errors">
-                    <div class="alert alert-red" x-text="error">
-                    </div>
-                  </template>
-
-                  <button @click.prevent="addToBasketWithMessage(item.product.id, -1)">-</button>
-                  <span class="quantity" x-text="item.quantity"></span>
-                  <button @click.prevent="addToBasketWithMessage(item.product.id, 1)">+</button>
-
-                  <span x-text="item.product.name"></span> :
-                  <span x-text="item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })">€</span>
-                  <span x-show="item.getBonusQuantity() > 0" x-text="`${item.getBonusQuantity()} x P`"></span>
-
-                  <button
-                    class="remove-item"
-                    @click.prevent="removeFromBasket(item.product.id)"
-                  ><i class="fa fa-trash-can delete-action"></i></button>
-
-                  <input
-                    type="hidden"
-                    :value="item.quantity"
-                    :id="`id_form-${index}-quantity`"
-                    :name="`form-${index}-quantity`"
-                    required
-                    readonly
-                  >
-                  <input
-                    type="hidden"
-                    :value="item.product.id"
-                    :id="`id_form-${index}-id`"
-                    :name="`form-${index}-id`"
-                    required
-                    readonly
-                  >
-                </li>
-              </template>
-            </ul>
-
-            <p class="margin-bottom">
-              <strong>Total: </strong>
-              <strong x-text="sumBasket().toLocaleString(undefined, { minimumFractionDigits: 2 })"></strong>
-              <strong> €</strong>
-            </p>
-
-            <div class="row">
-              <input
-                class="btn btn-blue"
-                type="submit"
-                @click.prevent="finish"
-                :disabled="getBasketSize() === 0"
-                value="{% trans %}Finish{% endtrans %}"
-              />
-              <input
-                class="btn btn-grey"
-                type="submit" @click.prevent="cancel"
-                value="{% trans %}Cancel{% endtrans %}"
-              />
-            </div>
-          </form>
-        </div>
-      </details>
-      <details class="accordion" name="selling">
-        <summary>{% trans %}Refilling{% endtrans %}</summary>
-        {% if object.type == "BAR" %}
-          {% if refilling_fragment %}
-            <div
-              class="accordion-content"
-              @htmx:after-request="onRefillingSuccess"
-            >
-              {{ refilling_fragment }}
-            </div>
-          {% else %}
-            <div class="accordion-content">
-              <p class="alert alert-yellow">
-                {% trans trimmed %}
-                  As a barman, you are not able to refill any account on your own.
-                  An admin should be connected on this counter for that.
-                  The customer can refill by using the eboutic.
-                {% endtrans %}
-              </p>
-            </div>
-          {% endif %}
-          </details>
-          {% if student_card_fragment %}
-            <details class="accordion" name="selling">
-              <summary>{% trans %}Student card{% endtrans %}</summary>
-              <div class="accordion-content">
-                {{ student_card_fragment }}
-              </div>
-            </details>
-          {% endif %}
-
-        {% endif %}
-      </div>
-
-      <div id="products">
-        {% if not products %}
+        {% for error in form.non_form_errors() %}
           <div class="alert alert-red">
-            {% trans %}No products available on this counter for this user{% endtrans %}
+            {{ error }}
+          </div>
+        {% endfor %}
+        <p>{% trans %}Basket: {% endtrans %}</p>
+
+        <form x-cloak method="post" action="" x-ref="basketForm">
+
+          <div class="basket-error-container">
+            <div
+              x-cloak
+              class="alert alert-red basket-error"
+              x-show="alertMessage.show"
+              x-transition.duration.500ms
+              x-text="alertMessage.content"
+            ></div>
+          </div>
+
+          {% csrf_token %}
+          <div x-ref="basketManagementForm">
+            {{ form.management_form }}
+          </div>
+          <ul>
+            <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
+            <template x-for="(item, index) in Object.values(basket)">
+              <li>
+                <template x-for="error in item.errors">
+                  <div class="alert alert-red" x-text="error">
+                  </div>
+                </template>
+
+                <button @click.prevent="addToBasketWithMessage(item.product.id, -1)">-</button>
+                <span class="quantity" x-text="item.quantity"></span>
+                <button @click.prevent="addToBasketWithMessage(item.product.id, 1)">+</button>
+
+                <span x-text="item.product.name"></span> :
+                <span x-text="item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })">€</span>
+                <span x-show="item.getBonusQuantity() > 0" x-text="`${item.getBonusQuantity()} x P`"></span>
+
+                <button
+                  class="remove-item"
+                  @click.prevent="removeFromBasket(item.product.id)"
+                ><i class="fa fa-trash-can delete-action"></i></button>
+
+                <input
+                  type="hidden"
+                  :value="item.quantity"
+                  :id="`id_form-${index}-quantity`"
+                  :name="`form-${index}-quantity`"
+                  required
+                  readonly
+                >
+                <input
+                  type="hidden"
+                  :value="item.product.id"
+                  :id="`id_form-${index}-id`"
+                  :name="`form-${index}-id`"
+                  required
+                  readonly
+                >
+              </li>
+            </template>
+          </ul>
+
+          <p class="margin-bottom">
+            <strong>Total: </strong>
+            <strong x-text="sumBasket().toLocaleString(undefined, { minimumFractionDigits: 2 })"></strong>
+            <strong> €</strong>
+          </p>
+
+          <div class="row">
+            <input
+              class="btn btn-blue"
+              type="submit"
+              @click.prevent="finish"
+              :disabled="getBasketSize() === 0"
+              value="{% trans %}Finish{% endtrans %}"
+            />
+            <input
+              class="btn btn-grey"
+              type="submit" @click.prevent="cancel"
+              value="{% trans %}Cancel{% endtrans %}"
+            />
+          </div>
+        </form>
+      </div>
+      {% if object.type == "BAR" %}
+        <h5>{% trans %}Refilling{% endtrans %}</h5>
+        {% if refilling_fragment %}
+          <div
+            @htmx:after-request="onRefillingSuccess"
+          >
+            {{ refilling_fragment }}
           </div>
         {% else %}
-          <ui-tab-group>
-            {% for category in categories.keys() -%}
-              <ui-tab title="{{ category }}" {% if loop.index == 1 -%}active{%- endif -%}>
-                <h5 class="margin-bottom">{{ category }}</h5>
-                <div class="row gap-2x">
-                  {% for product in categories[category] -%}
-                    <button class="card shadow" @click="addToBasketWithMessage('{{ product.id }}', 1)">
-                      <img
-                        class="card-image"
-                        alt="image de {{ product.name }}"
-                        {% if product.icon %}
-                          src="{{ product.icon.url }}"
-                        {% else %}
-                          src="{{ static('core/img/na.gif') }}"
-                        {% endif %}
-                      />
-                      <span class="card-content">
-                        <strong class="card-title">{{ product.name }}</strong>
-                        <p>{{ product.price }} €<br>{{ product.code }}</p>
-                      </span>
-                    </button>
-                  {%- endfor %}
-                </div>
-              </ui-tab>
-            {% endfor %}
-          </ui-tab-group>
+          <div>
+            <p class="alert alert-yellow">
+              {% trans trimmed %}
+                As a barman, you are not able to refill any account on your own.
+                An admin should be connected on this counter for that.
+                The customer can refill by using the eboutic.
+              {% endtrans %}
+            </p>
+          </div>
         {% endif %}
-      </div>
+        {% if student_card_fragment %}
+          <h5>{% trans %}Student card{% endtrans %}</h3>
+          <div>
+            {{ student_card_fragment }}
+          </div>
+        {% endif %}
+
+      {% endif %}
     </div>
+
+    <div id="products">
+      {% if not products %}
+        <div class="alert alert-red">
+          {% trans %}No products available on this counter for this user{% endtrans %}
+        </div>
+      {% else %}
+        <ul>
+          {% for category in categories.keys() -%}
+            <li><a href="#cat_{{ category|slugify }}">{{ category }}</a></li>
+          {%- endfor %}
+        </ul>
+        {% for category in categories.keys() -%}
+          <div id="cat_{{ category|slugify }}">
+            <h5 class="margin-bottom">{{ category }}</h5>
+            <div class="row gap-2x">
+              {% for product in categories[category] -%}
+                <button class="card shadow" @click="addToBasketWithMessage('{{ product.id }}', 1)">
+                  <img
+                    class="card-image"
+                    alt="image de {{ product.name }}"
+                    {% if product.icon %}
+                      src="{{ product.icon.url }}"
+                    {% else %}
+                      src="{{ static('core/img/na.gif') }}"
+                    {% endif %}
+                  />
+                  <span class="card-content">
+                    <strong class="card-title">{{ product.name }}</strong>
+                    <p>{{ product.price }} €<br>{{ product.code }}</p>
+                  </span>
+                </button>
+              {%- endfor %}
+            </div>
+          </div>
+        {%- endfor %}
+      {% endif %}
+    </div>
+  </div>
 {% endblock content %}
 
 {% block script %}

counter/templates/counter/refound_account.jinja

@@ -5,12 +5,12 @@
 {% endblock %}
 
 {% block content %}
-  <main>
+  <div id="accounting">
     <h3>{% trans %}Refound account{% endtrans %}</h3>
     <form action="" method="post">
       {% csrf_token %}
       {{ form.as_p() }}
       <p><input type="submit" value="{% trans %}Refound{% endtrans %}" /></p>
     </form>
-  </main>
+  </div>
 {% endblock %}

counter/templates/counter/stats.jinja

@@ -5,6 +5,10 @@
   {% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}
 {% endblock %}
 
+{% block jquery_css %}
+    {# Remove jquery_css #}
+{% endblock %}
+
 {% block content %}
   <h3>{% trans counter_name=counter %}{{ counter_name }} stats{% endtrans %}</h3>
   <h4>

counter/tests/test_counter.py

@@ -17,7 +17,6 @@ from datetime import timedelta
 from decimal import Decimal
 
 import pytest
-from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.auth.models import Permission, make_password
 from django.core.cache import cache
@@ -47,15 +46,6 @@ from counter.models import (
 )
 
 
-def set_age(user: User, age: int):
-    user.date_of_birth = localdate().replace(year=localdate().year - age)
-    user.save()
-
-
-def force_refill_user(user: User, amount: Decimal | int):
-    baker.make(Refilling, amount=amount, customer=user.customer, is_validated=False)
-
-
 class TestFullClickBase(TestCase):
     @classmethod
     def setUpTestData(cls):
@@ -236,11 +226,11 @@ class TestCounterClick(TestFullClickBase):
         cls.banned_counter_customer = subscriber_user.make()
         cls.banned_alcohol_customer = subscriber_user.make()
 
-        set_age(cls.customer, 20)
-        set_age(cls.barmen, 20)
-        set_age(cls.club_admin, 20)
-        set_age(cls.banned_alcohol_customer, 20)
-        set_age(cls.underage_customer, 17)
+        cls.set_age(cls.customer, 20)
+        cls.set_age(cls.barmen, 20)
+        cls.set_age(cls.club_admin, 20)
+        cls.set_age(cls.banned_alcohol_customer, 20)
+        cls.set_age(cls.underage_customer, 17)
 
         cls.banned_alcohol_customer.ban_groups.add(
             BanGroup.objects.get(pk=settings.SITH_GROUP_BANNED_ALCOHOL_ID)
@@ -288,6 +278,11 @@ class TestCounterClick(TestFullClickBase):
             {"username": used_barman.username, "password": "plop"},
         )
 
+    @classmethod
+    def set_age(cls, user: User, age: int):
+        user.date_of_birth = localdate().replace(year=localdate().year - age)
+        user.save()
+
     def submit_basket(
         self,
         user: User,
@@ -311,6 +306,9 @@ class TestCounterClick(TestFullClickBase):
             data,
         )
 
+    def refill_user(self, user: User, amount: Decimal | int):
+        baker.make(Refilling, amount=amount, customer=user.customer, is_validated=False)
+
     def test_click_eboutic_failure(self):
         eboutic = baker.make(Counter, type="EBOUTIC")
         self.client.force_login(self.club_admin)
@@ -320,7 +318,7 @@ class TestCounterClick(TestFullClickBase):
         assert res.status_code == 404
 
     def test_click_office_success(self):
-        force_refill_user(self.customer, 10)
+        self.refill_user(self.customer, 10)
         self.client.force_login(self.club_admin)
         res = self.submit_basket(
             self.customer, [BasketItem(self.stamps.id, 5)], counter=self.club_counter
@@ -329,7 +327,7 @@ class TestCounterClick(TestFullClickBase):
         assert self.updated_amount(self.customer) == Decimal("2.5")
 
         # Test no special price on office counter
-        force_refill_user(self.club_admin, 10)
+        self.refill_user(self.club_admin, 10)
         res = self.submit_basket(
             self.club_admin, [BasketItem(self.stamps.id, 1)], counter=self.club_counter
         )
@@ -338,7 +336,7 @@ class TestCounterClick(TestFullClickBase):
         assert self.updated_amount(self.club_admin) == Decimal("8.5")
 
     def test_click_bar_success(self):
-        force_refill_user(self.customer, 10)
+        self.refill_user(self.customer, 10)
         self.login_in_bar(self.barmen)
         res = self.submit_basket(
             self.customer, [BasketItem(self.beer.id, 2), BasketItem(self.snack.id, 1)]
@@ -349,7 +347,7 @@ class TestCounterClick(TestFullClickBase):
 
         # Test barmen special price
 
-        force_refill_user(self.barmen, 10)
+        self.refill_user(self.barmen, 10)
 
         assert (
             self.submit_basket(self.barmen, [BasketItem(self.beer.id, 1)])
@@ -358,7 +356,7 @@ class TestCounterClick(TestFullClickBase):
         assert self.updated_amount(self.barmen) == Decimal("9")
 
     def test_click_tray_price(self):
-        force_refill_user(self.customer, 20)
+        self.refill_user(self.customer, 20)
         self.login_in_bar(self.barmen)
 
         # Not applying tray price
@@ -375,7 +373,7 @@ class TestCounterClick(TestFullClickBase):
         self.login_in_bar()
 
         for user in [self.underage_customer, self.banned_alcohol_customer]:
-            force_refill_user(user, 10)
+            self.refill_user(user, 10)
 
             # Buy product without age limit
             res = self.submit_basket(user, [BasketItem(self.snack.id, 2)])
@@ -396,7 +394,7 @@ class TestCounterClick(TestFullClickBase):
             self.banned_counter_customer,
             self.customer_old_can_not_buy,
         ]:
-            force_refill_user(user, 10)
+            self.refill_user(user, 10)
             resp = self.submit_basket(user, [BasketItem(self.snack.id, 2)])
             assert resp.status_code == 302
             assert resp.url == resolve_url(self.counter)
@@ -412,7 +410,7 @@ class TestCounterClick(TestFullClickBase):
 
     def test_click_allowed_old_subscriber(self):
         self.login_in_bar()
-        force_refill_user(self.customer_old_can_buy, 10)
+        self.refill_user(self.customer_old_can_buy, 10)
         res = self.submit_basket(
             self.customer_old_can_buy, [BasketItem(self.snack.id, 2)]
         )
@@ -422,7 +420,7 @@ class TestCounterClick(TestFullClickBase):
 
     def test_click_wrong_counter(self):
         self.login_in_bar()
-        force_refill_user(self.customer, 10)
+        self.refill_user(self.customer, 10)
         res = self.submit_basket(
             self.customer, [BasketItem(self.snack.id, 2)], counter=self.other_counter
         )
@@ -446,7 +444,7 @@ class TestCounterClick(TestFullClickBase):
         assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_click_not_connected(self):
-        force_refill_user(self.customer, 10)
+        self.refill_user(self.customer, 10)
         res = self.submit_basket(self.customer, [BasketItem(self.snack.id, 2)])
         assertRedirects(res, self.counter.get_absolute_url())
 
@@ -458,29 +456,15 @@ class TestCounterClick(TestFullClickBase):
         assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_click_product_not_in_counter(self):
-        force_refill_user(self.customer, 10)
+        self.refill_user(self.customer, 10)
         self.login_in_bar()
 
         res = self.submit_basket(self.customer, [BasketItem(self.stamps.id, 2)])
         assert res.status_code == 200
         assert self.updated_amount(self.customer) == Decimal("10")
 
-    def test_basket_empty(self):
-        force_refill_user(self.customer, 10)
-
-        for basket in [
-            [],
-            [BasketItem(None, None)],
-            [BasketItem(None, None), BasketItem(None, None)],
-        ]:
-            assertRedirects(
-                self.submit_basket(self.customer, basket),
-                self.counter.get_absolute_url(),
-            )
-            assert self.updated_amount(self.customer) == Decimal("10")
-
     def test_click_product_invalid(self):
-        force_refill_user(self.customer, 10)
+        self.refill_user(self.customer, 10)
         self.login_in_bar()
 
         for item in [
@@ -488,12 +472,14 @@ class TestCounterClick(TestFullClickBase):
             BasketItem(self.beer.id, -1),
             BasketItem(None, 1),
             BasketItem(self.beer.id, None),
+            BasketItem(None, None),
         ]:
             assert self.submit_basket(self.customer, [item]).status_code == 200
+
             assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_click_not_enough_money(self):
-        force_refill_user(self.customer, 10)
+        self.refill_user(self.customer, 10)
         self.login_in_bar()
         res = self.submit_basket(
             self.customer,
@@ -523,7 +509,7 @@ class TestCounterClick(TestFullClickBase):
         assert self.updated_amount(self.customer) == 0
 
     def test_recordings(self):
-        force_refill_user(self.customer, self.cons.selling_price * 3)
+        self.refill_user(self.customer, self.cons.selling_price * 3)
         self.login_in_bar(self.barmen)
         res = self.submit_basket(self.customer, [BasketItem(self.cons.id, 3)])
         assert res.status_code == 302
@@ -824,53 +810,3 @@ class TestClubCounterClickAccess(TestCase):
         self.client.force_login(self.user)
         res = self.client.get(self.click_url)
         assert res.status_code == 200
-
-
-@pytest.mark.django_db
-class TestCounterLogout:
-    def test_logout_simple(self, client: Client):
-        perm_counter = baker.make(Counter, type="BAR")
-        permanence = baker.make(
-            Permanency,
-            counter=perm_counter,
-            start=now() - timedelta(hours=1),
-            activity=now() - timedelta(minutes=10),
-        )
-        with freeze_time():
-            res = client.post(
-                reverse("counter:logout", kwargs={"counter_id": permanence.counter_id}),
-                data={"user_id": permanence.user_id},
-            )
-            assertRedirects(
-                res,
-                reverse(
-                    "counter:details", kwargs={"counter_id": permanence.counter_id}
-                ),
-            )
-            permanence.refresh_from_db()
-            assert permanence.end == now()
-
-    def test_logout_doesnt_change_old_permanences(self, client: Client):
-        perm_counter = baker.make(Counter, type="BAR")
-        permanence = baker.make(
-            Permanency,
-            counter=perm_counter,
-            start=now() - timedelta(hours=1),
-            activity=now() - timedelta(minutes=10),
-        )
-        old_end = now() - relativedelta(year=10)
-        old_permanence = baker.make(
-            Permanency,
-            counter=perm_counter,
-            end=old_end,
-            activity=now() - relativedelta(year=8),
-        )
-        with freeze_time():
-            client.post(
-                reverse("counter:logout", kwargs={"counter_id": permanence.counter_id}),
-                data={"user_id": permanence.user_id},
-            )
-            permanence.refresh_from_db()
-            assert permanence.end == now()
-            old_permanence.refresh_from_db()
-            assert old_permanence.end == old_end

counter/tests/test_customer.py

@@ -1,4 +1,5 @@
 import itertools
+import json
 import string
 from datetime import timedelta
 
@@ -15,6 +16,7 @@ from core.baker_recipes import board_user, subscriber_user
 from core.models import User
 from counter.baker_recipes import product_recipe, refill_recipe, sale_recipe
 from counter.models import (
+    BillingInfo,
     Counter,
     Customer,
     Refilling,
@@ -24,6 +26,149 @@ from counter.models import (
 )
 
 
+@pytest.mark.django_db
+class TestBillingInfo:
+    @pytest.fixture
+    def payload(self):
+        return {
+            "first_name": "Subscribed",
+            "last_name": "User",
+            "address_1": "3, rue de Troyes",
+            "zip_code": "34301",
+            "city": "Sète",
+            "country": "FR",
+            "phone_number": "0612345678",
+        }
+
+    def test_edit_infos(self, client: Client, payload: dict):
+        user = subscriber_user.make()
+        baker.make(BillingInfo, customer=user.customer)
+        client.force_login(user)
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        user.refresh_from_db()
+        infos = BillingInfo.objects.get(customer__user=user)
+        assert response.status_code == 200
+        assert hasattr(user.customer, "billing_infos")
+        assert infos.customer == user.customer
+        for key, val in payload.items():
+            assert getattr(infos, key) == val
+
+    @pytest.mark.parametrize(
+        "user_maker", [subscriber_user.make, lambda: baker.make(User)]
+    )
+    @pytest.mark.django_db
+    def test_create_infos(self, client: Client, user_maker, payload):
+        user = user_maker()
+        client.force_login(user)
+        assert not BillingInfo.objects.filter(customer__user=user).exists()
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        assert response.status_code == 200
+        user.refresh_from_db()
+        assert hasattr(user, "customer")
+        infos = BillingInfo.objects.get(customer__user=user)
+        assert hasattr(user.customer, "billing_infos")
+        assert infos.customer == user.customer
+        for key, val in payload.items():
+            assert getattr(infos, key) == val
+
+    def test_invalid_data(self, client: Client, payload: dict[str, str]):
+        user = subscriber_user.make()
+        client.force_login(user)
+        # address_1, zip_code and country are missing
+        del payload["city"]
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        assert response.status_code == 422
+        user.customer.refresh_from_db()
+        assert not hasattr(user.customer, "billing_infos")
+
+    @pytest.mark.parametrize(
+        ("operator_maker", "expected_code"),
+        [
+            (subscriber_user.make, 403),
+            (lambda: baker.make(User), 403),
+            (lambda: baker.make(User, is_superuser=True), 200),
+        ],
+    )
+    def test_edit_other_user(
+        self, client: Client, operator_maker, expected_code: int, payload: dict
+    ):
+        user = subscriber_user.make()
+        client.force_login(operator_maker())
+        baker.make(BillingInfo, customer=user.customer)
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        assert response.status_code == expected_code
+
+    @pytest.mark.parametrize(
+        "phone_number",
+        ["+33612345678", "0612345678", "06 12 34 56 78", "06-12-34-56-78"],
+    )
+    def test_phone_number_format(
+        self, client: Client, payload: dict, phone_number: str
+    ):
+        """Test that various formats of phone numbers are accepted."""
+        user = subscriber_user.make()
+        client.force_login(user)
+        payload["phone_number"] = phone_number
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        assert response.status_code == 200
+        infos = BillingInfo.objects.get(customer__user=user)
+        assert infos.phone_number == "0612345678"
+        assert infos.phone_number.country_code == 33
+
+    def test_foreign_phone_number(self, client: Client, payload: dict):
+        """Test that a foreign phone number is accepted."""
+        user = subscriber_user.make()
+        client.force_login(user)
+        payload["phone_number"] = "+49612345678"
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        assert response.status_code == 200
+        infos = BillingInfo.objects.get(customer__user=user)
+        assert infos.phone_number.as_national == "06123 45678"
+        assert infos.phone_number.country_code == 49
+
+    @pytest.mark.parametrize(
+        "phone_number", ["061234567a", "06 12 34 56", "061234567879", "azertyuiop"]
+    )
+    def test_invalid_phone_number(
+        self, client: Client, payload: dict, phone_number: str
+    ):
+        """Test that invalid phone numbers are rejected."""
+        user = subscriber_user.make()
+        client.force_login(user)
+        payload["phone_number"] = phone_number
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        assert response.status_code == 422
+        assert not BillingInfo.objects.filter(customer__user=user).exists()
+
+
 class TestStudentCard(TestCase):
     """Tests for adding and deleting Stundent Cards
     Test that an user can be found with it's student card.

counter/views/auth.py

@@ -13,10 +13,10 @@
 #
 #
 
+from django.db.models import F
 from django.http import HttpRequest, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect
 from django.utils import timezone
-from django.utils.timezone import now
 from django.views.decorators.http import require_POST
 
 from core.views.forms import LoginForm
@@ -47,7 +47,7 @@ def counter_login(request: HttpRequest, counter_id: int) -> HttpResponseRedirect
 @require_POST
 def counter_logout(request: HttpRequest, counter_id: int) -> HttpResponseRedirect:
     """End the permanency of a user in this counter."""
-    Permanency.objects.filter(
-        counter=counter_id, user=request.POST["user_id"], end=None
-    ).update(end=now())
+    Permanency.objects.filter(counter=counter_id, user=request.POST["user_id"]).update(
+        end=F("activity")
+    )
     return redirect("counter:details", counter_id=counter_id)

counter/views/cash.py

@@ -12,17 +12,18 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
+from datetime import datetime
+from datetime import timezone as tz
 
 from django import forms
 from django.conf import settings
-from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.http import Http404
+from django.http import HttpResponseRedirect
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView
-from django.views.generic.edit import BaseFormView, UpdateView
+from django.views.generic.edit import UpdateView
 
-from core.models import User
+from core.auth.mixins import CanViewMixin
 from counter.forms import CashSummaryFormBase
 from counter.models import (
     CashRegisterSummary,
@@ -30,7 +31,9 @@ from counter.models import (
     Counter,
     Refilling,
 )
+from counter.utils import is_logged_in_counter
 from counter.views.mixins import (
+    CounterAdminMixin,
     CounterAdminTabsMixin,
     CounterTabsMixin,
 )
@@ -154,9 +157,11 @@ class CashRegisterSummaryForm(forms.Form):
         else:
             self.instance = None
 
-    def save(self, counter: Counter | None = None, user: User | None = None):
+    def save(self, counter=None):
         cd = self.cleaned_data
-        summary = self.instance or CashRegisterSummary(counter=counter, user=user)
+        summary = self.instance or CashRegisterSummary(
+            counter=counter, user=counter.get_random_barman()
+        )
         summary.comment = cd["comment"]
         summary.emptied = cd["emptied"]
         summary.save()
@@ -242,33 +247,48 @@ class CashRegisterSummaryForm(forms.Form):
             summary.delete()
 
 
-class CounterCashSummaryView(
-    CounterTabsMixin, PermissionRequiredMixin, BaseFormView, DetailView
-):
+class CounterCashSummaryView(CounterTabsMixin, CanViewMixin, DetailView):
     """Provide the cash summary form."""
 
     model = Counter
     pk_url_kwarg = "counter_id"
     template_name = "counter/cash_register_summary.jinja"
     current_tab = "cash_summary"
-    permission_required = "counter.add_cashregistersummary"
-    form_class = CashRegisterSummaryForm
 
     def dispatch(self, request, *args, **kwargs):
+        """We have here again a very particular right handling."""
         self.object = self.get_object()
-        if self.object.type != "BAR":
-            raise Http404
-        return super().dispatch(request, *args, **kwargs)
+        if is_logged_in_counter(request) and self.object.barmen_list:
+            return super().dispatch(request, *args, **kwargs)
+        return HttpResponseRedirect(
+            reverse("counter:details", kwargs={"counter_id": self.object.id})
+            + "?bad_location"
+        )
 
-    def form_valid(self, form):
-        form.save(counter=self.object, user=self.request.user)
-        return super().form_valid(form)
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        self.form = CashRegisterSummaryForm()
+        return super().get(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        self.form = CashRegisterSummaryForm(request.POST)
+        if self.form.is_valid():
+            self.form.save(self.object)
+            return HttpResponseRedirect(self.get_success_url())
+        return super().get(request, *args, **kwargs)
 
     def get_success_url(self):
-        return reverse("counter:details", kwargs={"counter_id": self.object.id})
+        return reverse_lazy("counter:details", kwargs={"counter_id": self.object.id})
+
+    def get_context_data(self, **kwargs):
+        """Add form to the context."""
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["form"] = self.form
+        return kwargs
 
 
-class CashSummaryEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
+class CashSummaryEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """Edit cash summaries."""
 
     model = CashRegisterSummary
@@ -277,11 +297,12 @@ class CashSummaryEditView(CounterAdminTabsMixin, PermissionRequiredMixin, Update
     pk_url_kwarg = "cashsummary_id"
     form_class = CashRegisterSummaryForm
     current_tab = "cash_summary"
-    permission_required = "counter.change_cashregistersummary"
-    success_url = reverse_lazy("counter:cash_summary_list")
+
+    def get_success_url(self):
+        return reverse("counter:cash_summary_list")
 
 
-class CashSummaryListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView):
+class CashSummaryListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
     """Display a list of cash summaries."""
 
     model = CashRegisterSummary
@@ -290,7 +311,6 @@ class CashSummaryListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListVi
     current_tab = "cash_summary"
     queryset = CashRegisterSummary.objects.all().order_by("-date")
     paginate_by = settings.SITH_COUNTER_CASH_SUMMARY_LENGTH
-    permission_required = "counter.view_cashregistersummary"
 
     def get_context_data(self, **kwargs):
         """Add sums to the context."""
@@ -301,12 +321,12 @@ class CashSummaryListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListVi
         kwargs["refilling_sums"] = {}
         for c in Counter.objects.filter(type="BAR").all():
             refillings = Refilling.objects.filter(counter=c)
-            cash_register_summaries = CashRegisterSummary.objects.filter(counter=c)
+            cashredistersummaries = CashRegisterSummary.objects.filter(counter=c)
             if form.is_valid() and form.cleaned_data["begin_date"]:
                 refillings = refillings.filter(
                     date__gte=form.cleaned_data["begin_date"]
                 )
-                cash_register_summaries = cash_register_summaries.filter(
+                cashredistersummaries = cashredistersummaries.filter(
                     date__gte=form.cleaned_data["begin_date"]
                 )
             else:
@@ -317,16 +337,23 @@ class CashSummaryListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListVi
                 )
                 if last_summary:
                     refillings = refillings.filter(date__gt=last_summary.date)
-                    cash_register_summaries = cash_register_summaries.filter(
+                    cashredistersummaries = cashredistersummaries.filter(
                         date__gt=last_summary.date
                     )
+                else:
+                    refillings = refillings.filter(
+                        date__gte=datetime(year=1994, month=5, day=17, tzinfo=tz.utc)
+                    )  # My birth date should be old enough
+                    cashredistersummaries = cashredistersummaries.filter(
+                        date__gte=datetime(year=1994, month=5, day=17, tzinfo=tz.utc)
+                    )
             if form.is_valid() and form.cleaned_data["end_date"]:
                 refillings = refillings.filter(date__lte=form.cleaned_data["end_date"])
-                cash_register_summaries = cash_register_summaries.filter(
+                cashredistersummaries = cashredistersummaries.filter(
                     date__lte=form.cleaned_data["end_date"]
                 )
             kwargs["summaries_sums"][c.name] = sum(
-                [s.get_total() for s in cash_register_summaries.all()]
+                [s.get_total() for s in cashredistersummaries.all()]
             )
             kwargs["refilling_sums"][c.name] = sum([s.amount for s in refillings.all()])
         return kwargs