decidim-core 0.28.2 → 0.29.0.rc2

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

@@ -11,15 +11,22 @@ end
 %>
 
 <div class="layout-container">
-  <header>
-    <%= render partial: "layouts/decidim/admin_links" if current_user && allowed_to?(:read, :admin_dashboard) %>
-    <%= render partial: "layouts/decidim/header/main" %>
-    <% if display_flash_messages.present? %>
-      <div class="container">
-        <%= display_flash_messages %>
-      </div>
-    <% end %>
-    <%= render partial: "layouts/decidim/header/menu" unless controller_name == "homepage" %>
+  <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %>>
+    <div id="sticky-header-container" data-sticky-header>
+      <%= render partial: "layouts/decidim/impersonation_warning" %>
+      <%= render partial: "layouts/decidim/omnipresent_banner" %>
+      <%= render partial: "layouts/decidim/offline_banner" %>
+      <%= render partial: "layouts/decidim/admin_links" if current_user && allowed_to?(:read, :admin_dashboard) %>
+      <%= render partial: "layouts/decidim/header/main" %>
+    </div>
+    <div id="menu-bar-container">
+      <% if display_flash_messages.present? %>
+        <div id="flash-messages-container" class="container">
+          <%= display_flash_messages %>
+        </div>
+      <% end %>
+      <%= render partial: "layouts/decidim/header/menu" unless controller_name == "homepage" %>
+    </div>
   </header>
 
   <div id="content" data-content>

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

@@ -3,16 +3,15 @@
     <div class="lg:w-1/3">
       <%= render partial: "layouts/decidim/footer/main_intro" %>
     </div>
-    <div class="lg:w-2/3 grid grid-cols-1 gap-x-4 gap-y-10 lg:grid-cols-4 text-md text-white">
+    <div class="lg:w-2/3 grid grid-cols-1 gap-x-44 gap-y-10 lg:grid-cols-4 text-md text-white">
       <%= render partial: "layouts/decidim/footer/main_links" %>
     </div>
-    <%= cell("decidim/footer_pages", :topics) %>
   </div>
   <div class="main-footer__down">
     <nav class="md:w-1/2 lg:w-auto" role="navigation" aria-label="Legal">
       <%= render partial: "layouts/decidim/footer/main_legal" %>
     </nav>
-    <nav class="max-w-fit w-full md:w-auto md:ml-auto" role="navigation" aria-label="Social media">
+    <nav class="w-full md:w-auto md:ml-auto" role="navigation" aria-label="Social media">
       <%= render partial: "layouts/decidim/footer/main_social_media_links" %>
     </nav>
     <%= render partial: "layouts/decidim/footer/main_language_chooser" %>

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

@@ -1,9 +1,9 @@
 <% if current_organization.official_img_footer.attached? %>
   <%= link_to current_organization.official_url, class: "block mb-6" do %>
-    <%= image_tag current_organization.attached_uploader(:official_img_footer).path, alt: current_organization.name, class: "max-h-16" %>
+    <%= image_tag current_organization.attached_uploader(:official_img_footer).path, alt: current_organization_name, class: "max-h-16" %>
   <% end %>
 <% end %>
 <div class="text-sm text-white prose">
-  <p><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization.name) %></p>
+  <p><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization_name) %></p>
   <p><%= organization_description_label %></p>
 </div>

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

@@ -1,7 +1,6 @@
-<ul class="flex flex-col md:flex-row gap-10 text-sm text-white [&_a]:underline">
-  <%= cell("decidim/footer_pages", :pages) %>
+<ul class="flex flex-col gap-6 md:flex-row md:gap-10 text-sm text-white [&_a]:underline">
   <li>
-    <%= link_to t("layouts.decidim.footer.terms_and_conditions"), decidim.page_path("terms-and-conditions") %>
+    <%= link_to t("layouts.decidim.footer.terms_of_service"), decidim.page_path("terms-of-service") %>
   </li>
   <li>
     <a href="#" data-dialog-open="dc-modal"><%= t("layouts.decidim.footer.data_consent_settings") %></a>

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

@@ -1,16 +1,5 @@
 <%= footer_menu.render %>
 
-<nav role="navigation" aria-label="<%= t("layouts.decidim.footer.resources") %>">
-  <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.resources") %></h2>
-  <ul class="space-y-4 break-inside-avoid">
-    <li class="font-semibold underline"><%= link_to t("decidim.profiles.show.activity"), decidim.last_activities_path %></li>
-    <% if Decidim.module_installed?(:meetings) %>
-      <li class="font-semibold underline"><%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %></li>
-    <% end %>
-    <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
-  </ul>
-</nav>
-
 <nav role="navigation" aria-label="<%= t("layouts.decidim.user_menu.profile") %>">
   <h2 class="h4 mb-4"><%= t("layouts.decidim.user_menu.profile") %></h2>
   <ul class="space-y-4 break-inside-avoid">
@@ -27,3 +16,16 @@
     <% end %>
   </ul>
 </nav>
+
+<nav role="navigation" aria-label="<%= t("layouts.decidim.footer.resources") %>">
+  <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.resources") %></h2>
+  <ul class="space-y-4 break-inside-avoid">
+    <li class="font-semibold underline"><%= link_to t("decidim.profiles.show.activity"), decidim.last_activities_path %></li>
+    <% if Decidim.module_installed?(:meetings) %>
+      <li class="font-semibold underline"><%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %></li>
+    <% end %>
+    <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
+  </ul>
+</nav>
+
+<%= cell("decidim/footer_topics", nil) %>

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

@@ -1,8 +1,8 @@
-<ul class="flex justify-between md:justify-start gap-6 text-sm text-white hover:[&_a]:opacity-50">
+<ul class="flex md:justify-between md:justify-start gap-6 text-sm text-white hover:[&_a]:opacity-50">
   <% if current_organization.twitter_handler.present? %>
     <li>
       <a target="_blank" data-external-link="text-only" rel="noopener noreferrer" href="https://twitter.com/<%= current_organization.twitter_handler %>">
-        <span class="sr-only"><%= t("layouts.decidim.social_media_links.x", organization: translated_attribute(current_organization.name)) %></span>
+        <span class="sr-only"><%= t("layouts.decidim.social_media_links.x", organization: current_organization_name) %></span>
         <%= icon "twitter-x-line", class: "w-8 h-8 fill-current", "aria-label": "X" %>
       </a>
     </li>
@@ -10,7 +10,7 @@
   <% if current_organization.facebook_handler.present? %>
     <li>
       <a target="_blank" data-external-link="text-only" rel="noopener noreferrer" href="https://www.facebook.com/<%= current_organization.facebook_handler %>">
-        <span class="sr-only"><%= t("layouts.decidim.social_media_links.facebook", organization: translated_attribute(current_organization.name)) %></span>
+        <span class="sr-only"><%= t("layouts.decidim.social_media_links.facebook", organization: current_organization_name) %></span>
         <%= icon "facebook-fill", class: "w-8 h-8 fill-current", "aria-label": "Facebook" %>
       </a>
     </li>
@@ -18,7 +18,7 @@
   <% if current_organization.instagram_handler.present? %>
     <li>
       <a target="_blank" data-external-link="text-only" rel="noopener noreferrer" href="https://www.instagram.com/<%= current_organization.instagram_handler %>">
-        <span class="sr-only"><%= t("layouts.decidim.social_media_links.instagram", organization: translated_attribute(current_organization.name)) %></span>
+        <span class="sr-only"><%= t("layouts.decidim.social_media_links.instagram", organization: current_organization_name) %></span>
         <%= icon "instagram-line", class: "w-8 h-8 fill-current", "aria-label": "Instagram" %>
       </a>
     </li>
@@ -26,16 +26,16 @@
   <% if current_organization.youtube_handler.present? %>
     <li>
       <a target="_blank" data-external-link="text-only" rel="noopener noreferrer" href="https://www.youtube.com/<%= current_organization.youtube_handler %>">
