headmin 0.2.7 → 0.3.3

data/app/views/headmin/forms/repeater/_row.html.erb

@@ -18,7 +18,7 @@
   <%= form.hidden_field :id %>
   <%= form.hidden_field :_destroy if destroyable %>
   <%= form.hidden_field :position if draggable %>
-  <%= yield if block_given? %>
+  <%= yield %>
 
   <!--  Drag handle -->
   <% if draggable %>

data/app/views/headmin/heading/_title.html.erb

@@ -21,4 +21,4 @@
       </a>
     <% end %>
   </div>
-</div>
+</div>

data/app/views/headmin/layout/_body.html.erb

@@ -5,5 +5,5 @@
 %>
 
 <div class="body col-sm-12 col-md-11 col-lg-10 p-0">
-  <%= yield if block_given? %>
+  <%= yield %>
 </div>

data/app/views/headmin/layout/_content.html.erb

@@ -5,5 +5,5 @@
 %>
 
 <div class="content py-4">
-  <%= yield if block_given? %>
+  <%= yield %>
 </div>

data/app/views/headmin/layout/_footer.html.erb

@@ -10,7 +10,7 @@
     <div class="text-secondary">
       Headmin v.<%= Headmin::VERSION %>
       <span class="float-end">
-        <%= yield if block_given? %>
+        <%= yield %>
       </span>
     </div>
   </div>

data/app/views/headmin/layout/_header.html.erb

@@ -7,7 +7,7 @@
 <header class="border-bottom d-print-none d-none d-md-block">
   <nav class="navbar navbar-light bg-white">
     <div class="container-fluid">
-      <%= yield if block_given? %>
+      <%= yield %>
     </div>
   </nav>
 </header>

data/app/views/headmin/layout/_main.html.erb

@@ -1,13 +1,19 @@
-<%#
-    headmin/layout/main
-    accepts block: yes
-    parameters: none
+<%
+  # headmin/layout/main
+  #
+  # ==== Examples
+  #   Basic version
+  #   <%= render 'headmin/layout/main' do %#>
+  #     ...
+  #   <% end %#>
+
+  class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : false
 %>
 
-<div class="main" data-controller="popup">
+<div class="main <%= class_names %>" data-controller="popup">
   <div class="container-fluid">
     <div class="row">
-      <%= yield if block_given? %>
+      <%= yield %>
     </div>
   </div>
 </div>

data/app/views/headmin/layout/_sidebar.html.erb

@@ -7,14 +7,14 @@
 
 <div class="sidebar col-sm-12 col-md-1 col-lg-2 bg-dark overflow-y d-print-none">
   <nav class="navbar navbar-expand-md navbar-dark bg-dark w-100 h-100 flex-md-column">
-    <a href="<%= admin_root_path %>" class="nav-brand mb-lg-4 ms-lg-3 me-lg-auto">
-      <%= logo %>
+    <a href="<%= local_assigns[:url] %>" class="nav-brand mb-lg-4 ms-lg-3 me-lg-auto">
+      <%= local_assigns[:logo] %>
     </a>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
     <div class="navbar-nav navbar-collapse collapse flex-column align-items-start justify-content-start w-100 h-100" id="sidebar-nav">
-      <%= yield if block_given? %>
+      <%= yield %>
     </div>
   </nav>
 </div>

data/app/views/headmin/layout/sidebar/_bottom.html.erb

@@ -1,4 +1,4 @@
 <div class="mt-auto w-100">
   <hr class="bg-light">
-  <%= yield if block_given? %>
+  <%= yield %>
 </div>

data/app/views/headmin/layout/sidebar/_nav.html.erb

@@ -5,5 +5,5 @@
 %>
 
 <ul class="nav nav-pills flex-column mb-auto w-100">
-  <%= yield if block_given? %>
+  <%= yield %>
 </ul>

data/app/views/headmin/nav/_dropdown.html.erb

@@ -0,0 +1,34 @@
+<%
+  # headmin/nav/dropdown
+  #
+  # ==== Options
+  # * +name</tt> - Name of the nav item
+  # * +url</tt> - URL for this nav item
+  # * +icon</tt> - Optional Bootstrap icon name
+  # * +active</tt> - Set to true if this nav dropdown needs to be highlighted
+  #
+  # ==== Examples
+  #   Basic version.
+  #   <%= render 'headmin/nav/dropdown', name: 'My Account', url: admin_user_path, icon: 'person-circle' do  %#>
+  #     <%= render 'headmin/nav/item', name: 'Edit info', url: edit_admin_user_path(current_user) %#>
+  #     <%= render 'headmin/nav/item', name: 'Log out', url: destroy_user_session_path(current_user) %#>
+  #   <% end %#>
+
+  name = local_assigns.has_key?(:name) ? name : ''
+  icon = local_assigns.has_key?(:icon) ? icon : nil
+  collapse_id = "nav-dropdown-#{name.parameterize}"
+  url = local_assigns.has_key?(:url) ? url : request.url
+  active = local_assigns.has_key?(:active) ? active : current_url?(url)
+%>
+
+<li class="nav-item">
+  <a class="nav-link d-flex align-items-center dropdown-toggle <%= 'active' if active %>" href="#<%= collapse_id %>" role="button" data-bs-toggle="collapse" aria-expanded="<%= active.to_s %>" aria-controls="<%= collapse_id %>">
+    <%= bootstrap_icon(icon, class: 'me-2') if icon %>
+    <span class="d-block d-md-none d-lg-block">
+      <%= name %>
+    </span>
+  </a>
+  <ul class="collapse <%= 'show' if active %>" id="<%= collapse_id %>">
+    <%= yield %>
+  </ul>
+</li>

data/app/views/headmin/nav/_item.html.erb

@@ -1,21 +1,30 @@
-<%#
-    headmin/nav/item
-    accepts block: yes
-    parameters:
-      url: (string) Url to be used as anchor in link tag
-      name: (string) Name to be displayed inside link
-      active: (boolean) Whether to highlight the item or not
+<%
+  # headmin/nav/item
+  #
+  # ==== Options
+  # * +name</tt> - Name of the nav item
+  # * +url</tt> - URL for this nav item
+  # * +icon</tt> - Optional Bootstrap icon name
+  # * +active</tt> - Set to true if this nav item needs to be highlighted
+  #
+  # ==== Examples
+  #   Basic version.
+  #   <%= render 'headmin/nav/item', name: 'Dashboard', url: admin_root_path %#>
+  #
+  #   With icon
+  #   <%= render 'headmin/nav/item', name: 'Dashboard', url: admin_root_path, icon: 'speedometer' %#>
+
+  name = local_assigns.has_key?(:name) ? name : ''
+  icon = local_assigns.has_key?(:icon) ? icon : nil
+  url = local_assigns.has_key?(:url) ? url : request.url
+  active = local_assigns.has_key?(:active) ? active : current_url?(url)
 %>
-<% name = local_assigns.has_key?(:name) ? name : '' %>
-<% icon = local_assigns.has_key?(:icon) ? icon : nil %>
-<% url = local_assigns.has_key?(:url) ? url : '' %>
-<% active = local_assigns.has_key?(:active) ? current_url?(url) : false %>
 
 <li class="nav-item">
   <a class="nav-link d-flex align-items-center <%= 'active' if active %>" aria-current="page" href="<%= url %>">
     <%= bootstrap_icon(icon, class: 'me-2') if icon %>
     <span class="d-block d-md-none d-lg-block">
-  <%= name %>
-</span>
+      <%= name %>
+    </span>
   </a>
 </li>

data/app/views/headmin/nav/item/_devise.html.erb

@@ -16,6 +16,6 @@
   <%= render 'headmin/dropdown/list', id: 'nav-item-devise' do %>
     <%= render 'headmin/dropdown/item', name: t('.edit_profile'), url: polymorphic_path([:edit, singular, :registration]) %>
     <%= render 'headmin/dropdown/divider' %>
-    <%= render 'headmin/dropdown/item', name: t('.log_out'), url: polymorphic_path([:destroy, singular, :session]), method: :delete %>
+    <%= render 'headmin/dropdown/item', name: t('.log_out'), url: polymorphic_path([:destroy, singular, :session]), data: { "turbo-method": "delete" } %>
   <% end %>
 <% end %>

data/app/views/headmin/table/_actions.html.erb

@@ -9,12 +9,11 @@
   #     <%= render 'headmin/table/actions/delete', url: destroy_admin_pages_path %#>
   #   <% end %#>
 
-  selection_count = content_for(:collection_total_count).to_i || 0
 %>
 
 <% content_for :table_actions do %>
   <th class="h-table-actions d-none" data-controller="table-actions" data-table-actions-target="wrapper" data-table-target="actions">
-    <%= form_with url: '', data: { 'table-actions-target': 'form' } do |form| %>
+    <%= form_with url: '', data: { "table-actions-target": 'form', "turbo": false } do |form| %>
       <%= form.hidden_field :authenticity_token, value: form_authenticity_token %>
       <%= form.hidden_field :_method, value: 'POST', 'data-table-actions-target': 'method' %>
       <%= query_parameter_fields(form) %>
@@ -28,16 +27,15 @@
           <div class="d-flex align-items-center gap-3">
             <label class="text-nowrap"
               data-table-actions-target="counter"
-              data-total-count="<%= selection_count %>"
               data-items-zero="<%= t('.items_html', count: 0) %>"
               data-items-one="<%= t('.items_html', count: 1) %>"
               data-items-other="<%= t('.items_html', count: 2) %>"
             >
-              <%= t('.items_html', count: selection_count) %>
+              <%= t('.items_html', count: 0) %>
             </label>
             <select class="form-select me-1" data-table-actions-target="select" data-action="change->table-actions#update">
               <option disabled selected="selected"><%= t('.selection') %></option>
-              <%= yield if block_given? %>
+              <%= yield %>
             </select>
           </div>
         </div>

data/app/views/headmin/table/_body.html.erb

@@ -5,7 +5,7 @@
 %>
 
 <% content_for :table_body do %>
-  <%= yield if block_given? %>
+  <%= yield %>
 <% end %>
 
 <tbody data-table-target="body">

data/app/views/headmin/table/_foot.html.erb

@@ -5,7 +5,7 @@
 %>
 
 <% content_for :table_foot do %>
-  <%= yield if block_given? %>
+  <%= yield %>
 <% end %>
 
 <tfoot class="table-light">

data/app/views/headmin/table/_footer.html.erb

@@ -5,5 +5,5 @@
 %>
 
 <div class="d-flex flex-column flex-md-row align-content-start align-items-md-center justify-content-md-between">
-  <%= yield if block_given? %>
+  <%= yield %>
 </div>

data/app/views/headmin/table/_head.html.erb

@@ -7,7 +7,7 @@
 <thead class="table-light fw-light">
 <tr>
   <% content_for :table_head do %>
-    <%= yield if block_given? %>
+    <%= yield %>
   <% end %>
 
   <%= yield :table_head  %>

data/app/views/headmin/table/_header.html.erb

@@ -5,5 +5,5 @@
 %>
 
 <div class="d-flex flex-column flex-md-row align-content-start align-items-md-center justify-content-md-between">
-  <%= yield if block_given? %>
+  <%= yield %>
 </div>

data/app/views/headmin/table/actions/_action.html.erb

@@ -2,10 +2,10 @@
   # headmin/table/actions/action
   #
   # ==== Options
-  # * <tt>name</tt> - Name of the bulk action
-  # * <tt>url</tt> - URL to send the request to
-  # * <tt>method</tt> - HTTP method for the request (defaults to GET)
-  # * <tt>confirm</tt> - Message to show in a confirm dialog. Leave blank if no confirm dialog needs to be shown
+  # * +name</tt> - Name of the bulk action
+  # * +url</tt> - URL to send the request to
+  # * +method</tt> - HTTP method for the request (defaults to GET)
+  # * +confirm</tt> - Message to show in a confirm dialog. Leave blank if no confirm dialog needs to be shown
   #
   # ==== Examples
   #   Basic version.

data/app/views/headmin/table/actions/_delete.html.erb

@@ -2,7 +2,7 @@
   # headmin/table/actions/delete
   #
   # ==== Options
-  # * <tt>url</tt> - URL to send the request to
+  # * +url</tt> - URL to send the request to
   #
   # ==== Examples
   #   Basic version.

data/app/views/headmin/table/actions/_export.html.erb

@@ -2,7 +2,7 @@
   # headmin/table/actions/export
   #
   # ==== Options
-  # * <tt>url</tt> - URL to send the request to
+  # * +url</tt> - URL to send the request to
   #
   # ==== Examples
   #   Basic version.

data/app/views/headmin/table/body/_row.html.erb

@@ -1,9 +1,17 @@
-<%#
-    headmin/table/body/row
-    accepts block: yes
-    parameters: none
-%>
+<%
+  # headmin/table/body/row
+  #
+  # ==== Options
+  # * +class</tt> - Custom class names to add to the table row
+  #
+  # ==== Examples
+  #   <%= render 'headmin/table/body/row' do %#>
+  #     <%= render 'headmin/table/body/id', value: page.id %#>
+  #     <%= render 'headmin/table/body/string', value: page.title %#>
+  #   <% end %#>
 
-<tr>
-  <%= yield if block_given? %>
+  class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : false
+%>
+<tr class="<%= class_names %>" data-table-target="row">
+  <%= yield %>
 </tr>

data/app/views/headmin/views/devise/registrations/_edit.html.erb

@@ -1,5 +1,5 @@
 <div>
-  <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put}) do |f| %>
+  <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
     <%= render "headmin/views/devise/shared/error_messages", resource: resource %>
 
     <%= render 'headmin/forms/email', form: f, attribute: :email, required: true, float: true %>
@@ -19,6 +19,6 @@
     <h4><%= t('.cancel') %></h4>
 
     <p><%= t('.unhappy') %></p>
-    <%= button_to t('.cancel'), registration_path(resource_name), class: 'btn btn-lg btn-danger w-100', data: {confirm: "Are you sure?"}, method: :delete %>
+    <%= button_to t('.cancel'), registration_path(resource_name), class: 'btn btn-lg btn-danger w-100', "data-turbo-confirm": "Are you sure?", "data-turbo-method": "delete" %>
   </div>
 </div>

data/config/importmap.rb

@@ -0,0 +1,2 @@
+# Pin npm packages by running ./bin/importmap
+pin "headmin"

data/config/initializers/customize_input_error.rb

@@ -1,9 +1,9 @@
-ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+ActionView::Base.field_error_proc = proc do |html_tag, instance|
   class_attr_index = html_tag.index 'class="'
 
   if class_attr_index
-    html_tag.insert class_attr_index+7, 'error '
+    html_tag.insert class_attr_index + 7, "error "
   else
-    html_tag.insert html_tag.index('>'), ' class="error"'
+    html_tag.insert html_tag.index(">"), ' class="error"'
   end
-end
+end

data/config/locales/en.yml

@@ -1,5 +1,2 @@
 en:
   language_name: English
-  headmin:
-    popup:
-      add: 'Add %{name}'

data/config/locales/headmin/forms/en.yml

@@ -12,6 +12,11 @@ en:
         title: Status
         view:
           title: View
+      file:
+        not_found: Not available
+        placeholder:
+          one: Browse file or drag & drop it here
+          other: Browse files or drag & drop them here
       group:
         save: Save
       blocks:

data/config/locales/headmin/forms/nl.yml

@@ -12,6 +12,11 @@ nl:
         title: Status
         view:
           title: Bekijken
+      file:
+        not_found: Niet beschikbaar
+        placeholder:
+          one: Kies bestand of sleep het hierheen
+          other: Kies bestanden of sleep ze hierheen
       group:
         save: Opslaan
       blocks:

data/config/locales/headmin/popup/en.yml

@@ -0,0 +1,4 @@
+en:
+  headmin:
+    popup:
+      add: 'Add %{name}'

data/config/locales/headmin/popup/nl.yml

@@ -0,0 +1,4 @@
+nl:
+  headmin:
+    popup:
+      add: '%{name} toevoegen'

data/config/locales/headmin/thumbnail/en.yml

@@ -0,0 +1,4 @@
+en:
+  headmin:
+    thumbnail:
+      title: Title

data/config/locales/headmin/thumbnail/nl.yml

@@ -0,0 +1,4 @@
+nl:
+  headmin:
+    thumbnail:
+      title: Titel

data/config/locales/nl.yml

@@ -1,5 +1,2 @@
 nl:
   language_name: Nederlands
-  headmin:
-    popup:
-      add: '%{name} toevoegen'

data/esbuild-css.js

@@ -0,0 +1,25 @@
+const esbuild = require("esbuild");
+const sassPlugin = require("esbuild-sass-plugin").sassPlugin;
+const watch = process.argv.includes('-w')
+
+// Used to skip external URLs in scss files
+const externalUrlPlugin = {
+    name: "custom-resolver",
+    setup(build) {
+        build.onResolve({filter: /^https?:\/\//}, ({path}) => {
+            return {path, external: true, namespace: "provided"};
+        });
+    }
+}
+
+esbuild.build({
+    entryPoints: ['src/scss/headmin.scss'],
+    outfile: 'app/assets/stylesheets/headmin.css',
+    bundle: true,
+    watch: watch,
+    allowOverwrite: true,
+    plugins: [
+        externalUrlPlugin,
+        sassPlugin()
+    ]
+}).catch((e) => console.error(e.message));

data/esbuild-js.js

@@ -0,0 +1,11 @@
+const esbuild = require("esbuild");
+const watch = process.argv.includes('-w')
+
+esbuild.build({
+    entryPoints: ['src/js/headmin.js'],
+    outfile: 'app/assets/javascripts/headmin.js',
+    bundle: true,
+    allowOverwrite: true,
+    format: 'esm',
+    watch: watch
+}).catch((e) => console.error(e.message));

data/headmin.gemspec

@@ -29,7 +29,10 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_runtime_dependency 'closure_tree'
+  spec.add_runtime_dependency "closure_tree", "~> 7.4"
+  spec.add_runtime_dependency "inline_svg", "~> 1.7"
+  spec.add_runtime_dependency "redcarpet", "~> 3.5"
+  spec.add_runtime_dependency "rouge", "~> 3.27"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/generators/headmin/blocks_generator.rb

@@ -2,21 +2,21 @@ module Headmin
   class BlocksGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../../templates', __FILE__)
+    source_root File.expand_path("../../templates", __FILE__)
 
     def copy_models
-      template 'models/block.rb', 'app/models/block.rb'
+      template "models/block.rb", "app/models/block.rb"
     end
 
     def copy_migrations
-      migration_template 'migrations/create_blocks.rb', 'db/migrate/create_blocks.rb'
+      migration_template "migrations/create_blocks.rb", "db/migrate/create_blocks.rb"
     end
 
-    private
-
-    def self.next_migration_number(dirname)
-      next_migration_number = current_migration_number(dirname) + 1
-      ActiveRecord::Migration.next_migration_number(next_migration_number)
+    class << self
+      def next_migration_number(dirname)
+        next_migration_number = current_migration_number(dirname) + 1
+        ActiveRecord::Migration.next_migration_number(next_migration_number)
+      end
     end
   end
 end

data/lib/generators/headmin/devise_generator.rb

@@ -2,15 +2,15 @@ module Headmin
   class DeviseGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../../templates', __FILE__)
+    source_root File.expand_path("../../templates", __FILE__)
 
     def copy_controllers
-      directory 'controllers/auth', 'app/controllers/auth'
+      directory "controllers/auth", "app/controllers/auth"
     end
 
     def copy_views
-      directory 'views/auth', 'app/views/auth'
-      copy_file 'views/layouts/auth.html.erb', 'app/views/layouts/auth.html.erb'
+      directory "views/auth", "app/views/auth"
+      copy_file "views/layouts/auth.html.erb", "app/views/layouts/auth.html.erb"
     end
   end
 end

data/lib/generators/headmin/fields_generator.rb

@@ -2,22 +2,22 @@ module Headmin
   class FieldsGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../../templates', __FILE__)
+    source_root File.expand_path("../../templates", __FILE__)
 
     def copy_models
-      template 'models/field.rb', 'app/models/field.rb'
+      template "models/field.rb", "app/models/field.rb"
     end
 
     def copy_migrations
-      migration_template 'migrations/create_fields.rb', 'db/migrate/create_fields.rb'
-      migration_template 'migrations/create_field_hierarchies.rb', 'db/migrate/create_field_hierarchies.rb'
+      migration_template "migrations/create_fields.rb", "db/migrate/create_fields.rb"
+      migration_template "migrations/create_field_hierarchies.rb", "db/migrate/create_field_hierarchies.rb"
     end
 
-    private
-
-    def self.next_migration_number(dirname)
-      next_migration_number = current_migration_number(dirname) + 1
-      ActiveRecord::Migration.next_migration_number(next_migration_number)
+    class << self
+      def next_migration_number(dirname)
+        next_migration_number = current_migration_number(dirname) + 1
+        ActiveRecord::Migration.next_migration_number(next_migration_number)
+      end
     end
   end
 end

data/lib/generators/templates/controllers/auth/confirmations_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::ConfirmationsController < Devise::ConfirmationsController
-  layout 'auth'
+  layout "auth"
   # GET /resource/confirmation/new
   # def new
   #   super

data/lib/generators/templates/controllers/auth/omniauth_callbacks_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  layout 'auth'
+  layout "auth"
   # You should configure your model like this:
   # devise :omniauthable, omniauth_providers: [:twitter]
 

data/lib/generators/templates/controllers/auth/passwords_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::PasswordsController < Devise::PasswordsController
-  layout 'auth'
+  layout "auth"
   # GET /resource/password/new
   # def new
   #   super

data/lib/generators/templates/controllers/auth/registrations_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::RegistrationsController < Devise::RegistrationsController
-  layout 'auth'
+  layout "auth"
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]
 

data/lib/generators/templates/controllers/auth/sessions_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Auth::SessionsController < Devise::SessionsController
-  layout 'auth'
+  layout "auth"
   # before_action :configure_sign_in_params, only: [:create]
 
   # GET /resource/sign_in