headmin 0.4.1 → 0.5.1

data/app/views/headmin/views/devise/confirmations/_new.html.erb

@@ -1,7 +1,7 @@
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: {method: :post}) do |f| %>
   <%= render "headmin/views/devise/shared/error_messages", resource: resource %>
 
-  <%= render 'headmin/forms/email', form: f, attribute: :email, required: true, float: true %>
+  <%= render "headmin/forms/email", form: f, attribute: :email, required: true, float: true %>
 
   <%= f.submit t('.resend'), class: 'btn btn-lg btn-primary w-100' %>
 

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

@@ -3,8 +3,8 @@
 
   <%= f.hidden_field :reset_password_token %>
 
-  <%= render 'headmin/forms/password', form: f, attribute: :password, required: true, float: true %>
-  <%= render 'headmin/forms/password', form: f, attribute: :password_confirmation, required: true, float: true %>
+  <%= render "headmin/forms/password", form: f, attribute: :password, required: true, float: true %>
+  <%= render "headmin/forms/password", form: f, attribute: :password_confirmation, required: true, float: true %>
 
   <%= f.submit t('.change_password'), class: 'btn btn-lg btn-primary w-100' %>
 

data/app/views/headmin/views/devise/passwords/_new.html.erb

@@ -1,7 +1,7 @@
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: {method: :post}) do |f| %>
   <%= render "headmin/views/devise/shared/error_messages", resource: resource %>
 
-  <%= render 'headmin/forms/email', form: f, attribute: :email, required: true, float: true %>
+  <%= render "headmin/forms/email", form: f, attribute: :email, required: true, float: true %>
 
   <%= f.submit t('.send_instructions'), class: 'btn btn-lg btn-primary w-100' %>
 

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

@@ -2,15 +2,15 @@
   <%= 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 %>
+    <%= render "headmin/forms/email", form: f, attribute: :email, required: true, float: true %>
 
     <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
       <div><%= t('.waiting_confirmation', email: resource.unconfirmed_email) %></div>
     <% end %>
 
-    <%= render 'headmin/forms/password', form: f, attribute: :password, required: true, float: true %>
-    <%= render 'headmin/forms/password', form: f, attribute: :password_confirmation, required: true, float: true %>
-    <%= render 'headmin/forms/password', form: f, attribute: :current_password, required: true, float: true %>
+    <%= render "headmin/forms/password", form: f, attribute: :password, required: true, float: true %>
+    <%= render "headmin/forms/password", form: f, attribute: :password_confirmation, required: true, float: true %>
+    <%= render "headmin/forms/password", form: f, attribute: :current_password, required: true, float: true %>
 
     <%= f.submit t('.change'), class: 'btn btn-lg btn-primary w-100' %>
   <% end %>

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

@@ -1,9 +1,9 @@
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= render "headmin/views/devise/shared/error_messages", resource: resource %>
 
-  <%= render 'headmin/forms/email', form: f, attribute: :email, required: true, float: true %>
-  <%= render 'headmin/forms/password', form: f, attribute: :password, required: true, float: true %>
-  <%= render 'headmin/forms/password', form: f, attribute: :password_confirmation, required: true, float: true %>
+  <%= render "headmin/forms/email", form: f, attribute: :email, required: true, float: true %>
+  <%= render "headmin/forms/password", form: f, attribute: :password, required: true, float: true %>
+  <%= render "headmin/forms/password", form: f, attribute: :password_confirmation, required: true, float: true %>
 
   <%= f.submit t('.sign_up'), class: 'btn btn-lg btn-primary w-100' %>
 

data/app/views/headmin/views/devise/sessions/_new.html.erb

@@ -1,10 +1,10 @@
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
 
-  <%= render 'headmin/forms/email', form: f, attribute: :email, required: true, float: true %>
-  <%= render 'headmin/forms/password', form: f, attribute: :password, required: true, float: true %>
+  <%= render "headmin/forms/email", form: f, attribute: :email, required: true, float: true %>
+  <%= render "headmin/forms/password", form: f, attribute: :password, required: true, float: true %>
 
   <% if devise_mapping.rememberable? %>
-    <%= render 'headmin/forms/checkbox', form: f, attribute: :remember_me %>
+    <%= render "headmin/forms/checkbox", form: f, attribute: :remember_me %>
   <% end %>
 
   <%= f.submit t('.login'), class: 'btn btn-lg btn-primary w-100' %>

data/app/views/headmin/views/devise/unlocks/_new.html.erb

@@ -1,7 +1,7 @@
 <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: {method: :post}) do |f| %>
   <%= render "headmin/views/devise/shared/error_messages", resource: resource %>
 
-  <%= render 'headmin/forms/email', form: f, attribute: :email, required: true, float: true %>
+  <%= render "headmin/forms/email", form: f, attribute: :email, required: true, float: true %>
 
   <%= f.submit t('.resend'), class: 'btn btn-lg btn-primary w-100' %>
 

data/config/locales/en.yml

@@ -1,2 +1,6 @@
 en:
   language_name: English
+
+  date:
+    formats:
+      default: "%d/%m/%Y"

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

@@ -0,0 +1,6 @@
+en:
+  headmin:
+    dropdown:
+      devise:
+        edit_profile: Edit profile
+        log_out: Log out

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

@@ -0,0 +1,6 @@
+nl:
+  headmin:
+    dropdown:
+      devise:
+        edit_profile: Profiel bewerken
+        log_out: Afmelden

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

@@ -1,13 +1,38 @@
 en:
   headmin:
     filters:
+      apply: Apply
       button: Filters
       remove_all: Clear all
       filter:
         button:
           all: All
+        conditional:
+          and: And
+          or: Or
       select:
         blank: Make a choice
       search:
         button: Search
-        placeholder: 'Search in %{resource}'
+        placeholder: 'Search in %{resource}'
+      conditionals:
+        and: and
+        or: or
+      operators:
+        eq: is equal to
+        not_eq: is not equal to
+        gt: is greater than
+        gteq: is greater than or equal to
+        lt: is lower than
+        lteq: is lower than or equal to
+        starts_with: starts with
+        ends_with: ends with
+        matches: matches with
+        does_not_match: does not matches with
+        is_not_null: is not null
+        is_null: is null
+      values:
+        "false": "False"
+        "no": "No"
+        "true": "Hello"
+        "yes": "Yes"

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

@@ -1,13 +1,38 @@
 nl:
   headmin:
     filters:
+      apply: Toepassen
       button: Filters
       remove_all: Filters leegmaken
       filter:
         button:
           all: Alle
+        conditional:
+          and: En
+          or: Of
       select:
         blank: Maak een keuze
       search:
         button: Zoeken
-        placeholder: 'In %{resource} zoeken'
+        placeholder: 'In %{resource} zoeken'
+      conditionals:
+        and: en
+        or: of
+      operators:
+        eq: is
+        not_eq: is niet
+        gt: is groter dan
+        gteq: is groter dan of gelijk aan
+        lt: is kleiner dan
+        lteq: is kleiner dan of gelijk aan
+        starts_with: begint met
+        ends_with: eindigt met
+        matches: lijkt op
+        does_not_match: lijkt niet op
+        is_not_null: is ingevuld
+        is_null: is niet ingevuld
+      values:
+        "false": Onwaar
+        "no": Nee
+        "true": Waar
+        "yes": Ja

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

@@ -1,14 +1,5 @@
 en:
   headmin:
     layout:
-      sidebar:
-        menu:
-          account:
-            edit_profile: Edit profile
-            log_out: Log out
-      header:
-        account:
-          edit_profile: Edit profile
-          log_out: Log out
       footer:
         help: Support

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

@@ -1,14 +1,5 @@
 nl:
   headmin:
     layout:
-      sidebar:
-        menu:
-          account:
-            edit_profile: Profiel bewerken
-            log_out: Afmelden
-      header:
-        account:
-          edit_profile: Profiel bewerken
-          log_out: Afmelden
       footer:
         help: Hulp nodig?

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

@@ -0,0 +1,7 @@
+en:
+  headmin:
+    nav:
+      item:
+        devise:
+        edit_profile: Edit profile
+        log_out: Log out

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

@@ -0,0 +1,7 @@
+nl:
+  headmin:
+    nav:
+      item:
+        devise:
+          edit_profile: Profiel bewerken
+          log_out: Afmelden

data/config/locales/nl.yml

@@ -1,2 +1,6 @@
 nl:
   language_name: Nederlands
+
+  date:
+    formats:
+      default: "%d/%m/%Y"

data/lib/generators/templates/views/layouts/auth.html.erb

@@ -10,7 +10,7 @@
 </head>
 <body class="bg-light w-100 vh-100">
 
-<%= render 'headmin/notifications' %>
+<%= render "headmin/notifications" %>
 
 <main class="d-flex justify-content-center align-items-center w-100 vh-100 p-3">
   <%= yield %>

data/lib/headmin/version.rb

@@ -1,3 +1,3 @@
 module Headmin
-  VERSION = "0.4.1"
+  VERSION = "0.5.1"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "headmin",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Admin component library",
   "module": "app/assets/javascripts/headmin.js",
   "main": "app/assets/javascripts/headmin.js",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headmin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: closure_tree
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".lock-487e157d270f3062a98b7b2a012753708-1272821827"
 - ".nvmrc"
 - ".ruby-version"
 - CHANGELOG.md
@@ -100,6 +101,7 @@ files:
 - app/assets/javascripts/headmin/controllers/dropzone_controller.js
 - app/assets/javascripts/headmin/controllers/file_preview_controller.js
 - app/assets/javascripts/headmin/controllers/filter_controller.js
+- app/assets/javascripts/headmin/controllers/filter_row_controller.js
 - app/assets/javascripts/headmin/controllers/filters_controller.js
 - app/assets/javascripts/headmin/controllers/flatpickr_controller.js
 - app/assets/javascripts/headmin/controllers/hello_controller.js
@@ -224,9 +226,8 @@ files:
 - app/assets/stylesheets/headmin/vendor/tom-select-bootstrap.css
 - app/controllers/concerns/headmin/acts_as_list.rb
 - app/controllers/concerns/headmin/authentication.rb
-- app/controllers/concerns/headmin/filter.rb
+- app/controllers/concerns/headmin/filterable.rb
 - app/controllers/concerns/headmin/pagination.rb
-- app/controllers/concerns/headmin/searchable.rb
 - app/controllers/concerns/headmin/sortable.rb
 - app/helpers/headmin/admin_helper.rb
 - app/helpers/headmin/bootstrap_helper.rb
@@ -248,10 +249,34 @@ files:
 - app/models/concerns/headmin/form/wrappable.rb
 - app/models/headmin/.DS_Store
 - app/models/headmin/blocks_view.rb
+- app/models/headmin/filter/base.rb
+- app/models/headmin/filter/base_view.rb
+- app/models/headmin/filter/boolean.rb
+- app/models/headmin/filter/boolean_view.rb
+- app/models/headmin/filter/button_view.rb
+- app/models/headmin/filter/conditional_view.rb
+- app/models/headmin/filter/date.rb
+- app/models/headmin/filter/date_view.rb
+- app/models/headmin/filter/flatpickr_view.rb
+- app/models/headmin/filter/menu_item_view.rb
+- app/models/headmin/filter/money.rb
+- app/models/headmin/filter/number.rb
+- app/models/headmin/filter/number_view.rb
+- app/models/headmin/filter/operator_view.rb
+- app/models/headmin/filter/options_view.rb
+- app/models/headmin/filter/row_view.rb
+- app/models/headmin/filter/search.rb
+- app/models/headmin/filter/search_view.rb
+- app/models/headmin/filter/text.rb
+- app/models/headmin/filter/text_view.rb
+- app/models/headmin/filters.rb
 - app/models/headmin/form/blocks_view.rb
 - app/models/headmin/form/checkbox_view.rb
+- app/models/headmin/form/color_view.rb
 - app/models/headmin/form/date_range_view.rb
 - app/models/headmin/form/date_view.rb
+- app/models/headmin/form/datetime_range_view.rb
+- app/models/headmin/form/datetime_view.rb
 - app/models/headmin/form/email_view.rb
 - app/models/headmin/form/file_view.rb
 - app/models/headmin/form/flatpickr_range_view.rb
@@ -293,19 +318,29 @@ files:
 - app/views/headmin/dropdown/_item.html.erb
 - app/views/headmin/dropdown/_list.html.erb
 - app/views/headmin/dropdown/_locale.html.erb
+- app/views/headmin/filters/_base.html.erb
+- app/views/headmin/filters/_boolean.html.erb
 - app/views/headmin/filters/_date.html.erb
 - app/views/headmin/filters/_flatpickr.html.erb
+- app/views/headmin/filters/_number.html.erb
+- app/views/headmin/filters/_options.html.erb
 - app/views/headmin/filters/_search.html.erb
-- app/views/headmin/filters/_select.html.erb
+- app/views/headmin/filters/_text.html.erb
 - app/views/headmin/filters/filter/_button.html.erb
+- app/views/headmin/filters/filter/_conditional.html.erb
 - app/views/headmin/filters/filter/_menu_item.html.erb
-- app/views/headmin/filters/filter/_template.html.erb
+- app/views/headmin/filters/filter/_null_select.html.erb
+- app/views/headmin/filters/filter/_operator.html.erb
+- app/views/headmin/filters/filter/_row.html.erb
 - app/views/headmin/forms/_autocomplete.html.erb
 - app/views/headmin/forms/_blocks.html.erb
 - app/views/headmin/forms/_checkbox.html.erb
+- app/views/headmin/forms/_color.html.erb
 - app/views/headmin/forms/_datalist.html.erb
 - app/views/headmin/forms/_date.html.erb
 - app/views/headmin/forms/_date_range.html.erb
+- app/views/headmin/forms/_datetime.html.erb
+- app/views/headmin/forms/_datetime_range.html.erb
 - app/views/headmin/forms/_email.html.erb
 - app/views/headmin/forms/_errors.html.erb
 - app/views/headmin/forms/_file.html.erb
@@ -332,8 +367,8 @@ files:
 - app/views/headmin/forms/autocomplete/_list.html.erb
 - app/views/headmin/forms/fields/_base.html.erb
 - app/views/headmin/forms/fields/_file.html.erb
+- app/views/headmin/forms/fields/_files.html.erb
 - app/views/headmin/forms/fields/_group.html.erb
-- app/views/headmin/forms/fields/_image.html.erb
 - app/views/headmin/forms/fields/_list.html.erb
 - app/views/headmin/forms/fields/_text.html.erb
 - app/views/headmin/forms/repeater/_row.html.erb
@@ -369,6 +404,7 @@ files:
 - app/views/headmin/table/actions/_export.html.erb
 - app/views/headmin/table/body/_association.html.erb
 - app/views/headmin/table/body/_boolean.erb
+- app/views/headmin/table/body/_color.html.erb
 - app/views/headmin/table/body/_currency.html.erb
 - app/views/headmin/table/body/_date.html.erb
 - app/views/headmin/table/body/_id.html.erb
@@ -405,6 +441,8 @@ files:
 - config/locales/devise/en.yml
 - config/locales/devise/nl.yml
 - config/locales/en.yml
+- config/locales/headmin/dropdown/en.yml
+- config/locales/headmin/dropdown/nl.yml
 - config/locales/headmin/filters/en.yml
 - config/locales/headmin/filters/nl.yml
 - config/locales/headmin/forms/en.yml
@@ -413,6 +451,8 @@ files:
 - config/locales/headmin/heading/nl.yml
 - config/locales/headmin/layout/en.yml
 - config/locales/headmin/layout/nl.yml
+- config/locales/headmin/nav/en.yml
+- config/locales/headmin/nav/nl.yml
 - config/locales/headmin/pagination/en.yml
 - config/locales/headmin/pagination/nl.yml
 - config/locales/headmin/popup/en.yml

data/app/controllers/concerns/headmin/filter.rb

@@ -1,5 +0,0 @@
-module Headmin
-  module Filter
-    include Headmin::FilterHelper
-  end
-end

data/app/controllers/concerns/headmin/searchable.rb

@@ -1,15 +0,0 @@
-module Headmin
-  module Searchable
-    def search(collection)
-      if search_params&.present?
-        collection.search(search_params)
-      else
-        collection
-      end
-    end
-
-    def search_params
-      @search_params ||= params[:search]&.to_s
-    end
-  end
-end

data/app/views/headmin/filters/_select.html.erb

@@ -1,45 +0,0 @@
-<%
-  # headmin/filters/select
-  #
-  # ==== Options
-  # * +name</tt> - Name of the filter parameter
-  # * +label</tt> - Display name
-  # * +options</tt> - List of options to select from
-  #
-  # ==== Examples
-  #   Basic version
-  #   <%= render "headmin/filters/select", name: :poll_type, label: 'Type', options: [["General", "general", "Fun", "fun"]] %#>
-
-  name = local_assigns.has_key?(:name) ? name.to_sym : nil
-  label = local_assigns.has_key?(:label) ? label : name.to_s.humanize
-  options = local_assigns.has_key?(:options) ? options : []
-
-  select_options = {
-    class: "form-select",
-    prompt: t('.blank'),
-    include_blank: false,
-    required: true,
-    'data-filters-target': 'input',
-    'data-action': "change->filters#update"
-  }
-%>
-
-<%= content_for :filters_menu do %>
-  <%= render 'headmin/filters/filter/menu_item', name: name, label: label %>
-<% end %>
-
-<%= content_for :filters_templates do %>
-  <%= render 'headmin/filters/filter/template', name: name, label: label do %>
-    <%= select_tag("#{name}[]", options_for_select(options), select_options) %>
-  <% end %>
-<% end %>
-
-<%= content_for :filters_buttons do %>
-  <% (params[name] || []).each_with_index do |param, index| %>
-    <% selected_option = options.detect { |value, key, config| (key.present? ? key : value) == param } %>
-    <% selected_value = selected_option.is_a?(Array) ? selected_option.first : selected_option %>
-    <%= render 'headmin/filters/filter/button', name: name, label: label, value: selected_value, id: "#{name}_#{index}_#{SecureRandom.hex}" do %>
-      <%= select_tag("#{name}[]", options_for_select(options, param), select_options) %>
-    <% end %>
-  <% end %>
-<% end %>

data/app/views/headmin/filters/filter/_template.html.erb

@@ -1,13 +0,0 @@
-<%#
-    headmin/filters/filter/template
-    accepts block: yes
-    parameters:
-      name: (string) Name of the parameter
-      label: (string) Display name
-%>
-
-<template data-filter-name="<%= name %>" data-filters-target="template">
-  <%= render 'headmin/filters/filter/button', name: name, label: label, value: nil, id: 'template_id' do %>
-    <%= yield %>
-  <% end %>
-</template>

data/app/views/headmin/forms/fields/_image.html.erb

@@ -1,17 +0,0 @@
-<%
-  # name: headmin/forms/fields/image
-  #
-  # ==== Options
-  # * +form+ - Form object
-  # * +name+ - Name for the field
-  #
-  # ==== Examples
-  #   Basic version
-  #   <%= render 'headmin/forms/fields/image', form: group, name: :image do |field, attribute, label| %#>
-  #     <%= render "headmin/forms/image", form: field, attribute: attribute, label: label %#>
-  #   <% end %#>
-%>
-
-<%= render 'headmin/forms/fields/base', form: form, field_type: :image, name: name do |field, label| %>
-  <% yield field, :file, label %>
-<% end %>