-        <span class="sr-only"><%= t("layouts.decidim.social_media_links.youtube", organization: translated_attribute(current_organization.name)) %></span>
-        <%= icon "youtube-line", class: "w-8 h-8 fill-current", "aria-label": "Youtube" %>
+        <span class="sr-only"><%= t("layouts.decidim.social_media_links.youtube", organization: current_organization_name) %></span>
+        <%= icon "youtube-line", class: "w-8 h-8 fill-current", "aria-label": "YouTube" %>
       </a>
     </li>
   <% end %>
   <% if current_organization.github_handler.present? %>
     <li>
       <a target="_blank" data-external-link="text-only" rel="noopener noreferrer" href="https://www.github.com/<%= current_organization.github_handler %>">
-        <span class="sr-only"><%= t("layouts.decidim.social_media_links.github", organization: translated_attribute(current_organization.name)) %></span>
-        <%= icon "github-fill", class: "w-8 h-8 fill-current", "aria-label": "Github" %>
+        <span class="sr-only"><%= t("layouts.decidim.social_media_links.github", organization: current_organization_name) %></span>
+        <%= icon "github-fill", class: "w-8 h-8 fill-current", "aria-label": "GitHub" %>
       </a>
     </li>
   <% end %>

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

@@ -1,7 +1,12 @@
 <div id="main-bar" class="main-bar__container">
   <div class="main-bar">
     <div class="main-bar__logo">
-      <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
+      <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__search">
       <%= render partial: "layouts/decidim/header/main_search" %>
@@ -9,27 +14,9 @@
     <div class="main-bar__links-desktop">
       <%= render partial: "layouts/decidim/header/main_links_desktop" %>
     </div>
-
-    <div class="lg:hidden">
-      <%# Main dropdown mobile %>
-      <button id="main-dropdown-summary-mobile" class="main-bar__links-mobile__trigger"
-        data-component="dropdown"
-        data-target="dropdown-menu-main-mobile">
-        <%= icon "menu-line" %><span class="sr-only"><%= t("main_menu", scope: "layouts.decidim.header") %></span>
-      </button>
-
-      <div id="dropdown-menu-main-mobile" class="main-bar__links-mobile__dropdown" aria-hidden="true">
-        <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown", locals: { id: "breadcrumb-main-dropdown-mobile" } %>
-      </div>
-
-      <%# Sticky menu mobile %>
-      <div class="main-bar__links-mobile">
-        <%= render partial: "layouts/decidim/header/main_links_mobile" %>
-      </div>
-
-      <%# Overlay menus mobile %>
-      <%= render partial: "layouts/decidim/header/main_links_mobile_search" %>
-      <%= render partial: "layouts/decidim/header/main_links_mobile_account" if current_user %>
+    <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 %>
   </div>
 </div>

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

@@ -21,7 +21,7 @@
 <% if !current_user %>
   <div>
     <%= link_to decidim.new_user_session_path, class: "main-bar__links-desktop__item", "aria-label": t("layouts.decidim.header.log_in") do %>
-      <%= icon "login-box-line" %><span><%= t("layouts.decidim.header.log_in") %></span>
+      <%= icon "user-line" %><span><%= t("layouts.decidim.header.log_in") %></span>
     <% end %>
   </div>
 <% else %>
@@ -41,9 +41,8 @@
           </span>
         </span>
       <% else %>
-        <span class="main-bar__links-desktop__item">
-          <%= icon "user-smile-line" %>
-          <span><%= t("layouts.decidim.user_profile.account") %></span>
+        <span class="main-bar__links-desktop__item-account">
+          <%= text_initials(current_user.name) %>
         </span>
       <% end %>
     </button>

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

@@ -1,7 +1,12 @@
 <div id="dropdown-menu-account-mobile" class="main-bar__links-mobile__account" aria-hidden="true">
   <div class="main-bar">
     <div class="main-bar__logo">
-      <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
+      <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>
@@ -11,7 +16,7 @@
     </div>
   </div>
 
-  <div class="p-4 container">
+  <div class="account-container p-4 container">
     <% if current_user.avatar.attached? %>
       <div class="main-bar__avatar">
         <%= image_tag(
@@ -20,7 +25,9 @@
               ) %>
       </div>
     <% else %>
-      <%= icon "user-smile-line", class: "main-bar__avatar" %>
+      <div class="main-bar__avatar-name">
+        <%= text_initials(current_user.name) %>
+      </div>
     <% end %>
 
     <p class="h3 mt-2"><%= t("decidim.block_user_mailer.notify.hello") %>&nbsp;<%= current_user.name %></p>

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

@@ -0,0 +1,24 @@
+<% if current_user %>
+  <button id="dropdown-trigger-links-mobile" class="main-bar__links-mobile__item" data-component="dropdown" data-target="dropdown-menu-account-mobile">
+    <% if current_user.notifications.any? %>
+      <span class="main-bar__notification"></span>
+    <% end %>
+    <% if current_user.avatar.attached? %>
+      <span class="main-bar__avatar">
+        <%= image_tag(
+                current_user.attached_uploader(:avatar).path(variant: :thumb),
+                alt: t("decidim.author.avatar", name: decidim_sanitize(current_user.avatar.name))
+              ) %>
+      </span>
+    <% else %>
+      <div class="main-bar__avatar-name">
+        <%= text_initials(current_user.name) %>
+      </div>
+    <% end %>
+
+  </button>
+<% else %>
+  <%= link_to decidim.new_user_session_path, class: "main-bar__links-mobile__login" do %>
+    <%= icon "user-line" %><span><%= t("layouts.decidim.header.log_in") %></span>
+  <% end %>
+<% end %>

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

@@ -10,25 +10,4 @@
       </div>
     </div>
   </div>
-
-  <div class="main-bar__links-mobile__search-block">
-    <div class="-translate-y-full">
-      <label class="h4" for="input-search-mobile"><%= t("decidim.search.term_input_placeholder") %></label>
-      <%= form_tag(decidim.search_path, method: :get, class: "filter-search") do %>
-        <%= text_field_tag(
-          :term,
-          nil,
-          id: "input-search-mobile",
-          value: params[:term] || params.dig(:filter, :term),
-          placeholder: t("decidim.search.term_input_placeholder"),
-          title: t("decidim.search.term_input_placeholder"),
-          "aria-label": t("decidim.search.term_input_placeholder"),
-          tabindex: "0"
-        ) %>
-        <button type="submit" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
-          <%= icon "search-line" %>
-        </button>
-      <% end %>
-    </div>
-  </div>
 </div>

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

@@ -0,0 +1,12 @@
+<button id="main-dropdown-summary-mobile" class="main-bar__links-mobile__trigger p-0"
+                                          data-component="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" %>
+</button>
+
+<div id="dropdown-menu-main-mobile" class="main-bar__links-mobile__dropdown main-bar__links-mobile__dropdown-before" aria-hidden="true">
+  <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown_mobile", locals: { id: "breadcrumb-main-dropdown-mobile" } %>
+</div>
+
+<%= render partial: "layouts/decidim/header/main_links_mobile_item_account" %>

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

@@ -8,7 +8,7 @@
 </div>
 
 <div id="main-dropdown-menu" class="menu-bar__breadcrumb-desktop__dropdown-content no-animation" aria-hidden="true">
-  <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown", locals: { id: "breadcrumb-main-dropdown-desktop" } %>
+  <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown_desktop", locals: { id: "breadcrumb-main-dropdown-desktop" } %>
 </div>
 
 <%= render partial: "layouts/decidim/header/menu_breadcrumb_items" %>

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

