effective_events 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03792a86651968a66d776678245154a7e1315bd4927a5f6803cf822831b11b54'
-  data.tar.gz: fff7d1415683e67b7982fd82bfdfa0f258e10451ea1645f00ce2b7a86fd86abd
+  metadata.gz: 35aaa94c6a057b65a26c73faa1a5b37babb0f85d69a9737b4eb1d62789011847
+  data.tar.gz: c446a129b0aa52abd78c877cc84023259690e39466d45f887f322adc7b7ab237
 SHA512:
-  metadata.gz: a760d7c086e811c0bd6f64f36e2bcddefd725c86c533f922448f8242f0c60edade3dbe7c3f96b07b034200d19f99efd3cd161b1de460eed9e24ba26965f569ba
-  data.tar.gz: 7157dfd23817e90be3102d6ce494b027f392b94568557dccf85b99c0622150e33311db116d256f3a9996e7fff8fea4d2fb6d9c08bd5eb9438ee00b889de9b18e
+  metadata.gz: c238a2e8a33362cbd2ff6afcfac069674b4c0a28b6cf81cef07ce3b1d57ef1867de18a2026af24d00eef3c6957196c47b9211910143fafc08c37621ebc7359c0
+  data.tar.gz: 6a9677f0ecf59a10ac7ac562d8d9651180310395aceecd0e7f8268a72bbec5deda07857c441a80aae6bd05fc7173b7d68ecfb081cfe459f4f607a1a2a36f45f7

data/README.md

@@ -99,6 +99,9 @@ if user.admin?
 end
 ```
 
+## Calendar
+`effective_events` comes with an integration with `simple_calendar` where events can be displayed in calendars. You can override its views using the command `rails g simple_calendar:views` - check out [Customizing Views](https://github.com/excid3/simple_calendar#customizing-the-calendar) for more information.
+
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)

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

@@ -0,0 +1,25 @@
+.effective__simple-calendar {
+  .calendar-heading {
+    background: $gray-200;
+  }
+
+  .calendar-arrow {
+    font-size: 10px;
+
+    a {
+      text-decoration: none;
+    }
+  }
+
+  .table th {
+    border: 0px;
+  }
+
+  .table td {
+    aspect-ratio: 1 / 1;
+    width: 2rem;
+    height: 2rem;
+    vertical-align: middle;
+    border: 1px solid $gray-200;
+  }
+}

data/app/assets/stylesheets/effective_events.scss

@@ -1 +1,2 @@
 @import 'effective_events/base';
+@import 'effective_events/simple_calendar';

data/app/models/effective/event.rb

@@ -2,6 +2,25 @@
 
 module Effective
   class Event < ActiveRecord::Base
+    if defined?(PgSearch)
+      include PgSearch::Model
+
+      multisearchable against: [
+                        :title,
+                        :slug,
+                      ],
+                      associated_against: {
+                        rich_texts: [:body],
+                      },
+                      using: {
+                        trigram: {},
+                        tsearch: {
+                          highlight: true,
+                        }
+                      }
+
+    end
+
     has_many :event_tickets, -> { EventTicket.sorted }, inverse_of: :event, dependent: :destroy
     accepts_nested_attributes_for :event_tickets, allow_destroy: true
 
@@ -32,6 +51,7 @@ module Effective
 
     acts_as_slugged
     log_changes if respond_to?(:log_changes)
+    acts_as_tagged if respond_to?(:acts_as_tagged)
     acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
 
     self.table_name = EffectiveEvents.events_table_name.to_s
@@ -214,5 +234,9 @@ module Effective
       duplicate.tap { |event| event.save! }
     end
 
+    def start_time
+      start_at
+    end
+
   end
 end

data/app/views/admin/events/_form_event.html.haml

@@ -5,6 +5,9 @@
   - if categories.present?
     = f.select :category, categories, hint: 'optional category'
 
+  - if event.class.respond_to?(:acts_as_tagged?)
+    = render 'effective/tags/fields', f: f
+
   = f.datetime_field :published_at, label: 'Publish date', hint: 'When should this be displayed on the website.'
   = f.check_box :draft, hint: 'Save this event as a draft. It will not be accessible on the website.'
 

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

@@ -1,4 +1,5 @@
 = render 'layout' do
+
   -# render_datatable(@datatable)
 
   .mb-4= render('effective/events/categories')
@@ -9,8 +10,16 @@
   - if @event_search.present? && results.length == 0
     .alert.alert-info There are no results for your search. Please try again.
 
-  -# This renders effective/events/event
-  = render(results)
+  .row
+    .col-md-3
+      = month_calendar(events: @events) do |date, events|
+        - if events.any? { |event| event.start_at.to_date == date }
+          = date.day
+        - else
+           
+    .col-md-9
+      -# This renders effective/events/event
+      = render(results)
 
   %nav.d-flex.justify-content-center
     = bootstrap_paginate(results, per_page: @event_search.per_page)

data/app/views/simple_calendar/_month_calendar.html.haml

@@ -0,0 +1,20 @@
+.effective__simple-calendar
+  .calendar-heading.d-flex.justify-content-between.align-items-center.mb-2.py-1
+    - date = params[:start_date].presence.try(:to_date) || Date.current
+    .calendar-arrow.p-1= link_to t('simple_calendar.previous', default: 'Previous').html_safe, effective_events.events_path(start_date: date - 1.month)
+    %span.calendar-title.text-uppercase.text-primary.font-weight-bold= t('date.month_names')[start_date.month]
+    .calendar-arrow.p-1= link_to t('simple_calendar.next', default: 'Next').html_safe, effective_events.events_path(start_date: date + 1.month)
+
+  %table.table.table-striped.table-sm
+    %thead
+      %tr.text-center.text-primary.font-weight-normal.py-2
+        - date_range.slice(0, 7).each do |day|
+          %th.px-1= t('date.abbr_day_names')[day.wday]
+
+    %tbody
+      - date_range.each_slice(7) do |week|
+        %tr
+          - week.each do |day|
+            - content = capture_haml(day, sorted_events.fetch(day, []), &passed_block)
+            = content_tag :td, class: content.to_i > 0 && 'text-center bg-primary font-weight-bold font-size-small text-white' do
+              = content

data/config/locales/en.yml

@@ -0,0 +1,15 @@
+---
+en:
+  simple_calendar:
+    previous: "◀"
+    next: "▶"
+
+  date:
+    abbr_day_names:
+    - S
+    - M
+    - T
+    - W
+    - T
+    - F
+    - S

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.6.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,7 @@ files:
 - app/assets/javascripts/effective_events/base.js
 - app/assets/stylesheets/effective_events.scss
 - app/assets/stylesheets/effective_events/base.scss
+- app/assets/stylesheets/effective_events/simple_calendar.scss
 - app/controllers/admin/event_addons_controller.rb
 - app/controllers/admin/event_notifications_controller.rb
 - app/controllers/admin/event_products_controller.rb
@@ -260,7 +261,9 @@ files:
 - app/views/effective/events/index.html.haml
 - app/views/effective/events/show.html.haml
 - app/views/effective/events_mailer/event_registrant_purchased.liquid
+- app/views/simple_calendar/_month_calendar.html.haml
 - config/effective_events.rb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/01_create_effective_events.rb.erb
 - db/seeds.rb
@@ -289,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Event registrations, tickets and products