From 15228732ae31834a0a699b452b5d4a0fc6b1858e Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 14 Feb 2025 10:08:26 +0100 Subject: [PATCH 01/37] Add group admin view --- lemarche/users/admin.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lemarche/users/admin.py b/lemarche/users/admin.py index 46e263059..f57d2c76d 100644 --- a/lemarche/users/admin.py +++ b/lemarche/users/admin.py @@ -3,7 +3,8 @@ from ckeditor.widgets import CKEditorWidget from django import forms from django.contrib import admin -from django.contrib.auth.admin import UserAdmin +from django.contrib.auth.admin import GroupAdmin, UserAdmin +from django.contrib.auth.models import Group from django.contrib.contenttypes.admin import GenericTabularInline from django.core.exceptions import ValidationError from django.db import models @@ -22,6 +23,11 @@ from lemarche.utils.fields import pretty_print_readonly_jsonfield +@admin.register(Group, site=admin_site) +class GroupAdmin(GroupAdmin): + pass + + class HasCompanyFilter(admin.SimpleListFilter): """Custom admin filter to target users who are linked to a Company.""" From 440e42d58a311f2fbdfc82a59935b6803de73598 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 14 Feb 2025 10:30:14 +0100 Subject: [PATCH 02/37] Add is onboarded field user field --- lemarche/users/admin.py | 2 +- .../users/migrations/0045_user_is_onboarded.py | 18 ++++++++++++++++++ lemarche/users/models.py | 1 + lemarche/www/auth/views.py | 3 ++- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 lemarche/users/migrations/0045_user_is_onboarded.py diff --git a/lemarche/users/admin.py b/lemarche/users/admin.py index f57d2c76d..a1c2f7416 100644 --- a/lemarche/users/admin.py +++ b/lemarche/users/admin.py @@ -314,7 +314,7 @@ class UserAdmin(FieldsetsInlineMixin, UserAdmin): ("API", {"fields": ("api_key", "api_key_last_updated")}), ( "Permissions", - {"classes": ["collapse"], "fields": ("is_active", "is_staff", "is_superuser", "groups")}, + {"classes": ["collapse"], "fields": ("is_onboarded", "is_active", "is_staff", "is_superuser", "groups")}, ), ( "Stats", diff --git a/lemarche/users/migrations/0045_user_is_onboarded.py b/lemarche/users/migrations/0045_user_is_onboarded.py new file mode 100644 index 000000000..800cd797e --- /dev/null +++ b/lemarche/users/migrations/0045_user_is_onboarded.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.6 on 2025-02-14 09:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("users", "0044_alter_user_api_key"), + ] + + operations = [ + migrations.AddField( + model_name="user", + name="is_onboarded", + field=models.BooleanField(default=True, verbose_name="L'utilisateur à suivi la prodédure d'onboarding"), + ), + ] diff --git a/lemarche/users/models.py b/lemarche/users/models.py index ca0888da5..8ec45428b 100644 --- a/lemarche/users/models.py +++ b/lemarche/users/models.py @@ -301,6 +301,7 @@ class User(AbstractUser): # is_active, is_staff, is_superuser is_anonymized = models.BooleanField(verbose_name="L'utilisateur à été anonymisé", default=False) + is_onboarded = models.BooleanField(verbose_name="L'utilisateur à suivi la prodédure d'onboarding", default=True) # date_joined, last_login created_at = models.DateTimeField(verbose_name="Date de création", default=timezone.now) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index aeff247e5..eef3544da 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -70,7 +70,6 @@ def get_success_url(self): class SignupView(SuccessMessageMixin, CreateView): template_name = "auth/signup.html" form_class = SignupForm - # success_url = reverse_lazy("wagtail_serve", args=("",)) # # doesn't work + see get_success_url() below success_message = "Inscription validée !" # see get_success_message() below def form_valid(self, form): @@ -80,6 +79,8 @@ def form_valid(self, form): - login the user automatically - track signup """ + # User will be considered as onboarded when an admin will manually set it as onboarded + form.instance.is_onboarded = False user = form.save() # add to Brevo list (to send welcome email + automation) add_to_contact_list(user, "signup") From fa1e01e7c17188fcdd40194b1d938ee6f28ef3bc Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 14 Feb 2025 15:44:49 +0100 Subject: [PATCH 03/37] Template view to book meeting --- lemarche/templates/auth/meeting_calendar.html | 24 +++++++++++++++++++ lemarche/www/auth/urls.py | 3 ++- lemarche/www/auth/views.py | 12 +++++----- 3 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 lemarche/templates/auth/meeting_calendar.html diff --git a/lemarche/templates/auth/meeting_calendar.html b/lemarche/templates/auth/meeting_calendar.html new file mode 100644 index 000000000..2b347f36b --- /dev/null +++ b/lemarche/templates/auth/meeting_calendar.html @@ -0,0 +1,24 @@ +{% extends BASE_TEMPLATE %} +{% load dsfr_tags process_dict static humanize wagtailcore_tags advert_cms %} +{% block page_title %} + Prise de rendez-vous +{% endblock page_title %} + +{% block breadcrumb %} + {% process_dict root_dir=HOME_PAGE_PATH current="Prise de rendez-vous" as breadcrumb_data %} + {% dsfr_breadcrumb breadcrumb_data %} +{% endblock breadcrumb %} +{% block content %} +
+
+
+
+

Prenez rendez-vous pour activer votre compte

+ + Veuillez sélectionner un créneau + +
+
+
+
+{% endblock content %} diff --git a/lemarche/www/auth/urls.py b/lemarche/www/auth/urls.py index 4aab4a685..1ae88d571 100644 --- a/lemarche/www/auth/urls.py +++ b/lemarche/www/auth/urls.py @@ -1,7 +1,7 @@ from django.contrib.auth import views as auth_views from django.urls import path, reverse_lazy -from lemarche.www.auth.views import LoginView, PasswordResetView, SignupView +from lemarche.www.auth.views import LoginView, MeetingCalendarView, PasswordResetView, SignupView # https://docs.djangoproject.com/en/dev/topics/http/urls/#url-namespaces-and-included-urlconfs @@ -11,6 +11,7 @@ path("login/", LoginView.as_view(), name="login"), path("logout/", auth_views.LogoutView.as_view(template_name="auth/logged_out.html"), name="logout"), path("signup/", SignupView.as_view(), name="signup"), + path("rendez-vous/", MeetingCalendarView.as_view(), name="booking-meeting-view"), path("password-reset/", PasswordResetView.as_view(), name="password_reset"), path( "password-reset/sent/", diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index eef3544da..6bdb4df19 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -4,7 +4,7 @@ from django.http import HttpResponseRedirect from django.urls import reverse_lazy from django.utils.safestring import mark_safe -from django.views.generic import CreateView +from django.views.generic import CreateView, TemplateView from lemarche.users.models import User from lemarche.utils.emails import add_to_contact_list @@ -99,17 +99,13 @@ def get_success_url(self): - next_url if there is a next param - or dashboard if SIAE """ - success_url = reverse_lazy("wagtail_serve", args=("",)) + success_url = reverse_lazy("auth:booking-meeting-view") next_url = self.request.GET.get("next", None) # sanitize next_url if next_url: safe_url = get_safe_url(self.request, param_name="next") if safe_url: return safe_url - elif self.request.POST.get("kind") == User.KIND_SIAE: - return reverse_lazy("dashboard:home") - elif self.request.POST.get("kind") == User.KIND_BUYER: - return reverse_lazy("siae:search_results") return success_url def get_success_message(self, cleaned_data): @@ -134,3 +130,7 @@ def get_success_url(self): success_url = super().get_success_url() user_email = self.request.POST.get("email") return f"{success_url}?email={user_email}" + + +class MeetingCalendarView(TemplateView): + template_name = "auth/meeting_calendar.html" From b9a71f2be72fba2c9fa628d7b5f4cccb01055232 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 14 Feb 2025 16:21:34 +0100 Subject: [PATCH 04/37] Fix tests --- lemarche/www/auth/tests.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lemarche/www/auth/tests.py b/lemarche/www/auth/tests.py index 59af6bcc3..06d0323b1 100644 --- a/lemarche/www/auth/tests.py +++ b/lemarche/www/auth/tests.py @@ -163,9 +163,7 @@ def test_siae_submits_signup_form_success(self): self._complete_form(user_profile=self.SIAE, with_submit=True) # should redirect SIAE to dashboard - messages = self._assert_signup_success(redirect_url=reverse("dashboard:home"), user_kind=User.KIND_SIAE) - - self.assertTrue("Vous pouvez maintenant ajouter votre structure" in messages.text) + self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view")) def test_siae_submits_signup_form_error(self): user_profile = self.SIAE @@ -198,7 +196,7 @@ def test_buyer_submits_signup_form_success(self): scroll_to_and_click_element(self.driver, submit_element) # should redirect BUYER to search - self._assert_signup_success(redirect_url=reverse("siae:search_results"), user_kind=User.KIND_BUYER) + self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view")) def test_buyer_submits_signup_form_success_extra_data(self): self._complete_form(user_profile=self.BUYER, with_submit=False) @@ -243,7 +241,7 @@ def test_partner_submits_signup_form_success(self): submit_element = self.driver.find_element(By.CSS_SELECTOR, "form button[type='submit']") scroll_to_and_click_element(self.driver, submit_element) - self._assert_signup_success(redirect_url=reverse("wagtail_serve", args=("",))) + self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view")) def test_partner_submits_signup_form_error(self): user_profile = self.PARTNER From 3d601f4542959dcec6b7f69216980dd00192f7a7 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 14 Feb 2025 16:26:22 +0100 Subject: [PATCH 05/37] Remove useless file --- lemarche/templates/layouts/_header_dsfr.html | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lemarche/templates/layouts/_header_dsfr.html diff --git a/lemarche/templates/layouts/_header_dsfr.html b/lemarche/templates/layouts/_header_dsfr.html deleted file mode 100644 index 4d0bcb2e9..000000000 --- a/lemarche/templates/layouts/_header_dsfr.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "dsfr/header.html" %} From 1f9a6b41d351b55d3d6da460eaadb80fa1cb5aa5 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 14 Feb 2025 16:29:46 +0100 Subject: [PATCH 06/37] Prevent access to dashboard --- .../layouts/_header_nav_primary_items.html | 23 ++++++++++++++++++- lemarche/www/dashboard/views.py | 8 ++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lemarche/templates/layouts/_header_nav_primary_items.html b/lemarche/templates/layouts/_header_nav_primary_items.html index 98d0e9188..4fe0fd7f4 100644 --- a/lemarche/templates/layouts/_header_nav_primary_items.html +++ b/lemarche/templates/layouts/_header_nav_primary_items.html @@ -13,7 +13,28 @@ {% endif %} + {% if user.is_onboarded %}
  • + + Tableau de bord + +
    • + {% endif %} +
  • + + Favoris {{ user.favorite_list_count }} + +
    • +
  • + + Mon profil + +
    • +
  • +
    + {% csrf_token %} + +
    {% include "includes/_dropdown_menu.html" %}
    • {% else %} @@ -46,4 +67,4 @@ {% endif %} {% endif %} - \ No newline at end of file + diff --git a/lemarche/www/dashboard/views.py b/lemarche/www/dashboard/views.py index e47451646..daafbc41d 100644 --- a/lemarche/www/dashboard/views.py +++ b/lemarche/www/dashboard/views.py @@ -1,4 +1,4 @@ -from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin from django.contrib.messages.views import SuccessMessageMixin from django.urls import reverse_lazy from django.utils import timezone @@ -16,10 +16,12 @@ SLUG_RESSOURCES_CAT_BUYERS = "acheteurs" -class DashboardHomeView(LoginRequiredMixin, DetailView): - # template_name = "dashboard/home.html" +class DashboardHomeView(UserPassesTestMixin, LoginRequiredMixin, DetailView): context_object_name = "user" + def test_func(self): + return self.request.user.is_onboarded + def get_object(self): return self.request.user From 13af0438d5f7889cae3cc65ddc68b48181b35e53 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 14 Feb 2025 16:33:50 +0100 Subject: [PATCH 07/37] Prevent access to favorites --- lemarche/templates/layouts/_header_nav_primary_items.html | 2 +- lemarche/www/dashboard_favorites/views.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lemarche/templates/layouts/_header_nav_primary_items.html b/lemarche/templates/layouts/_header_nav_primary_items.html index 4fe0fd7f4..b001da749 100644 --- a/lemarche/templates/layouts/_header_nav_primary_items.html +++ b/lemarche/templates/layouts/_header_nav_primary_items.html @@ -19,12 +19,12 @@ Tableau de bord - {% endif %}
  • Favoris {{ user.favorite_list_count }}
    • + {% endif %}
  • Mon profil diff --git a/lemarche/www/dashboard_favorites/views.py b/lemarche/www/dashboard_favorites/views.py index 294571be8..b6d868fc5 100644 --- a/lemarche/www/dashboard_favorites/views.py +++ b/lemarche/www/dashboard_favorites/views.py @@ -1,6 +1,6 @@ from django.conf import settings from django.contrib import messages -from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin from django.contrib.messages.views import SuccessMessageMixin from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 @@ -16,12 +16,14 @@ from lemarche.www.dashboard_favorites.forms import FavoriteListEditForm -class DashboardFavoriteListView(LoginRequiredMixin, ListView): - # form_class = FavoriteListEditForm +class DashboardFavoriteListView(UserPassesTestMixin, LoginRequiredMixin, ListView): template_name = "favorites/dashboard_favorite_list.html" queryset = FavoriteList.objects.all() context_object_name = "favorite_lists" + def test_func(self): + return self.request.user.is_onboarded + def get_queryset(self): qs = super().get_queryset() qs = qs.by_user(user=self.request.user) From 755458d5d106df19368b18ffc930f4fcf801fb24 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 14 Feb 2025 17:26:58 +0100 Subject: [PATCH 08/37] User is onboard if it creates a Tender --- lemarche/www/tenders/views.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py index c0d1f5898..8ebdf414c 100644 --- a/lemarche/www/tenders/views.py +++ b/lemarche/www/tenders/views.py @@ -228,6 +228,9 @@ def done(self, _, form_dict, **kwargs): user = get_or_create_user( self.request.user, tender_dict=cleaned_data, source=user_constants.SOURCE_TENDER_FORM ) + # User is considered as onboarded if it completes a Tender creation + user.is_onboarded = True + user.save(update_fields=["is_onboarded"]) # when it's done we save the tender tender_dict = cleaned_data | {"author": user, "source": tender_constants.SOURCE_FORM} is_draft: bool = self.request.POST.get("is_draft", False) From cc54d1fafe24204b0d4bd11015414e18c3affcc2 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Mon, 17 Feb 2025 16:05:42 +0100 Subject: [PATCH 09/37] Try google agenda --- lemarche/templates/auth/meeting_calendar.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lemarche/templates/auth/meeting_calendar.html b/lemarche/templates/auth/meeting_calendar.html index 2b347f36b..179e8f9c4 100644 --- a/lemarche/templates/auth/meeting_calendar.html +++ b/lemarche/templates/auth/meeting_calendar.html @@ -15,8 +15,11 @@

    Prenez rendez-vous pour activer votre compte

    - Veuillez sélectionner un créneau + Veuillez sélectionner un créneau : + + +
    From d565e4a87a04828f3a28ae270e26ad5248e59142 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Mon, 17 Feb 2025 16:32:34 +0100 Subject: [PATCH 10/37] Fix anonymous user case --- lemarche/www/dashboard/views.py | 3 ++- lemarche/www/dashboard_favorites/views.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lemarche/www/dashboard/views.py b/lemarche/www/dashboard/views.py index daafbc41d..136dfc682 100644 --- a/lemarche/www/dashboard/views.py +++ b/lemarche/www/dashboard/views.py @@ -20,7 +20,8 @@ class DashboardHomeView(UserPassesTestMixin, LoginRequiredMixin, DetailView): context_object_name = "user" def test_func(self): - return self.request.user.is_onboarded + if self.request.user.is_authenticated: + return self.request.user.is_onboarded def get_object(self): return self.request.user diff --git a/lemarche/www/dashboard_favorites/views.py b/lemarche/www/dashboard_favorites/views.py index b6d868fc5..b910314e4 100644 --- a/lemarche/www/dashboard_favorites/views.py +++ b/lemarche/www/dashboard_favorites/views.py @@ -22,7 +22,8 @@ class DashboardFavoriteListView(UserPassesTestMixin, LoginRequiredMixin, ListVie context_object_name = "favorite_lists" def test_func(self): - return self.request.user.is_onboarded + if self.request.user.is_authenticated: + return self.request.user.is_onboarded def get_queryset(self): qs = super().get_queryset() From 1da6b28e9bcbf2ffc3a17a711b27accdeba65801 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Tue, 18 Feb 2025 10:47:14 +0100 Subject: [PATCH 11/37] Add wagtail paragraph --- lemarche/cms/migrations/0015_paragraph.py | 38 +++++++++++++++++++ lemarche/cms/snippets.py | 30 +++++++++++++++ lemarche/templates/auth/meeting_calendar.html | 3 ++ lemarche/www/auth/views.py | 6 +++ 4 files changed, 77 insertions(+) create mode 100644 lemarche/cms/migrations/0015_paragraph.py diff --git a/lemarche/cms/migrations/0015_paragraph.py b/lemarche/cms/migrations/0015_paragraph.py new file mode 100644 index 000000000..28813b30c --- /dev/null +++ b/lemarche/cms/migrations/0015_paragraph.py @@ -0,0 +1,38 @@ +# Generated by Django 5.1.6 on 2025-02-18 09:33 + +import wagtail.fields +from django.db import migrations, models + + +def paragraph_migration(apps, schema_editor): + Paragraph = apps.get_model("cms", "Paragraph") + Paragraph.objects.create( + title="Prise de rendez vous", slug="rdv-signup", content="Prenez un rendez vous s'il vous plaît" + ) + + +class Migration(migrations.Migration): + + dependencies = [ + ("cms", "0014_homepage_sub_header_custom_message"), + ] + + operations = [ + migrations.CreateModel( + name="Paragraph", + fields=[ + ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("title", models.CharField(max_length=255, verbose_name="Titre de l'encart")), + ( + "slug", + models.SlugField(unique=True, help_text="Identifiant", max_length=255, verbose_name="slug"), + ), + ("content", wagtail.fields.RichTextField(blank=True, verbose_name="Contenu")), + ], + options={ + "verbose_name": "Paragraphe", + "verbose_name_plural": "Paragraphes", + }, + ), + migrations.RunPython(paragraph_migration, migrations.RunPython.noop), + ] diff --git a/lemarche/cms/snippets.py b/lemarche/cms/snippets.py index bf8ebf8a1..2db3042b8 100644 --- a/lemarche/cms/snippets.py +++ b/lemarche/cms/snippets.py @@ -1,5 +1,6 @@ from django.db import models from wagtail.admin.panels import FieldPanel +from wagtail.fields import RichTextField from wagtail.snippets.models import register_snippet @@ -88,3 +89,32 @@ class Meta: def __str__(self): return self.title + + +@register_snippet +class Paragraph(models.Model): + title = models.CharField(max_length=255, verbose_name="Titre de l'encart") + slug = models.SlugField( + verbose_name="slug", + unique=True, + max_length=255, + help_text="Identifiant", + ) + + content = RichTextField( + blank=True, + verbose_name="Contenu", + ) + + panels = [ + FieldPanel("title"), + FieldPanel("slug"), + FieldPanel("content"), + ] + + class Meta: + verbose_name = "Paragraphe" + verbose_name_plural = "Paragraphes" + + def __str__(self): + return self.title diff --git a/lemarche/templates/auth/meeting_calendar.html b/lemarche/templates/auth/meeting_calendar.html index 179e8f9c4..42ae99086 100644 --- a/lemarche/templates/auth/meeting_calendar.html +++ b/lemarche/templates/auth/meeting_calendar.html @@ -22,6 +22,9 @@

    Prenez rendez-vous pour activer votre compte

    +
    + {{ wagtail_paragraph.content |safe }} +
    {% endblock content %} diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index 6bdb4df19..4bc218e40 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -6,6 +6,7 @@ from django.utils.safestring import mark_safe from django.views.generic import CreateView, TemplateView +from lemarche.cms.snippets import Paragraph from lemarche.users.models import User from lemarche.utils.emails import add_to_contact_list from lemarche.utils.urls import get_safe_url @@ -134,3 +135,8 @@ def get_success_url(self): class MeetingCalendarView(TemplateView): template_name = "auth/meeting_calendar.html" + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + ctx["wagtail_paragraph"] = Paragraph.objects.get(slug="rdv-signup") + return ctx From d78b3580e49234233ecbcb70c7ee587c34087f15 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Tue, 18 Feb 2025 11:07:17 +0100 Subject: [PATCH 12/37] Add wagtail paragraph --- lemarche/templates/auth/meeting_calendar.html | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lemarche/templates/auth/meeting_calendar.html b/lemarche/templates/auth/meeting_calendar.html index 42ae99086..b6b4c6d1f 100644 --- a/lemarche/templates/auth/meeting_calendar.html +++ b/lemarche/templates/auth/meeting_calendar.html @@ -9,22 +9,17 @@ {% dsfr_breadcrumb breadcrumb_data %} {% endblock breadcrumb %} {% block content %} -
    -
    +
    + {{ wagtail_paragraph.content |safe }} +
    +

    Prenez rendez-vous pour activer votre compte

    - - Veuillez sélectionner un créneau : - - +
    -
    - {{ wagtail_paragraph.content |safe }} -
    -
    {% endblock content %} From 9a3e0306f5fbbb04ae5f98bc675b55745ff3a571 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Tue, 18 Feb 2025 11:17:20 +0100 Subject: [PATCH 13/37] Iframe as varenv --- config/settings/base.py | 2 +- lemarche/templates/auth/meeting_calendar.html | 2 +- lemarche/www/auth/views.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/settings/base.py b/config/settings/base.py index 72ac80a60..cadf85afe 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -787,7 +787,7 @@ TALLY_BUYER_NPS_FORM_ID = env.str("TALLY_BUYER_NPS_FORM_ID", "") TALLY_SIAE_NPS_FORM_ID = env.str("TALLY_SIAE_NPS_FORM_ID", "") PARTNER_APPROCH_USER_ID = env.int("PARTNER_APPROCH_USER_ID", 0) - +GOOGLE_AGENDA_IFRAME_URL = env.str("GOOGLE_AGENDA_IFRAME_URL", "") # Misc # ------------------------------------------------------------------------------ diff --git a/lemarche/templates/auth/meeting_calendar.html b/lemarche/templates/auth/meeting_calendar.html index b6b4c6d1f..5e9673647 100644 --- a/lemarche/templates/auth/meeting_calendar.html +++ b/lemarche/templates/auth/meeting_calendar.html @@ -17,7 +17,7 @@

    Prenez rendez-vous pour activer votre compte

    - +
    diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index 4bc218e40..278bb7927 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.contrib import messages from django.contrib.auth import authenticate, login, views as auth_views from django.contrib.messages.views import SuccessMessageMixin @@ -139,4 +140,5 @@ class MeetingCalendarView(TemplateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) ctx["wagtail_paragraph"] = Paragraph.objects.get(slug="rdv-signup") + ctx["agenda_iframe_url"] = settings.GOOGLE_AGENDA_IFRAME_URL return ctx From 24caf1912d8e04082f01651c0e8de9bc30dfc7a7 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Tue, 18 Feb 2025 14:47:41 +0100 Subject: [PATCH 14/37] test tests --- lemarche/www/auth/tests.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lemarche/www/auth/tests.py b/lemarche/www/auth/tests.py index 06d0323b1..c842969e2 100644 --- a/lemarche/www/auth/tests.py +++ b/lemarche/www/auth/tests.py @@ -5,6 +5,7 @@ from selenium.webdriver.firefox.options import Options from selenium.webdriver.support.select import Select +from lemarche.cms.snippets import Paragraph from lemarche.users.factories import DEFAULT_PASSWORD, UserFactory from lemarche.users.models import User @@ -43,6 +44,11 @@ def setUpClass(cls): def setUp(self): EXAMPLE_PASSWORD = "c*[gkp`0=" + # Static server tests cases erases data from migrations + Paragraph.objects.get_or_create( + slug="rdv-signup", + defaults={"title": "Prise de rendez vous"}, + ) self.SIAE = { "id_kind": 0, # required From 7f6fe330ea9c6d9bd175498b86489297408ef390 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 11:02:44 +0100 Subject: [PATCH 15/37] rebase changes --- .../templates/includes/_dropdown_menu.html | 10 ++++++---- .../layouts/_header_nav_primary_items.html | 20 ------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/lemarche/templates/includes/_dropdown_menu.html b/lemarche/templates/includes/_dropdown_menu.html index 01eaad76a..44bf34e6f 100644 --- a/lemarche/templates/includes/_dropdown_menu.html +++ b/lemarche/templates/includes/_dropdown_menu.html @@ -2,19 +2,21 @@
      + {% if user.is_onboarded %}
    • Tableau de bord
    • - - Mon profil + + Favoris {{ user.favorite_list_count }}
      • + {% endif %}
    • - - Favoris {{ user.favorite_list_count }} + + Mon profil
      • {% if user.kind == user.KIND_SIAE or user.kind == user.KIND_BUYER %} diff --git a/lemarche/templates/layouts/_header_nav_primary_items.html b/lemarche/templates/layouts/_header_nav_primary_items.html index b001da749..02b3637a0 100644 --- a/lemarche/templates/layouts/_header_nav_primary_items.html +++ b/lemarche/templates/layouts/_header_nav_primary_items.html @@ -15,26 +15,6 @@ {% endif %} {% if user.is_onboarded %}
    • - - Tableau de bord - -
      • -
    • - - Favoris {{ user.favorite_list_count }} - -
      • - {% endif %} -
    • - - Mon profil - -
      • -
    • -
      - {% csrf_token %} - -
      {% include "includes/_dropdown_menu.html" %}
      • {% else %} From 4e3fc3be979442f3eacf5b535b854d16434e71b4 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 11:05:24 +0100 Subject: [PATCH 16/37] rebase changes --- lemarche/templates/layouts/_header_nav_primary_items.html | 1 - 1 file changed, 1 deletion(-) diff --git a/lemarche/templates/layouts/_header_nav_primary_items.html b/lemarche/templates/layouts/_header_nav_primary_items.html index 02b3637a0..e7d35283c 100644 --- a/lemarche/templates/layouts/_header_nav_primary_items.html +++ b/lemarche/templates/layouts/_header_nav_primary_items.html @@ -13,7 +13,6 @@ {% endif %} - {% if user.is_onboarded %}
    • {% include "includes/_dropdown_menu.html" %}
      • From f8864a96c9154518c221ddc6cce988a8e0c51eaa Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 11:36:47 +0100 Subject: [PATCH 17/37] GOOGLE_AGENDA_IFRAME_URL as default var --- env.default.sh | 1 + env.docker_default.local | 1 + 2 files changed, 2 insertions(+) diff --git a/env.default.sh b/env.default.sh index 4d6c1cf1b..c1ba53846 100644 --- a/env.default.sh +++ b/env.default.sh @@ -13,6 +13,7 @@ export POSTGRESQL_ADDON_DB="" export SECRET_KEY="coucou" export DJANGO_SETTINGS_MODULE="config.settings.dev" export TRACKER_HOST="https://example.com" +export GOOGLE_AGENDA_IFRAME_URL = "" # APIs export API_EMPLOIS_INCLUSION_TOKEN="" diff --git a/env.docker_default.local b/env.docker_default.local index ab432d80f..a4377d879 100755 --- a/env.docker_default.local +++ b/env.docker_default.local @@ -29,6 +29,7 @@ ENV=dev DEBUG=True SECRET_KEY=[YOUR_SECRET] TRACKER_HOST=localhost +GOOGLE_AGENDA_IFRAME_URL="" # MTCAPTCHA MTCAPTCHA_PRIVATE_KEY= From edfc2f1a722182629d192c143efed98ee71f3845 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 11:39:09 +0100 Subject: [PATCH 18/37] typo fix --- lemarche/users/migrations/0045_user_is_onboarded.py | 2 +- lemarche/users/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lemarche/users/migrations/0045_user_is_onboarded.py b/lemarche/users/migrations/0045_user_is_onboarded.py index 800cd797e..3ada51165 100644 --- a/lemarche/users/migrations/0045_user_is_onboarded.py +++ b/lemarche/users/migrations/0045_user_is_onboarded.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name="user", name="is_onboarded", - field=models.BooleanField(default=True, verbose_name="L'utilisateur à suivi la prodédure d'onboarding"), + field=models.BooleanField(default=True, verbose_name="L'utilisateur a suivi la procédure d'onboarding"), ), ] diff --git a/lemarche/users/models.py b/lemarche/users/models.py index 8ec45428b..b1aa0d91d 100644 --- a/lemarche/users/models.py +++ b/lemarche/users/models.py @@ -301,7 +301,7 @@ class User(AbstractUser): # is_active, is_staff, is_superuser is_anonymized = models.BooleanField(verbose_name="L'utilisateur à été anonymisé", default=False) - is_onboarded = models.BooleanField(verbose_name="L'utilisateur à suivi la prodédure d'onboarding", default=True) + is_onboarded = models.BooleanField(verbose_name="L'utilisateur a suivi la procédure d'onboarding", default=True) # date_joined, last_login created_at = models.DateTimeField(verbose_name="Date de création", default=timezone.now) From 9dbeb682b7744ac4bdcf2d2eea37cee511a927e1 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 11:39:36 +0100 Subject: [PATCH 19/37] fix tests --- lemarche/www/auth/tests.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lemarche/www/auth/tests.py b/lemarche/www/auth/tests.py index c842969e2..f6f83aab3 100644 --- a/lemarche/www/auth/tests.py +++ b/lemarche/www/auth/tests.py @@ -131,7 +131,7 @@ def _complete_form(self, user_profile: dict, signup_url=reverse("auth:signup"), scroll_to_and_click_element(self.driver, submit_element) def _assert_signup_success(self, redirect_url: str, user_kind=None) -> list: - """Assert the success signup and returns the sucess messages + """Assert the success signup and returns the success messages Args: redirect_url (str): redirect url after signup @@ -148,9 +148,6 @@ def _assert_signup_success(self, redirect_url: str, user_kind=None) -> list: menu_button = self.driver.find_element(By.ID, "my-account") menu_button.click() - dashboard_link = self.driver.find_element(By.LINK_TEXT, "Tableau de bord") - self.assertIsNotNone(dashboard_link) - notifications_link = self.driver.find_elements(By.LINK_TEXT, "Notifications") if user_kind in [User.KIND_SIAE, User.KIND_BUYER]: self.assertTrue(len(notifications_link) > 0) @@ -169,7 +166,7 @@ def test_siae_submits_signup_form_success(self): self._complete_form(user_profile=self.SIAE, with_submit=True) # should redirect SIAE to dashboard - self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view")) + self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view"), user_kind=User.KIND_SIAE) def test_siae_submits_signup_form_error(self): user_profile = self.SIAE @@ -202,7 +199,7 @@ def test_buyer_submits_signup_form_success(self): scroll_to_and_click_element(self.driver, submit_element) # should redirect BUYER to search - self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view")) + self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view"), user_kind=User.KIND_BUYER) def test_buyer_submits_signup_form_success_extra_data(self): self._complete_form(user_profile=self.BUYER, with_submit=False) From cfe8d73fbe460fe99d81461d9ec0fc255db87895 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 11:44:14 +0100 Subject: [PATCH 20/37] Hide tender create for non onboarded users --- .../templates/layouts/_header_nav_primary_items.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lemarche/templates/layouts/_header_nav_primary_items.html b/lemarche/templates/layouts/_header_nav_primary_items.html index e7d35283c..5dc58747a 100644 --- a/lemarche/templates/layouts/_header_nav_primary_items.html +++ b/lemarche/templates/layouts/_header_nav_primary_items.html @@ -6,12 +6,12 @@ Demandes reçues{% if tender_siae_unread_count %} {{ tender_siae_unread_count }}{% endif %} - {% else %} -
    • - - Publier un besoin d'achat - -
      • + {% elif user.is_onboarded %} +
    • + + Publier un besoin d'achat + +
      • {% endif %}
    • {% include "includes/_dropdown_menu.html" %} From e35747f9ef0857dcd2f6e2965e4b9a8729d125b9 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 12:04:40 +0100 Subject: [PATCH 21/37] Redirect to book meeting on access denied --- lemarche/www/dashboard/views.py | 6 +++++- lemarche/www/dashboard_favorites/views.py | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lemarche/www/dashboard/views.py b/lemarche/www/dashboard/views.py index 136dfc682..258847680 100644 --- a/lemarche/www/dashboard/views.py +++ b/lemarche/www/dashboard/views.py @@ -1,6 +1,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin from django.contrib.messages.views import SuccessMessageMixin -from django.urls import reverse_lazy +from django.shortcuts import redirect +from django.urls import reverse, reverse_lazy from django.utils import timezone from django.views.generic import DetailView, FormView, UpdateView @@ -23,6 +24,9 @@ def test_func(self): if self.request.user.is_authenticated: return self.request.user.is_onboarded + def handle_no_permission(self): + return redirect(reverse("auth:booking-meeting-view")) + def get_object(self): return self.request.user diff --git a/lemarche/www/dashboard_favorites/views.py b/lemarche/www/dashboard_favorites/views.py index b910314e4..703780ec5 100644 --- a/lemarche/www/dashboard_favorites/views.py +++ b/lemarche/www/dashboard_favorites/views.py @@ -3,8 +3,8 @@ from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin from django.contrib.messages.views import SuccessMessageMixin from django.http import HttpResponseRedirect -from django.shortcuts import get_object_or_404 -from django.urls import reverse_lazy +from django.shortcuts import get_object_or_404, redirect +from django.urls import reverse, reverse_lazy from django.utils.safestring import mark_safe from django.views.generic import DeleteView, DetailView, ListView, UpdateView from django.views.generic.edit import CreateView @@ -25,6 +25,9 @@ def test_func(self): if self.request.user.is_authenticated: return self.request.user.is_onboarded + def handle_no_permission(self): + return redirect(reverse("auth:booking-meeting-view")) + def get_queryset(self): qs = super().get_queryset() qs = qs.by_user(user=self.request.user) From f4f88fabf729857e8cb1a38ecce54fcb4464348f Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 15:07:51 +0100 Subject: [PATCH 22/37] Redirect to book meeting on access denied --- lemarche/www/dashboard/views.py | 7 ++++++- lemarche/www/dashboard_favorites/views.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lemarche/www/dashboard/views.py b/lemarche/www/dashboard/views.py index 258847680..0fe2bcb97 100644 --- a/lemarche/www/dashboard/views.py +++ b/lemarche/www/dashboard/views.py @@ -23,9 +23,14 @@ class DashboardHomeView(UserPassesTestMixin, LoginRequiredMixin, DetailView): def test_func(self): if self.request.user.is_authenticated: return self.request.user.is_onboarded + else: + return True def handle_no_permission(self): - return redirect(reverse("auth:booking-meeting-view")) + if not self.test_func(): + return redirect(reverse("auth:booking-meeting-view")) + else: + return super().handle_no_permission() def get_object(self): return self.request.user diff --git a/lemarche/www/dashboard_favorites/views.py b/lemarche/www/dashboard_favorites/views.py index 703780ec5..dfcb61483 100644 --- a/lemarche/www/dashboard_favorites/views.py +++ b/lemarche/www/dashboard_favorites/views.py @@ -24,9 +24,14 @@ class DashboardFavoriteListView(UserPassesTestMixin, LoginRequiredMixin, ListVie def test_func(self): if self.request.user.is_authenticated: return self.request.user.is_onboarded + else: + return True def handle_no_permission(self): - return redirect(reverse("auth:booking-meeting-view")) + if not self.test_func(): + return redirect(reverse("auth:booking-meeting-view")) + else: + return super().handle_no_permission() def get_queryset(self): qs = super().get_queryset() From 75099352e1ef33805e945619c0529ff1c671dd52 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 15:23:05 +0100 Subject: [PATCH 23/37] Disable AGENDA feature based on google agenda url presence --- lemarche/www/auth/views.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index 278bb7927..b3e309ae1 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -82,7 +82,8 @@ def form_valid(self, form): - track signup """ # User will be considered as onboarded when an admin will manually set it as onboarded - form.instance.is_onboarded = False + # If no google agenda url, the functionality is disabled + form.instance.is_onboarded = False if settings.GOOGLE_AGENDA_IFRAME_URL else True user = form.save() # add to Brevo list (to send welcome email + automation) add_to_contact_list(user, "signup") @@ -101,7 +102,10 @@ def get_success_url(self): - next_url if there is a next param - or dashboard if SIAE """ - success_url = reverse_lazy("auth:booking-meeting-view") + if settings.GOOGLE_AGENDA_IFRAME_URL: + success_url = reverse_lazy("auth:booking-meeting-view") + else: + success_url = reverse_lazy("wagtail_serve", args=("",)) next_url = self.request.GET.get("next", None) # sanitize next_url if next_url: From 632d4f02a625d66994f8cb5e72ff64dccf833110 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 15:31:34 +0100 Subject: [PATCH 24/37] custom message with agenda signup --- lemarche/www/auth/views.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index b3e309ae1..ababe31c1 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -118,10 +118,14 @@ def get_success_message(self, cleaned_data): """Show detailed welcome message to SIAE.""" success_message = super().get_success_message(cleaned_data) if cleaned_data["kind"] == User.KIND_SIAE: - success_message += mark_safe( - "
      Vous pouvez maintenant ajouter votre structure en cliquant sur " - f"Ajouter une structure." - ) + if settings.GOOGLE_AGENDA_IFRAME_URL: + success_message += mark_safe( + "
      Vous pouvez maintenant ajouter votre structure en cliquant sur " + f"Ajouter une structure." + ) + else: + success_message += "Après votre rendez-vous, un administrateur finalisera la création de votre compte" + return success_message From 603d2fc88ef090aaf2856d704d7a5ad14b012071 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 15:44:45 +0100 Subject: [PATCH 25/37] custom message with agenda signup --- lemarche/www/auth/tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lemarche/www/auth/tests.py b/lemarche/www/auth/tests.py index f6f83aab3..c73f1cd80 100644 --- a/lemarche/www/auth/tests.py +++ b/lemarche/www/auth/tests.py @@ -1,4 +1,5 @@ from django.contrib.staticfiles.testing import StaticLiveServerTestCase +from django.test import override_settings from django.urls import reverse from selenium import webdriver from selenium.webdriver.common.by import By @@ -32,6 +33,7 @@ def element_select_option(driver, element, option=""): field_select.select_by_visible_text(option) +@override_settings(GOOGLE_AGENDA_IFRAME_URL="some_google_url") class SignupFormTest(StaticLiveServerTestCase): @classmethod def setUpClass(cls): From a23a6d2224a7c6584f00e1f44d871904762fb0d8 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 16:24:33 +0100 Subject: [PATCH 26/37] login required --- lemarche/www/auth/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index ababe31c1..45235b9b4 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -1,6 +1,7 @@ from django.conf import settings from django.contrib import messages from django.contrib.auth import authenticate, login, views as auth_views +from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.messages.views import SuccessMessageMixin from django.http import HttpResponseRedirect from django.urls import reverse_lazy @@ -142,7 +143,7 @@ def get_success_url(self): return f"{success_url}?email={user_email}" -class MeetingCalendarView(TemplateView): +class MeetingCalendarView(LoginRequiredMixin, TemplateView): template_name = "auth/meeting_calendar.html" def get_context_data(self, **kwargs): From 0334416bd929031a28e35cb9710c48dc59f260f7 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 16:38:01 +0100 Subject: [PATCH 27/37] Design stuff --- lemarche/static/itou_marche/itou_marche.scss | 11 +++++++++++ lemarche/templates/auth/meeting_calendar.html | 12 ++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lemarche/static/itou_marche/itou_marche.scss b/lemarche/static/itou_marche/itou_marche.scss index 34a08c1f6..69a3819fa 100644 --- a/lemarche/static/itou_marche/itou_marche.scss +++ b/lemarche/static/itou_marche/itou_marche.scss @@ -231,3 +231,14 @@ p.fr-tag--green-emeraude { background-color: var(--background-action-low-green-emeraude); color: var(--text-action-high-green-emeraude) } + +.fr-background-alt--orange { + background-color: #fc5455; +} + +.rounded-iframe { + width: 100%; + height: 650px; + border: none; + border-radius: 15px; +} diff --git a/lemarche/templates/auth/meeting_calendar.html b/lemarche/templates/auth/meeting_calendar.html index 5e9673647..f90123c65 100644 --- a/lemarche/templates/auth/meeting_calendar.html +++ b/lemarche/templates/auth/meeting_calendar.html @@ -9,15 +9,19 @@ {% dsfr_breadcrumb breadcrumb_data %} {% endblock breadcrumb %} {% block content %} -
      +
      -
      +
      {{ wagtail_paragraph.content |safe }}
      -
      +

      Prenez rendez-vous pour activer votre compte

      - +
      From e7a4ee83695cf28fc63cbbbc48dd42ff5e83b381 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 16:44:05 +0100 Subject: [PATCH 28/37] Only buyer kind user is concerned by the meeting agenda --- lemarche/www/auth/views.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index 45235b9b4..e110ad908 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -84,7 +84,8 @@ def form_valid(self, form): """ # User will be considered as onboarded when an admin will manually set it as onboarded # If no google agenda url, the functionality is disabled - form.instance.is_onboarded = False if settings.GOOGLE_AGENDA_IFRAME_URL else True + if form.instance.king == User.KIND_BUYER and settings.GOOGLE_AGENDA_IFRAME_URL: + form.instance.is_onboarded = False user = form.save() # add to Brevo list (to send welcome email + automation) add_to_contact_list(user, "signup") @@ -103,7 +104,7 @@ def get_success_url(self): - next_url if there is a next param - or dashboard if SIAE """ - if settings.GOOGLE_AGENDA_IFRAME_URL: + if settings.GOOGLE_AGENDA_IFRAME_URL and self.request.user.kind == User.KIND_BUYER: success_url = reverse_lazy("auth:booking-meeting-view") else: success_url = reverse_lazy("wagtail_serve", args=("",)) @@ -119,13 +120,13 @@ def get_success_message(self, cleaned_data): """Show detailed welcome message to SIAE.""" success_message = super().get_success_message(cleaned_data) if cleaned_data["kind"] == User.KIND_SIAE: - if settings.GOOGLE_AGENDA_IFRAME_URL: - success_message += mark_safe( - "
      Vous pouvez maintenant ajouter votre structure en cliquant sur " - f"Ajouter une structure." - ) - else: - success_message += "Après votre rendez-vous, un administrateur finalisera la création de votre compte" + success_message += mark_safe( + "
      Vous pouvez maintenant ajouter votre structure en cliquant sur " + f"Ajouter une structure." + ) + + if cleaned_data["kind"] == User.KIND_BUYER and settings.GOOGLE_AGENDA_IFRAME_URL: + success_message += "Après votre rendez-vous, un administrateur finalisera la création de votre compte" return success_message From 32e4236508f9b6813a88ab1ee9d9c9964c3c55a3 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 17:06:27 +0100 Subject: [PATCH 29/37] fix typo --- lemarche/www/auth/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index e110ad908..f9672eec1 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -84,7 +84,7 @@ def form_valid(self, form): """ # User will be considered as onboarded when an admin will manually set it as onboarded # If no google agenda url, the functionality is disabled - if form.instance.king == User.KIND_BUYER and settings.GOOGLE_AGENDA_IFRAME_URL: + if form.instance.kind == User.KIND_BUYER and settings.GOOGLE_AGENDA_IFRAME_URL: form.instance.is_onboarded = False user = form.save() # add to Brevo list (to send welcome email + automation) From 8a9df305570ebaddd63490e4b7dcdbd4d47906af Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 17:10:37 +0100 Subject: [PATCH 30/37] fix tests --- lemarche/www/auth/tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lemarche/www/auth/tests.py b/lemarche/www/auth/tests.py index c73f1cd80..8ff15b4e4 100644 --- a/lemarche/www/auth/tests.py +++ b/lemarche/www/auth/tests.py @@ -168,7 +168,9 @@ def test_siae_submits_signup_form_success(self): self._complete_form(user_profile=self.SIAE, with_submit=True) # should redirect SIAE to dashboard - self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view"), user_kind=User.KIND_SIAE) + messages = self._assert_signup_success(redirect_url=reverse("dashboard:home"), user_kind=User.KIND_SIAE) + + self.assertTrue("Vous pouvez maintenant ajouter votre structure" in messages.text) def test_siae_submits_signup_form_error(self): user_profile = self.SIAE @@ -246,7 +248,7 @@ def test_partner_submits_signup_form_success(self): submit_element = self.driver.find_element(By.CSS_SELECTOR, "form button[type='submit']") scroll_to_and_click_element(self.driver, submit_element) - self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view")) + self._assert_signup_success(redirect_url=reverse("wagtail_serve", args=("",))) def test_partner_submits_signup_form_error(self): user_profile = self.PARTNER From 909d957a89e2c88fe7d57a94d19857f782ed6a15 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Thu, 27 Feb 2025 19:08:27 +0100 Subject: [PATCH 31/37] fix tests --- lemarche/www/auth/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index f9672eec1..b1588d322 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -114,6 +114,8 @@ def get_success_url(self): safe_url = get_safe_url(self.request, param_name="next") if safe_url: return safe_url + elif self.request.POST.get("kind") == User.KIND_SIAE: + return reverse_lazy("dashboard:home") return success_url def get_success_message(self, cleaned_data): From 4b245eb12f6a69ed7f592e45b79fafd42b285c84 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Fri, 28 Feb 2025 09:13:24 +0100 Subject: [PATCH 32/37] fix tests --- lemarche/www/auth/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index b1588d322..daf715226 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -114,8 +114,8 @@ def get_success_url(self): safe_url = get_safe_url(self.request, param_name="next") if safe_url: return safe_url - elif self.request.POST.get("kind") == User.KIND_SIAE: - return reverse_lazy("dashboard:home") + elif self.request.POST.get("kind") == User.KIND_SIAE: + return reverse_lazy("dashboard:home") return success_url def get_success_message(self, cleaned_data): From fddba54fb857a4deeb995dfa6f129ead7f4e7393 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Mon, 3 Mar 2025 17:45:40 +0100 Subject: [PATCH 33/37] Jump line for message --- lemarche/www/auth/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index daf715226..41fe70990 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -128,7 +128,7 @@ def get_success_message(self, cleaned_data): ) if cleaned_data["kind"] == User.KIND_BUYER and settings.GOOGLE_AGENDA_IFRAME_URL: - success_message += "Après votre rendez-vous, un administrateur finalisera la création de votre compte" + success_message += "
      Après votre rendez-vous, un administrateur finalisera la création de votre compte" return success_message From 7851f31d593fd8ccd4df4717039abb4a48d58c96 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Tue, 4 Mar 2025 09:10:38 +0100 Subject: [PATCH 34/37] Linear background --- lemarche/static/itou_marche/itou_marche.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemarche/static/itou_marche/itou_marche.scss b/lemarche/static/itou_marche/itou_marche.scss index 69a3819fa..3c7e389b8 100644 --- a/lemarche/static/itou_marche/itou_marche.scss +++ b/lemarche/static/itou_marche/itou_marche.scss @@ -233,7 +233,7 @@ p.fr-tag--green-emeraude { } .fr-background-alt--orange { - background-color: #fc5455; + background: linear-gradient(to bottom, #fc5455 50%, transparent 50%); } .rounded-iframe { From 2d10e43dd27f8cfaa36f5e1b077b24201c7ad5c8 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Tue, 4 Mar 2025 10:14:11 +0100 Subject: [PATCH 35/37] White text --- lemarche/static/itou_marche/itou_marche.scss | 12 ++++++++++++ lemarche/templates/auth/meeting_calendar.html | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lemarche/static/itou_marche/itou_marche.scss b/lemarche/static/itou_marche/itou_marche.scss index 3c7e389b8..442f191c1 100644 --- a/lemarche/static/itou_marche/itou_marche.scss +++ b/lemarche/static/itou_marche/itou_marche.scss @@ -236,9 +236,21 @@ p.fr-tag--green-emeraude { background: linear-gradient(to bottom, #fc5455 50%, transparent 50%); } +.fr-background-alt--white { + background: #ffffff; +} + .rounded-iframe { width: 100%; height: 650px; border: none; border-radius: 15px; } + +.text-white { + color: #ffffff; +} + +.text-white * { + color: inherit; +} diff --git a/lemarche/templates/auth/meeting_calendar.html b/lemarche/templates/auth/meeting_calendar.html index f90123c65..7d956eedd 100644 --- a/lemarche/templates/auth/meeting_calendar.html +++ b/lemarche/templates/auth/meeting_calendar.html @@ -9,16 +9,16 @@ {% dsfr_breadcrumb breadcrumb_data %} {% endblock breadcrumb %} {% block content %} -
      -
      +
      +
      - {{ wagtail_paragraph.content |safe }} + {{ wagtail_paragraph.content | safe }}

      Prenez rendez-vous pour activer votre compte

      From 6e8f544ed17cc08f2a90954bffb1e5e54a19ac38 Mon Sep 17 00:00:00 2001 From: Guilouf Date: Tue, 4 Mar 2025 10:35:26 +0100 Subject: [PATCH 36/37] Acitvate account link --- lemarche/templates/layouts/_header_nav_primary_items.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lemarche/templates/layouts/_header_nav_primary_items.html b/lemarche/templates/layouts/_header_nav_primary_items.html index 5dc58747a..8a92e5e96 100644 --- a/lemarche/templates/layouts/_header_nav_primary_items.html +++ b/lemarche/templates/layouts/_header_nav_primary_items.html @@ -11,6 +11,12 @@ Publier un besoin d'achat +
      • + {% else %} +
    • + + Activer mon compte +
      • {% endif %}
    • From 068fce53e79b85c857ea916c74b0d989dacd077f Mon Sep 17 00:00:00 2001 From: Guilouf Date: Tue, 4 Mar 2025 10:40:37 +0100 Subject: [PATCH 37/37] Add access control for already onboarded users --- lemarche/www/auth/views.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lemarche/www/auth/views.py b/lemarche/www/auth/views.py index 41fe70990..7dcf4d84b 100644 --- a/lemarche/www/auth/views.py +++ b/lemarche/www/auth/views.py @@ -1,7 +1,7 @@ from django.conf import settings from django.contrib import messages from django.contrib.auth import authenticate, login, views as auth_views -from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin from django.contrib.messages.views import SuccessMessageMixin from django.http import HttpResponseRedirect from django.urls import reverse_lazy @@ -146,9 +146,15 @@ def get_success_url(self): return f"{success_url}?email={user_email}" -class MeetingCalendarView(LoginRequiredMixin, TemplateView): +class MeetingCalendarView(LoginRequiredMixin, UserPassesTestMixin, TemplateView): template_name = "auth/meeting_calendar.html" + def test_func(self): + """Do not display for already onboarded users""" + if self.request.user.is_onboarded: + return False + return True + def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) ctx["wagtail_paragraph"] = Paragraph.objects.get(slug="rdv-signup")