decidim-blogs 0.27.10 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17890b8befb35b79d9eabbae4e4d6c1a2b9f0388e8c42c1d73a5ac2e710e5fdf
-  data.tar.gz: c0e42272a5c633c9bc23835bfe97ea78421592244d38dd9f96e941d8b4c36e3b
+  metadata.gz: c2330f24d70eca14e552dcf053957b8df8b1564de2a265a9b57648b89b079a3e
+  data.tar.gz: 8b5128b4c3f8a6f2b27b613e6796b5782a93d9d81dd26c2d97ab24e9fbfd4285
 SHA512:
-  metadata.gz: ba2888668c1332abdc94b465b1085855fe9f8423758d83db5ad441fa84c601f91358d24ae79f54e6dfa7a20c56c77219430aeee139a40838ff761a88ec8ed75a
-  data.tar.gz: b625f3565a3bdbf61c264347d05da8e321653c73e282a6a631a08e8dfe8b78b4b4d4b40d642e62c579bdfd26fdcd0a510a5dda87d48695ce7f4603df82c45631
+  metadata.gz: 2f848ffdda0e612316006c3ef8990b16a61cb536fac4dec1d484cc60e65526c827dbca9ca1bde5254a91aa95c563153b8bd3ce013c8f9a2678b108982fa0f461
+  data.tar.gz: 26c7b99f72dc7e3813a86da7c8e94d4a33a4e7beddd65743d1f6f74f5d78578d9d2c937f4e220e80a95445619cad8718565111459063911e7f1103d89dcbf479

data/app/cells/decidim/blogs/content_blocks/highlighted_posts/content.erb

@@ -0,0 +1,17 @@
+<div class="content-block__title">
+  <h2 class="h2 decorator"><%= single_component ? translated_attribute(single_component.name) : t("name", scope: "decidim.components.blogs") %></h2>
+  <div class="label text-lg"><%= posts_count %></div>
+  <% if single_component %>
+    <%= link_to decidim_blogs.root_path, class: "button button__sm button__text-secondary" do %>
+      <span><%= t("decidim.blogs.content_blocks.highlighted_posts.see_all") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
+  <% end %>
+</div>
+
+<span class="content-block__span"><%= t("decidim.blogs.content_blocks.highlighted_posts.last_published") %></span>
+<div class="participatory-space__block-grid">
+  <% posts_to_render.each do |post| %>
+    <%= cell "decidim/blogs/post_g", post %>
+  <% end %>
+</div>

data/app/cells/decidim/blogs/content_blocks/highlighted_posts_cell.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    module ContentBlocks
+      class HighlightedPostsCell < Decidim::ContentBlocks::HighlightedElementsCell
+        include Decidim::ComponentPathHelper
+        include Decidim::CardHelper
+
+        def show
+          render unless posts_count.zero?
+        end
+
+        private
+
+        def posts
+          @posts ||= Decidim::Blogs::Post.published.where(component: published_components).created_at_desc
+        end
+
+        def decidim_blogs
+          return unless single_component
+
+          Decidim::EngineRouter.main_proxy(single_component)
+        end
+
+        def single_component
+          @single_component ||= published_components.one? ? published_components.first : nil
+        end
+
+        def posts_to_render
+          @posts_to_render ||= posts.includes([:author, :component]).limit(limit)
+        end
+
+        def posts_count
+          @posts_count ||= posts.size
+        end
+
+        def cache_hash
+          hash = []
+          hash << "decidim/blogs/content_blocks/highlighted_posts"
+          hash << posts.cache_key_with_version
+          hash << I18n.locale.to_s
+          hash.join(Decidim.cache_key_separator)
+        end
+
+        def limit
+          3
+        end
+      end
+    end
+  end
+end

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

@@ -5,10 +5,7 @@ module Decidim
     # A cell to display when a post has been created.
     class PostActivityCell < ActivityCell
       def title
-        I18n.t(
-          "decidim.blogs.last_activity.new_post_at_html",
-          link: participatory_space_link
-        )
+        I18n.t("decidim.blogs.last_activity.new_post")
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Blogs
     # This cell renders the card for an instance of a Post
-    # the default size is the Medium Card (:m)
+    # the default size is the List Card (:l)
     class PostCell < Decidim::ViewModel
       def show
         cell card_size, model, options
@@ -12,7 +12,14 @@ module Decidim
       private
 
       def card_size
-        "decidim/blogs/post_m"
+        case @options[:size]
+        when :s
+          "decidim/blogs/post_s"
+        when :g
+          "decidim/blogs/post_g"
+        else
+          "decidim/blogs/post_l"
+        end
       end
     end
   end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This cell renders the Grid (:g) post card
+    # for a given instance of a Post
+    class PostGCell < Decidim::CardGCell
+      delegate :photo, to: :model
+
+      private
+
+      def has_image?
+        resource_image_path.present?
+      end
+
+      def show_description?
+        true
+      end
+
+      def metadata_cell
+        "decidim/blogs/post_metadata_g"
+      end
+
+      def resource_image_path
+        return if photo.blank?
+
+        photo.url
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This cell renders the List (:l) post card
+    # for a given instance of a Post
+    class PostLCell < Decidim::CardLCell
+      delegate :photo, to: :model
+
+      private
+
+      def has_image?
+        true
+      end
+
+      def has_description?
+        true
+      end
+
+      def description_length
+        500
+      end
+
+      def metadata_cell
+        "decidim/blogs/post_metadata"
+      end
+
+      def resource_image_path
+        return if photo.blank?
+
+        photo.url
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This cell renders metadata for an instance of a Proposal
+    class PostMetadataCell < Decidim::CardMetadataCell
+      def initialize(*)
+        super
+
+        @items.prepend(*post_items)
+      end
+
+      private
+
+      def post_items
+        [author_item, creation_date, comments_count_item, endorsements_count_item]
+      end
+
+      def creation_date
+        date_at = model.try(:published_at) || model.try(:created_at)
+
+        {
+          text: l(date_at.to_date, format: :decidim_short_with_month_name_short),
+          icon: "calendar-todo-line"
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This cell renders metadata for an instance of a Post
+    class PostMetadataGCell < PostMetadataCell
+      private
+
+      def post_items
+        [author_item, comments_count_item]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This cell renders the Search (:s) post card
+    # for a given instance of a Post
+    class PostSCell < Decidim::CardSCell
+      private
+
+      def metadata_cell
+        "decidim/blogs/post_metadata"
+      end
+    end
+  end
+end

data/app/commands/decidim/blogs/admin/create_post.rb

@@ -31,6 +31,7 @@ module Decidim
           attributes = {
             title: @form.title,
             body: @form.body,
+            published_at: @form.published_at,
             component: @form.current_component,
             author: @form.author
           }

data/app/commands/decidim/blogs/admin/update_post.rb

@@ -37,10 +37,19 @@ module Decidim
           Decidim.traceability.update!(
             post,
             @user,
+            attributes
+          )
+        end
+
+        def attributes
+          {
             title: form.title,
             body: form.body,
+            published_at: form.published_at,
             author: form.author
-          )
+          }.reject do |attribute, value|
+            value.blank? && attribute == :published_at
+          end
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Decidim
 
         def create
           enforce_permission_to :create, :blogpost
-          @form = form(PostForm).from_params(params, current_component: current_component)
+          @form = form(PostForm).from_params(params, current_component:)
 
           CreatePost.call(@form, current_user) do
             on(:ok) do
@@ -37,7 +37,7 @@ module Decidim
 
         def update
           enforce_permission_to :update, :blogpost, blogpost: post
-          @form = form(PostForm).from_params(params, current_component: current_component)
+          @form = form(PostForm).from_params(params, current_component:)
 
           UpdatePost.call(@form, post, current_user) do
             on(:ok) do

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

@@ -5,25 +5,37 @@ module Decidim
     # Exposes the blog resource so users can view them
     class PostsController < Decidim::Blogs::ApplicationController
       include Flaggable
+      include Paginable
+      include Decidim::IconHelper
 
-      helper_method :posts, :post, :paginate_posts, :posts_most_commented
+      helper_method :posts, :post, :post_presenter, :paginate_posts, :posts_most_commented, :tabs, :panels
 
       def index; end
 
-      def show; end
+      def show
+        raise ActionController::RoutingError, "Not Found" unless post
+      end
 
       private
 
       def paginate_posts
-        @paginate_posts ||= posts.created_at_desc.page(params[:page]).per(4)
+        @paginate_posts ||= paginate(posts.created_at_desc)
       end
 
       def post
         @post ||= posts.find(params[:id])
       end
 
+      def post_presenter
+        @post_presenter ||= Decidim::Blogs::PostPresenter.new(post)
+      end
+
       def posts
-        @posts ||= Post.where(component: current_component)
+        @posts ||= if current_user&.admin?
+                     Post.where(component: current_component)
+                   else
+                     Post.published.where(component: current_component)
+                   end
       end
 
       # PROVISIONAL if we implement counter cache

data/app/forms/decidim/blogs/admin/post_form.rb

@@ -11,6 +11,7 @@ module Decidim
         translatable_attribute :body, String
 
         attribute :decidim_author_id, Integer
+        attribute :published_at, Decidim::Attributes::TimeWithZone
 
         validates :title, translatable_presence: true
         validates :body, translatable_presence: true
@@ -43,7 +44,7 @@ module Decidim
         end
 
         def post
-          @post ||= Post.find_by(id: id)
+          @post ||= Post.find_by(id:)
         end
 
         def user_groups

data/app/helpers/decidim/blogs/admin/posts_helper.rb

@@ -7,6 +7,7 @@ module Decidim
       module PostsHelper
         include Decidim::ApplicationHelper
         include SanitizeHelper
+        include PaginateHelper
 
         # Public: truncates the post body
         #
@@ -16,7 +17,7 @@ module Decidim
         # Returns the post's body truncated.
         def post_description_admin(post, max_length = 100)
           body = translated_attribute(post.body)
-          CGI.unescapeHTML html_truncate(body, max_length: max_length)
+          CGI.unescapeHTML html_truncate(body, max_length:)
         end
 
         def post_author_select_field(form, name, _options = {})
@@ -33,6 +34,15 @@ module Decidim
 
           form.select(name, select_options)
         end
+
+        def publish_data(published_at)
+          data = {}
+          if published_at > Time.current
+            data[:icon] = icon("time-line", aria_label: t("decidim.blogs.admin.posts.index.not_published_yet"), role: "img")
+            data[:popup] = t("decidim.blogs.admin.posts.index.not_published_yet")
+          end
+          data
+        end
       end
     end
   end

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

@@ -11,6 +11,10 @@ module Decidim
       include ::Decidim::EndorsableHelper
       include ::Decidim::FollowableHelper
       include Decidim::Comments::CommentsHelper
+
+      def component_name
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.blogs.name")
+      end
     end
   end
 end

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

@@ -14,11 +14,9 @@ module Decidim
       # max_length - a number to limit the length of the body
       #
       # Returns the post's body truncated.
-      def post_description(post, max_length = 600)
-        link = post_path(post)
+      def post_description(post, max_length = 300)
         body = translated_attribute(post.body)
-        tail = "... <br/> #{link_to(t("read_more", scope: "decidim.blogs"), link)}".html_safe
-        CGI.unescapeHTML html_truncate(body, max_length: max_length, tail: tail)
+        CGI.unescapeHTML html_truncate(body, max_length:)
       end
     end
   end

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

@@ -26,6 +26,7 @@ module Decidim
       validates :title, presence: true
 
       scope :created_at_desc, -> { order(arel_table[:created_at].desc) }
+      scope :published, -> { where("published_at <= ?", Time.current) }
 
       searchable_fields({
                           participatory_space: { component: :participatory_space },
@@ -36,12 +37,22 @@ module Decidim
                         index_on_create: true,
                         index_on_update: ->(post) { post.visible? })
 
+      class << self
+        def all_timestamp_attributes_in_model
+          super + ["published_at"]
+        end
+
+        def log_presenter_class_for(_log)
+          Decidim::Blogs::AdminLog::PostPresenter
+        end
+      end
+
       def visible?
-        participatory_space.try(:visible?) && component.try(:published?)
+        participatory_space.try(:visible?) && component.try(:published?) && published?
       end
 
-      def self.log_presenter_class_for(_log)
-        Decidim::Blogs::AdminLog::PostPresenter
+      def published?
+        published_at <= Time.current
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.

data/app/packs/entrypoints/decidim_blogs.js

@@ -1,2 +1,5 @@
 // Images
 require.context("../images", true)
+
+// CSS
+import "stylesheets/blogs.scss"

data/app/packs/stylesheets/blogs.scss

@@ -0,0 +1,53 @@
+.blog {
+  &__image {
+    @apply grow rounded overflow-hidden mb-8 aspect-[3];
+
+    img {
+      @apply w-full h-full object-cover;
+    }
+  }
+
+  &__actions {
+    @apply flex flex-col md:flex-row justify-between items-center gap-10;
+
+    &-left {
+      @apply flex items-center gap-2;
+    }
+
+    &-right {
+      @apply flex items-center gap-4;
+
+      button {
+        @apply flex items-center gap-1;
+      }
+    }
+
+    .is-active span:last-child {
+      @apply text-white bg-secondary border-secondary;
+    }
+  }
+
+  &__endorsers {
+    @apply space-y-3;
+
+    &-text {
+      @apply text-sm text-gray-2;
+    }
+
+    &-grid {
+      @apply flex flex-wrap gap-y-3;
+    }
+
+    &-button {
+      @apply block ml-auto text-right text-xs text-secondary cursor-pointer;
+    }
+  }
+
+  &__section {
+    @apply mt-16 first-of-type:mt-0 last:mb-16 md:last:mb-36 xl:max-w-[75%] space-y-10;
+
+    p {
+      @apply mt-4 text-gray-2 text-md;
+    }
+  }
+}

data/app/presenters/decidim/blogs/admin_log/post_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Blogs::Post`
       # 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/views/decidim/blogs/admin/posts/_form.html.erb

@@ -1,18 +1,24 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-  <div class="card-section">
-
-      <div class="field">
-        <%= post_author_select_field form, :decidim_author_id, label: t("decidim.blogs.actions.author_id") %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <div class="field">
+          <%= post_author_select_field form, :decidim_author_id, label: t("decidim.blogs.actions.author_id") %>
+        </div>
       </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
-    </div>
-    <div class="row column">
-      <%= form.translated :editor, :body, lines: 30 %>
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
+      <div class="row column">
+        <%= form.translated :editor, :body, lines: 30, aria: { label: :body } %>
+      </div>
+      <div class="row">
+        <div class="columns">
+          <%= form.datetime_field :published_at %>
+        </div>
+      </div>
     </div>
   </div>
+
 </div>

data/app/views/decidim/blogs/admin/posts/edit.html.erb

@@ -1,8 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form edit_post" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".save") %>
+<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_post" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".save"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>