five-two-nw-olivander 0.1.2.15 → 0.1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c162440a26c8e6f7df1adfe3b568705fcefed8383f8c35fb3ee586cdb47e5af9
-  data.tar.gz: a20899ee325a8c056ab694615e3f56c2ab72f9ba99a3d0c1b5bb674f26e49e6f
+  metadata.gz: 60ef0e4f6cf44268d5836df99ce2f7548b77f6494a1de083ec0374c58c5f823c
+  data.tar.gz: 56d4c32092f2fd4dbeca7f8470fb26f01a23b0a3f2f38e10a734119a745a39c3
 SHA512:
-  metadata.gz: ddfda85d4db1af90c5b64a9cb30e1c1d631b17ad2cff1643ca0540de24057842176c1f49572c501c07f2167cc4548d671823ed35ab34c5caa6fbc855b9a93a66
-  data.tar.gz: 7956f79b03ba67ba808c68a8f0c7562ff2393a3386705a4a39f029b52056021d0c4ca2092da1107cfe3bf59b0defd868e22644c90f0a0e32d928e64b43322858
+  metadata.gz: b58d17599c9bff68932f749af403b809bd7080a7e77fb9dacb943e5f5558e26010ea0cea38e461fa11abaf4847c3bdd81de376622c96c83b32e72df2208418d2
+  data.tar.gz: d2345d025f1460ea4c3a2c7b806885eb514cda39e284400e773da772ac68ebc64596d11841b5a11ae393ffdd3ea5d041e5bc5d580bff50eb79ec5003118167fa

data/app/assets/stylesheets/adminlte.css

@@ -25,4 +25,6 @@
 
  .table td, .table th {
   padding: 0.25rem !important;
- }
+ }
+
+ .card-secondary:not(.card-outline) > .card-header a.page-link { color: blue }

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

@@ -90,6 +90,10 @@ module Olivander
       end
 
       class_methods do
+        def resource_action(model, action)
+          resources[model].actions.select{ |x| x.sym == action }.first
+        end
+
         def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], &block)
           self.current_resource = RoutedResource.new(model, DEFAULT_CRUD_ACTIONS & (only - except))
           yield if block_given?

data/app/helpers/olivander/application_helper.rb

@@ -32,9 +32,17 @@ module Olivander
     def resource_form_actions(route_builder, resource, for_action: :show)
       [].tap do |output|
         authorized_resource_actions(route_builder, resource, for_action: for_action).select{ |x| x.show_in_form }.each do |a|
-          output << link_to(a.sym, {controller: a.controller, action: a.action}, method: a.verb, class: 'btn btn-primary', data: { turbo: true })
+          output << link_to(a.sym, {controller: a.controller, action: a.action}, method: a.verb, class: 'btn btn-tool', data: { turbo: true })
         end
       end.join('&nbsp;').html_safe
     end
+
+    def current_user
+      controller.respond_to?(:current_user) ? controller.current_user : nil
+    end
+
+    def current_ability
+      controller.respond_to?(:current_ability) ? controller.current_ability : nil
+    end
   end
 end

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

@@ -1,6 +1,6 @@
 - read_only = action_name != 'edit'
 = simple_form_for(@resource) do |f|
-  .card
+  .card.card-primary
     .card-header
       .card-tools
         = resource_form_actions(@context.route_builder, @resource, for_action: action_name.to_sym)

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

@@ -24,7 +24,7 @@
 
 .row
   .col-12
-    .card
+    .card.card-primary
       .card-header
         %h3.card-title= @page_title
         .card-tools
@@ -48,4 +48,4 @@
 - begin
   = render partial: 'index_additional'
 - rescue ActionView::MissingTemplate
-  - Rails.logger.debug "did not find additional index partial"
+  - Rails.logger.debug "did not find additional index partial"

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

@@ -11,7 +11,7 @@
       .image
         %img.img-circle.elevation-2{:alt => "User Image", :src => image_path(user_image_path(nil))}/
       .info
-        = link_to current_erp_user, destroy_erp_user_session_path, method: :delete, class: 'd-block'
+        = link_to current_user, @context.sign_out_path, method: :delete, class: 'd-block'
     / SidebarSearch Form
     .form-inline
       .input-group{"data-widget" => "sidebar-search"}

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

@@ -12,6 +12,7 @@
       = 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'
       = render partial: 'layouts/olivander/adminlte/flashes'
       = render partial: 'layouts/olivander/adminlte/footer'
       = render partial: 'layouts/olivander/adminlte/control_sidebar'

data/lib/olivander/application_context.rb

@@ -1,6 +1,6 @@
 module Olivander
   class ApplicationContext
-    attr_accessor :name, :logo, :company, :menu_items, :route_builder
+    attr_accessor :name, :logo, :company, :menu_items, :route_builder, :sign_out_path
 
     def self.default
       ctx = ApplicationContext.new
@@ -8,10 +8,11 @@ module Olivander
       ctx
     end
 
-    def initialize(name: 'Application Name', logo: Logo.new, company: Company.new, menu_items: [])
+    def initialize(name: 'Application Name', logo: Logo.new, company: Company.new, sign_out_path: '/sign_out', menu_items: [])
       self.name = name
       self.logo = logo
       self.company = company
+      self.sign_out_path = sign_out_path
       self.menu_items = menu_items
     end
 

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.15"
+  VERSION = "0.1.2.17"
 end

metadata

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