administration-zero 0.0.12 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7acbcb69df24a8f4cc70e5679ddee87b6ae96a031fa16eefdbe364aca086127e
-  data.tar.gz: 494132b0b91cf59fde8afb705768824af1aa6ec7ccae6cbaa00aa1ff385595f9
+  metadata.gz: 0ddf1c47cb20c004e23f87a749887cca995b415764ba24799692a42e9d4b13ca
+  data.tar.gz: 34666d42bd99a7d088fc43332171b33176b7b64ae65918104caf55d13adfa6f4
 SHA512:
-  metadata.gz: bab4269085274c79c172220c6f19e3e5c061f75f63e46efddc45dca0208f59aa8c78fa6b1c88862585fe1b4d9fef0b503bb531ff9d3bdda5bf64271052b5f2c7
-  data.tar.gz: fab03417c2685ece0c56a4d5d169ebdb6fb2c78d708987618074ae12120cb2fa3a183f3a72561e484e4b5e3b79ce888ed87ba0daf18a22bbcc59af3690a1d047
+  metadata.gz: 3e0bcf1bdef4df5a3febdffac660073bc5d7c53976b6af83dd1ec36901ecdc6d663abae987de089eef03ed6ffbd4e8b36a63673026a8134c2744294fbf925eb5
+  data.tar.gz: 8c017ac485dda3c9e57db9241aa7632078cf89b9a26b60efd1bc1d4b24430c988c84901a0562d1b65a8f1746e19539a4f992f3674507036b176eaab743d69de8

data/Gemfile.lock

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

data/lib/administration_zero/version.rb

@@ -1,3 +1,3 @@
 module AdministrationZero
-  VERSION = "0.0.12"
+  VERSION = "0.0.15"
 end

data/lib/generators/admin/install/templates/controllers/admin/{application_controller.rb → base_controller.rb}

@@ -1,4 +1,4 @@
-class Admin::ApplicationController < ActionController::Base
+class Admin::BaseController < ActionController::Base
   include Pagy::Backend
 
   before_action :set_time_zone
@@ -9,8 +9,8 @@ class Admin::ApplicationController < ActionController::Base
   end
 
   def authenticate
-    if admin_user = Admin::User.find_by_id(session[:admin_user_id])
-      Admin::Current.user = admin_user
+    if user = Admin::User.find_by_id(session[:admin_user_id])
+      Admin::Current.user = user
     else
       redirect_to admin_sign_in_path
     end

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

@@ -1,4 +1,4 @@
-class Admin::HomeController < Admin::ApplicationController
+class Admin::HomeController < Admin::BaseController
   def index
   end
 end

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

@@ -1,7 +1,7 @@
-class Admin::PasswordResetsController < Admin::ApplicationController
+class Admin::PasswordResetsController < Admin::BaseController
   skip_before_action :authenticate
 
-  before_action :set_admin_user, only: %i[ edit update ]
+  before_action :set_user, only: %i[ edit update ]
 
   layout "admin/authentication"
 
@@ -12,8 +12,8 @@ class Admin::PasswordResetsController < Admin::ApplicationController
   end
 
   def create
-    if @admin_user = Admin::User.find_by(email: params[:email])
-      Admin::UserMailer.with(admin_user: @admin_user).password_reset.deliver_later
+    if @user = Admin::User.find_by(email: params[:email])
+      Admin::UserMailer.with(user: @user).password_reset.deliver_later
       redirect_to admin_sign_in_path, notice: "Check your email for reset instructions"
     else
       redirect_to new_admin_password_reset_path, alert: "Sorry, we didn't recognize that email address"
@@ -21,21 +21,21 @@ class Admin::PasswordResetsController < Admin::ApplicationController
   end
 
   def update
-    if @admin_user.update(admin_user_params)
+    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
 
   private
-    def set_admin_user
-      @admin_user = Admin::User.find_signed!(params[:token], purpose: :password_reset)
+    def set_user
+      @user = Admin::User.find_signed!(params[:token], purpose: :password_reset)
     rescue
       redirect_to new_admin_password_reset_path, alert: "That password reset link is invalid"
     end
 
-    def admin_user_params
+    def user_params
       params.permit(:password, :password_confirmation)
     end
 end

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

@@ -1,17 +1,17 @@
-class Admin::SessionsController < Admin::ApplicationController
+class Admin::SessionsController < Admin::BaseController
   skip_before_action :authenticate, only: %i[ new create ]
 
   layout "admin/authentication"
 
   def new
-    @admin_user = Admin::User.new
+    @user = Admin::User.new
   end
 
   def create
-    @admin_user = Admin::User.find_by(email: params[:email])
+    @user = Admin::User.find_by(email: params[:email])
 
-    if @admin_user && @admin_user.authenticate(params[:password])
-      session[:admin_user_id] = @admin_user.id; redirect_to(admin_path)
+    if @user && @user.authenticate(params[:password])
+      session[:admin_user_id] = @user.id; redirect_to(admin_path)
     else
       redirect_to admin_sign_in_path(email_hint: params[:email]), alert: "That email or password is incorrect"
     end

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

@@ -1,11 +1,11 @@
-class Admin::UsersController < Admin::ApplicationController
-  before_action :set_admin_user, only: %i[ show edit update destroy ]
+class Admin::UsersController < Admin::BaseController
+  before_action :set_user, only: %i[ show edit update destroy ]
 
   def index
     @search = Admin::User.all.ransack(params[:q])
 
     respond_to do |format|
-      format.html { @pagy, @admin_users = pagy(@search.result) }
+      format.html { @pagy, @users = pagy(@search.result) }
       format.csv  { render csv: @search.result }
     end
   end
@@ -14,41 +14,41 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def new
-    @admin_user = Admin::User.new
+    @user = Admin::User.new
   end
 
   def edit
   end
 
   def create
-    @admin_user = Admin::User.new(admin_user_params)
+    @user = Admin::User.new(user_params)
 
-    if @admin_user.save
-      redirect_to @admin_user, notice: "User was successfully created."
+    if @user.save
+      redirect_to @user, notice: "User was successfully created."
     else
       render :new, status: :unprocessable_entity
     end
   end
 
   def update
-    if @admin_user.update(admin_user_params)
-      redirect_to @admin_user, notice: "User was successfully updated."
+    if @user.update(user_params)
+      redirect_to @user, notice: "User was successfully updated."
     else
       render :edit, status: :unprocessable_entity
     end
   end
 
   def destroy
-    @admin_user.destroy
+    @user.destroy
     redirect_to admin_users_url, notice: "User was successfully destroyed."
   end
 
   private
-    def set_admin_user
-      @admin_user = Admin::User.find(params[:id])
+    def set_user
+      @user = Admin::User.find(params[:id])
     end
 
-    def admin_user_params
+    def user_params
       params.require(:admin_user).permit(:email, :password, :password_confirmation)
     end
 end

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

@@ -0,0 +1,39 @@
+<!-- Tabler Core -->
+<script src="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta11/dist/js/tabler.min.js"></script>
+
+<!-- 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>
+
+<!-- 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>
+
+<!-- Stimulus controllers -->
+<script type="module">
+  import { Application, Controller } from "https://cdn.jsdelivr.net/npm/@hotwired/stimulus@3.1.0/dist/stimulus.min.js"
+  const stimulus = Application.start()
+
+  stimulus.register("validation", class extends Controller {
+    connect() {
+      this.element.querySelectorAll(".field_with_errors").forEach((element) => {
+        element.firstChild.classList.add("is-invalid")
+        element.parentNode.insertBefore(element.firstChild, element)
+        element.parentNode.removeChild(element)
+      })
+    }
+  })
+
+  stimulus.register("flash-message", class extends Controller {
+    connect() {
+      new bootstrap.Toast(this.element).show()
+    }
+  })
+</script>

data/lib/generators/admin/install/templates/erb/admin/{application → 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

@@ -0,0 +1,7 @@
+<!-- Tabler Core -->
+<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 {
+  --tblr-body-bg: #f5f7fb;
+}</style>

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 @admin_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 @admin_user.errors[:password_confirmation].first, class: "invalid-feedback d-block" %>
     </div>
 
     <div class="form-footer">

data/lib/generators/admin/install/templates/erb/admin/user_mailer/password_reset.html.erb

@@ -5,7 +5,7 @@
   </head>
   <body>
     <p>Hey there,</p>
-    <p>Can't remember your password for <strong><%= @admin_user.email %></strong>? That's OK, it happens. Just hit the link below to set a new one.</p>
+    <p>Can't remember your password for <strong><%= @user.email %></strong>? That's OK, it happens. Just hit the link below to set a new one.</p>
     <p><%= link_to "Reset my password", edit_admin_password_reset_url(token: @signed_id) %></p>
     <p>If you did not request a password reset you can safely ignore this email, it expires in 20 minutes. Only someone with access to this email account can reset your password.</p>
     <hr>

data/lib/generators/admin/install/templates/erb/admin/user_mailer/password_reset.text.erb

@@ -1,6 +1,6 @@
 Hey there,
 
-Can't remember your password for <%= @admin_user.email %>? That's OK, it happens. Just hit the link below to set a new one.
+Can't remember your password for <%= @user.email %>? That's OK, it happens. Just hit the link below to set a new one.
 
 [Reset my password]<%= edit_admin_password_reset_url(token: @signed_id) %>
 

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

@@ -1,9 +1,9 @@
-<%= form_with(model: admin_user) do |form| %>
+<%= form_with(model: user, html: { "data-controller": "validation" }) do |form| %>
   <div class="form-group row mb-2">
     <%= form.label :email, class: "form-label col-md-3 col-form-label" %>
     <div class="col-md px-0">
       <%= form.email_field :email, autocomplete: "email", class: "form-control" %>
-      <%= tag.div admin_user.errors[:email].first, class: "invalid-feedback" %>
+      <%= tag.div user.errors[:email].first, class: "invalid-feedback" %>
     </div>
   </div>
 
@@ -11,7 +11,7 @@
     <%= form.label :password, class: "form-label col-md-3 col-form-label" %>
     <div class="col-md px-0">
       <%= form.password_field :password, required: true, autocomplete: "new-password", class: "form-control" %>
-      <%= tag.div admin_user.errors[:password].first, class: "invalid-feedback" %>
+      <%= tag.div user.errors[:password].first, class: "invalid-feedback" %>
     </div>
   </div>
 
@@ -19,12 +19,12 @@
     <%= form.label :password_confirmation, class: "form-label col-md-3 col-form-label" %>
     <div class="col-md px-0">
       <%= form.password_field :password_confirmation, required: true, autocomplete: "new-password", class: "form-control" %>
-      <%= tag.div admin_user.errors[:password_confirmation].first, class: "invalid-feedback" %>
+      <%= tag.div user.errors[:password_confirmation].first, class: "invalid-feedback" %>
     </div>
   </div>
 
   <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/edit.html.erb

@@ -2,7 +2,7 @@
   <%= render "page_header_breadcrumb", title: "Editing user" do %>
     <li class="breadcrumb-item"><%= link_to "Admin", admin_path %></li>
     <li class="breadcrumb-item"><%= link_to "Users", admin_users_path %></li>
-    <li class="breadcrumb-item"><%= link_to @admin_user.email, @admin_user %></li>
+    <li class="breadcrumb-item"><%= link_to @user.email, @user %></li>
   <% end %>
 <% end %>
 
@@ -10,7 +10,7 @@
   <div class="container-xl">
     <div class="card">
       <div class="card-body">
-        <%= render "form", admin_user: @admin_user %>
+        <%= render "form", user: @user %>
       </div>
     </div>
   </div>

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 %>
@@ -23,15 +23,15 @@
             </tr>
           </thead>
           <tbody>
-            <% @admin_users.each do |admin_user| %>
+            <% @users.each do |user| %>
               <tr>
-                <td><%= link_to admin_user.id, admin_user %></td>
-                <td><%= admin_user.email %></td>
-                <td><%= l(admin_user.created_at, format: :long) %></td>
+                <td><%= link_to user.id, user %></td>
+                <td><%= user.email %></td>
+                <td><%= l(user.created_at, format: :long) %></td>
                 <td>
-                  <%= link_to "View", admin_user, class: "btn btn-light btn-sm" %>
-                  <%= link_to "Edit", edit_admin_user_path(admin_user), class: "btn btn-light btn-sm" %>
-                  <%= button_to "Delete", admin_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/new.html.erb

@@ -9,7 +9,7 @@
   <div class="container-xl">
     <div class="card">
       <div class="card-body">
-        <%= render "form", admin_user: @admin_user %>
+        <%= render "form", user: @user %>
       </div>
     </div>
   </div>

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

@@ -1,12 +1,12 @@
 <%= render "page_header" do %>
-  <%= render "page_header_breadcrumb", title: @admin_user.email do %>
+  <%= render "page_header_breadcrumb", title: @user.email do %>
     <li class="breadcrumb-item"><%= link_to "Admin", admin_path %></li>
     <li class="breadcrumb-item"><%= link_to "Users", admin_users_path %></li>
   <% end %>
 
   <%= render "page_header_actions" do %>
-    <%= link_to "Edit user", edit_admin_user_path(@admin_user), class: "btn btn-primary" %>
-    <%= button_to "Delete user", @admin_user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-light" %>
+    <%= 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-white" %>
   <% end %>
 <% end %>
 
@@ -19,13 +19,13 @@
       <div class="card-body">
         <dl class="row">
           <dt class="col-md-3">Email</dt>
-          <dd class="col-md-9"><%= @admin_user.email %></dd>
+          <dd class="col-md-9"><%= @user.email %></dd>
 
           <dt class="col-md-3">Created at</dt>
-          <dd class="col-md-9"><%= l(@admin_user.created_at, format: :long) %></dd>
+          <dd class="col-md-9"><%= l(@user.created_at, format: :long) %></dd>
 
           <dt class="col-md-3">Updated at</dt>
-          <dd class="col-md-9"><%= l(@admin_user.updated_at, format: :long) %></dd>
+          <dd class="col-md-9"><%= l(@user.updated_at, format: :long) %></dd>
         </dl>
       </div>
     </div>

data/lib/generators/admin/install/templates/mailers/admin/user_mailer.rb

@@ -1,8 +1,8 @@
 class Admin::UserMailer < Admin::ApplicationMailer
   def password_reset
-    @admin_user = params[:admin_user]
-    @signed_id = @admin_user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
+    @user = params[:user]
+    @signed_id = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
 
-    mail to: @admin_user.email, subject: "Reset your password"
+    mail to: @user.email, subject: "Reset your password"
   end
 end

data/lib/generators/admin/install/templates/test_unit/controllers/admin/home_controller_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Admin::HomeControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @admin_user = sign_in_admin_as(admin_users(:lazaro_nixon))
+    @user = sign_in_admin_as(admin_users(:lazaro_nixon))
   end
 
   test "should get index" do

data/lib/generators/admin/install/templates/test_unit/controllers/admin/password_resets_controller_test.rb

@@ -2,9 +2,9 @@ require "test_helper"
 
 class Admin::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @admin_user = admin_users(:lazaro_nixon)
-    @sid = @admin_user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
-    @sid_exp = @admin_user.signed_id(purpose: :password_reset, expires_in: 0.minutes)
+    @user = admin_users(:lazaro_nixon)
+    @sid = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
+    @sid_exp = @user.signed_id(purpose: :password_reset, expires_in: 0.minutes)
   end
 
   test "should get new" do
@@ -18,8 +18,8 @@ class Admin::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should send a password reset email" do
-    assert_enqueued_email_with Admin::UserMailer, :password_reset, args: { admin_user: @admin_user } do
-      post admin_password_reset_url, params: { email: @admin_user.email }
+    assert_enqueued_email_with Admin::UserMailer, :password_reset, args: { user: @user } do
+      post admin_password_reset_url, params: { email: @user.email }
     end
 
     assert_redirected_to admin_sign_in_url

data/lib/generators/admin/install/templates/test_unit/controllers/admin/sessions_controller_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Admin::SessionsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @admin_user = admin_users(:lazaro_nixon)
+    @user = admin_users(:lazaro_nixon)
   end
 
   test "should get new" do
@@ -11,7 +11,7 @@ class Admin::SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should sign in" do
-    post admin_sign_in_url, params: { email: @admin_user.email, password: "Secret1*3*5*" }
+    post admin_sign_in_url, params: { email: @user.email, password: "Secret1*3*5*" }
     assert_redirected_to admin_url
 
     get admin_url
@@ -19,8 +19,8 @@ class Admin::SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should not sign in with wrong credentials" do
-    post admin_sign_in_url, params: { email: @admin_user.email, password: "SecretWrong1*3" }
-    assert_redirected_to admin_sign_in_url(email_hint: @admin_user.email)
+    post admin_sign_in_url, params: { email: @user.email, password: "SecretWrong1*3" }
+    assert_redirected_to admin_sign_in_url(email_hint: @user.email)
     assert_equal "That email or password is incorrect", flash[:alert]
 
     get admin_url
@@ -28,7 +28,7 @@ class Admin::SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should sign out" do
-    sign_in_admin_as @admin_user
+    sign_in_admin_as @user
 
     delete admin_sign_out_url
     assert_redirected_to admin_sign_in_url

data/lib/generators/admin/install/templates/test_unit/controllers/admin/users_controller_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @admin_user = sign_in_admin_as(admin_users(:lazaro_nixon))
+    @user = sign_in_admin_as(admin_users(:lazaro_nixon))
   end
 
   test "should get index" do
@@ -24,23 +24,23 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should show admin_user" do
-    get admin_user_url(@admin_user)
+    get admin_user_url(@user)
     assert_response :success
   end
 
   test "should get edit" do
-    get edit_admin_user_url(@admin_user)
+    get edit_admin_user_url(@user)
     assert_response :success
   end
 
   test "should update admin_user" do
-    patch admin_user_url(@admin_user), params: { admin_user: { email: @admin_user.email, password: "NewSecret1*3*5*", password_confirmation: "NewSecret1*3*5*" } }
-    assert_redirected_to admin_user_url(@admin_user)
+    patch admin_user_url(@user), params: { admin_user: { email: @user.email, password: "NewSecret1*3*5*", password_confirmation: "NewSecret1*3*5*" } }
+    assert_redirected_to admin_user_url(@user)
   end
 
   test "should destroy admin_user" do
     assert_difference("Admin::User.count", -1) do
-      delete admin_user_url(@admin_user)
+      delete admin_user_url(@user)
     end
 
     assert_redirected_to admin_users_url

data/lib/generators/admin/install/templates/test_unit/system/admin/password_resets_test.rb

@@ -2,15 +2,15 @@ require "application_system_test_case"
 
 class Admin::PasswordResetsTest < ApplicationSystemTestCase
   setup do
-    @admin_user = admin_users(:lazaro_nixon)
-    @sid = @admin_user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
+    @user = admin_users(:lazaro_nixon)
+    @sid = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
   end
 
   test "sending a password reset email" do
     visit admin_sign_in_url
     click_on "I forgot password"
 
-    fill_in "Email", with: @admin_user.email
+    fill_in "Email", with: @user.email
     click_on "Send me new password"
 
     assert_text "Check your email for reset instructions"

data/lib/generators/admin/install/templates/test_unit/system/admin/sessions_test.rb

@@ -2,12 +2,12 @@ require "application_system_test_case"
 
 class Admin::SessionsTest < ApplicationSystemTestCase
   setup do
-    @admin_user = admin_users(:lazaro_nixon)
+    @user = admin_users(:lazaro_nixon)
   end
 
   test "signing in" do
     visit admin_sign_in_url
-    fill_in "Email", with: @admin_user.email
+    fill_in "Email", with: @user.email
     fill_in "Password", with: "Secret1*3*5*"
     click_on "Sign in"
 
@@ -15,10 +15,10 @@ class Admin::SessionsTest < ApplicationSystemTestCase
   end
 
   test "signing out" do
-    sign_in_admin_as @admin_user
+    sign_in_admin_as @user
     click_on "Paweł Kuna"
     click_on "Logout"
 
-    assert_selector "h2", text: "Login to your account"
+    assert_selector "h1", text: "Login to your account"
   end
 end

data/lib/generators/admin/install/templates/test_unit/system/admin/users_test.rb

@@ -2,12 +2,12 @@ require "application_system_test_case"
 
 class Admin::UsersTest < ApplicationSystemTestCase
   setup do
-    @admin_user = sign_in_admin_as(admin_users(:lazaro_nixon))
+    @user = sign_in_admin_as(admin_users(:lazaro_nixon))
   end
 
   test "visiting the index" do
     visit admin_users_url
-    assert_selector "h2", text: "Users"
+    assert_selector "h1", text: "Users"
   end
 
   test "should create user" do
@@ -23,10 +23,10 @@ class Admin::UsersTest < ApplicationSystemTestCase
   end
 
   test "should update user" do
-    visit admin_user_url(@admin_user)
+    visit admin_user_url(@user)
     click_on "Edit user"
 
-    fill_in "Email", with: @admin_user.email
+    fill_in "Email", with: @user.email
     fill_in "Password", with: "NewSecret1*3*5*"
     fill_in "Password confirmation", with: "NewSecret1*3*5*"
     click_on "Update User"
@@ -35,7 +35,7 @@ class Admin::UsersTest < ApplicationSystemTestCase
   end
 
   test "should destroy user" do
-    visit admin_user_url(@admin_user)
+    visit admin_user_url(@user)
     page.accept_confirm { click_on "Delete user" }
 
     assert_text "User was successfully destroyed"

data/lib/generators/admin/scaffold/templates/controller.rb.tt

@@ -1,4 +1,4 @@
-class <%= controller_class_name %>Controller < Admin::ApplicationController
+class <%= controller_class_name %>Controller < Admin::BaseController
   before_action :set_<%= singular_table_name %>, only: %i[ show edit update destroy ]
 
   def index

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

@@ -1,4 +1,4 @@
-<%%= form_with(model: <%= model_resource_name %>) do |form| %>
+<%%= form_with(model: <%= model_resource_name %>, html: { "data-controller": "validation" }) do |form| %>
 <% attributes.each do |attribute| -%>
   <div class="form-group row mb-2">
 <% if attribute.password_digest? -%>
@@ -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 %>
 

data/lib/generators/admin/scaffold/templates/system_test.rb.tt

@@ -8,7 +8,7 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
 
   test "visiting the index" do
     visit <%= index_helper(type: :url) %>
-    assert_selector "h2", text: "<%= human_name.pluralize %>"
+    assert_selector "h1", text: "<%= human_name.pluralize %>"
   end
 
   test "should create <%= human_name.downcase %>" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administration-zero
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.15
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -33,21 +33,21 @@ files:
 - lib/administration_zero/version.rb
 - lib/generators/admin/install/USAGE
 - lib/generators/admin/install/install_generator.rb
-- lib/generators/admin/install/templates/controllers/admin/application_controller.rb
+- lib/generators/admin/install/templates/controllers/admin/base_controller.rb
 - lib/generators/admin/install/templates/controllers/admin/home_controller.rb
 - lib/generators/admin/install/templates/controllers/admin/password_resets_controller.rb
 - lib/generators/admin/install/templates/controllers/admin/sessions_controller.rb
 - lib/generators/admin/install/templates/controllers/admin/users_controller.rb
-- lib/generators/admin/install/templates/erb/admin/application/_flash_messages.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_footer.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_javascript_tags.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_page_header.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_page_header_actions.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_page_header_breadcrumb.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_pagination.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_primary_navbar.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_secondary_navbar.html.erb
-- lib/generators/admin/install/templates/erb/admin/application/_stylesheet_link_tags.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_flash_messages.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_footer.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_javascript_tags.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_page_header.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_page_header_actions.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_page_header_breadcrumb.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_pagination.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_primary_navbar.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_secondary_navbar.html.erb
+- lib/generators/admin/install/templates/erb/admin/base/_stylesheet_link_tags.html.erb
 - lib/generators/admin/install/templates/erb/admin/home/index.html.erb
 - lib/generators/admin/install/templates/erb/admin/password_resets/edit.html.erb
 - lib/generators/admin/install/templates/erb/admin/password_resets/new.html.erb
@@ -59,8 +59,8 @@ files:
 - lib/generators/admin/install/templates/erb/admin/users/index.html.erb
 - lib/generators/admin/install/templates/erb/admin/users/new.html.erb
 - lib/generators/admin/install/templates/erb/admin/users/show.html.erb
-- lib/generators/admin/install/templates/erb/layouts/admin/application.html.erb
 - lib/generators/admin/install/templates/erb/layouts/admin/authentication.html.erb
+- lib/generators/admin/install/templates/erb/layouts/admin/base.html.erb
 - lib/generators/admin/install/templates/helpers/admin/application_helper.rb
 - lib/generators/admin/install/templates/images/admin/000m.jpg
 - lib/generators/admin/install/templates/images/admin/logo.svg

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

@@ -1,47 +0,0 @@
-<!-- Tabler Core -->
-<script src="https://unpkg.com/@tabler/core@1.0.0-beta9/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;
-  }
-</script>
-
-<!-- bring back data-confirm -->
-<script>
-  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);
-    });
-  });
-</script>
-
-<!-- flash message -->
-<script>
-  document.addEventListener("DOMContentLoaded", () => {
-    const selector = "[data-controller='flash-message']";
-
-    document.querySelectorAll(selector).forEach((thiz) => {
-      new bootstrap.Toast(thiz).show();
-    });
-  });
-</script>

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

@@ -1,7 +0,0 @@
-<!-- Tabler Core -->
-<link rel="stylesheet" href="https://unpkg.com/@tabler/core@1.0.0-beta9/dist/css/tabler.min.css">
-
-<!-- Customize tabler here -->
-<style>body {
-  --tblr-body-bg: #f5f7fb;
-}</style>