decidim-core 0.30.2 → 0.31.0.rc1

data/app/views/layouts/decidim/footer/_main_language_chooser.html.erb

@@ -1,6 +1,6 @@
 <% if available_locales.length > 1 %>
   <div class="main-footer__language-container">
-    <button id="trigger-dropdown-language-chooser" data-component="dropdown" data-target="dropdown-menu-language-chooser" class="main-footer__language-trigger">
+    <button id="trigger-dropdown-language-chooser" data-controller="dropdown" data-target="dropdown-menu-language-chooser" class="main-footer__language-trigger">
       <%= icon "global-line" %>
       <span><%= t("name", scope: "locale" ) %></span>
       <%= icon "arrow-down-s-line" %>

data/app/views/layouts/decidim/header/_close_ephemeral_session.html.erb

@@ -5,7 +5,12 @@
         method: :delete,
         class: "main-bar__links-desktop__item",
         "aria-label": t("layouts.decidim.header.close"),
-        data: { close: "", confirm: t("layouts.decidim.header.confirm_close_ephemeral_session") }
+        data: {
+          close: "main-bar__links-desktop__item",
+          confirm: t("layouts.decidim.header.confirm_close_ephemeral_session"),
+          confirm_title: t("layouts.decidim.header.confirm_title_close_ephemeral_session"),
+          confirm_icon: "logout-box-line"
+        }
      ) do %>
         <%= icon "close-line" %><span><%= t("layouts.decidim.header.close") %></span>
     <% end %>
@@ -20,6 +25,11 @@
       class: "text-secondary",
       type: :button,
       "aria-label": t("layouts.decidim.header.close"),
-      data: { close: "", confirm: t("layouts.decidim.header.confirm_close_ephemeral_session") }
+      data: {
+        close: "",
+        confirm: t("layouts.decidim.header.confirm_close_ephemeral_session"),
+        confirm_title: t("layouts.decidim.header.confirm_title_close_ephemeral_session"),
+        confirm_icon: "logout-box-line"
+      }
     ) %>
 </div>

data/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb

@@ -0,0 +1,24 @@
+<div class="main-bar__back-button hidden lg:flex">
+  <%= link_to(
+      content_for(:focus_mode_return_path),
+      class: "main-bar__links-desktop__item",
+      "aria-label": t("layouts.decidim.header.back")
+  ) do %>
+      <%= icon "arrow-left-line", class: "w-8 h-6 mr-2 fill-current" %>
+      <%= yield(:focus_mode_return_string).presence || t("layouts.decidim.header.back") %>
+  <% end %>
+</div>
+
+<div class="main-bar__back-button lg:hidden">
+  <%= link_to(
+      content_for(:focus_mode_return_path),
+      class: "main-bar__links-desktop__item",
+      type: :button,
+      "aria-label": t("layouts.decidim.header.back")
+    ) do %>
+      <span class="flex items-center gap-1">
+        <%= icon "arrow-left-line", class: "w-8 h-6 mr-2 fill-current" %>
+        <%= t("layouts.decidim.header.back") %>
+      </span>
+    <% end %>
+</div>

data/app/views/layouts/decidim/header/_main.html.erb

@@ -1,26 +1,32 @@
 <div id="main-bar" class="main-bar__container">
-  <div class="main-bar">
-    <div class="main-bar__logo">
-      <div class="main-bar__logo-desktop">
-        <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
-      </div>
-      <div class="main-bar__logo-mobile">
-        <%= render partial: "layouts/decidim/logo_mobile", locals: { organization: current_organization } %>
-      </div>
+  <% if content_for?(:focus_mode) %>
+    <div class="main-bar main-bar--focus-mode-back-button">
+      <%= render partial: "layouts/decidim/header/focus_mode_back_button" if content_for(:focus_mode_return_path) %>
     </div>
-    <% if current_user&.ephemeral? %>
-      <%= render partial: "layouts/decidim/header/close_ephemeral_session" %>
-    <% else %>
-      <div role="search" class="main-bar__search">
-        <%= render partial: "layouts/decidim/header/main_search" %>
-      </div>
-      <div role="navigation" class="main-bar__links-desktop">
-        <%= render partial: "layouts/decidim/header/main_links_desktop" %>
+  <% else %>
+    <div class="main-bar">
+      <div class="main-bar__logo">
+        <div class="main-bar__logo-desktop">
+          <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
+        </div>
+        <div class="main-bar__logo-mobile">
+          <%= render partial: "layouts/decidim/logo_mobile", locals: { organization: current_organization } %>
+        </div>
       </div>
