effective_events 0.21.3 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe445b12eeae75aaa1e672a4f9e052e2b99d9216462dcd9bfc1a0f4bc27e7ca
-  data.tar.gz: 6e7c8f3e438c8893cfa56d5a12a85bfbc2a06f353336bb1d5a6ed4ae763396d7
+  metadata.gz: 2ffd423f757ef4a0b0135bc467e8c98c46c340013b6afb6b360b9ac7c9d31dd0
+  data.tar.gz: 8f922c163d69b87d29d01544dbcc183004642a5828a0dd82f83a734cc13997db
 SHA512:
-  metadata.gz: 4c5d4df026688410610707a911a9e1f3afddc2735eeca7bd4223d3afc00c2a763a4359f766406b30578062194fc1e291f70631fe00750ba305ab5eec72558a1b
-  data.tar.gz: fbc9a5490824c926586f2178a47e321b93cea0b8bcb8935bd7fdcb7b10d500c6c18ad4d5f37f9ed6713f8699ecc50438ae76ca07cafef0fde47de767c9231ec0
+  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

@@ -147,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.3'.freeze
+  VERSION = '0.22.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.22.0
 platform: ruby
 authors:
 - Code and Effect