decidim-initiatives 0.27.4 → 0.28.0.rc5

data/app/packs/stylesheets/initiatives.scss

@@ -0,0 +1,171 @@
+.initiatives {
+  @apply block;
+
+  &__selection {
+    .form-defaults {
+      @apply my-10;
+    }
+
+    .card__highlight {
+      @apply pl-4 pr-20 py-4 items-center justify-between gap-4;
+    }
+
+    .card__highlight-authorized {
+      @apply w-full my-10 hover:cursor-default hover:ring-background;
+    }
+
+    &__icon {
+      @apply flex-none w-8 h-8 text-gray fill-secondary;
+
+      &.is-granted {
+        @apply text-success;
+      }
+    }
+
+    &__text {
+      @apply grow space-y-2.5 text-left;
+
+      span {
+        @apply inline-block text-sm text-gray-2;
+      }
+    }
+
+    &:hover {
+      @apply border-tertiary;
+    }
+  }
+
+  &__progress-bar {
+    .progress-bar__container {
+      @apply w-16;
+    }
+
+    .progress-bar__number {
+      @apply text-gray-2 font-normal text-sm;
+    }
+
+    .progress-bar__units {
+      @apply hidden;
+    }
+  }
+
+  &__card__grid-metadata-dates {
+    @apply block justify-center content-center;
+
+    svg {
+      @apply fill-gray;
+    }
+
+    span {
+      @apply text-gray-2;
+    }
+  }
+}
+
+.initiative {
+  &__hero {
+    @apply backdrop-brightness-[30%];
+
+    &-text {
+      @apply container text-center text-white md:px-16 pt-10 pb-14 md:[&_a_+_a]:ml-6;
+    }
+
+    &-slogan {
+      @apply text-lg font-normal my-4;
+    }
+
+    &-location {
+      @apply text-lg;
+    }
+
+    .initiatives__card__grid-metadata-dates {
+      svg {
+        @apply fill-white;
+      }
+
+      span {
+        @apply text-white;
+      }
+    }
+  }
+
+  &__form__committee {
+    @apply flex items-center px-4 py-2 border border-gray outline outline-1 outline-transparent rounded bg-background-2 focus:outline-2 focus:outline-secondary w-full;
+
+    span {
+      @apply text-black font-normal;
+    }
+  }
+
+  &__aside {
+    @apply md:px-6 md:pb-6 w-full;
+
+    .layout-aside__section {
+      .profile__user-nick {
+        @apply hidden;
+      }
+
+      .participatory-space__nav-container {
+        @apply ml-0;
+      }
+
+      .author {
+        @apply mb-6;
+      }
+
+      .profile__user-avatar-container {
+        @apply w-6 h-6;
+      }
+
+      .profile__user-name {
+        @apply text-sm ml-2;
+      }
+    }
+  }
+
+  &__aside__element__committee {
+    @apply mb-6 flex items-center;
+  }
+
+  &__aside__element__data {
+    @apply ml-2 mb-4 pb-4 border-b border-gray-3;
+  }
+
+  &__aside__element__data-title {
+    @apply text-gray-2 font-semibold text-sm mb-2;
+  }
+
+  &__aside__element__data-text {
+    @apply text-sm font-normal text-gray-2 block;
+  }
+
+  &__aside__element-title {
+    @apply inline-block text-gray-2 font-bold text-md align-middle;
+  }
+}
+
+#initiatives {
+  .card__grid {
+    @apply relative;
+  }
+
+  .card__grid-text {
+    @apply min-h-[120px];
+  }
+
+  .initiative-status {
+    @apply text-center ml-2;
+  }
+
+  .initiatives__card__grid-metadata-dates {
+    @apply mr-2;
+  }
+
+  .initiatives__progress-bar {
+    @apply mx-2;
+  }
+}
+
+.edit_initiative .profile__group__list {
+  @apply w-full;
+}

data/app/permissions/decidim/initiatives/permissions.rb

@@ -88,9 +88,9 @@ module Decidim
       def creation_enabled?
         Decidim::Initiatives.creation_enabled && (
         Decidim::Initiatives.do_not_require_authorization ||
-            UserAuthorizations.for(user).any? ||
-            Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
-      )
+          UserAuthorizations.for(user).any? ||
+          Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?) &&
+          authorized?(:create, permissions_holder: initiative_type)
       end
 
       def request_membership?

data/app/presenters/decidim/initiatives/admin_log/initiative_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Initiative`
       # 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/initiatives/admin_log/initiatives_settings_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::InitiativesSettings`
       # 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/initiatives/admin_log/initiatives_type_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::InitiativesType`
       # 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/queries/decidim/initiatives/organization_prioritized_initiatives.rb

@@ -22,7 +22,7 @@ module Decidim
       private
 
       def base_query
-        Decidim::Initiative.where(organization: organization).published.open
+        Decidim::Initiative.where(organization:).published.open
       end
     end
   end

data/app/queries/decidim/initiatives/similar_initiatives.rb

@@ -31,8 +31,8 @@ module Decidim
           .where(organization: @organization)
           .where(
             Arel.sql("GREATEST(#{title_similarity}, #{description_similarity}) >= ?").to_s,
-            form.title,
-            form.description,
+            translated_attribute(form.title),
+            translated_attribute(form.description),
             Decidim::Initiatives.similarity_threshold
           )
           .limit(Decidim::Initiatives.similarity_limit)

data/app/queries/decidim/initiatives/support_period_finished_initiatives.rb

@@ -5,7 +5,7 @@ module Decidim
     # Class uses to retrieve initiatives that have been a long time in validating
     # state
     class SupportPeriodFinishedInitiatives < Decidim::Query
-      # Retrieves the initiatives ready to be evaluated to decide if they've been
+      # Retrieves the initiatives ready to be evaluated to decide if they have been
       # accepted or not.
       def query
         Decidim::Initiative

data/app/queries/decidim/initiatives/user_authorizations.rb

@@ -22,7 +22,7 @@ module Decidim
 
       # Retrieves authorizations for the given user.
       def query
-        Authorization.where(user: user).where.not(granted_at: nil)
+        Authorization.where(user:).where.not(granted_at: nil)
       end
     end
   end

data/app/services/decidim/initiatives/pdf_signature_example.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: false
 
-require "origami"
+require "hexapdf"
 require "tempfile"
-require_relative "../../../../lib/gem_overrides/origami/date"
 
 module Decidim
   module Initiatives
@@ -18,64 +17,57 @@ module Decidim
 
       # Public: PDF signed using a new certificate generated by the service
       def signed_pdf
-        @signed_pdf ||= StringIO.open(pdf) do |stream|
-          parsed_pdf = Origami::PDF.read(stream)
-          parsed_pdf.append_page do |page|
-            page.add_annotation(signature_annotation)
-            parsed_pdf.sign(
-              certificate,
-              key,
-              method: "adbe.pkcs7.detached",
-              annotation: signature_annotation,
-              location: location,
-              contact: contact,
-              issuer: issuer
-            )
-          end
-          extract_signed_pdf(parsed_pdf)
+        signed_file = Tempfile.new("signed_pdf")
+
+        doc = HexaPDF::Document.new(io: StringIO.new(pdf))
+
+        # Prepare the document for embedding of the digital signature
+        data = nil # Used for storing the to-be-signed data
+        signing_mechanism = lambda do |io, byte_range|
+          # Store the to-be-signed data in the local variable data
+          io.pos = byte_range[0]
+          data = io.read(byte_range[1])
+          io.pos = byte_range[2]
+          data << io.read(byte_range[3])
+          ""
         end
+        doc.sign(signed_file.path, signature: signature_widget(doc), reason: caption, signature_size: 10_000, external_signing: signing_mechanism)
+
+        signature = OpenSSL::PKCS7.sign(certificate, key, data,
+                                        # [HexaPDF.demo_cert.sub_ca, HexaPDF.demo_cert.root_ca],
+                                        [],
+                                        OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY).to_der
+
+        # Embed the signature
+        HexaPDF::DigitalSignature::Signing.embed_signature(File.open(signed_file.path, "rb+"), signature)
+
+        File.binread(signed_file.path)
+      ensure
+        signed_file.close
+        signed_file.unlink
       end
 
       private
 
-      def extract_signed_pdf(parsed_pdf)
-        file = Tempfile.new("signed_pdf")
-        begin
-          parsed_pdf.save(file.path)
-          File.binread(file.path)
-        ensure
-          file.close
-          file.unlink
-        end
-      end
+      def signature_widget(doc)
+        doc.pages.add.document
 
-      def text_annotation(options = {})
-        width = options.fetch(:width, 200.0)
-        height = options.fetch(:height, 50.0)
-        size = options.fetch(:size, 8)
-
-        Origami::Annotation::AppearanceStream.new.tap do |annotation|
-          annotation.Type = Origami::Name.new("XObject")
-          annotation.Resources = Origami::Resources.new
-          annotation.Resources.ProcSet = [Origami::Name.new("Text")]
-          annotation.set_indirect(true)
-          annotation.Matrix = [1, 0, 0, 1, 0, 0]
-          annotation.BBox = [0, 0, width, height]
-          annotation.write(caption, x: size, y: (height / 2) - (size / 2), size: size)
-        end
-      end
+        form = doc.acro_form(create: true)
+        form.signature_flag(:append_only)
 
-      def signature_annotation(options = {})
-        @signature_annotation ||= begin
-          width = options.fetch(:width, 200.0)
-          height = options.fetch(:height, 50.0)
+        sig_field = form.create_signature_field("signature")
 
-          Origami::Annotation::Widget::Signature.new.tap do |annotation|
-            annotation.set_indirect(true)
-            annotation.Rect = Origami::Rectangle[llx: height, lly: width + height, urx: width + height, ury: width]
-            annotation.set_normal_appearance(text_annotation(width: width, height: height))
-          end
-        end
+        widget = sig_field.create_widget(doc.pages[doc.pages.length - 1], Rect: [60, 50, 250, 620])
+        widget.flag(:print)
+        xobject = (widget[:AP] ||= {})[:N] ||= doc.add({ Type: :XObject, Subtype: :Form }) # Create the appearance for the widget
+        xobject[:BBox] = [0, 0, widget[:Rect].width, widget[:Rect].height]
+        xobject.canvas
+               .font("Helvetica", size: 10)
+               .text(caption, at: [10, 30])
+
+        sig = doc.add({ Type: :Sig }) # set an empty signature and apply it to the field
+        sig_field.field_value = sig
+        sig
       end
 
       def certificate

data/app/views/decidim/initiatives/_modal.html.erb

@@ -0,0 +1,15 @@
+<%= decidim_modal id: "not-authorized-modal" do %>
+  <div data-dialog-container>
+    <%= icon "information-line" %>
+    <h3 class="h3" id="dialog-title-not-authorized-modal" data-dialog-title>
+      <%= t(".not_authorized.title") %>
+    </h3>
+    <p id="dialog-desc-not-authorized-modal"><%= t(".not_authorized.explanation") %></p>
+  </div>
+  <div data-dialog-actions>
+    <%= link_to t(".not_authorized.authorizations_page"), decidim_verifications.authorizations_path(redirect_url: create_initiative_url(:select_initiative_type)), class: "button button__sm md:button__lg button__secondary" %>
+    <button data-dialog-close="not-authorized-modal" class="button button__sm md:button__lg button__secondary">
+      <%= t("ok", scope: "decidim.budgets.projects.budget_excess") %>
+    </button>
+  </div>
+<% end %>

data/app/views/decidim/initiatives/admin/answers/_info_initiative.html.erb

@@ -1,23 +1,25 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= link_to "#{t ".initiatives"} > ", initiatives_path %>
-      <%= decidim_sanitize translated_attribute(initiative.title) %>
-    </h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <strong><%= t ".description" %>: </strong> <%= decidim_sanitize_editor translated_attribute(initiative.description) %>
-    </div>
-    <div class="row column">
-      <strong><%= t ".created_at" %>: </strong> <%= l initiative.created_at, format: :decidim_short %>
+<div class="form__wrapper">
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title">
+        <%= link_to "#{t ".initiatives"} > ", initiatives_path %>
+        <%= decidim_sanitize translated_attribute(initiative.title) %>
+      </h2>
     </div>
-    <div class="row column">
-      <strong><%= t ".state" %>: </strong> <%= I18n.t(initiative.state, scope: "decidim.initiatives.admin_states") %>
-    </div>
-    <div class="row column">
-      <strong><%= t ".initiative_votes_count" %>: </strong> <%= initiative.online_votes_count %>
+
+    <div class="card-section">
+      <div class="row column">
+        <strong><%= t ".description" %>: </strong> <%= decidim_sanitize_editor translated_attribute(initiative.description) %>
+      </div>
+      <div class="row column">
+        <strong><%= t ".created_at" %>: </strong> <%= l initiative.created_at, format: :decidim_short %>
+      </div>
+      <div class="row column">
+        <strong><%= t ".state" %>: </strong> <%= I18n.t(initiative.state, scope: "decidim.initiatives.admin_states") %>
+      </div>
+      <div class="row column">
+        <strong><%= t ".initiative_votes_count" %>: </strong> <%= initiative.online_votes_count %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/decidim/initiatives/admin/answers/edit.html.erb

@@ -1,35 +1,49 @@
-<%= render partial: "info_initiative", locals: { initiative: current_initiative } %>
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("decidim.admin_log.helpers.answers") %>
+  </h2>
+</div>
 
-<%= decidim_form_for(@form, url: initiative_answer_path(current_initiative), html: { class: "form edit_initiative_answer" }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title", title: translated_attribute(current_initiative.title) %></h2>
-    </div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= render partial: "info_initiative", locals: { initiative: current_initiative } %>
 
-    <div class="card-section">
-      <div class="row column">
-        <%= f.translated :editor, :answer, autofocus: true, rows: 15 %>
-      </div>
+    <%= decidim_form_for(@form, url: initiative_answer_path(current_initiative), html: { class: "form-defaults form edit_initiative_answer" }) do |f| %>
+      <div class="form__wrapper">
+        <div class="card">
+          <div class="card-divider">
+            <h2 class="card-title"><%= t ".title", title: translated_attribute(current_initiative.title) %></h2>
+          </div>
 
-      <div class="row column">
-        <%= f.text_field :answer_url %>
-      </div>
+          <div class="card-section">
+            <div class="row column">
+              <%= f.translated :editor, :answer, autofocus: true, rows: 15 %>
+            </div>
 
-      <% if @form.signature_dates_required? %>
-        <div class="row">
-          <div class="columns xlarge-6">
-            <%= f.date_field :signature_start_date, disabled: !@form.signature_dates_required? %>
-          </div>
+            <div class="row column">
+              <%= f.text_field :answer_url %>
+            </div>
+
+            <% if @form.signature_dates_required? %>
+              <div class="row">
+                <div class="columns">
+                  <%= f.date_field :signature_start_date, disabled: !@form.signature_dates_required? %>
+                </div>
 
-          <div class="columns xlarge-6">
-            <%= f.date_field :signature_end_date, disabled: !@form.signature_dates_required? %>
+                <div class="columns">
+                  <%= f.date_field :signature_end_date, disabled: !@form.signature_dates_required? %>
+                </div>
+              </div>
+            <% end %>
           </div>
         </div>
-      <% end %>
-    </div>
-  </div>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".answer") %>
+      </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".answer"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/initiatives/admin/committee_requests/index.html.erb

@@ -1,9 +1,12 @@
+<% add_decidim_page_title(t(".title")) %>
 <div class="card" id="committee_members">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".title" %></h2>
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
+      <%= t ".title" %>
+    </h2>
   </div>
 
-  <div class="card-section">
+  <div class="card-section p-4">
     <div class="row column">
       <%= t ".invite_to_committee_help" %>
     </div>
@@ -11,56 +14,46 @@
     <div class="row column">
       <div class="committee_link" id="committee_link">
         <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>
+        <%= icon_link_to "clipboard-line", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %>
       </div>
-      <%= icon_link_to "clipboard", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %>
     </div>
   </div>
+</div>
 
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-        <tr>
-          <th><%= t "user", scope: "activemodel.attributes.initiatives_committee_member" %></th>
-          <th></th>
-        </tr>
-        </thead>
-        <tbody>
-          <% if current_initiative.committee_members.empty? %>
-          <tr>
-            <td><%= t ".no_members_yet" %></td>
-            <td></td>
-          </tr>
-          <% end %>
+<div class="table-scroll mt-4">
+  <table class="table-list">
+    <thead>
+    <tr>
+      <th><%= t "user", scope: "activemodel.attributes.initiatives_committee_member" %></th>
+      <th></th>
+    </tr>
+    </thead>
+    <tbody>
+      <% if current_initiative.committee_members.empty? %>
+      <tr>
+        <td><%= t ".no_members_yet" %></td>
+        <td></td>
+      </tr>
+      <% end %>
 
-          <% current_initiative.committee_members.each do |request| %>
-            <tr data-id="<%= request.id %>">
-              <td>
-                <%= link_to request.user.name, "mailto:#{request.user.email}" %>
-              </td>
-              <td class="table-list__actions">
-                <% if allowed_to? :approve, :initiative_committee_member, request: request %>
-                  <%= icon_link_to "check",
-                                   approve_initiative_committee_request_path(current_initiative, request),
-                                   t(".approve"),
-                                   class: "action-icon--check" %>
-                <% end %>
+      <% current_initiative.committee_members.each do |request| %>
+        <tr data-id="<%= request.id %>">
+          <td>
+            <%= link_to request.user.name, "mailto:#{request.user.email}" %>
+          </td>
+          <td class="table-list__actions">
+            <% if allowed_to? :approve, :initiative_committee_member, request: request %>
+              <%= icon_link_to "check-line", approve_initiative_committee_request_path(current_initiative, request), t(".approve"), class: "action-icon--check" %>
+            <% end %>
 
-                <% if allowed_to? :revoke, :initiative_committee_member, request: request %>
-                  <%= icon_link_to "circle-x",
-                                   revoke_initiative_committee_request_path(current_initiative, request),
-                                   t(".revoke"),
-                                   class: "action-icon--remove",
-                                   method: :delete,
-                                   data: { confirm: t(".confirm_revoke") } %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-  </div>
+            <% if allowed_to? :revoke, :initiative_committee_member, request: request %>
+              <%= icon_link_to "delete-bin-line", revoke_initiative_committee_request_path(current_initiative, request), t(".revoke"), class: "action-icon--remove", method: :delete, data: { confirm: t(".confirm_revoke") } %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 </div>
 
-<%= javascript_pack_tag "decidim_initiatives_admin" %>
+<%= append_javascript_pack_tag "decidim_initiatives_admin" %>

data/app/views/decidim/initiatives/admin/exports/_dropdown.html.erb

@@ -1,9 +1,10 @@
-<span class="exports dropdown tiny button button--simple" data-toggle="<%= dropdown_id(collection_ids) %>">
+<span class="exports button button__sm button__secondary button--simple" data-toggle="<%= dropdown_id(collection_ids) %>">
   <% if collection_ids.present? %>
     <%= t("actions.export-selection", scope: "decidim.admin") %>
-    <% else %>
-        <%= t("actions.export", scope: "decidim.admin") %>
-    <% end %>
+  <% else %>
+    <%= t("actions.export", scope: "decidim.admin") %>
+  <% end %>
+  <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
 </span>
 <div class="dropdown-pane"
      id="<%= dropdown_id(collection_ids) %>"
@@ -13,11 +14,11 @@
      data-auto-focus="true"
      data-close-on-click="true">
   <ul class="vertical menu add-components">
-    <% %w{CSV JSON}.each do |format| %>
+    <% %w(CSV JSON).each do |format| %>
       <li class="exports--format--<%= format.downcase %> exports--initiatives">
         <%= link_to t("decidim.admin.exports.export_as", name: t("decidim.initiatives.admin.exports.initiatives"),
-                      export_format: format.upcase),
-                    export_initiatives_path(format: format, collection_ids: collection_ids) %>
+                                                         export_format: format.upcase),
+                    export_initiatives_path(format:, collection_ids:) %>
       </li>
     <% end %>
   </ul>