Bump vite from 6.3.5 to 6.3.6

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

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

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

club/templates/club/club_detail.jinja

@@ -1,14 +1,6 @@
 {% extends "core/base.jinja" %}
 {% from 'core/macros.jinja' import user_profile_link %}
 
-{% block title -%}
-  {{ club.name }}
-{%- endblock %}
-
-{% block description -%}
-  {{ club.short_description }}
-{%- endblock %}
-
 {% block content %}
   <div id="club_detail">
     {% if club.logo %}

club/templates/club/club_list.jinja

@@ -1,12 +1,8 @@
 {% extends "core/base.jinja" %}
 
-{% block title -%}
+{% block title %}
   {% trans %}Club list{% endtrans %}
-{%- endblock %}
+{% endblock %}
-
-{% block description -%}
-  {% trans %}The list of all clubs existing at UTBM.{% endtrans %}
-{%- endblock %}
 
 {% macro display_club(club) -%}
 
@@ -25,7 +21,7 @@
 
   {%- if club.children.all()|length != 0 %}
     <ul>
-      {%- for c in club.children.order_by('name').prefetch_related("children") %}
+      {%- for c in club.children.order_by('name') %}
         {{ display_club(c) }}
       {%- endfor %}
     </ul>
@@ -40,8 +36,8 @@
   {% if club_list %}
     <h3>{% trans %}Club list{% endtrans %}</h3>
     <ul>
-      {%- for club in club_list %}
+      {%- for c in club_list.all().order_by('name') if c.parent is none %}
-        {{ display_club(club) }}
+        {{ display_club(c) }}
       {%- endfor %}
     </ul>
   {% else %}

club/views.py

@@ -171,10 +171,6 @@ class ClubListView(ListView):
 
     model = Club
     template_name = "club/club_list.jinja"
-    queryset = (
-        Club.objects.filter(parent=None).order_by("name").prefetch_related("children")
-    )
-    context_object_name = "club_list"
 
 
 class ClubView(ClubTabsMixin, DetailView):

com/ics_calendar.py

@@ -68,7 +68,7 @@ class IcsCalendar:
                 start=news_date.start_date,
                 end=news_date.end_date,
                 url=as_absolute_url(
-                    reverse("com:news_detail", kwargs={"news_id": news_date.news_id})
+                    reverse("com:news_detail", kwargs={"news_id": news_date.news.id})
                 ),
             )
             calendar.events.append(event)

com/models.py

@@ -27,7 +27,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.mail import EmailMultiAlternatives
 from django.db import models, transaction
-from django.db.models import Exists, F, OuterRef, Q
+from django.db.models import F, Q
 from django.shortcuts import render
 from django.templatetags.static import static
 from django.urls import reverse
@@ -55,17 +55,9 @@ class Sith(models.Model):
 
 
 class NewsQuerySet(models.QuerySet):
-    def published(self) -> Self:
+    def moderated(self) -> Self:
         return self.filter(is_published=True)
 
-    def waiting_moderation(self) -> Self:
-        """Filter all non-finished non-published news"""
-        # Because of the way News and NewsDates are created,
-        # there may be some cases where this method is called before
-        # the NewsDates linked to a Date are actually persisted in db.
-        # Thus, it's important to filter by "not past date" rather than by "future date"
-        return self.filter(~Q(dates__start_date__lt=timezone.now()), is_published=False)
-
     def viewable_by(self, user: User) -> Self:
         """Filter news that the given user can view.
 
@@ -135,28 +127,20 @@ class News(models.Model):
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
-        if not self.is_published:
+        if self.is_published:
-            admins_without_notif = User.objects.filter(
+            return
-                ~Exists(
+        for user in User.objects.filter(
-                    Notification.objects.filter(
+            groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID]
-                        user=OuterRef("pk"), type="NEWS_MODERATION"
+        ):
+            Notification.objects.create(
+                user=user, url=reverse("com:news_admin_list"), type="NEWS_MODERATION"
             )
-                ),
-                groups__id=settings.SITH_GROUP_COM_ADMIN_ID,
-            )
-            notif_url = reverse("com:news_admin_list")
-            new_notifs = [
-                Notification(user=user, url=notif_url, type="NEWS_MODERATION")
-                for user in admins_without_notif
-            ]
-            Notification.objects.bulk_create(new_notifs)
-        self.update_moderation_notifs()
 
     def get_absolute_url(self):
         return reverse("com:news_detail", kwargs={"news_id": self.id})
 
     def get_full_url(self):
-        return f"https://{settings.SITH_URL}{self.get_absolute_url()}"
+        return "https://%s%s" % (settings.SITH_URL, self.get_absolute_url())
 
     def is_owned_by(self, user):
         if user.is_anonymous:
@@ -175,16 +159,19 @@ class News(models.Model):
             or (user.is_authenticated and self.author_id == user.id)
         )
 
-    @staticmethod
+
-    def update_moderation_notifs():
+def news_notification_callback(notif: Notification):
-        count = News.objects.waiting_moderation().count()
+    # the NewsDate linked to the News
-        notifs_qs = Notification.objects.filter(
+    # which creation triggered this callback may not exist yet,
-            type="NEWS_MODERATION", user__groups__id=settings.SITH_GROUP_COM_ADMIN_ID
+    # so it's important to filter by "not past date" rather than by "future date"
-        )
+    count = News.objects.filter(
+        ~Q(dates__start_date__gt=timezone.now()), is_published=False
+    ).count()
     if count:
-            notifs_qs.update(viewed=False, param=str(count))
+        notif.viewed = False
+        notif.param = str(count)
     else:
-            notifs_qs.update(viewed=True)
+        notif.viewed = True
 
 
 class NewsDateQuerySet(models.QuerySet):

com/static/com/css/news-list.scss

@@ -83,8 +83,7 @@
     #links_content {
       overflow: auto;
       box-shadow: $shadow-color 1px 1px 1px;
-      min-height: 20em;
+      height: 20em;
-      padding-bottom: 1em;
 
       h4 {
         margin-left: 5px;

com/templates/com/news_list.jinja

@@ -1,6 +1,10 @@
 {% extends "core/base.jinja" %}
 {% from "com/macros.jinja" import news_moderation_alert %}
 
+{% block title %}
+  {% trans %}News{% endtrans %}
+{% endblock %}
+
 {% block additional_css %}
   <link rel="stylesheet" href="{{ static('com/css/news-list.scss') }}">
   <link rel="stylesheet" href="{{ static('com/components/ics-calendar.scss') }}">
@@ -205,10 +209,6 @@
               <i class="fa-solid fa-graduation-cap fa-xl"></i>
               <a href="{{ url("pedagogy:guide") }}">{% trans %}UV Guide{% endtrans %}</a>
             </li>
-            <li>
-              <i class="fa-solid fa-calendar-days fa-xl"></i>
-              <a href="{{ url("timetable:generator") }}">{% trans %}Timetable{% endtrans %}</a>
-            </li>
             <li>
               <i class="fa-solid fa-magnifying-glass fa-xl"></i>
               <a href="{{ url("matmat:search_clear") }}">{% trans %}Matmatronch{% endtrans %}</a>

com/tests/test_notifications.py

@@ -1,22 +1,13 @@
-from datetime import timedelta
-
 import pytest
 from django.conf import settings
-from django.utils.timezone import now
 from model_bakery import baker
 
-from com.models import News, NewsDate
+from com.models import News
-from core.baker_recipes import subscriber_user
 from core.models import Group, Notification, User
 
 
 @pytest.mark.django_db
 def test_notification_created():
-    # this news is unpublished, but is set in the past
-    # it shouldn't be taken into account when counting the number
-    # of news that are to be moderated
-    past_news = baker.make(News, is_published=False)
-    baker.make(NewsDate, news=past_news, start_date=now() - timedelta(days=1))
     com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
     com_admin_group.users.all().delete()
     Notification.objects.all().delete()
@@ -24,28 +15,9 @@ def test_notification_created():
     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, is_published=False)
+        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)
-
-
-@pytest.mark.django_db
-def test_notification_edited_when_moderating_news():
-    com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
-    com_admins = subscriber_user.make(_quantity=3)
-    com_admin_group.users.set(com_admins)
-    Notification.objects.all().delete()
-    news = baker.make(News, is_published=False)
-    assert Notification.objects.count() == 3
-    assert Notification.objects.filter(viewed=False).count() == 3
-
-    news.is_published = True
-    news.moderator = com_admins[0]
-    news.save()
-    # when the news is moderated, the notification should be marked as read
-    # for all admins
-    assert Notification.objects.count() == 3
-    assert Notification.objects.filter(viewed=False).count() == 0

core/models.py

@@ -560,7 +560,7 @@ class User(AbstractUser):
         """Determine if the object is owned by the user."""
         if hasattr(obj, "is_owned_by") and obj.is_owned_by(self):
             return True
-        if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group_id):
+        if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group.id):
             return True
         return self.is_root
 
@@ -569,14 +569,8 @@ class User(AbstractUser):
         if hasattr(obj, "can_be_edited_by") and obj.can_be_edited_by(self):
             return True
         if hasattr(obj, "edit_groups"):
-            if (
+            for pk in obj.edit_groups.values_list("pk", flat=True):
-                hasattr(obj, "_prefetched_objects_cache")
+                if self.is_in_group(pk=pk):
-                and "edit_groups" in obj._prefetched_objects_cache
-            ):
-                pks = [g.id for g in obj.edit_groups.all()]
-            else:
-                pks = list(obj.edit_groups.values_list("id", flat=True))
-            if any(self.is_in_group(pk=pk) for pk in pks):
                     return True
         if isinstance(obj, User) and obj == self:
             return True
@@ -587,17 +581,8 @@ class User(AbstractUser):
         if hasattr(obj, "can_be_viewed_by") and obj.can_be_viewed_by(self):
             return True
         if hasattr(obj, "view_groups"):
-            # if "view_groups" has already been prefetched, use
+            for pk in obj.view_groups.values_list("pk", flat=True):
-            # the prefetch cache, else fetch only the ids, to make
+                if self.is_in_group(pk=pk):
-            # the query lighter.
-            if (
-                hasattr(obj, "_prefetched_objects_cache")
-                and "view_groups" in obj._prefetched_objects_cache
-            ):
-                pks = [g.id for g in obj.view_groups.all()]
-            else:
-                pks = list(obj.view_groups.values_list("id", flat=True))
-            if any(self.is_in_group(pk=pk) for pk in pks):
                     return True
         return self.can_edit(obj)
 
@@ -651,6 +636,9 @@ class User(AbstractUser):
 
 
 class AnonymousUser(AuthAnonymousUser):
+    def __init__(self):
+        super().__init__()
+
     @property
     def was_subscribed(self):
         return False
@@ -659,6 +647,10 @@ class AnonymousUser(AuthAnonymousUser):
     def is_subscribed(self):
         return False
 
+    @property
+    def subscribed(self):
+        return False
+
     @property
     def is_root(self):
         return False
@@ -1392,9 +1384,9 @@ class Page(models.Model):
 
     @cached_property
     def is_club_page(self):
-        return (
+        club_root_page = Page.objects.filter(name=settings.SITH_CLUB_ROOT_PAGE).first()
-            self.name == settings.SITH_CLUB_ROOT_PAGE
+        return club_root_page is not None and (
-            or settings.SITH_CLUB_ROOT_PAGE in [p.name for p in self.get_parent_list()]
+            self == club_root_page or club_root_page in self.get_parent_list()
         )
 
     @cached_property

core/templates/core/base.jinja

@@ -2,14 +2,8 @@
 <html lang="fr">
   <head>
     {% block head %}
-      <title>{% block title %}Association des Étudiants de l'UTBM{% endblock %}</title>
+      <title>{% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM</title>
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <meta name="description" content="{% block description -%}
-                                          {% trans trimmed %}
-                                            AE UTBM is a voluntary organisation run by UTBM students.
-                                            It organises student life at UTBM and manages its student facilities.
-                                          {% endtrans %}
-                                        {%- endblock %}">
       <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') }}">

core/templates/core/page_list.jinja

@@ -5,12 +5,16 @@
 {% endblock %}
 
 {% block content %}
+  {% if page_list %}
     <h3>{% trans %}Page list{% endtrans %}</h3>
     <ul>
       {% for p in page_list %}
-      <li><a href="{{ p.get_absolute_url() }}">{{ p.display_name }}</a></li>
+        <li><a href="{{ p.get_absolute_url() }}">{{ p.get_display_name() }}</a></li>
       {% endfor %}
     </ul>
+  {% else %}
+    {% trans %}There is no page in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 

core/views/page.py

@@ -12,10 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.db.models import F, OuterRef, Subquery
-from django.db.models.functions import Coalesce
 
 # This file contains all the views that concern the page model
 from django.forms.models import modelform_factory
@@ -46,20 +43,6 @@ class CanEditPagePropMixin(CanEditPropMixin):
 class PageListView(CanViewMixin, ListView):
     model = Page
     template_name = "core/page_list.jinja"
-    queryset = (
-        Page.objects.annotate(
-            display_name=Coalesce(
-                Subquery(
-                    PageRev.objects.filter(page=OuterRef("id"))
-                    .order_by("-date")
-                    .values("title")[:1]
-                ),
-                F("name"),
-            )
-        )
-        .prefetch_related("view_groups")
-        .select_related("parent")
-    )
 
 
 class PageView(CanViewMixin, DetailView):

eboutic/templates/eboutic/eboutic_main.jinja

@@ -1,12 +1,8 @@
 {% extends "core/base.jinja" %}
 
-{% block title -%}
+{% block title %}
   {% trans %}Eboutic{% endtrans %}
-{%- endblock %}
+{% endblock %}
-
-{% block description -%}
-  {% trans %}The online shop of the association.{% endtrans %}
-{%- endblock %}
 
 {% block additional_js %}
     {# This script contains the code to perform requests to manipulate the

forum/templates/forum/main.jinja

@@ -2,13 +2,9 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 {% from 'forum/macros.jinja' import display_forum, display_search_bar %}
 
-{% block title -%}
+{% block title %}
   {% trans %}Forum{% endtrans %}
-{%- endblock %}
+{% endblock %}
-
-{% block description -%}
-  {% trans %}A forum dedicated to the UTBM students.{% endtrans %}
-{%- endblock %}
 
 {% block additional_css %}
   <link rel="stylesheet" href="{{ static('forum/css/forum.scss') }}">

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-13 00:17+0200\n"
+"POT-Creation-Date: 2025-08-23 15:30+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -306,10 +306,6 @@ msgstr "Utilisateur non enregistré"
 msgid "Club list"
 msgstr "Liste des clubs"
 
-#: club/templates/club/club_list.jinja
-msgid "The list of all clubs existing at UTBM."
-msgstr "La liste de tous les clubs existants à l'UTBM"
-
 #: club/templates/club/club_list.jinja
 msgid "inactive"
 msgstr "inactif"
@@ -905,7 +901,7 @@ msgid "News admin"
 msgstr "Administration des nouvelles"
 
 #: com/templates/com/news_admin_list.jinja com/templates/com/news_detail.jinja
-#: com/views.py
+#: com/templates/com/news_list.jinja com/views.py
 msgid "News"
 msgstr "Nouvelles"
 
@@ -1039,14 +1035,10 @@ msgstr "Liens"
 msgid "Our services"
 msgstr "Nos services"
 
-#: com/templates/com/news_list.jinja
+#: com/templates/com/news_list.jinja pedagogy/templates/pedagogy/guide.jinja
 msgid "UV Guide"
 msgstr "Guide des UVs"
 
-#: com/templates/com/news_list.jinja
-msgid "Timetable"
-msgstr "Emploi du temps"
-
 #: com/templates/com/news_list.jinja core/templates/core/base/navbar.jinja
 msgid "Matmatronch"
 msgstr "Matmatronch"
@@ -1713,12 +1705,8 @@ msgid "500, Server Error"
 msgstr "500, Erreur Serveur"
 
 #: core/templates/core/base.jinja
-msgid ""
+msgid "Welcome!"
-"AE UTBM is a voluntary organisation run by UTBM students. It organises "
+msgstr "Bienvenue !"
-"student life at UTBM and manages its student facilities."
-msgstr ""
-"L'AE UTBM est une association bénévole gérée par les étudiants de l'UTBM. "
-"Elle organise la vie étudiante de l'UTBM et gère ses lieux de vie."
 
 #: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja
 msgid "Contacts"
@@ -2161,6 +2149,10 @@ msgstr ""
 msgid "Page history"
 msgstr "Historique de la page"
 
+#: core/templates/core/page_list.jinja
+msgid "There is no page in this website."
+msgstr "Il n'y a pas de page sur ce site web."
+
 #: core/templates/core/page_prop.jinja
 msgid "Page properties"
 msgstr "Propriétés de la page"
@@ -3827,10 +3819,6 @@ msgstr ""
 msgid "Pay with Sith account"
 msgstr "Payer avec un compte AE"
 
-#: eboutic/templates/eboutic/eboutic_main.jinja
-msgid "The online shop of the association."
-msgstr "La boutique en ligne de l'association."
-
 #: eboutic/templates/eboutic/eboutic_main.jinja
 msgid "Clear"
 msgstr "Vider"
@@ -4160,10 +4148,6 @@ msgstr "Message supprimé ou non-visible."
 msgid "Order by date"
 msgstr "Trier par date"
 
-#: forum/templates/forum/main.jinja
-msgid "A forum dedicated to the UTBM students."
-msgstr "Un forum dédié aux étudiants de l'UTBM."
-
 #: forum/templates/forum/main.jinja
 msgid "View last unread messages"
 msgstr "Voir les derniers messages non lus"
@@ -4390,14 +4374,6 @@ msgstr "signaler"
 msgid "reporter"
 msgstr "signalant"
 
-#: pedagogy/templates/pedagogy/guide.jinja
-msgid "UE Guide"
-msgstr "Guide des UEs"
-
-#: pedagogy/templates/pedagogy/guide.jinja
-msgid "A guide of courses available at UTBM."
-msgstr "Un guide de tous les cours disponibles à l'UTBM."
-
 #: pedagogy/templates/pedagogy/guide.jinja
 #, python-format
 msgid "%(display_name)s"
@@ -4690,11 +4666,6 @@ msgstr "Demande de retrait d'image"
 msgid "Request removal"
 msgstr "Demander le retrait"
 
-#: sas/templates/sas/main.jinja
-msgid "See all the photos taken during events organised by the AE."
-msgstr ""
-"Retrouvez toutes les photos prises lors des événements organisés par l'AE."
-
 #: sas/templates/sas/main.jinja
 msgid "You must be logged in to see the SAS."
 msgstr "Vous devez être connecté pour voir les photos."
@@ -5201,18 +5172,6 @@ msgstr "Membre existant"
 msgid "the groups that can create subscriptions"
 msgstr "les groupes pouvant créer des cotisations"
 
-#: timetable/templates/timetable/generator.jinja
-msgid "Timetable generator"
-msgstr "Générateur d'emploi du temps"
-
-#: timetable/templates/timetable/generator.jinja
-msgid "Generate"
-msgstr "Générer"
-
-#: timetable/templates/timetable/generator.jinja
-msgid "Save to PNG"
-msgstr "Sauver en PNG"
-
 #: trombi/models.py
 msgid "subscription deadline"
 msgstr "fin des inscriptions"
@@ -5510,9 +5469,3 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée."
 #, python-format
 msgid "Maximum characters: %(max_length)s"
 msgstr "Nombre de caractères max: %(max_length)s"
-
-#~ msgid "Timeplan generator"
-#~ msgstr "Temps de génération du template : "
-
-#~ msgid "There is no page in this website."
-#~ msgstr "Il n'y a pas de page sur ce site web."

package-lock.json

@@ -29,7 +29,6 @@
         "d3-force-3d": "^3.0.5",
         "easymde": "^2.19.0",
         "glob": "^11.0.0",
-        "html2canvas": "^1.4.1",
         "htmx.org": "^2.0.3",
         "jquery": "^3.7.1",
         "js-cookie": "^3.0.5",
@@ -51,7 +50,7 @@
         "@types/jquery": "^3.5.31",
         "@types/js-cookie": "^3.0.6",
         "typescript": "^5.8.3",
-        "vite": "^6.2.6",
+        "vite": "^6.3.6",
         "vite-bundle-visualizer": "^1.2.1",
         "vite-plugin-static-copy": "^3.1.2"
       }
@@ -3125,15 +3124,6 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -3522,15 +3512,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/css-line-break": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
-      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
-      "license": "MIT",
-      "dependencies": {
-        "utrie": "^1.0.2"
-      }
-    },
     "node_modules/cytoscape": {
       "version": "3.33.1",
       "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz",
@@ -4203,19 +4184,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/html2canvas": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
-      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
-      "license": "MIT",
-      "dependencies": {
-        "css-line-break": "^2.1.0",
-        "text-segmentation": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/htmx.org": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.6.tgz",
@@ -5511,15 +5479,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/text-segmentation": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
-      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
-      "license": "MIT",
-      "dependencies": {
-        "utrie": "^1.0.2"
-      }
-    },
     "node_modules/three": {
       "version": "0.177.0",
       "resolved": "https://registry.npmjs.org/three/-/three-0.177.0.tgz",
@@ -5777,19 +5736,10 @@
         "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/utrie": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
-      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
-      "license": "MIT",
-      "dependencies": {
-        "base64-arraybuffer": "^1.0.2"
-      }
-    },
     "node_modules/vite": {
-      "version": "6.3.5",
+      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
-      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+      "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -35,7 +35,7 @@
     "@types/jquery": "^3.5.31",
     "@types/js-cookie": "^3.0.6",
     "typescript": "^5.8.3",
-    "vite": "^6.2.6",
+    "vite": "^6.3.6",
     "vite-bundle-visualizer": "^1.2.1",
     "vite-plugin-static-copy": "^3.1.2"
   },
@@ -60,7 +60,6 @@
     "d3-force-3d": "^3.0.5",
     "easymde": "^2.19.0",
     "glob": "^11.0.0",
-    "html2canvas": "^1.4.1",
     "htmx.org": "^2.0.3",
     "jquery": "^3.7.1",
     "js-cookie": "^3.0.5",

pedagogy/templates/pedagogy/guide.jinja

@@ -2,13 +2,9 @@
 {% from 'core/macros.jinja' import paginate_alpine %}
 
 {% block title %}
-  {% trans %}UE Guide{% endtrans %}
+  {% trans %}UV Guide{% endtrans %}
 {% endblock %}
 
-{% block description -%}
-  {% trans %}A guide of courses available at UTBM.{% endtrans %}
-{%- endblock %}
-
 {% block additional_css %}
   <link rel="stylesheet" href="{{ static('pedagogy/css/pedagogy.scss') }}">
 {% endblock %}

sas/templates/sas/main.jinja

@@ -8,10 +8,6 @@
   {% trans %}SAS{% endtrans %}
 {% endblock %}
 
-{% block description -%}
-  {% trans %}See all the photos taken during events organised by the AE.{% endtrans %}
-{%- endblock %}
-
 {% set is_sas_admin = user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
 
 {% from "sas/macros.jinja" import display_album %}

sith/settings.py

@@ -99,10 +99,9 @@ INSTALLED_APPS = (
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
-    "django.contrib.sitemaps",
-    "django.contrib.sites",
     "django.contrib.messages",
     "staticfiles",
+    "django.contrib.sites",
     "honeypot",
     "django_jinja",
     "ninja_extra",
@@ -125,7 +124,6 @@ INSTALLED_APPS = (
     "pedagogy",
     "galaxy",
     "antispam",
-    "timetable",
     "api",
 )
 
@@ -688,10 +686,8 @@ SITH_NOTIFICATIONS = [
 # The keys are the notification names as found in SITH_NOTIFICATIONS, and the
 # values are the callback function to update the notifs.
 # The callback must take the notif object as first and single argument.
-# If a notification is permanent but requires no post-action, set the
-# callback import string as None
 SITH_PERMANENT_NOTIFICATIONS = {
-    "NEWS_MODERATION": None,
+    "NEWS_MODERATION": "com.models.news_notification_callback",
     "SAS_MODERATION": "sas.models.sas_notification_callback",
 }
 

sith/sitemap.py

@@ -1,46 +0,0 @@
-from django.conf import settings
-from django.contrib.sitemaps import Sitemap
-from django.db.models import OuterRef, Subquery
-from django.urls import reverse
-
-from club.models import Club
-from core.models import Page, PageRev
-
-
-class SithSitemap(Sitemap):
-    def items(self):
-        return [
-            "core:index",
-            "eboutic:main",
-            "sas:main",
-            "forum:main",
-            "club:club_list",
-            "election:list",
-        ]
-
-    def location(self, item):
-        return reverse(item)
-
-
-class PagesSitemap(Sitemap):
-    def items(self):
-        return (
-            Page.objects.filter(view_groups=settings.SITH_GROUP_PUBLIC_ID)
-            .exclude(revisions=None, _full_name__startswith="club")
-            .annotate(
-                lastmod=Subquery(
-                    PageRev.objects.filter(page=OuterRef("pk"))
-                    .values("date")
-                    .order_by("-date")[:1]
-                )
-            )
-            .all()
-        )
-
-    def lastmod(self, item: Page):
-        return item.lastmod
-
-
-class ClubSitemap(Sitemap):
-    def items(self):
-        return Club.objects.filter(is_active=True)

sith/urls.py

@@ -15,24 +15,20 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.contrib.sitemaps.views import sitemap
 from django.http import Http404
 from django.urls import include, path
-from django.views.decorators.cache import cache_page
 from django.views.i18n import JavaScriptCatalog
 
 from api.urls import api
-from sith.sitemap import ClubSitemap, PagesSitemap, SithSitemap
 
 js_info_dict = {"packages": ("sith",)}
 
 handler403 = "core.views.forbidden"
 handler404 = "core.views.not_found"
 handler500 = "core.views.internal_servor_error"
-sitemaps = {"sith": SithSitemap, "pages": PagesSitemap, "clubs": ClubSitemap}
+
 urlpatterns = [
     path("", include(("core.urls", "core"), namespace="core")),
-    path("sitemap.xml", cache_page(86400)(sitemap), {"sitemaps": sitemaps}),
     path("api/", api.urls),
     path("rootplace/", include(("rootplace.urls", "rootplace"), namespace="rootplace")),
     path(
@@ -53,7 +49,6 @@ urlpatterns = [
     path("i18n/", include("django.conf.urls.i18n")),
     path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),
     path("captcha/", include("captcha.urls")),
-    path("edt/", include(("timetable.urls", "timetable"), namespace="timetable")),
 ]
 
 if settings.DEBUG:

timetable/admin.py

@@ -1 +0,0 @@
-# Register your models here.

timetable/apps.py

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

timetable/models.py

@@ -1 +0,0 @@
-# Create your models here.

timetable/static/bundled/timetable/generator-index.ts

@@ -1,164 +0,0 @@
-import html2canvas from "html2canvas";
-
-// see https://regex101.com/r/QHSaPM/2
-const TIMETABLE_ROW_RE: RegExp =
-  /^(?<ueCode>\w.+\w)\s+(?<courseType>[A-Z]{2}\d)\s+((?<weekGroup>[AB])\s+)?(?<weekday>(lundi)|(mardi)|(mercredi)|(jeudi)|(vendredi)|(samedi)|(dimanche))\s+(?<startHour>\d{2}:\d{2})\s+(?<endHour>\d{2}:\d{2})\s+[\dA-B]\s+((?<attendance>[\wé]*)\s+)?(?<room>\w+(?:, \w+)?)$/;
-
-const DEFAULT_TIMETABLE: string = `DS52\t\tCM1\t\tlundi\t08:00\t10:00\t1\tPrésentiel\tA113
-DS53\t\tCM1\t\tlundi\t10:15\t12:15\t1\tPrésentiel\tA101
-DS53\t\tTP1\t\tlundi\t13:00\t16:00\t1\tPrésentiel\tH010
-SO03\t\tCM1\t\tlundi\t16:15\t17:45\t1\tPrésentiel\tA103
-SO03\t\tTD1\t\tlundi\t17:45\t19:45\t1\tPrésentiel\tA103
-DS50\t\tTP1\t\tmardi\t08:00\t10:00\t1\tPrésentiel\tA216
-DS51\t\tCM1\t\tmardi\t10:15\t12:15\t1\tPrésentiel\tA216
-DS51\t\tTP1\t\tmardi\t14:00\t18:00\t1\tPrésentiel\tH010
-DS52\t\tTP2\tA\tjeudi\t08:00\t10:00\tA\tPrésentiel\tA110a, A110b
-DS52\t\tTD1\t\tjeudi\t10:15\t12:15\t1\tPrésentiel\tA110a, A110b
-LC02\t\tTP1\t\tjeudi\t15:00\t16:00\t1\tPrésentiel\tA209
-LC02\t\tTD1\t\tjeudi\t16:15\t18:15\t1\tPrésentiel\tA206`;
-
-type WeekDay =
-  | "lundi"
-  | "mardi"
-  | "mercredi"
-  | "jeudi"
-  | "vendredi"
-  | "samedi"
-  | "dimanche";
-
-const WEEKDAYS = [
-  "lundi",
-  "mardi",
-  "mercredi",
-  "jeudi",
-  "vendredi",
-  "samedi",
-  "dimanche",
-] as const;
-
-const SLOT_HEIGHT = 20 as const; // Each 15min has a height of 20px in the timetable
-const SLOT_WIDTH = 250 as const; // Each weekday ha a width of 400px in the timetable
-const MINUTES_PER_SLOT = 15 as const;
-
-interface TimetableSlot {
-  courseType: string;
-  room: string;
-  startHour: string;
-  endHour: string;
-  startSlot: number;
-  endSlot: number;
-  ueCode: string;
-  weekGroup?: string;
-  weekday: WeekDay;
-}
-
-function parseSlots(s: string): TimetableSlot[] {
-  return s
-    .split("\n")
-    .filter((s: string) => s.length > 0)
-    .map((row: string) => {
-      const parsed = TIMETABLE_ROW_RE.exec(row);
-      if (!parsed) {
-        throw new Error(`Couldn't parse row ${row}`);
-      }
-      const [startHour, startMin] = parsed.groups.startHour
-        .split(":")
-        .map((i) => Number.parseInt(i));
-      const [endHour, endMin] = parsed.groups.endHour
-        .split(":")
-        .map((i) => Number.parseInt(i));
-      return {
-        ...parsed.groups,
-        startSlot: Math.floor((startHour * 60 + startMin) / MINUTES_PER_SLOT),
-        endSlot: Math.floor((endHour * 60 + endMin) / MINUTES_PER_SLOT),
-      } as unknown as TimetableSlot;
-    });
-}
-
-document.addEventListener("alpine:init", () => {
-  Alpine.data("timetableGenerator", () => ({
-    content: DEFAULT_TIMETABLE,
-    error: "",
-    displayedWeekdays: [] as WeekDay[],
-    courses: [] as TimetableSlot[],
-    startSlot: 0,
-    table: {
-      height: 0,
-      width: 0,
-    },
-
-    colors: {} as Record<string, string>,
-    colorPalette: [
-      "#27ae60",
-      "#2980b9",
-      "#c0392b",
-      "#7f8c8d",
-      "#f1c40f",
-      "#1abc9c",
-      "#95a5a6",
-      "#26C6DA",
-      "#c2185b",
-      "#e64a19",
-      "#1b5e20",
-    ],
-
-    generate() {
-      try {
-        this.courses = parseSlots(this.content);
-      } catch {
-        this.error = gettext(
-          "Wrong timetable format. Make sure you copied if from your student folder.",
-        );
-        return;
-      }
-
-      // color each UE
-      let colorIndex = 0;
-      for (const slot of this.courses) {
-        if (!this.colors[slot.ueCode]) {
-          this.colors[slot.ueCode] =
-            this.colorPalette[colorIndex % this.colorPalette.length];
-          colorIndex++;
-        }
-      }
-
-      this.displayedWeekdays = WEEKDAYS.filter((day) =>
-        this.courses.some((slot: TimetableSlot) => slot.weekday === day),
-      );
-      this.startSlot = this.courses.reduce(
-        (acc: number, curr: TimetableSlot) => Math.min(acc, curr.startSlot),
-        25 * 4,
-      );
-      this.endSlot = this.courses.reduce(
-        (acc: number, curr: TimetableSlot) => Math.max(acc, curr.endSlot),
-        1,
-      );
-      this.table.height = SLOT_HEIGHT * (this.endSlot - this.startSlot);
-      this.table.width = SLOT_WIDTH * this.displayedWeekdays.length;
-    },
-
-    getStyle(slot: TimetableSlot) {
-      const hasWeekGroup = slot.weekGroup !== undefined;
-      const width = hasWeekGroup ? SLOT_WIDTH / 2 : SLOT_WIDTH;
-      const leftOffset = slot.weekGroup === "B" ? SLOT_WIDTH / 2 : 0;
-      return {
-        height: `${(slot.endSlot - slot.startSlot) * SLOT_HEIGHT}px`,
-        width: `${width}px`,
-        top: `${(slot.startSlot - this.startSlot) * SLOT_HEIGHT}px`,
-        left: `${this.displayedWeekdays.indexOf(slot.weekday) * SLOT_WIDTH + leftOffset}px`,
-        backgroundColor: this.colors[slot.ueCode],
-      };
-    },
-
-    async savePng() {
-      const elem = document.getElementById("timetable");
-      const img = (await html2canvas(elem)).toDataURL();
-      const downloadLink = document.createElement("a");
-      downloadLink.href = img;
-      downloadLink.download = "edt.png";
-      document.body.appendChild(downloadLink);
-      downloadLink.click();
-      downloadLink.remove();
-    },
-  }));
-});

timetable/static/timetable/css/generator.scss

@@ -1,35 +0,0 @@
-#timetable {
-  display: block;
-  margin: 2em auto ;
-  .header {
-    background-color: white;
-    box-shadow: none;
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    gap: 0;
-    span {
-      flex: 1;
-      text-align: center;
-    }
-  }
-  .content {
-    position: relative;
-    text-align: center;
-
-    .slot {
-      background-color: cadetblue;
-      position: absolute;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-
-      .course-type {
-        position: absolute;
-        top: 0;
-        right: 0;
-        padding: 10px;
-      }
-    }
-  }
-}

timetable/templates/timetable/generator.jinja

@@ -1,58 +0,0 @@
-{% extends 'core/base.jinja' %}
-
-{%- block additional_css -%}
-  <link rel="stylesheet" href="{{ static('timetable/css/generator.scss') }}">
-{%- endblock -%}
-
-{%- block additional_js -%}
-  <script type="module" src="{{ static('bundled/timetable/generator-index.ts') }}"></script>
-{%- endblock -%}
-
-{% block title %}
-  {% trans %}Timetable generator{% endtrans %}
-{% endblock %}
-
-{% block content %}
-  <div x-data="timetableGenerator">
-    <form @submit.prevent="generate()">
-      <h1>Générateur d'emploi du temps</h1>
-      <div class="alert alert-red" x-show="!!error" x-cloak>
-        <span class="alert-main" x-text="error"></span>
-      </div>
-      <div class="form-group">
-        <label for="timetable-input">Colle ton emploi du temps (sans l'entête)</label>
-        <textarea id="timetable-input" cols="30" rows="15" x-model="content"></textarea>
-      </div>
-      <input type="submit" class="btn btn-blue" value="{% trans %}Generate{% endtrans %}">
-    </form>
-    <div
-      id="timetable"
-      x-show="table.height > 0 && table.width > 0"
-      :style="{width: `${table.width}px`, height: `${table.height+40}px`}"
-    >
-      <div class="header">
-        <template x-for="weekday in displayedWeekdays">
-          <span x-text="weekday"></span>
-        </template>
-      </div>
-      <div class="content">
-        <template x-for="course in courses">
-          <div class="slot" :style="getStyle(course)">
-            <span class="course-type" x-text="course.courseType"></span>
-            <span x-text="course.ueCode"></span>
-            <span x-text="`${course.startHour} - ${course.endHour}`"></span>
-            <span x-text="(course.weekGroup ? `\nGroupe ${course.weekGroup}` : '')"></span>
-            <span x-text="course.room"></span>
-          </div>
-        </template>
-      </div>
-    </div>
-    <button
-      class="margin-bottom btn btn-blue"
-      @click="savePng"
-      x-show="table.height > 0 && table.width > 0"
-    >
-      {% trans %}Save to PNG{% endtrans %}
-    </button>
-  </div>
-{% endblock content %}

timetable/tests.py

@@ -1 +0,0 @@
-# Create your tests here.

timetable/urls.py

@@ -1,5 +0,0 @@
-from django.urls import path
-
-from timetable.views import GeneratorView
-
-urlpatterns = [path("", GeneratorView.as_view(), name="generator")]

timetable/views.py

@@ -1,8 +0,0 @@
-# Create your views here.
-from django.views.generic import TemplateView
-
-from core.auth.mixins import FormerSubscriberMixin
-
-
-class GeneratorView(FormerSubscriberMixin, TemplateView):
-    template_name = "timetable/generator.jinja"