decidim-budgets 0.27.4 → 0.28.0.rc5

data/app/packs/stylesheets/budgets.scss

@@ -0,0 +1,273 @@
+.budget {
+  &-list__map {
+    @apply md:-ml-16 -mt-6 md:-mt-12 mb-6 aspect-square md:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 md:[&+*]:mt-12;
+  }
+
+  &-summary {
+    @apply bg-tertiary;
+
+    box-shadow: 0 4px 6px 0 rgba(211, 211, 211, 0.25);
+
+    &__content {
+      @apply p-4 md:p-0;
+    }
+
+    &__container {
+      @apply -mt-12 -my-16 mb-8;
+
+      .budget-summary {
+        @apply -ml-16;
+      }
+    }
+
+    &__content__header {
+      @apply col-span-2 text-2xl mb-2;
+
+      .ql-editor {
+        @apply inline-block text-2xl;
+      }
+    }
+
+    &__content__header--title {
+      @apply font-semibold;
+    }
+
+    &__content__header--description {
+      @apply text-sm;
+    }
+
+    &__progressbar {
+      @apply my-4 relative;
+
+      .budget-progress {
+        @apply bg-white rounded;
+      }
+
+      &--minimum {
+        @apply absolute;
+
+        .progress-meter--minimum-mark {
+          @apply h-[20px] ml-auto w-[2px] bg-black block;
+        }
+      }
+
+      &--meter {
+        background-color: var(--success);
+
+        @apply h-[20px] rounded;
+      }
+    }
+
+    &__progressbar-marks {
+      @apply grid grid-cols-[70%_1fr_1fr] mt-2;
+    }
+
+    &__progressbar-marks_center {
+      @apply text-center -translate-x-2/4;
+    }
+
+    &__progressbar-marks_right {
+      @apply justify-self-end text-left md:text-right;
+    }
+
+    &__progressbar-legend {
+      @apply text-sm block;
+    }
+
+    &__progressbar-legend-strong {
+      @apply font-bold block;
+    }
+  }
+
+  &__card__list-project {
+    @apply ml-auto rounded py-3 px-6 bg-background w-[30%] min-w-[120px] grid grid-cols-1 md:grid-cols-2 md:place-items-center;
+  }
+
+  &__card__list-project__amount {
+    @apply font-semibold text-gray-2 text-xl inline-block text-center mb-2 md:mb-0;
+  }
+
+  &__card__highlight-vote {
+    @apply justify-center flex flex-col w-full md:w-1/4 bg-background p-4 bg-background font-bold text-gray-2 ml-auto;
+  }
+
+  &__card__highlight-vote__header {
+    @apply place-items-start pb-2;
+  }
+
+  &__card__highlight-vote__text {
+    @apply block text-sm text-gray-2 font-normal;
+  }
+
+  &__card__highlight-vote__number {
+    @apply text-xl font-semibold;
+  }
+
+  &__card__highlight-vote__button {
+    @apply mt-auto text-left mt-2;
+
+    &.button__secondary:hover {
+      @apply text-white #{!important};
+
+      background: rgb(var(--secondary-rgb) / var(--tw-bg-opacity)) !important;
+    }
+
+    &.button__transparent-secondary:hover {
+      @apply border-secondary text-secondary #{!important};
+
+      background: #fff !important;
+    }
+  }
+
+  &__definition-project__title .ql-editor {
+    @apply text-4xl mb-4;
+  }
+
+  &__definition-data__title {
+    @apply text-sm text-gray-2 mt-6 mb-2 block;
+  }
+
+  &__definition-data__number {
+    @apply text-gray-2 font-bold text-3xl bg-background text-center p-2 rounded;
+  }
+
+  &__filter-title {
+    @apply font-bold mb-4;
+  }
+
+  &__filter__container {
+    @apply my-4 rounded p-2 border-4 border-white;
+  }
+
+  &__list--header {
+    @apply grid grid-cols-2;
+  }
+
+  &-list {
+    .card__list {
+      @apply pr-0;
+    }
+
+    .card__link {
+      @apply mb-2 block;
+    }
+
+    .tag-container {
+      @apply [&:not(:first-child)]:px-6;
+    }
+
+    .card__list-content {
+      @apply w-full cursor-pointer;
+    }
+
+    .project-item {
+      @apply flex gap-4;
+
+      .card__list {
+        @apply inline-block w-[65%];
+      }
+
+      + .project-item {
+        @apply mt-6;
+      }
+    }
+  }
+}
+
+#budgets-to-vote {
+  .card__highlight-text {
+    @apply w-full md:w-[70%] p-0;
+  }
+
+  .order-by {
+    @apply mb-8;
+  }
+}
+
+.verification-modal .card__list .budget__card__list-project {
+  @apply inline-block w-[25%] text-center;
+}
+
+#budgets.card__highlight-container {
+  @apply mb-0;
+}
+
+.progressbox-fixed-wrapper {
+  @apply bg-tertiary fixed hidden inset-x-0 inset-y-0 h-max z-20;
+
+  box-shadow: 0 4px 6px 0 rgba(211, 211, 211, 0.25);
+}
+
+.progressbox-fixed-wrapper.is-progressbox-visible {
+  @apply block;
+}
+
+#budget-confirm .card__list__project-voted {
+  @apply hover:border-background cursor-default flex-row;
+
+  .card__list-title {
+    @apply cursor-default no-underline;
+  }
+
+  .card__list__content {
+    @apply w-[75%];
+  }
+}
+
+.budget-summary__progressbox--checked_out {
+  @apply hidden md:block;
+}
+
+.budget-summary__content {
+  @apply md:grid md:grid-cols-12 md:items-center md:px-16 pt-4 px-4;
+}
+
+.budget-summary__progressbox {
+  @apply md:col-span-8;
+}
+
+.budget-summary__progressbox-buttons {
+  @apply md:col-span-3 md:col-start-10;
+}
+
+.budget-summary__button-modal {
+  @apply col-span-12 mb-4 pb-4;
+}
+
+.progressbox-fixed-wrapper {
+  .budget-summary__progressbar {
+    @apply md:pl-32 md:pr-8;
+  }
+
+  .budget-summary__progressbox {
+    @apply md:col-span-5 md:col-start-4;
+  }
+
+  .budget-summary__progressbox-buttons {
+    @apply md:col-start-10 md:col-span-2;
+  }
+}
+
+#project-item {
+  .budget-summary__content {
+    @apply py-4 md:py-4 md:container md:grid grid-cols-1 md:grid-cols-12 md:items-center;
+  }
+
+  .budget-summary__progressbox {
+    @apply md:col-start-2 md:col-span-7 relative;
+  }
+
+  .budget-summary__progressbox-buttons {
+    @apply md:col-start-10 md:col-span-2;
+  }
+
+  .budget-summary__button-modal {
+    @apply col-span-10 col-start-2 justify-start;
+  }
+
+  .progressbox-fixed-wrapper {
+    .budget-summary__progressbar {
+      @apply md:col-start-1 md:col-span-7;
+    }
+  }
+}