-      <div class="main-bar__menu-mobile">
-        <%= render partial: "layouts/decidim/header/main_menu_mobile" %>
-      </div>
-      <%= render partial: "layouts/decidim/header/main_links_mobile_account" if current_user %>
-    <% end %>
-  </div>
+      <% if current_user&.ephemeral? %>
+        <%= render partial: "layouts/decidim/header/close_ephemeral_session" %>
+      <% else %>
+        <div role="search" class="main-bar__search">
+          <%= render partial: "layouts/decidim/header/main_search" %>
+        </div>
+        <nav role="navigation" class="main-bar__links-desktop">
+          <%= render partial: "layouts/decidim/header/main_links_desktop" %>
+        </nav>
+        <div class="main-bar__menu-mobile">
+          <%= render partial: "layouts/decidim/header/main_menu_mobile" %>
+        </div>
+        <%= render partial: "layouts/decidim/header/main_links_mobile_account" if current_user %>
+      <% end %>
+    </div>
+  <% end %>
 </div>

data/app/views/layouts/decidim/header/_main_links_desktop.html.erb

@@ -26,7 +26,7 @@
   </div>
 <% else %>
   <div class="main-bar__dropdown-container">
-    <button id="trigger-dropdown-account" class="main-bar__dropdown-trigger" data-component="dropdown" data-target="dropdown-menu-account">
+    <button id="trigger-dropdown-account" class="main-bar__dropdown-trigger" data-controller="dropdown" data-target="dropdown-menu-account">
       <% unread_data = current_user_unread_data %>
       <% if unread_data[:unread_items] %>
         <%= content_tag :span, "", class: "main-bar__notification", data: unread_data %>

data/app/views/layouts/decidim/header/_main_links_dropdown.html.erb

@@ -1,30 +1,30 @@
 <% unread_data ||= current_user_unread_data %>
-<li>
-  <%= link_to decidim.account_path, class: "dropdown__item" do %>
+<li class="dropdown__item">
+  <%= link_to decidim.account_path, class: "dropdown__button" do %>
     <%= icon "user-smile-line" %>
-    <span class="text-secondary"><%= t("layouts.decidim.user_menu.profile") %></span>
+    <span><%= t("layouts.decidim.user_menu.profile") %></span>
   <% end %>
 </li>
-<li>
-  <%= link_to decidim.profile_path(current_user.nickname), class: "dropdown__item" do %>
+<li class="dropdown__item">
+  <%= link_to decidim.profile_path(current_user.nickname), class: "dropdown__button" do %>
     <%= icon "account-circle-line" %>
-    <span class="text-secondary"><%= t("layouts.decidim.user_menu.public_profile") %></span>
+    <span><%= t("layouts.decidim.user_menu.public_profile") %></span>
   <% end %>
 </li>
-<li>
-  <%= link_to decidim.notifications_path, class: "dropdown__item" do %>
+<li class="dropdown__item">
+  <%= link_to decidim.notifications_path, class: "dropdown__button" do %>
     <%= icon "notification-3-line" %>
-    <span class="text-secondary"><%= t("layouts.decidim.user_menu.notifications") %></span>
+    <span><%= t("layouts.decidim.user_menu.notifications") %></span>
     <% if unread_data[:unread_notifications] %>
       <%= content_tag :span, "", class: "main-bar__dropdown-notification", data: unread_data %>
       <%= content_tag :span, t("layouts.decidim.user_menu.unread_notifications"), class: "sr-only" %>
     <% end %>
   <% end %>
 </li>
-<li>
-  <%= link_to decidim.conversations_path, class: "dropdown__item" do %>
+<li class="dropdown__item">
+  <%= link_to decidim.conversations_path, class: "dropdown__button" do %>
     <%= icon "mail-send-line" %>
-    <span class="text-secondary"><%= t("layouts.decidim.user_menu.conversations") %></span>
+    <span><%= t("layouts.decidim.user_menu.conversations") %></span>
     <% if unread_data[:unread_conversations] %>
       <%= content_tag :span, "", class: "main-bar__dropdown-notification", data: unread_data %>
       <%= content_tag :span, t("layouts.decidim.user_menu.unread_conversations"), class: "sr-only" %>
@@ -32,16 +32,16 @@
   <% end %>
 </li>
 <% if allowed_to? :read, :admin_dashboard %>
-  <li>
-    <%= link_to decidim_admin.root_path, class: "dropdown__item" do %>
+  <li class="dropdown__item">
+    <%= link_to decidim_admin.root_path, class: "dropdown__button" do %>
       <%= icon "dashboard-line" %>
-      <span class="text-secondary"><%= t("layouts.decidim.user_menu.admin_dashboard") %></span>
+      <span><%= t("layouts.decidim.user_menu.admin_dashboard") %></span>
     <% end %>
   </li>
 <% end %>
