five-two-nw-olivander 0.2.0.22 → 0.2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb603dd2511a6392d67387838934cd9b8ea6c07b6d3317d29a8582f54499a741
-  data.tar.gz: f41f025d643dd0d6c7b66644f42e0863a07aab6d34a2660ab8ff7fbcd4eeeb08
+  metadata.gz: 7d0296c18b05b98a8346e7c04c1dbfc31b449ad9bd3328103f3fedbb0be36e29
+  data.tar.gz: c54615ded2e32f20658347245f453922abd816812867a74861f929387380a5eb
 SHA512:
-  metadata.gz: ea2a63a0f6db1f587ff20d2f02f33b6f9136cafcb71a3e49d3d40bf67a8317c5d81b3bf2155e440c286807978abb5e4ddde0ac12f2d60cdf4c51effcef6f2925
-  data.tar.gz: a2be3205634e6e3921c9cbc610e3f85d1f12744713d6972d1deac3907bcaa8ba18389829000f3af63f945110b8a1251c5009290436aa325d0f919b1df64c84a8
+  metadata.gz: b83fa3327c1e436a3e7266694604ae415df5e63afaa87ebd32d33e86f3366858b9c848b2952e15d457c109cc3d6099c8f769d71e261b66fa2b54c65752ff8c54
+  data.tar.gz: 4f9f587b5eefd520da0d09672fea7244079f1042880cc8169c810d1af4177ed2a590ee9c07c141b7a265dec313feb763f45cc8a41aa5b8317c325041be2a57ed

data/app/datatables/olivander/datatable.rb

@@ -61,6 +61,7 @@ module Olivander
       end
 
       datatable do
+        puts "firing datatable do block"
         order(order_by[0], order_by[1]) if order_by.size == 2
         # bulk_actions_col if datatable._bulk_actions.size.positive?
 
@@ -69,7 +70,10 @@ module Olivander
           label = field_label_for(klazz, key)
           sym = key.gsub('_id', '')
           visible = show.include?(key) || !(default_hidden.include?(key) || hide.include?(key))
-          if %w[id name first_name last_name display_name title].include?(sym)
+          already_implemented_method = "col_for_#{sym}"
+          if datatable.respond_to?(already_implemented_method)
+            datatable.send(already_implemented_method, visible: visible)
+          elsif %w[id name first_name last_name display_name title].include?(sym)
             col sym, visible: visible, action: :show
           elsif sym.include?('.')
             col sym, visible: visible, label: label

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

@@ -1,4 +1,6 @@
 .content-wrapper
+  - if Olivander::CurrentContext.application_context.layout_container?
+    <div class='container'>
   %section.content-header
     .container-fluid
       .row.mb-2
@@ -10,3 +12,6 @@
   %section.content
     .container-fluid
       = content
+  - if Olivander::CurrentContext.application_context.layout_container?
+    </div>
+

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

@@ -1,10 +1,13 @@
+- if Olivander::CurrentContext.application_context.nav_container?
+  <div class='container'>
 / Navbar
-%nav.main-header.navbar.navbar-expand.navbar-white.navbar-light
+%nav.main-header.navbar{ class: Olivander::CurrentContext.application_context.nav_class }
   / Left navbar links
   %ul.navbar-nav
-    %li.nav-item
-      %a.nav-link{"data-widget" => "pushmenu", :href => "#", :role => "button", 'data-enable-remember': "true"}
-        %i.fas.fa-bars
+    - if Olivander::CurrentContext.application_context.sidebar?
+      %li.nav-item
+        %a.nav-link{"data-widget" => "pushmenu", :href => "#", :role => "button", 'data-enable-remember': "true"}
+          %i.fas.fa-bars
     - Olivander::CurrentContext.application_context.visible_modules.each do |menu_item|
       %li.nav-item.d-none.d-sm-inline-block
         = link_to menu_item.text, menu_item.href, class: 'nav-link'
@@ -124,3 +127,5 @@
     -# %li.nav-item
     -#   %a.nav-link{title: 'Show Sidebar Options', "data-controlsidebar-slide" => "true", "data-widget" => "control-sidebar", :href => "#", :role => "button"}
     -#     %i.fas.fa-th-large
+- if Olivander::CurrentContext.application_context.nav_container?
+  </div>

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

@@ -2,13 +2,15 @@
 %html
   = render partial: 'layouts/olivander/adminlte/head'
   - sidebar_collapse = cookies['lte.pushmenu.collapsed'] == 'true' ? 'sidebar-collapse' : ''
-  %body.hold-transition.sidebar-mini.layout-fixed{ class: sidebar_collapse }
+  - layout_class = Olivander::CurrentContext.application_context.layout_class
+  %body{ class: [layout_class, sidebar_collapse].join(' ') }
     .wrapper
       / Preloader
       -# .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'
-      = render partial: 'layouts/olivander/adminlte/sidebar'
+      - if Olivander::CurrentContext.application_context.sidebar?
+        = render partial: 'layouts/olivander/adminlte/sidebar'
       -# = render partial: 'layouts/olivander/adminlte/content'
       = render partial: @content_partial || 'layouts/olivander/adminlte/content', locals: { content: yield }
       = turbo_frame_tag 'modal'

data/lib/olivander/application_context.rb

@@ -1,14 +1,34 @@
 module Olivander
   class ApplicationContext
-    attr_accessor :name, :logo, :login_logo, :company, :menu_items, :route_builder, :sign_out_path, :sidebar_background_class
+    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
 
     def initialize(**kwargs)
-      self.name = kwargs[:name] || ENV['OLIVANDER_APP_NAME'] || 'Application Name'
+      self.name = kwargs[:name] || ENV['OLIVANDER_APP_NAME'] || DEFAULT_APPLICATION_NAME
       self.logo = kwargs[:logo] || Logo.new(url: kwargs[:logo_url], alt: kwargs[:logo_alt])
       self.login_logo = kwargs[:login_logo] || LoginLogo.new(url: kwargs[:login_logo_url], alt: kwargs[:login_logo_alt])
       self.company = kwargs[:company] || Company.new(name: kwargs[:company_name], url: kwargs[:company_url])
-      self.sign_out_path = kwargs[:sign_out_path] || '/sign_out'
+      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_class = kwargs[:nav_class] || DEFAULT_NAV_CLASS
+      self.layout_container = kwargs[:layout_container] || 'false'.freeze == 'true'.freeze
+      self.layout_class = kwargs[:layout_class] || DEFAULT_LAYOUT_CLASS
+      self.sidebar = kwargs[:sidebar] || 'true' == 'true'.freeze
       begin
         self.route_builder = RouteBuilder.new
       rescue NameError
@@ -16,6 +36,18 @@ module Olivander
       end
     end
 
+    def nav_container?
+      nav_container == true
+    end
+
+    def layout_container?
+      layout_container == true
+    end
+
+    def sidebar?
+      sidebar == true
+    end
+
     def visible_modules
       [].tap do |arr|
         menu_items.each do |menu_item|
@@ -37,8 +69,8 @@ module Olivander
       attr_accessor :url, :alt
 
       def initialize(**kwargs)
-        self.url = kwargs[:url] || ENV['OLIVANDER_LOGO_URL'] || '/images/olivander_logo.png'
-        self.alt = kwargs[:alt] || ENV['OLIVANDER_LOGO_ALT'] || 'Logo Image'
+        self.url = kwargs[:url] || ENV['OLIVANDER_LOGO_URL'] || DEFAULT_LOGO_URL
+        self.alt = kwargs[:alt] || ENV['OLIVANDER_LOGO_ALT'] || DEFAULT_LOGO_ALT
       end
     end
 
@@ -46,8 +78,8 @@ module Olivander
       attr_accessor :url, :alt
 
       def initialize(**kwargs)
-        self.url = kwargs[:url] || ENV['OLIVANDER_LOGIN_LOGO_URL'] || '/images/olivander_login_logo.png'
-        self.alt = kwargs[:alt] || ENV['OLIVANDER_LOGIN_LOGO_ALT'] || 'Login Logo Image'
+        self.url = kwargs[:url] || ENV['OLIVANDER_LOGIN_LOGO_URL'] || DEFAULT_LOGIN_LOGO_URL
+        self.alt = kwargs[:alt] || ENV['OLIVANDER_LOGIN_LOGO_ALT'] || DEFAULT_LOGIN_LOGO_ALT
       end
     end
 
@@ -55,8 +87,8 @@ module Olivander
       attr_accessor :name, :url
 
       def initialize(**kwargs)
-        self.url = kwargs[:url] || ENV['OLIVANDER_COMPANY_URL'] || '/'
-        self.name = kwargs[:name] || ENV['OLIVANDER_COMPANY_NAME'] || 'Company Name'
+        self.url = kwargs[:url] || ENV['OLIVANDER_COMPANY_URL'] || DEFAULT_COMPANY_URL
+        self.name = kwargs[:name] || ENV['OLIVANDER_COMPANY_NAME'] || DEFAULT_COMPANY_ALT
       end
     end
   end
@@ -64,6 +96,7 @@ module Olivander
   class CurrentContext < ActiveSupport::CurrentAttributes
     attribute :application_context
     attribute :user, :ability
+    DEFAULT_USER_DISPLAY      = 'No User Set'.freeze
 
     def build(&block)
       self.application_context ||= ::Olivander::ApplicationContext.new
@@ -76,7 +109,7 @@ module Olivander
     private
 
     def build_dummy_user
-      OpenStruct.new({ display_name: 'No User Set' })
+      OpenStruct.new({ display_name: DEFAULT_USER_DISPLAY })
     end
 
     def build_dummy_ability

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.2.0.22'.freeze
+  VERSION = '0.2.0.23'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.22
+  version: 0.2.0.23
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick