effective_events 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b29ba82476500dc0793755782751f968623a5fd7a2a05a4c01075fd57dd3eb2
-  data.tar.gz: f3efe6fa8417a593fcf46a0219e2fdbe77183ab8d6b24344f969e969d4b45bf9
+  metadata.gz: 8f06812e69cf669261f11555462013b8340e0c04a6af24916857d2a94f2aee43
+  data.tar.gz: ead5d60f77ec92e1e00ca5cbb9c6e33b5553177bb953e89c6cd74c171acfca62
 SHA512:
-  metadata.gz: c1788863bd9f10ab8af6e147b4b83df8bb0f12c353efd26c44fd2274f8c3b2108d0db460eb62a770efd6764bc72fd8829023a090208c468cffdda1517cee2897
-  data.tar.gz: 424203654b7861c179002ef3d2989c8fa8334e57fa9886156638d405a292a1de586f836f3e40ac34eb6db5a8fa06dd01549232a9b3862fc48e7bf93ae24ac3c7
+  metadata.gz: ddd0f95d520222d396e10b9ae9158e0ae717b6d28884e62e87d13b821e926253abfe362ee5e939e39113b1eb93465462475f463087680bc64cecdb481497f164
+  data.tar.gz: 65949637a55a6d50e8266a2e9d9eea77ef1f5d350ea1950aaf4796af4592d99b694517824666092daa30d2f12f2c6cfeb211193268ac54b8a6050d71eefee651

data/app/datatables/effective_events_datatable.rb

@@ -4,6 +4,7 @@ class EffectiveEventsDatatable < Effective::Datatable
     # Upcoming should be first here, so when displayed as a simple datatable on the dashboard they only see upcoming events
     scope :upcoming
     scope :registerable
+    scope :external
     scope :all
   end
 

data/app/helpers/effective_events_helper.rb

@@ -1,4 +1,11 @@
 module EffectiveEventsHelper
+  def effective_events_event_schedule(event)
+    if event.start_at.beginning_of_day == event.end_at.beginning_of_day
+      "#{event.start_at.strftime("%b %d, %Y %I:%M%P")} - #{event.end_at.strftime("%I:%M%P")}"
+    else
+      "#{event.start_at.strftime("%b %d, %Y")} - #{event.end_at.strftime("%b %d, %Y")}"
+    end
+  end
 
   def effective_events_event_tickets_collection(event, namespace = nil)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
@@ -37,5 +44,4 @@ module EffectiveEventsHelper
       [label, product.to_param, disabled].compact
     end
   end
-
 end

data/app/models/effective/event.rb

@@ -79,6 +79,7 @@ module Effective
 
     # Doesnt consider sold out yet
     scope :registerable, -> { published.not_closed.with_tickets }
+    scope :external, -> { published.where(external_registration: true) }
 
     scope :paginate, -> (page: nil, per_page: nil) {
       page = (page || 1).to_i
@@ -113,8 +114,9 @@ module Effective
     validates :published_at, presence: true, unless: -> { draft? }
     validates :start_at, presence: true
     validates :end_at, presence: true
-    validates :registration_start_at, presence: true
-    validates :registration_end_at, presence: true
+
+    validates :registration_start_at, presence: true, unless: -> { external_registration? }
+    validates :registration_end_at, presence: true, unless: -> { external_registration? }
     validates :external_registration_url, presence: true, if: -> { external_registration? }
 
     validate(if: -> { start_at && end_at }) do
@@ -204,8 +206,8 @@ module Effective
         event.slug = event.slug + '-copy'
         event.draft = true
 
-        event.body = body
-        event.excerpt = excerpt
+        event.rich_text_body = rich_text_body
+        event.rich_text_excerpt = rich_text_excerpt
       end
     end
 

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

@@ -1,8 +1,6 @@
 .effective-event-categories
-  %p
-    %strong Categories
+  %ul.nav.nav-pills{role: 'navigation'}
+    = nav_link_to('All Events', effective_events.events_path, class: "nav-pill-effective-event effective-event-all")
 
-  = link_to('All Events', effective_events.events_path)
-
-  - EffectiveEvents.categories.each do |category|
-    = link_to(category, effective_events.events_path + '/' + category.parameterize)
+    - EffectiveEvents.categories.each do |category|
+      = nav_link_to(category, effective_events.events_path + '/' + category.parameterize, class: "nav-pill-effective-event effective-event-#{category.parameterize}")

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

@@ -1,53 +1,7 @@
-.card
+.card{class: "effective-events-#{event.category.parameterize}"}
   .card-body
-    - if event.file.attached?
-      = image_tag(event.file)
-
-    = event.excerpt.to_s
-
-    %table.table.effective-events-table
-      %tbody
-        %tr
-          %th Dates
-          %td
-            Starts: #{event.start_at&.strftime('%F %R')}
-            %br
-            Ends: #{event.end_at&.strftime('%F %R')}
-
-        - if event.category.present?
-          %tr
-            %th Category
-            %td= event.category
-
-        %tr
-          %th Published At
-          %td= event.published_at.strftime('%F %R')
-
-        %tr
-          %th Registration Closes
-          %td= event.registration_end_at.strftime('%F %R')
-
-        %tr
-          %th Early Bird
-          %td
-            Status: #{event.early_bird_status}
-            %br
-            Ends: #{event.early_bird_end_at&.strftime('%F %R')}
-
-        - if event.event_tickets.present?
-          %tr
-            %th Tickets
-            %td
-              %ul.pl-3
-                - event.event_tickets.each do |ticket|
-                  %li= "#{ticket} (#{price_to_currency(ticket.price)})"
-
-        - if event.event_products.present?
-          %tr
-            %th Add-ons
-            %td
-              %ul.pl-0
-                - event.event_products.each do |product|
-                  %li= "#{product} (#{price_to_currency(product.price)})"
-
-    = link_to('View more', effective_events.event_path(event))
+    = link_to(event.category, effective_events.events_path + '/' + event.category.parameterize, class: "badge badge-event mb-2 effective-events-#{event.category.parameterize}")
+    %h2.mt-1= link_to event.title, effective_events.event_path(event)
+    .effective-events-schedule= effective_events_event_schedule(event)
+    .effective-events-excerpt= event.excerpt.to_s
+    = link_to "View Event",  effective_events.event_path(event), class: 'btn btn-primary'

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

@@ -1,52 +1,60 @@
-.effective-event
-  - if @event.sold_out?
-    .alert.alert-warning This event is sold out.
-
-  - if @event.closed?
-    .alert.alert-warning 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'
-
-  = card do
-    - if @event.file.attached?
-      = image_tag(@event.file)
-
+= 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)
+
+  - 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('%F %R')
+
+    - 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
-
-    %table.table.effective-events-table
-      %tbody
-        %tr
-          %th Dates
-          %td
-            Starts: #{@event.start_at&.strftime('%F %R')}
-            %br
-            Ends: #{@event.end_at&.strftime('%F %R')}
-
-        %tr
-          %th Registration Closes
-          %td= @event.registration_end_at.strftime('%F %R')
-
-        %tr
-          %th Early Bird
-          %td
-            Status: #{@event.early_bird_status}
-            %br
-            Ends: #{@event.early_bird_end_at&.strftime('%F %R')}
-
-        %tr
-          %th Tickets
-          %td
-            %ul.pl-3
-              - @event.event_tickets.each do |ticket|
-                %li= "#{ticket} (#{price_to_currency(ticket.price)})"
-
-        - if @event.event_products.present?
-          %tr
-            %th Add-ons
-            %td
-              %ul.pl-0
-                - @event.event_products.each do |product|
-                  %li= "#{product} (#{price_to_currency(product.price)})"

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails