decidim-conferences 0.27.4 → 0.28.0.rc5

data/app/packs/src/decidim/conferences/admin/conferences.js

@@ -6,20 +6,20 @@ $(() => {
   if ($form.length > 0) {
     $conferenceScopeEnabled.on("change", (event) => {
       const checked = event.target.checked;
-      window.theDataPicker.enabled($conferenceScopeId, checked);
+      $conferenceScopeId.attr("disabled", !checked);
     })
-    window.theDataPicker.enabled($conferenceScopeId, $conferenceScopeEnabled.prop("checked"));
+    $conferenceScopeId.attr("disabled", !$conferenceScopeEnabled.prop("checked"));
 
     const $registrationsEnabled = $form.find("#conference_registrations_enabled");
     const $availableSlots = $form.find("#conference_available_slots");
+    const $registrationTerms = $form.find("#conference_registrations_terms");
     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);
-      })
+      $registrationTerms[0].querySelectorAll(".editor-container .ProseMirror").forEach((node) => {
+        node.editor.setOptions({ editable: enabled });
+      });
     };
     $registrationsEnabled.on("change", toggleDisabledFields);
     toggleDisabledFields();

data/app/packs/stylesheets/decidim/conferences/_conference.scss

@@ -0,0 +1,102 @@
+.conference {
+  &__hero {
+    @apply backdrop-brightness-[30%];
+
+    &-text {
+      @apply container text-center text-white space-y-6 md:px-16 pt-10 pb-14 md:[&_a_+_a]:ml-6;
+    }
+
+    &-slogan {
+      @apply text-lg font-semibold;
+    }
+
+    &-location {
+      @apply text-lg;
+    }
+  }
+
+  &__content-block {
+    @apply grid grid-cols-9 gap-x-4 place-items-start space-y-0;
+
+    > :nth-child(3n + 1),
+    > :nth-child(3n + 2) {
+      @apply col-span-9 lg:col-span-6;
+    }
+
+    > :nth-child(3n) {
+      @apply col-span-9 lg:col-span-3 row-span-2 lg:order-2 justify-self-center flex flex-col gap-2 max-w-full overflow-x-auto;
+    }
+
+    > :nth-child(3n + 2) {
+      @apply lg:order-3;
+    }
+  }
+
+  &__nav {
+    @apply divide-y divide-white [&>li]:py-3.5 first:[&>li]:pt-0 last:[&>li]:pb-0;
+
+    &-container {
+      @apply ml-0 md:ml-6 bg-primary p-3 md:p-6 rounded w-full md:w-auto self-stretch;
+
+      [id*="dropdown-menu"] {
+        @apply mx-0;
+      }
+
+      [data-target*="dropdown"] {
+        @apply p-0 [&>span]:text-white [&>svg]:text-white;
+      }
+    }
+
+    &-item {
+      @apply flex items-center gap-1 text-white font-semibold hover:underline [&>svg]:fill-current;
+    }
+  }
+
+  &__grid {
+    @apply grid grid-cols-2 md:grid-cols-4 auto-rows-fr gap-3 md:gap-x-6 gap-y-10;
+
+    &-item {
+      @apply space-y-4;
+
+      &-img {
+        @apply border-4 border-background rounded aspect-[4/3] p-1;
+
+        img {
+          @apply w-full h-full object-contain;
+        }
+      }
+
+      &-text {
+        @apply text-secondary;
+      }
+    }
+  }
+
+  &__map {
+    @apply flex flex-col-reverse md:flex-row items-start gap-4 only:[&>*]:grow first:[&>*]:min-w-[40%];
+
+    & > :last-child:not(:only-child) {
+      @apply aspect-[4/3] w-full rounded overflow-hidden;
+    }
+
+    &-address {
+      @apply border-4 border-background rounded p-4 mt-4 first:mt-0;
+    }
+  }
+
+  &__box {
+    @apply flex flex-col gap-4 md:flex-row md:items-end justify-between border-2 border-background rounded p-6 first:[&>*]:space-y-4;
+
+    &-icon {
+      @apply w-8 h-8 text-tertiary fill-current;
+    }
+
+    &-title {
+      @apply text-2xl font-semibold;
+    }
+
+    &-description {
+      @apply text-lg text-gray-2;
+    }
+  }
+}

data/app/packs/stylesheets/decidim/conferences/_media.scss

@@ -0,0 +1,13 @@
+.conference__media {
+  &-section {
+    @apply mt-16 last:mb-16 md:last:mb-36 xl:max-w-[75%] space-y-10;
+
+    p {
+      @apply mt-4 text-gray-2 text-md;
+    }
+  }
+
+  &-links {
+    @apply mt-10 space-y-8;
+  }
+}

data/app/packs/stylesheets/decidim/conferences/_program.scss

@@ -0,0 +1,43 @@
+.conference__program {
+  @apply mb-16 md:mb-36;
+
+  &-selector {
+    @apply grid grid-cols-2 md:flex gap-4 md:gap-1 justify-end [&~*]:mt-6 [&_button]:w-full;
+  }
+
+  &-item {
+    @apply grid grid-cols-12 gap-2 items-start first:[&>*]:col-span-12 md:first:[&>*]:col-span-2 last:[&>*]:col-span-12 md:last:[&>*]:col-span-10;
+  }
+
+  &-time {
+    @apply h-10 grid place-items-center border-b-2 border-tertiary text-center text-xl text-gray-2 font-semibold;
+  }
+
+  &-category {
+    @apply h-10 w-full bg-background border-b-2 border-gray-3 text-center text-md text-gray-2 font-normal truncate;
+
+    &-container {
+      @apply flex gap-2 [&>*]:grow [&>*]:min-w-0;
+    }
+
+    &-content {
+      @apply [&>a]:block [&>a]:py-4;
+    }
+
+    &[aria-expanded="true"] {
+      @apply bg-background-4 border-secondary text-secondary font-semibold;
+    }
+  }
+
+  &-attribute {
+    @apply flex items-center gap-2 last:[&>*]:flex last:[&>*]:flex-wrap last:[&>*]:items-center last:[&>*]:gap-2 md:last:[&>*]:gap-6;
+
+    &-container {
+      @apply py-6 border-t border-background space-y-6;
+    }
+
+    &-url {
+      @apply underline text-sm text-secondary;
+    }
+  }
+}

data/app/packs/stylesheets/decidim/conferences/_registration.scss

@@ -0,0 +1,39 @@
+.conference__registration {
+  @apply flex flex-col md:flex-row items-start md:items-center justify-between gap-2.5 rounded-l px-4 border-l-4 border-background;
+
+  &-container {
+    @apply w-full lg:w-4/5 xl:w-3/5 space-y-10 mb-16 md:mb-36;
+
+    &-title {
+      @apply py-10 text-gray-2 uppercase font-semibold;
+    }
+  }
+
+  &-text {
+    @apply text-sm text-gray-2 space-y-2.5 md:space-y-4 w-full lg:w-1/5 xl:w-2/5;
+
+    & > *:last-child {
+      @apply inline-flex items-center gap-1.5 first:[&>*]:flex-none max-w-full;
+    }
+  }
+
+  &-button {
+    @apply truncate md:w-32;
+
+    &-container {
+      @apply w-full md:w-72 flex items-center justify-between md:justify-end gap-4 md:gap-8 px-3 md:px-6 py-3 bg-background rounded;
+
+      & > *:first-child {
+        @apply text-xl font-semibold whitespace-nowrap;
+      }
+    }
+  }
+
+  &:hover &-button:not([disabled]) {
+    @apply bg-secondary text-white border-transparent;
+  }
+
+  &-modal {
+    @apply p-6;
+  }
+}

data/app/packs/stylesheets/decidim/conferences/_speaker.scss

@@ -0,0 +1,83 @@
+.conference__speaker {
+  &__container {
+    @apply grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-x-4 md:gap-x-8 lg:gap-x-16 gap-y-10 mb-16 md:mb-36;
+  }
+
+  &__item {
+    @apply flex flex-col gap-4 hover:cursor-pointer text-left focus-visible:outline-none;
+
+    &-image {
+      @apply ring-4 ring-background overflow-hidden rounded aspect-square;
+
+      img {
+        @apply w-full h-full object-cover;
+      }
+    }
+
+    &-name {
+      @apply text-secondary;
+    }
+
+    &-text {
+      @apply mt-2 flex flex-col text-sm text-gray-2;
+    }
+
+    &:hover &-image,
+    &:focus &-image {
+      @apply ring-tertiary;
+    }
+
+    &:hover &-name,
+    &:focus &-name {
+      @apply underline;
+    }
+  }
+
+  &__modal {
+    @apply md:pr-12 md:pb-12;
+
+    &-title {
+      @apply flex gap-2 items-center text-2xl text-black font-semibold;
+    }
+
+    &-img {
+      @apply w-1/4 flex-none rounded overflow-hidden aspect-square;
+
+      img {
+        @apply w-full h-full object-cover;
+      }
+    }
+
+    &-bio {
+      @apply w-full divide-y divide-gray-3 [&>*]:py-4 first:[&>*]:pt-0 last:[&>*]:pb-0;
+
+      &-container {
+        @apply flex flex-col md:flex-row gap-4 md:gap-10 items-start mt-10 w-full;
+      }
+
+      &-name {
+        @apply text-black text-2xl font-semibold;
+      }
+
+      &-roles {
+        @apply mt-4 text-gray-2 text-sm after:[&_span]:content-['_/_'] last:after:[&_span]:content-[''];
+      }
+
+      &-networks {
+        @apply flex flex-wrap mt-4 flex gap-2 md:gap-6 text-secondary text-sm [&>*]:flex [&>*]:items-center [&>*]:gap-1.5;
+      }
+
+      &-description {
+        @apply overflow-y-auto max-h-[50vh] text-gray-2 text-md;
+      }
+
+      &-meetings {
+        @apply overflow-y-auto max-h-[20vh] text-secondary text-md flex flex-col gap-2;
+
+        &-title {
+          @apply text-gray-2 font-bold mb-4;
+        }
+      }
+    }
+  }
+}

