administration-zero 0.0.14 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a291ddd1aa06b883bcbd143aeef64c9d2d87045b12fa4f33fc048987fe67ac79
-  data.tar.gz: ac6de3699a5db5e9f02052c70b4bbf7ea80558801a7e930df4c44fb17356124b
+  metadata.gz: 48700b15bc64b0480184e97ff4ceae284e8a4c2403d9bf0ae083291570a3147e
+  data.tar.gz: ac351aa3ffc2eefb5b588adb3a5076ea790b00e5f360152126db725690dc4ef2
 SHA512:
-  metadata.gz: 4dc53a371733b5a796bded1aed343f94e9db143f65393a2e2f1aca27339c57df2aca9bca84458a35534ce21be2a46cc68a51f51b0386429fe8d4d7cd7d2155ec
-  data.tar.gz: d9a3abf79a2c4b3c5e95fa040b2ed4af7cbeb1d47ecdf99416820e3872ff7ef2c746e24dc062c81cdaf7e9e38b7fd6ac6f5eb98ed34a8bba9aadda21a00389f4
+  metadata.gz: 77646b36ce47942d583972f37e99fd83d886cdbf759f12054fd0b3982916130ca5c0936c98c654e90aa2438d03f53889397f1bae4636cadfd59b506ae8c35ea4
+  data.tar.gz: 6ea59ae1da5b860d1c80be4575fd5abe828d0c12aff33c0a5b09a97eae2ddb6f83c7f748a8d6251d9738d7c825e98f8fdf65729b341c115c6ee73178bf5e5e3b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    administration-zero (0.0.14)
+    administration-zero (0.0.17)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -11,6 +11,7 @@ The purpose of administration zero is to generate a pre-built administration pan
 - [Sortable and filterable](https://github.com/activerecord-hackery/ransack)
 - [Exportable data](https://github.com/westonganger/spreadsheet_architect)
 - [Toastr for flash messages](https://getbootstrap.com/docs/5.1/components/toasts)
+- Show fields with errors in red
 - Determine time zone automatically
 - Easy authentication system
 - Admin scaffolds

data/lib/administration_zero/version.rb

@@ -1,3 +1,3 @@
 module AdministrationZero
-  VERSION = "0.0.14"
+  VERSION = "0.0.17"
 end

data/lib/generators/admin/install/install_generator.rb

@@ -7,6 +7,17 @@ module Admin
 
       source_root File.expand_path("templates", __dir__)
 
+      def add_field_error_proc
+        field_error_proc_code = <<~RUBY
+          # Provides an HTML generator for displaying errors that come from Active Model
+          config.action_view.field_error_proc = Proc.new do |html_tag, instance|
+            raw Nokogiri::HTML.fragment(html_tag).child.add_class("is-invalid")
+          end
+        RUBY
+
+        environment field_error_proc_code
+      end
+
       def add_gems
         uncomment_lines "Gemfile", /"bcrypt"/
         gem "pagy", comment: "Use Pagy to add paginated results [https://github.com/ddnexus/pagy]"

data/lib/generators/admin/install/templates/controllers/admin/password_resets_controller.rb

@@ -24,7 +24,7 @@ class Admin::PasswordResetsController < Admin::BaseController
     if @user.update(user_params)
       redirect_to admin_sign_in_path, notice: "Your password was reset successfully. Please sign in"
     else
-      render :edit, status: :unprocessable_entity
+      redirect_to edit_admin_password_reset_path(token: params[:token]), alert: @user.errors.first.full_message
     end
   end
 

data/lib/generators/admin/install/templates/erb/admin/base/_flash_messages.html.erb

@@ -1,6 +1,6 @@
 <% message = notice || alert %>
 
-<% if message %>
+<% if message.present? %>
   <div class="position-fixed start-50 translate-middle-x" style="z-index: 1030; top: 8rem;">
     <div class="toast hide text-center text-white bg-dark border-0" data-controller="flash-message">
       <div class="toast-body">

data/lib/generators/admin/install/templates/erb/admin/base/_javascript_tags.html.erb

@@ -1,47 +1,29 @@
 <!-- Tabler Core -->
-<script src="https://unpkg.com/@tabler/core@1.0.0-beta9/dist/js/tabler.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta11/dist/js/tabler.min.js"></script>
 
-<!-- set time zone cookie -->
-<script>
-  const { timeZone } = new Intl.DateTimeFormat().resolvedOptions();
-  setCookie("time_zone", timeZone);
-
-  function setCookie(name, value) {
-    const twentyYears  = 20 * 365 * 24 * 60 * 60 * 1000;
-    const body = [ name, value ].map(encodeURIComponent).join("=");
-    const expires = new Date(Date.now() + twentyYears).toUTCString();
-    const cookie = `${body}; path=/; expires=${expires}`;
-    document.cookie = cookie;
-  }
+<!-- Time zone cookie -->
+<script type="module">
+  import cookies from "https://cdn.jsdelivr.net/npm/js-cookie@3.0.1/dist/js.cookie.min.mjs"
+  const { timeZone } = new Intl.DateTimeFormat().resolvedOptions()
+  cookies.set("time_zone", timeZone, { expires: 365 })
 </script>
 
-<!-- bring back data-confirm -->
-<script>
+<!-- Data confirm -->
+<script type="module">
   document.addEventListener("click", (event) => {
-    if (!event.target.matches("[data-confirm]")) return;
-    if (!window.confirm(event.target.dataset["confirm"])) event.preventDefault();
-  });
-</script>
-
-<!-- validation rails -->
-<script>
-  document.addEventListener("DOMContentLoaded", () => {
-    document.querySelectorAll(".field_with_errors").forEach((element) => {
-      element.firstChild.classList.add("is-invalid");
-
-      element.parentNode.insertBefore(element.firstChild, element);
-      element.parentNode.removeChild(element);
-    });
-  });
+    if (!event.target.matches("[data-confirm]")) return
+    if (!window.confirm(event.target.dataset["confirm"])) event.preventDefault()
+  })
 </script>
 
-<!-- flash message -->
-<script>
-  document.addEventListener("DOMContentLoaded", () => {
-    const selector = "[data-controller='flash-message']";
+<!-- Stimulus controllers -->
+<script type="module">
+  import { Application, Controller } from "https://cdn.jsdelivr.net/npm/@hotwired/stimulus@3.1.0/dist/stimulus.min.js"
+  window.Stimulus = Application.start()
 
-    document.querySelectorAll(selector).forEach((thiz) => {
-      new bootstrap.Toast(thiz).show();
-    });
-  });
+  Stimulus.register("flash-message", class extends Controller {
+    connect() {
+      new bootstrap.Toast(this.element).show()
+    }
+  })
 </script>

data/lib/generators/admin/install/templates/erb/admin/base/_primary_navbar.html.erb

@@ -4,9 +4,9 @@
       <span class="navbar-toggler-icon"></span>
     </button>
     <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-      <a href=".">
+      <%= link_to admin_path do %>
         <%= image_tag "admin/logo.svg", width: 110, height: 32, alt: "Tabler", class: "navbar-brand-image" %>
-      </a>
+      <% end %>
     </h1>
     <div class="navbar-nav flex-row order-md-last">
       <div class="nav-item d-none d-md-flex me-3">

data/lib/generators/admin/install/templates/erb/admin/base/_stylesheet_link_tags.html.erb

@@ -1,5 +1,5 @@
 <!-- Tabler Core -->
-<link rel="stylesheet" href="https://unpkg.com/@tabler/core@1.0.0-beta9/dist/css/tabler.min.css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta11/dist/css/tabler.min.css">
 
 <!-- Customize tabler here -->
 <style>body {

data/lib/generators/admin/install/templates/erb/admin/password_resets/edit.html.erb

@@ -7,13 +7,11 @@
     <div class="mb-3">
       <%= form.label :password, "New password", class: "form-label" %>
       <%= form.password_field :password, required: true, autofocus: true, autocomplete: "new-password", class: "form-control" %>
-      <%= tag.div @user.errors[:password].first, class: "invalid-feedback d-block" %>
     </div>
 
     <div>
       <%= form.label :password_confirmation, "Confirm new password", class: "form-label" %>
       <%= form.password_field :password_confirmation, required: true, autocomplete: "new-password", class: "form-control" %>
-      <%= tag.div @user.errors[:password_confirmation].first, class: "invalid-feedback d-block" %>
     </div>
 
     <div class="form-footer">

data/lib/generators/admin/install/templates/erb/admin/users/_form.html.erb

@@ -25,6 +25,6 @@
 
   <div class="form-footer">
     <%= form.submit class: "btn btn-primary" %>
-    <%= link_to "Cancel", admin_users_path, class: "btn btn-light" %>
+    <%= link_to "Cancel", admin_users_path, class: "btn btn-white" %>
   </div>
 <% end %>

data/lib/generators/admin/install/templates/erb/admin/users/index.html.erb

@@ -4,7 +4,7 @@
   <% end %>
 
   <%= render "page_header_actions" do %>
-    <%= link_to "Filters", "#offcanvas_filters", "data-bs-toggle": "offcanvas", class: "btn btn-light" %>
+    <%= link_to "Filters", "#offcanvas_filters", "data-bs-toggle": "offcanvas", class: "btn btn-white" %>
     <%= link_to "New user", new_admin_user_path, class: "btn btn-primary" %>
   <% end %>
 <% end %>
@@ -29,9 +29,9 @@
                 <td><%= user.email %></td>
                 <td><%= l(user.created_at, format: :long) %></td>
                 <td>
-                  <%= link_to "View", user, class: "btn btn-light btn-sm" %>
-                  <%= link_to "Edit", edit_admin_user_path(user), class: "btn btn-light btn-sm" %>
-                  <%= button_to "Delete", user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-light btn-sm" %>
+                  <%= link_to "View", user, class: "btn btn-white btn-sm" %>
+                  <%= link_to "Edit", edit_admin_user_path(user), class: "btn btn-white btn-sm" %>
+                  <%= button_to "Delete", user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-white btn-sm" %>
                 </td>
               </tr>
             <% end %>
@@ -67,6 +67,6 @@
     </div>
 
     <%= f.submit "Filter", class: "btn btn-primary" %>
-    <%= link_to "Clear Filter", admin_users_path, class: "btn btn-light" %>
+    <%= link_to "Clear Filter", admin_users_path, class: "btn btn-white" %>
   <% end %>
 </div>

data/lib/generators/admin/install/templates/erb/admin/users/show.html.erb

@@ -6,7 +6,7 @@
 
   <%= render "page_header_actions" do %>
     <%= link_to "Edit user", edit_admin_user_path(@user), class: "btn btn-primary" %>
-    <%= button_to "Delete user", @user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-light" %>
+    <%= button_to "Delete user", @user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-white" %>
   <% end %>
 <% end %>
 

data/lib/generators/admin/scaffold/templates/erb/_form.html.erb.tt

@@ -36,6 +36,6 @@
 <% end -%>
   <div class="form-footer">
     <%%= form.submit class: "btn btn-primary" %>
-    <%%= link_to "Cancel", <%= index_helper(type: :path) %>, class: "btn btn-light" %>
+    <%%= link_to "Cancel", <%= index_helper(type: :path) %>, class: "btn btn-white" %>
   </div>
 <%% end %>

data/lib/generators/admin/scaffold/templates/erb/index.html.erb.tt

@@ -4,7 +4,7 @@
   <%% end %>
 
   <%%= render "page_header_actions" do %>
-    <%%= link_to "Filters", "#offcanvas_filters", "data-bs-toggle": "offcanvas", class: "btn btn-light" %>
+    <%%= link_to "Filters", "#offcanvas_filters", "data-bs-toggle": "offcanvas", class: "btn btn-white" %>
     <%%= link_to "New <%= human_name.downcase %>", <%= new_helper(type: :path) %>, class: "btn btn-primary" %>
   <%% end %>
 <%% end %>
@@ -37,9 +37,9 @@
 <% end -%>
 <% end -%>
                 <td>
-                  <%%= link_to "View", <%= model_resource_name %>, class: "btn btn-light btn-sm" %>
-                  <%%= link_to "Edit", <%= edit_helper(singular_table_name, type: :path) %>, class: "btn btn-light btn-sm" %>
-                  <%%= button_to "Delete", <%= model_resource_name %>, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-light btn-sm" %>
+                  <%%= link_to "View", <%= model_resource_name %>, class: "btn btn-white btn-sm" %>
+                  <%%= link_to "Edit", <%= edit_helper(singular_table_name, type: :path) %>, class: "btn btn-white btn-sm" %>
+                  <%%= button_to "Delete", <%= model_resource_name %>, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-white btn-sm" %>
                 </td>
               </tr>
             <%% end %>
@@ -48,7 +48,7 @@
       </div>
       <div class="card-footer d-flex align-items-center fs-5">
         <div class="d-none d-md-block">
-          <div>Download: <%%= link_to "CSV", <%= index_helper(type: :path) %>(format: :csv, q: request.params[:q]) %></div>
+          <div>Download: <%%= link_to "CSV", url_for(format: :csv, q: request.params[:q]) %></div>
           <%%= raw pagy_info(@pagy) %>
         </div>
         <div class="ms-auto">
@@ -69,6 +69,6 @@
     <%%# f.text_field :name_cont, class: "form-control mb-3" %>
 
     <%%= f.submit "Filter", class: "btn btn-primary" %>
-    <%%= link_to "Clear Filter", <%= index_helper(type: :path) %>, class: "btn btn-light" %>
+    <%%= link_to "Clear Filter", <%= index_helper(type: :path) %>, class: "btn btn-white" %>
   <%% end %>
 </div>

data/lib/generators/admin/scaffold/templates/erb/show.html.erb.tt

@@ -6,7 +6,7 @@
 
   <%%= render "page_header_actions" do %>
     <%%= link_to "Edit <%= human_name.downcase %>", <%= edit_helper(type: :path) %>, class: "btn btn-primary" %>
-    <%%= button_to "Delete <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-light" %>
+    <%%= button_to "Delete <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-white" %>
   <%% end %>
 <%% end %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administration-zero
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.17
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies: []
 description:
 email: