error pages

rauversion · Aug 11, 2023 · 62c5132 · 62c5132
1 parent 4638b69
commit 62c5132
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 227 deletions.
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
@@ -1,26 +1,17 @@
 class ErrorsController < ApplicationController
-  layout "error"
+  layout "errors"
 
-  def show
-    @exception = request.env["action_dispatch.exception"]
-    @status_code = @exception.try(:status_code) ||
-                   ActionDispatch::ExceptionWrapper.new(
-                    request.env, @exception
-                  ).status_code
 
-    render view_for_code(@status_code), status: @status_code
+  def not_found
+    render "404"
   end
 
-  private
-    def view_for_code(code)
-      supported_error_codes.fetch(code, "404")
-    end
+  def fatal
+    render "500"
+  end
+
+  def not_allowed
+    render "422"
+  end
 
-    def supported_error_codes
-      {
-        403 => "403",
-        404 => "404",
-        500 => "500"
-      }
-    end
 end
diff --git a/app/views/errors/404.html.erb b/app/views/errors/404.html.erb
@@ -5,7 +5,7 @@
       <p class="text-4xl font-bold tracking-tight text-brand-600 sm:text-5xl">404</p>
       <div class="sm:ml-6">
         <div class="sm:border-l sm:border-gray-200 sm:pl-6">
-          <h1 class="text-4xl font-bold tracking-tight text-gray-900 dark:text-gray-100 sm:text-5xl">
+          <h1 class="text-4xl font-bold tracking-tight text-gray-700 dark:text-gray-100 sm:text-5xl">
             <%= gettext("Page not found") %>
           </h1>
           <p class="mt-1 text-base text-gray-500 dark:text-gray-300">

diff --git a/app/views/errors/422.html.erb b/app/views/errors/422.html.erb
@@ -0,0 +1,32 @@
+
+<div class="min-h-full bg-black px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8">
+  <div class="mx-auto max-w-max">
+    <main class="sm:flex">
+      <p class="text-4xl font-bold tracking-tight text-brand-600 sm:text-5xl">500</p>
+      <div class="sm:ml-6">
+        <div class="sm:border-l sm:border-gray-200 sm:pl-6">
+          <h1 class="text-4xl font-bold tracking-tight text-gray-700 dark:text-gray-100 sm:text-5xl">
+            <%= gettext("Access denied") %>
+          </h1>
+          <p class="mt-1 text-base text-gray-500 dark:text-gray-300">
+            <%= gettext("Please check the URL in the address bar and try again.") %>
+          </p>
+        </div>
+        <div class="mt-10 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6">
+          <a
+            href="/"
+            class="inline-flex items-center rounded-md border border-transparent bg-brand-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-brand-700 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:ring-offset-2"
+          >
+            <%= gettext("Go back home") %>
+          </a>
+          <a
+            href="#"
+            class="inline-flex items-center rounded-md border border-transparent bg-brand-100 px-4 py-2 text-sm font-medium text-brand-700 hover:bg-brand-200 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:ring-offset-2"
+          >
+            <%= gettext("Contact support") %>
+          </a>
+        </div>
+      </div>
+    </main>
+  </div>
+</div>
diff --git a/app/views/errors/500.html.erb b/app/views/errors/500.html.erb
@@ -5,7 +5,7 @@
       <p class="text-4xl font-bold tracking-tight text-brand-600 sm:text-5xl">500</p>
       <div class="sm:ml-6">
         <div class="sm:border-l sm:border-gray-200 sm:pl-6">
-          <h1 class="text-4xl font-bold tracking-tight text-gray-900 dark:text-gray-100 sm:text-5xl">
+          <h1 class="text-4xl font-bold tracking-tight text-gray-700 dark:text-gray-100 sm:text-5xl">
             <%= gettext("Something went wrong") %>
           </h1>
           <p class="mt-1 text-base text-gray-500 dark:text-gray-300">

diff --git a/app/views/layouts/errors.html.erb b/app/views/layouts/errors.html.erb
@@ -1,7 +1,7 @@
 <%# app/views/layouts/error.html.erb %>
 
 <!DOCTYPE html>
-<html>
+<html class="dark">
   <head>
     <title>RauversionRor</title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -12,7 +12,7 @@
     <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
   </head>
 
-  <body>
+  <body class="dark:bg-black">
     <main>
       <%= yield %>
     </main>

diff --git a/config/application.rb b/config/application.rb
@@ -11,9 +11,8 @@ class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.0
 
-    #config.exceptions_app = ->(env) {
-    #  ErrorsController.action(:show).call(env)
-    #}
+    config.exceptions_app = self.routes
+
 
     config.hosts << "chaskiq.sa.ngrok.io"
     config.hosts << ENV['HOST']

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -8,7 +8,7 @@
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  config.consider_all_requests_local = false
+  # config.consider_all_requests_local = false
 
   # Do not eager load code on boot.
   config.eager_load = false

diff --git a/config/routes.rb b/config/routes.rb
@@ -22,6 +22,9 @@
   get "/embed/sets/:playlist_id", to: "embeds#show_playlist"
   get "/embed/sets/:playlist_id/private", to: "embeds#private_playlist"
 
+  get "/404" => "errors#not_found"
+  get "/500" => "errors#fatal"
+
 
   resource :player, controller: "player"
 

diff --git a/public/404.html b/public/404.html
diff --git a/public/422.html b/public/422.html
diff --git a/public/500.html b/public/500.html