effective_events 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24e45c933e3321aedd576be10a7df7d8ce1ec1f4599e9ae8509a9997d1645c2
-  data.tar.gz: 62c674e85d85fea359bb32425a2f2eb515e17153a2d435dc57c4fc2359a1a5e1
+  metadata.gz: e2a902e5d3728d5cea14da58094f0e6cc8a64c72491fb45c62637895811c7e9d
+  data.tar.gz: d2da9b7ec73953f311dff46d07c7077af1b382891a93bd2392f87b9cbd9849fc
 SHA512:
-  metadata.gz: 82304ee7f0098f50722860d3dd7c96c7805184adad091db68adcac850bb4b34d7ee3fa5d44a68a1c3c2013e03132a2a138097c19ff718b69ea34c5f6ceee4eec
-  data.tar.gz: 13a8e694faea6f2b093ef6c30a30cc199dabc3890a16f3e6f6500ae8cc7100c786820fc202433f738233f673f9adee34ebec610cc2ce39504894840e34c238b3
+  metadata.gz: 22c5152ac0c15105cb822bc8b9c8eec214f54268e89b3a8e9c3b688c479ea9be64d73a85d69c09034fe6b0508cf3dec95ac535f98c808b836d315fb82f338bcd
+  data.tar.gz: 31402819144cbc718c3873fe829842460726dc175bd81bee9b18810149841507eed10bb87c5f6cc7a5e10b1133b47f5609fa979279998d9d5ec714057e7952af

data/app/controllers/effective/events_controller.rb

@@ -23,6 +23,7 @@ module Effective
 
     def show
       @event = resource_scope.find(params[:id])
+      @upcoming_events = resource_scope.upcoming.where.not(id: @event.id)
 
       if @event.respond_to?(:roles_permit?)
         raise Effective::AccessDenied.new('Access Denied', :show, @event) unless @event.roles_permit?(current_user)

data/app/models/effective/event.rb

@@ -5,20 +5,7 @@ module Effective
     if defined?(PgSearch)
       include PgSearch::Model
 
-      multisearchable against: [
-                        :title,
-                        :slug,
-                      ],
-                      associated_against: {
-                        rich_texts: [:body],
-                      },
-                      using: {
-                        trigram: {},
-                        tsearch: {
-                          highlight: true,
-                        }
-                      }
-
+      multisearchable against: [:body]
     end
 
     has_many :event_tickets, -> { EventTicket.sorted }, inverse_of: :event, dependent: :destroy

data/app/models/effective/event_search.rb

@@ -16,7 +16,7 @@ module Effective
 
     # Base collection to search.
     def collection
-      Event.events(user: current_user, unpublished: unpublished)
+      Event.events(user: current_user, unpublished: unpublished).upcoming
     end
 
     def per_page

data/app/views/effective/events/show.html.haml

@@ -1,57 +1,82 @@
 = render 'layout' do
   .effective-event
-    - if @event.sold_out?
-      .alert.alert-warning.mb-3 This event is sold out.
-
-    - if @event.closed?
-      .alert.alert-warning.mb-3 This event is no longer available.
-
-    - if @event.registerable?
-      .resource-buttons
-        - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
-        = link_to 'Register', url, class: 'btn btn-primary'
-
-  - if @event.file.attached?
-    = image_tag(@event.file)
-
-  %ul.list-unstyled
-    -# Not shown
-      %li
-        %strong Published:
-        = @event.published_at.strftime("%b %d, %Y %I:%M%P")
-
-    %li
-      %strong Event Date:
-      = effective_events_event_schedule(@event)
-
-    - if @event.registration_start_at.present?
-      %li
-        %strong Registration Opens:
-        = @event.registration_start_at.strftime("%b %d, %Y %I:%M%P")
-
-    - if @event.early_bird_end_at.present?
-      %li
-        %strong Early Bird Rate Ends:
-        = @event.early_bird_end_at.strftime("%b %d, %Y %I:%M%P")
-
-    - if @event.registration_end_at.present?
-      %li
-        %strong Registration Closes:
-        = @event.registration_end_at.strftime("%b %d, %Y %I:%M%P")
-
-    - if @event.event_tickets.present?
-      %li
-        %strong Tickets
-        %ul
-          - @event.event_tickets.each do |ticket|
-            %li= "#{ticket} (#{price_to_currency(ticket.price)})"
-
-    - if @event.event_products.present?
-      %li
-        %strong Add-ons
-        %ul
-          - @event.event_products.each do |product|
-            %li= "#{product} (#{price_to_currency(product.price)})"
-
-  - if @event.body.present?
-    = @event.body.to_s
+    .row
+      .col
+        %h1.mb-4= @page_title
+
+    .row
+      .col-md-3
+        - if @event.registerable?
+          .register.mb-4
+            - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
+            = link_to 'Register', url, class: 'btn btn-primary btn-block'
+
+        %ul.list-unstyled
+          -# Not shown
+          -# %li.mb-3
+          -#   %label Published
+          -#   %br
+          -#   = @event.published_at.strftime("%B %e at %l:%M%P")
+          %li.mb-3
+            %label Event Date
+            %br
+            = effective_events_event_schedule(@event)
+
+          - if @event.registration_start_at.present?
+            %li.mb-3
+              %label Registration Opens
+              %br
+              = @event.registration_start_at.strftime("%b %d, %Y %I:%M%P")
+
+          - if @event.early_bird_end_at.present?
+            %li.mb-3
+              %label Early Bird Rate Ends
+              %br
+              = @event.early_bird_end_at.strftime("%b %d, %Y %I:%M%P")
+
+          - if @event.registration_end_at.present?
+            %li.mb-3
+              %label Registration Closes
+              %br
+              = @event.registration_end_at.strftime("%b %d, %Y %I:%M%P")
+
+        - if @event.event_tickets.present? #|| @event.event_products.present?
+          %ul.list-unstyled
+            - if @event.event_tickets.present?
+              %li
+                %label Tickets
+                %br
+                %ul
+                  - @event.event_tickets.each do |ticket|
+                    %li= "#{ticket} (#{price_to_currency(ticket.price)})"
+
+            -# - if @event.event_products.present?
+            -#   %li
+            -#     %label Add-ons
+            -#     %br
+            -#     %ul
+            -#       - @event.event_products.each do |product|
+            -#         %li= "#{product} (#{price_to_currency(product.price)})"
+
+        %hr
+
+        %label.mb-2 Upcoming Events
+        %ul.list-unstyled
+          %li.mb-3
+            - @upcoming_events.each do |event|
+              %h5= link_to event.title, effective_events.event_path(event), class: 'text-decoration-none'
+
+      .col-md-8
+        - if @event.sold_out?
+          .alert.alert-warning.mb-3 This event is sold out.
+
+        - if @event.closed?
+          .alert.alert-warning.mb-3 This event is no longer available.
+
+        - if @event.file.attached?
+          .d-flex.justify-content-center.mb-3
+            = image_tag(@event.file)
+
+        - if @event.body.present?
+          .content.my-5
+            = @event.body.to_s

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.6.5'.freeze
+  VERSION = '0.6.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails