From 0b8428e262f7477acc5252e1261ef8c64b082141 Mon Sep 17 00:00:00 2001
From: Bogdanov Anton <kortirso@gmail.com>
Date: Sun, 16 Mar 2025 18:48:03 +0300
Subject: [PATCH] IS-359 styles for admin pages

---
 CHANGELOG.md                                                | 1 +
 app/controllers/admin/base_controller.rb                    | 2 +-
 app/controllers/web/errors_controller.rb                    | 2 ++
 app/views/components/page_wrappers/admin_component.html.erb | 4 +---
 app/views/controllers/web/errors/forbidden.html.erb         | 2 +-
 config/routes.rb                                            | 2 +-
 spec/support/shared/required_admin_auth.rb                  | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e6c9a7c..2dff10a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - pagy overflow bug
+- styles for admin pages
 
 ## [2.0.2] - 2024-12-06
 ### Added
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 85bd55b1..f8151353 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -12,7 +12,7 @@ class BaseController < ApplicationController
     def authorize_admin
       return if current_user.admin?
 
-      access_denied
+      redirect_to forbidden_path
     end
   end
 end
diff --git a/app/controllers/web/errors_controller.rb b/app/controllers/web/errors_controller.rb
index 41d0c634..5f4876f9 100644
--- a/app/controllers/web/errors_controller.rb
+++ b/app/controllers/web/errors_controller.rb
@@ -5,5 +5,7 @@ class ErrorsController < ApplicationController
     skip_before_action :authenticate
 
     def internal; end
+
+    def forbidden; end
   end
 end
diff --git a/app/views/components/page_wrappers/admin_component.html.erb b/app/views/components/page_wrappers/admin_component.html.erb
index 37e79b08..7636f953 100644
--- a/app/views/components/page_wrappers/admin_component.html.erb
+++ b/app/views/components/page_wrappers/admin_component.html.erb
@@ -1,9 +1,7 @@
 <div class="flex flex-col lg:flex-row flex-1 max-h-screen">
   <div class="w-full lg:w-64 bg-zinc-800 flex flex-col justify-between p-4 lg:p-0">
     <div class="flex flex-col">
-      <%= link_to root_path, class: 'user-navigation-link admin lg:my-4 text-xl' do %>
-        <span>PullKeeper</span>
-      <% end %>
+      <%= link_to 'PullKeeper', root_path, class: 'user-navigation-link admin lg:my-4 text-xl' %>
       <div class="flex flex-row lg:flex-col flex-wrap lg:flex-nowrap">
         <%= link_to 'Companies', admin_companies_path, class: 'user-navigation-link admin' %>
       </div>
diff --git a/app/views/controllers/web/errors/forbidden.html.erb b/app/views/controllers/web/errors/forbidden.html.erb
index 0a4a652c..8560843d 100644
--- a/app/views/controllers/web/errors/forbidden.html.erb
+++ b/app/views/controllers/web/errors/forbidden.html.erb
@@ -1,5 +1,5 @@
 <%= render PageWrappers::UserComponent.new(current_user: current_user) do %>
-  <div class="flex flex-1 justify-center items-center">
+  <div class="h-full flex flex-1 justify-center items-center">
     <p class="text-2xl uppercase">Access denied</p>
   </div>
 <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 72a77c3d..116419ee 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -8,7 +8,6 @@
   mount PgHero::Engine, at: 'pghero'
   mount Emailbutler::Engine => '/emailbutler'
   mount Que::View::Engine => '/que_view'
-
   mount Authkeeper::Engine => '/authkeeper'
 
   namespace :admin do
@@ -107,6 +106,7 @@
   end
 
   get '/500', to: 'web/errors#internal'
+  get 'forbidden', to: 'web/errors#forbidden'
 
   root 'web/welcome#index'
 end
diff --git a/spec/support/shared/required_admin_auth.rb b/spec/support/shared/required_admin_auth.rb
index 9cd65b50..79ce788f 100644
--- a/spec/support/shared/required_admin_auth.rb
+++ b/spec/support/shared/required_admin_auth.rb
@@ -7,7 +7,7 @@
     it 'render shared error' do
       do_request
 
-      expect(response).to render_template 'web/errors/forbidden'
+      expect(response).to redirect_to forbidden_path
     end
   end
 end