data/app/packs/stylesheets/decidim/conferences/conferences.scss

@@ -1,3 +1,5 @@
-.conference--date{
-  cursor: default;
-}
+@import "stylesheets/decidim/conferences/conference.scss";
+@import "stylesheets/decidim/conferences/speaker.scss";
+@import "stylesheets/decidim/conferences/registration.scss";
+@import "stylesheets/decidim/conferences/program.scss";
+@import "stylesheets/decidim/conferences/media.scss";

data/app/permissions/decidim/conferences/permissions.rb

@@ -80,14 +80,14 @@ module Decidim
         return unless user
         return unless conference.presence
         return unless conference.registrations_enabled? &&
-                      conference.conference_invites.exists?(user: user) &&
+                      conference.conference_invites.exists?(user:) &&
                       permission_action.action == :decline_invitation &&
                       permission_action.subject == :conference
 
         allow!
       end
 
-      # It's an admin user if it's an organization admin or is a space admin
+      # It is an admin user if it is an organization admin or is a space admin
       # for the current `conference`.
       def admin_user?
         user.admin? || (conference ? can_manage_conference?(role: :admin) : has_manageable_conferences?)

data/app/presenters/decidim/conference_speaker_presenter.rb

@@ -40,7 +40,7 @@ module Decidim
     def avatar_url(variant = nil)
       return avatar.default_url unless avatar.attached?
 
-      avatar.path(variant: variant)
+      avatar.path(variant:)
     end
 
     private

data/app/presenters/decidim/conferences/admin_log/conference_invite_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Conferences::Invite`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/conferences/admin_log/conference_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Conference`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/conferences/admin_log/conference_registration_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Conferences::ConferenceRegistration`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/conferences/admin_log/conference_speaker_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::ConferenceSpeaker`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/conferences/admin_log/conference_user_role_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::ConferenceUserRole`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/conferences/admin_log/media_link_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Conferences::MediaLink`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/conferences/admin_log/partner_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Conferences::Partner`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/conferences/admin_log/registration_type_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Conferences::RegistrationType`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/conferences/conference_stats_presenter.rb

@@ -2,40 +2,15 @@
 
 module Decidim
   module Conferences
-    # A presenter to render statistics in the homepage.
+    # A presenter to render statistics in a Conference.
     class ConferenceStatsPresenter < Decidim::StatsPresenter
       include IconHelper
 
-      def conference
-        __getobj__.fetch(:conference)
-      end
-
-      # Public: Render a collection of primary stats.
-      def highlighted
-        highlighted_stats = component_stats(priority: StatsRegistry::HIGH_PRIORITY)
-        highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
-        highlighted_stats.concat(comments_stats(:conferences))
-        highlighted_stats = highlighted_stats.reject(&:empty?)
-        highlighted_stats = highlighted_stats.reject { |_manifest, _name, data| data.zero? }
-        grouped_highlighted_stats = highlighted_stats.group_by(&:first)
-
-        statistics(grouped_highlighted_stats)
-      end
-
       private
 
-      def component_stats(conditions)
-        Decidim.component_manifests.map do |component_manifest|
-          component_manifest.stats
-                            .filter(conditions)
-                            .with_context(published_components)
-                            .map { |name, data| [component_manifest.name, name, data] }.flatten
-        end
-      end
+      def participatory_space = __getobj__.fetch(:conference)
 
-      def published_components
-        @published_components ||= Component.where(participatory_space: conference).published
-      end
+      def participatory_space_sym = :conferences
     end
   end
 end

data/app/queries/decidim/conferences/admin/admin_users.rb

@@ -3,11 +3,11 @@
 module Decidim
   module Conferences
     module Admin
-      # A class used to find the admins for an conference or an organization conferences.
+      # A class used to find the admins for a conference or an organization conferences.
       class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
-        # conference - an conference that needs to find its conference admins
+        # conference - a conference that needs to find its conference admins
         def self.for(conference)
           new(conference).query
         end
@@ -21,7 +21,7 @@ module Decidim
 
         # Initializes the class.
         #
-        # conference - an conference that needs to find its conference admins
+        # conference - a conference that needs to find its conference admins
         # organization - an organization that needs to find its conference admins
         def initialize(conference, organization = nil)
           @conference = conference
@@ -50,7 +50,7 @@ module Decidim
           if conference
             [conference]
           else
-            Decidim::Conference.where(organization: organization)
+            Decidim::Conference.where(organization:)
           end
         end
       end

data/app/queries/decidim/conferences/conferences_with_user_role.rb

@@ -39,8 +39,8 @@ module Decidim
       attr_reader :user, :role
 
       def conference_ids
-        user_roles = ConferenceUserRole.where(user: user) if role == :any
-        user_roles = ConferenceUserRole.where(user: user, role: role) if role != :any
+        user_roles = ConferenceUserRole.where(user:) if role == :any
+        user_roles = ConferenceUserRole.where(user:, role:) if role != :any
         user_roles.pluck(:decidim_conference_id)
       end
     end

data/app/queries/decidim/conferences/organization_conferences.rb

@@ -9,7 +9,7 @@ module Decidim
       end
 
       def query
-        Decidim::Conference.where(organization: @organization)
+        Decidim::Conference.where(organization: @organization).order(weight: :asc, start_date: :desc)
       end
     end
   end

data/app/queries/decidim/conferences/organization_published_conferences.rb

@@ -14,7 +14,7 @@ module Decidim
           OrganizationConferences.new(@organization),
           VisibleConferences.new(@user),
           PublishedConferences.new
-        ).query.order(start_date: :desc)
+        ).query.order(weight: :asc, start_date: :desc)
       end
     end
   end

data/app/views/decidim/conferences/admin/conference_copies/_form.html.erb

@@ -1,33 +1,27 @@
-<%= javascript_pack_tag "decidim_conferences_admin" %>
+<%= append_javascript_pack_tag "decidim_conferences_admin" %>
 
-<div class="card" id="conferences">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <div class="row">
-        <div class="column xlarge-8">
-          <%= form.translated :text_field, :title, autofocus: true %>
-        </div>
-        <div class="column xlarge-4 slug">
-          <%= form.text_field :slug %>
-          <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url(:conferences, form.object.slug)) %></p>
-        </div>
+<div class="form__wrapper">
+  <div class="card pt-4" id="conferences">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
       </div>
-      <div class="card">
-        <div class="card-divider">
-          <legend><%= select %></legend>
-        </div>
-        <div class="card-section">
-          <div class="row">
-            <div class="columns xlarge-3">
-              <%= form.check_box :copy_categories %>
-            </div>
-
-            <div class="columns xlarge-6">
-              <%= form.check_box :copy_components %>
+      <div class="row column slug">
+        <%= form.text_field :slug, help_text: t(".slug_help_html", url: decidim_form_slug_url(:conferences, form.object.slug)) %>
+      </div>
+      <div class="row column">
+        <div class="card">
+          <div class="card-divider">
+            <legend><%= t("conference_copies.new.select", scope: "decidim.admin") %></legend>
+          </div>
+          <div class="card-section">
+            <div class="row">
+              <div class="row column">
+                <%= form.check_box :copy_categories %>
+              </div>
+              <div class="row column">
+                <%= form.check_box :copy_components %>
+              </div>
             </div>
           </div>
         </div>

data/app/views/decidim/conferences/admin/conference_copies/new.html.erb

@@ -1,8 +1,19 @@
 <% add_decidim_page_title(t("conference_copies.new.title", scope: "decidim.admin")) %>
-<%= decidim_form_for(@form, url: conference_copies_path(current_conference), method: :post, html: { class: "form copy_conference" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("conference_copies.new.title", scope: "decidim.admin"), select: t("conference_copies.new.select", scope: "decidim.admin") } %>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t("conference_copies.new.copy", scope: "decidim.admin") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("conference_copies.new.title", scope: "decidim.admin") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: conference_copies_path(current_conference), method: :post, html: { class: "form form-defaults copy_conference" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("conference_copies.new.copy", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>