From 2443ed2020fcfde1bce9eae1b7a5dce48d4d3d53 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Sun, 19 May 2024 13:27:00 +0100
Subject: [PATCH] quick cache fix

---
 build.gradle                                  |  2 +-
 .../static/images/file-earmark-pdf.svg        |  4 ++
 .../resources/templates/fragments/common.html | 48 +++++++++----------
 src/main/resources/templates/login.html       |  2 +-
 src/main/resources/templates/sign.html        |  2 +-
 .../templates/split-pdf-by-sections.html      |  2 +-
 6 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 src/main/resources/static/images/file-earmark-pdf.svg

diff --git a/build.gradle b/build.gradle
index 13456a96..54f319c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
 import com.github.jk1.license.render.*
 
 group = 'stirling.software'
-version = '0.24.0'
+version = '0.24.1'
 
 //17 is lowest but we support and recommend 21
 sourceCompatibility = '17'
diff --git a/src/main/resources/static/images/file-earmark-pdf.svg b/src/main/resources/static/images/file-earmark-pdf.svg
new file mode 100644
index 00000000..51b9975d
--- /dev/null
+++ b/src/main/resources/static/images/file-earmark-pdf.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-pdf" viewBox="0 0 16 16">
+  <path d="M14 14V4.5L9.5 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2M9.5 3A1.5 1.5 0 0 0 11 4.5h2V14a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h5.5z"/>
+  <path d="M4.603 14.087a.8.8 0 0 1-.438-.42c-.195-.388-.13-.776.08-1.102.198-.307.526-.568.897-.787a7.7 7.7 0 0 1 1.482-.645 20 20 0 0 0 1.062-2.227 7.3 7.3 0 0 1-.43-1.295c-.086-.4-.119-.796-.046-1.136.075-.354.274-.672.65-.823.192-.077.4-.12.602-.077a.7.7 0 0 1 .477.365c.088.164.12.356.127.538.007.188-.012.396-.047.614-.084.51-.27 1.134-.52 1.794a11 11 0 0 0 .98 1.686 5.8 5.8 0 0 1 1.334.05c.364.066.734.195.96.465.12.144.193.32.2.518.007.192-.047.382-.138.563a1.04 1.04 0 0 1-.354.416.86.86 0 0 1-.51.138c-.331-.014-.654-.196-.933-.417a5.7 5.7 0 0 1-.911-.95 11.7 11.7 0 0 0-1.997.406 11.3 11.3 0 0 1-1.02 1.51c-.292.35-.609.656-.927.787a.8.8 0 0 1-.58.029m1.379-1.901q-.25.115-.459.238c-.328.194-.541.383-.647.547-.094.145-.096.25-.04.361q.016.032.026.044l.035-.012c.137-.056.355-.235.635-.572a8 8 0 0 0 .45-.606m1.64-1.33a13 13 0 0 1 1.01-.193 12 12 0 0 1-.51-.858 21 21 0 0 1-.5 1.05zm2.446.45q.226.245.435.41c.24.19.407.253.498.256a.1.1 0 0 0 .07-.015.3.3 0 0 0 .094-.125.44.44 0 0 0 .059-.2.1.1 0 0 0-.026-.063c-.052-.062-.2-.152-.518-.209a4 4 0 0 0-.612-.053zM8.078 7.8a7 7 0 0 0 .2-.828q.046-.282.038-.465a.6.6 0 0 0-.032-.198.5.5 0 0 0-.145.04c-.087.035-.158.106-.196.283-.04.192-.03.469.046.822q.036.167.09.346z"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html
index 635d0952..440a2ea3 100644
--- a/src/main/resources/templates/fragments/common.html
+++ b/src/main/resources/templates/fragments/common.html
@@ -41,36 +41,36 @@
     <script src="js/thirdParty/pdf-lib.min.js"></script>
 
     <!-- Custom -->
-    <link rel="stylesheet" href="css/general.css">
-    <link rel="stylesheet" th:href="@{css/theme/theme.css}">
-    <link rel="stylesheet" th:href="@{css/theme/componentes.css}">
-    <link rel="stylesheet" th:href="@{css/theme/theme.light.css}" id="light-mode-styles">
-    <link rel="stylesheet" th:href="@{css/theme/theme.dark.css}" id="dark-mode-styles">
-    <link rel="stylesheet" th:href="@{css/rainbow-mode.css}" id="rainbow-mode-styles" disabled>
-    <link rel="stylesheet" href="css/tab-container.css">
-    <link rel="stylesheet" href="css/navbar.css">
+    <link rel="stylesheet" href="css/general.css?v=2">
+    <link rel="stylesheet" th:href="@{css/theme/theme.css?v=2}">
+    <link rel="stylesheet" th:href="@{css/theme/componentes.css?v=2}">
+    <link rel="stylesheet" th:href="@{css/theme/theme.light.css?v=2}" id="light-mode-styles">
+    <link rel="stylesheet" th:href="@{css/theme/theme.dark.css?v=2}" id="dark-mode-styles">
+    <link rel="stylesheet" th:href="@{css/rainbow-mode.css?v=2}" id="rainbow-mode-styles" disabled>
+    <link rel="stylesheet" href="css/tab-container.css?v=2">
+    <link rel="stylesheet" href="css/navbar.css?v=2">
 
-    <link rel="stylesheet" th:href="@{/css/error.css}" th:if="${error}">
+    <link rel="stylesheet" th:href="@{/css/error.css?v=2}" th:if="${error}">
 
-    <link rel="stylesheet" href="css/home.css" th:if="${currentPage == 'home'}">
-    <link rel="stylesheet" href="css/account.css" th:if="${currentPage == 'account'}">
-    <link rel="stylesheet" href="css/licenses.css" th:if="${currentPage == 'licenses'}">
-    <link rel="stylesheet" href="css/multi-tool.css" th:if="${currentPage == 'multi-tool'}">
-    <link rel="stylesheet" href="css/rotate-pdf.css" th:if="${currentPage == 'rotate-pdf'}">
-    <link rel="stylesheet" href="css/stamp.css" th:if="${currentPage == 'stamp'}">
-    <link rel="stylesheet" href="css/fileSelect.css">
-    <link rel="stylesheet" href="css/footer.css">
+    <link rel="stylesheet" href="css/home.css?v=2" th:if="${currentPage == 'home'}">
+    <link rel="stylesheet" href="css/account.css?v=2" th:if="${currentPage == 'account'}">
+    <link rel="stylesheet" href="css/licenses.css?v=2" th:if="${currentPage == 'licenses'}">
+    <link rel="stylesheet" href="css/multi-tool.css?v=2" th:if="${currentPage == 'multi-tool'}">
+    <link rel="stylesheet" href="css/rotate-pdf.css?v=2" th:if="${currentPage == 'rotate-pdf'}">
+    <link rel="stylesheet" href="css/stamp.css?v=2" th:if="${currentPage == 'stamp'}">
+    <link rel="stylesheet" href="css/fileSelect.css?v=2">
+    <link rel="stylesheet" href="css/footer.css?v=2">
     <script src="js/thirdParty/fontfaceobserver.standalone.js"></script>
 
     <!-- Google MD Icons -->
     <link rel="stylesheet" href="css/theme/font.css">
 
     <!-- Help Modal -->
-    <link rel="stylesheet" href="css/errorBanner.css">
+    <link rel="stylesheet" href="css/errorBanner.css?v=2">
 
-    <script src="js/cacheFormInputs.js"></script>
-    <script src="js/tab-container.js"></script>
-    <script src="js/darkmode.js"></script>
+    <script src="js/cacheFormInputs.js?v=2"></script>
+    <script src="js/tab-container.js?v=2"></script>
+    <script src="js/darkmode.js?v=2"></script>
   </th:block>
 
 <th:block th:fragment="game">
@@ -140,7 +140,7 @@
         <div id="level">Level: 1</div>
         <img src="favicon.svg" class="player" id="player" alt="favicon">
       </div>
-      <link rel="stylesheet" href="css/game.css">
+      <link rel="stylesheet" href="css/game.css?v=2">
     </dialog>
 </th:block>
 
@@ -150,7 +150,7 @@
                   const multiple = [[${multiple}]] || false;
                   const remoteCall = [[${remoteCall}]] || true;
                 </script>
-                <script src="js/downloader.js"></script>
+                <script src="js/downloader.js?v=2"></script>
 
                 <div class="custom-file-chooser" th:attr="data-bs-unique-id=${name}, data-bs-element-id=${name+'-input'}, data-bs-files-selected=#{filesSelected}, data-bs-pdf-prompt=#{pdfPrompt}">
                   <div class="mb-3">
@@ -166,5 +166,5 @@
                     </div>
                   </div>
                 </div>
-                <script src="js/fileInput.js"></script>
+                <script src="js/fileInput.js?v=2"></script>
 </th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 085283c2..b97a44b2 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -2,7 +2,7 @@
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{login.title}, header=#{login.header})}"></th:block>
-    <link rel="stylesheet" href="css/login.css">
+    <link rel="stylesheet" href="css/login.css?v=2">
   </head>
 
   <body>
diff --git a/src/main/resources/templates/sign.html b/src/main/resources/templates/sign.html
index 7b6347e2..a7bb7bff 100644
--- a/src/main/resources/templates/sign.html
+++ b/src/main/resources/templates/sign.html
@@ -2,7 +2,7 @@
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{sign.title}, header=#{sign.header})}"></th:block>
-    <link rel="stylesheet" href="css/sign.css">
+    <link rel="stylesheet" href="css/sign.css?v=2">
   <th:block th:each="font : ${fonts}">
     <style th:inline="text">
       @font-face {
diff --git a/src/main/resources/templates/split-pdf-by-sections.html b/src/main/resources/templates/split-pdf-by-sections.html
index 9790b1b2..cc4d0cc2 100644
--- a/src/main/resources/templates/split-pdf-by-sections.html
+++ b/src/main/resources/templates/split-pdf-by-sections.html
@@ -2,7 +2,7 @@
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{split-by-sections.title}, header=#{split-by-sections.header})}"></th:block>
-    <link rel="stylesheet" href="css/split-pdf-by-sections.css">
+    <link rel="stylesheet" href="css/split-pdf-by-sections.css?v=2">
   </head>
 
   <body>