five-two-nw-olivander 0.2.0.40 → 0.2.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4610c47ded82a152be778053557a0d35d660727ae1ab9da2059e7d19fbba7a1a
-  data.tar.gz: e7fc3504c61308e210324d2f498d40a35c6517847b6adfc79c73f54eb7b19801
+  metadata.gz: f4f6a5a132be75741c971c202ffb9e84e9dd0baa2b4d801a27d8bc062becc82a
+  data.tar.gz: f3fae3ffa8b17681bb9930aa3ae8b93686cbec70e2e78fc76963b8836a4b7286
 SHA512:
-  metadata.gz: 064fc6c35d3a25fced4443266cf339eacf68788aaef92a9eebd1d284d5c7699bbea22a315fd0a6adf2256ea3e99d22a3d1152720dcbfa401be5f6fbfff818a09
-  data.tar.gz: df67abe52eb81428c88f36be3d3df6a4d04bc265372e8fe8618e5a95d858ddcc4f25d873a1cb8f583ee78f647a1ae489e3fbbc5be24cf215f6d4854def638630
+  metadata.gz: a8af9883db04b3f000e2b926ab7dff2d1f5e1f9934ad752d6818d6cd1324353364c6077e31acd45c991ffb461a7d754cbf927e18fba400ed3541ebd914e7f61f
+  data.tar.gz: 718f1125a137e63d61f182067918306ccf000c077aee2845e212c7401f94f225638a2f3df05527fbdc8c7d9540b498b9486c34151b8a440ea480151919587cf7

data/app/assets/javascripts/adminlte.js

@@ -37,4 +37,17 @@ $(document).ready(function(e) {
     })
     label.appendChild(helpCircle)
   })
+
+  $(window).scroll(function() {
+    if ($(this).scrollTop() > 100) {
+      $('#back-to-top').fadeIn();
+    } else {
+      $('#back-to-top').fadeOut();
+    }
+  });
+
+  $('#back-to-top').click(function(e) {
+    e.preventDefault();
+    $('html, body').animate({ scrollTop: 0 }, '500');
+  });
 })

data/app/assets/stylesheets/adminlte.css

@@ -48,4 +48,17 @@ ul.no-bullets {
   padding: 0; /* Remove padding */
   margin: 0; /* Remove margins */
 }
-table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) { background: rgba(0, 0, 0, 0.05); }
+table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) { background: rgba(0, 0, 0, 0.05); }
+/* Back to Top Button */
+#back-to-top {
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  display: none;
+  z-index: 100000;
+  font-size: 18px;
+  padding: 10px 15px;
+  border-radius: 50%;
+}
+/* Hover effect */
+#back-to-top:hover { background-color: #999; color: white; }

data/app/controllers/concerns/olivander/resources/crud_controller.rb

@@ -29,7 +29,7 @@ module Olivander
         def index_param_search
           params.each do |param|
             effective_resource.klass.columns.each do |col|
-              next unless col.name == param[0] #&& !param[1].blank?
+              next unless col.name == param[0] # && !param[1].blank?
 
               self.resources = self.resources.where(param[0].to_sym => param[1])
             end
@@ -42,10 +42,10 @@ module Olivander
           else
             k = resources.klass
             self.resources = k.all
-            fields = %w[name title description text].keep_if{ |field| k.respond_to?(field) }
+            fields = %w[name title description text].keep_if { |field| k.respond_to?(field) }
             unless params[:term].blank?
               like_term = "%#{ActiveRecord::Base.sanitize_sql_like(params[:term])}%"
-              clauses = fields.map{ |field| "#{field} ilike '#{like_term}'" }.join(' or ')
+              clauses = fields.map { |field| "#{field} ilike '#{like_term}'" }.join(' or ')
             end
             orders = fields.join(', ')
             self.resources = self.resources.where(clauses) if clauses.present? && clauses.length.positive?
@@ -64,7 +64,7 @@ module Olivander
           run_callbacks(:resource_render)
 
           respond_to do |format|
-            format.html { }
+            format.html {}
             format.js { render('show', formats: :js) }
             format.json { render json: resource }
             format.turbo_stream {}
@@ -76,7 +76,7 @@ module Olivander
         end
 
         def respond_with_success(resource, action)
-          return if (response.body.respond_to?(:length) && response.body.length > 0)
+          return if response.body.respond_to?(:length) && response.body.length > 0
 
           if specific_redirect_path?(action)
             respond_to do |format|
@@ -93,7 +93,7 @@ module Olivander
                 else
                   render(
                     (template_present?(action) ? action : :member_action),
-                    locals: { action: action, remote_form_redirect: resource_redirect_path(resource, action)}
+                    locals: { action: action, remote_form_redirect: resource_redirect_path(resource, action) }
                   )
                 end
               end
@@ -127,7 +127,9 @@ module Olivander
               end
 
               format.json { render json: resource }
-              format.turbo_stream {}
+              format.turbo_stream do
+                flash.now[:success] ||= resource_flash(:success, resource, action)
+              end
             end
           end
         end
@@ -186,8 +188,8 @@ module Olivander
           params.keys.each do |k|
             if params[k].is_a? ActionController::Parameters
               recurse_and_fix_date_params(params[k])
-            else
-              params[k] = rearrange_date_param(params[k]) if date_params.include?(k.to_sym)
+            elsif date_params.include?(k.to_sym)
+              params[k] = rearrange_date_param(params[k])
             end
           end
         end

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

@@ -9,6 +9,9 @@
       -# .preloader.flex-column.justify-content-center.align-items-center
       -#   %img.animation__shake{:alt => "FFES Logo", :height => "60", :src => image_path("logo.gif")}
       = render partial: 'layouts/olivander/adminlte/navbar'
+      - if Olivander::CurrentContext.application_context.back_to_top?
+        %a.btn.btn-secondary.btn-lg#back-to-top{ href: '#' }
+          %i.fa.fa-arrow-up
       - if Olivander::CurrentContext.application_context.sidebar?
         = render partial: 'layouts/olivander/adminlte/sidebar'
       -# = render partial: 'layouts/olivander/adminlte/content'

data/lib/olivander/application_context.rb

@@ -1,21 +1,24 @@
+# frozen_string_literal: true
+
 module Olivander
+  # DTO to represent the overall application context
   class ApplicationContext
     attr_accessor :name, :logo, :login_logo, :company, :menu_items,
                   :route_builder, :sign_out_path, :sidebar_background_class,
                   :nav_container, :nav_class, :layout_container, :layout_class,
-                  :sidebar
-
-    DEFAULT_APPLICATION_NAME  = 'Application Name'.freeze
-    DEFAULT_SIGN_OUT_PATH     = '/users/sign_out'.freeze
-    DEFAULT_HEADER_CLASSES    = ''.freeze
-    DEFAULT_LOGO_URL          = '/images/olivander_logo.png'.freeze
-    DEFAULT_LOGO_ALT          = 'Logo Image'.freeze
-    DEFAULT_LOGIN_LOGO_URL    = '/images/olivander_login_logo.png'.freeze
-    DEFAULT_LOGIN_LOGO_ALT    = 'Login Logo Image'.freeze
-    DEFAULT_COMPANY_URL       = '/'.freeze
-    DEFAULT_COMPANY_ALT       = 'Company Name'.freeze
-    DEFAULT_LAYOUT_CLASS      = 'hold-transition sidebar-mini layout-fixed'.freeze
-    DEFAULT_NAV_CLASS         = 'navbar-expand navbar-white navbar-light'.freeze
+                  :sidebar, :back_to_top
+
+    DEFAULT_APPLICATION_NAME  = 'Application Name'
+    DEFAULT_SIGN_OUT_PATH     = '/users/sign_out'
+    DEFAULT_HEADER_CLASSES    = ''
+    DEFAULT_LOGO_URL          = '/images/olivander_logo.png'
+    DEFAULT_LOGO_ALT          = 'Logo Image'
+    DEFAULT_LOGIN_LOGO_URL    = '/images/olivander_login_logo.png'
+    DEFAULT_LOGIN_LOGO_ALT    = 'Login Logo Image'
+    DEFAULT_COMPANY_URL       = '/'
+    DEFAULT_COMPANY_ALT       = 'Company Name'
+    DEFAULT_LAYOUT_CLASS      = 'hold-transition sidebar-mini layout-fixed'
+    DEFAULT_NAV_CLASS         = 'navbar-expand navbar-white navbar-light'
 
     def initialize(**kwargs)
       self.name = kwargs[:name] || ENV['OLIVANDER_APP_NAME'] || DEFAULT_APPLICATION_NAME
@@ -24,11 +27,12 @@ module Olivander
       self.company = kwargs[:company] || Company.new(name: kwargs[:company_name], url: kwargs[:company_url])
       self.sign_out_path = kwargs[:sign_out_path] || DEFAULT_SIGN_OUT_PATH
       self.menu_items = kwargs[:menu_items] || []
-      self.nav_container = kwargs[:nav_container] || 'false'.freeze == 'true'.freeze
+      self.nav_container = kwargs[:nav_container] || 'false' == 'true'
       self.nav_class = kwargs[:nav_class] || DEFAULT_NAV_CLASS
-      self.layout_container = kwargs[:layout_container] || 'false'.freeze == 'true'.freeze
+      self.layout_container = kwargs[:layout_container] || 'false' == 'true'
       self.layout_class = kwargs[:layout_class] || DEFAULT_LAYOUT_CLASS
-      self.sidebar = kwargs[:sidebar] || 'true' == 'true'.freeze
+      self.sidebar = (kwargs[:sidebar] || true)
+      self.back_to_top = (kwargs[:back_to_top] || true)
       begin
         self.route_builder = RouteBuilder.new
       rescue NameError
@@ -36,16 +40,20 @@ module Olivander
       end
     end
 
+    def back_to_top?
+      back_to_top.to_s == 'true'
+    end
+
     def nav_container?
-      nav_container == true
+      nav_container.to_s == 'true'
     end
 
     def layout_container?
-      layout_container == true
+      layout_container.to_s == 'true'
     end
 
     def sidebar?
-      sidebar == true
+      sidebar.to_s == 'true'
     end
 
     def visible_modules
@@ -65,6 +73,7 @@ module Olivander
       end
     end
 
+    # DTO for the current application logo
     class Logo
       attr_accessor :url, :alt
 
@@ -74,6 +83,7 @@ module Olivander
       end
     end
 
+    # DTO for the current login logo
     class LoginLogo
       attr_accessor :url, :alt
 
@@ -83,6 +93,7 @@ module Olivander
       end
     end
 
+    # DTO for information about the Company for which this app is deployed
     class Company
       attr_accessor :name, :url
 
@@ -93,12 +104,13 @@ module Olivander
     end
   end
 
+  # DTO for state in the current thread of execution
   class CurrentContext < ActiveSupport::CurrentAttributes
     attribute :application_context
     attribute :user, :ability
-    DEFAULT_USER_DISPLAY      = 'No User Set'.freeze
+    DEFAULT_USER_DISPLAY = 'No User Set'
 
-    def build(&block)
+    def build
       self.application_context ||= ::Olivander::ApplicationContext.new
       self.user ||= build_dummy_user
       self.ability ||= build_dummy_ability

data/lib/olivander/version.rb

@@ -2,5 +2,5 @@
 
 # needed for gem
 module Olivander
-  VERSION = '0.2.0.40'
+  VERSION = '0.2.0.42'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.40
+  version: 0.2.0.42
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick