decidim-meetings 0.27.10 → 0.28.0.rc4

data/app/packs/stylesheets/decidim/meetings/_calendar.scss

@@ -0,0 +1,47 @@
+.meeting-calendar {
+  @apply grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 grid-rows-4 md:gap-y-6 md:gap-x-8 lg:gap-y-12 lg:gap-x-16 place-items-start;
+
+  &__selector {
+    @apply flex items-center gap-4;
+
+    &-container {
+      @apply flex justify-between items-center mb-8;
+    }
+
+    &-arrow {
+      @apply w-6 h-6 rounded-full bg-background;
+    }
+  }
+
+  &__link {
+    @apply flex items-center gap-2 text-secondary font-semibold;
+  }
+
+  &__month {
+    @apply text-center border-separate;
+
+    caption {
+      @apply text-lg text-gray-2 text-left font-semibold mb-4;
+    }
+
+    th {
+      @apply text-xs text-black uppercase font-semibold;
+    }
+
+    td {
+      @apply text-md text-gray-2 font-semibold w-9 h-9 rounded;
+    }
+
+    .is-today {
+      @apply border border-gray bg-background font-bold;
+    }
+
+    .is-past-event {
+      @apply bg-gray-2 text-white font-bold;
+    }
+
+    .is-upcoming-event {
+      @apply bg-secondary text-white font-bold;
+    }
+  }
+}

data/app/packs/stylesheets/decidim/meetings/_item.scss

@@ -0,0 +1,177 @@
+.meeting {
+  &__filter {
+    &-container {
+      @apply self-stretch;
+    }
+  }
+
+  &__calendar {
+    @apply w-14 flex flex-col justify-start rounded bg-background text-center;
+
+    &:only-child &-month {
+      @apply rounded-t;
+    }
+
+    &-container {
+      @apply grid grid-cols-[auto_1fr] md:grid-cols-[auto_1fr_1fr] items-center gap-0 md:gap-x-5 border-4 border-background rounded md:h-[120px] overflow-hidden;
+
+      > *:nth-child(2) {
+        @apply p-4 md:p-0;
+
+        &:not(:last-child) {
+          @apply col-span-2 md:col-auto order-2 md:order-1;
+        }
+
+        &:last-child {
+          @apply md:col-span-2 pr-4;
+        }
+      }
+
+      > *:nth-child(3) {
+        @apply order-1 md:order-2 h-[116px] md:h-full;
+      }
+    }
+
+    &-month {
+      @apply bg-primary uppercase text-white text-xs rounded-tl;
+    }
+
+    &-day {
+      @apply text-black text-2xl font-bold;
+    }
+
+    &-time {
+      @apply text-black text-xs;
+    }
+
+    &-month,
+    &-day,
+    &-time {
+      @apply inline-flex items-center justify-evenly empty:[&>span]:hidden;
+    }
+
+    &-separator {
+      @apply mx-2 font-normal text-sm;
+    }
+
+    &__lg {
+      @apply w-fit justify-center [&>*]:px-2;
+    }
+
+    &__lg &-month {
+      @apply py-1 text-md;
+    }
+
+    &__lg &-day {
+      @apply text-5xl;
+    }
+
+    &__lg &-time {
+      @apply text-md pb-2;
+    }
+  }
+
+  &__author {
+    @apply flex items-center gap-4;
+  }
+
+  &__grid {
+    @apply grid grid-cols-4 gap-x-12 gap-y-4;
+  }
+
+  &__online {
+    @apply bg-background flex flex-col grid place-items-center p-8 space-y-4 text-gray-2 text-center text-lg;
+  }
+
+  &__agenda {
+    &-title {
+      @apply flex gap-1 items-center;
+
+      svg {
+        @apply w-6 h-6 text-tertiary fill-current;
+      }
+    }
+
+    &-item {
+      @apply mt-6 bg-background rounded p-4 text-gray-2;
+
+      &__title {
+        @apply text-lg inline-flex gap-1 first:[&>*]:font-bold;
+      }
+
+      &__description {
+        @apply mt-2 text-md text-gray-2;
+      }
+    }
+
+    &-subitem {
+      @apply ml-4 mt-4;
+    }
+
+    &-subitem &-item__title {
+      @apply text-md;
+    }
+  }
+
+  &__aside {
+    &-progress {
+      @apply text-sm text-gray-2 text-center space-y-1;
+
+      progress {
+        @apply block w-full h-1 appearance-none rounded-full overflow-hidden bg-gray;
+
+        &::-webkit-progress-value {
+          @apply bg-success;
+        }
+
+        &::-webkit-progress-bar {
+          @apply bg-white;
+        }
+
+        &::-moz-progress-bar {
+          @apply bg-success;
+        }
+      }
+    }
+
+    &-block {
+      @apply bg-background rounded p-2 [&>*]:flex [&>*]:gap-1 first:[&>*>*]:flex-none last:[&>*>*]:space-y-1;
+
+      & + & {
+        @apply mt-4;
+      }
+
+      &__title {
+        @apply text-gray-2 text-sm font-semibold;
+      }
+
+      &__text {
+        @apply text-gray-2 text-sm;
+      }
+
+      &__large {
+        @apply text-gray-2 text-xl font-bold;
+      }
+
+      &__list {
+        @apply ml-4 list-disc text-gray-2 text-sm;
+      }
+    }
+
+    &-actions {
+      @apply flex flex-wrap justify-center gap-x-2;
+    }
+  }
+
+  &__registration-modal {
+    &__terms {
+      @apply text-xs text-gray-2;
+    }
+  }
+
+  &__cancelation-modal {
+    &__description {
+      @apply mt-8 mb-16 text-lg text-gray-2;
+    }
+  }
+}

data/app/packs/stylesheets/decidim/meetings/_list.scss

@@ -0,0 +1,58 @@
+.meeting-list {
+  @apply flex items-stretch gap-4 cursor-pointer;
+
+  &__map {
+    /* negative main padding values */
+    @apply md:-ml-16 -mt-6 md:-mt-12 aspect-square md:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 md:[&+*]:mt-12;
+  }
+
+  &__link {
+    @apply py-6 flex items-center justify-end gap-1 text-secondary;
+  }
+
+  &__modal {
+    @apply pr-16 pb-16;
+
+    &-title {
+      @apply flex items-baseline gap-2;
+    }
+
+    &-text {
+      @apply text-lg text-gray-2;
+    }
+
+    &-input {
+      @apply text-lg text-gray-2 relative;
+
+      input {
+        @apply w-full;
+      }
+
+      button {
+        @apply z-10 absolute top-1/2 right-2 -translate-y-1/2 text-sm;
+      }
+    }
+  }
+
+  &:hover h2 {
+    @apply underline;
+  }
+
+  &__block {
+    &-map {
+      @apply aspect-[2/1] md:aspect-[4/1] rounded overflow-hidden [&>*]:h-full;
+    }
+
+    &-list {
+      @apply flex flex-col md:flex-row justify-start gap-16 last:[&>*]:grow;
+
+      &-aside {
+        @apply flex flex-col gap-4 items-stretch;
+      }
+
+      &-title {
+        @apply text-gray-2 font-semibold uppercase;
+      }
+    }
+  }
+}

data/app/packs/stylesheets/decidim/meetings/_live_event.scss

