decidim-feeds 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f7b4dc0873ec6a7bc3486e3135646c3541ccbe9e627a112de580aa3463656c'
-  data.tar.gz: 125c99d7b8603b83241fa701ea58909a75fd4aa88f793f652f6dd76acb216b25
+  metadata.gz: a515b5ec8dbef4369e412ae903c9c72b7d671a5a25a09f5f95718fb6b2dd6012
+  data.tar.gz: b0933807864abe877a8a3795d8a278fbc0b230d21b3f0fc1615ddb0ad7d84e4a
 SHA512:
-  metadata.gz: 2c3c2480f3fb5c205625989f52df1f0e78b0fd025a49ef623783cc88ea7dd416e7003aed3fefedd622f7e96037f94fc62a8c504458c84f3eb5c0525377d84767
-  data.tar.gz: daccd381f32ed898385d5e230574146069a93806b631fc7532516a56517f78d2de0a67d009d05d65eee64420a51330bf954860ab0ada4b06e70439a6c8b0239f
+  metadata.gz: cdb366b1c176ae440c62c65865d6243529c13e33d36ac07e2ad4fa6ffbd581ec37c44c46e82cab184c7c944800e56a3a47ea77fd44250fd325b0e27147fccb93
+  data.tar.gz: 0102cc47bcbcf8b3014d3345f4eb46e01834c53ac6500d816ec045716840c73cd26a2586ac6d4106ac99e7049585dbf0b77346cf493424116f09345a83f95e8e

data/README.md

@@ -1,19 +1,21 @@
-# Decidim::Feeds participatory space (under development)
+# Decidim::Feeds participatory space
 
 This Feeds module adds a simple Feeds Participatory Space to hold a feed component.
 
-**The module is currently in development and not yet ready.**
-
 ## Usage
 
-Feeds will be available as a Participatory Space.
+Feeds will be available as a Participatory Space. This space is very simple and currently just a container for posts.
+
+Find more information about posts in the README of the [posts module](https://github.com/DecidimAustria/decidim-module-posts)
+
+It is planned to allow users to create groups for their posts and the groups will be implemented as individual feeds. So users should be able to create new feeds including a posts and meetings component. This is currently partly implemented but not finished.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "decidim-feeds", git: "https://github.com/DecidimAustria/decidim-module-feeds.git", branch: "main"
+gem "decidim-feeds"
 ```
 
 And then execute:

data/app/commands/decidim/feeds/create_feed.rb

@@ -5,12 +5,12 @@ module Decidim
     # A command with all the business logic when creating a new participatory
     # feed in the system.
     class CreateFeed < Decidim::Command
+      include ::Decidim::MultipleAttachmentsMethods
       # Public: Initializes the command.
       #
       # form - A form object with the params.
       def initialize(form)
         @form = form
-        @author = author
       end
 
       # Executes the command. Broadcasts these events:
@@ -22,6 +22,11 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
         if feed.persisted?
           # link_participatory_processes(feed)
           # Decidim::ContentBlocksCreator.new(feed).create_default!
@@ -47,9 +52,9 @@ module Decidim
           Feed,
           form.current_user,
           organization: form.current_organization,
-          title: { I18n.locale => form.title },
-          slug: form.title.parameterize,
-          created_by: form.current_user
+          title: form.title,
+          slug: form.title[I18n.locale.to_s].parameterize,
+          created_by: form.current_user # TODO: created_by is a string, that makes no sense
         )
       end
 
@@ -85,6 +90,12 @@ module Decidim
       # def link_participatory_processes(feed)
       #   feed.link_participatory_space_resources(participatory_processes(feed), "included_participatory_processes")
       # end
+
+      def first_attachment_weight
+        return 1 if feed.documents.count.zero?
+
+        feed.documents.count
+      end
     end
   end
 end

data/app/commands/decidim/feeds/update_feed.rb

@@ -5,7 +5,7 @@ module Decidim
     # A command with all the business logic when creating a new participatory
     # feed in the system.
     class UpdateFeed < Decidim::Command
-      include ::Decidim::AttachmentAttributesMethods
+      include ::Decidim::MultipleAttachmentsMethods
 
       # Public: Initializes the command.
       #
@@ -14,6 +14,7 @@ module Decidim
       def initialize(feed, form)
         @feed = feed
         @form = form
+        @attached_to = feed
       end
 
       # Executes the command. Broadcasts these events:
@@ -25,8 +26,15 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
         update_feed
         # link_participatory_processes(@feed)
+        document_cleanup!(include_all_attachments: true)
+        create_attachments if process_attachments?
 
         if @feed.valid?
           broadcast(:ok, @feed)

data/app/controllers/concerns/decidim/feeds/feed_breadcrumb.rb

@@ -6,31 +6,31 @@ module Decidim
     module FeedBreadcrumb
       extend ActiveSupport::Concern
 
-      private
+      # private
 
-      def current_participatory_space_breadcrumb_item
-        return {} if current_participatory_space.blank?
+      # def current_participatory_space_breadcrumb_item
+      #   return {} if current_participatory_space.blank?
 
-        dropdown_cell = current_participatory_space_manifest.breadcrumb_cell
+      #   dropdown_cell = current_participatory_space_manifest.breadcrumb_cell
 
-        items = current_participatory_space.ancestors.map do |participatory_space|
-          {
-            label: participatory_space.title,
-            url: Decidim::ResourceLocatorPresenter.new(participatory_space).path,
-            active: false,
-            dropdown_cell:,
-            resource: participatory_space
-          }
-        end
+      #   items = current_participatory_space.ancestors.map do |participatory_space|
+      #     {
+      #       label: participatory_space.title,
+      #       url: Decidim::ResourceLocatorPresenter.new(participatory_space).path,
+      #       active: false,
+      #       dropdown_cell:,
+      #       resource: participatory_space
+      #     }
+      #   end
 
-        items << {
-          label: current_participatory_space.title,
-          url: Decidim::ResourceLocatorPresenter.new(current_participatory_space).path,
-          active: true,
-          dropdown_cell:,
-          resource: current_participatory_space
-        }
-      end
+      #   items << {
+      #     label: current_participatory_space.title,
+      #     url: Decidim::ResourceLocatorPresenter.new(current_participatory_space).path,
+      #     active: true,
+      #     dropdown_cell:,
+      #     resource: current_participatory_space
+      #   }
+      # end
     end
   end
 end

data/app/controllers/decidim/feeds/feeds_controller.rb

@@ -5,10 +5,10 @@ module Decidim
     # A controller that holds the logic to show Feeds in a public layout.
     class FeedsController < Decidim::Feeds::ApplicationController
       include ParticipatorySpaceContext
-      include FeedBreadcrumb
+      # include FeedBreadcrumb
       include FormFactory
 
-      participatory_space_layout only: :show
+      #participatory_space_layout only: :show
 
       include FilterResource
       include Paginable
@@ -25,6 +25,8 @@ module Decidim
       def show
         enforce_permission_to :read, :feed, feed: current_participatory_space
 
+        @feed = current_feed
+
         @posts_component = current_feed.components.find_by(manifest_name: "posts")
 
         if @posts_component.nil?

data/app/forms/decidim/feeds/feed_form.rb

@@ -7,12 +7,14 @@ module Decidim
     #
     class FeedForm < Form
       include TranslatableAttributes
+      include AttachmentAttributes
 
       mimic :feed
 
       translatable_attribute :title, String
 
       attribute :created_by, String
+      attribute :attachment, AttachmentForm
       
       # attribute :participatory_processes_ids, Array[Integer]
       # attribute :included_at, Decidim::Attributes::LocalizedDate
@@ -24,6 +26,8 @@ module Decidim
 
       # validate :same_type_organization, if: ->(form) { form.decidim_feeds_type_id }
 
+      attachments_attribute :documents
+
       validates :title, translatable_presence: true
 
       # validates :banner_image, passthru: { to: Decidim::Feed }
@@ -48,6 +52,20 @@ module Decidim
       #                                 &.sort_by { |arr| arr[0] }
       # end
 
+      def map_model(model)
+        self.title = model.title # translated_attribute(model.title)
+        # self.slug = model.slug
+        self.documents = model.attachments
+      end
+
+      def has_attachments?
+        feed.has_attachments? && errors[:documents].empty? && documents.present?
+      end
+
+      def has_error_in_attachments?
+        errors[:documents].present?
+      end
+
       private
 
       # def organization_participatory_processes

data/app/helpers/decidim/feeds/feeds_helper.rb

@@ -17,14 +17,14 @@ module Decidim
         components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))
 
         [
-          *(if participatory_space.members.not_ceased.any?
-              [{
-                name: t("feed_member_menu_item", scope: "layouts.decidim.feed_navigation"),
-                url: decidim_feeds.feed_feed_members_path(participatory_space),
-                active: is_active_link?(decidim_feeds.feed_feed_members_path(participatory_space), :inclusive)
-              }]
-            end
-           )
+          # *(if participatory_space.members.not_ceased.any?
+          #     [{
+          #       name: t("feed_member_menu_item", scope: "layouts.decidim.feed_navigation"),
+          #       url: decidim_feeds.feed_feed_members_path(participatory_space),
+          #       active: is_active_link?(decidim_feeds.feed_feed_members_path(participatory_space), :inclusive)
+          #     }]
+          #   end
+          #  )
         ] + components.map do |component|
           {
             name: decidim_escape_translated(component.name),

data/app/models/decidim/feeds/feed.rb

@@ -12,7 +12,7 @@ module Decidim
       include Decidim::HasAttachments
       # include Decidim::HasAttachmentCollections
       # include Decidim::Publicable
-      # include Decidim::ScopableParticipatorySpace
+      include Decidim::ScopableParticipatorySpace
       # include Decidim::Followable
       # include Decidim::HasReference
       # include Decidim::HasPrivateUsers
@@ -41,17 +41,18 @@ module Decidim
       validates :slug, uniqueness: { scope: :organization }
       validates :slug, presence: true, format: { with: Decidim::Feeds::Feed.slug_format }
 
-      searchable_fields({
-                          # scope_id: :decidim_scope_id,
-                          participatory_space: :itself,
-                          A: :title,
-                          # B: :subtitle,
-                          # C: :short_description,
-                          # D: :description,
-                          datetime: :created_at
-                        },
-                        index_on_create: true,
-                        index_on_update: true
+      searchable_fields(
+        {
+          # scope_id: :decidim_scope_id,
+          participatory_space: :itself,
+          A: :title,
+          # B: :subtitle,
+          # C: :short_description,
+          # D: :description,
+          datetime: :created_at
+        },
+        index_on_create: true,
+        index_on_update: true
       )
 
       # Overwriting existing method Decidim::HasPrivateUsers.public_spaces

data/app/packs/src/decidim/feeds/feeds.js

@@ -0,0 +1,97 @@
+document.addEventListener('DOMContentLoaded', function () {
+	console.log('feeds.js has loaded');
+
+	const button = document.querySelector('.feeds_popup_btn');
+	const popup = document.getElementById('feeds_popup');
+
+	if (button && popup) {
+		const isTouchDevice = 'ontouchstart' in document.documentElement;
+		let hideTimeout; // Reference for debounce or timeout management
+
+		// Utility to toggle the popup's visibility
+		const showPopup = function (e) {
+			e.preventDefault();
+			const btn_icon = button.querySelector('.icon');
+			if (!btn_icon) {
+				console.error('Button icon not found for positioning');
+				return;
+			}
+
+			const rect = btn_icon.getBoundingClientRect();
+			popup.style.left = `${rect.left - 36}px`;
+			popup.classList.remove('hidden');
+			button.setAttribute('aria-expanded', 'true');
+		};
+
+		const hidePopup = function () {
+			popup.classList.add('hidden');
+			button.setAttribute('aria-expanded', 'false');
+			button.focus(); // Return focus to the button
+		};
+
+		// Debounce utility to handle rapid mouse events
+		const debounce = (callback, delay) => {
+			clearTimeout(hideTimeout);
+			hideTimeout = setTimeout(callback, delay);
+		};
+
+		if (isTouchDevice) {
+			button.addEventListener('touchstart', function (e) {
+				if (!popup.classList.contains('hidden')) {
+					hidePopup();
+				} else {
+					showPopup(e);
+				}
+				e.preventDefault();
+			});
+		} else {
+			// Prevent default click behavior
+			button.addEventListener('click', function (e) {
+				e.preventDefault();
+			});
+
+			// Show popup on mouseenter
+			button.addEventListener('mouseenter', showPopup);
+
+			// Hide popup on mouseleave with debounce
+			button.addEventListener('mouseleave', function () {
+				debounce(() => {
+					if (!popup.matches(':hover')) {
+						hidePopup();
+					}
+				}, 150);
+			});
+
+			// Hide popup when mouse leaves popup area
+			popup.addEventListener('mouseleave', hidePopup);
+
+			// Clear hide timeout if re-entering popup
+			popup.addEventListener('mouseenter', function () {
+				clearTimeout(hideTimeout);
+			});
+
+			// Add keyboard support for Enter and Escape
+			button.addEventListener('keydown', function (e) {
+				if (e.key === 'Enter') {
+					// Toggle popup visibility on Enter
+					if (!popup.classList.contains('hidden')) {
+						hidePopup();
+					} else {
+						showPopup(e);
+						// Focus the first focusable element in the popup for accessibility
+						const firstFocusable = popup.querySelector(
+							'a, button, input, [tabindex="0"]'
+						);
+						if (firstFocusable) firstFocusable.focus();
+					}
+				}
+			});
+
+			document.addEventListener('keydown', function (e) {
+				if (e.key === 'Escape' && !popup.classList.contains('hidden')) {
+					hidePopup();
+				}
+			});
+		}
+	}
+});

data/app/packs/stylesheets/decidim/feeds/feeds.scss

@@ -1,3 +1,7 @@
 /* css for decidim_feeds */
 
 @import '_variables.scss';
+
+.text-feeds-host {
+	color: red;
+}

data/app/views/decidim/feeds/feeds/_form.html.erb

@@ -1,18 +1,30 @@
 <div class="form__wrapper">
-  <div class="card" data-component="accordion" id="accordion-title">
-    <div class="card-divider">
-      <button class="card-divider-button" data-open="true" data-controls="panel-title" type="button">
-        <%= icon "arrow-right-s-line" %>
-        <h2 class="card-title" id="title">
-          <%= t("title", scope: "decidim.feeds.feeds.form") %>
-        </h2>
-      </button>
-    </div>
-
-    <div id="panel-title" class="card-section">
-      <div class="row column">
-        <%= form.text_field :title, autofocus: true, aria: { label: :title } %>
-      </div>
+  <div id="panel-title" class="card-section">
+    <div class="row column">
+      <%= form.translated_one_locale :text_field, :title, current_locale, autofocus: true, aria: { label: :title } %>
     </div>
   </div>
+
+  <%= form.upload :documents,
+        titled: true,
+        label: false,
+        button_label: t("add_logo", scope: "decidim.feeds.feeds.form"),
+        button_edit_label: I18n.t("replace_logo", scope: "decidim.feeds.feeds.form"),
+        multiple: true,
+        # modal_only: false,
+        # show_current: true,
+        #label: false,
+        # id: field_id,
+        # disabled:,
+        # attribute:,
+        # resource_name: @object_name,
+        # resource_class: options[:resource_class]&.to_s || resource_class(attribute),
+        # show_current: true,
+        # max_file_size:,
+        # help: help_messages,
+        # label: label_for(attribute),
+        # button_label:,
+        # button_edit_label: I18n.t("decidim.forms.upload.labels.replace"),
+        button_class: "button button__sm button__transparent-primary w-full",
+        required: false %>
 </div>

data/app/views/decidim/feeds/feeds/_menu-popup.html.erb

@@ -0,0 +1,42 @@
+<div id="feeds_popup" class="feeds_popup flex gap-2 fixed bottom-[5.5rem] left-4 z-[1000] hidden">
+  <div class="flex flex-col rounded-2xl shadow px-2 py-4 bg-white">
+    <nav aria-label="<%= t("decidim.feeds.feeds.menu.title") %>">
+      <ul class="flex flex-col gap-4 min-w-[80px]">
+        <li class="flex flex-col items-center gap-1">
+          <%= link_to decidim_feeds.feeds_path, class:'flex flex-col items-center' do %>
+            <%= icon "group-2-line", class: 'w-[24px] h-auto' %>
+            <span class="text-sm text-center"><%= t("decidim.feeds.feeds.menu.all") %></span>
+          <% end %>
+        </li>
+        <li class="flex flex-col items-center gap-1">
+          <%= link_to decidim_feeds.new_feed_path, class:'flex flex-col items-center' do %>
+            <%= icon "add-circle-line", class: 'w-[24px] h-auto' %>
+            <span class="text-sm text-center"><%= t("decidim.feeds.feeds.menu.new") %></span>
+          <% end %>
+        </li>
+        <li class="flex flex-col items-center gap-1">
+          <%= link_to decidim_feeds.new_feed_path, class:'flex flex-col items-center' do %>
+            <%= icon "settings-3-line", class: 'w-[24px] h-auto' %>
+            <span class="text-sm text-center"><%= t("decidim.feeds.feeds.menu.manage") %></span>
+          <% end %>
+        </li>
+      </ul>
+    </nav>
+  </div>
+  <div class="flex flex-col gap-2 rounded-2xl shadow px-2 py-4 bg-white">
+    <span class="text-sm font-bold text-center max-w-[80px]">
+      <%= t("decidim.feeds.feeds.menu.myGroups") %>
+    </span>
+    <nav aria-label="<%= t("decidim.feeds.feeds.menu.myGroups") %>">
+      <ul class="flex flex-col gap-4">
+        <li class="flex flex-col items-center gap-1">
+          <%= link_to '/', class:'flex flex-col items-center' do %>
+            <%= icon "group-2-line", class: 'w-[48px] h-auto' %>
+            <span class="text-sm text-center sr-only">NAME</span>
+          <% end %>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+<%= append_javascript_pack_tag "decidim_feeds" %>

data/app/views/decidim/feeds/feeds/_show.html.erb

@@ -0,0 +1,36 @@
+<%# add_decidim_meta_tags({
+                           image_url: current_participatory_space.attached_uploader(:hero_image).path,
+                           description: translated_attribute(current_participatory_space.short_description),
+                           url: feed_url(current_participatory_space),
+                           twitter_handler: current_organization.twitter_handler
+                         }) %>
+
+
+
+<%
+edit_link(
+  resource_locator(current_participatory_space).edit,
+  :update,
+  :feed,
+  feed: current_participatory_space
+)
+%>
+
+
+<%= link_to t(".show_posts"), decidim_feed_posts_path(current_participatory_space, @posts_component) %>
+<%= link_to t(".edit"), edit_feed_path(@current_feed) %>
+
+<div class="participatory-space__container">
+
+  <%= participatory_space_floating_help %>
+
+  <% active_content_blocks.each do |content_block| %>
+    <% next unless content_block.manifest %>
+    <%= cell content_block.manifest.cell, content_block %>
+  <% end %>
+
+</div>
+
+<section class="participatory-space__block-reference">
+  <%= resource_reference(current_participatory_space) %>
+</section>

data/app/views/decidim/feeds/feeds/_sidebar.html.erb

@@ -0,0 +1,12 @@
+<aside class="!relative !top-0 !bottom-0 !right-0">
+  <nav>
+    <ul class="flex flex-col gap-4">
+      <li class="flex flex-col items-center gap-1">
+        <%= link_to decidim_feeds.new_feed_path, class:'flex flex-col items-center' do %>
+          <%= icon "add-circle-line", class: 'w-[24px] h-auto' %>
+          <span class="text-sm text-center"><%= t("decidim.feeds.feeds.index.new_feed") %></span>
+        <% end %>
+      </li>
+    </ul>
+  </nav>    
+</aside>

data/app/views/decidim/feeds/feeds/edit.html.erb

@@ -1,10 +1,27 @@
-<div>
-  <%= decidim_form_for(@form, html: { class: "form form-defaults edit_feed feed_form_admin" }) do |f| %>
-    <%= render partial: "form", object: f %>
-    <div class="item__edit-sticky">
-      <div class="item__edit-sticky-container">
-        <%= f.submit t("feeds.edit.update", scope: "decidim.feeds"), class: "button button__sm button__secondary" %>
+<main class="feeds__main w-full xl:max-w-screen-xl 2xl:max-w-screen-2xl mx-auto p-4 lg:p-16">
+  <div class="feeds__container grow min-h-[calc(100vh-72px)]">
+    <div class="feeds__body flex-grow flex flex-wrap gap-4 items-start">
+      <div class="card__grid-home w-full lg:grid-cols-8 xl:grid-cols-12 gap-6">
+        <div class="p-2 gap-4 md:col-start-1 md:col-end-4 lg:col-start-2 lg:col-end-8 xl:col-start-2 xl:col-end-10">
+          <%= link_to decidim_feeds.feeds_path, class:'flex items-center gap-1' do %>
+            <%= icon "arrow-left-circle-line", class: 'w-[24px] h-auto' %>
+            <span class="text-sm text-center"><%= t("decidim.feeds.feeds.nav.back") %></span>
+          <% end %>
+        </div>
+        <div class="p-2 gap-4 md:col-start-1 md:col-end-4 lg:col-start-2 lg:col-end-8 xl:col-start-2 xl:col-end-10">
+          <h1 class="text-xl font-bold mb-2 uppercase">
+            <%= t "feeds.edit.title", scope: "decidim.feeds" %>
+          </h1>
+          <%= decidim_form_for(@form, html: { class: "form form-defaults edit_feed feed_form_admin" }) do |f| %>
+            <%= render partial: "form", object: f %>
+            <div class="item__edit-sticky">
+              <div class="item__edit-sticky-container">
+                <%= f.submit t("feeds.edit.update", scope: "decidim.feeds"), class: "button button__sm button__secondary" %>
+              </div>
+            </div>
+          <% end %>
+        </div>
       </div>
     </div>
-  <% end %>
-</div>
+  </div>
+</main>

data/app/views/decidim/feeds/feeds/index.html.erb

@@ -1,5 +1,39 @@
-<% @feeds.each do |feed| %>
-  <%= link_to translated_attribute(feed.title), feed %>
-<% end %>
-
-<%= link_to t(".new_feed"), new_feed_path %>
+<main class="feeds__main flex w-full xl:max-w-screen-xl 2xl:max-w-screen-2xl mx-auto p-4 lg:p-16 lg:flex-row lg:gap-4 lg:justify-between">
+  <div class="feeds__container grow min-h-[calc(100vh-72px)]">
+    <div class="feeds__body flex-grow flex flex-wrap gap-4 items-start">
+      <div class="card__grid-home w-full lg:grid-cols-8 xl:grid-cols-12 gap-6">
+        <div class="p-2 gap-4 md:col-start-1 md:col-end-4 lg:col-start-2 lg:col-end-8 xl:col-start-2 xl:col-end-10">
+          <h1 class="text-xl mb-2 uppercase"><%= t("decidim.feeds.feeds.index.all_feeds") %></h1>
+          <ul class="flex gap-2 flex-wrap">
+            <% @feeds.each do |feed| %>
+              <li>
+                <%= link_to feed, class:'flex flex-col items-center' do %>
+                  <% if feed.attachments.any? %>
+                    <%= image_tag feed.attachments.first.file.url, class: 'w-[48px] h-auto' %>
+                  <% else %>
+                    <%= icon "group-2-line", class: 'w-[48px] h-auto' %>
+                  <% end %>
+                  <span class="text-sm text-center"><%=translated_attribute(feed.title)%></span>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+        <div class="p-2 gap-4 md:col-start-1 md:col-end-4 lg:col-start-2 lg:col-end-8 xl:col-start-2 xl:col-end-10">
+          <h2 class="text-xl font-bold mb-2 uppercase"><%= t("decidim.feeds.feeds.index.my_feeds") %></h2>
+          <ul class="flex gap-2 flex-wrap">
+            <% @feeds.each do |feed| %>
+              <li>
+                <%= link_to feed, class:'flex flex-col items-center' do %>
+                  <%= icon "group-2-line", class: 'w-[48px] h-auto' %>
+                  <span class="text-sm text-center"><%=translated_attribute(feed.title)%></span>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+  <%= render partial: "decidim/feeds/feeds/sidebar" %>
+</main>

data/app/views/decidim/feeds/feeds/new.html.erb

@@ -1,20 +1,31 @@
 <% add_decidim_page_title(t("feeds.new.title", scope: "decidim.feeds")) %>
-
-<div class="item_show__header">
-  <h1 class="item_show__header-title">
-    <%= t "feeds.new.title", scope: "decidim.feeds" %>
-  </h1>
-</div>
-
-<div class="item__edit item__edit-1col">
-  <div class="item__edit-form">
-    <%= decidim_form_for(@form, html: { class: "form-defaults form new_feed feed_form" }) do |f| %>
-      <%= render partial: "form", object: f %>
-      <div class="item__edit-sticky">
-        <div class="item__edit-sticky-container">
-          <%= f.submit t("feeds.new.create", scope: "decidim.feeds"), class: "button button__sm button__secondary" %>
+<main class="feeds__main w-full xl:max-w-screen-xl 2xl:max-w-screen-2xl mx-auto p-4 lg:p-16">
+  <div class="feeds__container grow min-h-[calc(100vh-72px)]">
+    <div class="feeds__body flex-grow flex flex-wrap gap-4 items-start">
+      <div class="card__grid-home w-full lg:grid-cols-8 xl:grid-cols-12 gap-6">
+        <div class="p-2 gap-4 md:col-start-1 md:col-end-4 lg:col-start-2 lg:col-end-8 xl:col-start-2 xl:col-end-10">
+          <%= link_to decidim_feeds.feeds_path, class:'flex items-center gap-1' do %>
+            <%= icon "arrow-left-circle-line", class: 'w-[24px] h-auto' %>
+            <span class="text-sm text-center"><%= t("decidim.feeds.feeds.nav.back") %></span>
+          <% end %>
+        </div>
+        <div class="p-2 gap-4 md:col-start-1 md:col-end-4 lg:col-start-2 lg:col-end-8 xl:col-start-2 xl:col-end-10">
+          <h1 class="text-xl font-bold mb-2 uppercase">
+            <%= t "feeds.new.title", scope: "decidim.feeds" %>
+          </h1>
+          <%= decidim_form_for(@form, html: { class: "form-defaults form new_feed feed_form" }) do |f| %>
+            <%= render partial: "form", object: f %>
+            <div class="item__edit-sticky">
+              <div class="item__edit-sticky-container">
+                <%= f.submit class: "button button__sm button__secondary" do %>
+                  <%= t("feeds.new.create", scope: "decidim.feeds") %>
+                  <%= icon "arrow-right-line", class: '' %>
+                <% end %>
+              </div>
+            </div>
+          <% end %>
         </div>
       </div>
-    <% end %>
+    </div>
   </div>
-</div>
+</main>

data/app/views/decidim/feeds/feeds/show.html.erb

@@ -1,33 +1,34 @@
-<%# add_decidim_meta_tags({
-                           image_url: current_participatory_space.attached_uploader(:hero_image).path,
-                           description: translated_attribute(current_participatory_space.short_description),
-                           url: feed_url(current_participatory_space),
-                           twitter_handler: current_organization.twitter_handler
-                         }) %>
+<% add_decidim_page_title(t("feeds.edit.update", scope: "decidim.feeds")) %>
+<main class="feeds__main flex w-full xl:max-w-screen-xl 2xl:max-w-screen-2xl mx-auto p-4 lg:p-16 lg:flex-row lg:gap-4 lg:justify-between">
+  <div class="grow min-h-[calc(100vh-72px)]">
+    <div class="feeds__body flex-grow flex flex-wrap gap-4 items-start">
+      <div class="card__grid-home w-full lg:grid-cols-8 xl:grid-cols-12 gap-6">
+        <div class="p-2 gap-4 md:col-start-1 md:col-end-4 lg:col-start-2 lg:col-end-8 xl:col-start-2 xl:col-end-10">
+          <%= link_to decidim_feeds.feeds_path, class:'flex items-center gap-1' do %>
+            <%= icon "arrow-left-circle-line", class: 'w-[24px] h-auto' %>
+            <span class="text-sm text-center"><%= t("decidim.feeds.feeds.nav.back") %></span>
+          <% end %>
+        </div>
+        <div class="p-2 gap-4 md:col-start-1 md:col-end-4 lg:col-start-2 lg:col-end-8 xl:col-start-2 xl:col-end-10">
+          <div class="flex justify-between pb-4">
+            <%= link_to decidim_feed_posts_path(current_participatory_space, @posts_component) do %>
+              <h1 class="mb-2 flex gap-4 align-baseline">
+                <%= icon "group-2-line", class: 'w-[48px] h-auto' %>
+                <span class="text-xl font-bold uppercase"><%= translated_attribute @feed.title %></span>
+              </h1>
+            <% end %>
+            <%= link_to decidim_feeds.edit_feed_path(@feed), class:'flex flex-col items-center' do %>
+              <%= icon "settings-3-line", class: 'w-[24px] h-auto' %>
+              <span class="text-sm text-center"><%= t("decidim.feeds.feeds.menu.edit") %></span>
+            <% end %>
+          </div>
+          <p class="text-pretty py-4">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sapien ornare vitae amet.</p>
+          <div class="flex gap-4 py-4">
+            <%= link_to t(".show_posts"), decidim_feed_posts_path(current_participatory_space, @posts_component), class: "button button__sm button__transparent-primary self-end" %>
+          </div>
 
-<%
-edit_link(
-  resource_locator(current_participatory_space).edit,
-  :update,
-  :feed,
-  feed: current_participatory_space
-)
-%>
-
-<%= link_to t(".show_posts"), decidim_feed_posts_path(current_participatory_space, @posts_component) %>
-<%= link_to t(".edit"), edit_feed_path(@current_feed) %>
-
-<div class="participatory-space__container">
-
-  <%= participatory_space_floating_help %>
-
-  <% active_content_blocks.each do |content_block| %>
-    <% next unless content_block.manifest %>
-    <%= cell content_block.manifest.cell, content_block %>
-  <% end %>
-
-</div>
-
-<section class="participatory-space__block-reference">
-  <%= resource_reference(current_participatory_space) %>
-</section>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>

data/config/locales/bs.yml

@@ -3,8 +3,19 @@ bs:
   decidim:
     feeds:
       feeds:
+        nav:
+          back: Nazad
+        menu:
+          title: Upravljanje Feedovima
+          all: Sve
+          new: Novo
+          manage: Upravljaj
+          edit: Uredi
+          myGroups: Moje Grupe
         index:
           new_feed: Novi Feed
+          all_feeds: Svi Feedovi
+          my_feeds: Moji Feedovi
         show:
           show_posts: Prikazi postove
           edit: Uredi
@@ -14,18 +25,28 @@ bs:
           create: Kreiraj Feed
         edit:
           update: Ažuriraj Feed
+          title: Uredi Feed
         form:
           title: Naslov
+          add_logo: Dodaj Logo
+          replace_logo: Zamijeni Logo
         create:
           error: Kreiranje feeda nije uspjelo
           success: Feed uspješno kreiran
         update:
           success: Feed uspješno ažuriran
           error: Ažuriranje feeda nije uspjelo
+        user:
+          filter:
+            title: Pretraga
+            name: Ime
+            interest: Interes
+            block: Stube / Zgrada / Kvart
+            noUser: Nema korisnika
       admin:
         feeds:
           index:
-            new_info_page_info: "Za Feeds UI, potrebna vam je stranica s URL slugom \"info\""
+            new_info_page_info: 'Za Feeds UI, potrebna vam je stranica s URL slugom "info"'
             new_info_page_button: Kreiraj novu info stranicu
           form:
             title: Naslov
@@ -37,7 +58,7 @@ bs:
         feeds:
           name: Feed
       survey:
-        participated: "%{count} odgovora"
+        participated: '%{count} odgovora'
     shared:
       flag_modal:
         report: Prijavi

data/config/locales/de.yml

@@ -3,29 +3,50 @@ de:
   decidim:
     feeds:
       feeds:
+        nav:
+          back: Zurück
+        menu:
+          title: Gruppenverwaltung
+          all: Alle
+          new: Neue
+          manage: Verwalten
+          edit: Bearbeiten
+          myGroups: Meine Gruppen
         index:
-          new_feed: Neuer Feed
+          new_feed: Neue Gruppe
+          all_feeds: Alle Gruppen
+          my_feeds: Meine Gruppen
         show:
           show_posts: Beiträge anzeigen
           edit: Bearbeiten
           posts_component_not_found: Beitragskomponente nicht gefunden
         new:
-          title: Neuer Feed
-          create: Feed erstellen
+          title: Neue Gruppe
+          create: Gruppe erstellen
         edit:
-          update: Feed aktualisieren
+          update: Gruppe aktualisieren
+          title: Gruppe bearbeiten
         form:
           title: Titel
+          add_logo: Logo hinzufügen
+          replace_logo: Logo ersetzen
         create:
           error: Feed-Erstellung fehlgeschlagen
           success: Feed erfolgreich erstellt
         update:
           success: Feed erfolgreich aktualisiert
           error: Feed-Aktualisierung fehlgeschlagen
+        user:
+          filter:
+            title: Suche
+            name: Name
+            interest: Interesse
+            block: Stiege / Gebäude / Bezirk
+            noUser: Keine Benutzer gefunden
       admin:
         feeds:
           index:
-            new_info_page_info: "Für die Feeds UI benötigen sie eine Seite mit dem URL Slug \"info\""
+            new_info_page_info: 'Für die Feeds UI benötigen sie eine Seite mit dem URL Slug "info"'
             new_info_page_button: Neue Info-Seite erstellen
           form:
             title: Titel
@@ -37,7 +58,7 @@ de:
         feeds:
           name: Feed
       survey:
-        participated: "%{count} Antworten"
+        participated: '%{count} Antworten'
     shared:
       flag_modal:
         report: Melden

data/config/locales/en.yml

@@ -3,8 +3,19 @@ en:
   decidim:
     feeds:
       feeds:
+        nav:
+          back: Back
+        menu:
+          title: Groups Management
+          all: All
+          new: New
+          manage: Manage
+          edit: Edit
+          myGroups: My Groups
         index:
           new_feed: New Feed
+          all_feeds: All Feeds
+          my_feeds: My Feeds
         show:
           show_posts: Show posts
           edit: Edit
@@ -14,18 +25,28 @@ en:
           create: Create Feed
         edit:
           update: Update Feed
+          title: Edit Feed
         form:
           title: Title
+          add_logo: Add Logo
+          replace_logo: Replace Logo
         create:
           error: Feed creation failed
           success: Feed created successfully
         update:
           success: Feed updated successfully
           error: Feed update failed
+        user:
+          filter:
+            title: Search
+            name: Name
+            interest: Interest
+            block: Staircase / Building / District
+            noUser: No users found
       admin:
         feeds:
           index:
-            new_info_page_info: "For the Feeds UI, you need a page with the URL slug \"info\""
+            new_info_page_info: 'For the Feeds UI, you need a page with the URL slug "info"'
             new_info_page_button: Create new info page
           form:
             title: Title
@@ -37,7 +58,7 @@ en:
         feeds:
           name: Feed
       survey:
-        participated: "%{count} responses"
+        participated: '%{count} responses'
     shared:
       flag_modal:
         report: Report

data/config/locales/hr.yml

@@ -3,8 +3,19 @@ hr:
   decidim:
     feeds:
       feeds:
+        nav:
+          back: Nazad
+        menu:
+          title: Upravljanje Feedovima
+          all: Sve
+          new: Novo
+          manage: Upravljaj
+          edit: Uredi
+          myGroups: Moje Grupe
         index:
           new_feed: Novi Feed
+          all_feeds: Svi Feedovi
+          my_feeds: Moji Feedovi
         show:
           show_posts: Prikazi postove
           edit: Uredi
@@ -14,18 +25,28 @@ hr:
           create: Kreiraj Feed
         edit:
           update: Ažuriraj Feed
+          title: Uredi Feed
         form:
           title: Naslov
+          add_logo: Dodaj Logo
+          replace_logo: Zamijeni Logo
         create:
           error: Kreiranje feeda nije uspjelo
           success: Feed uspješno kreiran
         update:
           success: Feed uspješno ažuriran
           error: Ažuriranje feeda nije uspjelo
+        user:
+          filter:
+            title: Pretraga
+            name: Ime
+            interest: Interes
+            block: Stube / Zgrada / Kvart
+            noUser: Nema korisnika
       admin:
         feeds:
           index:
-            new_info_page_info: "Za Feeds UI, potrebna vam je stranica s URL slugom \"info\""
+            new_info_page_info: 'Za Feeds UI, potrebna vam je stranica s URL slugom "info"'
             new_info_page_button: Kreiraj novu info stranicu
           form:
             title: Naslov
@@ -37,7 +58,7 @@ hr:
         feeds:
           name: Feed
       survey:
-        participated: "%{count} odgovora"
+        participated: '%{count} odgovora'
     shared:
       flag_modal:
         report: Prijavi

data/config/locales/it.yml

@@ -3,8 +3,19 @@ it:
   decidim:
     feeds:
       feeds:
+        nav:
+          back: Indietro
+        menu:
+          title: Gestione dei gruppi
+          all: Tutti
+          new: Nuovo
+          manage: Gestisci
+          edit: Modifica
+          myGroups: I miei gruppi
         index:
           new_feed: Nuovo feed
+          all_feeds: Tutti i feed
+          my_feeds: I miei feed
         show:
           show_posts: Mostra post
           edit: Modifica
@@ -14,18 +25,28 @@ it:
           create: Crea feed
         edit:
           update: Aggiorna feed
+          title: Modifica feed
         form:
           title: Titolo
+          add_logo: Aggiungi Logo
+          replace_logo: Sostituisci Logo
         create:
           error: Creazione del feed fallita
           success: Feed creato con successo
         update:
           success: Feed aggiornato con successo
           error: Aggiornamento del feed fallito
+        user:
+          filter:
+            title: Cerca
+            name: Nome
+            interest: Interesse
+            block: Scala / Edificio / Quartiere
+            noUser: Nessun utente trovato
       admin:
         feeds:
           index:
-            new_info_page_info: "Per l'interfaccia utente dei feed, è necessaria una pagina con lo slug URL \"info\""
+            new_info_page_info: 'Per l''interfaccia utente dei feed, è necessaria una pagina con lo slug URL "info"'
             new_info_page_button: Crea nuova pagina di informazioni
           form:
             title: Titolo
@@ -37,7 +58,7 @@ it:
         feeds:
           name: Feed
       survey:
-        participated: "%{count} risposte"
+        participated: '%{count} risposte'
     shared:
       flag_modal:
         report: Segnala

data/config/locales/sr.yml

@@ -3,8 +3,19 @@ sr:
   decidim:
     feeds:
       feeds:
+        nav:
+          back: Nazad
+        menu:
+          title: Upravljanje Feedovima
+          all: Sve
+          new: Novo
+          manage: Upravljaj
+          edit: Uredi
+          myGroups: Moje Grupe
         index:
           new_feed: Novi Feed
+          all_feeds: Svi Feedovi
+          my_feeds: Moji Feedovi
         show:
           show_posts: Prikazi postove
           edit: Uredi
@@ -14,18 +25,28 @@ sr:
           create: Kreiraj Feed
         edit:
           update: Ažuriraj Feed
+          title: Uredi Feed
         form:
           title: Naslov
+          add_logo: Dodaj Logo
+          replace_logo: Zamijeni Logo
         create:
           error: Kreiranje feeda nije uspelo
           success: Feed uspešno kreiran
         update:
           success: Feed uspešno ažuriran
           error: Ažuriranje feeda nije uspelo
+        user:
+          filter:
+            title: Pretraga
+            name: Ime
+            interest: Interes
+            block: Stube / Zgrada / Kvart
+            noUser: Nema korisnika
       admin:
         feeds:
           index:
-            new_info_page_info: "Za Feeds UI, potrebna vam je stranica s URL slugom \"info\""
+            new_info_page_info: 'Za Feeds UI, potrebna vam je stranica s URL slugom "info"'
             new_info_page_button: Kreiraj novu info stranicu
           form:
             title: Naslov
@@ -37,7 +58,7 @@ sr:
         feeds:
           name: Feed
       survey:
-        participated: "%{count} odgovora"
+        participated: '%{count} odgovora'
     shared:
       flag_modal:
         report: Prijavi
@@ -72,4 +93,4 @@ sr:
           fields:
             title: Naslov
             created_at: Kreirano
-            actions: Akcije
+            actions: Akcije

data/config/locales/tr.yml

@@ -3,8 +3,19 @@ tr:
   decidim:
     feeds:
       feeds:
+        nav:
+          back: Geri
+        menu:
+          title: Feed Yönetimi
+          all: Tümü
+          new: Yeni
+          manage: Yönet
+          edit: Düzenle
+          myGroups: Gruplarım
         index:
           new_feed: Yeni Feed
+          all_feeds: Tüm Feedler
+          my_feeds: Benim Feedlerim
         show:
           show_posts: Gönderileri Göster
           edit: Düzenle
@@ -14,18 +25,28 @@ tr:
           create: Feed Oluştur
         edit:
           update: Feed'i Güncelle
+          title: Feed'i Düzenle
         form:
           title: Başlık
+          add_logo: Logo Ekle
+          replace_logo: Logo Değiştir
         create:
           error: Feed oluşturma başarısız oldu
           success: Feed başarıyla oluşturuldu
         update:
           success: Feed başarıyla güncellendi
           error: Feed güncelleme başarısız oldu
+        user:
+          filter:
+            title: Ara
+            name: İsim
+            interest: İlgi
+            block: Merdiven / Bina / Mahalle
+            noUser: Kullanıcı bulunamadı
       admin:
         feeds:
           index:
-            new_info_page_info: "Feeds UI için \"info\" URL slug'ına sahip bir sayfaya ihtiyacınız var"
+            new_info_page_info: 'Feeds UI için "info" URL slug''ına sahip bir sayfaya ihtiyacınız var'
             new_info_page_button: Yeni bilgi sayfası oluştur
           form:
             title: Başlık
@@ -37,7 +58,7 @@ tr:
         feeds:
           name: Feed
       survey:
-        participated: "%{count} yanıt"
+        participated: '%{count} yanıt'
     shared:
       flag_modal:
         report: Rapor Et

data/lib/decidim/feeds/engine.rb

@@ -76,6 +76,11 @@ module Decidim
         Decidim.icons.register(name: "translate", icon: "translate", category: "editor", description: "", engine: :feeds)
         Decidim.icons.register(name: "file-2-line", icon: "file-2-line", category: "editor", description: "", engine: :feeds)
         Decidim.icons.register(name: "dislike", icon: "heart-fill", description: "Dislike", category: "action", engine: :feeds)
+        Decidim.icons.register(name: "settings-3-line", icon: "settings-3-line", description: "", category: "action", engine: :feeds)
+        Decidim.icons.register(name: "add-circle-line", icon: "add-circle-line", description: "", category: "action", engine: :feeds)
+        Decidim.icons.register(name: "arrow-left-circle-line", icon: "arrow-left-circle-line", description: "", category: "action", engine: :feeds)
+        Decidim.icons.register(name: "user-unfollow-line", icon: "user-unfollow-line", description: "", category: "action", engine: :feeds)
+        Decidim.icons.register(name: "admin-line", icon: "admin-line", description: "", category: "action", engine: :feeds)
       end
 
     end

data/lib/decidim/feeds/seeds.rb

@@ -10,9 +10,9 @@ module Decidim
 
         feed = create_feed!
 
-        seed_components_manifests!(participatory_space: current_feed)
+        seed_components_manifests!(participatory_space: feed)
 
-        # Decidim::ContentBlocksCreator.new(current_feed).create_default!
+        # Decidim::ContentBlocksCreator.new(feed).create_default!
       end
 
       # def create_content_block!

data/lib/decidim/feeds/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-meetings version.
   module Feeds
-    VERSION = "1.0.0"
-    COMPAT_DECIDIM_VERSION = [">= 0.28.0", "< 0.29"].freeze
+    VERSION = "2.0.0"
+    COMPAT_DECIDIM_VERSION = [">= 0.29.0", "< 0.30"].freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-feeds
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Rusa
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-26 00:00:00.000000000 Z
+date: 2025-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
 description: A new participatory space for Decidim that is ideal for decidim-posts.
 email:
 - alex@rusa.at
@@ -85,6 +85,9 @@ files:
 - app/views/decidim/feeds/admin/feeds/index.html.erb
 - app/views/decidim/feeds/admin/feeds/new.html.erb
 - app/views/decidim/feeds/feeds/_form.html.erb
+- app/views/decidim/feeds/feeds/_menu-popup.html.erb
+- app/views/decidim/feeds/feeds/_show.html.erb
+- app/views/decidim/feeds/feeds/_sidebar.html.erb
 - app/views/decidim/feeds/feeds/edit.html.erb
 - app/views/decidim/feeds/feeds/index.html.erb
 - app/views/decidim/feeds/feeds/new.html.erb