effective_events 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b35f3042e9e99875c91066ad1c6cd8c70e601dfc4abc72e0b32632c683523371
-  data.tar.gz: db5f82e191ab087d2b052fb2426c0204a2d8ef0e19b2f4a6f4720aed2d6f1d91
+  metadata.gz: ac58bdfbd54d957533cc8ccc62152fd17b4d123133d55e7599159d4c495c690f
+  data.tar.gz: 3fe705a1de037e35954d50bd0e5ad1092968f373cdc098bbe6ea69a1d5b742e5
 SHA512:
-  metadata.gz: b00e8a6173d55548bbc2b72048b7bab6f724f7655cd6d78dd40eb9bbaa336eba428918b5961882f0d9af1ce688d60aeb2530657bbb1fac24733e43ba0c64552c
-  data.tar.gz: 79d0a3ec08ce158f5d65115f4d1f5d516eb2992f384e3b63c25e6026410b8f43134b9605bb811e15c7afae075adf58c73138159754f0e060f012e1a46dff5557
+  metadata.gz: 6eb6bc3ac0e9c42265e2b3c7493ec91029eda738f3608ccf1c0d1cf2255fc20d42b8bfb2ab8a55695692fafd795a34977bcf7aa011ec914369e217ccf9657a10
+  data.tar.gz: 60da0662095d319488c227d631d2b80bd4404dacfdde8418508568da51cfb310254d3e3683abcfb933112fcdc0d89f3cab2d1d8795166e53383546d2f41e4f07

data/app/models/effective/event.rb

@@ -214,6 +214,14 @@ module Effective
       event_tickets.none? { |event_ticket| event_ticket_available?(event_ticket, except: except, quantity: 1) }
     end
 
+    def upcoming?
+      end_at > Time.zone.now
+    end
+
+    def past?
+      end_at < Time.zone.now
+    end
+
     def early_bird?
       return false if early_bird_end_at.blank?
       early_bird_end_at > Time.zone.now

data/app/models/effective/event_search.rb

@@ -55,27 +55,30 @@ 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? && category != 'past'
-        events = events.where(category: category)
+      # Filter by upcoming or past and then apply default sorting
+      if category.present?
+        if category == 'past'
+          events = events.past.sorted
+        else
+          events = events.where(category: category).sorted
+        end
+      else
+        events = events.upcoming.reorder(start_at: :asc)
       end
 
-      # Apply Sorting
+      # Apply sorting from the search form
       events = case order.to_s
       when 'Sort by Published Date'
         events.reorder(published_start_at: :asc)
       when 'Sort by Event Date'
         events.reorder(start_at: :asc)
       else
-        events.reorder(start_at: :asc) # Default Sort by Event Date
+        events
       end
 
       events

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

@@ -1,10 +1,14 @@
 .row.mb-5.effective-events{class: "effective-events-#{event.category.to_s.parameterize}"}
-  - if event.file.present?
+  - # Do not show banners for past events
+  - if event.file.attached? && event.upcoming?
     .col-lg-4
       = link_to effective_events.event_path(event) do
         = image_tag url_for(event.file), class: "effective-events-image d-none d-lg-flex align-self-start", alt: event.title, width: "350", height: "220"
 
   .col
+    - if event.past?
+      .badge.badge-primary.badge-event.mb-2 Past Event
+
     - if event.category.present? && EffectiveEvents.categories.length > 1
       = link_to(event.category, effective_events.events_path + '/' + event.category.parameterize, class: "badge badge-primary badge-event mb-2 effective-events-#{event.category.parameterize}")
 

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

@@ -1,7 +1,7 @@
-.effective-event-sidebar
+.effective-event-sidebar.font-weight-bold.text-center.text-lg-left
   %ul.nav.flex-column{role: 'navigation'}
     = 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|
+    - EffectiveEvents.categories.sort.each do |category|
       = nav_link_to(category, effective_events.events_path + '/' + category.parameterize, class: "effective-event-#{category.parameterize}")

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

@@ -1,11 +1,11 @@
 = render 'layout' do
   .row
     - if EffectiveEvents.categories.length > 1
-      .d-none.d-lg-block.col-lg-3
+      .d-lg-block.col-lg-3.order-2.order-lg-1
         -#= render('effective/events/form', event_search: @event_search)
         = render('effective/events/sidebar')
 
-    .col
+    .col.order-1.order-lg-2
       %h1.effective-title.mb-4= @page_title
 
       - results = @event_search.results(page: params[:page])
@@ -15,5 +15,5 @@
       - else
         = render(results) # This renders effective/events/event
 
-      %nav.d-flex.justify-content-center
+      %nav.d-flex.justify-content-center.mb-4
         = bootstrap_paginate(results, per_page: @event_search.per_page)

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.23.0'.freeze
+  VERSION = '0.23.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails