From 7d6227a4be08d4f6bed44c738b046ede6167f034 Mon Sep 17 00:00:00 2001
From: Merci Jacob <mercihabam@gmail.com>
Date: Fri, 8 Aug 2025 18:21:04 +0200
Subject: [PATCH] use configured revverse proxy url font paths and js routing

---
 public/css/app.css                   | 14 --------------
 public/js/metadata.js                |  2 +-
 public/js/signature.js               |  2 +-
 templates/components/common.html.php |  1 +
 templates/components/header.html.php | 15 +++++++++++++++
 templates/signature.html.php         |  6 +++---
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/public/css/app.css b/public/css/app.css
index 2efedfb..c6a2e13 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -1,17 +1,3 @@
-@font-face {
-    font-family: 'Caveat';
-    font-style: normal;
-    font-weight: 400;
-    src: url(/vendor/fonts/Caveat-Regular.ttf) format('truetype');
-}
-
-@font-face {
-    font-family: 'Tajawal';
-    font-style: normal;
-    font-weight: 400;
-    src: url(/vendor/fonts/Tajawal-Medium.ttf) format('truetype');
-}
-
 #container-pages {
     overflow: auto;
 }
diff --git a/public/js/metadata.js b/public/js/metadata.js
index b88ca2b..101c3f7 100644
--- a/public/js/metadata.js
+++ b/public/js/metadata.js
@@ -330,7 +330,7 @@ async function pageUpload() {
         if(await canUseCache()) {
             const file = document.getElementById('input_pdf_upload').files[0]
             storeFileInCache(file, file.name);
-            history.pushState({}, '', '/metadata#'+file.name);
+            history.pushState({}, '', `${REVERSE_PROXY_URL ? '/': ''}${REVERSE_PROXY_URL}/metadata#${file.name}`);
         }
         pageMetadata(null);
     });
diff --git a/public/js/signature.js b/public/js/signature.js
index 6b8e59a..c1e315d 100644
--- a/public/js/signature.js
+++ b/public/js/signature.js
@@ -1176,7 +1176,7 @@ async function pageUpload() {
         if(await canUseCache()) {
             const file = document.getElementById('input_pdf_upload').files[0]
             storeFileInCache(file, file.name);
-            history.pushState({}, '', '/signature#'+file.name);
+            history.pushState({}, '', `${REVERSE_PROXY_URL ? '/': ''}${REVERSE_PROXY_URL}/signature#${file.name}`);
         }
         pageSignature(null);
     });
diff --git a/templates/components/common.html.php b/templates/components/common.html.php
index e30f431..6fa37c4 100644
--- a/templates/components/common.html.php
+++ b/templates/components/common.html.php
@@ -21,6 +21,7 @@
 <?php endif; ?>
 <script src="<?php echo $REVERSE_PROXY_URL; ?>/js/common.js?<?php echo ($COMMIT) ? $COMMIT : filemtime($ROOT."/public/js/common.js") ?>"></script>
 <script>
+var REVERSE_PROXY_URL = <?php echo json_encode($REVERSE_PROXY_URL); ?>;
 var trad = <?php echo json_encode([
     'Select this page' => _('Select this page'),
     'Delete this page' => _('Delete this page'),
diff --git a/templates/components/header.html.php b/templates/components/header.html.php
index 79ca2b9..836d8db 100644
--- a/templates/components/header.html.php
+++ b/templates/components/header.html.php
@@ -8,3 +8,18 @@
 <?php endif; ?>
 <link rel="icon" type="image/x-icon" href="<?php echo $REVERSE_PROXY_URL; ?>/favicon.ico">
 <link rel="icon" type="image/png" sizes="192x192" href="<?php echo $REVERSE_PROXY_URL; ?>/favicon.png" />
+<style>
+    @font-face {
+        font-family: 'Caveat';
+        font-style: normal;
+        font-weight: 400;
+        src: url('<?php echo $REVERSE_PROXY_URL; ?>/vendor/fonts/Caveat-Regular.ttf') format('truetype');
+    }
+
+    @font-face {
+        font-family: 'Tajawal';
+        font-style: normal;
+        font-weight: 400;
+        src: url('<?php echo $REVERSE_PROXY_URL; ?>/vendor/fonts/Tajawal-Medium.ttf') format('truetype');
+    }
+</style>
diff --git a/templates/signature.html.php b/templates/signature.html.php
index a792499..8d2eedf 100644
--- a/templates/signature.html.php
+++ b/templates/signature.html.php
@@ -351,11 +351,11 @@
     ]); ?>;
 
     <?php if ($TRANSLATION_LANGUAGE == 'ar'): ?>
-    url_font = <?php echo json_encode('/vendor/fonts/Tajawal-Medium.ttf') ?>
+    url_font = <?php echo json_encode((!empty($REVERSE_PROXY_URL) ? '/': '') . $REVERSE_PROXY_URL . '/vendor/fonts/Tajawal-Medium.ttf') ?>
     <?php elseif ($TRANSLATION_LANGUAGE == 'kab'): ?>
-    url_font = <?php echo json_encode('/vendor/fonts/FiraSans-MediumItalic.ttf') ?>
+    url_font = <?php echo json_encode((!empty($REVERSE_PROXY_URL) ? '/': '') . $REVERSE_PROXY_URL . '/vendor/fonts/FiraSans-MediumItalic.ttf') ?>
     <?php else: ?>
-    url_font = <?php echo json_encode('/vendor/fonts/Caveat-Regular.ttf') ?>
+    url_font = <?php echo json_encode((!empty($REVERSE_PROXY_URL) ? '/': '') . $REVERSE_PROXY_URL . '/vendor/fonts/Caveat-Regular.ttf') ?>
     <?php endif; ?>
     </script>
     <script src="<?php echo $REVERSE_PROXY_URL; ?>/js/signature.js?<?php echo ($COMMIT) ? $COMMIT : filemtime($ROOT."/public/js/signature.js") ?>"></script>