effective_polls 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d305ba395a3d2414ebca82cd907b4e15831390d406bc963f491ebb982c76d3
-  data.tar.gz: 46418fe6dc4c690c64e29800ce3cc3710ece9375e057f2fbdf2f47521b637bde
+  metadata.gz: 6a33a47c986c2f82da08218e53437b46481c94bfe71e725857e718be7bdccb1e
+  data.tar.gz: 48ca1df31f1cda3895a080e80b2b055b1adffca83bbb203868ee5d5b90d28d89
 SHA512:
-  metadata.gz: '0379c829ce46c31baa169a070c7023d2ae4f013770667725d14f9a309b1a940cf474afef85e1717de3ffad9cdbe114e1ed676895013ff865eee3afe4aeed8d58'
-  data.tar.gz: 8ff57a27c6baae02974c31c43d2067759b895f1f90fdf258c573b606acb6fa5ee26871f52b6ffda86713b63bc96785d1138e74d776c6f595b5264e64e649ae5c
+  metadata.gz: 4cd220d1b2967235d42c9dbfd25b8ba4fb004e1f65e71eb4351e4cb483ca7f7f3f11972868a4a33d783f5b0243e42a02e3c90881f1f2d8b769d3daa1a8ce8cdb
+  data.tar.gz: 12a61a54e03a10160cfd379934441406c39f360b8c76e88073778e9f695850fa86e4102e2fa13fc948e6970c5e63671e3f151203f96d10d3e30c582be37261d4

data/README.md

@@ -75,14 +75,8 @@ if user.admin?
 
   can :manage, Effective::Poll
   can :manage, Effective::PollNotification
-
-  can :index, Effective::PollQuestion
+  can :manage, Effective::PollQuestion
   can :index, Admin::EffectivePollResultsDatatable
-
-  can([:new, :create, :edit, :update, :destroy], Effective::PollQuestion) do |pq|
-    pq.poll.present? && !pq.poll.started?
-  end
-
 end
 ```
 

data/app/datatables/admin/effective_polls_datatable.rb

@@ -1,15 +1,15 @@
 class Admin::EffectivePollsDatatable < Effective::Datatable
   filters do
+    scope :all
     scope :upcoming
     scope :available
     scope :completed
-    scope :all
   end
 
   datatable do
     order :start_at, :desc
 
-    col :id, visible: false
+    col :token, visible: false
     col :created_at, visible: false
     col :updated_at, visible: false
 

data/app/mailers/effective/polls_mailer.rb

@@ -1,22 +1,70 @@
 module Effective
-  class PollsMailer < ActionMailer::Base
-    default from: EffectivePolls.mailer[:default_from]
+  class PollsMailer < EffectivePolls.mailer_class
     layout EffectivePolls.mailer[:layout].presence || 'effective_polls_mailer_layout'
 
-    def poll_upcoming_reminder(poll_notification, bcc)
-      mail(bcc: bcc, body: poll_notification.body, subject: poll_notification.subject)
+    def poll_upcoming_reminder(poll_notification, user)
+      @assigns = effective_email_templates_assigns(poll_notification, user)
+
+      mail(
+        to: user.email,
+        from: poll_notification.from,
+        body: poll_notification.body,
+        subject: poll_notification.subject
+      )
     end
 
-    def poll_start(poll_notification, bcc)
-      mail(bcc: bcc, body: poll_notification.body, subject: poll_notification.subject)
+    def poll_when_poll_starts(poll_notification, user)
+      @assigns = effective_email_templates_assigns(poll_notification, user)
+
+      mail(
+        to: user.email,
+        from: poll_notification.from,
+        body: poll_notification.body,
+        subject: poll_notification.subject
+      )
     end
 
-    def poll_reminder(poll_notification, bcc)
-      mail(bcc: bcc, body: poll_notification.body, subject: poll_notification.subject)
+    def poll_reminder(poll_notification, user)
+      @assigns = effective_email_templates_assigns(poll_notification, user)
+
+      mail(
+        to: user.email,
+        from: poll_notification.from,
+        body: poll_notification.body,
+        subject: poll_notification.subject
+      )
     end
 
-    def poll_end(poll_notification, bcc)
-      mail(bcc: bcc, body: poll_notification.body, subject: poll_notification.subject)
+    def poll_when_poll_ends(poll_notification, user)
+      @assigns = effective_email_templates_assigns(poll_notification, user)
+
+      mail(
+        to: user.email,
+        from: poll_notification.from,
+        body: poll_notification.body,
+        subject: poll_notification.subject
+      )
+    end
+
+    private
+
+    # Only relevant if the effective_email_templates gem is present
+    def effective_email_templates_assigns(poll_notification, user)
+      raise('expected an Effective::PollNotification') unless poll_notification.kind_of?(Effective::PollNotification)
+      raise('expected a User') unless user.kind_of?(User)
+
+      poll = poll_notification.poll
+      raise('expected poll to be persisted') unless poll&.persisted?
+
+      {
+        available_date: poll.available_date,
+        title: poll.title,
+        url: effective_polls.new_poll_ballot_url(poll),
+        user: {
+          name: user.to_s,
+          email: user.email
+        }
+      }
     end
 
   end

data/app/models/effective/poll.rb

@@ -1,7 +1,5 @@
 module Effective
   class Poll < ActiveRecord::Base
-    attr_accessor :skip_started_validation
-
     has_rich_text :all_steps_content
     has_rich_text :start_content
     has_rich_text :vote_content
@@ -61,7 +59,6 @@ module Effective
     }
 
     scope :sorted, -> { order(:start_at) }
-    scope :editable, -> { upcoming }
 
     scope :upcoming, -> { where('start_at > ?', Time.zone.now) }
     scope :available, -> { where('start_at <= ? AND (end_at > ? OR end_at IS NULL)', Time.zone.now, Time.zone.now) }
@@ -73,14 +70,6 @@ module Effective
     validates :audience, inclusion: { in: AUDIENCES }
     validates :audience_scope, presence: true, unless: -> { audience == 'All Users' }
 
-    validate(if: -> { started? }, unless: -> { skip_started_validation }) do
-      self.errors.add(:base, 'has already started. a poll cannot be changed after it has started.')
-    end
-
-    validate(if: -> { start_at.present? && !started? }, unless: -> { skip_started_validation }) do
-      self.errors.add(:start_at, 'must be a future date') if start_at < Time.zone.now
-    end
-
     validate(if: -> { start_at.present? && end_at.present? }) do
       self.errors.add(:end_at, 'must be after the start date') unless end_at > start_at
     end
@@ -94,8 +83,8 @@ module Effective
       available? && users.include?(user)
     end
 
-    def users
-      case audience
+    def users(except_completed: false)
+      users = case audience
       when 'All Users'
         User.all
       when 'Individual Users'
@@ -107,13 +96,11 @@ module Effective
       else
         raise('unexpected audience')
       end
-    end
 
-    def emails(exclude_completed: false)
-      if exclude_completed
-        users.where.not(id: completed_ballots.select('user_id as id')).pluck(:email)
+      if except_completed
+        users.where.not(id: completed_ballots.select('user_id as id'))
       else
-        users.pluck(:email)
+        users
       end
     end
 

data/app/models/effective/poll_notification.rb

@@ -3,8 +3,8 @@ module Effective
     belongs_to :poll
     log_changes(to: :poll) if respond_to?(:log_changes)
 
-    BATCHSIZE = (Rails.env.test? ? 3 : 250)
     CATEGORIES = ['Upcoming reminder', 'When poll starts', 'Reminder', 'When poll ends']
+    EMAIL_TEMPLATE_VARIABLES = ['available_date', 'title', 'url', 'user.name', 'user.email']
 
     UPCOMING_REMINDERS = {
       '1 hour before' => 1.hours.to_i,
@@ -45,6 +45,7 @@ module Effective
       reminder          :integer  # Number of seconds before poll.start_at
 
       # Email
+      from              :string
       subject           :string
       body              :text
 
@@ -66,9 +67,16 @@ module Effective
 
     validates :poll, presence: true
     validates :category, presence: true, inclusion: { in: CATEGORIES }
+
+    validates :from, presence: true
     validates :subject, presence: true
     validates :body, presence: true
 
+    if EffectivePolls.use_effective_email_templates
+      validates :body, liquid: true
+      validates :subject, liquid: true
+    end
+
     validates :reminder, if: -> { reminder? || upcoming_reminder? },
       presence: true, uniqueness: { scope: [:poll_id, :category], message: 'already exists' }
 
@@ -76,6 +84,10 @@ module Effective
       'poll notification'
     end
 
+    def email_template
+      'poll_' + category.to_s.parameterize.underscore
+    end
+
     def upcoming_reminder?
       category == 'Upcoming reminder'
     end
@@ -116,26 +128,13 @@ module Effective
     def notify!
       return false unless notify_now?
 
-      # We send to all email addresses, except for the 'Reminder' that exclude completed users
-      emails = poll.emails(exclude_completed: (category == 'Reminder'))
+      # We send to all users, except for the 'Reminder' that exclude completed users
+      users = poll.users(except_completed: (category == 'Reminder'))
 
       update_column(:started_at, Time.zone.now)
 
-      emails.in_groups_of(BATCHSIZE, false).each do |emails|
-        mail = case category
-        when 'When poll starts'
-          Effective::PollsMailer.poll_start(self, emails)
-        when 'When poll ends'
-          Effective::PollsMailer.poll_end(self, emails)
-        when 'Upcoming reminder'
-          Effective::PollsMailer.poll_upcoming_reminder(self, emails)
-        when 'Reminder'
-          Effective::PollsMailer.poll_reminder(self, emails)
-        else
-          raise('unexpected category')
-        end
-
-        mail.deliver_now
+      users.find_each do |user|
+        Effective::PollsMailer.public_send(email_template, self, user).deliver_now
       end
 
       update_column(:completed_at, Time.zone.now)

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

@@ -2,54 +2,41 @@
   - if inline_datatable?
     = f.hidden_field :poll_id
   - else
-    = f.select :poll_id, Effective::Poll.sorted.editable.all
+    = f.select :poll_id, Effective::Poll.sorted.all
 
   = f.select :category, Effective::PollNotification::CATEGORIES,
     label: 'Send an email notification'
 
-  = f.show_if :category, 'Upcoming reminder' do
+  - # Render email templates
+  - Effective::PollNotification::CATEGORIES.each do |category|
+    - template = 'poll_' + category.parameterize.underscore
 
-    = f.select :reminder, Effective::PollNotification::UPCOMING_REMINDERS, label: false,
-      hint: "before the poll starts on #{f.object.poll&.start_at&.strftime('%F')}."
+    = f.show_if :category, category do
+      = render "/admin/poll_notifications/form_#{template}", f: f
 
-    .alert.alert-warning
-      %strong Upcoming Reminders
-      are sent to the entire audience before the poll starts.
-      %br
-      Use upcoming reminders to advertise, prepare, or communicate to your audience before the poll begins.
+      - if f.object.category == category
+        = f.email_field :from
+        = f.text_field :subject
+        = f.text_area :body, rows: 10
 
-  = f.show_if :category, 'When poll starts' do
-    .alert.alert-warning
-      %strong When poll starts
-      notifications will be sent within 10 minutes of the poll start time.
+      - elsif EffectivePolls.use_effective_email_templates == false
+        = f.email_field :from, value: EffectivePolls.mailer[:default_from]
+        = f.text_field :subject, value: ''
+        = f.text_area :body, rows: 10, value: ''
 
-  = f.show_if :category, 'Reminder' do
+      - else
+        - email_template = Effective::EmailTemplate.where(template_name: template).first!
 
-    = f.select :reminder, Effective::PollNotification::REMINDERS, label: false,
-      hint: "after the poll starts on #{f.object.poll&.start_at&.strftime('%F')}."
+        = f.email_field :from, value: email_template.from
+        = f.text_field :subject, value: email_template.subject
+        = f.text_area :body, rows: 10, value: email_template.body
 
-    .alert.alert-warning
-      %strong Reminders
-      are sent to users in the audience who have not yet completed their ballot.
-      %br
-      Use reminders to boost your audience participation and remind people to vote.
+        %p The available variables are:
 
-  = f.show_if :category, 'When poll ends' do
-    .alert.alert-warning
-      %strong When poll ends
-      notifications will be sent within 10 minutes of the poll end time.
+        %ul
+          - Effective::PollNotification::EMAIL_TEMPLATE_VARIABLES.each do |variable|
+            %li {{ #{variable} }}
 
-  = f.text_field :subject, label: 'Email Subject'
-  = f.text_area :body, label: 'Email Body'
-
-  .alert.alert-warning
-    Email content must not contain any personal details.
-    %br
-    This content will be sent in a mass email with hundreds of bcc'd recipients.
-
-    - if poll_notification.poll.present?
-      %br
-      The url for this poll will be:
-      = effective_polls.poll_url(poll_notification.poll)
+        %small.text-muted Only a developer can add additional variables
 
   = effective_submit(f)

data/app/views/admin/poll_notifications/_form_poll_reminder.html.haml

@@ -0,0 +1,8 @@
+= f.select :reminder, Effective::PollNotification::REMINDERS, label: false,
+  hint: "after the poll starts on #{f.object.poll&.start_at&.strftime('%F')}."
+
+.alert.alert-warning
+  %strong Reminders
+  are sent to users in the audience who have not yet completed their ballot.
+  %br
+  Use reminders to boost your audience participation and remind people to vote.

data/app/views/admin/poll_notifications/_form_poll_upcoming_reminder.html.haml

@@ -0,0 +1,8 @@
+= f.select :reminder, Effective::PollNotification::UPCOMING_REMINDERS, label: false,
+  hint: "before the poll starts on #{f.object.poll&.start_at&.strftime('%F')}."
+
+.alert.alert-warning
+  %strong Upcoming Reminders
+  are sent to the entire audience before the poll starts.
+  %br
+  Use upcoming reminders to advertise, prepare, or communicate to your audience before the poll begins.

data/app/views/admin/poll_notifications/_form_poll_when_poll_ends.html.haml

@@ -0,0 +1,3 @@
+.alert.alert-warning
+  %strong When poll ends
+  notifications will be sent within 10 minutes of the poll end time.

data/app/views/admin/poll_notifications/_form_poll_when_poll_starts.html.haml

@@ -0,0 +1,3 @@
+.alert.alert-warning
+  %strong When poll starts
+  notifications will be sent within 10 minutes of the poll start time.

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

@@ -12,7 +12,7 @@
 
     = tab 'Notifications' do
       %p
-        The following email notification will be sent to all
+        The following email notifications will be sent to
         = pluralize(poll.users.count, 'users')
         in the audience.
 

data/app/views/admin/polls/_form_poll.html.haml

@@ -1,12 +1,9 @@
 = effective_form_with(model: [:admin, poll], engine: true) do |f|
-  = f.text_field :title, hint: 'The title of your poll.'
+  = f.text_field :title, hint: 'The title of your poll or election.'
 
-  = f.datetime_field :start_at, input_js: { minDate: [f.object.start_at.presence, Time.zone.now].compact.min.strftime('%F') }
+  = f.datetime_field :start_at, input_js: { minDate: Time.zone.now.beginning_of_day.strftime('%F') }
   = f.datetime_field :end_at
 
-  .alert.alert-warning
-    Once the start date has passed, this poll will become read only and you will be unable to make changes.
-
   -# Audience
   = f.radios :audience, Effective::Poll::AUDIENCES
 

data/app/views/effective/ballot_responses/fields/_date.html.haml

@@ -1 +1,2 @@
-= f.date_field :date, label: false, required: poll_question.required?
+.row
+  .col-sm-6= f.date_field :date, label: false, required: poll_question.required?

data/app/views/effective/ballot_responses/fields/_email.html.haml

@@ -1 +1,2 @@
-= f.email_field :email, label: false, required: poll_question.required?
+.row
+  .col-sm-6= f.email_field :email, label: false, required: poll_question.required?

data/app/views/effective/ballot_responses/fields/_number.html.haml

@@ -1 +1,2 @@
-= f.number_field :number, label: false, required: poll_question.required?
+.row
+  .col-sm-6= f.number_field :number, label: false, required: poll_question.required?

data/app/views/effective/ballots/_ballot.html.haml

@@ -2,8 +2,8 @@
   %table.table.table-hover
     %thead
       %tr
-        %th Poll Question
-        %th Ballot Response
+        %th Question
+        %th Response
 
     %tbody
       - ballot.poll.poll_questions.each_with_index do |poll_question, index|

data/app/views/effective/ballots/start.html.haml

@@ -1,5 +1,5 @@
 = render_wizard_sidebar(resource) do
-  %h1 Poll: #{resource.poll}
+  %h1= resource.poll
 
   .alert.alert-warning
     This is a <strong>Secret Ballot</strong>.

data/app/views/effective/ballots/submit.html.haml

@@ -1,5 +1,5 @@
 = render_wizard_sidebar(resource) do
-  %h1 Review: #{resource.poll}
+  %h1= resource.poll
 
   - if resource.poll.all_steps_content.present?
     .mb-2= resource.poll.all_steps_content

data/app/views/effective/ballots/vote.html.haml

@@ -1,5 +1,5 @@
 = render_wizard_sidebar(resource) do
-  %h1 Ballot: #{resource.poll}
+  %h1= resource.poll
 
   - if resource.poll.all_steps_content.present?
     .mb-2= resource.poll.all_steps_content

data/app/views/effective/poll_results/_results.html.haml

@@ -20,7 +20,7 @@
       %table.table.table-hover
         %thead
           %tr
-            %th Poll Question
+            %th Question
             %th Results
 
         %tbody

data/app/views/effective/polls_mailer/poll_reminder.liquid

@@ -0,0 +1,13 @@
+---
+subject: 'Reminder - Please submit your ballot for {{ title }}'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+The {{ title }} poll has already started.
+
+Please remember to submit your ballot.
+
+{{ url }}
+
+Thank you

data/app/views/effective/polls_mailer/poll_upcoming_reminder.liquid

@@ -0,0 +1,11 @@
+---
+subject: '{{ title }} is upcoming'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+The {{ title }} poll is upcoming.
+
+It will be available {{ available_date }}.
+
+Thank you

data/app/views/effective/polls_mailer/poll_when_poll_ends.liquid

@@ -0,0 +1,9 @@
+---
+subject: '{{ title }} has ended'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+The {{ title }} poll has ended.
+
+Thank you

data/app/views/effective/polls_mailer/poll_when_poll_starts.liquid

@@ -0,0 +1,13 @@
+---
+subject: '{{ title }} has started'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+The {{ title }} poll has started.
+
+Please click below to submit your ballot.
+
+{{ url }}
+
+Thank you

data/config/effective_polls.rb

@@ -56,4 +56,9 @@ EffectivePolls.setup do |config|
     default_from: 'no-reply@example.com'
   }
 
+  # Will work with effective_email_templates gem:
+  # - The poll notifications email content will be preopulated based off the template
+  # - Uses a EmailTemplatesMailer mailer instead of ActionMailer::Base
+  config.use_effective_email_templates = false
+
 end

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

@@ -20,6 +20,7 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.string :category
       t.integer :reminder
 
+      t.string :from
       t.string :subject
       t.text :body
 

data/lib/effective_polls.rb

@@ -13,13 +13,13 @@ module EffectivePolls
   mattr_accessor :ballot_response_options_table_name
 
   mattr_accessor :authorization_method
-  mattr_accessor :permitted_params
 
   mattr_accessor :layout
 
   mattr_accessor :audience_user_scopes
 
   # Hashes of configs
+  mattr_accessor :use_effective_email_templates
   mattr_accessor :mailer
 
   def self.setup
@@ -43,8 +43,13 @@ module EffectivePolls
     raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
-  def self.permitted_params
-    raise('todo')
+  def self.mailer_class
+    if use_effective_email_templates
+      require 'effective_email_templates'
+      Effective::EmailTemplatesMailer
+    else
+      ActionMailer::Base
+    end
   end
 
 end

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/lib/tasks/effective_polls_tasks.rake

@@ -5,17 +5,16 @@ namespace :effective_polls do
   task notify: :environment do
     poll_notifications = Effective::PollNotification.all.deep.notifiable
 
-    poll_notifications.find_each do |poll_notification|
+    poll_notifications.find_each do |notification|
       begin
-        notified = poll_notification.notify!
-        puts "Sent #{poll_notification.category} for #{poll_notification.poll}" if notified
+        notified = notification.notify!
+        puts "Sent #{notification.category} for #{notification.poll}" if notified
       rescue => e
         if defined?(ExceptionNotifier)
-          data = { poll_notification_id: poll_notification.id, poll_id: poll_notification.poll_id }
-          ExceptionNotifier.notify_exception(e, data: data)
+          ExceptionNotifier.notify_exception(e, data: { poll_notification_id: notification.id, poll_id: notification.poll_id })
         end
 
-        puts "Error with effective poll_notification #{poll_notification.id}: #{e.errors.inspect}"
+        puts "Error with effective poll_notification #{notification.id}: #{e.errors.inspect}"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,76 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: wicked
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Online polls and user voting.
 email:
 - info@codeandeffect.com
@@ -183,11 +113,14 @@ files:
 - app/models/effective/poll_question.rb
 - app/models/effective/poll_question_option.rb
 - app/views/admin/poll_notifications/_form.html.haml
+- app/views/admin/poll_notifications/_form_poll_reminder.html.haml
+- app/views/admin/poll_notifications/_form_poll_upcoming_reminder.html.haml
+- app/views/admin/poll_notifications/_form_poll_when_poll_ends.html.haml
+- app/views/admin/poll_notifications/_form_poll_when_poll_starts.html.haml
 - app/views/admin/poll_questions/_form.html.haml
 - app/views/admin/polls/_form.html.haml
 - app/views/admin/polls/_form_content.html.haml
 - app/views/admin/polls/_form_poll.html.haml
-- app/views/admin/polls/_poll.html.haml
 - app/views/admin/polls/results.html.haml
 - app/views/effective/ballot_responses/_ballot_response.html.haml
 - app/views/effective/ballot_responses/_fields.html.haml
@@ -238,8 +171,10 @@ files:
 - app/views/effective/poll_results/results/_select_upto_5.html.haml
 - app/views/effective/poll_results/results/_short_answer.html.haml
 - app/views/effective/poll_results/results/_upload_file.html.haml
-- app/views/effective/polls/_form.html.haml
-- app/views/effective/polls/_poll.html.haml
+- app/views/effective/polls_mailer/poll_reminder.liquid
+- app/views/effective/polls_mailer/poll_upcoming_reminder.liquid
+- app/views/effective/polls_mailer/poll_when_poll_ends.liquid
+- app/views/effective/polls_mailer/poll_when_poll_starts.liquid
 - app/views/layouts/effective_polls_mailer_layout.html.haml
 - config/effective_polls.rb
 - config/routes.rb

data/app/views/admin/polls/_poll.html.haml

@@ -1,2 +0,0 @@
-%p= poll.title
-%p= poll.body

data/app/views/effective/polls/_form.html.haml

@@ -1,10 +0,0 @@
-= effective_form_with(model: poll, engine: true) do |f|
-  = f.text_field :title, hint: 'The title of your poll.'
-  = f.text_area :body
-
-  = f.datetime_field :start_at
-  = f.datetime_field :end_at
-
-  = f.check_box :draft, hint: 'Save this poll as a draft. It will not be accessible on the website.'
-
-  = effective_submit(f)

data/app/views/effective/polls/_poll.html.haml

@@ -1,2 +0,0 @@
-%p= poll.title
-%p= poll.body