-<li>
-  <%= link_to decidim.destroy_user_session_path, method: :delete, class: "dropdown__item" do %>
+<li class="dropdown__item">
+  <%= link_to decidim.destroy_user_session_path, method: :delete, class: "dropdown__button" do %>
     <%= icon "logout-box-r-line" %>
-    <span class="text-secondary"><%= t("layouts.decidim.user_menu.log_out") %></span>
+    <span><%= t("layouts.decidim.user_menu.log_out") %></span>
   <% end %>
 </li>

data/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb

@@ -1,5 +1,5 @@
 <% if current_user %>
-  <button id="dropdown-trigger-links-mobile" class="main-bar__links-mobile__item" data-component="dropdown" data-target="dropdown-menu-account-mobile">
+  <button id="dropdown-trigger-links-mobile" class="main-bar__links-mobile__item" data-controller="dropdown" data-target="dropdown-menu-account-mobile">
     <% if current_user.notifications.any? %>
       <span class="main-bar__notification"></span>
     <% end %>

data/app/views/layouts/decidim/header/_main_menu_mobile.html.erb

@@ -1,5 +1,5 @@
 <button id="main-dropdown-summary-mobile" class="main-bar__links-mobile__trigger p-0"
-                                          data-component="dropdown"
+                                          data-controller="dropdown"
                                           data-target="dropdown-menu-main-mobile">
   <%= icon "menu-line" %><span class="sr-only"><%= t("main_menu", scope: "layouts.decidim.header") %></span>
   <%= icon "close-line" %>

data/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb

@@ -2,7 +2,7 @@
   <%= link_to decidim.root_url, class: "menu-bar__breadcrumb-desktop__dropdown-trigger", onmouseenter: "document.getElementById('main-dropdown-summary').click()" do %>
     <%= icon "home-2-line", class: "pointer-events-none" %><span class="sr-only"><%= t("decidim.menu.home") %></span>
   <% end %>
-  <button id="main-dropdown-summary" class="menu-bar__breadcrumb-desktop__dropdown-trigger" data-component="dropdown" data-hover="true" data-target="main-dropdown-menu">
+  <button id="main-dropdown-summary" class="menu-bar__breadcrumb-desktop__dropdown-trigger" data-controller="dropdown" data-hover="true" data-target="main-dropdown-menu">
     <%= icon "arrow-drop-down-line" %><span class="sr-only"><%= t("layouts.decidim.header.main_menu") %></span>
   </button>
 </div>

data/app/views/layouts/decidim/header/_menu_breadcrumb_items.html.erb

@@ -11,7 +11,7 @@
         <% end %>
         <button id="secondary-dropdown-summary-<%= i %>"
           class="menu-bar__breadcrumb-desktop__dropdown-trigger"
-          data-component="dropdown"
+          data-controller="dropdown"
           data-hover="true"
           data-target="secondary-dropdown-menu-<%= i %>">
           <%= icon "arrow-drop-down-line" %>

data/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb

@@ -16,7 +16,7 @@
     <% end %>
   </span>
   <% if dropdown_item.present? %>
-    <button id="secondary-dropdown-trigger-mobile" data-component="dropdown" data-hover="true" data-target="secondary-dropdown-menu-mobile">
+    <button id="secondary-dropdown-trigger-mobile" data-controller="dropdown" data-hover="true" data-target="secondary-dropdown-menu-mobile">
       <%= icon "arrow-down-s-line", class: "flex-none w-6 h-6 fill-current" %><span class="sr-only"><%= t("layouts.decidim.header.main_menu") %></span>
     </button>
   <% end %>

data/app/views/layouts/decidim/header/_mobile_language_choose.html.erb

@@ -1,6 +1,6 @@
 <% if available_locales.length > 1 %>
     <div>
-        <button id="dropdown-trigger-language-chooser-mobile" data-component="dropdown" data-target="dropdown-menu-language-chooser-mobile" class="mt-8 rounded-lg py-0 bg-gray-5 h-10 border border-gray outline outline-1 outline-transparent">
+        <button id="dropdown-trigger-language-chooser-mobile" data-controller="dropdown" data-target="dropdown-menu-language-chooser-mobile" class="mt-8 rounded-lg py-0 bg-gray-5 h-10 border border-gray outline outline-1 outline-transparent">
             <span class="ml-2"><%= t("name", scope: "locale" ) %></span>
             <%= icon "arrow-down-s-line" %>
             <%= icon "arrow-up-s-line" %>

data/app/views/layouts/decidim/mailer.html.erb

