fae-rails 2.1.0 → 2.2.0

data/app/assets/stylesheets/fae/modules/forms/_date.scss

@@ -207,6 +207,22 @@
     padding: 12px;
     font-size: 19px;
     color: $c-darker-grey;
+
+  }
+
+  &.table-filter-group {
+    width: 130px;
+
+    input[type=text] {
+      border-radius: 0;
+    }
+
+    label:before {
+      right: -5px;
+      bottom: -6px;
+
+      font-size: 15px;
+    }
   }
 }
 

data/app/assets/stylesheets/fae/modules/forms/_form-manager.scss

@@ -0,0 +1,82 @@
+.form-manager-form {
+  z-index: 2;
+  background: gray(90);
+  display: none;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  overflow: scroll;
+  margin-top: 1px;
+  padding: 100px 40px 0px 30px;
+
+  .js-form-manager-submit {
+    background: gray(20);
+    color: white;
+    font-size: 13px;
+
+    &:hover {
+      background: gray(10);
+    }
+  }
+
+  .helper {
+    color: gray(40);
+    font-weight: normal;
+  }
+
+  .inner-content {
+    margin-top: 103px;
+  }
+
+  .field-input {
+    margin-bottom: 10px;
+  }
+
+  header {
+    height: 74px;
+
+    a {
+      margin-right: 5px;
+      float: right;
+    }
+  }
+
+  .form-section {
+    margin-bottom: 30px;
+    overflow: auto;
+  }
+
+  .single-field {
+    float: left;
+    width: 25%;
+    margin-right: 20px;
+
+    input {
+      width: 100%;
+    }
+
+    .field_title {
+      width: 100%;
+      display: inline-block;
+
+      label {
+        float: left;
+        margin-right: 10px;
+      }
+
+      input {
+        width: auto;
+        float: left;
+      }
+    }
+  }
+}
+
+.js-form-manager-container {
+  display: none;
+  z-index: 4;
+}
+
+.js-launch-form-manager {
+	margin-left: 10px;
+}

data/app/assets/stylesheets/fae/modules/forms/_radio.scss

@@ -64,6 +64,6 @@
 
 .radio_collection.focused {
   .radio_collection-bullet {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }

data/app/assets/stylesheets/fae/modules/forms/_select.scss

@@ -32,7 +32,7 @@
     top: auto;
     bottom: 100%;
     margin-bottom: -1px;
-    border-top: 1px solid $c-notice-content;
+    border-top: 1px solid $c-focus-border;
     border-bottom: none;
     box-shadow: none;
     border-radius: 0;
@@ -41,7 +41,7 @@
 
 .chosen-container-active {
   .chosen-single {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
     background: $c-chosen-gradient-end;
   }
 }
@@ -120,7 +120,7 @@
 .chosen-container-multi.chosen-container-active {
   .chosen-single,
   .chosen-choices {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }
 
@@ -159,7 +159,8 @@
   }
 
   .chosen-search {
-    display: none;
+    position: absolute;
+    left: -9999px;
   }
 }
 
@@ -185,7 +186,7 @@
 
 .chosen-container {
   .chosen-drop {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }
 
@@ -307,7 +308,7 @@
 
     &.ms-focus {
       outline: 0;
-      border-bottom: 4px solid $c-notice-content;
+      border-bottom: 4px solid $c-focus-border;
     }
   }
 

data/app/assets/stylesheets/fae/modules/forms/_simple-mde.scss

@@ -23,7 +23,7 @@
   &.mde-focus {
     .CodeMirror-wrap,
     .editor-toolbar {
-      border-color: $c-notice-content;
+      border-color: $c-focus-border;
     }
   }
 }

data/app/assets/stylesheets/fae/modules/forms/_textarea.scss

@@ -11,6 +11,6 @@ textarea {
   border-radius: 2px;
 
   &:focus {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }

data/app/assets/stylesheets/fae/modules/tables/_filters.scss

@@ -58,4 +58,8 @@
 .table-filter-group {
   display: inline-block;
   margin: 0 30px 20px 0;
+
+  &.no-right-margin {
+    margin-right: 0;
+  }
 }

data/app/assets/stylesheets/fae/pages/_login.scss

@@ -33,6 +33,10 @@
   width: 50%;
   margin: auto;
 
+  h2 {
+    margin: 0 0 28px;
+  }
+
   @include bp(login_container) {
     display: inline-block;
     vertical-align: middle;

data/app/controllers/fae/application_controller.rb

@@ -17,9 +17,16 @@ module Fae
     before_action :detect_cancellation
     before_action :set_change_user
     before_action :set_locale
+    before_action :setup_form_manager
 
     private
 
+    def setup_form_manager
+      if Fae.use_form_manager
+        @form_manager = FormManager.for_model(params, @item)
+      end
+    end
+
     # defines the locale used to translate the Fae interface
     def set_locale
       if I18n.available_locales.include?(language_from_browser)

data/app/controllers/fae/base_controller.rb

@@ -35,7 +35,11 @@ module Fae
       @item = @klass.new(item_params)
 
       if @item.save
-        redirect_to @index_path, notice: t('fae.save_notice')
+        if @item.try(:fae_redirect_to_form_on_create)
+          redirect_to send("edit_admin_#{@klass_singular}_path", @item.id), notice: t('fae.save_notice')
+        else
+          redirect_to @index_path, notice: t('fae.save_notice')
+        end
       else
         build_assets
         flash[:alert] = t('fae.save_error')

data/app/controllers/fae/deploy_controller.rb

@@ -0,0 +1,24 @@
+module Fae
+  class DeployController < ApplicationController
+    before_action :admin_only
+
+    include Fae::ApplicationHelper
+
+    def index
+      raise 'Fae.netlify configs are missing.' unless netlify_enabled?
+      @deploy_hooks = DeployHook.all
+    end
+
+    def deploys_list
+      render json: Fae::NetlifyApi.new().get_deploys
+    end
+
+    def deploy_site
+      if Fae::NetlifyApi.new().run_deploy(params['deploy_hook_type'], current_user)
+        return render json: { success: true }
+      end
+      render json: {success: false}
+    end
+
+  end
+end

data/app/controllers/fae/deploy_hooks_controller.rb

@@ -0,0 +1,71 @@
+module Fae
+  class DeployHooksController < ApplicationController
+
+    before_action :super_admin_only
+    before_action :set_deploy_hook, only: [:show, :edit, :update, :destroy]
+    layout false
+
+    def index
+      @deploy_hooks = DeployHook.all
+    end
+
+    def new
+      @deploy_hook = DeployHook.new
+    end
+
+    def edit
+    end
+
+    def create
+      @deploy_hook = DeployHook.new(deploy_hook_params)
+
+      if @deploy_hook.save
+        flash[:notice] = t('fae.save_notice')
+        @deploy_hooks = DeployHook.all
+        render template: table_template_path
+      else
+        render action: 'new'
+      end
+    end
+
+    def update
+      if @deploy_hook.update(deploy_hook_params)
+        flash[:notice] = t('fae.save_notice')
+        @deploy_hooks = DeployHook.all
+        render template: table_template_path
+      else
+        render action: 'edit'
+      end
+    end
+
+    def destroy
+      if @deploy_hook.destroy
+        flash[:notice] = t('fae.delete_notice')
+      else
+        flash[:alert] = t('fae.delete_error')
+      end
+      @deploy_hooks = DeployHook.all
+      render template: table_template_path
+    end
+
+    private
+
+      def set_deploy_hook
+        @deploy_hook = DeployHook.find(params[:id])
+      end
+
+      def deploy_hook_params
+        params.require(:deploy_hook).permit!
+      end
+
+      def set_index_path
+        # @index_path determines form's cancel btn path
+        @index_path = deploy_hooks_path
+      end
+
+      def table_template_path
+        "fae/deploy_hooks/_table.html.slim"
+      end
+
+  end
+end

data/app/controllers/fae/form_managers_controller.rb

@@ -0,0 +1,19 @@
+module Fae
+  class FormManagersController < ApplicationController
+
+    def update
+      if params[:form_manager].present?
+        fields_serialized = params[:form_manager][:fields].to_json
+        conditions = {
+          form_manager_model_name: params[:form_manager][:form_manager_model_name],
+        }
+        if params[:form_manager][:form_manager_model_name] == 'Fae::StaticPage'
+          conditions[:form_manager_model_id] = params[:form_manager][:form_manager_model_id]
+        end
+        FormManager.where(conditions).first_or_initialize.update_attribute(:fields, fields_serialized)
+      end
+      render body: nil
+    end
+
+  end
+end

data/app/controllers/fae/options_controller.rb

@@ -7,6 +7,7 @@ module Fae
       @option = Option.first || Option.instance
       @option.build_logo if @option.logo.blank?
       @option.build_favicon if @option.favicon.blank?
+      @deploy_hooks = DeployHook.all
     end
 
     # PATCH/PUT /options/1

data/app/controllers/fae/static_pages_controller.rb

@@ -20,7 +20,8 @@ module Fae
         redirect_to @index_path, notice: t('fae.save_notice')
       else
         build_assocs
-        render template: "#{fae.root_path.gsub('/', '')}/content_blocks/#{params[:slug]}", error: t('fae.save_error')
+        flash[:alert] = t('fae.save_error')
+        render template: "#{fae.root_path.gsub('/', '')}/content_blocks/#{params[:slug]}"
       end
     end
 
@@ -29,6 +30,9 @@ module Fae
     # Use callbacks to share common setup or constraints between actions.
     def set_item
       @item = "#{params[:slug]}_page".classify.constantize.instance
+      if Fae.use_form_manager
+        @form_manager = FormManager.for_model(params, @item)
+      end
     end
 
     # set up variables so that fae partial forms work
@@ -50,5 +54,6 @@ module Fae
         @item.send(:"create_#{assoc.name}", attached_as: assoc.name.to_s) if assoc.macro == :has_one && @item.send(:"#{assoc.name}").blank?
       end
     end
+
   end
 end

data/app/controllers/fae/users_controller.rb

@@ -23,6 +23,8 @@ module Fae
     end
 
     def create
+      authorize_role
+
       @user = Fae::User.new(user_params)
 
       if @user.save
@@ -33,11 +35,13 @@ module Fae
     end
 
     def update
+      authorize_role
+
       params[:user].delete(:password) if params[:user][:password].blank?
       params[:user].delete(:password_confirmation) if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
 
       if @user.update(user_params)
-        path = current_user.super_admin? ? users_path : fae.root_path
+        path = current_user.super_admin_or_admin? ? users_path : fae.root_path
         redirect_to path, notice: t('fae.save_notice')
       else
         render action: 'edit', error: t('fae.save_error')
@@ -75,5 +79,11 @@ module Fae
         # @index_path determines form's cancel btn path
         @index_path = users_path
       end
+
+      def authorize_role
+        return if params[:user][:role_id].blank?
+        return if @role_collection.map(&:id).include?(params[:user][:role_id].to_i)
+        params[:user].delete(:role_id)
+      end
   end
 end

data/app/controllers/fae/utilities_controller.rb

@@ -2,8 +2,9 @@ module Fae
   class UtilitiesController < ApplicationController
 
     def toggle
-      klass = params[:object].gsub('__', '/').classify.constantize
-      if can_toggle(klass)
+      klass = params[:object].gsub('__', '/').classify
+      if can_toggle(klass, params[:attr])
+        klass = klass.constantize
         klass.find(params[:id]).toggle(params[:attr]).save(validate: false)
         render body: nil
       else
@@ -42,10 +43,21 @@ module Fae
 
     private
 
-    def can_toggle(klass)
-      # restrict models that non-admins aren't allowed to update
-      restricted_classes = %w(Fae::User Fae::Role Fae::Option)
-      return false if restricted_classes.include?(klass.name.to_s) && !current_user.super_admin_or_admin?
+    def can_toggle(klass, attribute)
+      # check if class exists and convert
+      return false unless Object.const_defined?(klass)
+      klass = klass.constantize
+
+      # allow admins to toggle Fae::User#active
+      return true if klass == Fae::User && attribute == 'active' && current_user.super_admin_or_admin?
+
+      # restrict models that only super admins can toggle
+      restricted_classes = %w(Fae::User Fae::Role Fae::Option Fae::Change)
+      return false if restricted_classes.include?(klass.name.to_s) && !current_user.super_admin?
+
+      # restrict to only other boolean fields
+      return false unless klass.columns_hash[attribute].type == :boolean
+
       true
     end
 

data/app/helpers/fae/application_helper.rb

@@ -22,6 +22,10 @@ module Fae
       new_klass
     end
 
+    def deployments_active_class
+      '-parent-current -open' if params[:controller].split('/').last == 'deploy'
+    end
+
     def col_name_or_image(item, attribute)
       value = item.send(attribute)
       return if value.blank?
@@ -72,7 +76,9 @@ module Fae
         begin
           return link_to text, fae.edit_content_block_path(change.changeable.slug) if change.changeable_type == 'Fae::StaticPage'
           parent = change.changeable.respond_to?(:fae_parent) ? change.changeable.fae_parent : nil
-          edit_path = edit_polymorphic_path([main_app, fae_scope, parent, change.changeable])
+          edit_path = edit_polymorphic_path(
+            [main_app, fae_scope.to_sym, parent, change.changeable]
+          )
           return link_to text, edit_path
         rescue
           return text
@@ -80,6 +86,15 @@ module Fae
       end
     end
 
+    def netlify_enabled?
+      Fae.netlify.present? &&
+      Fae.netlify[:api_user].present? &&
+      Fae.netlify[:api_token].present? &&
+      Fae.netlify[:site].present? &&
+      Fae.netlify[:site_id].present? &&
+      Fae.netlify[:api_base].present?
+    end
+
     private
 
     def nav_path_current?(path)
@@ -110,5 +125,15 @@ module Fae
       "#{item.class.name.underscore.gsub('/', '_').pluralize}_#{item.id}"
     end
 
+    def multi_column_nav_ul_class(item_count)
+      num = item_count.length
+      if num > 30
+        'multicol-nav four'
+      elsif num > 20
+        'multicol-nav three'
+      elsif num > 10
+        'multicol-nav'
+      end
+    end
   end
 end

data/app/helpers/fae/form_helper.rb

@@ -11,6 +11,8 @@ module Fae
       add_input_class(options, 'js-markdown-editor') if options[:markdown].present?
       add_input_class(options, 'js-html-editor') if options[:html].present?
 
+      set_form_manager_container_attr(f, options, attribute) unless options[:show_form_manager] == false
+
       set_maxlength(f, attribute, options)
 
       f.input attribute, options
@@ -22,6 +24,8 @@ module Fae
       list_order f, attribute, options
       set_prompt f, attribute, options if !options[:include_blank].is_a?(String)
 
+      set_form_manager_container_attr(f, options, attribute) unless options[:show_form_manager] == false
+
       f.association attribute, options
     end
 
@@ -46,7 +50,8 @@ module Fae
 
     def fae_checkbox(f, attribute, options={})
       options[:type] ||= 'stacked'
-      options.update(as: :check_boxes, wrapper_class: "checkbox-wrapper js-checkbox-wrapper #{options[:wrapper_class]} -#{options[:type]}", no_label_div: true)
+      options[:input_type] ||= :check_boxes
+      options.update(as: options[:input_type], wrapper_class: "input checkbox-wrapper js-checkbox-wrapper #{options[:wrapper_class]} -#{options[:type]}", no_label_div: true)
       association_or_input f, attribute, options
     end
 
@@ -125,7 +130,7 @@ module Fae
       label = options[:label] || label_translation(attribute) || attribute_name
       if options[:markdown_supported].present? || options[:helper_text].present?
         label += content_tag :h6, class: 'helper_text' do
-          concat(options[:helper_text]) if options[:helper_text].present?
+          concat(content_tag(:span, options[:helper_text], class: 'helper_text_text')) if options[:helper_text].present?
           concat(content_tag(:span, 'Markdown Supported', class: 'markdown-support')) if options[:markdown_supported].present?
         end
       end
@@ -188,6 +193,25 @@ module Fae
       end
     end
 
+    def add_wrapper_class(options, class_name)
+      if options.key?(:wrapper_html)
+        options[:wrapper_html].merge!({class: "#{options[:wrapper_html][:class]} #{class_name}"})
+      else
+        options[:wrapper_html] = { class: class_name }
+      end
+    end
+
+    def set_form_manager_container_attr(f, options, attribute)
+      form_manager_id = f.object.class.name
+      form_manager_id = f.object.attached_as if f.object.try(:attached_as)
+      form_manager_id += "_#{attribute}"
+      if options.key?(:wrapper_html)
+        options[:wrapper_html]['data-form-manager-id'] = form_manager_id
+      else
+        options[:wrapper_html] = { 'data-form-manager-id' => form_manager_id }
+      end
+    end
+
     # sets collection to class.for_fae_index if not defined
     def list_order(f, attribute, options)
       if is_association?(f, attribute) && !options[:collection]

data/app/helpers/fae/view_helper.rb

@@ -13,16 +13,16 @@ module Fae
       Rails.application.routes.url_helpers.fae_path[1..-1]
     end
 
-    def fae_image_form(f, image_name, label: nil, alt_label: nil, caption_label: nil, show_alt: nil, show_caption: nil, required: nil, helper_text: nil, alt_helper_text: nil, caption_helper_text: nil, attached_as: nil)
-      render 'fae/images/image_uploader', f: f, image_name: image_name, label: label, alt_label: alt_label, caption_label: caption_label, show_alt: show_alt, show_caption: show_caption, required: required, helper_text: helper_text, alt_helper_text: alt_helper_text, caption_helper_text: caption_helper_text, attached_as: attached_as
+    def fae_image_form(f, image_name, label: nil, alt_label: nil, caption_label: nil, show_alt: nil, show_caption: nil, required: nil, helper_text: nil, alt_helper_text: nil, caption_helper_text: nil, attached_as: nil, show_form_manager: true)
+      render 'fae/images/image_uploader', f: f, image_name: image_name, label: label, alt_label: alt_label, caption_label: caption_label, show_alt: show_alt, show_caption: show_caption, required: required, helper_text: helper_text, alt_helper_text: alt_helper_text, caption_helper_text: caption_helper_text, attached_as: attached_as, show_form_manager: show_form_manager
     end
 
-    def fae_file_form(f, file_name, label: nil, helper_text: nil, required: nil)
-      render 'fae/application/file_uploader', f: f, file_name: file_name, label: label, required: required, helper_text: helper_text
+    def fae_file_form(f, file_name, label: nil, helper_text: nil, required: nil, show_form_manager: true)
+      render 'fae/application/file_uploader', f: f, file_name: file_name, label: label, required: required, helper_text: helper_text, show_form_manager: show_form_manager
     end
 
-    def fae_content_form(f, attribute, label: nil, hint: nil, helper_text: nil, markdown: nil, markdown_supported: nil, input_options: nil)
-      render 'fae/application/content_form', f: f, attribute: attribute, label: label, hint: hint, helper_text: helper_text, markdown: markdown, markdown_supported: markdown_supported, input_options: input_options
+    def fae_content_form(f, attribute, label: nil, hint: nil, helper_text: nil, markdown: nil, markdown_supported: nil, input_options: nil, show_form_manager: true)
+      render 'fae/application/content_form', f: f, attribute: attribute, label: label, hint: hint, helper_text: helper_text, markdown: markdown, markdown_supported: markdown_supported, input_options: input_options, show_form_manager: show_form_manager
     end
 
     def fae_index_image(image, path = nil)
@@ -40,9 +40,9 @@ module Fae
 
       link_to url, class: "slider-wrapper #{link_class}", method: :post, remote: true do
         '<div class="slider-options">
-          <div class="slider-option slider-option-yes">Yes</div>
+          <div class="slider-option slider-option-yes" aria-live="polite">Yes</div>
           <div class="slider-option-selector"></div>
-          <div class="slider-option slider-option-no">No</div>
+          <div class="slider-option slider-option-no" aria-live="polite">No</div>
         </div>'.html_safe
       end
     end
@@ -56,7 +56,11 @@ module Fae
 
     def fae_delete_button(item, delete_path = nil, *custom_attrs)
       return if item.blank?
-      delete_path ||= polymorphic_path([main_app, fae_scope, item.try(:fae_parent), item])
+
+      delete_path ||= polymorphic_path(
+        [main_app, fae_scope.to_sym, item.try(:fae_parent), item]
+      )
+
       attrs = { method: :delete, title: 'Delete', class: 'js-tooltip table-action', data: { confirm: t('fae.delete_confirmation') } }
       attrs.deep_merge!(custom_attrs[0]) if custom_attrs.present?
       link_to delete_path, attrs do
@@ -115,6 +119,15 @@ module Fae
       end
     end
 
+    def fae_filter_datepicker(attribute, options={})
+      options[:label]       ||= attribute.to_s.titleize
+      options[:placeholder] = options[:label] if options[:placeholder].nil?
+      content_tag :div, class: 'table-filter-group text-input datepicker' do
+        concat label_tag "filter[#{attribute}]", options[:label]
+        concat text_field_tag "filter[#{attribute}]", nil, placeholder: options[:placeholder]
+      end
+    end
+
     def fae_avatar(user = current_user)
       hash = Digest::MD5.hexdigest(user.email.downcase)
       "https://secure.gravatar.com/avatar/#{hash}?s=80&d=mm"

data/app/models/concerns/fae/base_model_concern.rb

@@ -27,6 +27,15 @@ module Fae
       "#{fae_nested_parent}_id"
     end
 
+    def fae_form_manager_model_name
+      return 'Fae::StaticPage' if self.class.name.constantize.superclass.name == 'Fae::StaticPage'
+      self.class.name
+    end
+
+    def fae_form_manager_model_id
+      self.id
+    end
+
     module ClassMethods
       def for_fae_index
         order(order_method)