effective_pages 3.3.2 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3ef36f0fae90cb4172cbc5541abbac53d632e611024fc1b3febd6fc8476cafd
-  data.tar.gz: ed784ec8c9575641c5803450d5664b5d11cf90aab89d73163c4d86e28448f66e
+  metadata.gz: 33c7720dd14a75e375dffed5ae8c21e7390cfd93727886785c72d574fbe23376
+  data.tar.gz: 40ab7326b18be3a3a728461f604c4e2cfd827d75bacef55b2cd7bada79f5d513
 SHA512:
-  metadata.gz: 6afc63a6a120d7b67d872ab985f990d0db4117b12a7e0ae1bf79a2451c00fdcf89e18e8c2a3c58d22344f3a0190e0fc9cf11589b11c01e57f8fbf7798fee12cb
-  data.tar.gz: 38786d89a2341773f87bb122d9b64f26e7778d23c97dee10ee04d1b846b09331e9266acc7b156e6e8bd62dd249d58af64d465454d564d8cca958688ca8ca753c
+  metadata.gz: 4b9359a7b5c76c694ded55b524981df67e85f01e080c6ca2ae17c895762a52438d72d2c3b1ee508ff89d370eda0b921ea526af6b53800a353a8ad4ac5f79228e
+  data.tar.gz: 5ccdeb32c10e7920fa017a4f6d0d5ca8ba6416290de99d202a4f972092e20b3e18cb53dc4c1d26d6e38aafbeae6135073382d0029a9717d6aae61c99112adf89

data/README.md

@@ -172,12 +172,17 @@ All authorization checks are handled via the effective_resources gem found in th
 The permissions you actually want to define are as follows (using CanCan):
 
 ```ruby
-can [:show], Effective::Page
+can :index, Effective::Page
+can(:show, Effective::Page) { |page| page.roles_permit?(user) }
 
 if user.is?(:admin)
-  can :manage, Effective::Page
-  can :manage, Effective::Menu
-  can :admin, :effective_pages # Can access the admin screens
+  can :admin, :effective_pages
+
+  can(crud, Efective::Page)
+  can(crud - [:new, :create, :destroy], Effective::PageSection)
+
+  can(crud - [:destroy], Effective::PageBanner)
+  can(:destroy, Effective::PageBanner) { |pb| pb.pages.length == 0 }
 end
 ```
 

data/app/controllers/admin/carousel_items_controller.rb

@@ -0,0 +1,15 @@
+module Admin
+  class CarouselItemsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_pages) }
+
+    include Effective::CrudController
+
+    page_title 'Carousels'
+
+    def permitted_params
+      params.require(:effective_carousel_item).permit!
+    end
+
+  end
+end

data/app/controllers/admin/menus_controller.rb

@@ -3,8 +3,11 @@ module Admin
     before_action(:authenticate_user!) if defined?(Devise)
     before_action { EffectiveResources.authorize!(self, :admin, :effective_pages) }
 
+
     include Effective::CrudController
 
+    page_title 'Menus'
+
     resource_scope -> { Effective::Page.all }
 
     if (config = EffectivePages.layout)

data/app/controllers/admin/page_banners_controller.rb

@@ -0,0 +1,13 @@
+module Admin
+  class PageBannersController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_pages) }
+
+    include Effective::CrudController
+
+    def permitted_params
+      params.require(:effective_page_banner).permit!
+    end
+
+  end
+end

data/app/datatables/effective_carousel_items_datatable.rb

@@ -0,0 +1,35 @@
+class EffectiveCarouselItemsDatatable < Effective::Datatable
+
+  datatable do
+    reorder :position
+
+    col :id, visible: false
+    col :updated_at, visible: false
+
+    col :carousel
+    col :title
+
+    col :title
+    col :rich_text_body, label: 'Content'
+
+    col :file, label: 'Image' do |carousel_item|
+      image_tag(carousel_item.file, style: 'max-height: 100px;')
+    end
+
+    col :link_label, visible: false
+    col :link_url, visible: false
+    col :caption, visible: false
+
+    actions_col
+  end
+
+  collection do
+    Effective::CarouselItem.deep.all.where(carousel: carousel)
+  end
+
+  def carousel
+    carousel = EffectivePages.carousels.find { |carousel| carousel.to_s == attributes[:carousel].to_s }
+    carousel || raise("unexpected carousel: #{attributes[:carousel] || 'none'}")
+  end
+
+end

