effective_events 0.21.2 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42c8639a33d8247e332a53ef4c05381e7bab279c8ad935acf137bf51442efd1c
-  data.tar.gz: f6884ad2f0eca97360818679f50a0b5c12b24372e05c59635870aa5b13baceca
+  metadata.gz: 2ffd423f757ef4a0b0135bc467e8c98c46c340013b6afb6b360b9ac7c9d31dd0
+  data.tar.gz: 8f922c163d69b87d29d01544dbcc183004642a5828a0dd82f83a734cc13997db
 SHA512:
-  metadata.gz: a51681eb17f796a836916eaac24ad937f2aaa907ae12f1e79019ececf54f00b0fbdf0e642db420c66a7d38c231261c0b43f897a4084cb28ce07b0935d823045b
-  data.tar.gz: 0eaeb3437ef7e5106362051cd864a7a3f0b35602f543328af1adc30dccac734b04822146068c319dd7f9bd9f6a1ed1ee2779f2ae5cf8346490dec146df646795
+  metadata.gz: ed5b26cf2b8439c5758f3239bcf0ad2fc1de166aa56e5983837c2c5e627e8ce50dd676b08b99675ebafc7eceaf88bb03cf2fd5e17c5912214250d1a2f8223423
+  data.tar.gz: 683aff5ed150fb225e481d5c45701e7651e1691f0ac7d9cac0f54387f4b437f481ef707ced4f6b4adc696fc2423e153820e0d1c5e82b8f8c7e7ed44d662c7f0a

data/app/assets/stylesheets/effective_events/base.scss

@@ -0,0 +1,3 @@
+.effective-event-past {
+  margin-bottom: 1rem;
+}

data/app/controllers/effective/events_controller.rb

@@ -8,13 +8,19 @@ module Effective
     }
 
     def index
-      if event_category.present?
+      EffectiveResources.authorize!(self, :index, Effective::Event)
+
+      # Page Title
+      if event_category.blank?
+        @page_title = "Upcoming #{EffectiveResources.ets(Effective::Event)}"
+      elsif event_category == 'past'
+        @page_title = "Past #{EffectiveResources.ets(Effective::Event)}"
+      elsif event_category.present?
         @page_title = event_category
         @event_category = event_category
       else
-        @page_title ||= view_context.events_name_label
+        @page_title = view_context.events_name_label
       end
-      EffectiveResources.authorize!(self, :index, Effective::Event)
 
       # Sometimes we just display a Datatable for the events
       @datatable = EffectiveResources.best('EffectiveEventsDatatable').new
@@ -57,7 +63,7 @@ module Effective
 
     def event_category
       return nil unless params[:category].present?
-      EffectiveEvents.categories.find { |category| category.parameterize == params[:category] }
+      (Array(EffectiveEvents.categories) + ['past']).find { |category| category.parameterize == params[:category] }
     end
 
     def search_params

data/app/models/effective/event.rb

@@ -83,6 +83,8 @@ module Effective
 
     scope :sorted, -> { order(start_at: :desc) }
 
+    scope :for_sitemap, -> { published }
+
     scope :deep, -> { 
       base = includes(:event_registrants, :event_tickets, :rich_texts) 
       base = base.includes(:pg_search_document) if defined?(PgSearch)
@@ -145,6 +147,7 @@ module Effective
     validates :delayed_payment, inclusion: { in: [false], message: "cannot be used for external registration events" }, if: -> { external_registration? }
     validates :delayed_payment_date, presence: true, if: -> { delayed_payment? }
     validates :delayed_payment_date, absence: true, unless: -> { delayed_payment? }
+    validates :slug, exclusion: { in: Array(EffectiveEvents.categories) + ['past'], message: "must not match a category name or past" }
 
     validate(if: -> { start_at && end_at }) do
       errors.add(:end_at, 'must be after start date') unless start_at < end_at

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).upcoming
+      Event.events(user: current_user, unpublished: unpublished)
     end
 
     def per_page
@@ -55,13 +55,16 @@ module Effective
       events = collection()
       raise('expected an ActiveRecord collection') unless events.kind_of?(ActiveRecord::Relation)
 
+      # Filter by upcoming or past
+      events = (category == 'past') ? events.past : events.upcoming
+
       # Filter by term
       if term.present?
         events = Effective::Resource.new(events).search_any(term)
       end
 
       # Filter by category
-      if category.present?
+      if category.present? && category != 'past'
         events = events.where(category: category)
       end
 

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

@@ -1,6 +1,7 @@
 .effective-event-sidebar
   %ul.nav.flex-column{role: 'navigation'}
-    = nav_link_to('All Events', effective_events.events_path, class: "effective-event-all")
+    = nav_link_to("Upcoming #{ets(Effective::Event)}", effective_events.events_path, class: "effective-event-all")
+    = nav_link_to("Past #{ets(Effective::Event)}", effective_events.events_path + '/past', class: "effective-event-past")
 
     - EffectiveEvents.categories.each do |category|
       = nav_link_to(category, effective_events.events_path + '/' + category.parameterize, class: "effective-event-#{category.parameterize}")

data/config/routes.rb

@@ -10,7 +10,7 @@ EffectiveEvents::Engine.routes.draw do
 
     # Event Category routes
     match 'events/:category', to: 'events#index', via: :get, constraints: lambda { |req|
-      EffectiveEvents.categories.map(&:parameterize).include?(req.params['category'])
+      (EffectiveEvents.categories.map(&:parameterize) + ['past']).include?(req.params['category'])
     }
 
     match "events/:category/:id", to: 'events#show', via: :get, constraints: lambda { |req|

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.21.2'.freeze
+  VERSION = '0.22.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.22.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails