decidim-blogs 0.21.0 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ffb146f8393d89cf23c01f44b51d8e5caec159b6ba0147179a105b1a81f1a3c
-  data.tar.gz: c2ca7c30f1c2af6405abd47df267138634f87f4537405b6a07e4a49b6e6cb7e1
+  metadata.gz: 0e6d132edb5f45e23c8b736f0bd5f308ecd258a6511505041342474d4d88d04c
+  data.tar.gz: 0c2a4ef87ca43599d00da25de8a0e8b1b0da92a8bbfd948a8f0e055250da8486
 SHA512:
-  metadata.gz: fd6f92894919716ded583a58d7e177c4e64edc2a0c2692e6d3712b300e4286ebef99af5ea74db64b3d8c35505829aa126d3849bd581126a8e2a1b94893edeacc
-  data.tar.gz: abd58ef1553ed0f47e541fd8301d963687f868da57ea029cf1b691e78ccc5dc96ca0a0acd2c67f1b15391b58f9878009780f5d0377a195394e8f3718958cf1fb
+  metadata.gz: 376e3b93a830e888dbbb8bfcec1fe52ab76825bb4d7dcf64b3161ad4f8b3b8d9604d3cd4f1c4a0d0a291796f31a35e09f604f3ddebe8c7bd9ec42859c3e85992
+  data.tar.gz: 12cdefcc2ccee4f7ae552ee15f46752f7988cd45e4d31b03de9985809b5d1cfdf0c1adc3cce711605b686129766259f082d56937297e38bf5d30ae9dfa18cf7f

data/app/assets/images/decidim/blogs/icon.svg

@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
-  <path d="M18 0C8.07 0 0 8.07 0 18s8.07 18 18 18 18-8.071 18-18S27.93 0 18 0zm0 2c8.85 0 16 7.152 16 16 0 8.848-7.15 16-16 16-8.848 0-16-7.152-16-16C2 9.152 9.152 2 18 2zm-7 9a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2H11zm0 4a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2H11zm0 4a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2H11zm0 4a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2H11z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M18 0C8.07 0 0 8.07 0 18s8.07 18 18 18 18-8.071 18-18S27.93 0 18 0zm0 2c8.85 0 16 7.152 16 16 0 8.848-7.15 16-16 16-8.848 0-16-7.152-16-16C2 9.152 9.152 2 18 2zm-7 9a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2H11zm0 4a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2H11zm0 4a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2H11zm0 4a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2H11z"/></svg>

data/app/cells/decidim/blogs/post_m/footer.erb

@@ -1,5 +1,5 @@
 <div class="card__footer card__footer--spaces">
   <div class="card__support">
-    <%= link_to t("decidim.blogs.posts.show.view"), resource_path, class: "card__button button--sc light button small secondary" %>
+    <%= link_to t("decidim.blogs.posts.show.view"), resource_path, class: "card__button button--sc light button small" %>
   </div>
 </div>

data/app/cells/decidim/blogs/post_m_cell.rb

@@ -10,6 +10,12 @@ module Decidim
       def has_actions?
         false
       end
+
+      def endorsements_count
+        with_tooltip t("decidim.endorsable.endorsements") do
+          icon("bullhorn", class: "icon--small") + " " + model.endorsements_count.to_s
+        end
+      end
     end
   end
 end

data/app/controllers/decidim/blogs/posts_controller.rb

@@ -4,6 +4,8 @@ module Decidim
   module Blogs
     # Exposes the blog resource so users can view them
     class PostsController < Decidim::Blogs::ApplicationController
+      include Flaggable
+
       helper_method :posts, :post, :paginate_posts, :posts_most_commented
 
       def index; end

data/app/helpers/decidim/blogs/application_helper.rb

@@ -8,6 +8,8 @@ module Decidim
       include PaginateHelper
       include SanitizeHelper
       include Decidim::Blogs::PostsHelper
+      include ::Decidim::EndorsableHelper
+      include ::Decidim::FollowableHelper
       include Decidim::Comments::CommentsHelper
     end
   end

data/app/models/decidim/blogs/post.rb

@@ -12,11 +12,16 @@ module Decidim
       include Decidim::Authorable
       include Decidim::Comments::Commentable
       include Decidim::Searchable
+      include Decidim::Endorsable
+      include Decidim::Followable
+      include Decidim::TranslatableResource
       include Traceable
       include Loggable
 
       component_manifest_name "blogs"
 
+      translatable_fields :title, :body
+
       validates :title, presence: true
 
       scope :created_at_desc, -> { order(arel_table[:created_at].desc) }
@@ -56,6 +61,14 @@ module Decidim
       def user_allowed_to_comment?(user)
         can_participate_in_space?(user)
       end
+
+      def users_to_notify_on_comment_created
+        followers
+      end
+
+      def attachment_context
+        :admin
+      end
     end
   end
 end

data/app/types/decidim/blogs/blogs_type.rb

@@ -8,25 +8,23 @@ module Decidim
       name "Blogs"
       description "A blogs component of a participatory space."
 
-      connection :posts, PostType.connection_type do
-        resolve ->(component, _args, _ctx) {
-                  PostsTypeHelper.base_scope(component).includes(:component)
-                }
-      end
-
-      field(:post, PostType) do
-        argument :id, !types.ID
+      connection :posts,
+                 type: PostType.connection_type,
+                 description: "List all posts",
+                 function: PostListHelper.new(model_class: Post)
+      field :post,
+            type: PostType,
+            description: "Finds one post",
+            function: PostFinderHelper.new(model_class: Post)
+    end
 
-        resolve ->(component, args, _ctx) {
-          PostsTypeHelper.base_scope(component).find_by(id: args[:id])
-        }
-      end
+    class PostListHelper < Decidim::Core::ComponentListBase
+      argument :order, PostInputSort, "Provides several methods to order the results"
+      argument :filter, PostInputFilter, "Provides several methods to filter the results"
     end
 
-    module PostsTypeHelper
-      def self.base_scope(component)
-        Post.where(component: component)
-      end
+    class PostFinderHelper < Decidim::Core::ComponentFinderBase
+      argument :id, !types.ID, "The ID of the post"
     end
   end
 end

data/app/types/decidim/blogs/post_input_filter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    class PostInputFilter < Decidim::Core::BaseInputFilter
+      include Decidim::Core::HasTimestampInputFilter
+
+      graphql_name "PostFilter"
+      description "A type used for filtering posts inside a participatory space.
+
+A typical query would look like:
+
+```
+  {
+    participatoryProcesses {
+      components {
+        ...on Blogs {
+          posts(filter:{ createdBefore: \"2020-01-01\" }) {
+            id
+          }
+        }
+      }
+    }
+  }
+```
+"
+    end
+  end
+end

data/app/types/decidim/blogs/post_input_sort.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    class PostInputSort < Decidim::Core::BaseInputSort
+      include Decidim::Core::HasTimestampInputSort
+      include Decidim::Core::HasEndorsableInputSort
+
+      graphql_name "PostSort"
+      description "A type used for sorting blog posts"
+
+      argument :id, String, "Sort by ID, valid values are ASC or DESC", required: false
+    end
+  end
+end

data/app/types/decidim/blogs/post_type.rb

@@ -7,7 +7,10 @@ module Decidim
       interfaces [
         -> { Decidim::Comments::CommentableInterface },
         -> { Decidim::Core::AttachableInterface },
-        -> { Decidim::Core::AuthorableInterface }
+        -> { Decidim::Core::AuthorableInterface },
+        -> { Decidim::Core::TraceableInterface },
+        -> { Decidim::Core::EndorsableInterface },
+        -> { Decidim::Core::TimestampsInterface }
       ]
 
       name "Post"
@@ -16,8 +19,6 @@ module Decidim
       field :id, !types.ID, "The internal ID of this post"
       field :title, Decidim::Core::TranslatedFieldType, "The title for this post"
       field :body, Decidim::Core::TranslatedFieldType, "The body of this post"
-      field :createdAt, Decidim::Core::DateTimeType, "The time this post was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "The time this post was updated", property: :updated_at
     end
   end
 end

data/app/views/decidim/blogs/posts/_posts.html.erb

@@ -1,12 +1,12 @@
 <div class="row small-12">
   <% paginate_posts.each do |post| %>
-    <article class="card card--post">
+    <div class="card card--post">
       <div class="card__content">
         <div class="card__header">
           <%= link_to post, class: "card__link" do %>
-          <h5 class="card__title">
+          <h3 class="card__title">
             <%= translated_attribute post.title %>
-          </h5>
+          </h3>
           <% end %>
           <div class="card__author">
             <%= cell "decidim/author", present(post.author), from: post %>
@@ -14,7 +14,7 @@
         </div>
         <%= decidim_sanitize post_description(post) %>
       </div>
-    </article>
+    </div>
   <% end %>
 </div>
 <%= decidim_paginate paginate_posts %>

data/app/views/decidim/blogs/posts/_sidebar_blog.html.erb

@@ -9,8 +9,8 @@
         <div class="author-data author-data--nopadding">
           <%= render partial: "datetime", locals: { post: post } %>&nbsp;&nbsp;·&nbsp;&nbsp;
           <%= link_to "#{post_path(post)}#comments", title: t(".comments") do %>
-            <%= icon "comment-square", class: "icon--small", aria_label: "#{t(".comments")}", role: "img" %>
-            <%= post.comments.count %>
+            <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %>
+            <%= post.comments_count %>
             <%= t(".comments") %>
           <% end %>
           <a href="#comments" title="<%= t(".comments") %>"></a>

data/app/views/decidim/blogs/posts/show.html.erb

@@ -14,18 +14,45 @@
     blogpost: post
   )
 %>
+
+<div class="row column view-header">
+  <div class="m-bottom">
+    <%= link_to :posts, class: "small hollow" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
+  <h2 class="heading2"><%= translated_attribute post.title %></h2>
+  <%= cell "decidim/author", present(post.author), from: post %>
+</div>
 <div class="row">
-  <div class="columns medium-7 mediumlarge-8">
-    <div class="row column view-header">
-      <h2 class="heading2"><%= translated_attribute post.title %></h2>
-      <%= cell "decidim/author", present(post.author), from: post %>
-    </div>
+  <% if show_endorsements_card? %>
+      <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
+        <div class="card">
+          <div class="card__content">
+            <div class="row collapse buttons__row">
+              <% if endorsements_enabled? %>
+                <div class="column small-9 collapse">
+                  <%= endorsement_buttons_cell(post) %>
+                </div>
+              <% end %>
+              <div class="column collapse <%= endorsements_enabled? ? "small-3" : "" %>">
+                <%= link_to "#comments", class: "button small compact hollow button--nomargin expanded" do %>
+                    <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %> <%= post.comments_count %>
+                <% end %>
+              </div>
+            </div>
+            <br>
+            <%= follow_button_for(post) %>
+          </div>
+        </div>
+      </div>
+  <% end %>
+  <div class="columns mediumlarge-8 <%= "mediumlarge-pull-4" if show_endorsements_card? %>">
     <div class="section">
-      <p><%= decidim_sanitize translated_attribute post.body %></p>
+      <%= decidim_sanitize translated_attribute post.body %>
     </div>
-  </div>
-  <div id="most-commented" class="columns medium-5 mediumlarge-4 large-4">
-    <%= render partial: "sidebar_blog", locals: { posts: posts_most_commented } %>
+    <%= cell "decidim/endorsers_list", post %>
   </div>
 </div>
 <%= attachments_for post %>

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/bg-BG.yml

@@ -0,0 +1,13 @@
+bg:
+  activemodel:
+    models:
+      decidim/blogs/create_post_event: Нова блог публикация
+  activerecord:
+    models:
+      decidim/blogs/post:
+        one: Публикация
+        other: Публикации
+  decidim:
+    blogs:
+      actions:
+        confirm_destroy: Сигурни ли сте, че желаете да изтриете тази публикация?

data/config/locales/bg.yml

@@ -0,0 +1,13 @@
+bg:
+  activemodel:
+    models:
+      decidim/blogs/create_post_event: Нова блог публикация
+  activerecord:
+    models:
+      decidim/blogs/post:
+        one: Публикация
+        other: Публикации
+  decidim:
+    blogs:
+      actions:
+        confirm_destroy: Сигурни ли сте, че желаете да изтриете тази публикация?

data/config/locales/ca.yml

@@ -48,6 +48,8 @@ ca:
             title: títol
       posts:
         show:
+          back: Tornar al llistat
+          comments: Comentaris
           view: Veure
         sidebar_blog:
           comments: comentaris
@@ -60,9 +62,12 @@ ca:
           global:
             announcement: Avís
             comments_enabled: Comentaris habilitats
+            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
           step:
             announcement: Avís
             comments_blocked: Comentaris bloquejats
+            endorsements_blocked: Adhesions bloquejades
+            endorsements_enabled: Adhesions habilitades
     events:
       blogs:
         post_created:

data/config/locales/cs.yml

@@ -13,7 +13,7 @@ cs:
     blogs:
       actions:
         confirm_destroy: Opravdu chcete tento příspěvek smazat?
