fae-rails 2.1.0 → 2.2.0

data/app/models/fae/change.rb

@@ -28,12 +28,25 @@ module Fae
         conditions[:user_id] = params['user'] if params['user'].present?
         conditions[:changeable_type] = params['model'] if params['model'].present?
         conditions[:change_type] = params['type'] if params['type'].present?
+        params['date'] ||= ''
 
-        date_scope = case params['date']
-          when 'Last Hour' then   ['fae_changes.updated_at >= ?', 60.minutes.ago]
-          when 'Last Day' then    ['fae_changes.updated_at >= ?', 1.day.ago]
-          when 'Last Week' then   ['fae_changes.updated_at >= ?', 1.week.ago]
-          when 'Last Month' then  ['fae_changes.updated_at >= ?', 1.month.ago]
+        date_scope = []
+        if params['start_date'].present? || params['end_date'].present?
+          start_date = params['start_date'].present? ? CGI.unescape(params['start_date']).to_date : nil
+          end_date   = params['end_date'].present? ? CGI.unescape(params['end_date']).to_date : nil
+          date_scope = ['fae_changes.updated_at >= ?', start_date] if start_date.present?
+          date_scope = ['fae_changes.updated_at <= ?', end_date] if end_date.present?
+          date_scope = ['fae_changes.updated_at >= ? AND fae_changes.updated_at <= ?', start_date, end_date] if start_date.present? && end_date.present?
+        else
+          # normalize url param strings because "Last Hour" != "Last%20Hour"
+          date_scope = case params['date'].downcase.gsub('%20', '-')
+          when 'last-hour' then   ['fae_changes.updated_at >= ?', 60.minutes.ago]
+          when 'last-day' then    ['fae_changes.updated_at >= ?', 1.day.ago]
+          when 'last-week' then   ['fae_changes.updated_at >= ?', 1.week.ago]
+          when 'last-month' then  ['fae_changes.updated_at >= ?', 1.month.ago]
+          else
+            []
+          end
         end
 
         # use good 'ol MySQL to search if search param is present
@@ -45,7 +58,7 @@ module Fae
         # apply conditions and search from above to our scope
         order(id: :desc)
           .includes(:user).references(:user)
-          .where(Arel.sql(date_scope)).where(conditions).where(Arel.sql(search))
+          .where(date_scope).where(conditions).where(search)
       end
 
     end

data/app/models/fae/deploy_hook.rb

@@ -0,0 +1,12 @@
+module Fae
+  class DeployHook < ApplicationRecord
+    include Fae::BaseModelConcern
+
+    acts_as_list add_new_at: :top
+    default_scope { order(:position) }
+
+    default_scope { order(:environment) }
+
+    validates :url, :environment, presence: true
+  end
+end

data/app/models/fae/form_manager.rb

@@ -0,0 +1,24 @@
+module Fae
+	class FormManager < ActiveRecord::Base
+
+		include Fae::BaseModelConcern
+
+	  def fae_display_field
+	    model_name
+	  end
+
+	  class << self
+
+	    def for_model(params, item)
+				if item.present? && item.class.superclass.name == 'Fae::StaticPage'
+					conditions = {form_manager_model_name: 'Fae::StaticPage', form_manager_model_id: item.fae_form_manager_model_id}
+				else
+					conditions = {form_manager_model_name: params[:controller].gsub('admin/','').classify}
+				end
+	      where(conditions).first
+	    end
+
+	  end
+
+	end
+end

data/app/models/fae/user.rb

@@ -5,9 +5,9 @@ module Fae
     include Fae::UserConcern
 
     # Include default devise modules. Others available are:
-    # :registerable, :confirmable, :lockable, :timeoutable and :omniauthable
+    # :registerable, :confirmable, :timeoutable and :omniauthable
     devise :database_authenticatable,
-           :recoverable, :rememberable, :trackable
+           :recoverable, :rememberable, :trackable, :lockable
 
     belongs_to :role
 

data/app/services/fae/netlify_api.rb

@@ -0,0 +1,197 @@
+require 'net/http'
+
+module Fae
+  class NetlifyApi
+
+    def initialize()
+      @netlify_api_user   = Fae.netlify[:api_user]
+      @netlify_api_token  = Fae.netlify[:api_token]
+      @site               = Fae.netlify[:site]
+      @site_id            = Fae.netlify[:site_id]
+      @endpoint_base      = Fae.netlify[:api_base]
+      @logger             = Logger.new(Rails.root.join('log', 'netlify_api.log'))
+    end
+
+    def get_deploys
+      path = "sites/#{@site_id}/deploys?per_page=15"
+      get_deploys_env_response(path)
+    end
+
+    def run_deploy(deploy_hook_type, current_user)
+      hook = Fae::DeployHook.find_by_environment(deploy_hook_type)
+      if hook.present?
+        post("#{hook.url}?trigger_title=#{current_user.full_name.gsub(' ', '+')}+triggered+a+#{deploy_hook_type.titleize}+deploy")
+        return true
+      end
+      false
+    end
+
+    private
+
+    def get(endpoint, params = nil)
+      begin
+        uri = URI.parse(endpoint)
+        request = Net::HTTP::Get.new(uri)
+        set_headers(request)
+        response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) {|http|
+          http.request(request)
+        }
+        return JSON.parse(response.body) if response.present? && response.body.present?
+      rescue Exception => e
+        @logger.info "\n"
+        @logger.info "Failed getting on #{DateTime.now} to #{endpoint}"
+        @logger.info "Params: #{params}"
+        @logger.info "Reason: #{e}"
+      end
+    end
+
+    def post(endpoint, params = nil)
+      begin
+        uri = URI.parse(endpoint)
+        request = Net::HTTP::Post.new(uri)
+        set_headers(request)
+        request.body = params.to_json
+        response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) {|http|
+          http.request(request)
+        }
+        return JSON.parse(response.body) if response.present? && response.body.present?
+      rescue Exception => e
+        @logger.info "\n"
+        @logger.info "Failed posting on #{DateTime.now} to #{endpoint}"
+        @logger.info "Params: #{params}"
+        @logger.info "Reason: #{e}"
+      end
+    end
+
+    def set_headers(request)
+      request['User-Agent'] = "#{@site} (#{@netlify_api_user})"
+      request['Authorization'] = "Bearer #{@netlify_api_token}"
+    end
+
+    def get_deploys_env_response(path)
+      return get "#{@endpoint_base}#{path}" unless Rails.env.test?
+      [
+        {
+          "state"=>"building",
+          "name"=>"building-test",
+          "created_at"=>"2021-10-22T14:56:18.163Z",
+          "updated_at"=>"2021-10-22T14:57:55.905Z",
+          "error_message"=>nil,
+          "commit_ref"=>nil,
+          "branch"=>"staging",
+          "title"=>"Staging building",
+          "review_url"=>nil,
+          "published_at"=>nil,
+          "context"=>"branch-deploy",
+          "deploy_time"=>93,
+          "committer"=>nil,
+          "skipped_log"=>nil,
+          "manual_deploy"=>false,
+        },
+        {
+          "state"=>"processing",
+          "name"=>"processing-test",
+          "created_at"=>"2021-10-22T14:56:18.163Z",
+          "updated_at"=>"2021-10-22T14:57:55.905Z",
+          "error_message"=>nil,
+          "commit_ref"=>nil,
+          "branch"=>"staging",
+          "title"=>"Staging processing",
+          "review_url"=>nil,
+          "published_at"=>nil,
+          "context"=>"branch-deploy",
+          "deploy_time"=>93,
+          "committer"=>nil,
+          "skipped_log"=>nil,
+          "manual_deploy"=>false,
+        },
+        {
+          "state"=>"ready",
+          "name"=>"complete-test",
+          "created_at"=>"2021-10-22T14:56:18.163Z",
+          "updated_at"=>"2021-10-22T14:57:55.905Z",
+          "error_message"=>nil,
+          "commit_ref"=>'string',
+          "branch"=>"staging",
+          "title"=>"Staging complete",
+          "review_url"=>nil,
+          "published_at"=>nil,
+          "context"=>"branch-deploy",
+          "deploy_time"=>93,
+          "committer"=>nil,
+          "skipped_log"=>nil,
+          "manual_deploy"=>false,
+        },
+        {
+          "state"=>"ready",
+          "name"=>"admin-test",
+          "created_at"=>"2021-10-22T14:56:18.163Z",
+          "updated_at"=>"2021-10-22T14:57:55.905Z",
+          "error_message"=>nil,
+          "commit_ref"=>nil,
+          "branch"=>"staging",
+          "title"=>"Staging admin complete",
+          "review_url"=>nil,
+          "published_at"=>nil,
+          "context"=>"branch-deploy",
+          "deploy_time"=>93,
+          "committer"=>nil,
+          "skipped_log"=>nil,
+          "manual_deploy"=>false,
+        },
+        {
+          "state"=>"error",
+          "name"=>"error-test",
+          "created_at"=>"2021-10-22T14:56:18.163Z",
+          "updated_at"=>"2021-10-22T14:57:55.905Z",
+          "error_message"=>'Error!',
+          "commit_ref"=>nil,
+          "branch"=>"staging",
+          "title"=>"FINE admin triggered a Staging build",
+          "review_url"=>nil,
+          "published_at"=>nil,
+          "context"=>"branch-deploy",
+          "deploy_time"=>93,
+          "committer"=>nil,
+          "skipped_log"=>nil,
+          "manual_deploy"=>false,
+        },
+        {
+          "state"=>"ready",
+          "name"=>"fae-dummy",
+          "created_at"=>"2021-10-22T14:56:18.163Z",
+          "updated_at"=>"2021-10-22T14:57:55.905Z",
+          "error_message"=>nil,
+          "commit_ref"=>nil,
+          "branch"=>"master",
+          "title"=>"A production build",
+          "review_url"=>nil,
+          "published_at"=>nil,
+          "context"=>"production",
+          "deploy_time"=>93,
+          "committer"=>nil,
+          "skipped_log"=>nil,
+          "manual_deploy"=>false,
+        },
+        {
+          "state"=>"ready",
+          "name"=>"fae-dummy",
+          "created_at"=>"2021-10-22T14:56:18.163Z",
+          "updated_at"=>"2021-10-22T14:57:55.905Z",
+          "error_message"=>nil,
+          "commit_ref"=>nil,
+          "branch"=>"master",
+          "title"=>"Another production build",
+          "review_url"=>nil,
+          "published_at"=>nil,
+          "context"=>"production",
+          "deploy_time"=>93,
+          "committer"=>nil,
+          "skipped_log"=>nil,
+          "manual_deploy"=>false,
+        },
+      ]
+    end
+
+  end
+end

data/app/views/devise/unlocks/new.html.slim

@@ -1,13 +1,9 @@
-h2 Resend unlock instructions
+.login-form
+  h2 Resend unlock instructions
 
-= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f|
-  = f.error_notification
-  = f.full_error :unlock_token
+  = simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post, id: 'login_form' }) do |f|
 
-  .form-inputs
     = f.input :email, :required => true, :autofocus => true
 
-  .form-actions
-    = f.button :submit, "Resend unlock instructions"
-
-== render "devise/shared/links"
+    .login-form-actions
+      = f.button :submit, "Resend unlock instructions", class: "login-form-actions-submit"

data/app/views/fae/application/_content_form.html.slim

@@ -1,20 +1,21 @@
 ruby:
-  require_locals     ['attribute', 'f'], local_assigns
-  has_label            = ![false, ''].include?(local_assigns[:label])
-  label              ||= attribute.to_s.titleize
-  required           ||= f.object.send(attribute).is_required?(f.object.class)
-  helper_text        ||= attempt_common_helper_text(attribute)
-  markdown           ||= false
-  markdown_supported ||= false
-  hint               ||= nil
-  options            ||= {}
-  input_options      ||= {}
+  require_locals      ['attribute', 'f'], local_assigns
+  has_label             = ![false, ''].include?(local_assigns[:label])
+  label               ||= attribute.to_s.titleize
+  required            ||= f.object.send(attribute).is_required?(f.object.class)
+  helper_text         ||= attempt_common_helper_text(attribute)
+  markdown            ||= false
+  markdown_supported  ||= false
+  hint                ||= nil
+  options             ||= {}
+  input_options       ||= {}
+  show_form_manager   ||= true
 
   if has_label
     label_adjusted = required ? '<abbr title="required">*</abbr> ' : ''
     label_adjusted += label
     if markdown_supported.present? || helper_text.present?
-      label_adjusted += content_tag :h6, class: 'helper_text' do
+      label_adjusted += content_tag :h6, class: 'helper_text helper_text_text' do
         concat(helper_text) if helper_text.present?
         concat(content_tag(:span, 'Markdown Supported', class: 'markdown-support')) if markdown_supported.present?
       end
@@ -28,6 +29,8 @@ ruby:
   options.merge! input_options if (input_options.keys).any?
   options.merge! wrapper_html: {} if input_options[:wrapper_html].blank?
 
+  options.merge! wrapper_html: { data: { form_manager_id:  "#{f.object.class.name}_#{attribute}" } } if show_form_manager
+
   if options[:input_html].present? && options[:input_html][:class].present? && markdown.present?
     options[:input_html][:class] = options[:input_html][:class] + ' js-markdown-editor'
   elsif options[:input_html].blank?
@@ -45,6 +48,8 @@ ruby:
     - options.deep_merge! wrapper_html: { data: { language: lang } }
     - options[:label] = orig_label.gsub(label, "#{label} (#{lang.to_s})").html_safe
 
+    - options.deep_merge! wrapper_html: { data: { form_manager_id: "#{f.object.class.name}_#{attribute}_#{lang}" } } if show_form_manager
+
     = f.simple_fields_for "#{attribute}_#{lang}".to_sym, defaults: { wrapper_html: options[:wrapper_html] } do |i|
       - options[:input_html].merge! data: { validate: i.object.validation_json(f.object.class) }
       = i.input :content, options

data/app/views/fae/application/_file_uploader.html.slim

@@ -8,21 +8,26 @@ ruby:
   required    ||= false
   languages     = f.object.class.try(:fae_fields).try(:[], file_name).try(:[], :languages)
   language    ||= nil
+  show_form_manager ||= true
 
 - if languages.present?
   - languages.each do |lang|
     = render 'fae/application/file_uploader', f: f, item: item, file_name: "#{file_name}_#{lang}".to_sym, label: "#{label} (#{lang.to_s})", helper_text: helper_text, required: required, language: lang
 
 - else
+  ruby:
+    form_manager_id = show_form_manager ? "#{item.class.name}_#{file_name}" : nil
+    form_manager_id += "_#{language}" if language.present?
   - wrapper_html = language.present? ? { data: { language: language } } : {}
   = f.simple_fields_for file_name, defaults: { wrapper_html: wrapper_html } do |i|
-    .input.field
+    .input.field class="#{file_name}" data-form-manager-id=form_manager_id
       = content_tag :label, class: ('required' if required) do
         - if required
           abbr title="required" *
         = label.html_safe
         - if helper_text.present?
-          h6.helper_text = helper_text
+          h6.helper_text
+            span.helper_text_text = helper_text
 
       - if the_file.asset.present?
         .asset-actions.-files

data/app/views/fae/application/_global_search_results.html.slim

@@ -25,7 +25,7 @@ ul.search-results.js-search-results
       - records.each do |item|
         - begin
           - parent = item.respond_to?(:fae_parent) ? item.fae_parent : nil
-          - edit_path = edit_polymorphic_path([main_app, fae_scope, parent, item])
+          - edit_path = edit_polymorphic_path([main_app, fae_scope.to_sym, parent, item])
           li
             a href=edit_path
               span.search-record-label = item.class.name

data/app/views/fae/application/_header.slim

@@ -9,12 +9,15 @@ header.main-header#js-main-header
           li class=nav_active_class(item[:class_name], 0, idx)
             a href=item[:nested_path] = item[:text]
             - if item[:subitems].present?
-              ul
+              ul class=multi_column_nav_ul_class(item[:subitems])
                 - item[:subitems].each_with_index do |subitem, sub_idx|
                   li: a href=subitem[:nested_path] class=nav_active_class(subitem[:class_name], 1, sub_idx, idx) = subitem[:text]
 
   - if user_signed_in?
     ul.utility-nav#js-utility-nav
+      - if current_user.super_admin_or_admin? && netlify_enabled?
+      li class=deployments_active_class
+        a.deployments-nav-link href=fae.deploy_path = t('fae.navbar.deployments')
       li.utility-dropdown.js-utility-dropdown
         a.grabatar-link href="#"
           img.grabatar src=fae_avatar alt=current_user.full_name

data/app/views/fae/application/_mobilenav.slim

@@ -31,6 +31,9 @@ nav.nav.mobilenav
                       - thirditem[:path] ||= '#'
                       li: a href=thirditem[:path] = thirditem[:text]
 
+    - if current_user.super_admin_or_admin? && netlify_enabled?
+      li: a href=fae.deploy_path = t('fae.navbar.deployments')
+
     - if current_user.super_admin_or_admin?
       li.mobilenav-accordion.js-accordion
         a href="#" Admin

data/app/views/fae/deploy/index.html.slim

@@ -0,0 +1,40 @@
+header.content-header.js-content-header
+  h1 = t('fae.deploy.page.heading')
+
+== render 'flash_messages'
+
+main.content
+  - if @deploy_hooks.present?
+    - @deploy_hooks.each do |deploy_hook|
+      button.button.deploy-button.js-run-deploy data-build-hook-type=deploy_hook.environment href="#" = "#{t('fae.deploy.ctas.deploy')} #{deploy_hook.environment.to_s.titleize}"
+
+section.content
+  p = t('fae.deploy.table.deploying_helper').html_safe
+
+section.content#js-deploying-section
+  h2.deploying-heading = t('fae.deploy.table.deploying_heading')
+  .js-deploys-list.running
+    table
+      thead
+        tr
+          th = t('fae.deploy.table.title')
+          th = t('fae.deploy.table.deployed')
+          th = t('fae.deploy.table.duration')
+          th = t('fae.deploy.table.context')
+          th = t('fae.deploy.table.error_msg')
+      tbody
+
+section.content
+  h2 = t('fae.deploy.table.past_heading')
+  .js-deploys-list.past
+    table
+      thead
+        tr
+          th = t('fae.deploy.table.title')
+          th = t('fae.deploy.table.deployed')
+          th = t('fae.deploy.table.duration')
+          th = t('fae.deploy.table.context')
+          th = t('fae.deploy.table.error_msg')
+      tbody
+
+

data/app/views/fae/deploy_hooks/_form.html.slim

@@ -0,0 +1,18 @@
+ruby:
+	form_options = {
+		html: {
+			multipart: true,
+			novalidate: true,
+			class: 'js-file-form',
+			remote: true,
+			data: {
+				type: "html"
+			}
+		}
+	}
+= simple_form_for(@deploy_hook, form_options) do |f|
+  = fae_input f, :environment
+  = fae_input f, :url, label: 'URL'
+
+  = f.submit
+  = button_tag 'Cancel', type: 'button', class: 'js-cancel-nested cancel-nested-button'

data/app/views/fae/deploy_hooks/_table.html.slim

