decidim-conferences 0.24.3 → 0.25.0.rc4

data/lib/decidim/conferences/engine.rb

@@ -50,10 +50,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_conferences.assets" do |app|
-        app.config.assets.precompile += %w(decidim_conferences_manifest.js)
-      end
-
       initializer "decidim_conferences.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Conferences::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Conferences::Engine.root}/app/views") # for partials
@@ -67,11 +63,12 @@ module Decidim
 
       initializer "decidim_conferences.menu" do
         Decidim.menu :menu do |menu|
-          menu.item I18n.t("menu.conferences", scope: "decidim"),
-                    decidim_conferences.conferences_path,
-                    position: 2.8,
-                    if: Decidim::Conference.where(organization: current_organization).published.any?,
-                    active: :inclusive
+          menu.add_item :conferences,
+                        I18n.t("menu.conferences", scope: "decidim"),
+                        decidim_conferences.conferences_path,
+                        position: 2.8,
+                        if: Decidim::Conference.where(organization: current_organization).published.any?,
+                        active: :inclusive
         end
       end
 

data/lib/decidim/conferences/participatory_space.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:conferences) do |participatory_space|
-  participatory_space.icon = "decidim/conferences/conference.svg"
+  participatory_space.icon = "media/images/decidim_conferences.svg"
   participatory_space.model_class_name = "Decidim::Conference"
   participatory_space.stylesheet = "decidim/conferences/conferences"
 
@@ -64,8 +64,18 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
+        hero_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "hero_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
+        banner_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city2.jpeg")),
+          filename: "banner_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
         objectives: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
@@ -115,21 +125,39 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attachment_collection: attachment_collection,
         attached_to: conference,
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
+        content_type: "application/pdf",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
+          filename: "Exampledocument.pdf",
+          content_type: "application/pdf",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: conference,
-        file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
+        content_type: "image/jpeg",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "city.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: conference,
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
+        content_type: "application/pdf",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
+          filename: "Exampledocument.pdf",
+          content_type: "application/pdf",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       2.times do
@@ -165,7 +193,12 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
             link: Faker::Internet.url,
             partner_type: type,
             conference: conference,
-            logo: File.new(File.join(seeds_root, "logo.png")) # Keep after conference
+            logo: ActiveStorage::Blob.create_after_upload!(
+              io: File.open(File.join(seeds_root, "logo.png")),
+              filename: "logo.png",
+              content_type: "image/png",
+              metadata: nil
+            ) # Keep after conference
           )
         end
       end

data/lib/decidim/conferences/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.24.3"
+      "0.25.0.rc4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-conferences
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0.rc4
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 description: Conferences component for decidim.
 email:
 - isaac.mg@coditramuntana.com
@@ -103,14 +103,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_conferences_manifest.js
-- app/assets/config/decidim_conferences_manifest.js
-- app/assets/images/decidim/conferences/conference.svg
-- app/assets/javascripts/decidim/conferences/admin/conference_invite_form.es6
-- app/assets/javascripts/decidim/conferences/admin/conference_speakers.js.es6
-- app/assets/javascripts/decidim/conferences/admin/conferences.js.es6
-- app/assets/javascripts/decidim/conferences/conferences.js.es6
-- app/assets/stylesheet/decidim/conferences/conferences.scss
 - app/cells/decidim/conferences/conference_address/show.erb
 - app/cells/decidim/conferences/conference_address_cell.rb
 - app/cells/decidim/conferences/conference_cell.rb
@@ -238,6 +230,12 @@ files:
 - app/models/decidim/conferences/media_link.rb
 - app/models/decidim/conferences/partner.rb
 - app/models/decidim/conferences/registration_type.rb
+- app/packs/entrypoints/decidim_conferences_admin.js
+- app/packs/images/decidim/conferences/decidim_conferences.svg
+- app/packs/src/decidim/conferences/admin/conference_invite_form.js
+- app/packs/src/decidim/conferences/admin/conference_speakers.js
+- app/packs/src/decidim/conferences/admin/conferences.js
+- app/packs/stylesheets/decidim/conferences/conferences.scss
 - app/permissions/decidim/conferences/permissions.rb
 - app/presenters/decidim/admin/conference_speaker_presenter.rb
 - app/presenters/decidim/conference_meeting_presenter.rb
@@ -272,6 +270,8 @@ files:
 - app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb
 - app/uploaders/decidim/conferences/diploma_uploader.rb
 - app/uploaders/decidim/conferences/partner_logo_uploader.rb
+- app/uploaders/decidim/cw/conferences/diploma_uploader.rb
+- app/uploaders/decidim/cw/conferences/partner_logo_uploader.rb
 - app/views/decidim/conference_speakers/_conference_speaker.html.erb
 - app/views/decidim/conferences/_conference.html.erb
 - app/views/decidim/conferences/_order_by_conferences.html.erb
@@ -318,7 +318,6 @@ files:
 - app/views/decidim/conferences/conference_speakers/index.html.erb
 - app/views/decidim/conferences/conferences/_partners.html.erb
 - app/views/decidim/conferences/conferences/_promoted_conference.html.erb
-- app/views/decidim/conferences/conferences/_statistics.html.erb
 - app/views/decidim/conferences/conferences/index.html.erb
 - app/views/decidim/conferences/conferences/show.html.erb
 - app/views/decidim/conferences/media/_attachments.html.erb
@@ -333,6 +332,7 @@ files:
 - app/views/layouts/decidim/admin/conferences.html.erb
 - app/views/layouts/decidim/conference.html.erb
 - app/views/layouts/decidim/diploma.html.erb
+- config/assets.rb
 - config/initializers/wicked_pdf.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -360,6 +360,7 @@ files:
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr-CA.yml
+- config/locales/fr-LU.yml
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
@@ -370,10 +371,10 @@ files:
 - config/locales/is-IS.yml
 - config/locales/is.yml
 - config/locales/it.yml
-- config/locales/ja-JP.yml
 - config/locales/ja.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
+- config/locales/lb-LU.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -419,6 +420,7 @@ files:
 - db/migrate/20200320105914_index_foreign_keys_in_decidim_conferences_conference_invites.rb
 - db/migrate/20200320105915_index_foreign_keys_in_decidim_conferences_conference_registrations.rb
 - db/migrate/20210310134942_add_followable_counter_cache_to_conferences.rb
+- db/migrate/20210408204953_allow_null_logo_column_in_decidim_conferences_partners_table.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -452,9 +454,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key:

data/app/assets/config/admin/decidim_conferences_manifest.js

@@ -1,3 +0,0 @@
-//= link decidim/conferences/admin/conferences.js
-//= link decidim/conferences/admin/conference_speakers.js
-//= link decidim/conferences/admin/conference_invite_form.js

data/app/assets/config/decidim_conferences_manifest.js

@@ -1,2 +0,0 @@
-//= link_directory ../images/decidim/conferences
-//= link_directory ../javascripts/decidim/conferences

data/app/assets/javascripts/decidim/conferences/admin/conferences.js.es6

@@ -1,30 +0,0 @@
-$(() => {
-  ((exports) => {
-    const $conferenceScopeEnabled = $("#conference_scopes_enabled");
-    const $conferenceScopeId = $("#conference_scope_id");
-    const $form = $(".edit_conference, .new_conference");
-
-    if ($form.length > 0) {
-      $conferenceScopeEnabled.on("change", (event) => {
-        const checked = event.target.checked;
-        exports.theDataPicker.enabled($conferenceScopeId, checked);
-      })
-      exports.theDataPicker.enabled($conferenceScopeId, $conferenceScopeEnabled.prop("checked"));
-
-      const $registrationsEnabled = $form.find("#conference_registrations_enabled");
-      const $availableSlots = $form.find("#conference_available_slots");
-      const toggleDisabledFields = () => {
-        const enabled = $registrationsEnabled.prop("checked");
-        $availableSlots.attr("disabled", !enabled);
-
-        $form.find("#conference_registrations_terms .editor-container").each((idx, node) => {
-          const quill = Quill.find(node);
-          quill.enable(enabled);
-        })
-      };
-      $registrationsEnabled.on("change", toggleDisabledFields);
-      toggleDisabledFields();
-    }
-
-  })(window);
-});

data/app/views/decidim/conferences/conferences/_statistics.html.erb

@@ -1,10 +0,0 @@
-<section class="extended" id="conference-statistics" class="statistics">
-  <div class="row column">
-    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.conferences") %></h3>
-  </div>
-  <div class="row">
-    <div class="columns small-centered mediumlarge-12 large-12 process_stats">
-      <%= stats.highlighted %>
-    </div>
-  </div>
-</section>