@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta name="viewport" content="width=device-width">
+    <%= tag :meta, "http-equiv": "Content-Type", content: "text/html; charset=utf-8" %>
+    <%= tag :meta, name: "viewport", content: "width=device-width" %>
     <%= stylesheet_pack_tag "decidim_email" %>
   </head>
 

data/app/views/layouts/decidim/newsletter_base.html.erb

@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta name="viewport" content="width=device-width">
+    <%= tag :meta, "http-equiv": "Content-Type", content: "text/html; charset=utf-8" %>
+    <%= tag :meta, name: "viewport", content: "width=device-width" %>
     <%= stylesheet_pack_tag "decidim_email" %>
   </head>
 

data/app/views/layouts/decidim/shared/_layout_two_col.html.erb

@@ -1,6 +1,8 @@
 <% reverse ||= false %>
+<% large ||= false %>
 <% main_enabled = true unless local_assigns.has_key?(:main_enabled) %>
-<div class="layout-2col<%= " layout-2col__reverse" if reverse %>">
+
+<div class="layout-2col<%= " layout-2col__large" if large %><%= " layout-2col__reverse" if reverse %>">
   <aside class="layout-2col__aside">
     <%= yield :aside %>
   </aside>

data/app/views/layouts/decidim/shared/_layout_user_profile.html.erb

@@ -3,14 +3,18 @@
 <%= render layout: "layouts/decidim/shared/layout_center", locals: { columns: 10 } do %>
   <header class="text-center py-10">
     <h1 class="title-decorator inline-block text-left md:mb-12">
-      <%= t("title", scope: "layouts.decidim.user_profile") %>
-      <%= " - #{subtitle}" if subtitle.present? %>
+      <% if content_for?(:profile_title) %>
+        <%= yield :profile_title %>
+      <% else %>
+        <%= t("title", scope: "layouts.decidim.user_profile") %>
+        <%= " - #{subtitle}" if subtitle.present? %>
+      <% end %>
     </h1>
   </header>
 
   <div class="vertical-tabs">
     <nav aria-label="menu-vertical">
-      <button id="dropdown-trigger-profile" data-open-md="true" data-component="dropdown" data-target="dropdown-menu-profile">
+      <button id="dropdown-trigger-profile" data-open-md="true" data-controller="dropdown" data-target="dropdown-menu-profile">
         <span><%= user_menu.active_item&.label || t("decidim.searches.filters.jump_to") %></span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>

data/config/assets.rb

@@ -2,8 +2,8 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_entrypoints(
   decidim_overrides: "#{base_path}/app/packs/entrypoints/decidim_overrides.scss",
   decidim_core: "#{base_path}/app/packs/entrypoints/decidim_core.js",
   decidim_sw: "#{base_path}/app/packs/entrypoints/decidim_sw.js",
@@ -15,6 +15,6 @@ Decidim::Webpacker.register_entrypoints(
   decidim_geocoding_provider_here: "#{base_path}/app/packs/entrypoints/decidim_geocoding_provider_here.js",
   decidim_map_provider_default: "#{base_path}/app/packs/entrypoints/decidim_map_provider_default.js",
   decidim_map_provider_here: "#{base_path}/app/packs/entrypoints/decidim_map_provider_here.js",
-  decidim_widget: "#{base_path}/app/packs/entrypoints/decidim_widget.js",
+  decidim_qr: "#{base_path}/app/packs/entrypoints/decidim_qr.js",
   decidim_geocoding: "#{base_path}/app/packs/entrypoints/decidim_geocoding.js"
 )

data/config/initializers/devise.rb

@@ -302,6 +302,14 @@ Devise.setup do |config|
     manager.failure_app = RandomStalling
   end
 
+  # To be compatible with Turbo, from Devise v.4.9.0 on,
+  # devise keep error status for validation as :ok, and sets
+  # the redirect_status as :found. However, these configuration
+  # options is devised to change this behavior as
+  # needed (for more information refer to
+  # https://github.com/heartcombo/devise/blob/v4.9.0/CHANGELOG.md#490---2023-02-17):
+  config.responder.error_status = :forbidden
+
   # ==> Mountable engine configurations
   # When using Devise inside an engine, we can call it `MyEngine`, and this engine
   # is mountable, there are some extra configurations to be taken into account.

data/config/initializers/omniauth.rb

@@ -13,7 +13,7 @@ def setup_provider_proc(provider, config_mapping = {})
 end
 
 Rails.application.config.middleware.use OmniAuth::Builder do
-  omniauth_config = Rails.application.secrets[:omniauth]
+  omniauth_config = Decidim.omniauth_providers
 
   if omniauth_config
     if omniauth_config[:developer].present?