From 3212413911fc62aa6a9780fa7906d9922571af7b Mon Sep 17 00:00:00 2001
From: Stakovicz <albin@les-tilleuls.coop>
Date: Mon, 13 Jan 2025 13:05:23 +0100
Subject: [PATCH] global canonical

---
 app/Resources/views/base.html.twig                           | 4 +++-
 app/Resources/views/event/home.html.twig                     | 5 -----
 app/Resources/views/site/become_member.html.twig             | 3 ---
 app/Resources/views/site/company_public_profile.html.twig    | 3 ---
 .../views/site/company_public_profile_list.html.twig         | 3 ---
 app/Resources/views/site/home.html.twig                      | 4 ----
 app/Resources/views/site/meetups/list.html.twig              | 3 ---
 app/Resources/views/site/news/display.html.twig              | 3 ---
 app/Resources/views/site/news/list.html.twig                 | 3 ---
 app/Resources/views/site/talks/list.html.twig                | 3 ---
 app/Resources/views/site/talks/show.html.twig                | 4 ----
 11 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 6b554061e..c603a2618 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -7,7 +7,9 @@
               content="width=device-width, user-scalable=yes, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
         {% endblock %}
-        {% block canonical %}{% endblock %}
+        {% block canonical %}
+            <link rel="canonical" href="{{ url(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) }}" />
+        {% endblock %}
         <title>{% block title %}Afup{% endblock %}</title>
         {% block stylesheets %}
             <link rel="stylesheet" href="{{ asset('/templates/site/css/styles.css') }}">
diff --git a/app/Resources/views/event/home.html.twig b/app/Resources/views/event/home.html.twig
index be683b6e9..4ab5fa1ca 100644
--- a/app/Resources/views/event/home.html.twig
+++ b/app/Resources/views/event/home.html.twig
@@ -1,10 +1,5 @@
 {% extends ':event:base.html.twig' %}
 
-{% block canonical %}
-    <link rel="canonical" href="{{ url('event', {eventSlug: event.path, _locale: app.request.locale}) }}" />
-{% endblock %}
-
-
 {% block javascripts %}
     {{ parent() }}
     <script src="{{ asset('/js/countdown.min.js') }}"></script>
diff --git a/app/Resources/views/site/become_member.html.twig b/app/Resources/views/site/become_member.html.twig
index 1b43c1b7a..d15b197f0 100644
--- a/app/Resources/views/site/become_member.html.twig
+++ b/app/Resources/views/site/become_member.html.twig
@@ -1,9 +1,6 @@
 {% extends ':site:base.html.twig' %}
 
 {% block title %}Devenir membre de l'AFUP{% endblock %}
-{% block canonical %}
-    <link rel="canonical" href="{{ url('become_member') }}" />
-{% endblock %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/app/Resources/views/site/company_public_profile.html.twig b/app/Resources/views/site/company_public_profile.html.twig
index 81d35b5cd..09d56c52c 100644
--- a/app/Resources/views/site/company_public_profile.html.twig
+++ b/app/Resources/views/site/company_public_profile.html.twig
@@ -7,9 +7,6 @@
 {% endblock %}
 
 {% block page_title %}{{ company_member.companyName }}{% endblock %}
-{% block canonical %}
-    <link rel="canonical" href="{{ url('company_public_profile', { id: company_member.id, slug: company_member.slug}) }}" />
-{% endblock %}
 
 {% block title %}{{ company_member.companyName }} est adhérente à l'AFUP{% endblock %}
 
diff --git a/app/Resources/views/site/company_public_profile_list.html.twig b/app/Resources/views/site/company_public_profile_list.html.twig
index c01a36e55..444bcf531 100644
--- a/app/Resources/views/site/company_public_profile_list.html.twig
+++ b/app/Resources/views/site/company_public_profile_list.html.twig
@@ -7,9 +7,6 @@
 {% endblock %}
 
 {% block title %}Les entreprises adhérentes à l'AFUP{% endblock %}
-{% block canonical %}
-    <link rel="canonical" href="{{ url('company_public_profile_list') }}" />
-{% endblock %}
 
 {% block page_title %}Entreprises adhérentes{% endblock %}
 
diff --git a/app/Resources/views/site/home.html.twig b/app/Resources/views/site/home.html.twig
index b0ac27539..167650cd7 100644
--- a/app/Resources/views/site/home.html.twig
+++ b/app/Resources/views/site/home.html.twig
@@ -1,9 +1,5 @@
 {% extends ':site:base.html.twig' %}
 
-{% block canonical %}
-    <link rel="canonical" href="{{ url('home') }}" />
-{% endblock %}
-
 {% import _self as home_macros %}
 
 {% macro home_feuille(feuille) %}
diff --git a/app/Resources/views/site/meetups/list.html.twig b/app/Resources/views/site/meetups/list.html.twig
index c11344960..5dbb28c73 100644
--- a/app/Resources/views/site/meetups/list.html.twig
+++ b/app/Resources/views/site/meetups/list.html.twig
@@ -1,9 +1,6 @@
 {% extends ':site:base.html.twig' %}
 
 {% block title %}Les meetups des antennes de l'AFUP{% endblock %}
-{% block canonical %}
-    <link rel="canonical" href="{{ url('meetups_list') }}" />
-{% endblock %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/app/Resources/views/site/news/display.html.twig b/app/Resources/views/site/news/display.html.twig
index 680401793..1e2bc2ba5 100644
--- a/app/Resources/views/site/news/display.html.twig
+++ b/app/Resources/views/site/news/display.html.twig
@@ -1,9 +1,6 @@
 {% extends ':site:base.html.twig' %}
 
 {% block title %}{{ article.getTitle }} - AFUP{% endblock %}
-{% block canonical %}
-    <link rel="canonical" href="{{ url('news_display', {code: article.getSlug }) }}" />
-{% endblock %}
 
 {% block metas %}
     {{ parent() }}
diff --git a/app/Resources/views/site/news/list.html.twig b/app/Resources/views/site/news/list.html.twig
index 2d4723d81..db355bd08 100644
--- a/app/Resources/views/site/news/list.html.twig
+++ b/app/Resources/views/site/news/list.html.twig
@@ -1,9 +1,6 @@
 {% extends ':site:base.html.twig' %}
 
 {% block title %}Les actualités de l'AFUP, page {{ current_page }}{% endblock %}
-{% block canonical %}
-    <link rel="canonical" href="{{ url('news_list', {page: current_page}) }}" />
-{% endblock %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/app/Resources/views/site/talks/list.html.twig b/app/Resources/views/site/talks/list.html.twig
index e036c491f..3806ba0c3 100644
--- a/app/Resources/views/site/talks/list.html.twig
+++ b/app/Resources/views/site/talks/list.html.twig
@@ -1,9 +1,6 @@
 {% extends ':site:base.html.twig' %}
 
 {% block title %}Historique des conférences de l'AFUP{% endblock %}
-{% block canonical %}
-    <link rel="canonical" href="{{ url('talks_list') }}" />
-{% endblock %}
 
 {% block stylesheets %}
     {{ parent() }}
diff --git a/app/Resources/views/site/talks/show.html.twig b/app/Resources/views/site/talks/show.html.twig
index 015ea51bf..61f0e493f 100644
--- a/app/Resources/views/site/talks/show.html.twig
+++ b/app/Resources/views/site/talks/show.html.twig
@@ -1,9 +1,5 @@
 {% extends ':site:base.html.twig' %}
 
-{% block canonical %}
-    <link rel="canonical" href="{{ url('talks_show', {id: talk.id, slug: talk.slug }) }}" />
-{% endblock %}
-
 {% block stylesheets %}
     {{ parent() }}
     <link rel="stylesheet" href="/css/grid.css">