Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Home): La page d'accueil d'un utilisateur d'une structure doit être celle dédiée aux ESI #1172

Merged
merged 4 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
"django.contrib.messages.context_processors.messages",
# custom
"lemarche.utils.settings_context_processors.expose_settings",
"lemarche.utils.home_page_context_processors.home_page",
],
},
},
Expand Down Expand Up @@ -863,6 +864,9 @@

WAGTAIL_FRONTEND_LOGIN_URL = LOGIN_URL

# Specific home page is setted here to avoid one query on every page
SIAE_HOME_PAGE = env.str("SIAE_HOME_PAGE", "/accueil-structure/")

# Increase throttling to avoid Bad request errors when saving large pages
# https://docs.djangoproject.com/en/4.2/ref/settings/#data-upload-max-number-fields
DATA_UPLOAD_MAX_NUMBER_FIELDS = env.int("DATA_UPLOAD_MAX_NUMBER_FIELDS", 10000)
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/api/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">API</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/auth/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Connexion</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/auth/password_reset.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Réinitialisation du mot de passe</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/auth/password_reset_confirm.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Saisissez un nouveau mot de passe</li>
</ol>
</nav>
Expand Down
4 changes: 2 additions & 2 deletions lemarche/templates/auth/password_reset_sent.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Réinitialisation du mot de passe</li>
</ol>
</nav>
Expand Down Expand Up @@ -37,7 +37,7 @@ <h2 class="h3">
<li>vérifiez qu'il n'y a pas d'erreur dans votre e-mail</li>
</ul>
<p class="mt-3 mt-lg-5">
<a href="{% url 'wagtail_serve' '' %}" class="btn btn-link btn-ico pl-0">
<a href="{{ HOME_PAGE_PATH }}" class="btn btn-link btn-ico pl-0">
<i class="ri-arrow-go-back-line ri-lg"></i>
<span>Revenir à la page principale</span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/auth/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Inscription</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/cms/article_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="{% url 'wagtail_serve' '' %}">Accueil</a>
<a href="{{ HOME_PAGE_PATH }}">Accueil</a>
</li>
<li class="breadcrumb-item active" aria-current="page">{{ page.title }}</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/cms/article_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% slugurl 'ressources' %}">Ressources</a></li>
<li class="breadcrumb-item active" aria-current="page" title="{{ page.title }}">{{ page.title }}</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/cms/paid_article_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="{% url 'wagtail_serve' '' %}">Accueil</a>
<a href="{{ HOME_PAGE_PATH }}">Accueil</a>
</li>
<li class="breadcrumb-item active" aria-current="page">{{ page.title }}</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/cms/static/decouvrir-inclusion.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">C'est quoi l'inclusion ?</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/cms/static/filiere_recyclage.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Filière : recyclage</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/cms/static/filiere_restauration.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Filière : restauration</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/cms/static/valoriser-achats.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Auditer et valoriser vos achats</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/dashboard/home_buyer.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Tableau de bord</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/dashboard/home_siae.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Tableau de bord</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/dashboard/profile_edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item active" aria-current="page">Modifier mon profil</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/dashboard/siae_edit_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12 col-lg">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item active" aria-current="page" title="{{ siae.name_display }} : modifier">{{ siae.name_display }} : modifier</li>
</ol>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard_siaes:siae_search_by_siret' %}">Rechercher ma structure</a></li>
<li class="breadcrumb-item active" aria-current="page">Vérifier ma structure</li>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/dashboard/siae_search_by_siret.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item active" aria-current="page">Rechercher ma structure</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/dashboard/siae_users.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12 col-lg">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item active" aria-current="page" title="{{ siae.name }} : collaborateurs">{{ siae.name }} : collaborateurs</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/favorites/dashboard_favorite_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item active" aria-current="page">Liste d'achat favoris</li>
</ol>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard_favorites:list' %}">Liste d'achat favoris</a></li>
<li class="breadcrumb-item active" aria-current="page" title="{{ favorite_list.name }}">{{ favorite_list.name }}</li>
Expand Down
2 changes: 1 addition & 1 deletion lemarche/templates/includes/_header_for_buyers.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div id="header-for-buyers" class="text-center p-3 bg-marche-lightest">
<p class="mb-0">
Vous êtes acheteur ? <a id="header-for-buyers-link" href="{% url 'wagtail_serve' '' %}" class="font-weight-bold">Cliquez ici</a>
Vous êtes acheteur ? <a id="header-for-buyers-link" href="{{ HOME_PAGE_PATH }}" class="font-weight-bold">Cliquez ici</a>
</p>
</div>
2 changes: 1 addition & 1 deletion lemarche/templates/includes/_header_for_siaes.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load wagtailcore_tags %}
<div id="header-for-siaes" class="text-center p-3 bg-marche-lightest">
<p class="mb-0">
Vous êtes une structure inclusive (SIAE, EA, ESAT) ? <a id="header-for-siaes-link" href="{% slugurl 'accueil-structure' %}" class="font-weight-bold">Cliquez ici</a>
Vous êtes une structure inclusive (SIAE, EA, ESAT) ? <a id="header-for-siaes-link" href="{{ SIAE_HOME_PAGE }}" class="font-weight-bold">Cliquez ici</a>
</p>
</div>
2 changes: 1 addition & 1 deletion lemarche/templates/layouts/_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<strong>Accès rapides</strong>
<div class="s-footer-quick__gridlist">
<ul>
<li><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li><a href="{% url 'tenders:create' %}">Publier un besoin d'achat</li>
<li><a href="{% url 'siae:search_results' %}">Rechercher un prestataire</a></li>
<li><a href="{% url 'siae:search_results' %}">Moteur de recherche multicritères</a></li>
Expand Down
4 changes: 2 additions & 2 deletions lemarche/templates/layouts/_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<div class="s-header__container container">
<div class="s-header__row row">
<div class="s-header__col s-header__col--logo-ministere col col-md-auto d-flex align-items-center pr-0">
<a href="{% url 'wagtail_serve' '' %}" class="s-header__logo-ministere"><img src="{% static_theme_images 'logo-republique-francaise.svg' %}" alt="Rébublique Française"></a>
<a href="{{ HOME_PAGE_PATH }}" class="s-header__logo-ministere"><img src="{% static_theme_images 'logo-republique-francaise.svg' %}" alt="Rébublique Française"></a>
</div>
<div class="s-header__col s-header__col--logo-service col-auto d-flex align-items-center px-0">
<a href="{% url 'wagtail_serve' '' %}"><img src="{% static_theme_images 'logo-marche-inclusion.svg' %}" alt="Le marché de l'inclusion"></a>
<a href="{{ HOME_PAGE_PATH }}"><img src="{% static_theme_images 'logo-marche-inclusion.svg' %}" alt="Le marché de l'inclusion"></a>
</div>
<div class="s-header__col s-header__col--nav col d-none d-xl-inline-flex d-xl-flex align-items-center justify-content-end">
<nav role="navigation" id="nav-primary" aria-label="Navigation principale">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ul>
<li>
<a href="{% url 'wagtail_serve' '' %}" class="{% if request.path == '/' %}is-active{% endif %}">Accueil</a>
<a href="{{ HOME_PAGE_PATH }}" class="{% if request.path == HOME_PAGE_PATH %}is-active{% endif %}">Accueil</a>
</li>
<li>
<a href="/ressources/quest-ce-quun-prestataire-inclusif/" id="header-ressource-prestataire" class="{% if request.path == '/ressources/quest-ce-quun-prestataire-inclusif/' %}is-active{% endif %}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard_networks:detail' network.slug %}">Mon réseau</a></li>
<li class="breadcrumb-item active" aria-current="page">Mes adhérents</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard_networks:detail' network.slug %}">Mon réseau</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard_networks:siae_list' network.slug %}">Mes adhérents</a></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-12">
<nav class="c-breadcrumb c-breadcrumb--marche" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'wagtail_serve' '' %}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{{ HOME_PAGE_PATH }}">Accueil</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard:home' %}">Tableau de bord</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard_networks:detail' network.slug %}">Mon réseau</a></li>
<li class="breadcrumb-item"><a href="{% url 'dashboard_networks:tender_list' network.slug %}">Opportunités commerciales</a></li>
Expand Down
Loading
Loading