diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index c1cdcebbc..0694bf6bd 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -30,27 +30,31 @@ module WelcomeHelper image_tag(image_path) if image_path.present? end - def calculate_size(debates, proposals, budget_investments) - size = debates.any? && proposals.any? && budget_investments.any? ? 4 : 6 - "medium-#{size} large-#{size}" + def calculate_carousel_size(debates, proposals, apply_offset) + offset = calculate_offset(debates, proposals, apply_offset) + centered = calculate_centered(debates, proposals) + "#{offset if offset} #{centered if centered}" end - def calculate_centered(debates, proposals, budget_investments) - if debates.blank? && proposals.blank? && budget_investments.any? || - debates.blank? && proposals.any? && budget_investments.blank? || - debates.any? && proposals.blank? && budget_investments.blank? - centered = "medium-centered large-centered" + def calculate_centered(debates, proposals) + if (debates.blank? && proposals.any?) || + (debates.any? && proposals.blank?) + centered = "medium-centered large-centered" end end - def calculate_carousel_size(debates, proposals, budget_investments) - size = calculate_size(debates, proposals, budget_investments) - centered = calculate_centered(debates, proposals, budget_investments) - "#{size} #{centered if centered}" + def calculate_offset(debates, proposals, apply_offset) + if (debates.any? && proposals.any?) + if apply_offset + offset = "medium-offset-2 large-offset-2" + else + offset = "end" + end + end end - def display_recommendeds(debates, proposals, budget_investments) - debates.any? || proposals.any? || budget_investments.any? + def display_recommendeds(debates, proposals) + debates.any? || proposals.any? end end diff --git a/app/models/user.rb b/app/models/user.rb index 74eaecd38..1f5749d96 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -336,18 +336,6 @@ class User < ActiveRecord::Base proposals_list.order("cached_votes_up DESC").limit(3) end - def recommended_budget_investments - investments_list = Budget::Investment.where("author_id != ?", id) - investments_list_with_tagged = investments_list.tagged_with(interests, any: true) - - if interests.any? && investments_list_with_tagged.any? - followed_investments_ids = Budget::Investment.followed_by_user(self).pluck(:id) - investments_list = investments_list_with_tagged.where("id NOT IN (?)", followed_investments_ids) - end - - investments_list.order("cached_votes_up DESC").limit(3) - end - private def clean_document_number diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb index c47e119c0..3950fe8c6 100644 --- a/app/views/welcome/_recommended.html.erb +++ b/app/views/welcome/_recommended.html.erb @@ -2,10 +2,9 @@

<%= t("welcome.recommended.title") %>

-
diff --git a/app/views/welcome/_recommended_carousel.html.erb b/app/views/welcome/_recommended_carousel.html.erb index 6f41fb14d..773ba3588 100644 --- a/app/views/welcome/_recommended_carousel.html.erb +++ b/app/views/welcome/_recommended_carousel.html.erb @@ -1,4 +1,4 @@ -