decidim-decidim_awesome 0.6.3 → 0.7.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +64,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -84,20 +98,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 description: Some usability and UX tweaks for Decidim.
 email:
 - ivan@platoniq.net
@@ -115,21 +129,28 @@ files:
 - app/assets/images/decidim/decidim_awesome/loading.gif
 - app/assets/images/decidim/decidim_awesome/platoniq-logo.png
 - app/assets/javascripts/decidim/decidim_awesome/admin.js
+- app/assets/javascripts/decidim/decidim_awesome/admin/codemirror.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/admin/constraints.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/admin/form_exit_warn.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/application.js
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/api_fetcher.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/categories.js.es6
-- app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_map.js.es6
-- app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_proposals.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/awesome_map/hashtags.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/awesome_map/layers.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/map.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/awesome_map/markers.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/meetings.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/proposals.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/awesome_map/utilities.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/editors/legacy_quill_editor.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/editors/markdown_view.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/editors/quill_editor.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/forms/autosave.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/legacy_admin.js
+- app/assets/javascripts/decidim/decidim_awesome/legacy_application.js
 - app/assets/javascripts/decidim/decidim_awesome/proposals/images.js.es6
 - app/assets/stylesheets/decidim/decidim_awesome/admin.scss
+- app/assets/stylesheets/decidim/decidim_awesome/admin/codemirror.scss
 - app/assets/stylesheets/decidim/decidim_awesome/admin/constraints.scss
 - app/assets/stylesheets/decidim/decidim_awesome/application.scss
 - app/assets/stylesheets/decidim/decidim_awesome/awesome_iframe/iframe.scss
@@ -139,19 +160,24 @@ files:
 - app/assets/stylesheets/decidim/decidim_awesome/editors/markdown_view.scss
 - app/assets/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss
 - app/assets/stylesheets/decidim/decidim_awesome/forms/autosave.scss
+- app/awesome_overrides/presenters/decidim/menu_presenter_override.rb
 - app/awesome_overrides/presenters/decidim/proposals/proposal_presenter_override.rb
 - app/commands/decidim/decidim_awesome/admin/create_constraint.rb
+- app/commands/decidim/decidim_awesome/admin/create_menu_hack.rb
 - app/commands/decidim/decidim_awesome/admin/create_scoped_style.rb
 - app/commands/decidim/decidim_awesome/admin/destroy_constraint.rb
+- app/commands/decidim/decidim_awesome/admin/destroy_menu_hack.rb
 - app/commands/decidim/decidim_awesome/admin/destroy_scoped_style.rb
 - app/commands/decidim/decidim_awesome/admin/update_config.rb
 - app/commands/decidim/decidim_awesome/admin/update_constraint.rb
+- app/commands/decidim/decidim_awesome/admin/update_menu_hack.rb
 - app/commands/decidim/decidim_awesome/create_editor_image.rb
 - app/controllers/concerns/decidim/decidim_awesome/needs_awesome_config.rb
 - app/controllers/decidim/decidim_awesome/admin/application_controller.rb
 - app/controllers/decidim/decidim_awesome/admin/checks_controller.rb
 - app/controllers/decidim/decidim_awesome/admin/config_controller.rb
 - app/controllers/decidim/decidim_awesome/admin/constraints_controller.rb
+- app/controllers/decidim/decidim_awesome/admin/menu_hacks_controller.rb
 - app/controllers/decidim/decidim_awesome/application_controller.rb
 - app/controllers/decidim/decidim_awesome/editor_images_controller.rb
 - app/controllers/decidim/decidim_awesome/iframe_component/application_controller.rb
@@ -161,6 +187,7 @@ files:
 - app/forms/decidim/decidim_awesome/admin/config_form.rb
 - app/forms/decidim/decidim_awesome/admin/constraint_form.rb
 - app/forms/decidim/decidim_awesome/admin/intergram_form.rb
+- app/forms/decidim/decidim_awesome/admin/menu_form.rb
 - app/forms/decidim/decidim_awesome/editor_image_form.rb
 - app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb
 - app/helpers/decidim/decidim_awesome/map_helper.rb
@@ -168,6 +195,7 @@ files:
 - app/models/decidim/decidim_awesome/awesome_config.rb
 - app/models/decidim/decidim_awesome/config_constraint.rb
 - app/models/decidim/decidim_awesome/editor_image.rb
+- app/permissions/decidim/decidim_awesome/admin/permissions.rb
 - app/permissions/decidim/decidim_awesome/permissions.rb
 - app/uploaders/decidim/decidim_awesome/image_uploader.rb
 - app/views/decidim/decidim_awesome/admin/checks/index.html.erb
@@ -182,6 +210,10 @@ files:
 - app/views/decidim/decidim_awesome/admin/constraints/_form.html.erb
 - app/views/decidim/decidim_awesome/admin/constraints/new.html.erb
 - app/views/decidim/decidim_awesome/admin/constraints/show.html.erb
+- app/views/decidim/decidim_awesome/admin/menu_hacks/_form.html.erb
+- app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb
+- app/views/decidim/decidim_awesome/admin/menu_hacks/index.html.erb
+- app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb
 - app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb
 - app/views/decidim/decidim_awesome/map_component/map/error.erb
 - app/views/decidim/decidim_awesome/map_component/map/show.html.erb
@@ -191,16 +223,18 @@ files:
 - app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb
 - app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb
 - app/views/layouts/decidim/decidim_awesome/_intergram_widget.html.erb
-- app/views/v0.22/layouts/decidim/_head.html.erb
-- app/views/v0.22/layouts/decidim/admin/_header.html.erb
 - app/views/v0.23/layouts/decidim/_head.html.erb
 - app/views/v0.23/layouts/decidim/admin/_header.html.erb
+- app/views/v0.24/layouts/decidim/_head.html.erb
+- app/views/v0.24/layouts/decidim/admin/_header.html.erb
 - config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/cs.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/eu.yml
 - config/locales/fr.yml
+- config/locales/nl.yml
 - config/locales/sv.yml
 - db/migrate/20200324170000_create_decidim_awesome_config.rb
 - db/migrate/20200324230936_create_awesome_editor_images.rb
@@ -223,12 +257,14 @@ files:
 - lib/decidim/decidim_awesome/iframe_component/engine.rb
 - lib/decidim/decidim_awesome/map_component/component.rb
 - lib/decidim/decidim_awesome/map_component/engine.rb
+- lib/decidim/decidim_awesome/menu_hacker.rb
 - lib/decidim/decidim_awesome/system_checker.rb
 - lib/decidim/decidim_awesome/test/factories.rb
 - lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb
 - lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb
 - lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb
 - lib/decidim/decidim_awesome/test/shared_examples/editor_examples.rb
+- lib/decidim/decidim_awesome/test/shared_examples/menu_hack_contexts.rb
 - lib/decidim/decidim_awesome/test/themes/css.lvh.me.css
 - lib/decidim/decidim_awesome/test/themes/erb.lvh.me.scss.erb
 - lib/decidim/decidim_awesome/test/themes/scss.lvh.me.scss
@@ -238,6 +274,7 @@ files:
 - vendor/assets/images/layers.png
 - vendor/assets/images/marker-icon.png
 - vendor/assets/javascripts/codemirror-4.inline-attachment.js
+- vendor/assets/javascripts/codemirror.js
 - vendor/assets/javascripts/form-storage.js
 - vendor/assets/javascripts/highlight.min.js
 - vendor/assets/javascripts/image-resize.min.js
@@ -245,12 +282,16 @@ files:
 - vendor/assets/javascripts/inline-attachment.js
 - vendor/assets/javascripts/inscrybmde.min.js
 - vendor/assets/javascripts/jquery.inline-attachment.js
+- vendor/assets/javascripts/jquery.truncate.js
 - vendor/assets/javascripts/jsrender.min.js
+- vendor/assets/javascripts/keymap/sublime.js
 - vendor/assets/javascripts/leaflet.featuregroup.subgroup.js
+- vendor/assets/javascripts/mode/css/css.js
+- vendor/assets/stylesheets/codemirror.css
 - vendor/assets/stylesheets/default.min.css
 - vendor/assets/stylesheets/foundation.min.css
 - vendor/assets/stylesheets/github.min.css
-- vendor/assets/stylesheets/inscrybmde.min.css
+- vendor/assets/stylesheets/inscrybmde.min.scss
 homepage: https://github.com/decidim/decidim-module-decidim_awesome
 licenses:
 - AGPL-3.0
@@ -263,7 +304,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_map.js.es6

@@ -1,225 +0,0 @@
-// = require jsrender.min
-// = require decidim/map
-// = require leaflet.featuregroup.subgroup
-// = require decidim/decidim_awesome/awesome_map/categories
-// = require decidim/decidim_awesome/awesome_map/legacy_proposals
-// = require decidim/decidim_awesome/awesome_map/meetings
-// = require_self
-
-((exports) => {
-  const { fetchProposals, fetchMeetings, getCategory } = exports.AwesomeMap;
-
-  const collapsedMenu = $("#map").data("collapsed");
-  const show = {
-    withdrawn: $("#map").data("show-withdrawn"),
-    accepted: $("#map").data("show-accepted"),
-    evaluating: $("#map").data("show-evaluating"),
-    notAnswered: $("#map").data("show-not-answered"),
-    rejected: $("#map").data("show-rejected")
-  };
-  const components = $("#map").data("components");
-  const popupMeetingTemplateId = "marker-meeting-popup";
-  const popupProposalTemplateId = "legacy-marker-proposal-popup";
-
-  const cluster = L.markerClusterGroup();
-  const amendments = [];
-
-  const layers = {};
-
-  const control = L.control.layers(null, null, {
-    position: 'topleft', 
-    sortLayers: false,
-    collapsed: collapsedMenu, 
-    // hideSingleBase: true
-  });
-  const allMarkers = [];
-
-  const drawMarker = (element, marker, component) => {
-    let tmpl = component.type === "proposals" ? popupProposalTemplateId : popupMeetingTemplateId,
-        node = document.createElement("div");
-
-    $($.templates(`#${tmpl}`).render(element)).appendTo(node);
-    
-    marker.bindPopup(node, {
-      maxwidth: 640,
-      minWidth: 500,
-      keepInView: true,
-      className: "map-info"
-    }).openPopup();
-    
-    allMarkers.push({
-      marker: marker,
-      component: component,
-      element: element
-    });
-
-    // Check if it has amendments, add it to a list
-    if(element.amendments && element.amendments.length) {
-      element.amendments.forEach((amendment) => {
-        amendments.push(amendment.emendation.id);
-      });
-    }
-    // Add to category layer
-    let cat = getCategory(element.category);
-    if(layers[cat.id]) {
-      marker.addTo(layers[cat.id].group);
-      // show category if hidden
-      const $label = $(`.awesome_map-category_${cat.id}`).closest("label");
-      const $parent = $(`.awesome_map-category_${cat.parent}`).closest("label");
-      $label.show();
-      // update number of items
-      $label.attr("title", parseInt($label.attr("title") || 0) + 1);
-      // show parent if apply
-      $parent.show();
-      $parent.attr("title", parseInt($parent.attr("title") || 0) + 1);
-      // update component stats
-      const $component = $(`#awesome_map-component-${component.id}`);
-      $component.attr("title", parseInt($component.attr("title") || 0) + 1);
-    }
-
-    return marker;
-  };
-
-  const loadElements = (map) => {
-    // legends
-    control.addTo(map);
-    cluster.addTo(map);
-
-    // Load markers
-    components.forEach((component) => {  
-      if(component.type == "proposals") {
-        // add control layer for proposals
-        layers.proposals = {
-          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.proposals}</span>`,
-          group: L.featureGroup.subGroup(cluster)
-        };
-        control.addOverlay(layers.proposals.group, layers.proposals.label);
-        layers.proposals.group.addTo(map);
-
-        // add control layer for amendments if any
-        if(component.amendments) {
-          layers.amendments = {
-            label: `<span id="awesome_map-component-${component.d}" title="0">${window.DecidimAwesome.texts.amendments}</span>`,
-            group: L.featureGroup.subGroup(cluster)
-          }
-          control.addOverlay(layers.amendments.group, layers.amendments.label);
-          layers.amendments.group.addTo(map);
-        }
-
-        fetchProposals(component, '', (element, marker) => {
-            if(show[element.state || 'notAnswered']) {
-              drawMarker(element, marker, component).addTo(layers.proposals.group)   
-            }
-          }, () => {
-            // finall call
-            map.fitBounds(cluster.getBounds(), { padding: [50, 50] });
-            allMarkers.forEach((item) => {
-              // add marker to amendments layers if it's an amendment
-              if(amendments.find((a) => a == item.element.id)) {
-                item.marker.removeFrom(layers.proposals.group);
-                item.marker.addTo(layers.amendments.group);
-              }
-            });
-          });
-      }
-      
-      if(component.type == "meetings") {
-        // add control layer for meetings
-        layers.meetings = {
-          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.meetings}</span>`,
-          group: L.featureGroup.subGroup(cluster)
-        };
-        control.addOverlay(layers.meetings.group, layers.meetings.label);
-        layers.meetings.group.addTo(map);
-      
-        fetchMeetings(component, '', (element, marker) => {
-            drawMarker(element, marker, component).addTo(layers.meetings.group);
-          }, () => {
-            map.fitBounds(cluster.getBounds(), { padding: [50, 50] });
-          });
-      }
-    });
-
-
-    // add categories control layers
-    if(window.AwesomeMap.categories.length) {
-      let lastLayer = layers[Object.keys(layers)[Object.keys(layers).length - 1]];
-      // Add Categories "title"
-      if(lastLayer) {
-        lastLayer.label = `${lastLayer.label}<hr><b>${window.DecidimAwesome.texts.categories}</b>`;
-        control.removeLayer(lastLayer.group);
-        control.addOverlay(lastLayer.group, lastLayer.label);
-      }
-
-      window.AwesomeMap.categories.forEach((category) => {
-        // add control layer for this category
-        layers[category.id] = {
-          label: `<i class="awesome_map-category_${category.id}"></i> ${category.name}`,
-          group: L.featureGroup.subGroup(cluster)
-        };
-        layers[category.id].group.addTo(map);
-        control.addOverlay(layers[category.id].group, layers[category.id].label);
-        // hide layer by default, it will be activated if there's any marker in it
-        setTimeout(() => {
-          $(`.awesome_map-category_${category.id}`).closest("label").hide();
-        });
-      });
-
-      // watch events for subcategories syncronitzation
-      const getCatFromClass = (name) => {
-        let id = name.match(/awesome_map-category_(\d+)/) 
-        if(!id) return;
-        const cat = getCategory(id[1]);
-        if(!cat || !cat.name) return;
-
-        return cat;        
-      };
-
-      const indeterminateInput = (id) => {
-        $('[class^="awesome_map-category_"]').parent().prev().prop("indeterminate", false);
-        if(id) {
-          let $input = $(`.awesome_map-category_${id}`).parent().prev();
-          if(!$input.prop("checked")) {
-            $input.prop("indeterminate", true);
-          }
-        }
-      };
-
-      map.on('overlayadd', (e) => {
-        const cat = getCatFromClass(e.name);
-        if(!cat) return;
-        // if it's a children, put the parent to indeterminate
-        indeterminateInput(cat.parent);
-      });
-
-      // on remove a parent category, remove all children
-      map.on('overlayremove', (e) => {
-        const cat = getCatFromClass(e.name);
-        if(!cat) return;
-        cat.children().forEach((c) => {
-          let $el = $(`.awesome_map-category_${c.id}`);
-          if($el.parent().prev().prop("checked")) {
-            $el.click();
-          }
-        });
-      });
-
-    }
-
-  };
-
-  // currentMap might not be loaded yet so let's delay a bit
-  // TODO: improve this
-  const waitMap = () => {
-    if(exports.Decidim && exports.Decidim.currentMap) {
-      loadElements(exports.Decidim.currentMap);
-    } else {
-      setTimeout(() => {
-        waitMap();
-      }, 100);
-    }
-  };
-
-  waitMap();
-
-})(window);