decidim-proposals 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4be5f073d284da3f8ac70f23505dc51a15b6b888
-  data.tar.gz: b6e8be99a9db14b98eec0246f41648d34bbf3d84
+  metadata.gz: f981594ab6257e9cf721a9ffd76368d8c86c96f8
+  data.tar.gz: e857387adb235b90d3f758f57565712fccca1334
 SHA512:
-  metadata.gz: e7d3f307976ba987e3eb993452f98e58bedb727ae06a7caa81fd0fd0b7a0afc24f59950f999db00a41c103984b4a1d188703ea8d70dc808976a24b270ecd0867
-  data.tar.gz: 82905c51a3d79b6fb87579567dbb717fc3e359ff4088c2992fc1e53ba5341e77411e53f0c1f25f4d5a0b23fdee426cd75d38b001973cbde4cc6d6b96e8d06812
+  metadata.gz: 6ed1c5ea32849f63efe358f438fc878b833528030d6d12d0669953e5419866c8a24a5c1f9dfb2c56f76e6f854a19487920c4bc0354f8db5853bfdc48aa7c9717
+  data.tar.gz: efb15ffb3ad5e9fbfea35fa780a0966e9b5d44899c7c8dde74dd1ce418bea634b268b2a9e7faf5cbfd349b067139add3f128dabd06cbdfca3428aedb3ffbd134

data/Rakefile

@@ -1,2 +1,2 @@
 # frozen_string_literal: true
-require "decidim/common_rake"
+require "decidim/dev/common_rake"

data/app/assets/config/decidim_proposals_manifest.css

@@ -0,0 +1 @@
+/*= link decidim/proposals/social_share.css.scss */

data/app/assets/config/decidim_proposals_manifest.js

@@ -0,0 +1 @@
+//= link decidim/proposals/social_share.js

data/app/assets/images/decidim/proposals/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/></svg>

data/app/assets/javascripts/decidim/proposals/social_share.js

@@ -0,0 +1,2 @@
+// = require social-share-button
+// = require_self

data/app/assets/stylesheets/decidim/proposals/social_share.css.scss

@@ -0,0 +1,14 @@
+/*= require social-share-button */
+$size: 45px;
+
+.social-share-button {
+  display: inline-block;
+  vertical-align: top;
+  .ssb-icon {
+    margin-right: 5px;
+    background-size: $size $size;
+    height: $size;
+    width: $size;
+  }
+}
+

data/app/commands/decidim/proposals/create_proposal.rb

@@ -5,9 +5,11 @@ module Decidim
     class CreateProposal < Rectify::Command
       # Public: Initializes the command.
       #
-      # form - A form object with the params.
-      def initialize(form)
+      # form         - A form object with the params.
+      # current_user - The current user.
+      def initialize(form, current_user)
         @form = form
+        @current_user = current_user
       end
 
       # Executes the command. Broadcasts these events:
@@ -33,7 +35,7 @@ module Decidim
           body: form.body,
           category: form.category,
           scope: form.scope,
-          author: form.author,
+          author: @current_user,
           feature: form.feature
         )
       end

data/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -7,13 +7,13 @@ module Decidim
         helper_method :proposals
 
         def new
-          @form = form(ProposalForm).from_params({}, feature: current_feature)
+          @form = form(Admin::ProposalForm).from_params({})
         end
 
         def create
-          @form = form(ProposalForm).from_params(params, feature: current_feature)
+          @form = form(Admin::ProposalForm).from_params(params)
 
-          CreateProposal.call(@form) do
+          Admin::CreateProposal.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("proposals.create.success", scope: "decidim.proposals.admin")
               redirect_to proposals_path

data/app/controllers/decidim/proposals/proposal_votes_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Exposes the proposal vote resource so users can vote proposals.
+    class ProposalVotesController < Decidim::Proposals::ApplicationController
+      before_action :authenticate_user!
+      before_action :check_current_settings!
+
+      def create
+        @proposal = Proposal.where(feature: current_feature).find(params[:proposal_id])
+        @proposal.votes.create!(author: current_user)
+        @from_proposals_list = params[:from_proposals_list] == "true"
+      end
+
+      private
+
+      # The vote buttons should not be visible if the setting is not enabled.
+      # This ensure the votes cannot be created using a POST request directly.
+      def check_current_settings!
+        raise "This setting is not enabled for this step" unless current_settings.votes_enabled?
+      end
+    end
+  end
+end

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     # Exposes the proposal resource so users can view and create them.
     class ProposalsController < Decidim::Proposals::ApplicationController
       include FormFactory
+      include FilterResource
+
       before_action :authenticate_user!, only: [:new, :create]
 
       def show
@@ -12,19 +14,21 @@ module Decidim
       end
 
       def index
-        @search = ProposalSearch.new(current_feature, params[:page], params[:random_seed])
-        @proposals = @search.proposals
-        @random_seed = @search.random_seed
+        @proposals = search
+                     .results
+                     .includes(:author)
+                     .includes(votes: [:author])
+        @random_seed = search.random_seed
       end
 
       def new
-        @form = form(ProposalForm).from_params({}, author: current_user, feature: current_feature)
+        @form = form(ProposalForm).from_params({})
       end
 
       def create
-        @form = form(ProposalForm).from_params(params, author: current_user, feature: current_feature)
+        @form = form(ProposalForm).from_params(params)
 
-        CreateProposal.call(@form) do
+        CreateProposal.call(@form, current_user) do
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.create.success", scope: "decidim")
             redirect_to proposal_path(proposal)
@@ -36,6 +40,29 @@ module Decidim
           end
         end
       end
+
+      private
+
+      def search_klass
+        ProposalSearch
+      end
+
+      def default_search_params
+        {
+          page: params[:page],
+          per_page: 12
+        }
+      end
+
+      def default_filter_params
+        {
+          search_text: "",
+          origin: "all",
+          activity: "",
+          category_id: "",
+          random_seed: params[:random_seed]
+        }
+      end
     end
   end
 end

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -10,27 +10,28 @@ module Decidim
         attribute :body, String
         attribute :category_id, Integer
         attribute :scope_id, Integer
-        attribute :feature, Decidim::Feature
 