@@ -0,0 +1,17 @@
+<div id="<%= id %>" class="menu-bar__main-dropdown">
+  <div class="menu-bar__main-dropdown__top">
+    <div class="mb-8">
+      <%= render partial: "layouts/decidim/header/menu_form_search_mobile" %>
+    </div>
+    <%= mobile_breadcrumb_root_menu.render %>
+    <%= render partial: "layouts/decidim/header/mobile_language_choose" %>
+  </div>
+  <div class="menu-bar__main-dropdown__bottom">
+    <div class="menu-bar__main-dropdown__bottom-left">
+      <%= cell("decidim/highlighted_participatory_process", menu_highlighted_participatory_process) %>
+    </div>
+    <div class="menu-bar__main-dropdown__bottom-right">
+      <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", current_organization %>
+    </div>
+  </div>
+</div>

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

@@ -1,2 +1,2 @@
-<h3 class="menu-bar__main-dropdown__title"><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization.name) %></h3>
+<h3 class="menu-bar__main-dropdown__title"><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization_name) %></h3>
 <p class="menu-bar__main-dropdown__subtitle"><%= organization_description_label %></p>

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

@@ -2,7 +2,7 @@
 <div class="menu-bar__breadcrumb-mobile__dropdown-trigger">
   <span>
     <% breadcrumb_items.last(2).each_with_index do |item, i| %>
-      <% item_label = decidim_html_escape(translated_attribute(item[:label])) %>
+      <% item_label = decidim_escape_translated(item[:label]) %>
       <% if i.positive? %>
         <span>/</span>
       <% end %>

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

@@ -0,0 +1,16 @@
+<%= form_tag(decidim.search_path, method: :get, id: "form-search-mobile", class: "filter-search") do %>
+        <%= text_field_tag(
+            :term,
+            nil,
+            id: "input-search-mobile",
+            class: "reset-defaults",
+            value: params[:term] || params.dig(:filter, :term),
+            placeholder: t("decidim.search.term_input_placeholder"),
+            title: t("decidim.search.term_input_placeholder"),
+            "aria-label": t("decidim.search.term_input_placeholder"),
+            tabindex: "0"
+        ) %>
+        <button type="submit" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
+            <%= icon "search-line" %>
+        </button>
+<% end %>

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

@@ -0,0 +1,25 @@
+<% 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">
+            <span><%= t("name", scope: "locale" ) %></span>
+            <%= icon "arrow-down-s-line" %>
+            <%= icon "arrow-up-s-line" %>
+            <span class="sr-only">
+                <% available_locales.each do |locale| %>
+                <span lang="<%= locale %>">
+                    <%= I18n.with_locale(locale) { t("layouts.decidim.language_chooser.choose_language") } %>
+                </span>
+                <% end %>
+            </span>
+    </button>
+    <div id="dropdown-menu-language-chooser-mobile" class="bg-gray-5 relative" aria-hidden="true">
+        <ul class="menu-bar__language-chooser" role="menu">
+        <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
+            <li class="text-black text-sm hover:bg-secondary hover:text-white transition h-10" role="presentation">
+              <%= link_to locale_name(locale), decidim.locale_path(locale:), method: :post, role: "menuitem", lang: locale, class: "p-2 w-full block" %>
+            </li>
+        <% end %>
+        </ul>
+    </div>
+    </div>
+<% end %>

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

@@ -83,9 +83,9 @@
                       <th class="small-12 first columns cityhall-bar">
                         <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
                           <% if @custom_url_for_mail_root.present? %>
-                            <%= link_to @organization.name.html_safe, @custom_url_for_mail_root %>
+                            <%= link_to organization_name(@organization).html_safe, @custom_url_for_mail_root %>
                           <% else %>
-                            <%= link_to @organization.name.html_safe, decidim.root_url(host: @organization.host) %>
+                            <%= link_to organization_name(@organization).html_safe, decidim.root_url(host: @organization.host) %>
                           <% end %>
                         </div>
                       </th>

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

@@ -2,7 +2,7 @@
 main_enabled = true unless local_assigns.has_key?(:main_enabled)
 main_tag = main_enabled ? :main : :div
 columns ||= 6
