fae-rails 2.2.0 → 3.0.0

data/app/assets/stylesheets/fae/globals/navigation/_utility.scss

@@ -73,7 +73,7 @@
   height: 40px;
   display: inline-block;
   vertical-align: middle;
-  background: $c-custom-highlight;
+  background: var(--highlight-color);
 }
 
 .grabatar-link {

data/app/assets/stylesheets/fae/modules/_errors-bar.scss

@@ -0,0 +1,19 @@
+.errors-bar-wrapper {
+  border-color: $c-error-content;
+  background: $c-error-bg;
+  color: $c-error-content;
+  width: 100%;
+  padding: 20px;
+  display: none;
+  
+  .errors-bar {
+    display: flex;
+    margin-top: 20px;
+    flex-direction: column;
+  }
+
+  .error-jump-link {
+    margin-right: 20px;
+    font-size: 14px;
+  }
+}

data/app/assets/stylesheets/fae/modules/_toggles.scss

@@ -14,7 +14,7 @@
     background-color: $c-mid-grey;
   }
   &.slider-yes-selected {
-    background: $c-custom-highlight;
+    background: var(--highlight-color);
   }
 }
 

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

@@ -39,6 +39,11 @@ input[type=email] {
     margin-top: 10px;
     margin-bottom: 10px;
   }
+
+  .addedit-form-thumb {
+    max-width: 150px;
+    max-height: 100px;
+  }
 }
 
 .js-addedit-form-wrapper {
@@ -98,3 +103,11 @@ input[type=email] {
     margin-bottom: 10px;
   }
 }
+
+.input.field {
+
+  &.highlight {
+    outline: 2px dashed green;
+    outline-offset: 1px;
+  }
+}

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

@@ -149,11 +149,11 @@
 
 .ui-datepicker-calendar {
   .ui-state-hover {
-    color: $c-custom-highlight;
+    color: var(--highlight-color);
   }
 
   .ui-state-active {
-    background: $c-custom-highlight;
+    background: var(--highlight-color);
     color: $c-white;
     position: relative;
   }
@@ -323,12 +323,12 @@
 
         &.checked,
         &.toMonth.valid.checked {
-          background: $c-custom-highlight;
+          background: var(--highlight-color);
           color: $c-white;
         }
 
         &.real-today.checked {
-          background: $c-custom-highlight;
+          background: var(--highlight-color);
         }
       }
 

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

@@ -3,7 +3,7 @@
   display: inline-block;
   padding-left: 7px;
   cursor: pointer;
-  color: $c-custom-highlight;
+  color: var(--highlight-color);
 
   &:after {
     @include icon-stuff;

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

@@ -6,7 +6,7 @@ label {
   color: $c-text-heavy;
 
   abbr {
-    color: $c-custom-highlight;
+    color: var(--highlight-color);
   }
 
   h6 {

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

@@ -228,7 +228,7 @@
           position: absolute;
           right: 15px;
           top: 9px;
-          color: $c-custom-highlight;
+          color: var(--highlight-color);
         }
       }
 
@@ -289,7 +289,7 @@
           content: fae-icon(check);
           padding-right: 5px;
           margin-left: -19px;
-          color: $c-custom-highlight;
+          color: var(--highlight-color);
         }
       }
 

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

@@ -27,3 +27,74 @@
     }
   }
 }
