From f9aacb4c66072cb5c7beb9539c4849f022c403f9 Mon Sep 17 00:00:00 2001
From: Mayann <fritsch.mayann@gmail.com>
Date: Wed, 10 May 2023 20:01:05 +0200
Subject: [PATCH] #136 Added environment variable APP_ROOT_PATH to expose the
 webapp behind a reverse proxy using subfolder. Minor changes to html pages to
 remove absolute path for some resources

---
 src/main/resources/application.properties          |  3 ++-
 src/main/resources/templates/fragments/navbar.html | 12 ++++++------
 src/main/resources/templates/multi-tool.html       | 12 ++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d374846f..e52ba67a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,8 +17,9 @@ server.error.include-exception=true
 server.error.include-message=always
 
 server.servlet.session.tracking-modes=cookie
+server.servlet.context-path=${APP_ROOT_PATH:/}
 
 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true
 
-spring.thymeleaf.encoding=UTF-8
\ No newline at end of file
+spring.thymeleaf.encoding=UTF-8
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index d21868cf..82813598 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -304,19 +304,19 @@ function compareVersions(version1, version2) {
                          </a>
                         <div class="dropdown-menu" aria-labelledby="languageDropdown">
                             <a class="dropdown-item lang_dropdown-item" href="" data-language-code="en_GB">
-                                <img src="/images/flags/gb.svg" alt="icon" width="20" height="15"> English
+                                <img src="images/flags/gb.svg" alt="icon" width="20" height="15"> English
                             </a>
                             <a class="dropdown-item lang_dropdown-item" href="" data-language-code="ar_AR">
-                                <img src="/images/flags/sa.svg" alt="icon" width="20" height="15"> العربية
+                                <img src="images/flags/sa.svg" alt="icon" width="20" height="15"> العربية
                             </a>
                             <a class="dropdown-item lang_dropdown-item" href="" data-language-code="de_DE">
-                                <img src="/images/flags/de.svg" alt="icon" width="20" height="15"> Deutsch
+                                <img src="images/flags/de.svg" alt="icon" width="20" height="15"> Deutsch
                             </a>
                             <a class="dropdown-item lang_dropdown-item" href="" data-language-code="fr_FR">
-                                <img src="/images/flags/fr.svg" alt="icon" width="20" height="15"> Français
+                                <img src="images/flags/fr.svg" alt="icon" width="20" height="15"> Français
                             </a>
                             <a class="dropdown-item lang_dropdown-item" href="" data-language-code="es_ES">
-                                <img src="/images/flags/es.svg" alt="icon" width="20" height="15"> Español
+                                <img src="images/flags/es.svg" alt="icon" width="20" height="15"> Español
                             </a>
                         </div>
                     </li>
@@ -324,7 +324,7 @@ function compareVersions(version1, version2) {
                     <li class="nav-item">
                         <!-- Settings Button -->
                         <a href="#" class="nav-link" data-toggle="modal" data-target="#settingsModal">
-                            <img class="navbar-icon" src="/images/gear.svg" alt="icon" width="24" height="24">
+                            <img class="navbar-icon" src="images/gear.svg" alt="icon" width="24" height="24">
                         </a>
 
                     </li>
diff --git a/src/main/resources/templates/multi-tool.html b/src/main/resources/templates/multi-tool.html
index 2c6944b0..fc309162 100644
--- a/src/main/resources/templates/multi-tool.html
+++ b/src/main/resources/templates/multi-tool.html
@@ -60,11 +60,11 @@
     <div id="drag-container"></div>
     
     <script type="module">
-        import PdfContainer from '/js/multitool/PdfContainer.js';
-        import DragDropManager from "/js/multitool/DragDropManager.js";
-        import scrollDivHorizontally from "/js/multitool/horizontalScroll.js";
-        import ImageHighlighter from "/js/multitool/ImageHighlighter.js";
-        import PdfActionsManager from '/js/multitool/PdfActionsManager.js';
+        import PdfContainer from './js/multitool/PdfContainer.js';
+        import DragDropManager from "./js/multitool/DragDropManager.js";
+        import scrollDivHorizontally from "./js/multitool/horizontalScroll.js";
+        import ImageHighlighter from "./js/multitool/ImageHighlighter.js";
+        import PdfActionsManager from './js/multitool/PdfActionsManager.js';
 
         // enables drag and drop
         const dragDropManager = new DragDropManager('drag-container', 'pages-container');
@@ -199,4 +199,4 @@
     </style>
 </body>
 
-</html>
\ No newline at end of file
+</html>