tiny_admin 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71d42ca63e3a410de95780d584cdfb61dd94feb95b503f5f55379efabec9477e
-  data.tar.gz: 96c4b375cb65327635199296d11f54335e6c5266dacce39a7316e0eb2844046c
+  metadata.gz: de3ed265839998db96c8e220f1b66576a8a37325e0726f3597e0b1ef315087a4
+  data.tar.gz: 828309ff8139a11c3e73fcbeb82ffea7f752191e5c4e99e9dc19fbaa29a2180e
 SHA512:
-  metadata.gz: d377537524247253a871e016d3d5e688e47ab07d40c6d33814c5dfc0be761e734d3de3c8c23d3e3981d3f949ce15d230312b4c71fb2d7d6f33aeb45cc352223f
-  data.tar.gz: 4ddb16c2f1fbfefced95deb426cf369d28201866f800eee1f4b14895bd938233f6f67bf51d784a7edf340b48d7a75230a86b679db9ec71c07f18b726c23971a4
+  metadata.gz: 3648b175fd028a82bc7c3ae35fc51d3380a4d22fc6dd38dfd5da5ed375d94b4b45358b36c17c955482574756700bd2889ba57348e4ed3453491e2112c9d1471f
+  data.tar.gz: 4ea2a1301b70a3b88e07829e5755976482d22b2f18c1752ab7b7626e93b19b20527a7944c9da634fdf92a4bed53cf20d56c1e7e6738bc8c3b519de4147cd810b

data/README.md

@@ -19,7 +19,7 @@ Please ⭐ if you like it.
 
 ## Install
 
-- Add to your Gemfile: `gem 'tiny_admin', '~> 0.8'`
+- Add to your Gemfile: `gem 'tiny_admin', '~> 0.9'`
 - Mount the app in a route (check some examples with: Hanami, Rails, Roda and standalone in [extra](extra))
   + in Rails, update _config/routes.rb_: `mount TinyAdmin::Router => '/admin'`
 - Configure the dashboard using `TinyAdmin.configure` and/or `TinyAdmin.configure_from_file` with a YAML config file (see [configuration](#configuration) below):
@@ -218,6 +218,8 @@ model: Post
 
 #### Resource index options
 
+> 📚 [Wiki Resource index page](https://github.com/blocknotes/tiny_admin/wiki/Resource-index) available
+
 The Index hash supports the following options:
 
 - `attributes` (Array): fields to expose in the resource list page;
@@ -257,6 +259,8 @@ Example:
 
 #### Resource show options
 
+> 📚 [Wiki Resource show page](https://github.com/blocknotes/tiny_admin/wiki/Resource-show) available
+
 The Show hash supports the following options:
 
 - `attributes` (Array): fields to expose in the resource details page.

data/lib/tiny_admin/actions/index.rb

@@ -62,8 +62,9 @@ module TinyAdmin
         @pages = (total_count / pagination.to_f).ceil
         return if pages <= 1 || !pagination_component_class
 
+        attributes = { current: current_page, pages: pages, query_string: query_string, total_count: total_count }
         page.pagination_component = pagination_component_class.new
-        page.pagination_component.update_attributes(current: current_page, pages: pages, query_string: query_string)
+        page.pagination_component.update_attributes(attributes)
       end
     end
   end

data/lib/tiny_admin/router.rb

@@ -58,14 +58,15 @@ module TinyAdmin
         router.redirect route_for(TinyAdmin.settings.root[:redirect])
       else
         page_class = to_class(TinyAdmin.settings.root[:page])
-        render_page prepare_page(page_class, attributes: TinyAdmin.settings.root.slice(:content, :title, :widgets))
+        attributes = TinyAdmin.settings.root.slice(:content, :title, :widgets)
+        render_page prepare_page(page_class, attributes: attributes, params: request.params)
       end
     end
 
     def setup_page_route(router, slug, page_data)
       router.get slug do
         attributes = page_data.slice(:content, :title, :widgets)
-        render_page prepare_page(page_data[:class], slug: slug, attributes: attributes)
+        render_page prepare_page(page_data[:class], slug: slug, attributes: attributes, params: request.params)
       end
     end
 

data/lib/tiny_admin/utils.rb

@@ -14,7 +14,7 @@ module TinyAdmin
       list.join('&')
     end
 
-    def prepare_page(page_class, slug: nil, attributes: nil, options: nil)
+    def prepare_page(page_class, slug: nil, attributes: nil, options: nil, params: nil)
       page_class.new.tap do |page|
         page.options = options
         page.head_component = TinyAdmin.settings.components[:head]&.new
@@ -27,9 +27,11 @@ module TinyAdmin
           items: options&.include?(:no_menu) ? [] : TinyAdmin.settings.store&.navbar
         )
         attrs = attributes || {}
+        attrs[:params] = params if params
         attrs[:widgets] = attrs[:widgets].map { to_class(_1) } if attrs[:widgets]
         page.update_attributes(attrs) unless attrs.empty?
         yield(page) if block_given?
+        page.setup if page.respond_to?(:setup)
       end
     end
 

data/lib/tiny_admin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TinyAdmin
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/tiny_admin/views/actions/index.rb

@@ -28,6 +28,8 @@ module TinyAdmin
 
                     table_body
                   }
+
+                  render pagination_component if pagination_component
                 }
 
                 if filters&.any?
@@ -39,8 +41,6 @@ module TinyAdmin
                 end
               }
 
-              render pagination_component if pagination_component
-
               render TinyAdmin::Views::Components::Widgets.new(widgets)
             }
           end

data/lib/tiny_admin/views/basic_layout.rb

@@ -5,7 +5,7 @@ module TinyAdmin
     class BasicLayout < Phlex::HTML
       include Utils
 
-      attr_accessor :content, :widgets
+      attr_accessor :content, :params, :widgets
 
       def label_for(value, options: [])
         TinyAdmin.settings.helper_class.label_for(value, options: options)

data/lib/tiny_admin/views/components/pagination.rb

@@ -4,23 +4,31 @@ module TinyAdmin
   module Views
     module Components
       class Pagination < BasicComponent
-        attr_accessor :current, :pages, :query_string
+        attr_accessor :current, :pages, :query_string, :total_count
 
         def template
-          div(class: 'pagination-div') {
-            nav('aria-label' => 'Pagination') {
-              ul(class: 'pagination justify-content-center') {
-                if pages <= 10
-                  pages_range(1..pages)
-                elsif current <= 4 || current >= pages - 3
-                  pages_range(1..(current <= 4 ? current + 2 : 4), with_dots: true)
-                  pages_range((current > pages - 4 ? current - 2 : pages - 2)..pages)
-                else
-                  pages_range(1..1, with_dots: true)
-                  pages_range(current - 2..current + 2, with_dots: true)
-                  pages_range(pages..pages)
-                end
+          div(class: 'container') {
+            div(class: 'row') {
+              div(class: 'col total-count') {
+                "#{total_count} items"
               }
+              div(class: 'col col-6 text-center pagination-div') {
+                nav(class: 'd-inline-block', 'aria-label': 'Pagination') {
+                  ul(class: 'pagination') {
+                    if pages <= 10
+                      pages_range(1..pages)
+                    elsif current <= 4 || current >= pages - 3
+                      pages_range(1..(current <= 4 ? current + 2 : 4), with_dots: true)
+                      pages_range((current > pages - 4 ? current - 2 : pages - 2)..pages)
+                    else
+                      pages_range(1..1, with_dots: true)
+                      pages_range(current - 2..current + 2, with_dots: true)
+                      pages_range(pages..pages)
+                    end
+                  }
+                }
+              }
+              div(class: 'col')
             }
           }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_admin
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex