diff --git a/.env.template b/.env.template index ae60e2e58..9f49fa64e 100644 --- a/.env.template +++ b/.env.template @@ -18,3 +18,24 @@ GITHUB_REPO=betagouv/itou-communaute-django # SENDINBLUE API KEY SIB_API_KEY=__key_to_be_set__ + +# for Sentry +#SENTRY_DSN=__url_to_be_set__ + +# for Inclusion Connect +INCLUSION_CONNECT_BASE_URL=http://127.0.0.1:8080 +INCLUSION_CONNECT_REALM=local +INCLUSION_CONNECT_CLIENT_ID=local_inclusion_connect +INCLUSION_CONNECT_CLIENT_SECRET=__key_to_be_set__ + +# Path to the itou-backup project repository. +PATH_TO_BACKUPS=~/path/to/itou-backups + +# bucket for test purpose only +CELLAR_ADDON_KEY_ID=__id_to_be_set__ +CELLAR_ADDON_KEY_SECRET=__key_to_be_set__ +CELLAR_ADDON_HOST=__host_to_be_set__ +CELLAR_ADDON_PROTOCOL=https +S3_STORAGE_BUCKET_NAME=c3-storage-test-prive +S3_STORAGE_BUCKET_NAME_PUBLIC=c3-storage-test-public +S3_STORAGE_BUCKET_REGION=eu-west-3 diff --git a/README.md b/README.md index 33da5f85b..69ce20276 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,15 @@ python manage.py runserver ## Peupler la base de données +1. setup anonymous user default perms +1. setup authenticated user default perms +1. creer un forum type=0, kind=PUBLIC_FORUM, name="Échanges" +1. creer un forum type=0, kind=News, name="Actualités" -```bash -python manage.py loaddata fixtures/validation_fixtures.json -``` +pour créer de la documentation: +1. creer un forum type=1, kind=PUBLIC_FORUM, name="nom du thème" +1. creer un à x forum(s) type=0, kind=PUBLIC_FORUM, parent={forum précédent}, name="nom du sous-thème" ## Mises à jour @@ -108,7 +112,6 @@ Il vous reste juste à configurer votre IDE pour qu'il s'y attache. Dans VSCode, Vous pourrez dès lors placer des points d'arrêt dans le code en survolant le numéro de ligne dans la colonne à gauche et de lancer le débogueur (qui ne fera que s'attacher au serveur de deboguage qui tourne dans votre conteneur). - ### Lancer les tests en distribué ```bash @@ -119,47 +122,50 @@ pytest --numprocesses=logical --create-db Ajouter les secrets suivants dans le repo git -* CLEVER_SECRET -* CLEVER_TOKEN +- CLEVER_SECRET +- CLEVER_TOKEN Créer et lier les addons -* postgresql -* cellar S3 storage -* configuration provider + +- postgresql +- cellar S3 storage +- configuration provider Créer les variables d'environnement suivantes dans le configuration provider -* ALLOWED_HOSTS -* CC_PIP_REQUIREMENTS_FILE -* CC_PYTHON_BACKEND -* CC_PYTHON_MODULE -* CC_PYTHON_VERSION -* CC_UWSGI_DISABLE_FILE_WRAPPER -* DJANGO_DEBUG -* DJANGO_SECRET_KEY -* DJANGO_SETTINGS_MODULE -* INCLUSION_CONNECT_BASE_URL -* INCLUSION_CONNECT_CLIENT_ID -* INCLUSION_CONNECT_CLIENT_SECRET -* INCLUSION_CONNECT_REALM -* PORT -* PYTHONPATH -* S3_STORAGE_BUCKET_NAME -* S3_STORAGE_BUCKET_NAME_PUBLIC" -* S3_STORAGE_BUCKET_REGION -* SENTRY_DSN -* SIB_API_KEY -* STATIC_FILES_PATH -* STATIC_URL_PREFIX + +- ALLOWED_HOSTS +- CC_PIP_REQUIREMENTS_FILE +- CC_PYTHON_BACKEND +- CC_PYTHON_MODULE +- CC_PYTHON_VERSION +- CC_UWSGI_DISABLE_FILE_WRAPPER +- DJANGO_DEBUG +- DJANGO_SECRET_KEY +- DJANGO_SETTINGS_MODULE +- INCLUSION_CONNECT_BASE_URL +- INCLUSION_CONNECT_CLIENT_ID +- INCLUSION_CONNECT_CLIENT_SECRET +- INCLUSION_CONNECT_REALM +- PORT +- PYTHONPATH +- S3_STORAGE_BUCKET_NAME +- S3_STORAGE_BUCKET_NAME_PUBLIC" +- S3_STORAGE_BUCKET_REGION +- SENTRY_DSN +- SIB_API_KEY +- STATIC_FILES_PATH +- STATIC_URL_PREFIX ### pour le déploiment des recettes jetables Créer et lier les addons (différents de ceux de production ^^) -* postgresql -* cellar S3 storage -* configuration provider + +- postgresql +- cellar S3 storage +- configuration provider Ajouter les secrets suivants dans le repo git -* CLEVER_REVIEW_APPS_CONFIGURATION_ADDON -* CLEVER_REVIEW_APPS_ORG -* CLEVER_REVIEW_APPS_S3_ADDON +- CLEVER_REVIEW_APPS_CONFIGURATION_ADDON +- CLEVER_REVIEW_APPS_ORG +- CLEVER_REVIEW_APPS_S3_ADDON diff --git a/lacommunaute/forum/tests/tests_views.py b/lacommunaute/forum/tests/tests_views.py index 3649d4883..8fcdcd7c3 100644 --- a/lacommunaute/forum/tests/tests_views.py +++ b/lacommunaute/forum/tests/tests_views.py @@ -128,27 +128,27 @@ def test_has_liked(self): self.client.force_login(self.user) response = self.client.get(self.url) # icon: solid heart - self.assertContains(response, '1') + self.assertContains(response, '1') def test_has_not_liked(self): self.client.force_login(self.user) response = self.client.get(self.url) # icon: regular heart (outlined) - self.assertContains(response, '0') + self.assertContains(response, '0') def test_has_liked_TOPIC_ANNOUNCE(self): TopicFactory(forum=self.forum, poster=self.user, with_post=True, with_like=True, type=Topic.TOPIC_ANNOUNCE) self.client.force_login(self.user) response = self.client.get(self.url) - self.assertContains(response, '1') + self.assertContains(response, '1') def test_has_not_liked_TOPIC_ANNOUNCE(self): TopicFactory(forum=self.forum, poster=self.user, with_post=True, type=Topic.TOPIC_ANNOUNCE) self.client.force_login(self.user) response = self.client.get(self.url) - self.assertContains(response, '0') + self.assertContains(response, '0') def test_anonymous_like(self): params = {"next_url": self.url} @@ -342,7 +342,7 @@ def test_share_buttons(self): response = self.client.get(url) self.assertContains( response, - 'div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuSocialShare">', + 'div class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenuSocialShare">', status_code=200, ) @@ -355,9 +355,9 @@ def test_upvote_actions(self): '' - '\n 0' + '\n 0' ) response = self.client.get( reverse("forum_extension:forum", kwargs={"pk": child_forum.pk, "slug": child_forum.slug}) @@ -368,13 +368,13 @@ def test_upvote_actions(self): self.client.force_login(self.user) no_upvote_html = ( '
+ class="dropdown-item matomo-event" + data-matomo-category="engagement" + data-matomo-action="view" + data-matomo-option="directory"> {% trans "Members" %}
@@ -135,44 +135,44 @@

+ role="tabpanel" + aria-labelledby="topics-tab"> {% with unread_topics=unread_topics %} {% include "forum_conversation/topic_list.html" %} {% endwith %}
{% if announces %}
+ role="tabpanel" + aria-labelledby="announces-tab"> {% with topics=announces hide_if_empty=True unread_topics=unread_topics loadmoretopic_url=None %} {% include "forum_conversation/topic_list.html" %} {% endwith %} diff --git a/lacommunaute/templates/forum/forum_list.html b/lacommunaute/templates/forum/forum_list.html index d8e60e51d..f0cb6a4d1 100644 --- a/lacommunaute/templates/forum/forum_list.html +++ b/lacommunaute/templates/forum/forum_list.html @@ -13,17 +13,17 @@
{% if node.obj.image %} -
+
{{ node.obj.name }}
{% endif %}

+ class="matomo-event" + data-matomo-category="engagement" + data-matomo-action="view" + data-matomo-option="forum"> {{ node.obj.name }}

@@ -37,7 +37,7 @@

{{ node.obj.description.rendered|urlizetrunc_target_blank:30 }} {% endif %} {% if node.children %} -

  • + class="h5 d-block mb-0 matomo-event" + data-matomo-category="engagement" + data-matomo-action="view" + data-matomo-option="forum"> {{ child.obj.name }} @@ -81,12 +81,12 @@

    {% endif %}

    • -
    +
    + class="btn btn-ico btn-link stretched-link matomo-event" + data-matomo-category="engagement" + data-matomo-action="view" + data-matomo-option="fiches_techniques"> Consulter la fiche @@ -101,10 +101,10 @@

  • + class="matomo-event h4 d-block mb-0" + data-matomo-category="engagement" + data-matomo-action="view" + data-matomo-option="forum"> {{ node.obj.name }} diff --git a/lacommunaute/templates/forum_conversation/forum_attachments/attachment_formset.html b/lacommunaute/templates/forum_conversation/forum_attachments/attachment_formset.html index 3bf8bca20..a5d779773 100644 --- a/lacommunaute/templates/forum_conversation/forum_attachments/attachment_formset.html +++ b/lacommunaute/templates/forum_conversation/forum_attachments/attachment_formset.html @@ -17,9 +17,9 @@ {% endfor %} {% endif %} {% if field.name == 'DELETE' %} -
    - {{ field | add_class:'custom-control-input' }} - +
    + {{ field | add_class:'form-check-input' }} +
    {% elif field.name == 'file' %}
    diff --git a/lacommunaute/templates/forum_conversation/forum_polls/poll_detail.html b/lacommunaute/templates/forum_conversation/forum_polls/poll_detail.html index 5a3f02b94..5d0e7dc07 100644 --- a/lacommunaute/templates/forum_conversation/forum_polls/poll_detail.html +++ b/lacommunaute/templates/forum_conversation/forum_polls/poll_detail.html @@ -35,11 +35,11 @@
    {% if view_results_action %}
    - {% trans "Vote" %} + {% trans "Vote" %}
    {% elif can_be_completed and has_been_completed and not change_vote_action %}
    - {% trans "Change your vote" %} + {% trans "Change your vote" %}
    {% endif %} {% endwith %} diff --git a/lacommunaute/templates/forum_conversation/forum_polls/poll_option_formset.html b/lacommunaute/templates/forum_conversation/forum_polls/poll_option_formset.html index 7affcac5b..20dc8c8d1 100644 --- a/lacommunaute/templates/forum_conversation/forum_polls/poll_option_formset.html +++ b/lacommunaute/templates/forum_conversation/forum_polls/poll_option_formset.html @@ -11,9 +11,9 @@ {{ form.id }} {% endif %} {% if field.name == 'DELETE' %} -
    - {{ field | add_class:'custom-control-input' }} - +
    + {{ field | add_class:'form-check-input' }} +
    {% else %} {% include "partials/form_field.html" with field=field %} diff --git a/lacommunaute/templates/forum_conversation/forum_polls/poll_vote_form.html b/lacommunaute/templates/forum_conversation/forum_polls/poll_vote_form.html index a580c5e76..798cf8c2c 100644 --- a/lacommunaute/templates/forum_conversation/forum_polls/poll_vote_form.html +++ b/lacommunaute/templates/forum_conversation/forum_polls/poll_vote_form.html @@ -6,14 +6,14 @@ {% for option in poll_form.options.field.queryset %}
  • {% if poll.max_options == 1 %} -
    - - +
    + +
    {% else %} -
    - - +
    + +
    {% endif %}
    • @@ -21,6 +21,6 @@
    - {% trans "View results" %} + {% trans "View results" %}
    diff --git a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html index 9b84a5cfc..a58d71d45 100644 --- a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html +++ b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html @@ -35,15 +35,15 @@

    {% if view_results_action %}
    - {% trans "Vote" %} + {% trans "Vote" %}
    {% elif can_be_completed and has_been_completed and not change_vote_action %}
    + class="btn btn-sm btn-link ps-0 matomo-event" + data-matomo-category="engagement" + data-matomo-action="view" + data-matomo-option="topic"> {% trans "Change your vote" %}
    diff --git a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html index a916d810f..3b58ffce9 100644 --- a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html +++ b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html @@ -1,26 +1,26 @@ {% load i18n %}
    + action="" + hx-post="{% url 'forum_polls_extension:topic_poll_vote' poll.topic.forum.slug poll.topic.forum.pk poll.pk %}" + id="poll-form{{poll.pk}}" + hx-target="#pollarea{{poll.pk}}" + hx-swap="outerHTML" + novalidate> {% csrf_token %}
      {% for option in poll.options.all %}
    • {% if poll.max_options == 1 %} -
      - - +
      + +
      {% else %} -
      - - +
      + +
      {% endif %}
      • @@ -28,9 +28,9 @@
    + value="{% trans "Submit" %}" + data-matomo-category="engagement" + data-matomo-action="vote" + data-matomo-option="poll"/>
    diff --git a/lacommunaute/templates/forum_conversation/partials/post_certified.html b/lacommunaute/templates/forum_conversation/partials/post_certified.html index df9bfe3ac..006490271 100644 --- a/lacommunaute/templates/forum_conversation/partials/post_certified.html +++ b/lacommunaute/templates/forum_conversation/partials/post_certified.html @@ -6,7 +6,7 @@ {% if post %} -
    +
    @@ -22,13 +22,13 @@ {{ post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }} {% if post.content.rendered|length > 200 %} {% trans "+ show more" %} diff --git a/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html b/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html index eae5989ff..25d6d1eda 100644 --- a/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html +++ b/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html @@ -2,17 +2,17 @@ {% if not topic.is_certified or post.is_certified %} -
    + id="certifiedpost-button{{post.pk}}" + class="d-inline-block" + hx-target="#showmorepostsarea{{topic.pk}}" + hx-confirm="Êtes-vous sûr de vouloir {% if post.is_certified %}retirer la certification de{% else %}certifier{% endif %} cette réponse ?" + hx-swap="outerHTML">
    diff --git a/lacommunaute/templates/forum_conversation/partials/topic_filter.html b/lacommunaute/templates/forum_conversation/partials/topic_filter.html index d6635a12e..efa73e0fc 100644 --- a/lacommunaute/templates/forum_conversation/partials/topic_filter.html +++ b/lacommunaute/templates/forum_conversation/partials/topic_filter.html @@ -10,21 +10,21 @@
    Filter par : - -