From 3b2ed08b54061de324e57b05674d124040b8849a Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Fri, 21 Jul 2017 16:36:42 +0200 Subject: [PATCH 01/41] Add recommended partials. --- app/views/welcome/_recommended.html.erb | 138 ++++++++++++++++++ .../welcome/_recommended_no_image.html.erb | 129 ++++++++++++++++ 2 files changed, 267 insertions(+) create mode 100644 app/views/welcome/_recommended.html.erb create mode 100644 app/views/welcome/_recommended_no_image.html.erb diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb new file mode 100644 index 000000000..3c6e17294 --- /dev/null +++ b/app/views/welcome/_recommended.html.erb @@ -0,0 +1,138 @@ +
+

Recomendaciones que te pueden interesar

+
+
+

Debates recomendados

+
+
+
    +
  • +
    + +
    +
    Titulo debate 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + + +
+
+
+ + +
+
+
+
+ +
+ +
+

Propuestas recomendadas

+
+
+
    +
  • +
    + +
    +
    Titulo propuesta 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + +
+
+
+ + +
+
+
+
+ +
+ +
+

Presupuestos recomendados

+
+
+
    +
  • +
    + +
    +
    Titulo presupuesto 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + +
+
+
+ + +
+
+
+
+ +
diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb new file mode 100644 index 000000000..8fc04488c --- /dev/null +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -0,0 +1,129 @@ +
+

Recomendaciones que te pueden interesar

+
+
+

Debates recomendados

+
+
+
    +
  • +
    +
    +
    Titulo debate 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + + +
+
+
+ + +
+
+
+
+ +
+ +
+

Propuestas recomendadas

+
+
+
    +
  • +
    +
    +
    Titulo propuesta 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + +
+
+
+ + +
+
+
+
+ +
+ +
+

Presupuestos recomendados

+
+
+
    +
  • +
    +
    +
    Titulo presupuesto 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + +
+
+
+ + +
+
+
+
+ +
From ff6471982c1a8f58cb301bc8f48871a6017a024f Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 21 Jul 2017 20:06:33 +0200 Subject: [PATCH 02/41] Add recommended debates, proposals and investement to Home page. --- app/controllers/welcome_controller.rb | 3 - app/helpers/welcome_helper.rb | 11 ++ app/models/user.rb | 18 ++ app/views/proposals/index.html.erb | 14 +- .../welcome/_recommended_no_image.html.erb | 157 ++++++++---------- app/views/welcome/index.html.erb | 2 + config/locales/en/general.yml | 8 + config/locales/es/general.yml | 8 + 8 files changed, 122 insertions(+), 99 deletions(-) create mode 100644 app/helpers/welcome_helper.rb diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index d0c650fa3..5aec4a456 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -4,9 +4,6 @@ class WelcomeController < ApplicationController layout "devise", only: [:welcome, :verification] def index - if current_user - redirect_to :proposals - end end def welcome diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb new file mode 100644 index 000000000..78c01b141 --- /dev/null +++ b/app/helpers/welcome_helper.rb @@ -0,0 +1,11 @@ +module WelcomeHelper + + def active_class(index) + "is-active is-in" if index == 0 + end + + def slide_display(index) + "display: none;" if index > 0 + end + +end diff --git a/app/models/user.rb b/app/models/user.rb index 60536195b..1a26030ea 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -313,6 +313,24 @@ class User < ActiveRecord::Base follows.map{|follow| follow.followable.tags.map(&:name)}.flatten.compact.uniq end + def recommended_debates + Debate.tagged_with(interests, any: true). + where("author_id != ?", self). + order("cached_votes_total DESC").limit(3) + end + + def recommended_proposals + Proposal.tagged_with(interests, any: true). + where("author_id != ?", self). + order("cached_votes_up DESC").limit(3) + end + + def recommended_budget_investments + Budget::Investment.tagged_with(interests, any: true). + where("author_id != ?", self). + order("cached_votes_up DESC").limit(3) + end + private def clean_document_number diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index e1c04c607..5d51ad279 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -16,13 +16,13 @@
<% if @search_terms || @advanced_search_terms %> -

<%= t("shared.search_results") %>

-

- <%= page_entries_info @proposals %> - <% if !@advanced_search_terms %> - <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %> - <% end %> -

+

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @proposals %> + <% if !@advanced_search_terms %> + <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %> + <% end %> +

<% elsif @tag_filter %>

<%= t("shared.search_results") %>

diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb index 8fc04488c..495bccc5c 100644 --- a/app/views/welcome/_recommended_no_image.html.erb +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -1,128 +1,107 @@

-

Recomendaciones que te pueden interesar

-
+

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

+ +
-

Debates recomendados

+ +

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

+
+
    -
  • -
    -
    -
    Titulo debate 1
    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    -
    -
    -
    • + <% current_user.recommended_debates.each_with_index do |debate, index| %> -
  • +
    +
    +
    <%= debate.title %>
    +

    <%= debate.description %>

    + +
    -
- + - + <% end %> + +
+ +
+ +
-
- - -
-
- +
-

Propuestas recomendadas

+ +

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

+
-
    -
  • -
    -
    -
    Titulo propuesta 1
    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    -
    -
    -
    • - - + + + <% end %>
+
-
+ +
-
+
+
-
+
+
+ +

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

-
-

Presupuestos recomendados

-
    -
  • -
    -
    -
    Titulo presupuesto 1
    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    -
    -
    -
    • - - + + + <% end %>
+
-
+ +
-
-
+
+ +
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 727ec67b7..a9b2d455c 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -45,3 +45,5 @@
<% end %> + +<%= render "recommended_no_image" %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index aea5c65c8..28e294c03 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -713,6 +713,14 @@ en: proposal: description: Open space for citizen proposals about the kind of city we want to live in. title: You propose + recommended: + title: Recommendations that may interest you + debates: + title: Recommended debates + proposals: + title: Recommended proposals + budget_investments: + title: Recommended investments verification: i_dont_have_an_account: I don't have an account i_have_an_account: I already have an account diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 3f21ed55f..47aae4544 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -713,6 +713,14 @@ es: proposal: description: Espacio abierto para propuestas ciudadanas sobre el tipo de ciudad en el que queremos vivir. title: Propones + recommended: + title: Recomendaciones que te pueden interesar + debates: + title: Debates recomendados + proposals: + title: Propuestas recomendados + budget_investments: + title: Presupuestos recomendados verification: i_dont_have_an_account: No tengo cuenta, quiero crear una y verificarla i_have_an_account: Ya tengo una cuenta que quiero verificar From a4e12ea8018c1d286e176d99187cb2a77be41674 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Sat, 22 Jul 2017 00:31:10 +0200 Subject: [PATCH 03/41] Added style to recommended section. Added orbit bullet. For each title of the recommended added truncate horizontal with css. Added link for each recommended. Adjusted for responsive. Passed scss-lint. --- app/assets/stylesheets/layout.scss | 101 +++++++++++ app/assets/stylesheets/mixins.scss | 28 +++ .../welcome/_recommended_no_image.html.erb | 170 +++++++++--------- db/schema.rb | 2 +- 4 files changed, 215 insertions(+), 86 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7a5705f60..5c4dcb567 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -18,6 +18,7 @@ // 16. Flags // 17. Activity // 18. Banners +// 19. Recommended Section Home // // 01. Global styles @@ -319,6 +320,14 @@ a { background: $brand; } +.truncate-horizontal-text { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + -ms-text-overflow: ellipsis; +} + // 02. Header // ---------- @@ -2128,3 +2137,95 @@ table { text-decoration: none; } } + +// 19. Recommended Section Home +// ----------- +.section-recommended { + padding-top: $line-height * 2; + + h2 { + margin-bottom: $line-height * 2; + } + + .debates, + .proposals, + .budget-investments { + + @include breakpoint(medium) { + margin-bottom: 0; + } + + @include breakpoint(small) { + margin-bottom: $line-height; + } + } + + .card { + + .card-section { + padding: $line-height; + + p { + font-size: rem-calc(15); + } + } + + .orbit { + height: 300px; + + .orbit-wrapper { + max-height: 250px; + overflow: hidden; + position: relative; + } + + .orbit-bullets { + @include orbit-bullets; + width: 100%; + } + } + } + + .card .orbit .orbit-wrapper .truncate { + background: image-url('truncate.png'); + background-repeat: repeat-x; + bottom: 0; + height: 20px; + position: absolute; + width: 100%; + } + + .debates-inner { + border-top: 4px solid $debates; + } + + .proposals-inner { + border-top: 4px solid $proposals; + } + + .budget-investments-inner { + border-top: 4px solid $budget; + } + + .debates-inner, + .proposals-inner, + .budget-investments-inner { + background: #fff; + max-height: 350px; + + @include breakpoint(small) { + max-height: 400px; + } + + h4 { + margin-top: $line-height; + margin-bottom: 0; + font-size: rem-calc(18); + min-height: 50px; + } + + h5 { + font-size: rem-calc(14); + } + } +} diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 401a2ec81..70f4c179d 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -1,6 +1,7 @@ // Table of Contents // // 01. Logo +// 02. Orbit bullets // // 01. Logo @@ -30,3 +31,30 @@ } } } + + +//02. Orbit bullet +@mixin orbit-bullets { + @include disable-mouse-outline; + position: relative; + margin-top: $orbit-bullet-margin-top; + margin-bottom: $orbit-bullet-margin-bottom; + text-align: center; + + button { + width: $orbit-bullet-diameter; + height: $orbit-bullet-diameter; + margin: $orbit-bullet-margin; + + border-radius: 50%; + background-color: $orbit-bullet-background; + + &:hover { + background-color: $orbit-bullet-background-active; + } + + &.is-active { + background-color: $orbit-bullet-background-active; + } + } +} diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb index 495bccc5c..e151c06c0 100644 --- a/app/views/welcome/_recommended_no_image.html.erb +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -1,108 +1,108 @@ -
-

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

