tiny_admin 0.3.0 → 0.5.0

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

@@ -3,33 +3,34 @@
 module TinyAdmin
   module Views
     module Components
-      class Navbar < Phlex::HTML
-        attr_reader :current_slug, :items, :root_path, :root_title
-
-        def initialize(root_path:, root_title:, items: [], current_slug: nil)
-          @root_path = root_path
-          @root_title = root_title
-          @items = items || []
-          @current_slug = current_slug
-        end
+      class Navbar < BasicComponent
+        attr_accessor :current_slug, :items, :root_path, :root_title
 
         def template
           nav(class: 'navbar navbar-expand-lg') {
             div(class: 'container') {
               a(class: 'navbar-brand', href: root_path) { root_title }
-              button(class: 'navbar-toggler', type: 'button', 'data-bs-toggle' => 'collapse', 'data-bs-target' => '#navbarNav', 'aria-controls' => 'navbarNav', 'aria-expanded' => 'false', 'aria-label' => 'Toggle navigation') {
+              button(
+                class: 'navbar-toggler',
+                type: 'button',
+                'data-bs-toggle' => 'collapse',
+                'data-bs-target' => '#navbarNav',
+                'aria-controls' => 'navbarNav',
+                'aria-expanded' => 'false',
+                'aria-label' => 'Toggle navigation'
+              ) {
                 span(class: 'navbar-toggler-icon')
               }
               div(class: 'collapse navbar-collapse', id: 'navbarNav') {
                 ul(class: 'navbar-nav') {
-                  items.each do |slug, (name, path, options)|
+                  items.each do |slug, item|
                     classes = %w[nav-link]
                     classes << 'active' if slug == current_slug
-                    link_attributes = { class: classes.join(' '), href: path, 'aria-current' => 'page' }
-                    link_attributes.merge!(options) if options
+                    link_attributes = { class: classes.join(' '), href: item[:path], 'aria-current' => 'page' }
+                    link_attributes.merge!(item[:options]) if item[:options]
 
                     li(class: 'nav-item') {
-                      a(**link_attributes) { name }
+                      a(**link_attributes) { item[:name] }
                     }
                   end
                 }

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

@@ -3,8 +3,8 @@
 module TinyAdmin
   module Views
     module Components
-      class Pagination < Phlex::HTML
-        attr_reader :current, :pages, :query_string
+      class Pagination < BasicComponent
+        attr_accessor :current, :pages, :query_string
 
         def template
           div(class: 'pagination-div') {
@@ -25,12 +25,6 @@ module TinyAdmin
           }
         end
 
-        def update(current:, pages:, query_string:)
-          @current = current
-          @pages = pages
-          @query_string = query_string
-        end
-
         private
 
         def pages_range(range, with_dots: false)

data/lib/tiny_admin/views/default_layout.rb

@@ -6,8 +6,9 @@ module TinyAdmin
       attr_accessor :flash_component, :head_component, :messages, :navbar_component, :options, :title
 
       def template(&block)
-        flash_component&.update(messages: messages)
-        head_component&.update(title, style_links: style_links, extra_styles: settings.extra_styles)
+        extra_styles = settings.extra_styles
+        flash_component&.messages = messages
+        head_component&.update_attributes(page_title: title, style_links: style_links, extra_styles: extra_styles)
 
         doctype
         html {

data/lib/tiny_admin.rb

@@ -18,7 +18,7 @@ module TinyAdmin
   def configure_from_file(file)
     config = YAML.load_file(file, symbolize_names: true)
     config.each do |key, value|
-      TinyAdmin::Settings.instance.send("#{key}=", value)
+      TinyAdmin::Settings.instance[key] = value
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_admin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -88,11 +88,13 @@ files:
 - lib/tiny_admin/plugins/simple_auth.rb
 - lib/tiny_admin/router.rb
 - lib/tiny_admin/settings.rb
+- lib/tiny_admin/support.rb
 - lib/tiny_admin/utils.rb
 - lib/tiny_admin/version.rb
 - lib/tiny_admin/views/actions/index.rb
 - lib/tiny_admin/views/actions/show.rb
 - lib/tiny_admin/views/basic_layout.rb
+- lib/tiny_admin/views/components/basic_component.rb
 - lib/tiny_admin/views/components/filters_form.rb
 - lib/tiny_admin/views/components/flash.rb
 - lib/tiny_admin/views/components/head.rb