From bd4bb06c7e2e626e12486a4d0ada1d01e6314c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 20 Aug 2025 11:11:39 +0200
Subject: [PATCH 1/3] Remove bunnyCDN and Alpine external dependency

---
 app/views/general/404.phtml   | 24 +++++++++++++--
 app/views/general/error.phtml | 55 ++++++++++++++++++++++++++++++-----
 2 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/app/views/general/404.phtml b/app/views/general/404.phtml
index 03fdedb261..6dbf158205 100644
--- a/app/views/general/404.phtml
+++ b/app/views/general/404.phtml
@@ -6,8 +6,28 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>404 Not Found</title>
 
-    <link rel="preconnect" href="https://fonts.bunny.net">
-    <link href="https://fonts.bunny.net/css?family=inter:400,500" rel="stylesheet" />
+    <link rel="preconnect" href="https://fonts.appwrite.io/">
+    <style>
+        @font-face {
+            font-family: 'Inter';
+            src: url('https://fonts.appwrite.io/inter/Inter-Regular.woff2') format('woff2');
+            font-weight: 400;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'Inter';
+            src: url('https://fonts.appwrite.io/inter/Inter-Medium.woff2') format('woff2');
+            font-weight: 500;
+            font-style: normal;
+        }
+        
+        @font-face {
+            font-family: 'Fira Code';
+            src: url('https://fonts.appwrite.io/fira-code/FiraCode-Regular.woff2') format('woff2');
+            font-weight: 400;
+            font-style: normal;
+        }
+    </style>
     <style>
         * {
             margin: 0;
diff --git a/app/views/general/error.phtml b/app/views/general/error.phtml
index 8343421858..c21cb6dd26 100644
--- a/app/views/general/error.phtml
+++ b/app/views/general/error.phtml
@@ -104,11 +104,39 @@ switch ($type) {
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.x.x/dist/alpine.min.js" defer></script>
     <link rel="icon" type="image/svg+xml" href="<?php echo $url; ?>/images/logos/appwrite-icon.svg" />
     <link rel="mask-icon" type="image/png" href="<?php echo $url; ?>/images/logos/appwrite-icon.png" />
-    <link rel="preconnect" href="https://fonts.bunny.net">
-    <link href="https://fonts.bunny.net/css?family=fira-code:400|inter:400,500" rel="stylesheet" />
+
+    <link rel="preconnect" href="https://fonts.appwrite.io/">
+    <style>
+        @font-face {
+            font-family: 'Inter';
+            src: url('https://fonts.appwrite.io/inter/Inter-Regular.woff2') format('woff2');
+            font-weight: 400;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'Inter';
+            src: url('https://fonts.appwrite.io/inter/Inter-Medium.woff2') format('woff2');
+            font-weight: 500;
+            font-style: normal;
+        }
+        
+        @font-face {
+            font-family: 'Fira Code';
+            src: url('https://fonts.appwrite.io/fira-code/FiraCode-Regular.woff2') format('woff2');
+            font-weight: 400;
+            font-style: normal;
+        }
+        
+        @font-face {
+            font-family: 'Fira Code';
+            src: url('https://fonts.appwrite.io/fira-code/FiraCode-Regular.woff2') format('woff2');
+            font-weight: 400;
+            font-style: normal;
+        }
+    </style>
+
     <title><?php echo $this->print($title); ?></title>
 
     <style>
@@ -440,9 +468,9 @@ switch ($type) {
     </style>
 </head>
 
-<body x-data="{ page: 'error' }">
+<body>
     <div class="main">
-        <div x-show="page === 'error'" class="content <?php echo $isSimpleMessage ? 'large-error' : 'small-error' ?>">
+        <div id="views-error" class="content <?php echo $isSimpleMessage ? 'large-error' : 'small-error' ?>">
             <div class="center"><span class="<?php echo $this->print($labelClass); ?>"><?php echo $this->print($label); ?></span></div>
             <h1><?php echo $this->print($message); ?></h1>
             <?php if (!empty($type)): ?>
@@ -462,14 +490,14 @@ switch ($type) {
                 <?php endif; ?>
                     
                 <?php if ($development) : ?>
-                        <button class="<?php echo count($buttons) === 0 ? 'bordered-button' : 'button' ?>" x-on:click="page = 'trace'">View error trace</button>
+                        <button class="<?php echo count($buttons) === 0 ? 'bordered-button' : 'button' ?>" onclick="openTraceView()">View error trace</button>
                 <?php endif; ?>
             </div>
         </div>
 
         <?php if ($development) : ?>
-            <div x-show="page === 'trace'" class="error-trace">
-                <button class="back-button" x-on:click="page = 'error'">
+            <div id="views-trace" class="error-trace">
+                <button class="back-button" onclick="openErrorView()">
                     Back
                 </button>
                 <div class="trace-grid-header">Error trace</div>
@@ -500,6 +528,17 @@ switch ($type) {
         <?php endif; ?>
     </div>
 
+    <script>
+        function openErrorView() {
+            document.getElementById('views-trace')?.style.display = 'none';
+            document.getElementById('views-error')?.style.display = 'block';
+        }
+
+        function openTraceView() {
+            document.getElementById('views-trace')?.style.display = 'block';
+            document.getElementById('views-error')?.style.display = 'none';
+        }
+    </script>
 </body>
 
 </html>
\ No newline at end of file

From 79a0b6b6c387a5b786eeae1bf2b550db8039f120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 20 Aug 2025 11:21:21 +0200
Subject: [PATCH 2/3] Fix during QA

---
 app/views/general/error.phtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/general/error.phtml b/app/views/general/error.phtml
index c21cb6dd26..8eab2d62cf 100644
--- a/app/views/general/error.phtml
+++ b/app/views/general/error.phtml
@@ -496,7 +496,7 @@ switch ($type) {
         </div>
 
         <?php if ($development) : ?>
-            <div id="views-trace" class="error-trace">
+            <div id="views-trace" style="display: none;" class="error-trace">
                 <button class="back-button" onclick="openErrorView()">
                     Back
                 </button>
@@ -530,13 +530,13 @@ switch ($type) {
 
     <script>
         function openErrorView() {
-            document.getElementById('views-trace')?.style.display = 'none';
-            document.getElementById('views-error')?.style.display = 'block';
+            document.getElementById('views-trace').style.display = 'none';
+            document.getElementById('views-error').style.display = 'block';
         }
 
         function openTraceView() {
-            document.getElementById('views-trace')?.style.display = 'block';
-            document.getElementById('views-error')?.style.display = 'none';
+            document.getElementById('views-trace').style.display = 'block';
+            document.getElementById('views-error').style.display = 'none';
         }
     </script>
 </body>

From ca75ac3722fccfe12e5d82c7c8d30b2ee1cb443b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 20 Aug 2025 11:32:06 +0200
Subject: [PATCH 3/3] PR review improvements

---
 app/views/general/error.phtml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/views/general/error.phtml b/app/views/general/error.phtml
index 8eab2d62cf..23a4867fda 100644
--- a/app/views/general/error.phtml
+++ b/app/views/general/error.phtml
@@ -107,19 +107,21 @@ switch ($type) {
     <link rel="icon" type="image/svg+xml" href="<?php echo $url; ?>/images/logos/appwrite-icon.svg" />
     <link rel="mask-icon" type="image/png" href="<?php echo $url; ?>/images/logos/appwrite-icon.png" />
 
-    <link rel="preconnect" href="https://fonts.appwrite.io/">
+    <link rel="preconnect" href="https://fonts.appwrite.io/" crossorigin>
     <style>
         @font-face {
             font-family: 'Inter';
             src: url('https://fonts.appwrite.io/inter/Inter-Regular.woff2') format('woff2');
             font-weight: 400;
             font-style: normal;
+            font-display: swap;
         }
         @font-face {
             font-family: 'Inter';
             src: url('https://fonts.appwrite.io/inter/Inter-Medium.woff2') format('woff2');
             font-weight: 500;
             font-style: normal;
+            font-display: swap;
         }
         
         @font-face {
@@ -127,13 +129,7 @@ switch ($type) {
             src: url('https://fonts.appwrite.io/fira-code/FiraCode-Regular.woff2') format('woff2');
             font-weight: 400;
             font-style: normal;
-        }
-        
-        @font-face {
-            font-family: 'Fira Code';
-            src: url('https://fonts.appwrite.io/fira-code/FiraCode-Regular.woff2') format('woff2');
-            font-weight: 400;
-            font-style: normal;
+            font-display: swap;
         }
     </style>
 