+
+
+

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

-
-
+
+
-

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

+

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

-
-
+
+
+
    + <% current_user.recommended_debates.each_with_index do |debate, index| %> +
  • +
    +
    + <%= link_to debate_path(debate) do %> +
    <%= debate.title %>
    + <% end %> +

    <%= debate.description %>

    +
    +
    +
    • + <% end %> +
+
+
-
    +
- -
- -
- - -
-
+ +
+
-
-
-
+
+
-

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

+

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

-
-
- -
    +
    +
    +
      + <% current_user.recommended_proposals.each_with_index do |proposal, index| %> +
    • +
      +
      + <%= link_to proposal_path(proposal) do %> +
      <%= proposal.title %>
      + <% end %> +

      <%= proposal.description %>

      +
      +
      +
      • + <% end %> +
    +
    +
    +
- -
- -
- - -
- -
+ +
+
-
-
-
+
+
-

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

+

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

-
-
- -
    - <% current_user.recommended_budget_investments.each_with_index do |budget_investment, index| %> - -
  • -
    -
    -
    <%= budget_investment.title %>
    -

    <%= budget_investment.description %>

    - +
    +
    +
      + <% current_user.recommended_budget_investments.each_with_index do |budget_investment, index| %> +
    • +
      +
      + <%= link_to budget_path(budget_investment) do %> +
      <%= budget_investment.title %>
      + <% end %> +

      <%= budget_investment.description %>

      +
      -
    -
    • - + + <% end %> +
+
+
+
- -
- - -
-
-
diff --git a/db/schema.rb b/db/schema.rb index 91a26adeb..f12afd6a6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -919,7 +919,7 @@ ActiveRecord::Schema.define(version: 20170719174326) do t.boolean "email_digest", default: true t.boolean "email_on_direct_message", default: true t.boolean "official_position_badge", default: false - t.datetime "password_changed_at", default: '2017-06-22 11:21:30', null: false + t.datetime "password_changed_at", default: '2017-07-21 18:09:48', null: false t.boolean "created_from_signature", default: false t.integer "failed_email_digests_count", default: 0 t.text "former_users_data_log", default: "" From e82e8f5787176bf2daae41c986febce6d7a86ce4 Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 21 Jul 2017 22:58:49 +0200 Subject: [PATCH 04/41] Do not show proposals and investments as recommended when already followed --- app/models/user.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 1a26030ea..fb27d9532 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -320,14 +320,18 @@ class User < ActiveRecord::Base end def recommended_proposals + already_followed_proposals_ids = Proposal.joins(:follows).where("follows.user_id = ?", id).pluck(:id) + Proposal.tagged_with(interests, any: true). - where("author_id != ?", self). + where("author_id != ? AND id NOT IN (?)", id, already_followed_proposals_ids). order("cached_votes_up DESC").limit(3) end def recommended_budget_investments + already_followed_investments_ids = Budget::Investment.joins(:follows).where("follows.user_id = ?", id).pluck(:id) + Budget::Investment.tagged_with(interests, any: true). - where("author_id != ?", self). + where("author_id != ? AND id NOT IN (?)", id, already_followed_investments_ids). order("cached_votes_up DESC").limit(3) end From 36c76996e3c70c78fa6c4d8bdc3f56561aed0458 Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 21 Jul 2017 23:28:04 +0200 Subject: [PATCH 05/41] Display proposals and debates recommended when user have not interests. --- app/models/user.rb | 23 ++++++++++++++----- .../welcome/_recommended_no_image.html.erb | 12 +++++----- app/views/welcome/index.html.erb | 6 ++++- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index fb27d9532..973d46d2f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -321,18 +321,29 @@ class User < ActiveRecord::Base def recommended_proposals already_followed_proposals_ids = Proposal.joins(:follows).where("follows.user_id = ?", id).pluck(:id) + proposals_list = [] - Proposal.tagged_with(interests, any: true). - where("author_id != ? AND id NOT IN (?)", id, already_followed_proposals_ids). - order("cached_votes_up DESC").limit(3) + if already_followed_proposals_ids.any? + proposals_list = Proposal.tagged_with(interests, any: true). + where("author_id != ? AND id NOT IN (?)", id, already_followed_proposals_ids) + else + proposals_list = Proposal.where("author_id != ?", id) + end + + proposals_list.order("cached_votes_up DESC").limit(3) end def recommended_budget_investments already_followed_investments_ids = Budget::Investment.joins(:follows).where("follows.user_id = ?", id).pluck(:id) + investments_list = [] + if already_followed_investments_ids.any? + investments_list = Budget::Investment.tagged_with(interests, any: true). + where("author_id != ? AND id NOT IN (?)", id, already_followed_investments_ids) + else + investments_list = Budget::Investment.where("author_id != ?", id) + end - Budget::Investment.tagged_with(interests, any: true). - where("author_id != ? AND id NOT IN (?)", id, already_followed_investments_ids). - order("cached_votes_up DESC").limit(3) + investments_list.order("cached_votes_up DESC").limit(3) end private diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb index e151c06c0..5bf08cc44 100644 --- a/app/views/welcome/_recommended_no_image.html.erb +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -10,7 +10,7 @@
    - <% current_user.recommended_debates.each_with_index do |debate, index| %> + <% recommended_debates.each_with_index do |debate, index| %>
  • @@ -27,7 +27,7 @@
    - <%= render partial: 'proposals/proposal', collection: @proposals %> + <% if @proposals.any? %> + <%= render partial: 'proposals/proposal', collection: @proposals %> + <% else %> + <%= empty_recommended_proposals_message_text(current_user) %> + <% end %> <%= paginate @proposals %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index c6adeb22b..7937c06bf 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -109,6 +109,9 @@ en: most_commented: most commented relevance: relevance recommendations: recommendations + recommendations: + without_results: There are not debates related to your interests + without_interests: Follow proposals so we can give you recommendations search_form: button: Search placeholder: Search debates... @@ -331,6 +334,9 @@ en: relevance: relevance archival_date: Archived recommendations: recommendations + recommendations: + without_results: There are not proposals related to your interests + without_interests: Follow proposals so we can give you recommendations retired_proposals: Retired proposals retired_proposals_link: "Proposals retired by the author" retired_links: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index fb9167087..0c8b69057 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -109,6 +109,9 @@ es: most_commented: Más comentados relevance: Más relevantes recommendations: Recomendaciones + recommendations: + without_results: No existen debates relacionados con tus intereses + without_interests: Sigue propuestas para que podamos darte recomendaciones search_form: button: Buscar placeholder: Buscar debates... @@ -330,7 +333,10 @@ es: most_commented: Más comentadas relevance: Más relevantes archival_date: Archivadas - recommendations: Recomendaciones + recommendations: Recomendaciones + recommendations: + without_results: No existen propuestas relacionadas con tus intereses + without_interests: Sigue propuestas para que podamos darte recomendaciones retired_proposals: Propuestas retiradas retired_proposals_link: "Propuestas retiradas por sus autores" retired_links: diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index f5cde8d7d..e418d5100 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -371,6 +371,28 @@ feature 'Debates' do expect(page).not_to have_selector('a', text: 'recommendations') end + scenario 'Should display text when there are not recommendeds results', :js do + user = create(:user) + proposal = create(:proposal, tag_list: "Distinct_to_sport") + create(:follow, followable: proposal, user: user) + login_as(user) + visit debates_path + + click_link 'recommendations' + + expect(page).to have_content "There are not debates related to your interests" + end + + scenario 'Should display text when user has not related interests', :js do + user = create(:user) + login_as(user) + visit debates_path + + click_link 'recommendations' + + expect(page).to have_content "Follow proposals so we can give you recommendations" + end + scenario 'Debates are ordered by recommendations when there is a user logged', :js do proposal = create(:proposal, tag_list: "Sport" ) user = create(:user) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 7aeb20c1c..353bcfecb 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -632,11 +632,11 @@ feature 'Proposals' do context 'Recommendations' do - background do + before do Setting['feature.user.recommendations'] = true - create(:proposal, title: 'Best', cached_votes_up: 10) - create(:proposal, title: 'Medium', cached_votes_up: 5) - create(:proposal, title: 'Worst', cached_votes_up: 1) + create(:proposal, title: 'Best', cached_votes_up: 10, tag_list: "Sport") + create(:proposal, title: 'Medium', cached_votes_up: 5, tag_list: "Sport") + create(:proposal, title: 'Worst', cached_votes_up: 1, tag_list: "Sport") end after do @@ -649,8 +649,32 @@ feature 'Proposals' do expect(page).not_to have_selector('a', text: 'recommendations') end + scenario 'Should display text when there are not recommendeds results', :js do + user = create(:user) + proposal = create(:proposal, tag_list: "Distinct_to_sport") + create(:follow, followable: proposal, user: user) + login_as(user) + visit proposals_path + + click_link 'recommendations' + + expect(page).to have_content "There are not proposals related to your interests" + end + + scenario 'Should display text when user has not related interests', :js do + user = create(:user) + login_as(user) + visit proposals_path + + click_link 'recommendations' + + expect(page).to have_content "Follow proposals so we can give you recommendations" + end + scenario 'Proposals are ordered by recommendations when there is an user logged', :js do user = create(:user) + proposal = create(:proposal, tag_list: "Sport") + create(:follow, followable: proposal, user: user) login_as(user) visit proposals_path @@ -659,7 +683,7 @@ feature 'Proposals' do expect(page).to have_selector('a.active', text: 'recommendations') - within '#proposals' do + within '#proposals-list' do expect('Best').to appear_before('Medium') expect('Medium').to appear_before('Worst') end From fda2d8202fd3167b0e916d935b73aae892aa60eb Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 4 Aug 2017 14:18:20 +0200 Subject: [PATCH 36/41] Do not display empty recommended text when user is not logged --- app/views/debates/index.html.erb | 2 +- app/views/proposals/index.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index 816225b9e..eddcccd21 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -54,7 +54,7 @@ <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button expanded' %>
- <% if @debates.any? %> + <% if @debates.any? || current_user.blank? %> <%= render @debates %> <% else %> <%= empty_recommended_debates_message_text(current_user) %> diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index a9f1c3975..10b2ee382 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -66,7 +66,7 @@
- <% if @proposals.any? %> + <% if @proposals.any? || current_user.blank? %> <%= render partial: 'proposals/proposal', collection: @proposals %> <% else %> <%= empty_recommended_proposals_message_text(current_user) %> From 5ddeff217a915b99d746faaf69298df2abe2a5fb Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 5 Sep 2017 14:31:51 +0200 Subject: [PATCH 37/41] fixes css syntax error --- app/assets/stylesheets/layout.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 920d37323..2170387df 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2282,6 +2282,7 @@ table { margin: 0 auto; } } +} // 20. Documents .document-form form { @@ -2403,4 +2404,4 @@ table { } } -} +} \ No newline at end of file From b4a6f664bb3adebe69a5124857083f9e380d9136 Mon Sep 17 00:00:00 2001 From: taitus Date: Tue, 5 Sep 2017 18:51:19 +0200 Subject: [PATCH 38/41] Remove image by default on carousel. Remove duplicate code. Add background when user recomendations is actived --- app/helpers/welcome_helper.rb | 4 ++ app/views/welcome/_recommended.html.erb | 4 +- app/views/welcome/index.html.erb | 65 ++++++++----------------- 3 files changed, 25 insertions(+), 48 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index fcc70250f..76ae62d81 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -55,4 +55,8 @@ module WelcomeHelper end end + def highlight_background + (feature?("user.recommendations") && current_user) ? "highlight" : "" + end + end diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb index 99de4ec17..3c0088448 100644 --- a/app/views/welcome/_recommended.html.erb +++ b/app/views/welcome/_recommended.html.erb @@ -9,7 +9,7 @@ key: "debates", image_field: nil, image_version: nil, - image_default: "https://dummyimage.com/600x400/000/fff", + image_default: nil, carousel_size: carousel_size, btn_text_link: t("welcome.recommended.debates.btn_text_link"), btn_path_link: debates_path(order: "recommendations") %> @@ -21,7 +21,7 @@ key: "proposals", image_field: nil, image_version: nil, - image_default: "https://dummyimage.com/600x400/000/fff", + image_default: nil, carousel_size: carousel_size, btn_text_link: t("welcome.recommended.proposals.btn_text_link"), btn_path_link: proposals_path(order: "recommendations") %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 2291c2f2f..0ea0f748d 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -26,54 +26,27 @@ <% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
- -
-
-

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