-        destroy: Odstranit
+        destroy: Smazat
         edit: Upravit
         new: Nový příspěvek
         title: Akce
@@ -22,23 +22,23 @@ cs:
           components:
             body: Tělo
           post:
-            name: Pošta
+            name: Příspěvek
         posts:
           create:
             invalid: Při vytváření tohoto příspěvku došlo k potížím
-            success: Pošta byla úspěšně vytvořena
+            success: Příspěvek byl úspěšně vytvořen
           destroy:
-            success: Pošta byla úspěšně smazána
+            success: Příspěvek byl úspěšně odstraněn
           edit:
-            save: Aktualizace
+            save: Aktualizovat
           index:
             title: Příspěvky
           new:
             create: Vytvořit
-            title: Vytvořte příspěvek
+            title: Vytvořit příspěvek
           update:
             invalid: Při ukládání příspěvku došlo k chybám.
-            success: Úspěšně uložen příspěvek
+            success: Příspěvek byl úspěšně uložen
       last_activity:
         new_post_at_html: "<span>Nový příspěvek v %{link}</span>"
       models:
@@ -46,11 +46,13 @@ cs:
           fields:
             author: Autor
             body: Tělo
-            created_at: Vytvořeno u
-            title: titul
+            created_at: Vytvořeno v
+            title: titulek
       posts:
         show:
-          view: Pohled
+          back: Zpět na seznam
+          comments: Komentáře
+          view: Zobrazit
         sidebar_blog:
           comments: komentáře
           most_commented_posts: Nejvíce komentované příspěvky
@@ -62,14 +64,17 @@ cs:
           global:
             announcement: Oznámení
             comments_enabled: Komentáře povoleny
+            comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
           step:
             announcement: Oznámení
             comments_blocked: Komentáře byly blokovány
+            endorsements_blocked: Schvalování blokováno
+            endorsements_enabled: Schvalování povoleno
     events:
       blogs:
         post_created:
-          email_intro: Písmeno "%{resource_title}" bylo zveřejněno v "%{participatory_space_title}", které sledujete.
-          email_outro: Toto oznámení jste obdrželi, protože jste sledovali "%{participatory_space_title}". Můžete jej odhlásit od předchozího odkazu.
+          email_intro: Příspěvek "%{resource_title}" byl zveřejněn v "%{participatory_space_title}", který sledujete.
+          email_outro: Obdrželi jste toto oznámení, protože sledujete "%{participatory_space_title}". Můžete ho zrušit z předchozího odkazu.
           email_subject: Nový příspěvek publikován v %{participatory_space_title}
           notification_title: Příspěvek <a href="%{resource_path}">%{resource_title}</a> byl zveřejněn ve %{participatory_space_title}
     pages:

data/config/locales/da-DK.yml

@@ -0,0 +1 @@
+da:

data/config/locales/da.yml

@@ -0,0 +1 @@
+da:

data/config/locales/de.yml

@@ -48,7 +48,9 @@ de:
             title: Titel
       posts:
         show:
-          view: Aussicht
+          back: Zurück zur Liste
+          comments: Kommentare
+          view: Anzeigen
         sidebar_blog:
           comments: Bemerkungen
           most_commented_posts: Meist kommentierte Posts
@@ -60,16 +62,19 @@ de:
           global:
             announcement: Ankündigung
             comments_enabled: Kommentare aktiviert
+            comments_max_length: Maximale Länge der Kommentare (0 für Standardwert)
           step:
             announcement: Ankündigung
             comments_blocked: Kommentare blockiert
+            endorsements_blocked: Unterstützung deaktiviert
+            endorsements_enabled: Unterstützung aktiviert
     events:
       blogs:
         post_created:
           email_intro: Der Beitrag "%{resource_title}" wurde in "%{participatory_space_title}" veröffentlicht, dem Sie folgen.
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie "%{participatory_space_title}" folgen. Sie können es aus dem vorherigen Link aufheben.
+          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie "%{participatory_space_title}" folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
           email_subject: Neuer Beitrag in %{participatory_space_title}
-          notification_title: Der Beitrag <a href="%{resource_path}">%{resource_title}</a> wurde in %{participatory_space_title}
+          notification_title: Der Beitrag <a href="%{resource_path}">%{resource_title}</a> wurde in %{participatory_space_title} veröffentlicht
     pages:
       home:
         statistics: