+ <%= back_link_to sdg_goals_path %>
+
+
+
+
+
+ <%= render Widgets::Feeds::ParticipationComponent.new(feeds) %>
+
+ <% if processes_feed %>
+
+ <%= render Widgets::Feeds::FeedComponent.new(processes_feed) %>
+
+ <% end %>
+
+ <% feeds.each do |feed| %>
+ <% if feed_proposals?(feed) || feed_debates?(feed) %>
+ <%= render Widgets::Feeds::FeedComponent.new(feed) %>
+ <% end %>
+ <% end %>
+
diff --git a/app/components/widgets/feeds/participation_component.rb b/app/components/widgets/feeds/participation_component.rb
new file mode 100644
index 00000000000..f90b731c3d1
--- /dev/null
+++ b/app/components/widgets/feeds/participation_component.rb
@@ -0,0 +1,17 @@
+class Widgets::Feeds::ParticipationComponent < ApplicationComponent
+ attr_reader :feeds
+
+ def initialize(feeds)
+ @feeds = feeds
+ end
+
+ private
+
+ def feed_debates?(feed)
+ feed.kind == "debates"
+ end
+
+ def feed_proposals?(feed)
+ feed.kind == "proposals"
+ end
+end
diff --git a/app/components/widgets/feeds/process_component.html.erb b/app/components/widgets/feeds/process_component.html.erb
new file mode 100644
index 00000000000..ff7619cacfd
--- /dev/null
+++ b/app/components/widgets/feeds/process_component.html.erb
@@ -0,0 +1,13 @@
+
- <% @feeds.each do |feed| %>
-
- <% if feed_proposals?(feed) %>
-
">
-
-
<%= t("welcome.feed.most_active.#{feed.kind}") %>
-
- <% feed.items.each do |item| %>
-
row">
-
">
-
<%= link_to item.title, url_for(item) %>
-
<%= item.summary %>
-
- <% if item.image.present? %>
-
-
- <%= image_tag item.image_url(:thumb),
- alt: item.image.title.unicode_normalize %>
-
-
- <% end %>
-
- <% end %>
-
-
- <%= link_to t("welcome.feed.see_all_proposals"), proposals_path, class: "see-all" %>
-
- <% end %>
-
- <% if feed_debates?(feed) %>
-
">
-
-
<%= t("welcome.feed.most_active.#{feed.kind}") %>
-
- <% feed.items.each do |item| %>
-
">
- <%= link_to item.title, url_for(item) %>
-
- <% end %>
-
-
- <%= link_to t("welcome.feed.see_all_debates"), debates_path, class: "see-all" %>
-
- <% end %>
-
- <% end %>
-
<% if @cards.any? %>
">
-
<%= t("welcome.cards.title") %>
+ <%= t("welcome.cards.title") %>
<%= render "shared/cards" %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index a1c7a886ce5..05fc01c7115 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -875,9 +875,10 @@ en:
debates: "Most active debates"
proposals: "Most active proposals"
processes: "Open processes"
- see_all_debates: See all debates
- see_all_proposals: See all proposals
- see_all_processes: See all processes
+ see_all:
+ debates: See all debates
+ proposals: See all proposals
+ processes: See all processes
process_label: Process
see_process: See process
cards:
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index b9da8ab10f6..d5f998ecc7a 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -875,9 +875,10 @@ es:
debates: "Debates más activos"
proposals: "Propuestas más activas"
processes: "Procesos abiertos"
- see_all_debates: Ver todos los debates
- see_all_proposals: Ver todas las propuestas
- see_all_processes: Ver todos los procesos
+ see_all:
+ debates: Ver todos los debates
+ proposals: Ver todas las propuestas
+ processes: Ver todos los procesos
process_label: Proceso
see_process: Ver proceso
cards:
diff --git a/config/routes/sdg.rb b/config/routes/sdg.rb
index 9c065b9a6fc..52525c68574 100644
--- a/config/routes/sdg.rb
+++ b/config/routes/sdg.rb
@@ -1,3 +1,3 @@
namespace :sdg do
- resources :goals, only: :index
+ resources :goals, param: :code, only: [:index, :show]
end
diff --git a/db/sdg.rb b/db/sdg.rb
index 9dde1885ba8..f81741e77ee 100644
--- a/db/sdg.rb
+++ b/db/sdg.rb
@@ -1,4 +1,4 @@
-(1..17).each do |code|
+(1..17).to_a.shuffle.each do |code|
SDG::Goal.where(code: code).first_or_create!
end
diff --git a/spec/components/widgets/feeds/feed_component_spec.rb b/spec/components/widgets/feeds/feed_component_spec.rb
new file mode 100644
index 00000000000..09974de0b31
--- /dev/null
+++ b/spec/components/widgets/feeds/feed_component_spec.rb
@@ -0,0 +1,65 @@
+require "rails_helper"
+
+describe Widgets::Feeds::FeedComponent, type: :component do
+ describe "#see_all_path" do
+ context "debates" do
+ let(:feed) { Widget::Feed.new(kind: "debates") }
+
+ it "points to the debates path for homepage debates feeds" do
+ component = Widgets::Feeds::FeedComponent.new(feed)
+
+ render_inline component
+
+ expect(component.see_all_path).to eq "/debates"
+ end
+
+ it "points to the debates filtered by goal for goal feeds" do
+ component = Widgets::Feeds::FeedComponent.new(SDG::Widget::Feed.new(feed, SDG::Goal[6]))
+
+ render_inline component
+
+ expect(component.see_all_path).to eq "/debates?advanced_search#{CGI.escape("[goal]")}=6"
+ end
+ end
+
+ context "proposals" do
+ let(:feed) { Widget::Feed.new(kind: "proposals") }
+
+ it "points to the proposals path for homepage proposals feeds" do
+ component = Widgets::Feeds::FeedComponent.new(feed)
+
+ render_inline component
+
+ expect(component.see_all_path).to eq "/proposals"
+ end
+
+ it "points to the proposals filtered by goal for goal feeds" do
+ component = Widgets::Feeds::FeedComponent.new(SDG::Widget::Feed.new(feed, SDG::Goal[6]))
+
+ render_inline component
+
+ expect(component.see_all_path).to eq "/proposals?advanced_search#{CGI.escape("[goal]")}=6"
+ end
+ end
+
+ context "processes" do
+ let(:feed) { Widget::Feed.new(kind: "processes") }
+
+ it "points to the legislation processes path for homepage processes feeds" do
+ component = Widgets::Feeds::FeedComponent.new(feed)
+
+ render_inline component
+
+ expect(component.see_all_path).to eq "/legislation/processes"
+ end
+
+ it "points to the legislation processes path for goal processes feeds" do
+ component = Widgets::Feeds::FeedComponent.new(SDG::Widget::Feed.new(feed, SDG::Goal[6]))
+
+ render_inline component
+
+ expect(component.see_all_path).to eq "/legislation/processes"
+ end
+ end
+ end
+end
diff --git a/spec/routing/sdg_routes_spec.rb b/spec/routing/sdg_routes_spec.rb
new file mode 100644
index 00000000000..d3dbcb398c0
--- /dev/null
+++ b/spec/routing/sdg_routes_spec.rb
@@ -0,0 +1,19 @@
+require "rails_helper"
+
+describe "SDG routes" do
+ it "maps goals to their code" do
+ expect(get("/sdg/goals/1")).to route_to(
+ controller: "sdg/goals",
+ action: "show",
+ code: "1"
+ )
+ end
+
+ it "requires using the code instead of the ID" do
+ expect(get(sdg_goal_path(SDG::Goal[2].code))).to route_to(
+ controller: "sdg/goals",
+ action: "show",
+ code: "2"
+ )
+ end
+end
diff --git a/spec/system/admin/homepage/homepage_spec.rb b/spec/system/admin/homepage/homepage_spec.rb
index 0e3eff79a2a..b6349376ac9 100644
--- a/spec/system/admin/homepage/homepage_spec.rb
+++ b/spec/system/admin/homepage/homepage_spec.rb
@@ -92,9 +92,6 @@
expect(page).to have_content "Most active debates"
expect(page).to have_css(".debate", count: 3)
end
-
- expect(page).to have_css("#feed_proposals.medium-8")
- expect(page).to have_css("#feed_debates.medium-4")
end
scenario "Processes", :js do
@@ -109,7 +106,7 @@
visit root_path
expect(page).to have_content "Open processes"
- expect(page).to have_css(".legislation_process", count: 3)
+ expect(page).to have_css(".legislation-process", count: 3)
end
xscenario "Deactivate"
diff --git a/spec/system/sdg/goals_spec.rb b/spec/system/sdg/goals_spec.rb
index 313765c5c5f..3231a6f80d1 100644
--- a/spec/system/sdg/goals_spec.rb
+++ b/spec/system/sdg/goals_spec.rb
@@ -21,4 +21,68 @@
expect(page).to have_current_path sdg_goals_path
end
end
+
+ describe "Index" do
+ scenario "has links to SDGs" do
+ visit sdg_goals_path
+
+ click_link "7. Affordable and Clean Energy"
+
+ expect(page).to have_current_path sdg_goal_path(7)
+ end
+ end
+
+ describe "Show" do
+ before do
+ goal = SDG::Goal[15]
+
+ create(:debate, title: "Solar panels", sdg_goals: [SDG::Goal[7]])
+ create(:debate, title: "Hunting ground", sdg_goals: [goal])
+ create(:proposal, title: "Animal farm", sdg_goals: [goal])
+ create(:proposal, title: "Sea farm", sdg_goals: [SDG::Goal[14]])
+ create(:legislation_process, title: "Bullfighting regulations", sdg_goals: [goal])
+ create(:legislation_process, title: "Tax regulations", sdg_goals: [SDG::Goal[10]])
+ end
+
+ scenario "shows the SDG and its related content" do
+ visit sdg_goal_path(15)
+
+ within(".sdg-goal header") { expect(page).to have_content "Life on Land" }
+
+ within ".feed-proposals" do
+ expect(page).to have_content "Animal farm"
+ expect(page).not_to have_content "Sea farm"
+ end
+
+ within ".feed-debates" do
+ expect(page).to have_content "Hunting ground"
+ expect(page).not_to have_content "Solar panels"
+ end
+
+ within ".feed-processes" do
+ expect(page).to have_content "BULLFIGHTING REGULATIONS"
+ expect(page).not_to have_content "TAX REGULATIONS"
+ end
+ end
+
+ scenario "has links to debates and proposals filtered by goal" do
+ visit sdg_goal_path(15)
+
+ click_link "See all debates"
+
+ within "#debates" do
+ expect(page).to have_content "Hunting ground"
+ expect(page).not_to have_content "Solar panels"
+ end
+
+ go_back
+
+ click_link "See all proposals"
+
+ within "#proposals" do
+ expect(page).to have_content "Animal farm"
+ expect(page).not_to have_content "Sea farm"
+ end
+ end
+ end
end