-        validates :title, :body, :feature, presence: true
+        validates :title, :body, presence: true
         validates :category, presence: true, if: ->(form) { form.category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 
-        delegate :categories, to: :feature
-        delegate :scopes, to: :current_organization
+        delegate :categories, to: :current_feature, prefix: false
+        delegate :scopes, to: :current_organization, prefix: false
+
+        alias feature current_feature
 
         # Finds the Category from the category_id.
         #
         # Returns a Decidim::Category
         def category
-          @category ||= feature.categories.where(id: category_id).first
+          @category ||= categories.where(id: category_id).first
         end
 
         # Finds the Scope from the scope_id.
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= feature.scopes.where(id: scope_id).first
+          @scope ||= scopes.where(id: scope_id).first
         end
       end
     end

data/app/forms/decidim/proposals/proposal_form.rb

@@ -7,30 +7,30 @@ module Decidim
 
       attribute :title, String
       attribute :body, String
-      attribute :author, Decidim::User
       attribute :category_id, Integer
       attribute :scope_id, Integer
-      attribute :feature, Decidim::Feature
 
-      validates :title, :body, :author, :feature, presence: true
+      validates :title, :body, presence: true
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 
-      delegate :categories, to: :feature
+      delegate :categories, to: :current_feature
       delegate :scopes, to: :current_organization
 
+      alias feature current_feature
+
       # Finds the Category from the category_id.
       #
       # Returns a Decidim::Category
       def category
-        @category ||= feature.categories.where(id: category_id).first
+        @category ||= categories.where(id: category_id).first
       end
 
       # Finds the Scope from the scope_id.
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= feature.scopes.where(id: scope_id).first
+        @scope ||= scopes.where(id: scope_id).first
       end
     end
   end

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

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 module Decidim
   module Proposals
-    # Custom helpers, scoped to the pages engine.
+    # Custom helpers, scoped to the proposals engine.
     #
     module ApplicationHelper
       include Decidim::Comments::CommentsHelper
+      include PaginateHelper
+      include ProposalVotesHelper
     end
   end
 end

data/app/helpers/decidim/proposals/proposal_votes_helper.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    # Simple helpers to handle markup variations for proposal votes partials
+    module ProposalVotesHelper
+      # Returns the css classes used for proposal votes count in both proposals list and show pages
+      #
+      # from_proposals_list - A boolean to indicate if the template is rendered from the proposals list page
+      #
+      # Returns a hash with the css classes for the count number and label
+      def votes_count_classes(from_proposals_list)
+        return { number: "card__support__number", label: "" } if from_proposals_list
+        { number: "extra__suport-number", label: "extra__suport-text" }
+      end
+
+      # Returns the css classes used for proposal vote button in both proposals list and show pages
+      #
+      # from_proposals_list - A boolean to indicate if the template is rendered from the proposals list page
+      #
+      # Returns a string with the value of the css classes.
+      def vote_button_classes(from_proposals_list)
+        return "small" if from_proposals_list
+        "expanded button--sc"
+      end
+    end
+  end
+end

data/app/models/decidim/proposals/proposal.rb

@@ -8,6 +8,7 @@ module Decidim
       belongs_to :category, foreign_key: "decidim_category_id", class_name: Decidim::Category
       belongs_to :scope, foreign_key: "decidim_scope_id", class_name: Decidim::Scope
       has_one :organization, through: :feature
+      has_many :votes, foreign_key: "decidim_proposal_id", class_name: ProposalVote, dependent: :destroy
 
       validates :title, :feature, :body, presence: true
       validate :category_belongs_to_feature
@@ -32,6 +33,13 @@ module Decidim
         true
       end
 
+      # Public: Check if the user has voted the proposal
+      #
+      # Returns Boolean
+      def voted_by?(user)
+        votes.any? { |vote| vote.author == user }
+      end
+
       private
 
       def category_belongs_to_feature

data/app/models/decidim/proposals/proposal_vote.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    # A proposal can include a vote per user.
+    class ProposalVote < ApplicationRecord
+      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: Decidim::Proposals::Proposal, counter_cache: true
+      belongs_to :author, foreign_key: "decidim_author_id", class_name: Decidim::User
+
+      validates :proposal, uniqueness: { scope: :author }
+      validate :author_and_proposal_same_organization
+
+      private
+
+      # Private: check if the proposal and the author have the same organization
+      def author_and_proposal_same_organization
+        errors.add(:proposal, :invalid) unless author.organization == proposal.organization
+      end
+    end
+  end
+end

data/app/services/decidim/proposals/proposal_search.rb

@@ -3,26 +3,54 @@ module Decidim
   module Proposals
     # A service to encapsualte all the logic when searching and filtering
     # proposals in a participatory process.
-    class ProposalSearch
-      attr_reader :feature, :page, :per_page
-
+    class ProposalSearch < ResourceSearch
       # Public: Initializes the service.
       # feature     - A Decidim::Feature to get the proposals from.
       # page        - The page number to paginate the results.
-      # random_seed - A random flaot number between -1 and 1 to be used as a random seed at the database.
       # per_page    - The number of proposals to return per page.
-      def initialize(feature, page = nil, random_seed = nil, per_page = nil)
-        @feature = feature
-        @page = (page || 1).to_i
-        @per_page = (per_page || 12).to_i
-        @random_seed = random_seed.to_f
+      # random_seed - A random flaot number between -1 and 1 to be used as a random seed at the database.
+      def initialize(options = {})
+        super(Proposal.all, options)
+        @random_seed = options[:random_seed].to_f
+      end
+
+      # Handle the search_text filter
+      def search_search_text
+        query
+          .where("title ILIKE ?", "%#{search_text}%")
+          .or(query.where("body ILIKE ?", "%#{search_text}%"))
+      end
+
+      # Handle the origin filter
+      # The 'official' proposals doesn't have an author id
+      def search_origin
+        if origin == "official"
+          query.where(decidim_author_id: nil)
+        elsif origin == "citizenship"
+          query.where.not(decidim_author_id: nil)
+        else # Assume 'all'
+          query
+        end
+      end
+
+      # Handle the activity filter
+      def search_activity
+        if activity.include? "voted"
+          query
+            .includes(:votes)
+            .where(decidim_proposals_proposal_votes: {
+                     decidim_author_id: options[:current_user]
+                   })
+        else
+          query
+        end
       end
 
       # Returns the random proposals for the current page.
-      def proposals
+      def results
         @proposals ||= Proposal.transaction do
           Proposal.connection.execute("SELECT setseed(#{Proposal.connection.quote(random_seed)})")
-          Proposal.where(feature: feature).reorder("RANDOM()").page(page).per(per_page).load
+          super.reorder("RANDOM()").load
         end
       end
 

data/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -8,12 +8,12 @@
 
 <% if @form.categories&.any? %>
   <div class="field">
-    <%= form.categories_select :category_id, @form.categories, t(".select_a_category") %>
+    <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
   </div>
 <% end %>
 
 <% if @form.scopes&.any? %>
   <div class="field">
-    <%= form.select :scope_id, @form.scopes.map{|s| [translated_attribute(s.name), s.id]}, prompt: t(".select_a_scope") %>
+    <%= form.select :scope_id, @form.scopes.map{|s| [s.name, s.id]}, prompt: t(".select_a_scope") %>
   </div>
 <% end %>

data/app/views/decidim/proposals/proposal_votes/create.js.erb

@@ -0,0 +1,5 @@
+var $proposalVotesCount = $('#proposal-<%= @proposal.id %>-votes-count');
+var $proposalVoteButton = $('#proposal-<%= @proposal.id %>-vote-button');
+
+$proposalVotesCount.html('<%= j(render partial: 'decidim/proposals/proposals/votes_count', locals: { proposal: @proposal, from_proposals_list: @from_proposals_list }) %>');
+$proposalVoteButton.html('<%= j(render partial: 'decidim/proposals/proposals/vote_button', locals: { proposal: @proposal, from_proposals_list: @from_proposals_list }) %>');

data/app/views/decidim/proposals/proposals/_count.html.erb

@@ -0,0 +1 @@
+<%= t(".proposals_count", count: @proposals.total_count) %>

data/app/views/decidim/proposals/proposals/_filters.html.erb

@@ -0,0 +1,26 @@
+<%= filter_form_for filter do |form| %>
+  <div class="filters__section">
+    <div class="filters__search">
+      <div class="input-group">
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t('.search') %>
+        <div class="input-group-button">
+          <button type="submit" class="button button--muted">
+            <%= icon "magnifying-glass", aria_label: t('.search') %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizenship", t('.citizenship')]], :first, :last, legend_title: t('.origin') %>
+
+  <% if current_user && current_settings.votes_enabled? %>
+    <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
+  <% end %>
+
+  <% if current_feature.categories.any? %>
+    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>  
+  <% end %>
+
+  <%= form.hidden_field :random_seed %>
+<% end %>

data/app/views/decidim/proposals/proposals/_proposal.html.erb

@@ -26,8 +26,17 @@
     </div>
     <div class="card__footer">
       <div class="card__support">
-        <div class="card__support__data"></div>
-        <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>
+        <% if current_settings.votes_enabled? %>
+          <div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
+            <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
+          </div>
+          <div id="proposal-<%= proposal.id %>-vote-button"> 
+            <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
+          </div>
+        <% else %>
+          <div class="card__support__data"></div>
+          <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>  
+        <% end %>
       </div>
     </div>
   </article>

data/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -0,0 +1,4 @@
+<div class="row small-up-1 medium-up-2 card-grid">
+  <%= render @proposals %>
+</div>
+<%= decidim_paginate @proposals, random_seed: @random_seed %>

data/app/views/decidim/proposals/proposals/_share.html.erb

@@ -0,0 +1,33 @@
+<div class="text-center">
+  <button class="link text-center" data-open="processShare">
+    <%= t(".share") %>
+    <%= icon "share", class: "icon--after"%>
+  </button>
+</div>
+<div class="reveal" id="processShare" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".share") %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="button-group text-center">
+  <%= social_share_button_tag(content_for(:meta_title),
+        url: content_for(:meta_url),
+        image: content_for(:meta_image_url),
+        desc: content_for(:meta_description),
+        via: content_for(:twitter_handler)) %>
+    <a class="button secondary" data-open="urlShare">
+      <%= icon "link-intact" %>
+    </a>
+  </div>
+</div>
+<div class="reveal" id="urlShare" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".share_link") %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <h4 class="heading4"><%= "#{content_for(:meta_url)}" %></h4>
+</div>

data/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -0,0 +1,13 @@
+<% if current_user %>
+  <% if proposal.voted_by? current_user %>
+    <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
+      <%= t('.already_voted') %>
+    </button>
+  <% else %>
+    <%= button_to t('.vote'), proposal_proposal_votes_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+  <% end %>
+<% else %>
+  <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
+    <%= t('.vote') %>
+  </button>
+<% end %>

data/app/views/decidim/proposals/proposals/_votes_count.html.erb

@@ -0,0 +1,6 @@
+<span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
+  <%= proposal.votes.size %>
+</span>
+<span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
+  <%= t('.count', count: proposal.votes.size) %>
+</span>

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

@@ -1,6 +1,8 @@
 <div class="row columns">
   <div class="title-action">
-    <h2 class="title-action__title section-heading"><%= t(".proposals_count", count: @proposals.total_count) %></h2>
+    <h2 id="proposals-count" class="title-action__title section-heading">
+      <%= render partial: "count" %>
+    </h2>
     <%= link_to new_proposal_path, class: "title-action__action button small hollow" do %>
       <%= t(".new_proposal") %>
       <%= icon "plus" %>
@@ -8,16 +10,14 @@
   </div>
 </div>
 <div class="row">
-  <div class="columns mediumlarge-12 large-12">
-    <div class="row small-up-1 medium-up-3 card-grid">
-      <%= render @proposals %>
+  <div class="columns mediumlarge-4 large-3">
+    <div class="card card--secondary show-for-mediumlarge" >
+      <%= render partial: "filters" %>
     </div>
