five-two-nw-olivander 0.1.2.22 → 0.1.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf9c0144387ec2d459f02dadea4b96402dac9698093cc3fd897de95fc787ba7d
-  data.tar.gz: 84c801572bdec84621c76e8c34c0b640dcbc0f9b106edf4c0425d683455e7673
+  metadata.gz: 9898ba669152317001f7f33540a9367bb177c57ab66a7141599e2d813334c505
+  data.tar.gz: f39570a4bd11aedbf8f30dd60fbde534263b080297bfd057dafc3ae8ff2fbe9f
 SHA512:
-  metadata.gz: e2cae3668e04550b11d6514e73cd914d29aab621e3b63b3ddaf1d0f79af52bb1d6b92e24d9a1747f0cf8af5e043ccc6a288b4e64a5fc4c960893db417e37d932
-  data.tar.gz: a6dd96121cec897f2639f147fca0737fdb20fc4dab3e8879635b6d41bf385dfe9303ece99333687c9e51041d383a051bca081f1896c640eafb73e201ca3ef1de
+  metadata.gz: 442950a337255b5c53805f09f58eed5bd0cc2185f55977cedad2f2000783c5d04dfc9624f0b89cbdb9520446ee3c73914b5bd788f03a6af38f99273b893abfe7
+  data.tar.gz: 8afccfa400c2512f2beab92b60e2758017f9fbce51d240f05b4d2128b3e89dea80eb81d9d551ce68d574efabe9060f72fc6419c21af94acf0fe5b9e2ef34e282

data/app/components/olivander/components/resource_form_component.html.haml

@@ -4,7 +4,8 @@
     .row
       - section.fields.each do |field|
         %div{ class: section.column_class }
-          - if field.type == :association
-            = @f.association field.sym, disabled: !field.editable
+          - case field.type
+          - when :association
+            = @f.association field.sym, disabled: !field.editable, input_html: { data: { controller: "input-control-#{field.type}" } }
           - else 
-            = @f.input field.sym, disabled: !field.editable
+            = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { data: { controller: "input-control-#{field.type}" } }

data/app/helpers/olivander/application_helper.rb

@@ -84,5 +84,34 @@ module Olivander
 
       sym.to_s.titleize
     end
+
+    def is_dev_environment?
+      sidebar_context_suffix != 'production'
+    end
+
+    def sidebar_context_name
+      [@context.name, sidebar_context_suffix&.upcase].reject(&:blank?).join(' ')
+    end
+
+    def sidebar_context_suffix
+      suffix = nil
+      suffix ||= ENV['CLIENT_ENVIRONMENT']
+      parts = request.host.split('.')
+      suffix ||= parts.first.split('-').last.downcase if request.host.include?('-')
+      suffix ||= 'local' if %w[localhost test].include?(parts.last.downcase)
+      suffix ||= 'production'
+      suffix
+    end
+
+    def sidebar_background_class
+      @context.sidebar_background_class ||
+        ENV['SIDEBAR_BACKGROUND_CLASS'] ||
+        (is_dev_environment? ? 'bg-danger' : 'bg-info')
+    end
+
+    def favicon_link
+      favicon_path = is_dev_environment? ? '/images/favicon-dev.png' : '/images/favicon.ico'
+      favicon_link_tag(image_path(favicon_path))
+    end
   end
 end

data/app/inputs/custom_form_builder.rb

@@ -0,0 +1,43 @@
+class CustomFormBuilder < SimpleForm::FormBuilder
+  def initialize(*)
+    Rails.logger.warn "instantiating this class"
+    super
+  end
+
+  def association(association, options = {}, &block)
+    Rails.logger.warn "making an association"
+    resolve_custom_input_association(association, options)
+    super(association, options, &block)
+  end
+
+  def resolve_custom_input_association(association, options)
+    return if options[:as].present?
+
+    [
+      "#{object.class.name.demodulize}#{association.to_s.titleize}", "#{association.to_s.titleize}"
+    ].each do |key|
+      Rails.logger.debug "trying for #{key}"
+      next unless attempt_mapping_with_custom_namespace("#{key}Input").present?
+
+      options[:as] = key.to_sym
+      break
+    end
+  end
+
+  private
+
+  def fetch_association_collection(reflection, options)
+    Rails.logger.warn "we got into here"
+
+    options_method = "options_for_#{reflection.name}".to_sym
+    if object.respond_to?(options_method) then
+      Rails.logger.info "using specific method"
+      options.fetch(:collection) do
+        object.send(options_method)
+      end
+    else
+      Rails.logger.info "doing it old school"
+      super(reflection, options)
+    end
+  end
+end

data/app/inputs/date_time_input.rb

@@ -0,0 +1,38 @@
+class DateTimeInput < SimpleForm::Inputs::Base
+  def input(wrapper_options)
+    date_format = options[:date_format] || '%m/%d/%Y'
+    raw_value = object.public_send(attribute_name)
+    raw_value = raw_value.strftime(date_format) if raw_value.present?
+
+    disabled = options[:disabled] || false
+
+    field = @builder.text_field(attribute_name, id: "#{attribute_name}_datetimepicker", class: 'form-control', value: raw_value, disabled: disabled, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker")
+
+    add_on_class = options[:add_on_class] || "fa fa-calendar"
+
+    add_on = template.content_tag(:div, class: "input-group-prepend") do
+      add_on = template.content_tag(:div, class: "input-group-text") do
+        template.content_tag(:i, '', :class => add_on_class, 'data-toggle': 'datetimepicker', 'data-target': "##{attribute_name}_datetimepicker")
+      end
+    end
+
+    all = content_tag(:div, add_on + field, class: 'input-group')
+
+    script = "".html_safe
+    unless disabled then
+      picker_options = options[:picker_options] || { "format" => "MM/DD/YYYY" }
+
+      script = """
+        <script>
+        $(document).ready(function() {
+          $('##{attribute_name}_datetimepicker').datetimepicker(
+            #{picker_options.to_json}
+          );
+        });
+        </script>
+      """.html_safe
+    end
+
+    all + script
+  end
+end

data/app/views/application/_form.html.haml

@@ -1,5 +1,5 @@
 - read_only = action_name != 'edit'
-= simple_form_for(@resource) do |f|
+= simple_form_for(@resource, builder: CustomFormBuilder) do |f|
   .card.card-primary
     .card-header
       %h3.card-title= @resource

data/app/views/application/index.html.haml

@@ -18,6 +18,8 @@
               .card-header
                 %h3.card-title= I18n.t([@datatable.class.name.underscore, 'charts', k].join('.'))
                 .card-tools.text-right
+                  %button.btn.btn-tool{ type: :button, 'data-card-widget': :collapse }
+                    %i.fas.fa-minus
                   %button.btn.btn-tool{ type: :button, 'data-card-widget': :maximize }
                     %i.fas.fa-expand
               .card-body{ style: 'height: 220px' }

data/app/views/application/index.json.jbuilder

@@ -0,0 +1,4 @@
+resource = (@_effective_resource || Effective::Resource.new(controller_path))
+@resources = instance_variable_get('@' + resource.plural_name)
+
+json.array! @resources

data/app/views/layouts/olivander/adminlte/_head.html.haml

@@ -2,6 +2,7 @@
   %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
   %title= page_title
   %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
+  = favicon_link
   = csrf_meta_tags
   = csp_meta_tag
   %link{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700&display=fallback' }

data/app/views/layouts/olivander/adminlte/_sidebar.html.haml

@@ -1,9 +1,9 @@
 / Main Sidebar Container
 %aside.main-sidebar.sidebar-dark-primary.elevation-4{ data: { controller: 'left-nav' }}
   / Brand Logo
-  %a.brand-link.bg-info{:href => "/"}
+  %a.brand-link{ href: "/", class: sidebar_background_class }
     %img.brand-image.img-circle.elevation-3{:alt => @context.logo.alt, :src => @context.logo.url, :style => "opacity: .8"}/
-    %span.brand-text.font-weight-light= @context.name
+    %span.brand-text.font-weight-light= sidebar_context_name
   / Sidebar
   .sidebar
     / Sidebar user panel (optional)

data/config/initializers/simple_form.rb

@@ -13,7 +13,7 @@ SimpleForm.setup do |config|
   # wrapper, change the order or even add your own to the
   # stack. The options given below are used to wrap the
   # whole input.
-  config.wrappers :default, class: :input,
+  config.wrappers :default, class: "form-group",
     hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
     ## Extensions enabled by default
     # Any of these extensions can be disabled for a
@@ -52,16 +52,82 @@ SimpleForm.setup do |config|
     b.optional :readonly
 
     ## Inputs
-    # b.use :input, class: 'input', error_class: 'is-invalid', valid_class: 'is-valid'
-    b.use :label_input
+    # b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :label #, class: 'form-control'
+    b.use :input, class: 'form-control'
     b.use :hint,  wrap_with: { tag: :span, class: :hint }
-    b.use :error, wrap_with: { tag: :span, class: :error }
+    b.use :error, wrap_with: { tag: :span, class: "text-danger" }
 
     ## full_messages_for
     # If you want to display the full error message for the attribute, you can
     # use the component :full_error, like:
     #
     # b.use :full_error, wrap_with: { tag: :span, class: :error }
+
+    # b.wrapper
+  end
+
+  config.wrappers :checkbox, class: "form-check",
+    hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
+      ba.use :label_text
+    end
+    b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
+    b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
+  end
+
+  # vertical input for boolean
+  config.wrappers :vertical_boolean, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :form_check_wrapper, tag: 'div', class: 'form-check' do |bb|
+      bb.use :input, class: 'form-check-input' #, error_class: 'is-invalid', valid_class: 'is-valid'
+      bb.use :label, class: 'form-check-label'
+      bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
+      bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
+    end
+  end
+
+  # vertical input for radio buttons and check boxes
+  config.wrappers :vertical_collection, item_wrapper_class: 'form-check', item_label_class: 'form-check-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
+      ba.use :label_text
+    end
+    b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
+    b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
+  end
+
+  # vertical input for inline radio buttons and check boxes
+  config.wrappers :vertical_collection_inline, item_wrapper_class: 'form-check form-check-inline', item_label_class: 'form-check-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
+      ba.use :label_text
+    end
+    b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
+    b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
+  end
+
+  config.wrappers :switch, class: "custom-control custom-switch",
+    hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :minlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :input, class: 'custom-control-input'
+    #b.use :label, class: 'custom-control-label'
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: "text-danger" }
   end
 
   # The default wrapper to be used by the FormBuilder.
@@ -71,7 +137,7 @@ SimpleForm.setup do |config|
   # Defaults to :nested for bootstrap config.
   #   inline: input + label
   #   nested: label > input
-  config.boolean_style = :nested
+  config.boolean_style = :inline
 
   # Default class for buttons
   config.button_class = 'btn'
@@ -137,10 +203,24 @@ SimpleForm.setup do |config|
   # Custom wrappers for input types. This should be a hash containing an input
   # type as key and the wrapper that will be used for all inputs with specified type.
   # config.wrapper_mappings = { string: :prepend }
+  config.wrapper_mappings = {
+    boolean:  :vertical_boolean,
+    check_boxes:     :check_box,
+    # date:          :horizontal_multi_select,
+    # datetime:      :horizontal_multi_select,
+    # file:          :horizontal_file,
+    # radio_buttons: :horizontal_collection,
+    # range:         :horizontal_range,
+    # time:          :horizontal_multi_select
+  }
 
   # Namespaces where SimpleForm should look for custom input classes that
   # override default inputs.
-  # config.custom_inputs_namespaces << "CustomInputs"
+  Dir.glob('app/inputs/**/')
+     .map{ |x| x.gsub('app/inputs/', '').split('/').reject(&:blank?).join('/').camelize }
+     .reject(&:blank?).each do |d|
+    config.custom_inputs_namespaces << d
+  end
 
   # Default priority for time_zone inputs.
   # config.time_zone_priority = nil

data/lib/olivander/application_context.rb

@@ -1,6 +1,6 @@
 module Olivander
   class ApplicationContext
-    attr_accessor :name, :logo, :company, :menu_items, :route_builder, :sign_out_path
+    attr_accessor :name, :logo, :company, :menu_items, :route_builder, :sign_out_path, :sidebar_background_class
 
     def self.default
       ctx = ApplicationContext.new

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.22"
+  VERSION = '0.1.2.24'.freeze
 end

data/lib/templates/erb/scaffold/_form.html.erb

@@ -0,0 +1,15 @@
+<%# frozen_string_literal: true %>
+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+  <%%= f.error_notification %>
+  <%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+  <div class="form-inputs">
+  <%- attributes.each do |attribute| -%>
+    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+  <%- end -%>
+  </div>
+
+  <div class="form-actions">
+    <%%= f.button :submit %>
+  </div>
+<%% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.22
+  version: 0.1.2.24
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -194,6 +194,8 @@ files:
 - app/controllers/olivander/application_controller.rb
 - app/datatables/olivander/datatable.rb
 - app/helpers/olivander/application_helper.rb
+- app/inputs/custom_form_builder.rb
+- app/inputs/date_time_input.rb
 - app/jobs/olivander/application_job.rb
 - app/mailers/olivander/application_mailer.rb
 - app/models/olivander/application_record.rb
@@ -201,6 +203,7 @@ files:
 - app/views/application/_resource_form_actions.html.haml
 - app/views/application/edit.html.haml
 - app/views/application/index.html.haml
+- app/views/application/index.json.jbuilder
 - app/views/application/new.html.haml
 - app/views/application/show.html.haml
 - app/views/effective/resource/_actions_dropleft.html.haml
@@ -228,6 +231,7 @@ files:
 - lib/olivander/menus/menu_item.rb
 - lib/olivander/version.rb
 - lib/tasks/olivander_tasks.rake
+- lib/templates/erb/scaffold/_form.html.erb
 - lib/templates/erb/scaffold/_form.html.haml
 homepage: https://rubygems.org/gems/olivander
 licenses: