Revert "April fool day"

This reverts commit 6e0e633660af7e685cf9dcf60a1e4036d6f8091d.

april/apps.py

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

april/middleware.py

@@ -1,34 +0,0 @@
-import os
-from urllib.parse import urlparse
-
-from django.conf import settings
-from django.http import HttpRequest
-
-from april import views
-
-
-class AprilFoolMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request: HttpRequest):
-        if request.user.is_authenticated and request.user.id == os.environ.get(
-            "SLI_ID"
-        ):
-            # Sli deserves a special one :)
-            return views.april_fool_sli(request)
-        if self._prank_user(request):
-            return views.april_fool(request)
-        return self.get_response(request)
-
-    @classmethod
-    def _prank_user(cls, request):
-        if request.user.is_anonymous or not request.user.was_subscribed:
-            return False
-        # fool users only if the request isn't originated from the sith itself
-        referer = request.META.get("HTTP_REFERER", None)
-        if referer is not None or urlparse(referer).netloc == settings.SITH_URL:
-            return False
-        # don't fool a user too often, or his UX will become miserable
-        already_pranked = request.COOKIES.get("prankDone")
-        return not already_pranked

april/static/april/age_confirm.scss

@@ -1,165 +0,0 @@
-a, body, div, h3, img, li, p, small, span, ul {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  vertical-align: baseline;
-}
-
-body {
-  line-height: 1;
-}
-
-ul {
-  list-style: none;
-}
-
-body {
-  font-size: 14px;
-  color: var(--main-text);
-  font-family: Arial, Helvetica, sans-serif;
-}
-
-a {
-  text-decoration: none;
-  color: var(--main-theme);
-  cursor: pointer;
-  outline: 0;
-}
-
-p {
-  margin-bottom: 10px;
-  line-height: 21px;
-}
-
-h3 {
-  font-weight: 700;
-  margin-bottom: 10px;
-  font-size: 1.4em;
-}
-
-.button {
-  display: inline-block;
-  padding: 7px;
-  border: 0;
-  border-radius: 3px;
-  color: var(--main-text);
-  font-size: 1em;
-  text-align: center;
-  text-decoration: none;
-  cursor: pointer;
-  outline: 0;
-}
-
-button.button {
-  border: 0;
-}
-
-.button.button-pink {
-  background-color: var(--main-theme);
-}
-
-.button.button-close {
-  background-color: var(--gray);
-  color: var(--light-gray);
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
-#ageDisclaimerWrapper {
-  position: fixed;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  z-index: 20240;
-  width: 100%;
-  height: 100%;
-  display: block;
-  background-color: var(--main-background);
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal {
-  max-width: 850px;
-  width: 100%;
-  max-height: 100%;
-  overflow: auto;
-  box-sizing: border-box;
-  position: absolute;
-  left: 50%;
-  top: 30%;
-  -webkit-transform: translate(-50%, -30%);
-  transform: translate(-50%, -30%);
-  background: var(--darkest-gray);
-  border: 1px solid var(--gray);
-  padding: 50px;
-  text-align: center;
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .logo-wrapper {
-  margin-bottom: 20px;
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .content {
-  font-size: 1.2em;
-  margin: 30px 0;
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .buttons-wrapper {
-  display: flex;
-  justify-content: center;
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .buttons-wrapper .button-close, #ageDisclaimerWrapper .age-disclaimer-modal .buttons-wrapper .button-pink {
-  font-size: 1.3em;
-  padding: 15px 10px;
-  -webkit-transition: all .2s;
-  transition: all .2s;
-  flex-basis: 40%;
-  max-width: 350px;
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .buttons-wrapper .button-pink:hover {
-  background-color: var(--main-theme-hover);
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .buttons-wrapper .button-close {
-  margin-left: 10px;
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .buttons-wrapper .button-close:hover {
-  background-color: var(--mid-gray);
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .parental-control-message {
-  margin-top: 30px;
-  line-height: 18px;
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .parental-control-message .block-copyright {
-  position: relative;
-  bottom: 10px;
-  color: var(--shadow-dark-gray);
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .parental-control-message a {
-  display: inline-block;
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .parental-control-message a:hover {
-  color: var(--main-theme-hover);
-}
-
-#ageDisclaimerWrapper .age-disclaimer-modal .age_verification_title {
-  font-size: 2em;
-  font-weight: 700;
-  margin-bottom: 10px;
-}
-
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}

april/templates/april/age_confirm.jinja

@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="" class="grid">
-  <head>
-    <title>AE UTBM</title>
-    <link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
-
-    <style>
-      :root {
-        --main-text: #ffffff;
-        --lightest-gray: #fafafa;
-        --light-gray: #bbbbbb;
-        --mid-light-gray: #616161;
-        --gray: #4b4b4b;
-        --mid-gray: #363636;
-        --light-mid-gray: #444444;
-        --mid-gray-border: #313131;
-        --dark-gray: #232323;
-        --shadow-dark-gray: #707070;
-        --darkest-gray: #161617;
-        --main-background: #000;
-        --main-theme: #ec567c;
-        --main-theme-hover: #e33561;
-        --error: #b02020;
-        --main-error: #d32f2f;
-        --main-enable: #8faf20;
-        --main-theme-information: #ed6398;
-        --intersti-blue: #00aef1;
-        --tooltip-background: #444444;
-        --tooltip-text: #EEEEEE;
-      }
-    </style>
-
-    <link rel="stylesheet" href="{{ static("april/age_confirm.scss") }}"/>
-
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-    <script type="module" src="{{ static('bundled/alpine-index.js') }}"></script>
-  </head>
-
-  <body>
-    <div id="ageDisclaimerMainBG"
-         style="position:fixed; padding:0; margin:0; top:0; left:0; width: 100%; height: 100%; z-index: 10000; background: #000;"></div>
-
-    <div id="ageDisclaimerWrapper" x-data>
-      <div class="age-disclaimer-modal main">
-        <div class="logo-wrapper">
-          <img src="{{ static('core/img/logo_no_text.png') }}" width="160"/>
-        </div>
-        <p class="age_verification_title">
-          {% trans %}Age Verification{% endtrans %}
-        </p>
-        <div class="content">
-          <p>
-            {% trans trimmed %}
-              This website contains age-restricted materials including blousards
-              and explicit depictions of student activity.
-              By entering, you affirm that you are at least 18 years of age
-              or the age of majority in the campus you are accessing the website from
-              and you consent to viewing explicit student content.
-            {% endtrans %}
-          </p>
-        </div>
-        <div class="buttons-wrapper">
-          <button
-            id="accessButton"
-            class="button button-pink gtm-event-avmodal"
-            @click="ageConfirm"
-          >
-            {% trans %}I am 18 or older{% endtrans %}
-          </button>
-          <button
-            id="exitButton"
-            class="button button-close gtm-event-avmodal"
-            @click="document.location = 'https://youtu.be/dQw4w9WgXcQ'"
-          >
-            {% trans %}I am under 18{% endtrans %}
-          </button>
-        </div>
-        <div class="parental-control-message">
-          <p>
-            {% trans trimmed %}
-              Our <a href="https://ae.utbm.fr/forum/topic/18125/" target="_blank" rel="noopener nofollow">
-                parental controls page</a> explains if you can access this website
-            {% endtrans %}
-          </p>
-          <span class='block-copyright'>AE UTBM 2025</span>
-        </div>
-      </div>
-    </div>
-  </body>
-  <script>
-    function ageConfirm() {
-          {# If this cookie exists, the middleware shouldn't render this view #}
-      document.cookie = "prankDone=true;Max-Age=3600;";  {# one hour #}
-      document.location.reload();
-    }
-  </script>
-</html>

april/templates/april/sli.jinja

@@ -1,4 +0,0 @@
-<h1>Service unavailable</h1>
-<hr>
-<p>HTTP Error 503 : the service is unavailable</p>
-<em style="display: none">Review mes PRs, wesh</em>

april/views.py

@@ -1,9 +0,0 @@
-from django.shortcuts import render
-
-
-def april_fool(request):
-    return render(request, "april/age_confirm.jinja")
-
-
-def april_fool_sli(request):
-    return render(request, "april/sli.jinja")

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-01 01:33+0200\n"
+"POT-Creation-Date: 2025-03-28 13:51+0100\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"
@@ -796,42 +796,6 @@ msgstr ""
 "True si gardé à jour par le biais d'un fournisseur externe de domains "
 "toxics, False sinon"
 
-#: april/templates/april/age_confirm.jinja
-msgid "Age Verification"
-msgstr "Vérification de l'âge"
-
-#: april/templates/april/age_confirm.jinja
-msgid ""
-"This website contains age-restricted materials including blousards and "
-"explicit depictions of student activity. By entering, you affirm that you "
-"are at least 18 years of age or the age of majority in the campus you are "
-"accessing the website from and you consent to viewing explicit student "
-"content."
-msgstr ""
-"Ce site possède du contenu dont l'accès est limité à un certain âge, "
-"incluant des blousards et des représentations explicites d'activités "
-"étudiantes. En rentrant sur le site, vous affirmez que vous avez au moins 18 "
-"ans ou l'âge de la majorité dans le campus depuis lequel vous accédez au "
-"site et vous acceptez de voir du contenu explicite étudiant."
-
-#: april/templates/april/age_confirm.jinja
-msgid "I am 18 or older"
-msgstr "J'ai 18 ans ou plus"
-
-#: april/templates/april/age_confirm.jinja
-msgid "I am under 18"
-msgstr "J'ai moins de 18 ans"
-
-#: april/templates/april/age_confirm.jinja
-msgid ""
-"Our <a href=\"https://ae.utbm.fr/forum/topic/18125/\" target=\"_blank\" "
-"rel=\"noopener nofollow\"> parental controls page</a> explains if you can "
-"access this website"
-msgstr ""
-"Notre <a href=\"https://ae.utbm.fr/forum/topic/18125/\" target=\"_blank\" "
-"rel=\"noopener nofollow\"> page de contrôle parental</a> explique si vous "
-"pouvez accéder à ce site."
-
 #: club/forms.py
 msgid "Users to add"
 msgstr "Utilisateurs à ajouter"
@@ -971,10 +935,6 @@ msgstr "rôle"
 msgid "description"
 msgstr "description"
 
-#: club/models.py
-msgid "past member"
-msgstr "ancien membre"
-
 #: club/models.py
 msgid "Email address"
 msgstr "Adresse email"
@@ -3375,8 +3335,8 @@ msgstr "Nom d'utilisateur, email, ou numéro de compte AE"
 
 #: core/views/forms.py
 msgid ""
-"Profile: you need to be visible on the picture, in order to be recognized "
+"Profile: you need to be visible on the picture, in order to be recognized (e."
-"(e.g. by the barmen)"
+"g. by the barmen)"
 msgstr ""
 "Photo de profil: vous devez être visible sur la photo afin d'être reconnu "
 "(par exemple par les barmen)"
@@ -3449,6 +3409,10 @@ msgstr "Famille"
 msgid "Pictures"
 msgstr "Photos"
 
+#: core/views/user.py
+msgid "Galaxy"
+msgstr "Galaxie"
+
 #: counter/apps.py sith/settings.py
 msgid "Check"
 msgstr "Chèque"
@@ -3982,8 +3946,8 @@ msgstr ""
 #: counter/templates/counter/mails/account_dump.jinja
 msgid "If you think this was a mistake, please mail us at ae@utbm.fr."
 msgstr ""
-"Si vous pensez qu'il s'agit d'une erreur, veuillez envoyer un mail à "
+"Si vous pensez qu'il s'agit d'une erreur, veuillez envoyer un mail à ae@utbm."
-"ae@utbm.fr."
+"fr."
 
 #: counter/templates/counter/mails/account_dump.jinja
 msgid ""
@@ -6079,3 +6043,6 @@ 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 "past member"
+#~ msgstr "ancien membre"

sith/settings.py

@@ -98,7 +98,6 @@ INSTALLED_APPS = (
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
-    "april",
     "staticfiles",
     "django.contrib.sites",
     "honeypot",
@@ -136,7 +135,6 @@ MIDDLEWARE = (
     "django.middleware.security.SecurityMiddleware",
     "core.middleware.AuthenticationMiddleware",
     "core.middleware.SignalRequestMiddleware",
-    "april.middleware.AprilFoolMiddleware",
 )
 
 ROOT_URLCONF = "sith.urls"