@@ -0,0 +1,128 @@
+.meeting-polls {
+  &__body {
+    @apply flex flex-col min-h-screen;
+  }
+
+  &__header {
+    @apply flex items-center justify-between p-2.5 bg-background border;
+  }
+
+  &__main {
+    @apply flex grow items-stretch;
+  }
+
+  &__iframe {
+    @apply flex grow bg-gray-2 [&>*]:grow [&>*]:border-0;
+  }
+
+  &__aside {
+    @apply flex-none bg-background-2;
+
+    counter-reset: question;
+
+    &.is-open {
+      @apply w-1/5 [&+div]:w-4/5;
+
+      // shrink iframe when there is two panels
+      & + & + div {
+        @apply w-3/5;
+      }
+
+      & + & {
+        @apply border-l border-l-background;
+      }
+    }
+  }
+
+  &__question {
+    @apply bg-white;
+
+    summary {
+      @apply p-4 cursor-pointer font-bold text-secondary text-md transition border-b border-b-background hover:bg-background;
+
+      transition: background-color 0.2s ease-in-out;
+
+      &::after {
+        counter-increment: question;
+        content: "#" counter(question);
+      }
+
+      & ~ * {
+        @apply p-4;
+
+        // dynamic content
+        > :first-child {
+          @apply font-bold;
+        }
+
+        label {
+          @apply flex items-baseline cursor-pointer;
+        }
+
+        label + label {
+          @apply mt-4;
+        }
+        // end dynamic content
+      }
+    }
+
+    &[open] .meeting-polls__answer--bar > * {
+      opacity: 1;
+      transform: translateX(0);
+    }
+
+    &.is-new {
+      animation: animateHighlight 5s ease-in-out forwards;
+    }
+
+    @keyframes animateHighlight {
+      0%,
+      80% {
+        background-color: rgba(var(--warning-rgb), 0.1);
+      }
+    }
+  }
+
+  &__question--admin {
+    summary ~ * {
+      @apply border-t border-t-background p-4 bg-background-2;
+
+      a {
+        @apply my-4 block text-sm underline;
+      }
+
+      > :first-child {
+        @apply font-normal;
+      }
+    }
+  }
+
+  &__answer {
+    @apply flex items-center gap-2;
+
+    &--value {
+      @apply w-1/5 font-bold;
+    }
+
+    &--bar {
+      @apply w-4/5 h-2.5 overflow-hidden;
+
+      > * {
+        @apply bg-primary h-full opacity-0;
+      }
+    }
+  }
+
+  // vertical flow
+  label + &__answer + label {
+    @apply mt-6;
+  }
+
+  &__admin-label {
+    @apply p-4 bg-secondary text-white font-bold text-sm;
+  }
+
+  &__admin-action {
+    @apply py-2 flex items-center border-t-background [&>*]:flex-none first:[&>*]:w-2/5 last:[&>*]:w-3/5;
+  }
+}

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

@@ -0,0 +1,4 @@
+@import "stylesheets/decidim/meetings/list.scss";
+@import "stylesheets/decidim/meetings/item.scss";
+@import "stylesheets/decidim/meetings/calendar.scss";
+@import "stylesheets/decidim/meetings/live_event.scss";

data/app/permissions/decidim/meetings/permissions.rb

@@ -4,7 +4,6 @@ module Decidim
   module Meetings
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        allow_embed_meeting?
         return permission_action unless user
 
         # Delegate the admin permission checks to the admin permissions class
@@ -58,15 +57,6 @@ module Decidim
         @question ||= context.fetch(:question, nil)
       end
 
-      # As this is a public action, we need to run this before other checks
-      def allow_embed_meeting?
-        return unless permission_action.action == :embed && permission_action.subject == :meeting && meeting
-        return disallow! if meeting.withdrawn?
-        return allow! if meeting.published?
-
-        disallow!
-      end
-
       def can_join_meeting?
         meeting.can_be_joined_by?(user) &&
           authorized?(:join, resource: meeting)
@@ -78,11 +68,24 @@ module Decidim
 
       def can_decline_invitation?
         meeting.registrations_enabled? &&
-          meeting.invites.exists?(user: user)
+          meeting.invites.exists?(user:)
       end
 
       def can_create_meetings?
-        component_settings&.creation_enabled_for_participants?
+        component_settings&.creation_enabled_for_participants? && public_space_or_member?
+      end
+
+      def public_space_or_member?
+        participatory_space = context[:current_component].participatory_space
+
+        participatory_space.private_space? ? space_member?(participatory_space, user) : true
+      end
+
+      # Neither platform admins, nor space admins should be able to create meetings from the public side.
+      def space_member?(participatory_space, user)
+        return false unless user
+
+        participatory_space.participatory_space_private_users.exists?(decidim_user_id: user.id)
       end
 
       def can_update_meeting?

data/app/presenters/decidim/meetings/admin_log/invite_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Meetings::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/meetings/admin_log/meeting_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Meetings::Meeting`
       # 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
@@ -15,6 +15,10 @@ module Decidim
       class MeetingPresenter < Decidim::Log::BasePresenter
         private
 
+        def resource_presenter
+          @resource_presenter ||= Decidim::Meetings::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
+        end
+
         def diff_fields_mapping
           {
             address: :string,

data/app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Meetings::Questionnaire`
       # 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/meetings/admin_log/value_types/meeting_title_description_presenter.rb

@@ -10,7 +10,7 @@ module Decidim
           def present
             return unless value
 
-            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.decidim_escape_translated(value))
+            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.translated_attribute(value))
             renderer.render(links: false).html_safe
           end
         end

data/app/presenters/decidim/meetings/log/resource_presenter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Log
+      class ResourcePresenter < Decidim::Log::ResourcePresenter
+        private
+
+        # Private: Presents resource name.
+        #
+        # Returns an HTML-safe String.
+        def present_resource_name
+          Decidim::Meetings::MeetingPresenter.new(resource).title
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -34,6 +34,12 @@ module Decidim
         content_handle_locale(meeting.description, all_locales, extras, links, strip_tags)
       end
 
+      def editor_description(all_locales: false, extras: true)
+        return unless meeting
+
+        editor_locales(meeting.description, all_locales, extras:)
+      end
+
       def location(all_locales: false)
         return unless meeting
 
@@ -63,7 +69,7 @@ module Decidim
 
         handle_locales(meeting.closing_report, all_locales) do |content|
           renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
-          renderer.render(links: links).html_safe
+          renderer.render(links:).html_safe
         end
       end
 
@@ -72,7 +78,7 @@ module Decidim
 
         handle_locales(meeting.registration_email_custom_content, all_locales) do |content|
           renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
-          renderer.render(links: links).html_safe
+          renderer.render(links:).html_safe
         end
       end
 

data/app/services/decidim/meetings/calendar/component_calendar.rb

@@ -24,7 +24,7 @@ module Decidim
         #
         # Returns a collection of Meetings.
         def meetings
-          Decidim::Meetings::Meeting.where(component: component)
+          Decidim::Meetings::Meeting.where(component:)
         end
 
         # Finds the component meetings.

data/app/services/decidim/meetings/close_meeting_reminder_generator.rb

@@ -38,15 +38,17 @@ module Decidim
 
       def send_reminders(component)
         intervals = Array(reminder_manifest.settings.attributes[:reminder_times].default)
+        space_admins = Decidim::ParticipatoryProcessUserRole.where(decidim_participatory_process_id: component.participatory_space_id, role: "admin").collect(&:user)
+        space_admins = (global_admins + space_admins).uniq
         intervals.each do |interval|
           finder_query(component.id, interval).find_each do |meeting|
-            authors = meeting.official? ? space_admins(component) : [meeting.author]
+            authors = meeting.official? ? space_admins : [meeting.author]
             authors.each do |author|
               send_notif = author.notification_settings.fetch("close_meeting_reminder", "1")
               next unless send_notif == "1"
 
-              reminder = Decidim::Reminder.find_or_create_by(user: author, component: component)
-              record = Decidim::ReminderRecord.find_or_create_by(reminder: reminder, remindable: meeting)
+              reminder = Decidim::Reminder.find_or_create_by(user: author, component:)
+              record = Decidim::ReminderRecord.find_or_create_by(reminder:, remindable: meeting)
               record.update(state: "active") unless record.active?
               reminder.records << record
               reminder.save!
@@ -58,16 +60,8 @@ module Decidim
         end
       end
 
-      def space_admins(component)
-        @space_admins ||= begin
-          space_admins = if component.participatory_space.respond_to?(:user_roles)
-                           component.participatory_space.user_roles(:admin).collect(&:user)
-                         else
-                           []
-                         end
-          global_admins = component.organization.admins
-          (global_admins + space_admins).uniq
-        end
+      def global_admins
+        @global_admins ||= Decidim::User.where(admin: true).all
       end
     end
   end

data/app/services/decidim/meetings/meeting_iframe_embedder.rb

@@ -5,7 +5,7 @@ require "cgi"
 module Decidim
   module Meetings
     # This class handles the streaming url to be included in the iframe present
-    # in the live event. For some services it's required to transforma a bit
+    # in the live event. For some services it is required to transforma a bit
     # the structure of the URL.
     class MeetingIframeEmbedder
       # Public: Initializes the service.

data/app/views/decidim/meetings/_calendar_modal.html.erb

@@ -1,30 +1,28 @@
-<button class="button button--title share-link text-center calendar" data-open="calendarShare">
+<button class="button button__sm button__transparent-secondary mt-6 md:mt-12 md:self-start" data-dialog-open="calendarShare">
   <%= t(".export_calendar") %>
-  <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
+  <%= icon "download-cloud-2-line", class: "fill-current" %>
 </button>
 
-<div class="reveal" id="calendarShare" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".calendar_url") %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
+<%= decidim_modal id: "calendarShare", class: "meeting-list__modal" do %>
+<div class="meeting-list__modal-title">
+  <%= icon "share-forward-2-line", class: "w-6 h-6 text-gray fill-current flex-none" %>
+  <div class="space-y-8">
+    <h3 id="dialog-title-calendarShare" class="h3"><%= t(".calendar_url") %></h3>
 
-  <div class="calendar-url-description"><%= t(".copy_calendar_url_description") %></div>
-  <div class="calendar-url-explanation"><%= t(".copy_calendar_url_explanation") %></div>
+    <div id="dialog-desc-calendarShare" class="meeting-list__modal-text"><%= t(".copy_calendar_url_description") %></div>
+    <div class="meeting-list__modal-text"><%= t(".copy_calendar_url_explanation") %></div>
 
-  <div class="input-group calendar_url_input">
-    <input id="urlCalendarUrl" class="input-group-field" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>
-    <div class="input-group-button">
-      <button class="button primary"
-              data-clipboard-copy="#urlCalendarUrl"
-              data-clipboard-copy-label="<%= t(".copy_calendar_url_copied") %>"
-              data-clipboard-copy-message="<%= t(".copy_calendar_url_message") %>"
-              aria-label="<%= t(".copy_calendar_url_clarification") %>">
-        <%= icon "clipboard", role: "img", "aria-hidden": true %>
-        <%= t(".copy_calendar_url") %>
+    <div class="meeting-list__modal-input">
+      <input id="urlCalendarUrl" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>
+      <button
+        data-clipboard-copy="#urlCalendarUrl"
+        data-clipboard-copy-label="<%= t(".copy_calendar_url_copied") %>"
+        data-clipboard-copy-message="<%= t(".copy_calendar_url_message") %>"
+        aria-label="<%= t(".copy_calendar_url_clarification") %>">
+        <%= icon "file-copy-line", class: "w-5 h-6 text-secondary fill-current" %>
+        <span class="sr-only"><%= t(".copy_calendar_url") %></span>
       </button>
     </div>
   </div>
 </div>
+<% end %>