decidim-core 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48f0431d35a86ad18b3150daa3eb86220cdd95ff
-  data.tar.gz: 62ed99da05742f4543482e60c63f836d284b4aa2
+  metadata.gz: 3eff907b57b0cab03cceeb32b458e2cfd59e7dc6
+  data.tar.gz: 133dc98f767565fc733b02f8733c057855cd7d9b
 SHA512:
-  metadata.gz: 4e0c2a51aa16df05edbac2e0ba457d2d45c196a16df81ed93592397c845aabedb4ffca95d3dfb8defb75e295f8ae759e796df817dffd4049fb9a3454c1ce7079
-  data.tar.gz: 911e75063269ab61745d32e9dfe035a2fc6da51d6f67847753bd65ee30f0fc4fab4d57485a008a8c6c2ddcff49e04067362d711109992b0240882ce155e4ef23
+  metadata.gz: beb54c792c2e01aa0f08ebe85be2ad2b2b2888b2b102e008b1499e1a769279076bc650b7d14189bde0fd00d59d4d28734876271a81d02ea69c9b5e6746f70218
+  data.tar.gz: a45d55c72e259bae57b7ba19a2293259a8ca8a9199f3b5c02f906d37e06e6ad7a879ee20cafef940175dc7740aaf37667897e6c1ff9b121d9c4faacd8a9d3e61

data/app/assets/config/decidim_core_manifest.js

@@ -3,3 +3,5 @@
 //= link_directory ../images/decidim/
 //= link decidim/filters
 //= link decidim/orders
+//= link decidim/map.js
+//= link decidim/map.css

data/app/assets/javascripts/decidim/map.js.es6.erb

@@ -0,0 +1,95 @@
+// = require leaflet
+// = require leaflet-tilelayer-here
+// = require leaflet-svg-icon
+// = require leaflet.markercluster
+// = require jquery-tmpl
+// = require_self
+
+L.DivIcon.SVGIcon.DecidimIcon = L.DivIcon.SVGIcon.extend({
+  options: {
+    fillColor: '#ef604d',
+    opacity: 0
+  },
+  _createPathDescription: function() {
+    return 'M14 1.17a11.685 11.685 0 0 0-11.685 11.685c0 11.25 10.23 20.61 10.665 21a1.5 1.5 0 0 0 2.025 0c0.435-.435 10.665-9.81 10.665-21A11.685 11.685 0 0 0 14 1.17Zm0 17.415A5.085 5.085 0 1 1 19.085 13.5 5.085 5.085 0 0 1 14 18.585Z';
+  },
+  _createCircle: function() {
+    return ""
+  }
+});
+
+const popupTemplateId = 'marker-popup';
+$.template(popupTemplateId, $(`#${popupTemplateId}`).html());
+
+const addMarkers = (markersData, markerClusters, map) => {
+  const bounds = new L.LatLngBounds(markersData.map((markerData) => [markerData.latitude, markerData.longitude]));
+
+  markersData.forEach((markerData) => {
+    let marker = L.marker([markerData.latitude, markerData.longitude], {
+      icon: new L.DivIcon.SVGIcon.DecidimIcon()
+    });
+    let node = document.createElement('div');
+
+    $.tmpl(popupTemplateId, markerData).appendTo(node);
+
+    marker.bindPopup(node, {
+      maxwidth: 640,
+      minWidth: 500,
+      keepInView: true,
+      className: 'map-info'
+    }).openPopup();
+
+    markerClusters.addLayer(marker);
+  });
+
+  map.addLayer(markerClusters);
+  map.fitBounds(bounds, { padding: [100, 100] });
+};
+
+const loadMap = (mapId, markersData) => {
+  let markerClusters = L.markerClusterGroup();
+  const { hereAppId, hereAppCode } = window.Decidim.mapConfiguration;
+
+  if (window.Decidim.currentMap) {
+    window.Decidim.currentMap.remove();
+    window.Decidim.currentMap = null;
+  }
+
+  const map = L.map(mapId);
+
+  L.tileLayer.here({
+    appId: hereAppId,
+    appCode: hereAppCode
+  }).addTo(map);
+
+  if (markersData.length > 0) {
+    addMarkers(markersData, markerClusters, map);
+  } else {
+    map.fitWorld();
+  }
+
+  map.scrollWheelZoom.disable();
+
+  return map;
+};
+
+window.Decidim = window.Decidim || {};
+
+window.Decidim.loadMap = loadMap;
+window.Decidim.currentMap =  null;
+window.Decidim.mapConfiguration = {};
+
+$(() => {
+  const mapId = 'map';
+  const $map = $(`#${mapId}`);
+
+  const markersData = $map.data('markers-data');
+  const hereAppId = $map.data('here-app-id');
+  const hereAppCode = $map.data('here-app-code');
+
+  window.Decidim.mapConfiguration = { hereAppId, hereAppCode };
+
+  if ($map.length > 0) {
+    window.Decidim.currentMap = loadMap(mapId, markersData);
+  }
+});

data/app/assets/stylesheets/decidim/map.css

@@ -0,0 +1,3 @@
+/* = require leaflet */
+/* = require MarkerCluster */
+/* = require MarkerCluster.Default */

data/app/assets/stylesheets/decidim/modules/_layout.scss

@@ -1,9 +1,7 @@
 .wrapper{
-  padding: 3rem 1rem;
+  padding: 1.2rem 1rem;
   @include breakpoint(medium){
-    padding-top: 5rem;
-    padding-left: 1.5rem;
-    padding-right: 1.5rem;
+    padding: 5rem 1.5rem 3rem;
   }
   @include breakpoint(large){
     padding-left: 4rem;

data/app/assets/stylesheets/decidim/modules/_margins.scss

@@ -1,12 +1,13 @@
 $margin-s: 1rem;
+$margin-sm: 2rem;
 $margin-m: 3rem;
 $margin-l: 5rem;
 
 //Sections
 .section{
-  margin-bottom: $margin-m;
+  margin-bottom: $margin-sm;
   @include breakpoint(large){
-    margin-bottom: $margin-l;
+    margin-bottom: $margin-m;
   }
 }
 

data/app/assets/stylesheets/decidim/modules/_process-header.scss

@@ -1,5 +1,8 @@
 .process-header{
-  margin-bottom: 3rem;
+  margin-bottom: $margin-sm;
+  @include breakpoint(medium){
+    margin-bottom: $margin-m;
+  }
   .heading2{
     font-weight: bold;
   }
@@ -34,7 +37,10 @@
 }
 
 .process-header__info{
-  padding: 2rem 1.5rem 2rem 1rem;
+  padding: 1rem 1.5rem 1rem 1rem;
+  @include breakpoint(medium){
+    padding: 2rem 1.5rem 2rem 1rem;
+  }
   @include breakpoint(mediumlarge){
     padding-left: 2rem;
   }
@@ -59,6 +65,13 @@
   }
 }
 
+.process-header__phase--simple{
+  padding: .5rem 1rem;
+  @include breakpoint (medium){
+    padding: 2rem 1rem;
+  }
+}
+
 .process-header__hashtag{
   font-weight: 600;
   &::after{

data/app/assets/stylesheets/decidim/modules/_process-phase.scss

@@ -1,7 +1,10 @@
 .phase-title{
   display: block;
   font-weight: 600;
-  font-size: 1.1rem;
+  font-size: 1rem;
+  @include breakpoint(medium){
+    font-size: 1.1rem;
+  }
   line-height: 1;
   text-transform: uppercase;
   .is-inactive & {

data/app/assets/stylesheets/decidim/utils/_settings.scss

@@ -118,9 +118,9 @@ $header-margin-bottom: 0.5rem;
 $header-styles: (
   'small': (
     'h1': ('font-size': 40),
-    'h2': ('font-size': 32),
-    'h3': ('font-size': 28),
-    'h4': ('font-size': 24),
+    'h2': ('font-size': 26),
+    'h3': ('font-size': 24),
+    'h4': ('font-size': 22),
     'h5': ('font-size': 20),
     'h6': ('font-size': 16)
   ),

data/app/commands/decidim/create_report.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+module Decidim
+  # A command with all the business logic when a user creates a report.
+  class CreateReport < Rectify::Command
+    # Public: Initializes the command.
+    #
+    # form         - A form object with the params.
+    # reportable   - The resource being reported
+    # current_user - The current user.
+    def initialize(form, reportable, current_user)
+      @form = form
+      @reportable = reportable
+      @current_user = current_user
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid, together with the report.
+    # - :invalid if the form wasn't valid and we couldn't proceed.
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) if form.invalid?
+
+      transaction do
+        find_or_create_moderation!
+        create_report!
+        update_report_count!
+      end
+
+      send_report_notification_to_admins
+
+      if hideable?
+        hide!
+        send_hide_notification_to_admins
+      end
+
+      broadcast(:ok, report)
+    end
+
+    private
+
+    attr_reader :form, :report
+
+    def find_or_create_moderation!
+      @moderation = Moderation.find_or_create_by!(reportable: @reportable, participatory_process: participatory_process)
+    end
+
+    def create_report!
+      @report = Report.create!(
+        moderation: @moderation,
+        user: @current_user,
+        reason: form.reason,
+        details: form.details
+      )
+    end
+
+    def update_report_count!
+      @moderation.update_attributes!(report_count: @moderation.report_count + 1)
+    end
+
+    def participatory_process_admins
+      @participatory_process_admins ||= Decidim::Admin::ProcessAdmins.for(participatory_process)
+    end
+
+    def send_report_notification_to_admins
+      participatory_process_admins.each do |admin|
+        ReportedMailer.report(admin, @report).deliver_later
+      end
+    end
+
+    def hideable?
+      !@reportable.hidden? && @moderation.report_count >= Decidim.max_reports_before_hiding
+    end
+
+    def hide!
+      Decidim::Admin::HideResource.new(@reportable).call
+    end
+
+    def send_hide_notification_to_admins
+      participatory_process_admins.each do |admin|
+        ReportedMailer.hide(admin, @report).deliver_later
+      end
+    end
+
+    def participatory_process
+      @participatory_process ||= @reportable.feature.participatory_process
+    end
+  end
+end

data/app/controllers/concerns/decidim/devise_controllers.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+require "active_support/concern"
+
+module Decidim
+  # This concern groups methods and helpers needed by Devise controllers.
+  module DeviseControllers
+    extend ActiveSupport::Concern
+
+    included do
+      include Decidim::NeedsOrganization
+      include Decidim::LocaleSwitcher
+
+      include NeedsAuthorization
+      skip_authorization_check
+
+      helper Decidim::TranslationsHelper
+      helper Decidim::MetaTagsHelper
+      helper Decidim::DecidimFormHelper
+      helper Decidim::LanguageChooserHelper
+      helper Decidim::CookiesHelper
+      helper Decidim::ReplaceButtonsHelper
+
+      layout "layouts/decidim/application"
+    end
+  end
+end

data/app/controllers/concerns/decidim/payload_info.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module PayloadInfo
+    extend ActiveSupport::Concern
+
+    included do
+      def append_info_to_payload(payload)
+        super
+        payload[:user_id] = try(:current_user).try(:id)
+        payload[:organization_id] = try(:current_organization).try(:id)
+        payload[:app] = try(:current_organization).try(:name)
+        payload[:remote_ip] = request.remote_ip
+        payload[:referer] = request.referer.to_s
+        payload[:request_id] = request.uuid
+        payload[:user_agent] = request.user_agent
+        payload[:xhr] = request.xhr? ? 'true' : 'false'
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/user_profile.rb

@@ -13,6 +13,7 @@ module Decidim
     delegate :user_groups, to: :current_user, prefix: false
 
     included do
+      helper Decidim::UserProfileHelper
       layout "layouts/decidim/user_profile"
 
       helper_method :available_authorization_handlers,
@@ -25,7 +26,7 @@ module Decidim
     # Public: Available authorization handlers in order to conditionally
     # show the menu element.
     def available_authorization_handlers
-      Decidim.authorization_handlers
+      current_organization.available_authorizations.map(&:constantize)
     end
   end
 end

data/app/controllers/decidim/application_controller.rb

@@ -1,19 +1,39 @@
 # frozen_string_literal: true
 module Decidim
   # The main application controller that inherits from Rails.
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::DecidimController
     include Decidim::NeedsOrganization
     include Decidim::LocaleSwitcher
     include NeedsAuthorization
+    include PayloadInfo
+
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper
     helper Decidim::LanguageChooserHelper
+    helper Decidim::ReplaceButtonsHelper
+    helper Decidim::TranslationsHelper
+    helper Decidim::CookiesHelper
+    helper Decidim::AriaSelectedLinkToHelper
+
+    # Saves the location before loading each page so we can return to the
+    # right page. If we're on a devise page, we don't want to store that as the
+    # place to return to (for example, we don't want to return to the sign in page
+    # after signing in), which is what the :unless prevents
+    before_action :store_current_location, unless: :devise_controller?
 
     protect_from_forgery with: :exception, prepend: true
     after_action :add_vary_header
 
     layout "layouts/decidim/application"
 
+    rescue_from ActiveRecord::RecordNotFound, with: :redirect_to_404
+
+    private
+
+    def store_current_location
+      store_location_for(:user, request.url)
+    end
+
     def user_not_authorized_path
       decidim.root_path
     end
@@ -24,5 +44,9 @@ module Decidim
     def add_vary_header
       response.headers["Vary"] = "Accept"
     end
+
+    def redirect_to_404
+      raise ActionController::RoutingError, "Not Found"
+    end
   end
 end

data/app/controllers/decidim/authorizations_controller.rb

@@ -5,13 +5,15 @@ module Decidim
   # This controller allows users to create and destroy their authorizations. It
   # shouldn't be necessary to expand it to add new authorization schemes.
   class AuthorizationsController < ApplicationController
-    helper_method :handler, :handlers
+    helper_method :handler, :handlers, :stored_location
     before_action :valid_handler, only: [:new, :create]
 
     include Decidim::UserProfile
     helper Decidim::DecidimFormHelper
+    helper Decidim::AuthorizationFormHelper
 
     layout "layouts/decidim/user_profile", only: [:index]
+    skip_before_action :store_current_location
 
     def new; end
 
@@ -33,7 +35,7 @@ module Decidim
       AuthorizeUser.call(handler) do
         on(:ok) do
           flash[:notice] = t("authorizations.create.success", scope: "decidim")
-          redirect_to params[:redirect_url] || authorizations_path
+          redirect_to params[:redirect_url] || stored_location_for(current_user) || authorizations_path
         end
 
         on(:invalid) do
@@ -53,6 +55,12 @@ module Decidim
 
     protected
 
+    def stored_location
+      location = stored_location_for(current_user)
+      store_location_for(current_user, location)
+      location || participatory_processes_path
+    end
+
     def handler_params
       (params[:authorization_handler] || {}).merge(user: current_user)
     end