+
+.editor-preview,
+.editor-preview-side {
+  h1 {
+    font-size: 26px;
+  }
+
+  h2 {
+    font-size: 24px;
+  }
+
+  h3 {
+    font-size: 22px;
+  }
+
+  h4 {
+    font-size: 20px;
+  }
+
+  h5 {
+    font-size: 18px;
+  }
+
+  h6 {
+    font-size: 16px;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-weight: bold;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  p,
+  ul,
+  ol {
+    background: none;
+    border: 0;
+    color: black;
+    letter-spacing: 0;
+    margin: inherit;
+    padding: inherit;
+    text-transform: inherit;
+  }
+
+  ul {
+    list-style: disc;
+  }
+
+  ol {
+    list-style: decimal;
+  }
+
+  ul,
+  ol {
+    padding-left: 30px;
+  }
+
+  em {
+    font-style: italic;
+  }
+}

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

@@ -22,7 +22,7 @@ tbody {
     &:hover {
       td {
         &:first-child {
-          border-left-color: $c-custom-highlight;
+          border-left-color: var(--highlight-color);
         }
       }
     }

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

@@ -19,7 +19,7 @@
 
     &:hover {
       color: $c-white;
-      background: $c-custom-highlight;
+      background: var(--highlight-color);
     }
   }
 
@@ -29,6 +29,6 @@
 
   .current {
     color: $c-white;
-    background: $c-custom-highlight;
+    background: var(--highlight-color);
   }
 }

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

@@ -8,7 +8,7 @@
     min-width: 235px;
     height: 330px;
     padding: 35px;
-    border-top: 8px solid $c-custom-highlight;
+    border-top: 8px solid var(--highlight-color);
     border-radius: 4px;
     background: white;
     color: $c-mid-dark-grey;

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

@@ -15,7 +15,7 @@
 }
 
 .login-area {
-  border-top: 10px solid $c-custom-highlight;
+  border-top: 10px solid var(--highlight-color);
   margin: auto;
   border-radius: 5px;
   box-shadow: 0 0 5px 0 $c-grey;

data/app/assets/stylesheets/fae/simplemde_override.scss

@@ -0,0 +1,32 @@
+.editor-preview,
+.editor-preview-side {
+  h1 { font-size: 26px; }
+  h2 { font-size: 24px; }
+  h3 { font-size: 22px; }
+  h4 { font-size: 20px; }
+  h5 { font-size: 18px; }
+  h6 { font-size: 16px; }
+
+  h1, h2, h3, h4, h5, h6 {
+    font-weight: bold;
+  }
+
+  h1, h2, h3, h4, h5, h6, p, ul, ol {
+    background: none;
+    border: 0;
+    color: black;
+    letter-spacing: 0;
+    margin: inherit;
+    padding: inherit;
+    text-transform: inherit;
+  }
+
+  ul { list-style: disc; }
+  ol { list-style: decimal; }
+
+  ul, ol {
+    padding-left: 30px;
+  }
+
+  em { font-style: italic; }
+}

data/app/controllers/fae/application_controller.rb

@@ -60,7 +60,7 @@ module Fae
     end
 
     def show_404
-      render template: 'fae/pages/error404.html.slim', layout: 'fae/error.html.slim', status: :not_found
+      render 'fae/pages/error404', layout: 'fae/error', status: :not_found
     end
 
     def set_option
@@ -125,7 +125,7 @@ module Fae
 
     def load_and_filter_models
       # load of all models since Rails caches activerecord queries.
-      Rails.application.eager_load!
+      Zeitwerk::Loader.eager_load_all
       ActiveRecord::Base.descendants.map.reject { |m| m.name['Fae::'] || !m.instance_methods.include?(:fae_display_field) || Fae.dashboard_exclusions.include?(m.name) || !authorize_model(m) }
     end
 

data/app/controllers/fae/base_controller.rb

@@ -16,7 +16,7 @@ module Fae
       end
       respond_to do |format|
         format.html
-        format.csv { send_data @items.to_csv, filename: @items.name.parameterize + "." + Time.now.to_s(:filename) + '.csv'  }
+        format.csv { send_data @items.to_csv, filename: @items.name.parameterize + "." + Time.now.to_fs(:filename) + '.csv'  }
       end
     end
 

data/app/controllers/fae/deploy_hooks_controller.rb

@@ -22,7 +22,7 @@ module Fae
       if @deploy_hook.save
         flash[:notice] = t('fae.save_notice')
         @deploy_hooks = DeployHook.all
-        render template: table_template_path
+        render partial: table_template_path
       else
         render action: 'new'
       end
@@ -32,7 +32,7 @@ module Fae
       if @deploy_hook.update(deploy_hook_params)
         flash[:notice] = t('fae.save_notice')
         @deploy_hooks = DeployHook.all
-        render template: table_template_path
+        render partial: table_template_path
       else
         render action: 'edit'
       end
@@ -45,7 +45,7 @@ module Fae
         flash[:alert] = t('fae.delete_error')
       end
       @deploy_hooks = DeployHook.all
-      render template: table_template_path
+      render partial: table_template_path
     end
 
     private
@@ -64,7 +64,7 @@ module Fae
       end
 
       def table_template_path
-        "fae/deploy_hooks/_table.html.slim"
+        "fae/deploy_hooks/table"
       end
 
   end

data/app/controllers/fae/setup_controller.rb

@@ -34,11 +34,11 @@ module Fae
     private
 
     def show_404
-      render template: 'fae/pages/error404.html.slim', layout: 'fae/error.html.slim', status: :not_found
+      render 'fae/pages/error404', layout: 'fae/error', status: :not_found
     end
 
     def show_401
-      render template: 'fae/pages/error404.html.slim', layout: 'fae/error.html.slim', status: :unauthorized
+      render 'fae/pages/error404', layout: 'fae/error', status: :unauthorized
     end
 
     def user_params

data/app/helpers/fae/application_helper.rb

@@ -31,7 +31,7 @@ module Fae
       return if value.blank?
       # if item is an image
       if value.class.name == 'Fae::Image'
-        image_tag(value.asset.thumb.url) if value.asset.thumb.url.present?
+        image_tag(nested_table_thumb_url(value), class: 'addedit-form-thumb') if nested_table_thumb_url(value).present?
       # if item's attribute is an association
       elsif item.class.reflections.include?(attribute)
         value.try(:fae_display_field)
@@ -135,5 +135,14 @@ module Fae
         'multicol-nav'
       end
     end
+
+    def nested_table_thumb_url(image)
+      return unless image.asset.file
+      if image.asset.file.extension.downcase == 'svg'
+        image.asset.url
+      else
+        image.asset.thumb.url
+      end
+    end
   end
 end

data/app/helpers/fae/view_helper.rb

@@ -25,6 +25,10 @@ module Fae
       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_seo_set_form(f, seo_set_name)
+      render 'fae/application/seo_set_form', f: f, seo_set_name: seo_set_name
+    end
+
     def fae_index_image(image, path = nil)
       return if image.blank? || image.asset.blank? || image.asset.thumb.blank?
       content_tag :div, class: 'image-mat' do

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

@@ -100,6 +100,14 @@ module Fae
         accepts_nested_attributes_for file_name_symbol, allow_destroy: true
       end
 
+      def has_fae_seo_set(set_name_symbol)
+        has_one set_name_symbol,
+          as: :seo_setable,
+          class_name: '::Fae::SeoSet',
+          dependent: :destroy
+        accepts_nested_attributes_for set_name_symbol, allow_destroy: true
+      end
+
     end
 
     private

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

@@ -0,0 +1 @@
+module Fae::SeoSetConcern; end

data/app/models/fae/change.rb

@@ -9,6 +9,7 @@ module Fae
     serialize :updated_attributes
 
     class << self
+
       # writing current_user to thread for thread safety
       def current_user=(user)
         Thread.current[:current_user] = user

data/app/models/fae/option.rb

@@ -6,6 +6,7 @@ module Fae
 
     validates_inclusion_of :singleton_guard, :in => [0]
     validates_presence_of :title, :time_zone, :live_url
+    validates :colorway, format: { with: /(^[0-9a-fA-F]{6}$)|(^$)/, message: "Invalid hex code or doesn't meet length requirement of exactly 6 characters" }
 
     has_one :logo, -> { where(attached_as: 'logo' ) },
       as: :imageable,

data/app/models/fae/seo_set.rb

@@ -0,0 +1,14 @@
+module Fae
+  class SeoSet < ActiveRecord::Base
+    include Fae::BaseModelConcern
+    include Fae::SeoSetConcern
+
+    has_fae_image :social_media_image
+    belongs_to :seo_setable, polymorphic: true, touch: true, optional: true
+
+    def fae_display_field
+      seo_title
+    end
+
+  end
+end

data/app/services/fae/netlify_api.rb

@@ -28,7 +28,7 @@ module Fae
 
     private
 
-    def get(endpoint, params = nil)
+    def get(endpoint)
       begin
         uri = URI.parse(endpoint)
         request = Net::HTTP::Get.new(uri)
@@ -36,11 +36,18 @@ module Fae
         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?
+        if response.is_a?(Net::HTTPSuccess)
+          return JSON.parse(response.body) if response.body.present?
+        else
+          @logger.info "\n"
+          @logger.info "Get returned non-success code: #{response.code}"
+          @logger.info "Endpoint: #{endpoint}"
+          @logger.info "Body: #{response.body}" if response.body.present?
+        end
       rescue Exception => e
         @logger.info "\n"
-        @logger.info "Failed getting on #{DateTime.now} to #{endpoint}"
-        @logger.info "Params: #{params}"
+        @logger.info "Get failed"
+        @logger.info "Endpoint: #{endpoint}"
         @logger.info "Reason: #{e}"
       end
     end
@@ -54,10 +61,19 @@ module Fae
         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?
+        if response.is_a?(Net::HTTPSuccess)
+          return JSON.parse(response.body) if response.body.present?
+        else
+          @logger.info "\n"
+          @logger.info "Post returned non-success code: #{response.code}"
+          @logger.info "Endpoint: #{endpoint}"
+          @logger.info "Params: #{params}"
+          @logger.info "Body: #{response.body}" if response.body.present?
+        end
       rescue Exception => e
         @logger.info "\n"
-        @logger.info "Failed posting on #{DateTime.now} to #{endpoint}"
+        @logger.info "Post failed"
+        @logger.info "Endpoint: #{endpoint}"
         @logger.info "Params: #{params}"
         @logger.info "Reason: #{e}"
       end

data/app/uploaders/fae/file_uploader.rb

@@ -18,7 +18,7 @@ module Fae
 
     # Add a white list of extensions which are allowed to be uploaded.
     # For images you might use something like this:
-    def extension_whitelist
+    def extension_allowlist
       %w(jpg jpeg gif png pdf)
     end
 

data/app/uploaders/fae/image_uploader.rb

@@ -10,8 +10,8 @@ module Fae
       model.file_size = file.size
     end
 
-    def extension_whitelist
-      %w(jpg jpeg gif png ico)
+    def extension_allowlist
+      %w(jpg jpeg gif png ico svg)
     end
 
     # Override the directory where uploaded files will be stored.

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

@@ -16,8 +16,8 @@ header.main-header#js-main-header
   - 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 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/_seo_set_form.html.slim

@@ -0,0 +1,12 @@
+ruby:
+  require_locals ['f'], local_assigns
+  item            ||= f.object
+  seo_set_name    ||= :seo_set
+  the_seo_set       = item.send(seo_set_name)
+
+= f.simple_fields_for seo_set_name do |i|
+  = fae_input i, :seo_title, label: 'SEO Title'
+  = fae_input i, :seo_description, label: 'SEO Description'
+  = fae_input i, :social_media_title
+  = fae_input i, :social_media_description
+  = fae_image_form i, :social_media_image, helper_text: '1200 x 630 px., JPG'

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

@@ -3,13 +3,14 @@
     h1 Root Settings
     .content-header-buttons
       a.button#js-header-cancel href=fae.root_path(cancelled: true) = t('fae.form.cancel')
-      = f.submit t('fae.form.save')
+      input name="commit" type="submit" value=t('fae.form.save')
 
   == render 'flash_messages'
 
   main.content
     = fae_input f, :title, label: t('fae.options.project.name')
     = fae_input f, :time_zone, wrapper_class: 'select'
+    = fae_input f, :colorway, label: t('fae.options.colorway'), helper_text: t('fae.options.colorway_helper')
     = 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')

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

@@ -20,7 +20,7 @@ header.content-header.js-content-header.-dashboard
           - begin
             - parent = item.respond_to?(:fae_parent) ? item.fae_parent : nil
             - 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])
+            - index_path = polymorphic_path([main_app, fae_scope.to_sym, parent, item.class.to_s.pluralize.underscore.to_sym])
             tr
               td: a href=edit_path = item.fae_display_field
               td: a href=index_path = item.class.to_s

data/app/views/fae/shared/_errors.slim

@@ -1,4 +1 @@
-- unless flash.present?
-  .flash-message.alert.hide = t('fae.save_error')
-
 == render 'flash_messages'

data/app/views/fae/shared/_form_header.html.slim

@@ -42,3 +42,7 @@ header.content-header.js-content-header
 
 - if show_flash_messages
   == render 'fae/shared/errors'
+
+.errors-bar-wrapper
+  h2 = t('fae.save_error')
+  .errors-bar

data/app/views/fae/shared/_nested_table.html.slim

@@ -12,6 +12,7 @@ ruby:
   title               ||= assoc_name.titleize             # 'Restaurant Bars'
   add_button_text     ||= t('fae.common.add', title: title.singularize)
   hide_add_button     ||= false
+  hide_delete_button  ||= false
   ordered             ||= false
   has_thumb           ||= false
   edit_column         ||= false
@@ -34,7 +35,7 @@ ruby:
     new_path += "item_id=#{parent_item.id}&=item_class=#{parent_item.class.to_s}"
   end
 
-  options_for_table = { index: index, assoc: assoc, assoc_name: assoc_name, title: title, add_button_text: add_button_text, hide_add_button: hide_add_button, ordered: ordered, has_thumb: has_thumb, edit_column: edit_column, cols: cols, assoc_name_singular: assoc_name_singular, new_path: new_path, edit_path: edit_path }
+  options_for_table = { index: index, assoc: assoc, assoc_name: assoc_name, title: title, add_button_text: add_button_text, hide_add_button: hide_add_button, hide_delete_button: hide_delete_button, ordered: ordered, has_thumb: has_thumb, edit_column: edit_column, cols: cols, assoc_name_singular: assoc_name_singular, new_path: new_path, edit_path: edit_path }
   options_for_table[:parent_item] = parent_item unless index
 
 section.addedit-form.js-addedit-form class="#{'content' if index}"

data/app/views/fae/shared/_shared_nested_table.html.slim

@@ -2,6 +2,7 @@ ruby:
   colspan = cols.length + 1
   colspan += 1 if ordered
   colspan += 1 if has_thumb
+  colspan -= 1 if hide_delete_button
   table_class = ordered ? 'js-sort-row' : nil
 
   options_for_td = { cols: cols, edit_path: edit_path, edit_column: edit_column }
@@ -17,7 +18,8 @@ table class=table_class
         = th_columns(col)
       - if edit_column
         th.-action data-sorter="false"
-      th.-action
+      - unless hide_delete_button
+        th.-action
   tbody
     - records = index ? @items : parent_item.send(assoc)
     - if records.present?
@@ -35,7 +37,8 @@ table class=table_class
             td
               a.js-edit-link.js-tooltip.table-action title=t('fae.common.edit') href=self.send(edit_path, item)
                 i.icon-edit
-          td = fae_delete_button item, "/#{fae_path}/#{assoc_name}/#{item.id.to_s}", class: 'js-tooltip table-action js-delete-link', remote: true
+          - unless hide_delete_button
+            td = fae_delete_button item, "/#{fae_path}/#{assoc_name}/#{item.id.to_s}", class: 'js-tooltip table-action js-delete-link', remote: true
 
     - elsif !hide_add_button
       tr

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

@@ -9,7 +9,7 @@ html
     == javascript_include_tag 'fae/application'
     == csrf_meta_tags
 
-  body class=body_class
+  body class=body_class style=('--highlight-color:' + '#' + @option.colorway if @option.colorway.present?)
     == render 'mobilenav'
     == render 'header'
     .js-form-manager-container