-# Class names need to be complete, not metaprogarmmed, because of Tailwind class purge
+# Class names need to be complete, not metaprogrammed, because of Tailwind class purge
 css_class = case columns
             when 10 then "cols-10"
             when 8 then "cols-8"

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

@@ -7,20 +7,6 @@
       <%= render partial: "layouts/decidim/shared/linked_resource" %>
     <% end %>
 
-    <% if local_assigns.has_key?(:prev_path) %>
-      <%= link_to prev_path, class: "layout-item__arrow prev", title: t(".prev") do %>
-        <%= icon "arrow-left-s-line" %>
-        <span class="sr-only">%<%= t(".prev") %></span>
-      <% end %>
-    <% end %>
-
-    <% if local_assigns.has_key?(:next_path) %>
-      <%= link_to next_path, class: "layout-item__arrow next", title: t(".next") do %>
-        <%= icon "arrow-right-s-line" %>
-        <span class="sr-only"><%= t(".next") %></span>
-      <% end %>
-    <% end %>
-
     <%= yield %>
   </main>
   <aside class="layout-item__aside" aria-label="aside">

data/config/initializers/active_storage.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Rails.application.config.active_storage[:variable_content_types] << "image/webp"

data/config/initializers/devise.rb

@@ -178,7 +178,7 @@ Devise.setup do |config|
   # A period that the user is allowed to confirm their account before their
   # token becomes invalid. For example, if set to 3.days, the user can confirm
   # their account within 3 days after the mail was sent, but on the fourth day
-  # their account cannot be confirmed with the token any more.
+  # their account cannot be confirmed with the token anymore.
   # Default is nil, meaning there is no restriction on how long a user can take
   # before confirming their account.
   # config.confirm_within = 3.days

data/config/initializers/new_framework_defaults_7_0.rb

