decidim-decidim_awesome 0.10.3 → 0.11.1

data/app/packs/stylesheets/decidim/decidim_awesome/awesome_map/map.scss

@@ -2,18 +2,6 @@
 .dropdown-pane {
   z-index: 1000;
 }
-// Override padding in this component
-.wrapper {
-  padding: 0;
-
-  .callout.announcement {
-    margin-top: 2rem;
-  }
-
-  .google-map {
-    margin-bottom: 0;
-  }
-}
 
 #awesome-map {
   width: 100%;
@@ -21,21 +9,35 @@
   justify-content: center;
   align-items: center;
 
-  // .leaflet-marker-icon.svg-icon svg path{
-  //   filter: drop-shadow(3px 3px 2px rgba(0, 0, 0, .7));
-  // }
-
   .loading-spinner {
     z-index: 10000;
     position: absolute;
-    right: 0;
-    top: 0;
+    right: 50%;
+    top: 50%;
   }
 
-  .leaflet-container {
+  .leaflet-popup-content {
     font: inherit;
 
-    #bodyContent .description {
+    h3 {
+      @apply mb-2;
+    }
+
+    a {
+      @apply text-white;
+    }
+
+    .description {
+      @apply m-0 px-0 text-sm font-sans text-white;
+
+      p {
+        @apply mt-0;
+      }
+
+      a {
+        @apply underline;
+      }
+
       img,
       iframe {
         max-height: 5em;
@@ -103,6 +105,10 @@
   }
 }
 
+.participatory-space__container #awesome-map {
+  @apply mt-8 mb-8;
+}
+
 #awesome_map- {
   &categories-control {
     display: none;
@@ -148,7 +154,7 @@
       padding: 0.5rem;
 
       span {
-        margin: 0 0.5rem 2px 0;
+        margin: 0 0 2px 0.4em;
       }
 
       input {

data/app/packs/stylesheets/decidim/decidim_awesome/forms/autosave.scss

@@ -1,10 +1,10 @@
 .awesome_autosave-notice {
-  background-color: rgba(var(--success-rgb), 0.8);
+  background-color: rgb(var(--success-rgb) / 90%);
   position: fixed;
-  top: 0;
-  right: 0;
-  margin: 2em;
-  padding: 0.5em 1em;
+  top: 90%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  padding: 1em 2em;
   border-radius: 4px;
   border: 1px solid var(--success);
   font-weight: 600;
@@ -12,6 +12,6 @@
   z-index: 1000;
 
   &.error {
-    background-color: rgba(var(--alert-rgb), 0.8);
+    background-color: rgb(var(--alert-rgb) / 90%);
   }
 }

data/app/packs/stylesheets/decidim/decidim_awesome/forms/custom_fields.scss

@@ -1,186 +1,117 @@
 .decidim_awesome-custom_fields {
   &.private_body {
-    padding: 1.5rem 1rem;
-    margin-top: 2rem;
-    border: 1px solid $medium-gray;
-    border-radius: $global-radius;
-    background-color: $medium-gray;
-    color: $black;
-    font-weight: $global-weight-normal;
+    @apply px-4 py-6 mt-8 border border-gray rounded-s rounded-ee bg-gray-5 text-black font-normal;
   }
 
   .private_body-disclosure {
-    margin: -1rem 0 2rem;
-    font-size: 1.125rem;
-    font-style: italic;
+    @apply -mt-4 mb-8 text-lg italic;
 
     svg {
-      display: inline-block;
-      width: 1.5rem;
-      height: 1.5rem;
-      margin-right: 0.5rem;
-      vertical-align: bottom;
+      @apply inline-block w-6 h-6 mr-2 align-bottom;
     }
   }
 
   dt {
-    font-family: $body-font-family;
-    font-weight: $global-weight-bold;
+    @apply font-sans font-semibold;
   }
 
   dd {
-    padding: 0;
+    @apply px-0;
   }
 
+  // styles to tune a bit the form presentation in proposals creation
   .proposal_custom_field {
     h1 {
-      font-family: $body-font-family;
-      font-weight: $global-weight-bold;
-      font-size: 2.5rem;
-      margin-top: 1rem;
+      @apply font-sans font-bold text-4xl mt-4;
     }
 
     h2 {
-      font-family: $body-font-family;
-      font-weight: $global-weight-bold;
-      font-size: 2rem;
-      margin-top: 1rem;
+      @apply font-sans font-bold text-3xl mt-4;
     }
 
     h3 {
-      font-family: $body-font-family;
-      font-weight: $global-weight-bold;
-      font-size: 1.75rem;
-      margin-top: 1rem;
+      @apply font-sans font-semibold text-2xl mt-4;
     }
 
     h4 {
-      font-family: $body-font-family;
-      font-weight: $global-weight-bold;
-      font-size: 1.5rem;
-      margin-top: 1rem;
+      @apply font-sans font-semibold text-xl mt-4;
     }
 
     h5 {
-      font-family: $body-font-family;
-      font-weight: $global-weight-bold;
-      font-size: 1.125rem;
-      margin-top: 1rem;
+      @apply font-sans font-semibold text-lg mt-4;
     }
 
     h6 {
-      font-family: $body-font-family;
-      font-weight: $global-weight-bold;
-      font-size: 1rem;
-      margin-top: 1rem;
+      @apply font-sans font-semibold text-md mt-4;
     }
 
     p {
-      margin-top: 1rem;
+      @apply mt-4;
     }
 
+    // replace tooltips javascript with css
     label {
-      font-size: 0.875rem;
-      font-weight: $global-weight-bold;
-
       .tooltip-element {
-        margin: 0;
-        padding: 0;
-        visibility: hidden;
-        display: block;
+        @apply m-0 p-0 invisible block;
 
         &::before {
-          visibility: visible;
-          font-size: 0.75rem;
-          color: $medium-gray;
-          font-weight: $global-weight-normal;
-          font-style: italic;
+          @apply visible text-xs text-gray-2 italic font-thin;
+
           content: attr(tooltip);
         }
       }
     }
 
     .form-group:not(:first-of-type) {
-      margin-top: 1.5rem;
+      @apply mt-6;
     }
 
     .form-control {
-      width: 100%;
-      display: block;
+      @apply w-full block mt-4;
 
       &:not(.reset-defaults) {
-        display: inline-block;
-        padding: 0.5rem 1rem;
-        border: 1px solid $medium-gray;
-        outline: 1px solid transparent;
-        border-radius: $global-radius;
-        background-color: $body-background;
-        color: $black;
-        font-weight: $global-weight-normal;
-
-        &:focus {
-          outline: 2px solid $secondary-color;
-        }
-
-        &:disabled {
-          background-color: $light-gray;
-          color: $medium-gray;
-          cursor: not-allowed;
-        }
+        @apply inline-block px-4 py-2 border border-gray outline outline-1 outline-transparent rounded bg-background-2 text-black font-normal placeholder:text-gray focus:outline-2 focus:outline-secondary disabled:bg-background-3 disabled:text-gray-2 disabled:cursor-not-allowed;
 
         &.sm {
-          padding: 0.25rem;
-          font-size: 0.875rem;
+          @apply px-1 py-0.5 text-sm;
         }
 
         &.sm-icon {
-          padding: 0.25rem 0.25rem 0.25rem 1.5rem;
-          font-size: 0.875rem;
+          @apply pr-1 pl-6 py-0.5 text-sm;
         }
 
         &.is-invalid-input:not(:focus) {
-          outline: 2px solid $alert-color;
+          @apply outline-2 outline-alert;
         }
       }
 
+      /* read-only can be applied only to input and textarea, otherwise selects will be set as readonly */
       &:not(select) {
-        &:read-only {
-          background-color: $light-gray;
-          border: 0;
-          color: $medium-gray;
-        }
+        @apply read-only:bg-background read-only:border-0 read-only:text-gray-2;
       }
     }
 
     .formbuilder-checkbox {
       > label {
-        font-weight: $global-weight-normal;
+        @apply font-normal;
       }
     }
 
     .formbuilder-autocomplete {
-      position: relative;
+      @apply relative;
 
       .formbuilder-autocomplete-list {
-        z-index: 20;
-        max-height: 13rem;
-        outline: 1px solid transparent;
-        border-radius: $global-radius;
-        border: 1px solid $medium-gray;
-        color: $black;
-        font-weight: $global-weight-normal;
-        display: none;
+        @apply z-20 max-h-52 outline outline-1 outline-transparent rounded border border-gray text-black font-normal;
 
         li {
-          cursor: pointer;
-          border-radius: $global-radius;
-          padding: 0.5rem 1rem;
-          background-color: $body-background;
+          @apply cursor-pointer rounded px-4 py-2 bg-background-2;
 
           &.active-option {
-            background-color: $light-gray;
+            @apply bg-background;
           }
         }
+
+        display: none;
       }
     }
   }

data/app/packs/stylesheets/decidim/decidim_awesome/shared/spinner.scss

@@ -1,47 +1,26 @@
 // Loading spinner does not ocuppy all the width and height as the new spinner-container
 .loading-spinner {
-  position: relative;
-  cursor: wait;
+  @apply relative cursor-wait;
 
   &::before {
-    content: "";
-    display: block;
-    width: 1.5rem;
-    height: 1.5rem;
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-    border: 4px solid;
-    border-color: transparent transparent $secondary-color transparent;
-    z-index: 20;
-    margin-left: 50%;
-    transform: translateX(-50%);
+    @apply content-[""] ml-[50%] md:ml-[calc(50%-0.75rem)] block w-6 h-6 rounded-full animate-spin border-4 border-l-background border-y-background border-r-secondary z-20;
   }
 
   &.alert {
     &::before {
-      border-color: transparent transparent $alert-color transparent;
+      @apply border-r-alert;
     }
   }
 
   &.warning {
     &::before {
-      border-color: transparent transparent $warning-color transparent;
+      @apply border-r-warning;
     }
   }
 
   &.primary {
     &::before {
-      border-color: transparent transparent $primary-color transparent;
+      @apply border-r-primary;
     }
   }
 }
-
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}

data/app/packs/stylesheets/decidim/decidim_awesome/voting/voting_cards.scss

@@ -8,54 +8,6 @@
 .voting-voting_cards {
   $rectangle-width: 3rem;
 
-  // ProposalM card
-  &-card {
-    a {
-      margin-bottom: 0;
-
-      > svg {
-        margin-bottom: 2px;
-        vertical-align: middle;
-      }
-
-      &.button {
-        &.weight_0 {
-          background-color: var(--voting-cards-weight-0);
-        }
-
-        &.weight_1 {
-          background-color: var(--voting-cards-weight-1);
-        }
-
-        &.weight_2 {
-          background-color: var(--voting-cards-weight-2);
-        }
-
-        &.weight_3 {
-          background-color: var(--voting-cards-weight-3);
-        }
-      }
-    }
-
-    .votes_counter {
-      .weight_0 {
-        color: var(--voting-cards-weight-0);
-      }
-
-      .weight_1 {
-        color: var(--voting-cards-weight-1);
-      }
-
-      .weight_2 {
-        color: var(--voting-cards-weight-2);
-      }
-
-      .weight_3 {
-        color: var(--voting-cards-weight-3);
-      }
-    }
-  }
-
   margin-bottom: 1.5rem;
   border-bottom: 2px solid #d9d9d9;
 
@@ -69,7 +21,8 @@
 
       .vote-label {
         margin-bottom: 1rem;
-        color: $black;
+
+        @apply text-black;
       }
     }
 
@@ -84,11 +37,12 @@
     pointer-events: none;
     position: relative;
 
+    @apply relative cursor-wait;
+
     &::before {
-      @include spinner(25px, $medium-gray, var(--primary), 800ms);
+      @apply content-[""] block w-6 h-6 rounded-full animate-spin border-4 border-l-background border-y-background border-r-secondary;
 
       z-index: 1000;
-      content: "";
       vertical-align: middle;
       position: absolute;
       top: calc(50% - 12.5px);
@@ -190,7 +144,7 @@
     .vote-count {
       font-size: 2rem;
       font-weight: bolder;
-      margin-bottom: 0;
+      margin-bottom: 0.5rem;
     }
   }
 
@@ -221,3 +175,31 @@
     }
   }
 }
+
+.vote_proposal_modal {
+  div.button__sm {
+    display: inline-block;
+  }
+
+  .vote-label {
+    @apply ml-2;
+  }
+}
+
+.card__list-metadata {
+  .voting-weight_3 {
+    color: var(--voting-cards-weight-3);
+  }
+
+  .voting-weight_2 {
+    color: var(--voting-cards-weight-2);
+  }
+
+  .voting-weight_1 {
+    color: var(--voting-cards-weight-1);
+  }
+
+  .voting-weight_0 {
+    color: var(--voting-cards-weight-0);
+  }
+}

data/app/permissions/decidim/decidim_awesome/permissions.rb

@@ -14,15 +14,14 @@ module Decidim
       end
 
       def editor_image_action?
-        return unless permission_action.subject == :editor_image
+        return false unless permission_action.subject == :editor_image
 
         config = context.fetch(:awesome_config, {})
 
         return allow! if user.admin?
         return allow! if config[:allow_images_in_proposals]
-        return allow! if config[:allow_images_in_small_editor]
-        return allow! if config[:allow_images_in_full_editor]
-        return allow! if config[:allow_images_in_markdown_editor]
+        return allow! if config[:allow_images_in_editors]
+        return allow! if config[:allow_videos_in_editors]
       end
     end
   end

data/app/presenters/concerns/decidim/decidim_awesome/breadcrumb_root_menu_item_presenter_override.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module BreadcrumbRootMenuItemPresenterOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def arrow_link(text, url, args = {})
+          link_to url, extended_html_options.merge(class: args.with_indifferent_access[:class]) do
+            "<span>#{text}</span> #{icon("arrow-right-line")}".html_safe
+          end
+        end
+
+        def extended_html_options
+          {}.tap do |opts|
+            opts[:target] = "_blank" if @menu_item.try(:target) == "_blank"
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/concerns/decidim/decidim_awesome/menu_item_presenter_override.rb

@@ -6,12 +6,12 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        def link_to(name = nil, options = nil, html_options = nil, &block)
+        def link_to(name = nil, options = nil, html_options = nil, &)
           html_options ||= {}
           html_options[:target] = @menu_item.try(:target)
 
           options ||= html_options
-          @view.link_to(name, options, html_options, &block)
+          @view.link_to(name, options, html_options, &)
         end
 
         def active
@@ -19,6 +19,14 @@ module Decidim
 
           @menu_item&.active
         end
+
+        def active_for_breadcrumb?
+          is_active_link?(url, @menu_item.try(:original_active) || active)
+        end
+
+        def hacked_not_overriding?
+          !(@menu_item.is_a?(Decidim::MenuItem) || @menu_item.overrided?)
+        end
       end
     end
   end

data/app/presenters/concerns/decidim/decidim_awesome/menu_presenter_override.rb

@@ -17,6 +17,14 @@ module Decidim
                                 end
                               end
         end
+
+        def active_item_for_breadcrumb
+          presented_items.find do |item|
+            next if item.hacked_not_overriding?
+
+            item.active_for_breadcrumb?
+          end
+        end
       end
     end
   end

data/app/presenters/decidim/decidim_awesome/participatory_space_role_presenter.rb

@@ -5,7 +5,7 @@ module Decidim
     class ParticipatorySpaceRolePresenter < RoleBasePresenter
       # Finds the destroyed entry if exists
       def destroy_entry
-        @destroy_entry ||= PaperTrail::Version.find_by(item_type: item_type, event: "destroy", item_id: item_id)
+        @destroy_entry ||= PaperTrail::Version.find_by(item_type:, event: "destroy", item_id:)
       end
 
       # roles are in the destroyed event if the role has been removed

data/app/presenters/decidim/decidim_awesome/private_data_presenter.rb

@@ -17,15 +17,15 @@ module Decidim
 
       def total
         @total ||= Decidim::Proposals::Proposal.joins(:extra_fields)
-                                               .where(decidim_component_id: id)
-                                               .where.not(decidim_awesome_proposal_extra_fields: { private_body: nil })
+                                               .where(component: self)
+                                               .where.not(extra_fields: { private_body: nil })
                                                .count.to_s
       end
 
       def last_date
         @last_date ||= Decidim::Proposals::Proposal.joins(:extra_fields)
-                                                   .where(decidim_component_id: id)
-                                                   .where.not(decidim_awesome_proposal_extra_fields: { private_body: nil })
+                                                   .where(component: self)
+                                                   .where.not(extra_fields: { private_body: nil })
                                                    .order(private_body_updated_at: :desc)
                                                    .first&.extra_fields&.private_body_updated_at
       end
@@ -46,14 +46,14 @@ module Decidim
 
       def as_json(_options = nil)
         {
-          id: id,
-          name: name,
-          path: path,
-          total: total,
-          last_date: last_date,
-          time_ago: time_ago,
+          id:,
+          name:,
+          path:,
+          total:,
+          last_date:,
+          time_ago:,
           locked: locked?,
-          done: done
+          done:
         }
       end
 

data/app/presenters/decidim/decidim_awesome/user_entity_presenter.rb

@@ -6,7 +6,7 @@ module Decidim
       # Finds the destroyed entry if exists
       def destroy_entry
         @destroy_entry ||= begin
-          query = PaperTrail::Version.where(item_type: item_type, event: "update", item_id: item_id)
+          query = PaperTrail::Version.where(item_type:, event: "update", item_id:)
                                      .where("id > ?", entry.id)
           if roles.include? "admin"
             query.where("object_changes LIKE '%\nadmin:\n- true\n- false%'").first

data/app/queries/decidim/decidim_awesome/private_data_finder.rb

@@ -4,7 +4,7 @@ module Decidim
   module DecidimAwesome
     class PrivateDataFinder
       def query
-        Component.where(id: proposals.where.not(decidim_awesome_proposal_extra_fields: { private_body: nil }))
+        Component.where(id: proposals.where.not(extra_fields: { private_body: nil }))
       end
 
       def proposals

data/app/serializers/decidim/decidim_awesome/proposals/private_proposal_serializer.rb

@@ -28,14 +28,6 @@ module Decidim
           end
           payload
         end
-
-        def author_name(author)
-          if author.respond_to?(:name)
-            translated_attribute(author.name) # is a Decidim::User or Decidim::Organization or Decidim::UserGroup
-          elsif author.respond_to?(:title)
-            translated_attribute(author.title) # is a Decidim::Meetings::Meeting
-          end
-        end
       end
     end
   end