-

<%= t("welcome.debates.description") %>

-
-
-

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

-

<%= t("welcome.proposal.description") %>

-
-
-

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

-

<%= t("welcome.decide.description") %>

-
-
-

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

-

<%= t("welcome.do.description") %>

+ +
+
+
+

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

+

<%= t("welcome.debates.description") %>

+
+
+

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

+

<%= t("welcome.proposal.description") %>

+
+
+

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

+

<%= t("welcome.decide.description") %>

+
+
+

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

+

<%= t("welcome.do.description") %>

+
-
-
-

- <%= t("welcome.debates.title") %>
- <%= t("welcome.debates.description") %> -

-
-
-

- <%= t("welcome.proposal.title") %>
- <%= t("welcome.proposal.description") %> -

-
-
- -
-
-

- <%= t("welcome.decide.title") %>
- <%= t("welcome.decide.description") %> -

-
-
-

- <%= t("welcome.do.title") %>
- <%= t("welcome.do.description") %> -

-
-
<% end %> From ea4d46f786396bbae20f6d12961c0a8706c06ece Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 6 Sep 2017 11:28:27 +0200 Subject: [PATCH 39/41] Fix specs --- spec/features/budgets/investments_spec.rb | 2 ++ spec/features/proposals_spec.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index ef2c1bf5b..4040717f1 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -340,6 +340,8 @@ feature 'Budget Investments' do end scenario 'Can not access the community' do + Setting['feature.community'] = false + investment = create(:budget_investment, heading: heading) visit budget_investment_path(budget_id: budget.id, id: investment.id) expect(page).not_to have_content "Access the community" diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index b7492e19c..e7d000f94 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -101,6 +101,8 @@ feature 'Proposals' do end scenario 'Can not access the community' do + Setting['feature.community'] = false + proposal = create(:proposal) visit proposal_path(proposal) expect(page).not_to have_content "Access the community" From 4eee5f6ebaba56db30460ea9b4cdaaa2bcf30b31 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Thu, 28 Sep 2017 17:03:50 +0200 Subject: [PATCH 40/41] Fixed orbit-bullets. Decreased margin-top to button.hollow.expanded. --- app/assets/stylesheets/layout.scss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index d05dbd54b..8d2d155e3 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2198,15 +2198,17 @@ table { margin-bottom: $line-height; } - .button.hollow{ - margin-top: $line-height; + .button.hollow { + margin-top: rem-calc(10); } } .card { .card-section { - padding:$line-height 0; + padding: $line-height 0; + max-width: 300px; + margin: 0 auto; p { font-size: rem-calc(15); @@ -2280,8 +2282,7 @@ table { height: 480px; .orbit-wrapper { - min-height: 450px; - max-height: 460px; + max-height: 450px; } } @@ -2362,6 +2363,5 @@ table { } } - } -} \ No newline at end of file +} From 20fd176b6af9ff69609c57c7508a58218efa8ba1 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Thu, 28 Sep 2017 17:13:45 +0200 Subject: [PATCH 41/41] Change again margin-top to button.hollow --- app/assets/stylesheets/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 8d2d155e3..67abd0f1f 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2199,7 +2199,7 @@ table { } .button.hollow { - margin-top: rem-calc(10); + margin-top: rem-calc(15); } }