Merge branch 'main' of github.com:better-together-solutions/community-engine-rails

Author: rsmithlal

app/assets/images/card_images/default_card_image_community.jpg

@@ -2,4 +2,10 @@
   aspect-ratio: 3 / 2;
   overflow: hidden;
   object-fit: cover;
+}
+
+.card {
+  &.active {
+    background-color: var(--bs-primary-bg-subtle);
+  }
 }

app/assets/images/card_images/default_card_image_generic.jpg

@@ -9,14 +9,20 @@ class ConversationsController < ApplicationController
 
     helper_method :available_participants
 
-    def index; end
+    def index
+      authorize @conversations
+    end
 
     def new
       @conversation = Conversation.new
+      authorize @conversation
     end
 
-    def create
+    def create # rubocop:todo Metrics/MethodLength
       @conversation = Conversation.new(conversation_params.merge(creator: helpers.current_person))
+
+      authorize @conversation
+
       if @conversation.save
         @conversation.participants << helpers.current_person
 
@@ -30,6 +36,8 @@ def create
     end
 
     def show # rubocop:todo Metrics/MethodLength
+      authorize @conversation
+
       @messages = @conversation.messages.with_all_rich_text.includes(sender: [:string_translations]).order(:created_at)
       @message = @conversation.messages.build
 

app/assets/images/card_images/default_card_image_person.jpg

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # CRUD for BetterTogether::Event
+  class EventsController < FriendlyResourceController
+    def index
+      @draft_events = @events.draft
+      @upcoming_events = @events.upcoming
+      @past_events = @events.past
+    end
+
+    protected
+
+    def resource_class
+      ::BetterTogether::Event
+    end
+  end
+end

app/assets/stylesheets/better_together/cards.scss

@@ -44,6 +44,19 @@ def update
       end
     end
 
+    def destroy
+      authorize_resource
+
+      resource_string = resource_instance.to_s
+
+      if resource_instance.destroy
+        redirect_to url_for(resource_class),
+                    notice: "#{resource_class.model_name.human} #{resource_string} was successfully removed."
+      else
+        render :show, status: :unprocessable_entity
+      end
+    end
+
     protected
 
     def authorize_resource

app/controllers/better_together/conversations_controller.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # View helpers for events
+  module EventsHelper
+  end
+end

app/controllers/better_together/events_controller.rb

@@ -7,13 +7,13 @@ module ImageHelper # rubocop:todo Metrics/ModuleLength
     # rubocop:todo Metrics/CyclomaticComplexity
     # rubocop:todo Metrics/AbcSize
     def cover_image_tag(entity, options = {}) # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
-      image_classes = "cover-image rounded-top #{options[:class]}"
+      image_classes = "cover-image #{options[:class]}"
       image_style = options[:style].to_s
       image_width = options[:width] || 2400
       image_height = options[:height] || 600
       image_format = options[:format] || 'jpg'
-      image_alt = options[:alt] || 'Cover Image'
-      image_title = options[:title] || 'Cover Image'
+      image_alt = options[:alt] || entity
+      image_title = options[:title] || entity
       image_tag_attributes = {
         class: image_classes,
         style: image_style,
@@ -43,8 +43,8 @@ def card_image_tag(entity, options = {}) # rubocop:todo Metrics/MethodLength, Me
       image_width = options[:width] || 1200
       image_height = options[:height] || 800
       image_format = options[:format] || 'jpg'
-      image_alt = options[:alt] || 'Card Image'
-      image_title = options[:title] || 'Card Image'
+      image_alt = options[:alt] || entity
+      image_title = options[:title] || entity
       image_tag_attributes = {
         class: image_classes,
         style: image_style,
@@ -53,7 +53,7 @@ def card_image_tag(entity, options = {}) # rubocop:todo Metrics/MethodLength, Me
       }
 
       # Determine if entity has a card image
-      if entity.respond_to?(:card_image) && entity.card_image.attached?
+      if entity.respond_to?(:card_image) && entity.card_image&.attached?
         attachment = if entity.respond_to?(:optimized_card_image)
                        entity.optimized_card_image
                      else

app/controllers/better_together/resource_controller.rb

@@ -3,7 +3,7 @@
 module BetterTogether
   module PlatformsHelper # rubocop:todo Style/Documentation
     def invitation_token_expires_at
-      session[:platform_invitation_expires_at].to_datetime.to_i
+      session[:platform_invitation_expires_at]&.to_datetime&.to_i
     end
   end
 end