data/app/presenters/decidim/budgets/admin_log/budget_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Budgets::Budget`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/budgets/admin_log/project_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Budgets::Project``
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/services/decidim/budgets/order_reminder_generator.rb

@@ -31,12 +31,12 @@ module Decidim
       attr_reader :reminder_manifest
 
       def send_reminders(component)
-        budgets = Decidim::Budgets::Budget.where(component: component)
+        budgets = Decidim::Budgets::Budget.where(component:)
         pending_orders = Decidim::Budgets::Order.where(budget: budgets, checked_out_at: nil)
         users = Decidim::User.where(id: pending_orders.pluck(:decidim_user_id).uniq)
         users.each do |user|
-          reminder = Decidim::Reminder.find_or_create_by(user: user, component: component)
-          users_pending_orders = pending_orders.where(user: user)
+          reminder = Decidim::Reminder.find_or_create_by(user:, component:)
+          users_pending_orders = pending_orders.where(user:)
           update_reminder_records(reminder, users_pending_orders)
           if reminder.records.active.any?
             Decidim::Budgets::SendVoteReminderJob.perform_later(reminder)
@@ -61,7 +61,7 @@ module Decidim
       end
 
       def add_pending_orders(reminder, users_pending_orders)
-        reminder.records << users_pending_orders.map { |order| Decidim::ReminderRecord.find_or_create_by(reminder: reminder, remindable: order) }
+        reminder.records << users_pending_orders.map { |order| Decidim::ReminderRecord.find_or_create_by(reminder:, remindable: order) }
         return @alternative_refresh_state.call(reminder) if @alternative_refresh_state.present?
 
         reminder.records.each do |record|

data/app/views/decidim/budgets/admin/budgets/_form.html.erb

@@ -1,23 +1,28 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
 
-      <%= form.number_field :weight %>
+      <div class="row column">
+        <%= form.number_field :weight %>
+      </div>
 
-      <%= form.translated :editor, :description, toolbar: :content %>
+      <div class="row column">
+        <%= form.translated :editor, :description, toolbar: :content, aria: { label: :description } %>
+      </div>
 
-      <%= form.number_field :total_budget %>
+      <div class="row column">
+        <%= form.number_field :total_budget %>
+      </div>
 
       <% if current_component.has_subscopes? %>
         <div class="row column">
-          <%= scopes_picker_field form, :decidim_scope_id, root: current_component.scope %>
+          <%= scopes_select_field form, :decidim_scope_id, root: current_component.scope %>
         </div>
       <% end %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/decidim/budgets/admin/budgets/edit.html.erb

@@ -1,8 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form edit_budget" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_budget" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/budgets/admin/budgets/index.html.erb

@@ -1,71 +1,69 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card with-overflow">
-  <div class="card-divider">
-    <h2 class="card-title flex--sbc">
-      <div>
-        <%= t(".title") %>
-      </div>
-      <div class="flex--cc flex-gap--1">
-        <% if allowed_to? :remind, :order %>
-          <%= link_to t("actions.send_voting_reminders", scope: "decidim.budgets"), admin_reminders_path(current_component, name: "orders"), class: "button tiny button--title" %>
-        <% end %>
-        <% if allowed_to? :export, :budget %>
-          <%= export_dropdown %>
-        <% end %>
-        <div id="js-other-actions-wrapper">
-          <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.budget.name", scope: "decidim.budgets.admin")), new_budget_path, class: "button tiny button--title" if allowed_to? :create, :budget %>
-        </div>
+<div class="card">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
+      <%= t(".title") %>
+      <% if allowed_to? :export, :budget %>
+        <%= export_dropdown %>
+      <% end %>
+      <% if allowed_to? :remind, :order %>
+        <%= link_to t("actions.send_voting_reminders", scope: "decidim.budgets"), admin_reminders_path(current_component, name: "orders"), class: "button button__sm button__secondary" %>
+      <% end %>
+      <div id="js-other-actions-wrapper">
+        <%= link_to t("actions.new_budget", scope: "decidim.budgets"), new_budget_path, class: "button button__sm button__secondary" if allowed_to? :create, :budget %>
       </div>
+      <%= render partial: "decidim/admin/components/resource_action" %>
     </h2>
   </div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.budget.fields.name", scope: "decidim.budgets") %></th>
+          <th><%= t("models.budget.fields.total_budget", scope: "decidim.budgets") %></th>
+          <th><%= t("models.budget.fields.projects_count", scope: "decidim.budgets") %></th>
+          <%= th_resource_scope_label %>
+          <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% budgets.each do |budget| %>
+          <tr data-id="<%= budget.id %>">
+            <td>
+              <% if allowed_to? :update, :budget, budget: budget %>
+                <%= link_to translated_attribute(budget.title), budget_projects_path(budget) %><br>
+              <% else %>
+                <%= translated_attribute(budget.title) %>
+              <% end %>
+            </td>
+            <td>
+              <%= number_to_currency budget.total_budget, unit: Decidim.currency_unit, precision: 0 %>
+            </td>
+            <td>
+              <%= link_to budget.projects.count, budget_projects_path(budget) %>
+            </td>
+            <%= td_resource_scope_for(budget.scope) %>
+            <td class="table-list__actions">
+              <% if allowed_to? :update, :budget, budget: budget %>
+                <%= icon_link_to "pencil-line", edit_budget_path(budget), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
+              <% else %>
+                <%= icon "pencil-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.budgets") %>
+              <% end %>
 
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= t("models.budget.fields.name", scope: "decidim.budgets") %></th>
-            <th><%= t("models.budget.fields.total_budget", scope: "decidim.budgets") %></th>
-            <th><%= t("models.budget.fields.projects_count", scope: "decidim.budgets") %></th>
-            <%= th_resource_scope_label %>
-            <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% budgets.each do |budget| %>
-            <tr data-id="<%= budget.id %>">
-              <td>
-                <%= link_to translated_attribute(budget.title), resource_locator(budget).path %>
-              </td>
-              <td>
-                <%= number_to_currency budget.total_budget, unit: Decidim.currency_unit, precision: 0 %>
-              </td>
-              <td>
-                <%= link_to budget.projects.count, budget_projects_path(budget) %>
-              </td>
-              <%= td_resource_scope_for(budget.scope) %>
-              <td class="table-list__actions">
-                <%= icon_link_to "eye", resource_locator(budget).path, t("actions.preview", scope: "decidim.budgets"), class: "action-icon--preview", target: :blank %>
-
-                <%= icon_link_to "list", budget_projects_path(budget), t("actions.edit_projects", scope: "decidim.budgets"), class: "action-icon--edit-projects" %>
+              <%= icon_link_to "list-check", budget_projects_path(budget), t("actions.edit_projects", scope: "decidim.budgets"), class: "action-icon--edit-projects" %>
 
-                <% if allowed_to? :update, :budget, budget: budget %>
-                  <%= icon_link_to "pencil", edit_budget_path(budget), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
-                <% else %>
-                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.budgets") %>
-                <% end %>
+              <%= icon_link_to "eye-line", resource_locator(budget).path, t("actions.preview", scope: "decidim.budgets"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
 
-                <% if allowed_to? :delete, :budget, budget: budget %>
-                  <%= icon_link_to "circle-x", budget_path(budget), t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
-                <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+              <% if allowed_to? :delete, :budget, budget: budget %>
+                <%= icon_link_to "delete-bin-line", budget_path(budget), t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
+              <% else %>
+                <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
   <div class="card-divider">
     <strong><%= t ".finished_orders" %>:&nbsp;</strong><span><%= finished_orders.count %></span>

data/app/views/decidim/budgets/admin/budgets/new.html.erb

@@ -1,8 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form new_budget" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form new_budget" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb

@@ -1,13 +1,22 @@
-<div class="flex--cc flex-gap--1">
-  <%= render partial: "decidim/budgets/admin/projects/bulk_actions/dropdown" %>
+<div class="flex items-center gap-x-4">
+  <div class="bulk-actions-budgets">
+    <%= render partial: "decidim/budgets/admin/projects/bulk_actions/dropdown" %>
 
-  <%= render partial: "decidim/budgets/admin/projects/bulk_actions/recategorize" %>
-  <%= render partial: "decidim/budgets/admin/projects/bulk_actions/scope-change" %>
-  <%= render partial: "decidim/budgets/admin/projects/bulk_actions/change-selected" %>
+    <%= render partial: "decidim/budgets/admin/projects/bulk_actions/recategorize" %>
+    <%= render partial: "decidim/budgets/admin/projects/bulk_actions/scope-change" %>
+    <%= render partial: "decidim/budgets/admin/projects/bulk_actions/change-selected" %>
+    <%= render partial: "decidim/budgets/admin/projects/bulk_actions/budget-change" %>
 
-  <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_proposals_import_path(budget), class: "button tiny button--title" if allowed_to? :import_proposals, :project %>
-  <% if allowed_to? :export, :budget %>
-    <%= export_dropdown(current_component, budget.id) %>
-  <% end %>
-  <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_project_path, class: "button tiny button--title new" if allowed_to? :create, :project %>
+    <% if allowed_to? :export, :budget %>
+      <%= export_dropdowns(query, current_component, budget.id) %>
+    <% end %>
+    <% if allowed_to? :import_proposals, :project %>
+      <%= import_dropdown do %>
+        <li class="imports--component">
+          <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_proposals_import_path(budget) %>
+        </li>
+      <% end %>
+    <% end %>
+    <%= link_to t("actions.new_project", scope: "decidim.budgets"), new_budget_project_path, class: "button button__sm button__secondary new" if allowed_to? :create, :project %>
+  </div>
 </div>

data/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -1,51 +1,47 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= title.html_safe %>
-    </h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
-
-    <div class="row column">
-      <%= form.number_field :budget_amount %>
-    </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
 
-    <% if @form.geocoding_enabled? %>
       <div class="row column">
-        <%= form.geocoding_field :address %>
+        <%= form.translated :editor, :description, aria: { label: :description } %>
       </div>
-    <% end %>
 
-    <% if current_component.has_subscopes? %>
       <div class="row column">
-        <%= scopes_picker_field form, :decidim_scope_id, root: budget.scope %>
+        <%= form.number_field :budget_amount %>
       </div>
-    <% end %>
 
-    <div class="row column">
-      <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
-    </div>
+      <% if @form.geocoding_enabled? %>
+        <div class="row column">
+          <%= form.geocoding_field :address %>
+        </div>
+      <% end %>
+
+      <% if current_component.has_subscopes? %>
+        <div class="row column">
+          <%= scopes_select_field form, :decidim_scope_id, root: budget.scope %>
+        </div>
+      <% end %>
 
-    <% if Decidim::Budgets.enable_proposal_linking %>
       <div class="row column">
-        <%= proposals_picker(form, :proposals, proposals_picker_projects_path) %>
+        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
       </div>
-    <% end %>
 
-    <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
-
-    <% if form.object.persisted? %>
+    <% if Decidim::Budgets.enable_proposal_linking %>
       <div class="row column">
-        <%= form.check_box :selected %>
+        <%= render partial: "decidim/proposals/proposals/proposals_picker", locals: { form:, field: :proposals } %>
       </div>
     <% end %>
+
+      <%= render partial: "decidim/admin/shared/gallery", locals: { form: } %>
+
+      <% if form.object.persisted? %>
+        <div class="row column">
+          <%= form.check_box :selected %>
+        </div>
+      <% end %>
+    </div>
   </div>
 </div>