@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+#
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.0 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.0`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+# `button_to` view helper will render `<button>` element, regardless of whether
+# or not the content is passed as the first argument or as a block.
+# Rails.application.config.action_view.button_to_generates_button_tag = true
+
+# `stylesheet_link_tag` view helper will not render the media attribute by default.
+# Rails.application.config.action_view.apply_stylesheet_media_default = false
+
+# Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
+# Changing this default means invalidate all encrypted messages generated by
+# your application and, all the encrypted cookies. Only change this after you
+# rotated all the messages using the key rotator.
+#
+# See upgrading guide for more information on how to build a rotator.
+# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html
+# Rails.application.config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA256
+
+# Change the digest class for ActiveSupport::Digest.
+# Changing this default means that for example Etags change and
+# various cache keys leading to cache invalidation.
+# Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
+
+# Do not override ActiveSupport::TimeWithZone.name and use the default Ruby
+# implementation.
+# Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
+
+# Calls `Rails.application.executor.wrap` around test cases.
+# This makes test cases behave closer to an actual request or job.
+# Several features that are normally disabled in test, such as Active Record query cache
+# and asynchronous queries will then be enabled.
+# Rails.application.config.active_support.executor_around_test_case = true
+
+# Set both the `:open_timeout` and `:read_timeout` values for `:smtp` delivery method.
+# Rails.application.config.action_mailer.smtp_timeout = 5
+
+# The ActiveStorage video previewer will now use scene change detection to generate
+# better preview images (rather than the previous default of using the first frame
+# of the video).
+# Rails.application.config.active_storage.video_preview_arguments =
+#   "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
+
+# Automatically infer `inverse_of` for associations with a scope.
+# Rails.application.config.active_record.automatic_scope_inversing = true
+
+# Raise when running tests if fixtures contained foreign key violations
+# Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
+
+# Disable partial inserts.
+# This default means that all columns will be referenced in INSERT queries
+# regardless of whether they have a default or not.
+# Rails.application.config.active_record.partial_inserts = false
+
+# Protect from open redirect attacks in `redirect_back_or_to` and `redirect_to`.
+# Rails.application.config.action_controller.raise_on_open_redirects = true
+
+# Change the variant processor for Active Storage.
+# Changing this default means updating all places in your code that
+# generate variants to use image processing macros and ruby-vips
+# operations. See the upgrading guide for detail on the changes required.
+# The `:mini_magick` option is not deprecated; it is fine to keep using it.
+# Rails.application.config.active_storage.variant_processor = :vips
+
+# Enable parameter wrapping for JSON.
+# Previously this was set in an initializer. It is fine to keep using that initializer if you have customized it.
+# To disable parameter wrapping entirely, set this config to `false`.
+# Rails.application.config.action_controller.wrap_parameters_by_default = true
+
+# Specifies whether generated namespaced UUIDs follow the RFC 4122 standard for namespace IDs provided as a
+# `String` to `Digest::UUID.uuid_v3` or `Digest::UUID.uuid_v5` method calls.
+#
+# See https://guides.rubyonrails.org/configuring.html#config-active-support-use-rfc4122-namespaced-uuids for
+# more information.
+# Rails.application.config.active_support.use_rfc4122_namespaced_uuids = true
+
+# Change the default headers to disable browsers' flawed legacy XSS protection.
+# Rails.application.config.action_dispatch.default_headers = {
+#   "X-Frame-Options" => "SAMEORIGIN",
+#   "X-XSS-Protection" => "0",
+#   "X-Content-Type-Options" => "nosniff",
+#   "X-Download-Options" => "noopen",
+#   "X-Permitted-Cross-Domain-Policies" => "none",
+#   "Referrer-Policy" => "strict-origin-when-cross-origin"
+# }
+
+# ** Please read carefully, this must be configured in config/application.rb **
+# Change the format of the cache entry.
+# Changing this default means that all new cache entries added to the cache
+# will have a different format that is not supported by Rails 6.1 applications.
+# Only change this value after your application is fully deployed to Rails 7.0
+# and you have no plans to rollback.
+# When you are ready to change format, add this to `config/application.rb` (NOT this file):
+#  config.active_support.cache_format_version = 7.0
+
+# Cookie serializer: 2 options
+#
+# If you are upgrading and have not set `cookies_serializer` previously, your cookie serializer
+# is `:marshal`. The default for new apps is `:json`.
+#
+# Rails.application.config.action_dispatch.cookies_serializer = :json
+#
+#
+# To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
+#
+# Rails transparently deserializes existing (Marshal-serialized) cookies on read and
+# re-writes them in the JSON format.
+#
+# It is fine to use `:hybrid` long term; you should do that until you are confident *all* your cookies
+# have been converted to JSON. To keep using `:hybrid` long term, move this config to its own
+# initializer or to `config/application.rb`.
+#
+# Rails.application.config.action_dispatch.cookies_serializer = :hybrid
+#
+#
+# If your cookies cannot yet be serialized to JSON, keep using `:marshal` for backward-compatibility.
+#
+# If you have configured the serializer elsewhere, you can remove this section of the file.
+#
+# See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
+
+# Change the return value of `ActionDispatch::Request#content_type` to the Content-Type header without modification.
+# Rails.application.config.action_dispatch.return_only_request_media_type_on_content_type = false
+
+# Active Storage `has_many_attached` relationships will default to replacing the current collection instead of appending to it.
+# Thus, to support submitting an empty collection, the `file_field` helper will render an hidden field `include_hidden` by
+# default when `multiple_file_field_include_hidden` is set to `true`.
+# See https://guides.rubyonrails.org/configuring.html#config-active-storage-multiple-file-field-include-hidden for more information.
+# Rails.application.config.active_storage.multiple_file_field_include_hidden = true
+
+# ** Please read carefully, this must be configured in config/application.rb (NOT this file) **
+# Disables the deprecated #to_s override in some Ruby core classes
+# See https://guides.rubyonrails.org/configuring.html#config-active-support-disable-to-s-conversion for more information.
+# config.active_support.disable_to_s_conversion = true