-    <%
-      # Kaminari uses url_for to generate the url, but this doesn't play nice with our engine system
-      # and unless we remove these params they are added again as query string 😩
-      params.delete("participatory_process_id")
-      params.delete("feature_id")
-    %>
-    <%= paginate @proposals, theme: "decidim", params: { random_seed: @random_seed } %>
+  </div>
+  <div id="proposals" class="columns mediumlarge-8 large-9">
+    <%= render partial: "proposals" %>
   </div>
 </div>
+
+<%= render partial: "decidim/shared/login_modal" %>

data/app/views/decidim/proposals/proposals/index.js.erb

@@ -0,0 +1,5 @@
+var $proposals = $('#proposals');
+var $proposalsCount = $('#proposals-count');
+
+$proposals.html('<%= j(render partial: "proposals") %>');
+$proposalsCount.html('<%= j(render partial: "count") %>');

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

@@ -1,3 +1,8 @@
+<% content_for :meta_description, @proposal.body %>
+<% content_for :meta_title, @proposal.title %>
+<% content_for :meta_url, proposal_url(@proposal.id) %>
+<% content_for :twitter_handler, current_organization.twitter_handler %>
+
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
   <div class="author-data">
@@ -16,22 +21,44 @@
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
+    <% if current_settings.votes_enabled? %>
+      <div class="card extra">
+        <div class="card__content">
+            <div id="proposal-<%= @proposal.id %>-votes-count">
+              <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
+            </div>
+            <div id="proposal-<%= @proposal.id %>-vote-button"> 
+              <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
+            </div>
+        </div>
+      </div>
+    <% end %>
+    <%= render partial: "share", locals: { proposal: @proposal } %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <p><%= @proposal.body %></p>
-      <% if @proposal.category %>
+      <% if @proposal.category || @proposal.scope %>
         <ul class="tags tags--proposal">
-          <li><a href=""><%= translated_attribute(@proposal.category.name) %></a></li>
+          <% if @proposal.category %>
+            <li><a href=""><%= translated_attribute(@proposal.category.name) %></a></li>
+          <% end %>
+          <% if @proposal.scope %>
+            <li><a href=""><%= @proposal.scope.name %></a></li>
+          <% end %>
         </ul>
       <% end %>
     </div>
   </div>
 </div>
 
-
 <%= content_for :expanded do %>
   <% if @proposal.commentable? %>
-    <%= comments_for @proposal, arguable: true %>
+    <%= comments_for @proposal, arguable: true, votable: true %>
   <% end %>
 <% end %>
+
+<%= render partial: "decidim/shared/login_modal" %>
+
+<%= javascript_include_tag "decidim/proposals/social_share" %>
+<%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/config/i18n-tasks.yml

@@ -2,3 +2,4 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.proposals.name"
+- "decidim.features.proposals.settings.*"

data/config/initializers/social_share_button.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+SocialShareButton.configure do |config|
+  config.allow_sites = %w(twitter facebook google_plus)
+end

data/config/locales/ca.yml

@@ -3,6 +3,9 @@ ca:
     features:
       proposals:
         name: Propostes
+        settings:
+          step:
+            votes_enabled: Vots habilitats
     proposals:
       actions:
         new: Nova proposta
@@ -33,9 +36,21 @@ ca:
             scope: Àmbit
             title: Títol
       proposals:
+        count:
+          proposals_count:
+            one: 1 proposta
+            other: "%{count} propostes"
+        filters:
+          activity: Activitat
+          all: Tots
+          category: Categoria
+          citizenship: Ciutadania
+          official: Oficial
+          origin: Origen
+          search: Cerca
+          voted: Votat
         index:
           new_proposal: Nova proposta
-          proposals_count: "%{count} propostes"
         new:
           back: Enrere
           select_a_category: Si us plau, seleccioni una categoria
@@ -43,4 +58,15 @@ ca:
           send: Enviar
           title: Nova proposta
         proposal:
-          view_proposal: Veure proposta
+          view_proposal: Veure proposta
+        share:
+          close_window: Tanca la finestra
+          share: Compartir
+          share_link: Comparteix l'enllaç
+        vote_button:
+          already_voted: Ja has votat
+          vote: Votar
+        votes_count:
+          count:
+            one: VOT
+            other: VOTS

data/config/locales/en.yml

@@ -4,6 +4,9 @@ en:
     features:
       proposals:
         name: Proposals
+        settings:
+          step:
+            votes_enabled: Votes enabled
     proposals:
       actions:
         new: New proposal
@@ -34,9 +37,21 @@ en:
             scope: Scope
             title: Title
       proposals:
+        count:
+          proposals_count:
+            one: 1 proposal
+            other: "%{count} proposals"
+        filters:
+          activity: Activity
+          all: All
+          category: Category
+          citizenship: Citizenship
+          official: Official
+          origin: Origin
+          search: Search
+          voted: Voted
         index:
           new_proposal: New proposal
-          proposals_count: "%{count} proposals"
         new:
           back: Back
           select_a_category: Please select a category
@@ -45,3 +60,14 @@ en:
           title: New proposal
         proposal:
           view_proposal: View proposal
+        share:
+          close_window: Close window
+          share: Share
+          share_link: Share link
+        vote_button:
+          already_voted: Already voted
+          vote: Vote
+        votes_count:
+          count:
+            one: VOTE
+            other: VOTES

data/config/locales/es.yml

@@ -3,6 +3,9 @@ es:
     features:
       proposals:
         name: Propuestas
+        settings:
+          step:
+            votes_enabled: Votos habilitados
     proposals:
       actions:
         new: Nueva propuesta
@@ -33,9 +36,21 @@ es:
             scope: Ámbito
             title: Título
       proposals:
+        count:
+          proposals_count:
+            one: 1 propuesta
+            other: "%{count} propuestas"
+        filters:
+          activity: Actividad
+          all: Todas
+          category: Categoría
+          citizenship: Ciudadanía
+          official: Oficial
+          origin: Origen
+          search: Buscar
+          voted: Votado
         index:
           new_proposal: Nueva propuesta
-          proposals_count: "%{count} propuestas"
         new:
           back: Atrás
           select_a_category: Por favor, seleccione una categoría
@@ -43,4 +58,15 @@ es:
           send: Enviar
           title: Nueva propuesta
         proposal:
-          view_proposal: Ver propuesta
+          view_proposal: Ver propuesta
+        share:
+          close_window: Cerrar ventana
+          share: Compartir
+          share_link: Compartir enlace
+        vote_button:
+          already_voted: Ya votado
+          vote: Votar
+        votes_count:
+          count:
+            one: VOTAR
+            other: VOTOS

data/db/migrate/20170112115253_create_proposal_votes.rb

@@ -0,0 +1,12 @@
+class CreateProposalVotes < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_proposals_proposal_votes do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_proposal_vote_proposal" }
+      t.references :decidim_author, null: false, index: { name: "decidim_proposals_proposal_vote_author" }
+      
+      t.timestamps
+    end
+
+    add_index :decidim_proposals_proposal_votes, [:decidim_proposal_id, :decidim_author_id], unique: true, name: "decidim_proposals_proposal_vote_proposal_author_unique"
+  end
+end

data/db/migrate/20170113114245_add_text_search_indexes.rb

@@ -0,0 +1,6 @@
+class AddTextSearchIndexes < ActiveRecord::Migration[5.0]
+  def change
+    add_index :decidim_proposals_proposals, :title, name: "decidim_proposals_proposal_title_search"
+    add_index :decidim_proposals_proposals, :body, name: "decidim_proposals_proposal_body_search"
+  end
+end

data/db/migrate/20170118120151_add_counter_cache_votes_to_proposals.rb

@@ -0,0 +1,5 @@
+class AddCounterCacheVotesToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :proposal_votes_count, :integer, null: false, default: 0
+  end
+end

data/lib/decidim/proposals/engine.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "kaminari"
+require "social-share-button"
 
 module Decidim
   module Proposals
@@ -10,9 +11,15 @@ module Decidim
       isolate_namespace Decidim::Proposals
 
       routes do
-        resources :proposals, only: [:create, :new, :index, :show]
+        resources :proposals, only: [:create, :new, :index, :show] do
+          resources :proposal_votes, only: [:create]
+        end
         root to: "proposals#index"
       end
+
+      initializer "decidim_proposals.assets" do |app|
+        app.config.assets.precompile += %w(decidim_proposals_manifest.js decidim_proposals_manifest.css)
+      end
     end
   end
 end

data/lib/decidim/proposals/feature.rb

@@ -5,13 +5,18 @@ require_dependency "decidim/features/namer"
 Decidim.register_feature(:proposals) do |feature|
   feature.engine = Decidim::Proposals::Engine
   feature.admin_engine = Decidim::Proposals::AdminEngine
+  feature.icon = "decidim/proposals/icon.svg"
 
-  feature.on(:destroy) do |instance|
+  feature.on(:before_destroy) do |instance|
     if Decidim::Proposals::Proposal.where(feature: instance).any?
       raise "Can't destroy this feature when there are proposals"
     end
   end
 
+  feature.settings(:step) do |settings|
+    settings.attribute :votes_enabled, type: :boolean
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?
@@ -19,16 +24,37 @@ Decidim.register_feature(:proposals) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
         manifest_name: :proposals,
-        participatory_process: process
+        participatory_process: process,
+        step_settings: {
+          process.active_step.id => { votes_enabled: true }
+        }
       )
 
-      20.times do
-        Decidim::Proposals::Proposal.create!(
+      20.times do |n|
+        proposal = Decidim::Proposals::Proposal.create!(
           feature: feature,
           title: Faker::Lorem.sentence(2),
           body: Faker::Lorem.paragraphs(2).join("\n"),
           author: Decidim::User.where(organization: feature.organization).all.sample
         )
+
+        rand(3).times do |m|
+          email = "vote-author-#{process.id}-#{n}-#{m}@decidim.org"
+          name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
+
+          author = Decidim::User.create!(email: email,
+                                         password: "password1234",
+                                         password_confirmation: "password1234",
+                                         name: name,
+                                         organization: feature.organization,
+                                         tos_agreement: "1",
+                                         confirmed_at: Time.now)
+
+          Decidim::Proposals::ProposalVote.create!(proposal: proposal,
+                                                   author: author)
+        end
+
+        Decidim::Comments::Seed.comments_for(proposal)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: social-share-button
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 description: A proposals component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -93,30 +107,50 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/config/decidim_proposals_manifest.css
+- app/assets/config/decidim_proposals_manifest.js
+- app/assets/images/decidim/proposals/icon.svg
+- app/assets/javascripts/decidim/proposals/social_share.js
+- app/assets/stylesheets/decidim/proposals/social_share.css.scss
 - app/commands/decidim/proposals/admin/create_proposal.rb
 - app/commands/decidim/proposals/create_proposal.rb
 - app/controllers/decidim/proposals/admin/application_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_controller.rb
 - app/controllers/decidim/proposals/application_controller.rb
+- app/controllers/decidim/proposals/proposal_votes_controller.rb
 - app/controllers/decidim/proposals/proposals_controller.rb
 - app/forms/decidim/proposals/admin/proposal_form.rb
 - app/forms/decidim/proposals/proposal_form.rb
 - app/helpers/decidim/proposals/application_helper.rb
+- app/helpers/decidim/proposals/proposal_votes_helper.rb
 - app/models/decidim/proposals/application_record.rb
 - app/models/decidim/proposals/proposal.rb
+- app/models/decidim/proposals/proposal_vote.rb
 - app/services/decidim/proposals/proposal_search.rb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
 - app/views/decidim/proposals/admin/proposals/index.html.erb
 - app/views/decidim/proposals/admin/proposals/new.html.erb
+- app/views/decidim/proposals/proposal_votes/create.js.erb
+- app/views/decidim/proposals/proposals/_count.html.erb
+- app/views/decidim/proposals/proposals/_filters.html.erb
 - app/views/decidim/proposals/proposals/_proposal.html.erb
+- app/views/decidim/proposals/proposals/_proposals.html.erb
+- app/views/decidim/proposals/proposals/_share.html.erb
+- app/views/decidim/proposals/proposals/_vote_button.html.erb
+- app/views/decidim/proposals/proposals/_votes_count.html.erb
 - app/views/decidim/proposals/proposals/index.html.erb
+- app/views/decidim/proposals/proposals/index.js.erb
 - app/views/decidim/proposals/proposals/new.html.erb
 - app/views/decidim/proposals/proposals/show.html.erb
 - config/i18n-tasks.yml
+- config/initializers/social_share_button.rb
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - db/migrate/20161212110850_create_decidim_proposals.rb
+- db/migrate/20170112115253_create_proposal_votes.rb
+- db/migrate/20170113114245_add_text_search_indexes.rb
+- db/migrate/20170118120151_add_counter_cache_votes_to_proposals.rb
 - lib/decidim/proposals.rb
 - lib/decidim/proposals/admin.rb
 - lib/decidim/proposals/admin_engine.rb
@@ -142,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A proposals component for decidim's participatory processes.