feat: implement public layout and unify error handling for improved u…

…ser experience
Projecte-UrbanTree · Dec 12, 2024 · 30c692e · 30c692e
1 parent 6e28550
commit 30c692e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 43 deletions.
diff --git a/app/src/app/Core/Router.php b/app/src/app/Core/Router.php
@@ -141,19 +141,21 @@ protected function handleMiddlewares(array $middlewares): void
                 throw new Exception("Middleware {$middlewareClass} must implement MiddlewareInterface");
             }
 
-            $middleware->handle($_REQUEST, fn () => null);
+            $middleware->handle($_REQUEST, fn() => null);
         }
     }
 
     protected function abort(int $statusCode, string $message): void
     {
-        if ($statusCode === 404) {
-            View::render([
-                'view' => 'Error/404',
-                'title' => 'Error 404',
-                'layout' => 'BlankLayout'
-            ]);
-        }
+        View::render([
+            'view' => "Error",
+            'title' => "Error $statusCode",
+            'layout' => 'PublicLayout',
+            'data' => [
+                'code' => $statusCode,
+                'message' => $message,
+            ],
+        ]);
         http_response_code($statusCode);
         exit;
     }

diff --git a/app/src/app/Layouts/BlankLayout.php b/app/src/app/Layouts/BlankLayout.php
@@ -1,19 +1 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>
-        <?= htmlspecialchars($title) . ' - ' . htmlspecialchars(getenv('APP_NAME')); ?>
-    </title>
-    <script src="/assets/js/app.js"></script>
-    <script src="https://cdn.tailwindcss.com"></script>
-    <link rel="stylesheet" href="/assets/css/app.css">
-</head>
-
-<body class="w-full h-full">
-    <?= $content; ?>
-</body>
-
-</html>
+<?= $content;
diff --git a/app/src/app/Layouts/PublicLayout.php b/app/src/app/Layouts/PublicLayout.php
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>
+        <?= $title . ' - ' . getenv('APP_NAME'); ?>
+    </title>
+    <script src="/assets/js/app.js"></script>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <link rel="stylesheet" href="/assets/css/app.css">
+</head>
+
+<body class="w-full h-full">
+    <?= $content; ?>
+</body>
+
+</html>
diff --git a/app/src/app/Views/Error/403.php → app/src/app/Views/Error.php b/app/src/app/Views/Error/403.php → app/src/app/Views/Error.php
@@ -1,9 +1,9 @@
 <div class="min-h-screen bg-gray-100 flex items-center justify-center">
     <div class="text-center">
-        <h1 class="text-9xl font-bold text-blue-500">403</h1>
-        <p class="mt-4 text-2xl font-semibold text-gray-700">Acceso Denegado</p>
-        <p class="mt-2 text-gray-500">Lo sentimos, la página a la que intentas acceder no está disponible para ti.</p>
-        <div class="mt-6">
+        <h1 class="text-9xl font-bold text-blue-500"><?= $code; ?></h1>
+        <p class="mt-4 text-3xl font-semibold text-gray-700"><?= $message; ?></p>
+        <!-- <p class="mt-2 text-gray-500">Lo sentimos, la página que buscas no existe o fue movida.</p> -->
+        <div class="mt-8">
             <a href="/" class="px-6 py-3 bg-blue-500 text-white font-medium rounded hover:bg-blue-600 transition">
                 Volver al Inicio
             </a>

diff --git a/app/src/app/Views/Error/404.php b/app/src/app/Views/Error/404.php