@@ -0,0 +1,28 @@
+section.addedit-form.js-addedit-form
+  a.js-add-link.table-add-link.button.-small href=fae.new_deploy_hook_path = t('fae.deploy_hook.add_deploy_hook')
+  h2 = t('fae.deploy_hook.section_heading')
+  - if t('fae.deploy_hook.section_helper_text').present?
+    h6.table-helper-text = t('fae.deploy_hook.section_helper_text')
+  == render 'fae/application/flash_messages'
+  table.js-sort-row
+    thead
+      tr
+        th.th-sortable-handle
+        th = t('fae.deploy_hooks.environment')
+        th = t('fae.deploy_hooks.url')
+        th.-action
+    tbody
+      - if @deploy_hooks.present?
+        - @deploy_hooks.each do |item|
+          tr id=tr_id(item)
+            td.sortable-handle: i.icon-sort
+            td: a.js-edit-link href=edit_deploy_hook_path(item) #{item.environment}
+            td = item.url
+            td = fae_delete_button item, item, class: 'js-tooltip table-action js-delete-link', remote: true
+
+      - else
+        tr
+          - td_link = link_to 'add some', fae.new_deploy_hook_path, class: 'js-add-link'
+          td colspan="4" No #{t('fae.deploy_hook.section_heading')} yet, #{td_link}.
+
+  .js-addedit-form-wrapper

data/app/views/fae/deploy_hooks/edit.html.slim

@@ -0,0 +1,3 @@
+.nested-form
+  h2 = t('fae.deploy_hook.edit_deploy_hook')
+  == render 'form'

data/app/views/fae/deploy_hooks/new.html.slim

@@ -0,0 +1,3 @@
+.nested-form
+  h2 = t('fae.deploy_hook.new_deploy_hook')
+  == render 'form'

data/app/views/fae/images/_image_uploader.html.slim

@@ -15,15 +15,19 @@ ruby:
   attached_as         ||= image_name.to_s
   languages             = f.object.class.try(:fae_fields).try(:[], image_name).try(:[], :languages)
   language            ||= nil
+  show_form_manager   ||= true
 
 - if languages.present?
   - languages.each do |lang|
-    = render 'fae/images/image_uploader', f: f, item: item, image_name: "#{image_name}_#{lang}".to_sym, label: "#{label} (#{lang.to_s})", alt_label: "#{alt_label} (#{lang.to_s})", caption_label: "#{caption_label} (#{lang.to_s})", helper_text: helper_text, alt_helper_text: alt_helper_text, caption_helper_text: caption_helper_text, show_caption: show_caption, required: required, attached_as: attached_as, language: lang
+    = render 'fae/images/image_uploader', f: f, item: item, image_name: "#{image_name}_#{lang}".to_sym, label: "#{label} (#{lang.to_s})", alt_label: "#{alt_label} (#{lang.to_s})", caption_label: "#{caption_label} (#{lang.to_s})", helper_text: helper_text, alt_helper_text: alt_helper_text, caption_helper_text: caption_helper_text, show_caption: show_caption, required: required, attached_as: attached_as, language: lang, show_form_manager: show_form_manager
 
 - else
+  ruby:
+    form_manager_id = show_form_manager ? "#{item.class.name}_#{attached_as}" : nil
+    form_manager_id += "_#{language}" if language.present?
   - wrapper_html = language.present? ? { data: { language: language } } : {}
   = f.simple_fields_for image_name, defaults: { wrapper_html: wrapper_html } do |i|
-    .field.input*wrapper_html
+    .input.field.image*wrapper_html class="#{image_name}" data-form-manager-id=form_manager_id
       label class="#{'required' if required}"
         - if required
           abbr title="required" *
@@ -31,7 +35,8 @@ ruby:
         = " #{label.html_safe}"
 
         - if helper_text.present?
-          h6.helper_text = helper_text
+          h6.helper_text
+            span.helper_text_text = helper_text
 
       - if the_image.asset.present?
         .asset-actions
@@ -52,6 +57,8 @@ ruby:
         options = { label: caption_label.html_safe }
         options[:helper_text] = caption_helper_text if caption_helper_text.present?
         options[:wrapper_html] = wrapper_html
+        options[:wrapper_html].merge!({class: "#{form_manager_id}_caption_container"})
+        options[:show_form_manager] = false
 
       = fae_input i, :caption, options
 
@@ -60,6 +67,8 @@ ruby:
         options = { label: alt_label.html_safe }
         options[:helper_text] = alt_helper_text if alt_helper_text.present?
         options[:wrapper_html] = wrapper_html
+        options[:wrapper_html].merge!({class: "#{form_manager_id}_alt_container"})
+        options[:show_form_manager] = false
 
       = fae_input i, :alt, options
 

data/app/views/fae/options/_form.html.slim

@@ -7,10 +7,13 @@
 
   == render 'flash_messages'
 
-  section.content
+  main.content
     = fae_input f, :title, label: t('fae.options.project.name')
     = fae_input f, :time_zone, wrapper_class: 'select'
     = fae_input f, :live_url, label: t('fae.options.live_url'), helper_text: t('fae.options.url_helper')
     = fae_input f, :stage_url, label: t('fae.options.stage_url'), helper_text: t('fae.options.url_helper')
     = fae_image_form f, :logo, helper_text: t('fae.options.logo_helper')
     = fae_image_form f, :favicon
+
+section.content#deploy_hooks
+  == render "fae/deploy_hooks/table"

data/app/views/fae/pages/activity_log.html.slim

@@ -1,12 +1,16 @@
-== render 'fae/shared/index_header', title: 'Activity Log', new_button: false
+header.content-header.js-content-header
+  h1 = t('fae.application.activity_log_heading')
 
 main.content
 
   == fae_filter_form title: t('fae.changes.title'), action: fae.activity_log_filter_path do
-    == fae_filter_select :user, options: Fae::User.all.map { |u| [u.full_name, u.id] }, translation_path: 'fae.changes.models'
-    == fae_filter_select :model, options: Fae::Change.unique_changeable_types, translation_path: 'fae.changes.models'
     == fae_filter_select :type, options: [t('fae.changes.created'), t('fae.changes.updated'), t('fae.changes.deleted')], translation_path: 'fae.changes.models'
+    == fae_filter_datepicker :start_date, placeholder: 'MM/DD/YYYY', class: 'test'
+    == fae_filter_datepicker :end_date, placeholder: 'MM/DD/YYYY'
     == fae_filter_select :date, options: [t('fae.changes.last_hour'), t('fae.changes.last_day'), t('fae.changes.last_week'), t('fae.changes.last_month')], placeholder: t('fae.changes.all_time')
+    br
+    == fae_filter_select :user, options: Fae::User.all.map { |u| [u.full_name, u.id] }, translation_path: 'fae.changes.models'
+    == fae_filter_select :model, options: Fae::Change.unique_changeable_types, translation_path: 'fae.changes.models'
 
   table.js-results-table
     thead

data/app/views/fae/pages/home.html.slim

@@ -19,8 +19,8 @@ header.content-header.js-content-header.-dashboard
         - @list.each do |item|
           - begin
             - parent = item.respond_to?(:fae_parent) ? item.fae_parent : nil
-            - edit_path = edit_polymorphic_path([main_app, fae_scope, parent, item])
-            - index_path = polymorphic_path([main_app, fae_scope, parent, item.class.to_s.pluralize.underscore])
+            - edit_path = edit_polymorphic_path([main_app, fae_scope.to_sym, parent, item])
+            - index_path = polymorphic_path([main_app, fae_scope.to_sym, parent, item.class.to_s.pluralize.underscore])
             tr
               td: a href=edit_path = item.fae_display_field
               td: a href=index_path = item.class.to_s
@@ -33,5 +33,4 @@ header.content-header.js-content-header.-dashboard
       p
         = t('fae.page.no_objs_start')
         br
-        a href="https://www.faecms.com/documentation/quickstart-guide" target="_blank"
-        = t('fae.page.no_objs.end')
+        a href="https://www.faecms.com/documentation/quickstart-guide" target="_blank" = t('fae.page.no_objs_end')