tiny_admin 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ac2be067ca35c35f40c677c5f9461c5f83e366488a48e6ab50a888f0f22317
-  data.tar.gz: 2289dd33940174e8e614260f96273967ade51f75dc67a04d5e639415c984e65b
+  metadata.gz: d8059ea24a18bfb14f8e868a70203db8045099e20196f5098f1c63b121421e49
+  data.tar.gz: d0da80d718362c58a50e963b2e79dff550e77a763d7872a0ba96efea43f408b3
 SHA512:
-  metadata.gz: f4f80d86ac6b30bc29cf8e2f1efe480edefe84907bf5e9b7a3a8c3b3c3750ff59a1f9e609c87090105c0cd31fa22df7aa913858911a455d918633269c27317e7
-  data.tar.gz: 4fe8a75d9e3c0cc3bd756ab247fecb7575049dcec58559bdb7cdb1c58ecb4b6e7de3f8be96c396b0b304134cc75c6058b3cbeafce92cd027413971a99a812c02
+  metadata.gz: 3067f890f10f10f5dc7379c7b147f01f5cb62b8d59f06ad7b4387c685cd2e32cdeb1f87fbfe36b0e2c388c854ce461f1a18b2659ee479e401ba74ed3c5559a3a
+  data.tar.gz: 0a4b4129b33e0dbf2ab2d01df14ead0ec3971a098dbed39a5b50c287e2a00c5c8448011de81a233c7bb1dda58bb42b648d44069684a65cdb4e42e3faf2a453bb

data/README.md

@@ -1,6 +1,9 @@
 # Tiny Admin
 
-[![Gem Version](https://badge.fury.io/rb/tiny_admin.svg)](https://badge.fury.io/rb/tiny_admin) [![Linters](https://github.com/blocknotes/tiny_admin/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/tiny_admin/actions/workflows/linters.yml) [![Specs Rails 7.0](https://github.com/blocknotes/tiny_admin/actions/workflows/specs_rails_70.yml/badge.svg)](https://github.com/blocknotes/tiny_admin/actions/workflows/specs_rails_70.yml)
+[![Gem Version](https://badge.fury.io/rb/tiny_admin.svg)](https://badge.fury.io/rb/tiny_admin)
+[![Gem Downloads](https://badgen.net/rubygems/dt/tiny_admin)](https://rubygems.org/gems/tiny_admin)
+[![Linters](https://github.com/blocknotes/tiny_admin/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/tiny_admin/actions/workflows/linters.yml)
+[![Specs](https://github.com/blocknotes/tiny_admin/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/tiny_admin/actions/workflows/specs.yml)
 
 A compact and composable dashboard component for Ruby.
 
@@ -16,7 +19,7 @@ Please ⭐ if you like it.
 
 ## Install
 
-- Add to your Gemfile: `gem 'tiny_admin', '~> 0.5'`
+- Add to your Gemfile: `gem 'tiny_admin', '~> 0.7'`
 - 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):
@@ -51,6 +54,7 @@ Plugin available:
 Pages available:
 
 - **Root**: define how to present the content in the main page of the interface;
+- **Content**: define how to present page with inline content;
 - **PageNotFound**: define how to present pages not found;
 - **RecordNotFound**: define how to present record not found page;
 - **SimpleAuthLogin**: define how to present the login form for SimpleAuth plugin;
@@ -79,6 +83,7 @@ The following options are supported:
 - `title` (String): root section's title;
 - `page` (String): a view object to render;
 - `redirect` (String): alternative to _page_ option - redirects to a specific slug;
+- `widgets` (Array): list of widgets (as View components) to present.
 
 Example:
 
@@ -86,6 +91,9 @@ Example:
 root:
   title: MyAdmin
   redirect: posts
+  widgets:
+    - LatestAuthorsWidget
+    - LatestPostsWidget
 ```
 
 `helper_class` (String): class or module with helper methods, used for attributes' formatters.
@@ -122,9 +130,28 @@ authentication:
 
 - `slug` (String): section reference identifier;
 - `name` (String): section's title;
-- `type` (String): the type of section: `url`, `page` or `resource`;
+- `type` (String): the type of section: `content`, `page`, `resource` or `url`;
+- `widgets` (Array): list of widgets (as View components) to present;
 - other properties depends on the section's type.
 
+For _content_ sections:
+
+- `content` (String): the HTML content to present.
+
+Example:
+
+```yml
+slug: test-content
+name: Test content
+type: content
+content: >
+  <h1>Test content!</h1>
+  <p>Some test content</p>
+widgets:
+  - LatestAuthorsWidget
+  - LatestPostsWidget
+```
+
 For _url_ sections:
 
 - `url` (String): the URL to load when clicking on the section's menu item;
@@ -163,6 +190,7 @@ For _resource_ sections:
 - `show` (Hash): detail's action options (see below);
 - `collection_actions` (Array of hashes): custom collection's actions;
 - `member_actions` (Array of hashes): custom details's actions;
+- `widgets` (Array): list of widgets (as View components) to present;
 - `only` (Array of strings): list of supported actions (ex. `index`);
 - `options` (Array of strings): resource options (ex. `hidden`).
 
@@ -240,6 +268,9 @@ Example:
           header: The author
           link_to: authors
           call: author, name
+      widgets:
+        - LatestAuthorsWidget
+        - LatestPostsWidget
 ```
 
 ### Sample
@@ -264,6 +295,9 @@ authentication:
   # password: 'f1891cea80fc05e433c943254c6bdabc159577a02a7395dfebbfbc4f7661d4af56f2d372131a45936de40160007368a56ef216a30cb202c66d3145fd24380906'
 root:
   title: Test Admin
+  widgets:
+    - LatestAuthorsWidget
+    - LatestPostsWidget
   # page: RootPage
 helper_class: AdminHelper
 page_not_found: PageNotFound

data/lib/tiny_admin/actions/index.rb

@@ -3,34 +3,38 @@
 module TinyAdmin
   module Actions
     class Index < BasicAction
-      attr_reader :current_page,
+      attr_reader :context,
+                  :current_page,
                   :fields_options,
-                  :filters_list,
                   :links,
+                  :options,
                   :pagination,
                   :pages,
                   :params,
                   :query_string,
-                  :repository,
-                  :sort
+                  :repository
 
       def call(app:, context:, options:)
+        @context = context
+        @options = options || {}
         evaluate_options(options)
         fields = repository.fields(options: fields_options)
-        filters = prepare_filters(fields, filters_list)
-        records, total_count = repository.list(page: current_page, limit: pagination, filters: filters, sort: sort)
+        filters = prepare_filters(fields)
+        records, count = repository.list(page: current_page, limit: pagination, filters: filters, sort: options[:sort])
+        attributes = {
+          actions: context.actions,
+          fields: fields,
+          filters: filters,
+          links: options[:links],
+          prepare_record: ->(record) { repository.index_record_attrs(record, fields: fields_options) },
+          records: records,
+          slug: context.slug,
+          title: repository.index_title,
+          widgets: options[:widgets]
+        }
 
-        prepare_page(Views::Actions::Index) do |page|
-          setup_pagination(page, settings.components[:pagination], total_count: total_count)
-          page.update_attributes(
-            actions: context.actions,
-            fields: fields,
-            filters: filters,
-            links: links,
-            prepare_record: ->(record) { repository.index_record_attrs(record, fields: fields_options) },
-            records: records,
-            title: repository.index_title
-          )
+        prepare_page(Views::Actions::Index, slug: context.slug, attributes: attributes) do |page|
+          setup_pagination(page, TinyAdmin.settings.components[:pagination], total_count: count)
         end
       end
 
@@ -40,17 +44,13 @@ module TinyAdmin
         @fields_options = attribute_options(options[:attributes])
         @params = context.request.params
         @repository = context.repository
-        @filters_list = options[:filters]
         @pagination = options[:pagination] || 10
-        @sort = options[:sort]
-        @links = options[:links]
-
         @current_page = (params['p'] || 1).to_i
         @query_string = params_to_s(params.except('p'))
       end
 
-      def prepare_filters(fields, filters_list)
-        filters = (filters_list || []).map { _1.is_a?(Hash) ? _1 : { field: _1 } }
+      def prepare_filters(fields)
+        filters = (options[:filters] || []).map { _1.is_a?(Hash) ? _1 : { field: _1 } }
         filters = filters.each_with_object({}) { |filter, result| result[filter[:field]] = filter }
         values = (params['q'] || {})
         fields.each_with_object({}) do |(name, field), result|

data/lib/tiny_admin/actions/show.rb

@@ -8,16 +8,18 @@ module TinyAdmin
         repository = context.repository
         record = repository.find(context.reference)
         prepare_record = ->(record_data) { repository.show_record_attrs(record_data, fields: fields_options) }
+        attributes = {
+          actions: context.actions,
+          fields: repository.fields(options: fields_options),
+          prepare_record: prepare_record,
+          record: record,
+          reference: context.reference,
+          slug: context.slug,
+          title: repository.show_title(record),
+          widgets: options[:widgets]
+        }
 
-        prepare_page(Views::Actions::Show) do |page|
-          page.update_attributes(
-            actions: context.actions,
-            fields: repository.fields(options: fields_options),
-            prepare_record: prepare_record,
-            record: record,
-            title: repository.show_title(record)
-          )
-        end
+        prepare_page(Views::Actions::Show, slug: context.slug, attributes: attributes)
       rescue Plugins::BaseRepository::RecordNotFound => _e
         prepare_page(options[:record_not_found_page] || Views::Pages::RecordNotFound)
       end

data/lib/tiny_admin/authentication.rb

@@ -5,7 +5,7 @@ module TinyAdmin
     route do |r|
       r.get 'unauthenticated' do
         if current_user
-          r.redirect settings.root_path
+          r.redirect TinyAdmin.settings.root_path
         else
           render_login
         end
@@ -17,14 +17,17 @@ module TinyAdmin
 
       r.get 'logout' do
         logout_user
-        r.redirect settings.root_path
+        r.redirect TinyAdmin.settings.root_path
       end
     end
 
     private
 
     def render_login(notices: nil, warnings: nil, errors: nil)
-      page = prepare_page(settings.authentication[:login], options: %i[no_menu compact_layout])
+      login = TinyAdmin.settings.authentication[:login]
+      return unless login
+
+      page = prepare_page(login, options: %i[no_menu compact_layout])
       page.messages = {
         notices: notices || flash['notices'],
         warnings: warnings || flash['warnings'],

data/lib/tiny_admin/basic_app.rb

@@ -6,7 +6,7 @@ module TinyAdmin
 
     class << self
       def authentication_plugin
-        plugin = TinyAdmin::Settings.instance.authentication&.dig(:plugin)
+        plugin = TinyAdmin.settings.authentication&.dig(:plugin)
         plugin_class = plugin.is_a?(String) ? Object.const_get(plugin) : plugin
         plugin_class || TinyAdmin::Plugins::NoAuth
       end
@@ -17,8 +17,8 @@ module TinyAdmin
     plugin :render, engine: 'html'
     plugin :sessions, secret: SecureRandom.hex(64)
 
-    plugin authentication_plugin, TinyAdmin::Settings.instance.authentication
+    plugin authentication_plugin, TinyAdmin.settings.authentication
 
-    not_found { prepare_page(settings.page_not_found).call }
+    not_found { prepare_page(TinyAdmin.settings.page_not_found).call }
   end
 end

data/lib/tiny_admin/context.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
 module TinyAdmin
-  class Context
-    include Singleton
-
-    attr_accessor :actions,
-                  :navbar,
-                  :pages,
-                  :reference,
-                  :repository,
-                  :request,
-                  :resources,
-                  :router,
-                  :settings,
-                  :slug
-  end
+  Context = Struct.new(
+    :actions,
+    :reference,
+    :repository,
+    :request,
+    :router,
+    :slug,
+    keyword_init: true
+  )
 end

data/lib/tiny_admin/plugins/active_record_repository.rb

@@ -20,12 +20,12 @@ module TinyAdmin
       def fields(options: nil)
         if options
           types = model.columns.to_h { [_1.name, _1.type] }
-          options.each_with_object({}) do |(name, field_options), result|
-            result[name] = TinyAdmin::Field.create_field(name: name, type: types[name], options: field_options)
+          options.to_h do |name, field_options|
+            [name, TinyAdmin::Field.create_field(name: name, type: types[name], options: field_options)]
           end
         else
-          model.columns.each_with_object({}) do |column, result|
-            result[column.name] = TinyAdmin::Field.create_field(name: column.name, type: column.type)
+          model.columns.to_h do |column|
+            [column.name, TinyAdmin::Field.create_field(name: column.name, type: column.type)]
           end
         end
       end
@@ -42,8 +42,12 @@ module TinyAdmin
         raise BaseRepository::RecordNotFound, e.message
       end
 
+      def collection
+        model.all
+      end
+
       def list(page: 1, limit: 10, sort: nil, filters: nil)
-        query = sort ? model.all.order(sort) : model.all
+        query = sort ? collection.order(sort) : collection
         query = apply_filters(query, filters) if filters
         page_offset = page.positive? ? (page - 1) * limit : 0
         records = query.offset(page_offset).limit(limit).to_a

data/lib/tiny_admin/plugins/base_repository.rb

@@ -18,7 +18,7 @@ module TinyAdmin
             converter = Object.const_get(field[:converter])
             converter.send(method, value, options: options || [])
           else
-            Settings.instance.helper_class.send(method, value, options: options || [])
+            TinyAdmin.settings.helper_class.send(method, value, options: options || [])
           end
         else
           value&.to_s

data/lib/tiny_admin/router.rb

@@ -2,13 +2,14 @@
 
 module TinyAdmin
   class Router < BasicApp
+    extend Forwardable
+
+    def_delegator TinyAdmin, :route_for
+
     route do |r|
-      context.settings = TinyAdmin::Settings.instance
-      context.settings.load_settings
-      context.router = r
+      TinyAdmin.settings.load_settings
 
       r.on 'auth' do
-        context.slug = nil
         r.run Authentication
       end
 
@@ -25,15 +26,14 @@ module TinyAdmin
       end
 
       r.post '' do
-        context.slug = nil
-        r.redirect settings.root_path
+        r.redirect TinyAdmin.settings.root_path
       end
 
-      context.pages.each do |slug, data|
-        setup_page_route(r, slug, data)
+      store.pages.each do |slug, page_data|
+        setup_page_route(r, slug, page_data)
       end
 
-      context.resources.each do |slug, options|
+      store.resources.each do |slug, options|
         setup_resource_routes(r, slug, options: options || {})
       end
 
@@ -42,6 +42,10 @@ module TinyAdmin
 
     private
 
+    def store
+      @store ||= TinyAdmin.settings.store
+    end
+
     def render_page(page)
       if page.respond_to?(:messages=)
         page.messages = { notices: flash['notices'], warnings: flash['warnings'], errors: flash['errors'] }
@@ -50,74 +54,83 @@ module TinyAdmin
     end
 
     def root_route(router)
-      context.slug = nil
-      if settings.root[:redirect]
-        router.redirect route_for(settings.root[:redirect])
+      if TinyAdmin.settings.root[:redirect]
+        router.redirect route_for(TinyAdmin.settings.root[:redirect])
       else
-        page = settings.root[:page]
-        page_class = page.is_a?(String) ? Object.const_get(page) : page
-        render_page prepare_page(page_class)
+        page_class = to_class(TinyAdmin.settings.root[:page])
+        render_page prepare_page(page_class, attributes: TinyAdmin.settings.root.slice(:content, :title, :widgets))
       end
     end
 
-    def setup_page_route(router, slug, page_class)
+    def setup_page_route(router, slug, page_data)
       router.get slug do
-        context.slug = slug
-        render_page prepare_page(page_class)
+        attributes = page_data.slice(:content, :title, :widgets)
+        render_page prepare_page(page_data[:class], slug: slug, attributes: attributes)
       end
     end
 
     def setup_resource_routes(router, slug, options:)
       router.on slug do
-        context.slug = slug
-        setup_collection_routes(router, options: options)
-        setup_member_routes(router, options: options)
+        setup_collection_routes(router, slug, options: options)
+        setup_member_routes(router, slug, options: options)
       end
     end
 
-    def setup_collection_routes(router, options:)
-      context.repository = options[:repository].new(options[:model])
+    def setup_collection_routes(router, slug, options:)
+      repository = options[:repository].new(options[:model])
       action_options = options[:index] || {}
 
       # Custom actions
       custom_actions = setup_custom_actions(
         router,
         options[:collection_actions],
-        repository: context.repository,
-        options: action_options
+        options: action_options,
+        repository: repository,
+        slug: slug
       )
 
       # Index
       if options[:only].include?(:index) || options[:only].include?('index')
         router.is do
-          context.actions = custom_actions
-          context.request = request
+          context = Context.new(
+            actions: custom_actions,
+            repository: repository,
+            request: request,
+            router: router,
+            slug: slug
+          )
           index_action = TinyAdmin::Actions::Index.new
           render_page index_action.call(app: self, context: context, options: action_options)
         end
       end
     end
 
-    def setup_member_routes(router, options:)
-      context.repository = options[:repository].new(options[:model])
-      action_options = (options[:show] || {}).merge(record_not_found_page: settings.record_not_found)
+    def setup_member_routes(router, slug, options:)
+      repository = options[:repository].new(options[:model])
+      action_options = (options[:show] || {}).merge(record_not_found_page: TinyAdmin.settings.record_not_found)
 
       router.on String do |reference|
-        context.reference = reference
-
         # Custom actions
         custom_actions = setup_custom_actions(
           router,
           options[:member_actions],
-          repository: context.repository,
-          options: action_options
+          options: action_options,
+          repository: repository,
+          slug: slug,
+          reference: reference
         )
 
         # Show
         if options[:only].include?(:show) || options[:only].include?('show')
           router.is do
-            context.actions = custom_actions
-            context.request = request
+            context = Context.new(
+              actions: custom_actions,
+              reference: reference,
+              repository: repository,
+              request: request,
+              router: router,
+              slug: slug
+            )
             show_action = TinyAdmin::Actions::Show.new
             render_page show_action.call(app: self, context: context, options: action_options)
           end
@@ -125,15 +138,20 @@ module TinyAdmin
       end
     end
 
-    def setup_custom_actions(router, custom_actions, repository:, options:)
-      context.repository = repository
+    def setup_custom_actions(router, custom_actions, options:, repository:, slug:, reference: nil)
       (custom_actions || []).each_with_object({}) do |custom_action, result|
         action_slug, action = custom_action.first
-        action_class = action.is_a?(String) ? Object.const_get(action) : action
+        action_class = to_class(action)
 
         router.get action_slug.to_s do
-          context.actions = {}
-          context.request = request
+          context = Context.new(
+            actions: {},
+            reference: reference,
+            repository: repository,
+            request: request,
+            router: router,
+            slug: slug
+          )
           custom_action = action_class.new
           render_page custom_action.call(app: self, context: context, options: options)
         end

data/lib/tiny_admin/section.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  class Section
+    attr_reader :name, :options, :path, :slug
+
+    def initialize(name:, slug: nil, path: nil, options: {})
+      @name = name
+      @options = options
+      @path = path || TinyAdmin.route_for(slug)
+      @slug = slug
+    end
+  end
+end

data/lib/tiny_admin/settings.rb

@@ -3,7 +3,6 @@
 module TinyAdmin
   class Settings
     include Singleton
-    include Utils
 
     DEFAULTS = {
       %i[authentication plugin] => Plugins::NoAuth,
@@ -12,34 +11,53 @@ module TinyAdmin
       %i[components head] => Views::Components::Head,
       %i[components navbar] => Views::Components::Navbar,
       %i[components pagination] => Views::Components::Pagination,
+      %i[content_page] => Views::Pages::Content,
       %i[helper_class] => Support,
       %i[page_not_found] => Views::Pages::PageNotFound,
       %i[record_not_found] => Views::Pages::RecordNotFound,
       %i[repository] => Plugins::ActiveRecordRepository,
       %i[root_path] => '/admin',
       %i[root page] => Views::Pages::Root,
-      %i[root title] => 'TinyAdmin'
+      %i[root title] => 'TinyAdmin',
+      %i[sections] => []
     }.freeze
 
-    attr_accessor :authentication,
-                  :components,
-                  :extra_styles,
-                  :helper_class,
-                  :page_not_found,
-                  :record_not_found,
-                  :repository,
-                  :root,
-                  :root_path,
-                  :sections,
-                  :scripts,
-                  :style_links
+    OPTIONS = %i[
+      authentication
+      components
+      content_page
+      extra_styles
+      helper_class
+      page_not_found
+      record_not_found
+      repository
+      root
+      root_path
+      sections
+      scripts
+      style_links
+    ].freeze
+
+    attr_reader :store
+
+    OPTIONS.each do |option|
+      define_method(option) do
+        self[option]
+      end
+
+      define_method("#{option}=") do |value|
+        self[option] = value
+      end
+    end
 
-    def [](key)
-      send(key)
+    def [](*path)
+      key, option = fetch_setting(path)
+      option[key]
     end
 
-    def []=(key, value)
-      send("#{key}=", value)
+    def []=(*path, value)
+      key, option = fetch_setting(path)
+      option[key] = value
       convert_value(key, value)
     end
 
@@ -54,24 +72,33 @@ module TinyAdmin
         end
       end
 
-      context.pages ||= {}
-      context.resources ||= {}
-      @sections ||= []
-      @root_path = '/' if @root_path == ''
+      @store ||= TinyAdmin::Store.new(self)
+      self.root_path = '/' if root_path == ''
 
-      if @authentication[:plugin] <= Plugins::SimpleAuth
-        @authentication[:logout] ||= { name: 'logout', path: "#{root_path}/auth/logout" }
+      if authentication[:plugin] <= Plugins::SimpleAuth
+        logout_path = "#{root_path}/auth/logout"
+        authentication[:logout] ||= TinyAdmin::Section.new(name: 'logout', slug: 'logout', path: logout_path)
       end
-      context.navbar = prepare_navbar(sections, logout: authentication[:logout])
+      store.prepare_sections(sections, logout: authentication[:logout])
+    end
+
+    def reset!
+      @options = {}
     end
 
     private
 
+    def fetch_setting(path)
+      @options ||= {}
+      *parts, last = path.map(&:to_sym)
+      [last, parts.inject(@options) { |result, part| result[part] ||= {} }]
+    end
+
     def convert_value(key, value)
       if value.is_a?(Hash)
         value.each_key do |key2|
           path = [key, key2]
-          if DEFAULTS[path].is_a?(Class) || DEFAULTS[path].is_a?(Module)
+          if (DEFAULTS[path].is_a?(Class) || DEFAULTS[path].is_a?(Module)) && self[key][key2].is_a?(String)
             self[key][key2] = Object.const_get(self[key][key2])
           end
         end
@@ -79,51 +106,5 @@ module TinyAdmin
         self[key] = Object.const_get(self[key])
       end
     end
-
-    def prepare_navbar(sections, logout:)
-      items = sections.each_with_object({}) do |section, list|
-        unless section.is_a?(Hash)
-          section_class = Object.const_get(section)
-          next unless section_class.respond_to?(:to_h)
-
-          section = section_class.to_h
-        end
-
-        slug = section[:slug].to_s
-        case section[:type]&.to_sym
-        when :url
-          list[slug] = add_url_section(slug, section)
-        when :page
-          list[slug] = add_page_section(slug, section)
-        when :resource
-          list[slug] = add_resource_section(slug, section)
-        end
-      end
-      items['auth/logout'] = logout if logout
-      items
-    end
-
-    def add_url_section(_slug, section)
-      section.slice(:name, :options).tap { _1[:path] = section[:url] }
-    end
-
-    def add_page_section(slug, section)
-      page = section[:page]
-      context.pages[slug] = page.is_a?(String) ? Object.const_get(page) : page
-      { name: section[:name], path: route_for(slug), class: context.pages[slug] }
-    end
-
-    def add_resource_section(slug, section)
-      repository = section[:repository] || settings.repository
-      context.resources[slug] = {
-        model: section[:model].is_a?(String) ? Object.const_get(section[:model]) : section[:model],
-        repository: repository.is_a?(String) ? Object.const_get(repository) : repository
-      }
-      resource_options = section.slice(:resource, :only, :index, :show, :collection_actions, :member_actions)
-      resource_options[:only] ||= %i[index show]
-      context.resources[slug].merge!(resource_options)
-      hidden = section[:options] && (section[:options].include?(:hidden) || section[:options].include?('hidden'))
-      { name: section[:name], path: route_for(slug) } unless hidden
-    end
   end
 end

data/lib/tiny_admin/store.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  class Store
+    include Utils
+
+    attr_reader :navbar, :pages, :resources, :settings
+
+    def initialize(settings)
+      @pages = {}
+      @resources = {}
+      @settings = settings
+    end
+
+    def prepare_sections(sections, logout:)
+      @navbar = sections.each_with_object([]) do |section, list|
+        unless section.is_a?(Hash)
+          section_class = to_class(section)
+          next unless section_class.respond_to?(:to_h)
+
+          section = section_class.to_h
+        end
+
+        slug = section[:slug].to_s
+        case section[:type]&.to_sym
+        when :content
+          list << add_content_section(slug, section)
+        when :page
+          list << add_page_section(slug, section)
+        when :resource
+          list << add_resource_section(slug, section)
+        when :url
+          list << add_url_section(slug, section)
+        end
+      end
+      navbar << logout if logout
+    end
+
+    private
+
+    def add_content_section(slug, section)
+      pages[slug] = { class: settings.content_page, content: section[:content], widgets: section[:widgets] }
+      TinyAdmin::Section.new(name: section[:name], slug: slug)
+    end
+
+    def add_page_section(slug, section)
+      pages[slug] = { class: to_class(section[:page]) }
+      TinyAdmin::Section.new(name: section[:name], slug: slug)
+    end
+
+    def add_resource_section(slug, section)
+      resource = section.slice(:resource, :only, :index, :show, :collection_actions, :member_actions)
+      resource[:only] ||= %i[index show]
+      resources[slug] = resource.merge(
+        model: to_class(section[:model]),
+        repository: to_class(section[:repository] || settings.repository)
+      )
+
+      hidden = section[:options] && (section[:options].include?(:hidden) || section[:options].include?('hidden'))
+      TinyAdmin::Section.new(name: section[:name], slug: slug) unless hidden
+    end
+
+    def add_url_section(slug, section)
+      TinyAdmin::Section.new(name: section[:name], options: section[:options], path: section[:url], slug: slug)
+    end
+  end
+end

data/lib/tiny_admin/utils.rb

@@ -14,27 +14,27 @@ module TinyAdmin
       list.join('&')
     end
 
-    def prepare_page(page_class, options: nil)
+    def prepare_page(page_class, slug: nil, attributes: nil, options: nil)
       page_class.new.tap do |page|
         page.options = options
-        page.head_component = settings.components[:head]&.new
-        page.flash_component = settings.components[:flash]&.new
-        page.navbar_component = settings.components[:navbar]&.new
+        page.head_component = TinyAdmin.settings.components[:head]&.new
+        page.flash_component = TinyAdmin.settings.components[:flash]&.new
+        page.navbar_component = TinyAdmin.settings.components[:navbar]&.new
         page.navbar_component&.update_attributes(
-          current_slug: context&.slug,
-          root_path: settings.root_path,
-          root_title: settings.root[:title],
-          items: options&.include?(:no_menu) ? [] : context&.navbar
+          current_slug: slug,
+          root_path: TinyAdmin.settings.root_path,
+          root_title: TinyAdmin.settings.root[:title],
+          items: options&.include?(:no_menu) ? [] : TinyAdmin.settings.store&.navbar
         )
+        attrs = attributes || {}
+        attrs[:widgets] = attrs[:widgets].map { to_class(_1) } if attrs[:widgets]
+        page.update_attributes(attrs) unless attrs.empty?
         yield(page) if block_given?
       end
     end
 
-    def route_for(section, reference: nil, action: nil, query: nil)
-      root_path = settings.root_path == '/' ? nil : settings.root_path
-      route = [root_path, section, reference, action].compact.join("/")
-      route << "?#{query}" if query
-      route[0] == '/' ? route : route.prepend('/')
+    def to_class(klass)
+      klass.is_a?(String) ? Object.const_get(klass) : klass
     end
 
     def to_label(string)
@@ -42,13 +42,5 @@ module TinyAdmin
 
       string.respond_to?(:humanize) ? string.humanize : string.tr('_', ' ').capitalize
     end
-
-    def context
-      TinyAdmin::Context.instance
-    end
-
-    def settings
-      TinyAdmin::Settings.instance
-    end
   end
 end

data/lib/tiny_admin/version.rb

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

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

@@ -4,14 +4,16 @@ module TinyAdmin
   module Views
     module Actions
       class Index < DefaultLayout
-        attr_accessor :actions, :fields, :filters, :links, :pagination_component, :prepare_record, :records
+        attr_accessor :actions, :fields, :filters, :links, :pagination_component, :prepare_record, :records, :slug
 
         def template
           super do
             div(class: 'index') {
               div(class: 'row') {
                 div(class: 'col-4') {
-                  h1(class: 'title') { title }
+                  h1(class: 'title') {
+                    title
+                  }
                 }
                 div(class: 'col-8') {
                   actions_buttons
@@ -31,13 +33,15 @@ module TinyAdmin
                 if filters&.any?
                   div(class: 'col-3') {
                     filters_form = TinyAdmin::Views::Components::FiltersForm.new
-                    filters_form.update_attributes(section_path: route_for(context.slug), filters: filters)
+                    filters_form.update_attributes(section_path: TinyAdmin.route_for(slug), filters: filters)
                     render filters_form
                   }
                 end
               }
 
               render pagination_component if pagination_component
+
+              render TinyAdmin::Views::Components::Widgets.new(widgets)
             }
           end
         end
@@ -66,7 +70,7 @@ module TinyAdmin
                   field = fields[key]
                   td(class: "field-value-#{field.name} field-value-type-#{field.type}") {
                     if field.options && field.options[:link_to]
-                      a(href: route_for(field.options[:link_to], reference: value)) {
+                      a(href: TinyAdmin.route_for(field.options[:link_to], reference: value)) {
                         field.apply_call_option(record) || value
                       }
                     else
@@ -82,15 +86,15 @@ module TinyAdmin
                       links.each do |link|
                         whitespace
                         if link == 'show'
-                          a(href: route_for(context.slug, reference: record.id), class: link_class) { 'show' }
+                          a(href: TinyAdmin.route_for(slug, reference: record.id), class: link_class) { 'show' }
                         else
-                          a(href: route_for(context.slug, reference: record.id, action: link), class: link_class) {
+                          a(href: TinyAdmin.route_for(slug, reference: record.id, action: link), class: link_class) {
                             to_label(link)
                           }
                         end
                       end
                     else
-                      a(href: route_for(context.slug, reference: record.id), class: link_class) { 'show' }
+                      a(href: TinyAdmin.route_for(slug, reference: record.id), class: link_class) { 'show' }
                     end
                   }
                 }
@@ -103,7 +107,7 @@ module TinyAdmin
           ul(class: 'nav justify-content-end') {
             (actions || {}).each do |action, action_class|
               li(class: 'nav-item mx-1') {
-                href = route_for(context.slug, action: action)
+                href = TinyAdmin.route_for(slug, action: action)
                 a(href: href, class: 'nav-link btn btn-outline-secondary') {
                   action_class.respond_to?(:title) ? action_class.title : action
                 }

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

@@ -4,7 +4,7 @@ module TinyAdmin
   module Views
     module Actions
       class Show < DefaultLayout
-        attr_accessor :actions, :fields, :prepare_record, :record
+        attr_accessor :actions, :fields, :prepare_record, :record, :reference, :slug
 
         def template
           super do
@@ -26,7 +26,7 @@ module TinyAdmin
                   end
                   div(class: 'field-value col-10') {
                     if field.options[:link_to]
-                      a(href: route_for(field.options[:link_to], reference: value)) {
+                      a(href: TinyAdmin.route_for(field.options[:link_to], reference: value)) {
                         field.apply_call_option(record) || value
                       }
                     else
@@ -35,6 +35,8 @@ module TinyAdmin
                   }
                 }
               end
+
+              render TinyAdmin::Views::Components::Widgets.new(widgets)
             }
           end
         end
@@ -45,7 +47,7 @@ module TinyAdmin
           ul(class: 'nav justify-content-end') {
             (actions || {}).each do |action, action_class|
               li(class: 'nav-item mx-1') {
-                href = route_for(context.slug, reference: context.reference, action: action)
+                href = TinyAdmin.route_for(slug, reference: reference, action: action)
                 a(href: href, class: 'nav-link btn btn-outline-secondary') {
                   action_class.respond_to?(:title) ? action_class.title : action
                 }

data/lib/tiny_admin/views/basic_layout.rb

@@ -5,6 +5,8 @@ module TinyAdmin
     class BasicLayout < Phlex::HTML
       include Utils
 
+      attr_accessor :content, :widgets
+
       def update_attributes(attributes)
         attributes.each do |key, value|
           send("#{key}=", value)

data/lib/tiny_admin/views/basic_widget.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  module Views
+    class BasicWidget < Phlex::HTML
+    end
+  end
+end

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

@@ -23,14 +23,14 @@ module TinyAdmin
               }
               div(class: 'collapse navbar-collapse', id: 'navbarNav') {
                 ul(class: 'navbar-nav') {
-                  items.each do |slug, item|
+                  items.each do |item|
                     classes = %w[nav-link]
-                    classes << 'active' if slug == current_slug
-                    link_attributes = { class: classes.join(' '), href: item[:path], 'aria-current' => 'page' }
-                    link_attributes.merge!(item[:options]) if item[:options]
+                    classes << 'active' if item.slug == current_slug
+                    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) { item[:name] }
+                      a(**link_attributes) { item.name }
                     }
                   end
                 }

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  module Views
+    module Components
+      class Widgets < BasicComponent
+        def initialize(widgets)
+          @widgets = widgets
+        end
+
+        def template
+          return if @widgets.nil? || @widgets.empty?
+
+          div(class: 'container widgets') {
+            @widgets.each_slice(2).each do |row|
+              div(class: 'row') {
+                row.each do |widget|
+                  next unless widget < Phlex::HTML
+
+                  div(class: 'col') {
+                    div(class: 'card') {
+                      div(class: 'card-body') {
+                        render widget.new
+                      }
+                    }
+                  }
+                end
+              }
+            end
+          }
+        end
+      end
+    end
+  end
+end

data/lib/tiny_admin/views/default_layout.rb

@@ -6,7 +6,7 @@ module TinyAdmin
       attr_accessor :flash_component, :head_component, :messages, :navbar_component, :options, :title
 
       def template(&block)
-        extra_styles = settings.extra_styles
+        extra_styles = TinyAdmin.settings.extra_styles
         flash_component&.messages = messages
         head_component&.update_attributes(page_title: title, style_links: style_links, extra_styles: extra_styles)
 
@@ -49,7 +49,7 @@ module TinyAdmin
       end
 
       def style_links
-        settings.style_links || [
+        TinyAdmin.settings.style_links || [
           # Bootstrap CDN
           {
             href: 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css',
@@ -61,7 +61,7 @@ module TinyAdmin
       end
 
       def render_scripts
-        (settings.scripts || []).each do |script_attrs|
+        (TinyAdmin.settings.scripts || []).each do |script_attrs|
           script(**script_attrs)
         end
       end

data/lib/tiny_admin/views/pages/content.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module TinyAdmin
+  module Views
+    module Pages
+      class Content < DefaultLayout
+        def template
+          super do
+            div(class: 'content') {
+              div(class: 'content-data') {
+                unsafe_raw(content)
+              }
+
+              render TinyAdmin::Views::Components::Widgets.new(widgets)
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tiny_admin/views/pages/root.rb

@@ -7,7 +7,7 @@ module TinyAdmin
         def template
           super do
             div(class: 'root') {
-              h1(class: 'title') { 'Tiny Admin' }
+              render TinyAdmin::Views::Components::Widgets.new(widgets)
             }
           end
         end

data/lib/tiny_admin.rb

@@ -4,6 +4,7 @@ require 'phlex'
 require 'roda'
 require 'zeitwerk'
 
+require 'forwardable'
 require 'singleton'
 require 'yaml'
 
@@ -12,15 +13,27 @@ loader.setup
 
 module TinyAdmin
   def configure(&block)
-    block&.call(TinyAdmin::Settings.instance) || TinyAdmin::Settings.instance
+    block&.call(settings) || settings
   end
 
   def configure_from_file(file)
+    settings.reset!
     config = YAML.load_file(file, symbolize_names: true)
     config.each do |key, value|
-      TinyAdmin::Settings.instance[key] = value
+      settings[key] = value
     end
   end
 
-  module_function :configure, :configure_from_file
+  def route_for(section, reference: nil, action: nil, query: nil)
+    root_path = settings.root_path == '/' ? nil : settings.root_path
+    route = [root_path, section, reference, action].compact.join("/")
+    route << "?#{query}" if query
+    route[0] == '/' ? route : route.prepend('/')
+  end
+
+  def settings
+    TinyAdmin::Settings.instance
+  end
+
+  module_function :configure, :configure_from_file, :route_for, :settings
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -87,20 +87,25 @@ files:
 - lib/tiny_admin/plugins/no_auth.rb
 - lib/tiny_admin/plugins/simple_auth.rb
 - lib/tiny_admin/router.rb
+- lib/tiny_admin/section.rb
 - lib/tiny_admin/settings.rb
+- lib/tiny_admin/store.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/basic_widget.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
 - lib/tiny_admin/views/components/navbar.rb
 - lib/tiny_admin/views/components/pagination.rb
+- lib/tiny_admin/views/components/widgets.rb
 - lib/tiny_admin/views/default_layout.rb
+- lib/tiny_admin/views/pages/content.rb
 - lib/tiny_admin/views/pages/page_not_found.rb
 - lib/tiny_admin/views/pages/record_not_found.rb
 - lib/tiny_admin/views/pages/root.rb