data/app/datatables/effective_page_banners_datatable.rb

@@ -0,0 +1,25 @@
+class EffectivePageBannersDatatable < Effective::Datatable
+
+  datatable do
+    order :name, :asc
+    length :all
+
+    col :id, visible: false
+    col :updated_at, visible: false
+
+    col :name
+
+    col :file
+    col :caption
+
+    col :rich_text_body, visible: false
+    col :pages
+
+    actions_col
+  end
+
+  collection do
+    Effective::PageBanner.deep.all
+  end
+
+end

data/app/datatables/effective_page_sections_datatable.rb

@@ -8,13 +8,13 @@ class EffectivePageSectionsDatatable < Effective::Datatable
     col :updated_at, visible: false
 
     col :name
-    col :hint
 
     col :title
     col :rich_text_body
 
-    col :files
+    col :file
 
+    col :hint, visible: false
     col :link_label, visible: false
     col :link_url, visible: false
     col :caption, visible: false

data/app/datatables/effective_pages_datatable.rb

@@ -33,6 +33,8 @@ class EffectivePagesDatatable < Effective::Datatable
     col :menu_parent, search: { collection: admin_menu_parent_collection(), grouped: true }
     col :menu_position, visible: false
 
+    col :page_banner
+
     col :authenticate_user, visible: false
     col :roles, visible: false
 

data/app/helpers/effective_carousels_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module EffectiveCarouselsHelper
+
+  def render_carousel(name, options = {}, &block)
+    name = name.to_s
+    carousel = Array(EffectivePages.carousels).find { |carousel| carousel.to_s == name }
+
+    if carousel.blank?
+      raise("unable to find carousel #{name}. Please add it to config/initializers/effective_pages.rb")
+    end
+
+    carousel_items = Effective::CarouselItem.sorted.where(carousel: carousel)
+    return if carousel_items.blank?
+
+    if block_given?
+      yield(carousel_items); nil
+    else
+      render('effective/carousels/carousel', carousel: carousel, carousel_items: carousel_items, carousel_options: options)
+    end
+
+  end
+
+end

data/app/helpers/effective_page_banners_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module EffectivePageBannersHelper
+
+  def render_page_banner(page, opts = {}, &block)
+    raise('expected a page') unless page.kind_of?(Effective::Page)
+
+    # Do nothing if page.banner is false
+    return unless page.banner?
+
+    page_banner = page.page_banner
+    page_banner ||= Effective::PageBanner.random.first if page.banner_random?
+
+    raise("unable to find page banner for page #{page}") unless page_banner.present?
+
+    if block_given?
+      yield(page_banner); nil
+    else
+      image_tag(page_banner.file, alt: page_banner.caption, **opts)
+    end
+  end
+
+end

data/app/models/effective/carousel_item.rb

@@ -0,0 +1,73 @@
+# Carousels are configured in the config/initializers/effective_pages.rb
+# Kind of like a menu, they are predefined and cannot be edited by admin
+# The carousel items belong to a carousel through the string field
+module Effective
+  class CarouselItem < ActiveRecord::Base
+    attr_accessor :current_user
+
+    # For the body
+    has_many_rich_texts
+
+    # For the image attachment
+    has_one_attached :file
+
+    log_changes if respond_to?(:log_changes)
+
+    self.table_name = EffectivePages.carousel_items_table_name.to_s
+
+    effective_resource do
+      carousel          :string  # The hardcoded carousel I render underneath
+
+      title             :string
+      caption           :string
+
+      link_label        :string
+      link_url          :string
+
+      position          :integer
+
+      timestamps
+    end
+
+    scope :deep, -> { with_attached_file.includes(:rich_texts) }
+    scope :sorted, -> { order(:position, :id) }
+
+    before_validation(if: -> { carousel.present? }) do
+      self.position ||= (self.class.where(carousel: carousel).pluck(:position).compact.max || -1) + 1
+    end
+
+    validates :carousel, presence: true
+
+    validates :title, presence: true, length: { maximum: 255 }
+    validates :file, presence: true
+    validates :position, presence: true
+
+    validates :link_url, presence: true, if: -> { link_label.present? }
+    validates :link_url, absence: true, if: -> { link_label.blank? }
+
+    validate(if: -> { carousel.present? && EffectivePages.carousels? }) do
+      unless (carousels = EffectivePages.carousels).find { |c| c.to_s == carousel.to_s }.present?
+        self.errors.add(:carousel, "must be one of #{carousels.to_sentence}")
+      end
+    end
+
+    validate(if: -> { file.attached? }) do
+      self.errors.add(:file, 'must be an image') unless file.image?
+    end
+
+    def to_s
+      persisted? ? [carousel, number].join(' ') : 'carousel item'
+    end
+
+    # As per has_many_rich_texts
+    def body
+      rich_text_body
+    end
+
+    def number
+      '#' + position.to_s
+    end
+
+  end
+
+end

data/app/models/effective/page.rb

@@ -3,6 +3,8 @@ module Effective
     attr_accessor :current_user
     attr_accessor :menu_root_level
 
+    belongs_to :page_banner, optional: true
+
     # These parent / children are for the menu as well
     belongs_to :menu_parent, class_name: 'Effective::Page', optional: true
 
@@ -28,7 +30,7 @@ module Effective
 
       slug              :string
 
-      # Menu stuff
+      # Menus
       menu              :boolean        # Should this be displayed on the menu at all?
       menu_name         :string         # When I'm a root level item, this is the menu I render underneath
       menu_group        :string         # Used for design. Group by menu_group to display full dropdowns.
@@ -37,6 +39,10 @@ module Effective
       menu_url          :string         # Redirect to this url instead of the page url
       menu_position     :integer        # Position in the menu
 
+      # Banners
+      banner            :boolean        # Should we display a banner?
+      banner_random     :boolean        # Display a random banner
+
       # Access
       roles_mask        :integer
       authenticate_user :boolean
@@ -44,31 +50,7 @@ module Effective
       timestamps
     end
 
-    before_validation(if: -> { menu? && menu_position.blank? }) do
-      self.menu_position = (self.class.where(menu_parent: menu_parent).maximum(:menu_position) || -1) + 1
-    end
-
-    validate(if: -> { menu_url.present? }) do
-      unless menu_url.start_with?('http://') || menu_url.start_with?('https://') || menu_url.start_with?('/')
-        self.errors.add(:menu_url, "must start with http(s):// or /")
-      end
-    end
-
-    validates :title, presence: true, length: { maximum: 255 }
-    validates :meta_description, presence: true, length: { maximum: 150 }
-
-    validates :layout, presence: true
-    validates :template, presence: true
-
-    validates :menu_name, presence: true, if: -> { menu_root? && EffectivePages.menus.present? }
-
-    # Doesn't make sense for a top level item to have a menu group
-    validates :menu_group, absence: true, if: -> { menu_root? && EffectivePages.menus.present? }
-
-    # validates :menu_position, if: -> { menu? },
-    #   presence: true, uniqueness: { scope: [:menu_name, :menu_parent_id] }
-
-    scope :deep, -> { includes(:menu_parent, menu_children: :menu_parent) }
+    scope :deep, -> { includes(:page_banner, :menu_parent, menu_children: :menu_parent) }
 
     scope :draft, -> { where(draft: true) }
     scope :published, -> { where(draft: false) }
@@ -93,6 +75,34 @@ module Effective
       published.where(menu: false).or(published.where(menu: true).where.not(id: menu_root_with_children))
     }
 
+    before_validation(if: -> { menu? && menu_position.blank? }) do
+      self.menu_position = (self.class.where(menu_parent: menu_parent).maximum(:menu_position) || -1) + 1
+    end
+
+    validate(if: -> { menu_url.present? }) do
+      unless menu_url.start_with?('http://') || menu_url.start_with?('https://') || menu_url.start_with?('/')
+        self.errors.add(:menu_url, "must start with http(s):// or /")
+      end
+    end
+
+    validates :title, presence: true, length: { maximum: 255 }
+    validates :meta_description, presence: true, length: { maximum: 150 }
+
+    validates :layout, presence: true
+    validates :template, presence: true
+
+    validates :menu_name, presence: true, if: -> { menu_root? && EffectivePages.menus.present? }
+
+    # Doesn't make sense for a top level item to have a menu group
+    validates :menu_group, absence: true, if: -> { menu_root? && EffectivePages.menus.present? }
+
+    validate(if: -> { banner? && EffectivePages.banners? }) do
+      unless (page_banner.present? ^ banner_random?) # xor
+        self.errors.add(:page_banner_id, "please select a page banner or random")
+        self.errors.add(:banner_random, "please select a page banner or random")
+      end
+    end
+
     def to_s
       title
     end

data/app/models/effective/page_banner.rb

@@ -0,0 +1,49 @@
+# Banners can be
+module Effective
+  class PageBanner < ActiveRecord::Base
+    attr_accessor :current_user
+
+    # Not used
+    has_many_rich_texts
+
+    # Can be displayed on multiple pages
+    has_many :pages
+
+    # For the image attachment
+    has_one_attached :file
+
+    log_changes if respond_to?(:log_changes)
+
+    self.table_name = EffectivePages.page_banners_table_name.to_s
+
+    effective_resource do
+      name              :string       # Unique name of this page banner. Just used for reference.
+
+      caption           :string
+
+      timestamps
+    end
+
+    scope :deep, -> { with_attached_file.includes(:rich_texts) }
+    scope :sorted, -> { order(:name) }
+    scope :random, -> { order('RANDOM()') }
+
+    validates :name, presence: true, uniqueness: true, length: { maximum: 255 }
+    validates :file, presence: true
+
+    validate(if: -> { file.attached? }) do
+      self.errors.add(:file, 'must be an image') unless file.image?
+    end
+
+    def to_s
+      name.presence || 'page banner'
+    end
+
+    # As per has_many_rich_texts
+    def body
+      rich_text_body
+    end
+
+  end
+
+end

data/app/models/effective/page_section.rb

@@ -1,10 +1,10 @@
+# Page sections are only created by seeds / a developer
+# They are referenced by name
+# The admin user can only edit/update content
 module Effective
   class PageSection < ActiveRecord::Base
     attr_accessor :current_user
 
-    # Not used
-    belongs_to :owner, polymorphic: true, optional: true
-
     has_many_rich_texts
     has_one_attached :file
 
@@ -13,7 +13,8 @@ module Effective
     self.table_name = EffectivePages.page_sections_table_name.to_s
 
     effective_resource do
-      name              :string       # Unique name of this page section
+      name              :string       # Set by developer. The unique name of this page section
+      hint              :text         # Set by developer. A hint to display to user.
 
       title             :string
       caption           :string
@@ -21,8 +22,6 @@ module Effective
       link_label        :string
       link_url          :string
 
-      hint              :text
-
       timestamps
     end
 

data/app/views/admin/carousel_items/_form.html.haml

@@ -0,0 +1,7 @@
+= tabs do
+  = tab 'Carousel Item' do
+    = render '/admin/carousel_items/form_carousel_item', carousel_item: carousel_item
+
+  - if carousel_item.persisted?
+    = tab 'Logs' do
+      = render_datatable(carousel_item.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/carousel_items/_form_carousel_item.html.haml

@@ -0,0 +1,21 @@
+= effective_form_with(model: [:admin, carousel_item], engine: true) do |f|
+  - if (carousels = EffectivePages.carousels).length > 1
+    = f.select :carousel, carousels, label: 'Carousel item in this carousel'
+  - else
+    = f.hidden_field :carousel, value: carousels.first
+
+  = f.text_field :title
+
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :rich_text_body, label: 'Body'
+  - else
+    = f.rich_text_area :rich_text_body, label: 'Body'
+
+  .row
+    .col= f.text_field :link_label
+    .col= f.url_field :link_url
+
+  = f.file_field :file, label: 'Image attachment', hint: EffectivePages.carousels_hint_text
+  = f.text_field :caption, hint: 'Optional'
+
+  = effective_submit(f)

data/app/views/admin/carousel_items/index.html.haml

@@ -0,0 +1,5 @@
+- EffectivePages.carousels.each do |carousel|
+  .bg-white.my-5.p-3.rounded
+    %h3.mb-0 #{carousel.to_s.titleize} Carousel
+    - datatable = EffectiveCarouselItemsDatatable.new(carousel: carousel)
+    = render_datatable(datatable, simple: true, inline: true)

data/app/views/admin/menus/index.html.haml

@@ -1,11 +1,5 @@
-%h1= @page_title
-
-%p
-  Click Reorder to drag & drop reorder menu items.
-  Edit an item to reorder its children items.
-
 - EffectivePages.menus.each do |menu|
-  %h3 #{menu.to_s.titleize} Menu
-  - datatable = EffectivePagesMenuDatatable.new(menu: menu)
-  = render_datatable(datatable, simple: true, inline: true)
-  %hr.my-5
+  .bg-white.my-5.p-3.rounded
+    %h3.mb-0 #{menu.to_s.titleize} Menu
+    - datatable = EffectivePagesMenuDatatable.new(menu: menu)
+    = render_datatable(datatable, simple: true, inline: true)

data/app/views/admin/page_banners/_form.html.haml

@@ -0,0 +1,7 @@
+= tabs do
+  = tab 'Page Banner' do
+    = render '/admin/page_banners/form_page_banner', page_banner: page_banner
+
+  - if page_banner.persisted?
+    = tab 'Logs' do
+      = render_datatable(page_banner.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/page_banners/_form_page_banner.html.haml

@@ -0,0 +1,11 @@
+= effective_form_with(model: [:admin, page_banner], engine: true) do |f|
+  = f.text_field :name, hint: 'The name of this banner, used only for reference'
+  = f.file_field :file, label: 'Image attachment', hint: EffectivePages.banners_hint_text
+  = f.text_field :caption, hint: 'Optional. Displayed alongside the image'
+
+  -# - if defined?(EffectiveArticleEditor)
+  -#   = f.article_editor :rich_text_body, label: 'Body', hint: 'The main content'
+  -# - else
+  -#   = f.rich_text_area :rich_text_body, label: 'Body', hint: 'The main content'
+
+  = effective_submit(f)

data/app/views/admin/page_sections/_form_page_section.html.haml

@@ -1,11 +1,12 @@
 = effective_form_with(model: [:admin, page_section], engine: true) do |f|
   - if f.object.new_record?
-    = f.text_field :name, hint: 'The name of this region must be unique'
+    = f.text_field :name, hint: 'The name of this page section'
   - else
     = f.static_field :name
 
   - if f.object.hint.present?
-    .mb-4= f.object.hint.html_safe
+    %h4.mt-0 Instructions
+    %p= f.object.hint.html_safe
 
   = f.text_field :title
 
@@ -18,8 +19,7 @@
     .col= f.text_field :link_label
     .col= f.url_field :link_url
 
-  = f.file_field :file, label: 'Attachment'
-
-  = f.text_field :caption
+  = f.file_field :file, label: 'Attachment', hint: 'Upload an image to display on this page section'
+  = f.text_field :caption, hint: 'Displayed alongside the image'
 
   = effective_submit(f)

data/app/views/admin/pages/_form_page.html.haml

@@ -23,6 +23,17 @@
     - current_url = (effective_pages.page_url(f.object) rescue nil)
     = f.text_field :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
 
+  - if EffectivePages.banners?
+    = f.check_box :banner, label: 'Yes, display a page banner on this page'
+
+    = f.show_if(:banner, true) do
+      = card('Page Banner') do
+        %p.text-muted Please visit #{link_to('Page Banners', effective_pages.admin_page_banners_path)} to add or update the page banners.
+
+        = f.select :page_banner_id, Effective::PageBanner.sorted.all, label: 'Display this page banner'
+        %p - or -
+        = f.check_box :banner_random, label: 'Display a random page banner each time the page is refreshed'
+
   = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
 
   - if f.object.persisted? && f.object.menu_root_with_children?

data/app/views/effective/carousels/_carousel.html.haml

@@ -0,0 +1,27 @@
+- uid = "effective-carousel-#{carousel}-#{Time.zone.now.to_i}"
+- options = carousel_options
+
+- raise('expected one or more carousel items') unless carousel_items.present?
+
+%div.carousel.slide{id: uid, 'data-ride': 'carousel', **options}
+  %ol.carousel-indicators
+    - carousel_items.each_with_index do |item, index|
+      %li{'data-target': '#' + uid, 'data-slide-to': index, class: ('active' if index == 0)}
+
+  %div.carousel-inner
+    - carousel_items.each_with_index do |item, index|
+      %div.carousel-item{class: ('active' if index == 0)}
+        - if item.caption.blank?
+          = image_tag(item.file, class: 'd-block w-100', alt: "Slide #{index+1}")
+        - else
+          = image_tag(item.file, alt: item.caption)
+          %div.carousel-caption.d-none.d-md-block
+            %p= item.caption
+
+  %a.carousel-control-prev{href: '#' + uid, role: 'button', 'data-slide': 'prev'}
+    %span.carousel-control-prev-icon{'aria-hidden': true}
+    %span.sr-only Previous
+
+  %a.carousel-control-next{href: '#' + uid, role: 'button', 'data-slide': 'next'}
+    %span.carousel-control-next-icon{'aria-hidden': true}
+    %span.sr-only Next

data/config/effective_pages.rb

@@ -1,6 +1,8 @@
 EffectivePages.setup do |config|
   config.pages_table_name = :pages
   config.page_sections_table_name = :page_sections
+  config.page_banners_table_name = :page_banners
+  config.carousel_items_table_name = :carousel_items
 
   # The menu names a page can belong to
   config.menus = [:main, :footer]
@@ -57,4 +59,16 @@ EffectivePages.setup do |config|
   # Only 2 or 3 are supported right now
   config.max_menu_depth = 2
 
+  # Page Banners
+  # Allow a page banner to be selected on the Admin::Pages#edit screen
+  # Banners can be CRUD by the admin
+  config.banners = false
+  config.banners_hint_text = 'Hint text that includes required image dimensions'
+
+  # Page Carousels
+  # The menu names a page can belong to
+  config.carousels = false
+  # config.carousels = [:home, :secondary]
+  config.carousels_hint_text = 'Hint text that includes required image dimensions'
+
 end

data/config/routes.rb

@@ -4,7 +4,9 @@ EffectivePages::Engine.routes.draw do
   namespace :admin do
     resources :pages, except: [:show]
     resources :page_sections, only: [:index, :edit, :update]
+    resources :page_banners, except: [:show]
     resources :menus, only: [:index]
+    resources :carousel_items, except: [:show]
   end
 
   scope module: 'effective' do

data/db/migrate/01_create_effective_pages.rb.erb

@@ -1,6 +1,8 @@
 class CreateEffectivePages < ActiveRecord::Migration[4.2]
   def self.up
     create_table <%= @pages_table_name %> do |t|
+      t.integer :page_banner_id
+
       t.string :title
       t.string :meta_description
 
@@ -25,17 +27,27 @@ class CreateEffectivePages < ActiveRecord::Migration[4.2]
       t.string :menu_url
       t.integer :menu_position
 
+      t.boolean :banner, default: false
+      t.boolean :banner_random, default: false
+
       t.datetime :updated_at
       t.datetime :created_at
     end
 
     add_index <%= @pages_table_name %>, :slug, :unique => true
 
-    create_table <%= @page_sections_table_name %> do |t|
-      t.string :owner_type
-      t.integer :owner_id
+    create_table <%= @page_banners_table_name %> do |t|
+      t.string :name
+      t.string :caption
+
+      t.timestamps
+    end
+
+    add_index <%= @page_banners_table_name %>, :name, :unique => true
 
+    create_table <%= @page_sections_table_name %> do |t|
       t.string :name
+      t.text :hint
 
       t.string :title
       t.string :caption
@@ -43,18 +55,33 @@ class CreateEffectivePages < ActiveRecord::Migration[4.2]
       t.string :link_label
       t.string :link_url
 
-      t.text :hint
-
       t.datetime :updated_at
       t.datetime :created_at
     end
 
     add_index <%= @page_sections_table_name %>, :name, :unique => true
+
+    create_table <%= @carousel_items_table_name %> do |t|
+      t.string :carousel
+
+      t.string :title
+      t.string :caption
+
+      t.string :link_label
+      t.string :link_url
+
+      t.integer :position
+
+      t.timestamps
+    end
+
   end
 
   def self.down
     drop_table <%= @pages_table_name %>
+    drop_table <%= @page_banners_table_name %>
     drop_table <%= @page_sections_table_name %>
+    drop_table <%= @carousel_items_table_name %>
   end
 
 end

data/lib/effective_pages/engine.rb

@@ -7,7 +7,9 @@ module EffectivePages
       app.config.to_prepare do
         ActiveSupport.on_load :action_controller_base do
           helper EffectivePagesHelper
+          helper EffectiveCarouselsHelper
           helper EffectivePageSectionsHelper
+          helper EffectivePageBannersHelper
           helper EffectiveMenusHelper
         end
       end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.3.2'.freeze
+  VERSION = '3.4.1'.freeze
 end

data/lib/effective_pages.rb

@@ -7,12 +7,18 @@ require 'effective_pages/version'
 module EffectivePages
   def self.config_keys
     [
-      :pages_table_name, :page_sections_table_name,
+      :pages_table_name, :page_sections_table_name, :page_banners_table_name, :carousel_items_table_name,
       :pages_path, :excluded_pages, :layouts_path, :excluded_layouts,
       :site_og_image, :site_og_image_width, :site_og_image_height,
       :site_title, :site_title_suffix, :fallback_meta_description,
       :silence_missing_page_title_warnings, :silence_missing_meta_description_warnings, :silence_missing_canonical_url_warnings,
-      :use_effective_roles, :menus, :layout, :max_menu_depth
+      :use_effective_roles, :layout, :max_menu_depth, :banners_hint_text, :carousels_hint_text,
+
+      # Booleans
+      :banners,
+
+      # Hashes
+      :menus, :carousels
     ]
   end
 
@@ -49,4 +55,16 @@ module EffectivePages
     depth
   end
 
+  def self.banners?
+    !!banners
+  end
+
+  def self.carousels?
+    carousels.kind_of?(Array)
+  end
+
+  def self.menus?
+    menus.kind_of?(Array)
+  end
+
 end

data/lib/generators/effective_pages/install_generator.rb

@@ -22,6 +22,9 @@ module EffectivePages
       def create_migration_file
         @pages_table_name = ':' + EffectivePages.pages_table_name.to_s
         @page_sections_table_name = ':' + EffectivePages.page_sections_table_name.to_s
+        @page_banners_table_name = ':' + EffectivePages.page_banners_table_name.to_s
+        @carousel_items_table_name = ':' + EffectivePages.carousel_items_table_name.to_s
+
         migration_template ('../' * 3) + 'db/migrate/01_create_effective_pages.rb.erb', 'db/migrate/create_effective_pages.rb'
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,19 +75,32 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- app/controllers/admin/carousel_items_controller.rb
 - app/controllers/admin/menus_controller.rb
+- app/controllers/admin/page_banners_controller.rb
 - app/controllers/admin/page_sections_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/effective/pages_controller.rb
+- app/datatables/effective_carousel_items_datatable.rb
+- app/datatables/effective_page_banners_datatable.rb
 - app/datatables/effective_page_sections_datatable.rb
 - app/datatables/effective_pages_datatable.rb
 - app/datatables/effective_pages_menu_datatable.rb
+- app/helpers/effective_carousels_helper.rb
 - app/helpers/effective_menus_helper.rb
+- app/helpers/effective_page_banners_helper.rb
 - app/helpers/effective_page_sections_helper.rb
 - app/helpers/effective_pages_helper.rb
+- app/models/effective/carousel_item.rb
 - app/models/effective/page.rb
+- app/models/effective/page_banner.rb
 - app/models/effective/page_section.rb
+- app/views/admin/carousel_items/_form.html.haml
+- app/views/admin/carousel_items/_form_carousel_item.html.haml
+- app/views/admin/carousel_items/index.html.haml
 - app/views/admin/menus/index.html.haml
+- app/views/admin/page_banners/_form.html.haml
+- app/views/admin/page_banners/_form_page_banner.html.haml
 - app/views/admin/page_sections/_form.html.haml
 - app/views/admin/page_sections/_form_page_section.html.haml
 - app/views/admin/pages/_additional_fields.html.haml
@@ -96,6 +109,7 @@ files:
 - app/views/admin/pages/_form_menu.html.haml
 - app/views/admin/pages/_form_page.html.haml
 - app/views/admin/pages/_rich_text_areas.html.haml
+- app/views/effective/carousels/_carousel.html.haml
 - app/views/effective/pages/_menu.html.haml
 - app/views/effective/pages/_page_menu.html.haml
 - config/effective_pages.rb